From d8be21d28cfa9459452abb80eed8310986fe5dc4 Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Thu, 14 Jul 2022 10:30:55 +0530
Subject: [PATCH 001/887] Enabled sourcemap for test

---
 angular.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/angular.json b/angular.json
index 4037c51b9..a4d2e967d 100644
--- a/angular.json
+++ b/angular.json
@@ -101,7 +101,7 @@
               ],
               "optimization": true,
               "outputHashing": "all",
-              "sourceMap": false,
+              "sourceMap": true,
               "extractCss": true,
               "namedChunks": false,
               "aot": true,
@@ -127,7 +127,7 @@
               ],
               "optimization": true,
               "outputHashing": "all",
-              "sourceMap": false,
+              "sourceMap": true,
               "extractCss": true,
               "namedChunks": false,
               "aot": true,
@@ -153,7 +153,7 @@
               ],
               "optimization": true,
               "outputHashing": "all",
-              "sourceMap": false,
+              "sourceMap": true,
               "extractCss": true,
               "namedChunks": false,
               "aot": true,
@@ -179,7 +179,7 @@
               ],
               "optimization": true,
               "outputHashing": "all",
-              "sourceMap": false,
+              "sourceMap": true,
               "extractCss": true,
               "namedChunks": false,
               "aot": true,
@@ -205,7 +205,7 @@
               ],
               "optimization": true,
               "outputHashing": "all",
-              "sourceMap": false,
+              "sourceMap": true,
               "extractCss": true,
               "namedChunks": false,
               "aot": true,

From 130fe25922a036c8cdc31fe046a43ec440415d4e Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Thu, 14 Jul 2022 17:15:36 +0530
Subject: [PATCH 002/887] Reverted  sourcemap for test

---
 angular.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/angular.json b/angular.json
index a4d2e967d..4037c51b9 100644
--- a/angular.json
+++ b/angular.json
@@ -101,7 +101,7 @@
               ],
               "optimization": true,
               "outputHashing": "all",
-              "sourceMap": true,
+              "sourceMap": false,
               "extractCss": true,
               "namedChunks": false,
               "aot": true,
@@ -127,7 +127,7 @@
               ],
               "optimization": true,
               "outputHashing": "all",
-              "sourceMap": true,
+              "sourceMap": false,
               "extractCss": true,
               "namedChunks": false,
               "aot": true,
@@ -153,7 +153,7 @@
               ],
               "optimization": true,
               "outputHashing": "all",
-              "sourceMap": true,
+              "sourceMap": false,
               "extractCss": true,
               "namedChunks": false,
               "aot": true,
@@ -179,7 +179,7 @@
               ],
               "optimization": true,
               "outputHashing": "all",
-              "sourceMap": true,
+              "sourceMap": false,
               "extractCss": true,
               "namedChunks": false,
               "aot": true,
@@ -205,7 +205,7 @@
               ],
               "optimization": true,
               "outputHashing": "all",
-              "sourceMap": true,
+              "sourceMap": false,
               "extractCss": true,
               "namedChunks": false,
               "aot": true,

From f90eeddcff4eec8d7a4190fd5bb86b48a583477e Mon Sep 17 00:00:00 2001
From: nitin raj <nitin.raj@tarento.com>
Date: Fri, 15 Jul 2022 16:08:05 +0530
Subject: [PATCH 003/887] scroll, telephn no issue, loader issue resolved

---
 .../access/routes/home/home.component.scss    |  5 ++
 .../src/lib/routes/events/events.module.ts    | 79 ++++++++++---------
 .../create-event/create-event.component.html  | 22 ++++--
 .../create-event/create-event.component.ts    | 10 +++
 .../home/routes/home/home.component.scss      |  6 +-
 .../institute-profile.component.html          |  2 +-
 .../institute-profile.component.ts            |  7 +-
 .../create-user/create-user.component.html    |  9 ++-
 .../create-user/create-user.component.ts      | 13 ++-
 src/app/component/root/root.component.scss    |  4 +
 10 files changed, 99 insertions(+), 58 deletions(-)

diff --git a/project/ws/app/src/lib/routes/access/routes/home/home.component.scss b/project/ws/app/src/lib/routes/access/routes/home/home.component.scss
index cc2e85b20..12da50406 100644
--- a/project/ws/app/src/lib/routes/access/routes/home/home.component.scss
+++ b/project/ws/app/src/lib/routes/access/routes/home/home.component.scss
@@ -57,3 +57,8 @@
     flex-direction: column;
   }
 }
+
+
+::ng-deep .mat-drawer-content {
+  overflow-x: hidden!important;
+}
diff --git a/project/ws/app/src/lib/routes/events/events.module.ts b/project/ws/app/src/lib/routes/events/events.module.ts
index 3eb9ad38e..848dbca91 100644
--- a/project/ws/app/src/lib/routes/events/events.module.ts
+++ b/project/ws/app/src/lib/routes/events/events.module.ts
@@ -19,7 +19,7 @@ import {
   MatSidenavModule, MatGridListModule, MatListModule, MatCardModule, MatFormFieldModule, MatInputModule,
   MatIconModule, MatButtonModule, MatRadioModule, MatDialogModule, MatSelectModule, MatDatepickerModule,
   MatTableModule, MatCheckboxModule, MatNativeDateModule, MatSortModule, MatAutocompleteModule,
-  MatMenuModule, MatPaginatorModule,
+  MatMenuModule, MatPaginatorModule, MatProgressSpinnerModule,
 } from '@angular/material'
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
@@ -36,44 +36,45 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'
     SuccessComponent,
   ],
   imports:
-  [
-    CommonModule,
-    RouterModule,
-    EventsRoutingModule,
-    BreadcrumbsOrgModule,
-    MatSidenavModule,
-    MatListModule,
-    ScrollspyLeftMenuModule,
-    MatCardModule,
-    FormsModule,
-    MatFormFieldModule,
-    MatInputModule,
-    MatButtonModule,
-    MatIconModule,
-    MatGridListModule,
-    MatRadioModule,
-    MatDialogModule,
-    MatSelectModule,
-    MatDatepickerModule,
-    ReactiveFormsModule,
-    MatTableModule,
-    MatCheckboxModule,
-    MatNativeDateModule,
-    MatSortModule,
-    MatAutocompleteModule,
-    MatMenuModule,
-    MatPaginatorModule,
-    PipeFilterModule,
-    PipeHtmlTagRemovalModule,
-    PipeRelativeTimeModule,
-    PipeOrderByModule,
-    BreadcrumbsOrgModule,
-    WidgetResolverModule,
-    ScrollspyLeftMenuModule,
-    MatRadioModule,
-    MatExpansionModule,
-    MatDividerModule,
-  ],
+    [
+      CommonModule,
+      RouterModule,
+      EventsRoutingModule,
+      BreadcrumbsOrgModule,
+      MatSidenavModule,
+      MatListModule,
+      ScrollspyLeftMenuModule,
+      MatProgressSpinnerModule,
+      MatCardModule,
+      FormsModule,
+      MatFormFieldModule,
+      MatInputModule,
+      MatButtonModule,
+      MatIconModule,
+      MatGridListModule,
+      MatRadioModule,
+      MatDialogModule,
+      MatSelectModule,
+      MatDatepickerModule,
+      ReactiveFormsModule,
+      MatTableModule,
+      MatCheckboxModule,
+      MatNativeDateModule,
+      MatSortModule,
+      MatAutocompleteModule,
+      MatMenuModule,
+      MatPaginatorModule,
+      PipeFilterModule,
+      PipeHtmlTagRemovalModule,
+      PipeRelativeTimeModule,
+      PipeOrderByModule,
+      BreadcrumbsOrgModule,
+      WidgetResolverModule,
+      ScrollspyLeftMenuModule,
+      MatRadioModule,
+      MatExpansionModule,
+      MatDividerModule,
+    ],
   entryComponents: [
     ParticipantsComponent,
     EventThumbnailComponent,
diff --git a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.html b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.html
index 133a6ed74..b5979b819 100644
--- a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.html
+++ b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.html
@@ -9,16 +9,22 @@
                 </div>
                 <span class="spacer"></span>
                 <div class="flex flex-3 custom button-row-inline margin-top-xs">
-                    <button mat-stroked-button color="accent" type="button" class="mat-accent-border flex-auto-display"
-                        (click)="goToList()">
-                        <span i18n>Cancel</span>
-                    </button>
-                    <button mat-button class="create-btn" type="button" (click)="onSubmit()"
-                        [disabled]="!createEventForm.valid">
-                        <span i18n>Save and Publish</span>
-                    </button>
+                    <div>
+                        <button mat-stroked-button color="accent" type="button"
+                            class="mat-accent-border flex-auto-display" (click)="goToList()">
+                            <span i18n>Cancel</span>
+                        </button>
+                        <button mat-button class="create-btn btn-success" type="button" (click)="onSubmit()"
+                            [disabled]="!createEventForm.valid || disableCreateButton">
+                            <span i18n>Save and Publish</span>
+                        </button>
+                    </div>
+                    <div *ngIf="displayLoader" class="mt-5 pr-4 flex items-center justify-center">
+                        <mat-spinner [diameter]="30"></mat-spinner>
+                    </div>
 
                 </div>
+
             </div>
             <div class="flex flex-4 flex-column">
                 <div class="flex flex-1 custom">
diff --git a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
index 01959b70a..08a67251e 100644
--- a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
+++ b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
@@ -91,6 +91,8 @@ export class CreateEventComponent implements OnInit {
     value: string
   }[]
   newtimearray: any = []
+  disableCreateButton = false
+  displayLoader = false
 
   constructor(private snackBar: MatSnackBar, private eventsSvc: EventsService, private matDialog: MatDialog,
     // tslint:disable-next-line:align
@@ -387,6 +389,8 @@ export class CreateEventComponent implements OnInit {
   }
 
   onSubmit() {
+    this.disableCreateButton = true
+    this.displayLoader = true
     const eventDurationMinutes = this.addMinutes(
       this.createEventForm.controls['eventDurationHours'].value,
       this.createEventForm.controls['eventDurationMinutes'].value
@@ -494,15 +498,21 @@ export class CreateEventComponent implements OnInit {
     }
     // const formJson = this.encodeToBase64(form)
     if (eventDurationMinutes === 0) {
+      this.displayLoader = false
+      this.disableCreateButton = false
       this.openSnackbar('Duration cannot be zero')
     } else {
       this.eventsSvc.createEvent(form).subscribe(
         res => {
+          this.displayLoader = false
+          this.disableCreateButton = false
           const identifier = res.result.identifier
           // this.fileSubmit(identifier)
           this.publishEvent(identifier)
         },
         (err: any) => {
+          this.displayLoader = false
+          this.disableCreateButton = false
           this.openSnackbar(err.error.split(':')[1])
         }
       )
diff --git a/project/ws/app/src/lib/routes/home/routes/home/home.component.scss b/project/ws/app/src/lib/routes/home/routes/home/home.component.scss
index fddf68ca3..f6b87968c 100644
--- a/project/ws/app/src/lib/routes/home/routes/home/home.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/home/home.component.scss
@@ -20,6 +20,8 @@
 
 .left-nav {
   min-width: 240px;
+  overflow: hidden;
+  box-sizing: border-box;
   // max-width: 240px;
 
   // ::ng-deep.mat-drawer-inner-container {
@@ -79,8 +81,8 @@
   // margin-bottom: 32px;
 }
 
-.mat-drawer-content {
-  overflow: hidden !important;
+:ng-deep .mat-drawer-content {
+  overflow-x: hidden !important;
 }
 
 .nav-container {
diff --git a/project/ws/app/src/lib/routes/state-profile/routes/institute-profile/institute-profile.component.html b/project/ws/app/src/lib/routes/state-profile/routes/institute-profile/institute-profile.component.html
index 7dd7b2ee3..bc372f519 100644
--- a/project/ws/app/src/lib/routes/state-profile/routes/institute-profile/institute-profile.component.html
+++ b/project/ws/app/src/lib/routes/state-profile/routes/institute-profile/institute-profile.component.html
@@ -217,7 +217,7 @@ <h2 class="margin-remove-bottom">Contact & website details</h2>
                                         <mat-error [hidden]="false"
                                             *ngIf="instituteProfileForm?.controls['telephoneNo'].errors?.pattern"
                                             i18n-aria-label aria-label="Please enter a valid 10 digit mobile number">
-                                            Please enter a valid phone number
+                                            Please enter a valid telephone number
                                         </mat-error>
 
                                     </mat-form-field>
diff --git a/project/ws/app/src/lib/routes/state-profile/routes/institute-profile/institute-profile.component.ts b/project/ws/app/src/lib/routes/state-profile/routes/institute-profile/institute-profile.component.ts
index 0995960ac..26c2c23ee 100644
--- a/project/ws/app/src/lib/routes/state-profile/routes/institute-profile/institute-profile.component.ts
+++ b/project/ws/app/src/lib/routes/state-profile/routes/institute-profile/institute-profile.component.ts
@@ -27,7 +27,8 @@ export class InstituteProfileComponent implements OnInit {
     public countryCodes: string[] = []
     public stateNames: string[] = []
     public stdCodes: string[] = []
-    phoneNumberPattern = '^((\\+91-?)|0)?[0-9]{10}$'
+    mobileNumberPattern = '^((\\+91-?)|0)?[0-9]{10}$'
+    phnNumberPattern = '(^[0-9]{10}$)'
     pincodePattern = '(^[0-9]{6}$)'
     yearPattern = '(^[0-9]{4}$)'
     namePatern = `^[a-zA-Z\\s\\']{1,32}$`
@@ -60,10 +61,10 @@ export class InstituteProfileComponent implements OnInit {
             pincode: new FormControl('', [Validators.required, Validators.pattern(this.pincodePattern)]),
             establishmentYear: new FormControl('', [Validators.required, Validators.pattern(this.yearPattern)]),
             stdCode: new FormControl('', [Validators.required]),
-            telephoneNo: new FormControl('', [Validators.required, Validators.maxLength(10)]),
+            telephoneNo: new FormControl('', [Validators.required, Validators.pattern(this.phnNumberPattern)]),
             countryCode: new FormControl('', [Validators.required]),
             // tslint:disable-next-line: max-line-length
-            mobile: new FormControl('', [Validators.required, Validators.pattern(this.phoneNumberPattern)]),
+            mobile: new FormControl('', [Validators.required, Validators.pattern(this.mobileNumberPattern)]),
             email: new FormControl('', [Validators.required, Validators.email, Validators.pattern(this.emailPattern)]),
             website: new FormControl('', [Validators.required, Validators.pattern(this.websitePattern)]),
         })
diff --git a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html
index 7ff6e4c0d..d75c6723a 100644
--- a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html
+++ b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html
@@ -1,6 +1,5 @@
 <div>
-  <ws-widget-breadcrumbs-org
-    [widgetData]="breadcrumbs">
+  <ws-widget-breadcrumbs-org [widgetData]="breadcrumbs">
   </ws-widget-breadcrumbs-org>
 
   <mat-sidenav-container class="sticky" autosize name="discuss-menu">
@@ -111,11 +110,15 @@
                 </div>
               </div>
               <button mat-raised-button type="submit" (click)="onSubmit(createUserForm)"
-                class="text-white btn-success btn-responsive" [disabled]="createUserForm?.invalid || disableCreateButton">
+                class="text-white btn-success btn-responsive"
+                [disabled]="createUserForm?.invalid || disableCreateButton">
                 <span class="text-white" i18n>
                   Create user
                 </span>
               </button>
+              <div *ngIf="displayLoader" class="mt-5 pr-4 flex items-center justify-center">
+                <mat-spinner [diameter]="30"></mat-spinner>
+              </div>
             </form>
           </div>
         </div>
diff --git a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
index 053312a43..cbedf129a 100644
--- a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
@@ -39,6 +39,7 @@ export class CreateUserComponent implements OnInit, OnDestroy {
   qpPath: any
   breadcrumbs: any
   disableCreateButton = false
+  displayLoader = false
 
   @HostListener('window:scroll', ['$event'])
   handleScroll() {
@@ -132,6 +133,7 @@ export class CreateUserComponent implements OnInit, OnDestroy {
 
   onSubmit(form: any) {
     this.disableCreateButton = true
+    this.displayLoader = true
     const newobj = {
       personalDetails: {
         email: form.value.email,
@@ -144,6 +146,7 @@ export class CreateUserComponent implements OnInit, OnDestroy {
 
     this.usersSvc.createUser(newobj).subscribe(res => {
       if (res) {
+        this.displayLoader = false
         const dreq = {
           request: {
             organisationId: this.department,
@@ -165,11 +168,17 @@ export class CreateUserComponent implements OnInit, OnDestroy {
           }
         },
           // tslint:disable-next-line
-          (err: any) => { this.openSnackbar(err.error || err || `Some error occurred while updateing new user's role, Please try again later!`) })
+          (err: any) => {
+            this.displayLoader = false
+            this.openSnackbar(err.error || err || `Some error occurred while updateing new user's role, Please try again later!`)
+          })
       }
     },
       // tslint:disable-next-line
-      (err: any) => { this.openSnackbar(err.error || err || 'Some error occurred while creating user, Please try again later!') })
+      (err: any) => {
+        this.displayLoader = false
+        this.openSnackbar(err.error || err || 'Some error occurred while creating user, Please try again later!')
+      })
   }
 
   private openSnackbar(primaryMsg: string, duration: number = 5000) {
diff --git a/src/app/component/root/root.component.scss b/src/app/component/root/root.component.scss
index 439c58569..db92b4496 100644
--- a/src/app/component/root/root.component.scss
+++ b/src/app/component/root/root.component.scss
@@ -19,6 +19,10 @@ ws-app-nav-bar {
   box-sizing: border-box;
 }
 
+::ng-deep .mat-drawer-content {
+  overflow-x: hidden!important;
+}
+
 .height-on-top {
   padding-top: 56px;
 }

From 011d213b168897ce05c4b69675a088b527af0f1a Mon Sep 17 00:00:00 2001
From: nitin raj <nitin.raj@tarento.com>
Date: Mon, 18 Jul 2022 16:29:34 +0530
Subject: [PATCH 004/887] sidebar scroll issue resolved

---
 .../lib/routes/access/routes/home/home.component.html    | 2 +-
 .../lib/routes/access/routes/home/home.component.scss    | 9 +++++++--
 .../src/lib/routes/home/routes/home/home.component.scss  | 3 ++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/access/routes/home/home.component.html b/project/ws/app/src/lib/routes/access/routes/home/home.component.html
index c86dda7a9..2ae796b00 100644
--- a/project/ws/app/src/lib/routes/access/routes/home/home.component.html
+++ b/project/ws/app/src/lib/routes/access/routes/home/home.component.html
@@ -11,7 +11,7 @@
         <mat-icon>menu</mat-icon>
       </button>
     </div>
-    <div class="container-balanced">
+    <div class="container-balanced container-balanced-inner">
       <ws-widget-breadcrumbs-org
         [widgetData]="{titles:[{title:'Roles-access', url:'/app/home/roles-access'},{title:role,url:'none'}] }">
       </ws-widget-breadcrumbs-org>
diff --git a/project/ws/app/src/lib/routes/access/routes/home/home.component.scss b/project/ws/app/src/lib/routes/access/routes/home/home.component.scss
index 12da50406..250404b77 100644
--- a/project/ws/app/src/lib/routes/access/routes/home/home.component.scss
+++ b/project/ws/app/src/lib/routes/access/routes/home/home.component.scss
@@ -6,8 +6,9 @@
   @extend %page-center;
   height: auto;
   min-height: 75vh;
-  padding: 12px;
-  width: 99%!important;
+  padding: 0;
+  box-sizing: border-box;
+  width: 100%!important;
   margin-left: auto!important;
   margin-right: auto!important;
 }
@@ -16,6 +17,10 @@
   position: relative;
 }
 
+.container-balanced-inner {
+  padding: 24px!important;
+  box-sizing: border-box
+}
 .container-balanced-banner {
   @extend %page-center;
   height: auto;
diff --git a/project/ws/app/src/lib/routes/home/routes/home/home.component.scss b/project/ws/app/src/lib/routes/home/routes/home/home.component.scss
index f6b87968c..9fb7ffba7 100644
--- a/project/ws/app/src/lib/routes/home/routes/home/home.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/home/home.component.scss
@@ -7,6 +7,7 @@
   height: auto;
   min-height: 75vh;
   padding: 15px;
+  box-sizing: border-box;
 }
 
 .container2 {
@@ -91,5 +92,5 @@
   bottom: 0;
   left: 0;
   right: 0;
-  min-height: calc(100vh - 164px);
+  min-height: calc(100vh - 115px);
 }

From 2b78370e5d1d110734411edf8094ab48b3453cdb Mon Sep 17 00:00:00 2001
From: nitin raj <nitin.raj@tarento.com>
Date: Thu, 21 Jul 2022 18:11:20 +0530
Subject: [PATCH 005/887] loader position fix

---
 .../lib/routes/access/routes/home/home.component.scss    | 9 +++++++++
 .../src/lib/routes/home/routes/home/home.component.scss  | 1 +
 2 files changed, 10 insertions(+)

diff --git a/project/ws/app/src/lib/routes/access/routes/home/home.component.scss b/project/ws/app/src/lib/routes/access/routes/home/home.component.scss
index 250404b77..9d38c91ff 100644
--- a/project/ws/app/src/lib/routes/access/routes/home/home.component.scss
+++ b/project/ws/app/src/lib/routes/access/routes/home/home.component.scss
@@ -67,3 +67,12 @@
 ::ng-deep .mat-drawer-content {
   overflow-x: hidden!important;
 }
+
+::ng-deep.mat-progress-spinner {
+    display: block;
+    position: absolute!important;
+    top: 0;
+    margin-top: 30%;
+    left: 0;
+    margin-left: 45%;
+}
diff --git a/project/ws/app/src/lib/routes/home/routes/home/home.component.scss b/project/ws/app/src/lib/routes/home/routes/home/home.component.scss
index 9fb7ffba7..05d2ae8af 100644
--- a/project/ws/app/src/lib/routes/home/routes/home/home.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/home/home.component.scss
@@ -94,3 +94,4 @@
   right: 0;
   min-height: calc(100vh - 115px);
 }
+

From a4720a191ab1e39f11873ce12cd258d7a194eabb Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <75484189+nitinraj-tarento@users.noreply.github.com>
Date: Thu, 21 Jul 2022 18:29:31 +0530
Subject: [PATCH 006/887] loader position fix (#154)

---
 .../lib/routes/access/routes/home/home.component.scss    | 9 +++++++++
 .../src/lib/routes/home/routes/home/home.component.scss  | 1 +
 2 files changed, 10 insertions(+)

diff --git a/project/ws/app/src/lib/routes/access/routes/home/home.component.scss b/project/ws/app/src/lib/routes/access/routes/home/home.component.scss
index 250404b77..9d38c91ff 100644
--- a/project/ws/app/src/lib/routes/access/routes/home/home.component.scss
+++ b/project/ws/app/src/lib/routes/access/routes/home/home.component.scss
@@ -67,3 +67,12 @@
 ::ng-deep .mat-drawer-content {
   overflow-x: hidden!important;
 }
+
+::ng-deep.mat-progress-spinner {
+    display: block;
+    position: absolute!important;
+    top: 0;
+    margin-top: 30%;
+    left: 0;
+    margin-left: 45%;
+}
diff --git a/project/ws/app/src/lib/routes/home/routes/home/home.component.scss b/project/ws/app/src/lib/routes/home/routes/home/home.component.scss
index 9fb7ffba7..05d2ae8af 100644
--- a/project/ws/app/src/lib/routes/home/routes/home/home.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/home/home.component.scss
@@ -94,3 +94,4 @@
   right: 0;
   min-height: calc(100vh - 115px);
 }
+

From fc385d5e99399709ca99dacfd97a6fc445824802 Mon Sep 17 00:00:00 2001
From: nitin raj <nitin.raj@tarento.com>
Date: Fri, 22 Jul 2022 12:54:04 +0530
Subject: [PATCH 007/887] form loader fixed

---
 .../create-event/create-event.component.scss  | 22 ++++++++++++++-----
 .../create-user/create-user.component.scss    | 11 +++++++++-
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.scss b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.scss
index a8490f8a0..72939ba21 100644
--- a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.scss
+++ b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.scss
@@ -17,7 +17,7 @@ td, th {
   border-left: 1px solid #d3d3d3;
 }
 .page_title_flex {
-  display:flex; 
+  display:flex;
   justify-content: right;
 }
 
@@ -74,7 +74,7 @@ mat-card.highlight {
 
 mat-card.event_types {
   width:230px;
-  box-shadow: none; 
+  box-shadow: none;
   margin-right:20px;
 }
 
@@ -91,7 +91,7 @@ mat-card.event_types {
 }
 
 label.event_types {
-  vertical-align: text-bottom; 
+  vertical-align: text-bottom;
   line-height: 20px;
   font-size: 14px;
   font-weight: 400;
@@ -710,7 +710,7 @@ input.mat-input-element {
 }
 
 .image-box {
-  display:flex; 
+  display:flex;
   justify-content: right;
   .mat-card {
     width: 200px;
@@ -720,7 +720,7 @@ input.mat-input-element {
   .imgicon {
     width: 35px;
     margin: 0 auto;
-  }  
+  }
 
   #blah {
     width: 200px;
@@ -734,4 +734,14 @@ input.mat-input-element {
 }
 ::ng-deep.theme-igot.day-mode .mat-stroked-button:not([disabled]) {
   border-color: #0074b6;
-}
\ No newline at end of file
+}
+
+::ng-deep.mat-progress-spinner {
+    display: block;
+    position: absolute!important;
+    top: 0;
+    margin-top: 30%;
+    left: 0;
+    margin-left: 45%;
+    z-index: 1;
+}
diff --git a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.scss b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.scss
index 92294b0b6..afef02c5e 100644
--- a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.scss
+++ b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.scss
@@ -549,4 +549,13 @@ input.mat-input-element {
   overflow: auto;
   margin-left: 260px;
   background: #ffff;
-}
\ No newline at end of file
+}
+::ng-deep.mat-progress-spinner {
+    display: block;
+    position: absolute!important;
+    top: 0;
+    margin-top: 30%;
+    left: 0;
+    margin-left: 45%;
+    z-index: 1;
+}

From 67dfb7a0e9be4804e718aa8dfd3b31fe982749b8 Mon Sep 17 00:00:00 2001
From: nitin raj <nitin.raj@tarento.com>
Date: Fri, 22 Jul 2022 13:18:32 +0530
Subject: [PATCH 008/887] event page sidebar scroll fixed

---
 .../ws/app/src/lib/routes/access/routes/home/home.component.scss | 1 +
 .../events/routes/create-event/create-event.component.scss       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/project/ws/app/src/lib/routes/access/routes/home/home.component.scss b/project/ws/app/src/lib/routes/access/routes/home/home.component.scss
index 9d38c91ff..c6d312e65 100644
--- a/project/ws/app/src/lib/routes/access/routes/home/home.component.scss
+++ b/project/ws/app/src/lib/routes/access/routes/home/home.component.scss
@@ -66,6 +66,7 @@
 
 ::ng-deep .mat-drawer-content {
   overflow-x: hidden!important;
+  overflow-y: hidden!important;
 }
 
 ::ng-deep.mat-progress-spinner {
diff --git a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.scss b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.scss
index 72939ba21..5b900d310 100644
--- a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.scss
+++ b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.scss
@@ -109,6 +109,7 @@ mat-card.dull {
 
 .mat-drawer-inner-container {
   width: 250px !important;
+  overflow: hidden!important;
 }
 
 .save-btn {

From 124e687a22b7c6b1fec7db1bb8df11235d432c15 Mon Sep 17 00:00:00 2001
From: nitin raj <nitin.raj@tarento.com>
Date: Fri, 22 Jul 2022 15:01:02 +0530
Subject: [PATCH 009/887] scroll issue2

---
 .../lib/routes/access/routes/home/home.component.scss  | 10 +++++++---
 .../routes/events-home/events-home.component.scss      |  3 +++
 .../lib/routes/home/routes/home/home.component.scss    |  3 ++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/access/routes/home/home.component.scss b/project/ws/app/src/lib/routes/access/routes/home/home.component.scss
index c6d312e65..db596d71f 100644
--- a/project/ws/app/src/lib/routes/access/routes/home/home.component.scss
+++ b/project/ws/app/src/lib/routes/access/routes/home/home.component.scss
@@ -28,14 +28,13 @@
 
 .left-nav {
   min-width: 240px;
+  overflow: hidden!important;
   // max-width: 240px;
   // background:none !important;
   // border-right:0 !important;
 
 
-  // ::ng-deep.mat-drawer-inner-container {
-  //   overflow: visible;
-  // }
+
 
   @include breakpoint-xs {
     min-width: 100%;
@@ -43,6 +42,7 @@
   }
 }
 
+
 .flex-3 {
   flex: 3;
 }
@@ -69,6 +69,10 @@
   overflow-y: hidden!important;
 }
 
+ ::ng-deep .mat-drawer-inner-container {
+    overflow: hidden;
+  }
+
 ::ng-deep.mat-progress-spinner {
     display: block;
     position: absolute!important;
diff --git a/project/ws/app/src/lib/routes/events/routes/events-home/events-home.component.scss b/project/ws/app/src/lib/routes/events/routes/events-home/events-home.component.scss
index fddf68ca3..2d2a9b798 100644
--- a/project/ws/app/src/lib/routes/events/routes/events-home/events-home.component.scss
+++ b/project/ws/app/src/lib/routes/events/routes/events-home/events-home.component.scss
@@ -20,6 +20,9 @@
 
 .left-nav {
   min-width: 240px;
+  overflow: hidden!important;
+  height: 85vh;
+  box-sizing: border-box;
   // max-width: 240px;
 
   // ::ng-deep.mat-drawer-inner-container {
diff --git a/project/ws/app/src/lib/routes/home/routes/home/home.component.scss b/project/ws/app/src/lib/routes/home/routes/home/home.component.scss
index 05d2ae8af..151d9bb4b 100644
--- a/project/ws/app/src/lib/routes/home/routes/home/home.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/home/home.component.scss
@@ -21,8 +21,9 @@
 
 .left-nav {
   min-width: 240px;
-  overflow: hidden;
+  overflow: hidden!important;
   box-sizing: border-box;
+  height: 85vh;
   // max-width: 240px;
 
   // ::ng-deep.mat-drawer-inner-container {

From df37d1bb94ba8ba6c0fbdc87f5d338370263a12f Mon Sep 17 00:00:00 2001
From: nitin raj <nitin.raj@tarento.com>
Date: Mon, 25 Jul 2022 18:49:03 +0530
Subject: [PATCH 010/887] loader issue resolved

---
 .../app/src/lib/routes/access/routes/home/home.component.scss   | 2 +-
 .../routes/users/routes/create-user/create-user.component.scss  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/access/routes/home/home.component.scss b/project/ws/app/src/lib/routes/access/routes/home/home.component.scss
index db596d71f..de1a7816b 100644
--- a/project/ws/app/src/lib/routes/access/routes/home/home.component.scss
+++ b/project/ws/app/src/lib/routes/access/routes/home/home.component.scss
@@ -75,7 +75,7 @@
 
 ::ng-deep.mat-progress-spinner {
     display: block;
-    position: absolute!important;
+    position: fixed!important;
     top: 0;
     margin-top: 30%;
     left: 0;
diff --git a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.scss b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.scss
index afef02c5e..0b1c655a0 100644
--- a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.scss
+++ b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.scss
@@ -552,7 +552,7 @@ input.mat-input-element {
 }
 ::ng-deep.mat-progress-spinner {
     display: block;
-    position: absolute!important;
+    position: fixed!important;
     top: 0;
     margin-top: 30%;
     left: 0;

From b7445d665fa807c5a2aa7ec61e8d721edb793fa3 Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Thu, 11 Aug 2022 11:35:20 +0530
Subject: [PATCH 011/887] Update org name value

---
 .../ws/app/src/lib/routes/home/routes/home/home.component.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/home/home.component.ts b/project/ws/app/src/lib/routes/home/routes/home/home.component.ts
index 4d26c4a1b..07e305b68 100644
--- a/project/ws/app/src/lib/routes/home/routes/home/home.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/home/home.component.ts
@@ -81,7 +81,7 @@ export class HomeComponent implements OnInit, AfterViewInit, OnDestroy {
         // if (_.get(this.activeRoute.snapshot, 'data.department.data')) {
         const fullProfile = _.get(this.activeRoute.snapshot, 'data.configService')
         this.department = fullProfile.unMappedUser.rootOrgId
-        this.departmentName = fullProfile ? fullProfile.unMappedUser.channel : ''
+        this.departmentName = fullProfile ? fullProfile.unMappedUser.rootOrg.orgName : ''
         if (fullProfile) {
           const leftData = this.activeRoute.snapshot.data.pageData.data.menus
           _.set(leftData, 'widgetData.logo', true)

From 8ca3828cb38661a9cf9e715fa1c2a8af4b84badf Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Wed, 17 Aug 2022 11:15:39 +0530
Subject: [PATCH 012/887] Update rain dashboard package

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2edefed4b..7e320e84d 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "@project-sunbird/telemetry-sdk": "0.0.26",
     "@sunbird-cb/collection": "1.0.13",
     "@sunbird-cb/design-system": "0.0.1",
-    "@sunbird-cb/rain-dashboards": "^0.2.3",
+    "@sunbird-cb/rain-dashboards": "^0.2.4",
     "@sunbird-cb/resolver": "^1.0.0",
     "@sunbird-cb/utils": "^1.0.12",
     "@types/file-saver": "^2.0.1",

From f8ba75134bf29abe9269c673844a96cfcad35ace Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Thu, 18 Aug 2022 11:12:18 +0530
Subject: [PATCH 013/887] Reverted  rain dashboard package

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7e320e84d..2edefed4b 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "@project-sunbird/telemetry-sdk": "0.0.26",
     "@sunbird-cb/collection": "1.0.13",
     "@sunbird-cb/design-system": "0.0.1",
-    "@sunbird-cb/rain-dashboards": "^0.2.4",
+    "@sunbird-cb/rain-dashboards": "^0.2.3",
     "@sunbird-cb/resolver": "^1.0.0",
     "@sunbird-cb/utils": "^1.0.12",
     "@types/file-saver": "^2.0.1",

From 4a96cc1ab95377a9e2a18e65035ad7a319656946 Mon Sep 17 00:00:00 2001
From: "christopher.fernandes" <christyabcd.05@gmail.com>
Date: Tue, 6 Sep 2022 16:40:39 +0530
Subject: [PATCH 014/887] Task #59374: routes for users view component

---
 project/ws/app/src/lib/routes/home/home.module.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index d0e4a0685..eff0034ac 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -59,6 +59,7 @@ import { BudgetschemepopupComponent } from './components/budgetschemepopup/budge
 import { BudgetproofspopupComponent } from './components/budgetproofspopup/budgetproofspopup.component'
 import { UploadService } from './services/upload.service'
 import { AdmintableComponent } from './components/admintable/admintable.component'
+import { UsersModule } from '../users/users.module'
 @NgModule({
   declarations: [
     HomeComponent,
@@ -131,6 +132,7 @@ import { AdmintableComponent } from './components/admintable/admintable.componen
     MatTableModule,
     MatTooltipModule,
     MatSortModule,
+    UsersModule,
   ],
   entryComponents: [
     AdduserpopupComponent,

From a3d710b601acadb1112a4882ef155df530a67f09 Mon Sep 17 00:00:00 2001
From: "christopher.fernandes" <christyabcd.05@gmail.com>
Date: Tue, 6 Sep 2022 16:41:26 +0530
Subject: [PATCH 015/887] Task #59374: upgraded collection package to .15

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2edefed4b..345ad51d1 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@angular/router": "~8.2.1",
     "@angular/service-worker": "~8.2.1",
     "@project-sunbird/telemetry-sdk": "0.0.26",
-    "@sunbird-cb/collection": "1.0.13",
+    "@sunbird-cb/collection": "1.0.15",
     "@sunbird-cb/design-system": "0.0.1",
     "@sunbird-cb/rain-dashboards": "^0.2.3",
     "@sunbird-cb/resolver": "^1.0.0",

From 98d79123749a0e2ef2efeb4801347ffd9e3ba526 Mon Sep 17 00:00:00 2001
From: "christopher.fernandes" <christyabcd.05@gmail.com>
Date: Tue, 6 Sep 2022 16:42:13 +0530
Subject: [PATCH 016/887] Task #59374: org user table changes & client assets
 config for sample file

---
 .../lib/routes/home/home.rounting.module.ts   |  4 ++++
 .../users-view/users-view.component.html      | 22 ++++++++++++-------
 .../routes/users-view/users-view.component.ts | 17 ++++++++++++++
 3 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/home.rounting.module.ts b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
index 3789428a5..3b9b23b6a 100644
--- a/project/ws/app/src/lib/routes/home/home.rounting.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
@@ -16,6 +16,7 @@ import { LeadershipComponent } from './routes/leadership/leadership.component'
 import { StaffComponent } from './routes/staff/staff.component'
 import { BudgetComponent } from './routes/budget/budget.component'
 import { MdoinfoComponent } from './routes/mdoinfo/mdoinfo.component'
+import { PageResolve } from '@sunbird-cb/utils'
 
 const routes: Routes = [
   {
@@ -45,8 +46,11 @@ const routes: Routes = [
         component: UsersViewComponent,
         resolve: {
           usersList: UsersListResolve,
+          pageData: PageResolve,
         },
         data: {
+          pageType: 'feature',
+          pageKey: 'users-view',
           pageId: 'users',
           module: 'home',
         },
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index 39577ec05..c11726722 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -16,22 +16,28 @@
               'ws-mat-accent-border font-medium':currentFilter !== 'underreview'}" mat-button
             (click)="filter('underreview')" role="button">Under review</a> -->
           <a href="javascript:void(0)" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'active',
-              'ws-mat-accent-border font-medium':currentFilter !== 'active'}"
-            mat-button (click)="filter('active'); tabTelemetry('active', 0)" role="button">Active</a>
+              'ws-mat-accent-border font-medium':currentFilter !== 'active'}" mat-button
+            (click)="filter('active'); tabTelemetry('active', 0)" role="button">Active</a>
           <a href="javascript:void(0)" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'inactive',
-                          'ws-mat-accent-border font-medium':currentFilter !== 'inactive'}"
-            mat-button (click)="filter('inactive'); tabTelemetry('inactive', 1)" role="button">Inactive</a>
+                          'ws-mat-accent-border font-medium':currentFilter !== 'inactive'}" mat-button
+            (click)="filter('inactive'); tabTelemetry('inactive', 1)" role="button">Inactive</a>
           <!-- <a href="javascript:void(0)" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'blocked',
                           'ws-mat-accent-border font-medium':currentFilter !== 'blocked'}" mat-button
             (click)="filter('blocked')" role="button">Blocked</a> -->
+          <a href="javascript:void(0)" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'upload',
+                                      'ws-mat-accent-border font-medium':currentFilter !== 'upload'}" mat-button
+            (click)="filter('upload'); tabTelemetry('upload', 2)" role="button">File uploads</a>
         </div>
       </div>
-      <ng-container *ngIf="usersData">
-        <ws-widget-org-user-table [tableData]="tabledata" [data]="dataForTable" [isUpload]=fasle [isCreate]=true
-          (eOnCreateClick)="onCreateClick()" (eOnRowClick)="onRoleClick($event)" (actionsClick)="menuActions($event)"
-          (searchByEnterKey)="onEnterkySearch($event)">
+      <ng-container *ngIf="usersData && currentFilter !== 'upload'">
+        <ws-widget-org-user-table [tableData]="tabledata" [data]="dataForTable" [isUpload]=true [isCreate]=true
+          (eOnButtonClick)="clickHandler($event)" (eOnRowClick)="onRoleClick($event)"
+          (actionsClick)="menuActions($event)" (searchByEnterKey)="onEnterkySearch($event)">
         </ws-widget-org-user-table>
       </ng-container>
+      <ng-container *ngIf="currentFilter === 'upload'">
+        <ws-app-users-upload></ws-app-users-upload>
+      </ng-container>
     </mat-card-content>
   </mat-card>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index e8eaf10d5..5ce40cc87 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -211,6 +211,19 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     })
   }
 
+  clickHandler(event: any) {
+    // tslint:disable-next-line: no-console
+    console.log('clickHandler :: event ', event)
+    switch (event.type) {
+      case 'createUser':
+        this.onCreateClick()
+        break
+      case 'upload':
+        this.onUploadClick()
+        break
+    }
+  }
+
   onCreateClick() {
     this.router.navigate([`/app/users/create-user`])
     this.events.raiseInteractTelemetry(
@@ -222,6 +235,10 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     )
   }
 
+  onUploadClick() {
+    this.filter('upload')
+  }
+
   onRoleClick(user: any) {
     this.router.navigate([`/app/users/${user.userId}/details`])
     this.events.raiseInteractTelemetry(

From cf2b786fa42d48e3213378f350d33465c29dbeec Mon Sep 17 00:00:00 2001
From: "christopher.fernandes" <christyabcd.05@gmail.com>
Date: Tue, 6 Sep 2022 16:42:54 +0530
Subject: [PATCH 017/887] Task #59374: user upload component and functionality
 added

---
 .../users-upload/users-upload.component.html  | 127 +++++++++++
 .../users-upload/users-upload.component.scss  |  51 +++++
 .../users-upload.component.spec.ts            |  25 +++
 .../users-upload/users-upload.component.ts    | 207 ++++++++++++++++++
 .../app/src/lib/routes/users/users.module.ts  |  11 +-
 5 files changed, 417 insertions(+), 4 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
 create mode 100644 project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
 create mode 100644 project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts

diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
new file mode 100644
index 000000000..bb0313933
--- /dev/null
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
@@ -0,0 +1,127 @@
+<div class="flex flex-wrap">
+  <div class="flex flex-row fle-wrap w-full">
+    <div class="card-notify flex-1 inline-flex items-end justify-end">
+      <!-- <span class="mat-body-1 mr-5 pl-1">Download the sample file</span> -->
+      <button class="download-btn mat-accent-border mat-button mat-button-base" i18n (click)="downloadFile()">
+        <ng-container i18n>Download sample file</ng-container>
+      </button>
+    </div>
+  </div>
+  <div class="flex flex-row fle-wrap w-full">
+    <mat-card class="my-5 flex-custom ws-mat-accent-border mat-card w-full">
+      <div>
+        <form [formGroup]="formGroup" (ngSubmit)="onSubmit(form)" #form>
+          <input type="file" class="mb-5" (change)="onFileChange($event)" name="file" placeholder="Choose file"
+            accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel, .xlsx, .xls" />
+          <!-- <input type="submit" [disabled]="formGroup.invalid" value="upload" /> -->
+          <mat-error *ngIf="showFileError">Only .xlsx or .csv files are accepted</mat-error>
+
+          <div class="mt-5 text-left">
+            <div *ngIf="displayLoader | async" class="pr-4 flex items-center justify-center">
+              <mat-spinner [diameter]="30"></mat-spinner>
+            </div>
+            <button mat-button class="upload-btn mat-button mat-button-base" type="submit" i18n
+              [disabled]="formGroup.invalid">
+              <ng-container i18n>Upload</ng-container>
+            </button>
+          </div>
+
+        </form>
+      </div>
+    </mat-card>
+  </div>
+  <div>
+    <h2 class="w-full contacts-head">File uploads</h2>
+    <div class="mb-4 ws-mat-black60-text">
+      Need help? contact us <a class="mat-accent" target="_blank" href="{{contactUsUrl}}">here</a>
+    </div>
+    <div [hidden]="!bulkUploadData && fetching">
+      <div class=" mx-5 my-5 table-container w-full">
+        <div class="example-loading-shade" *ngIf="fetching">
+          <mat-spinner *ngIf="fetching"></mat-spinner>
+        </div>
+        <div class="pt-2 ">
+          <!-- <div class="m-5 flex items-end justify-end">
+                <button mat-raised-button color="primary" class="self-end" i18n (click)="refreshTable()">
+                  <ng-container i18n>Refresh</ng-container>
+                </button>
+              </div> -->
+          <mat-table mat-table [dataSource]="dataSource" matSort [matSortActive]="tabledata?.sortColumn"
+            [matSortDirection]="tabledata?.sortState">
+
+            <!-- ID Column -->
+            <ng-container matColumnDef="identifier">
+              <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Id
+              </th>
+              <td mat-cell *matCellDef="let row"> {{row.identifier}} </td>
+              <!-- <mat-header-cell *matHeaderCellDef mat-sort-header> Id </mat-header-cell>
+              <mat-cell *matCellDef="let row"> {{row.identifier}} </mat-cell> -->
+            </ng-container>
+
+
+            <!-- Name Column -->
+            <ng-container matColumnDef="fileName">
+              <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Name
+              </th>
+              <td mat-cell *matCellDef="let row"> {{row.fileName}} </td>
+            </ng-container>
+
+            <!-- status Column -->
+            <ng-container matColumnDef="status">
+              <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Status
+              </th>
+              <td mat-cell *matCellDef="let row"> {{row.status}} </td>
+            </ng-container>
+
+            <!-- status Column -->
+            <ng-container matColumnDef="dateCreatedOn">
+              <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Created
+                on
+              </th>
+              <td mat-cell *matCellDef="let row"> {{row.dateCreatedOn | date:'dd MMM yyy h:mm a' }} </td>
+            </ng-container>
+
+            <!-- status Column -->
+            <ng-container matColumnDef="dateUpdatedOn">
+              <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Updated
+                on
+              </th>
+              <td mat-cell *matCellDef="let row"> {{row.dateUpdatedOn | date:'dd MMM yyy h:mm a' }} </td>
+            </ng-container>
+
+            <!-- report Column -->
+            <!-- <ng-container matColumnDef="report">
+                  <th mat-header-cell *matHeaderCellDef mat-sort-header> report </th>
+                  <td mat-cell *matCellDef="let row">
+                    <button mat-raised-button color="primary" i18n *ngIf="row.status === 'completed'"
+                      (click)="downloadReport(row)">
+                      <ng-container i18n>Download</ng-container>
+                    </button>
+                  </td>
+                </ng-container> -->
+
+            <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+            <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
+
+            <!-- Row shown when there is no matching data. -->
+            <tr class="mat-row" *matNoDataRow>
+              <td class="mat-cell" colspan="4">No data ...</td>
+            </tr>
+
+          </mat-table>
+
+          <mat-paginator [pageSize]="10" [pageSizeOptions]="[5, 10, 25, 100]"></mat-paginator>
+        </div>
+      </div>
+    </div>
+    <ng-container *ngIf="!bulkUploadData && !fetching">
+      <h4 class="w-full
+       ws-mat-black60-text text-center">No data to be displayed!</h4>
+    </ng-container>
+  </div>
+</div>
+
+<input type="hidden" i18-value i18-aria-value aria-value="File upload successful..!" [value]="uplaodSuccessMsg"
+  #toastSuccess />
+<input type="hidden" i18-value i18-aria-value aria-value="Unable to process file upload..!"
+  value="Unable to process file upload..!" #toastError />
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
new file mode 100644
index 000000000..207920774
--- /dev/null
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
@@ -0,0 +1,51 @@
+table {
+    width: 100%;
+  }
+
+  .mat-form-field {
+    font-size: 14px;
+    width: 100%;
+  }
+
+  td, th {
+    width: 25%;
+  }
+
+  .table-container{
+       position: relative;
+  }
+
+  .example-loading-shade {
+    position: absolute;
+    top: 0;
+    left: 0;
+    bottom: 0px;
+    right: 0;
+    background: rgba(0, 0, 0, 0.15);
+    z-index: 1;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+.card-notify {
+    min-height: 74px;
+}
+
+.download-btn {
+    min-width: 112px;
+    width: auto;
+    border: 1px solid #0075B7;
+    border-radius: 4px;
+    color: #0075B7 !important;
+}
+
+.upload-btn {
+    width: auto;
+    background: #0075B7 !important;
+    color: white !important;
+}
+
+.upload-btn:disabled {
+    opacity: 0.7;
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.spec.ts b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.spec.ts
new file mode 100644
index 000000000..1ece15640
--- /dev/null
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
+
+import { UsersUploadComponent } from './users-upload.component'
+
+describe('UsersUploadComponent', () => {
+  let component: UsersUploadComponent
+  let fixture: ComponentFixture<UsersUploadComponent>
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [UsersUploadComponent],
+    })
+      .compileComponents()
+  }))
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(UsersUploadComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
+
+  it('should create', () => {
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
new file mode 100644
index 000000000..7ab2f7492
--- /dev/null
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
@@ -0,0 +1,207 @@
+import { Component, OnInit, ViewChild, ElementRef, AfterViewInit, OnDestroy } from '@angular/core'
+import { FormBuilder, Validators } from '@angular/forms'
+import { FileService } from '../../services/upload.service'
+import { Observable } from 'rxjs'
+import { MatSnackBar, MatSort } from '@angular/material'
+import { MatPaginator } from '@angular/material/paginator'
+import { MatTableDataSource } from '@angular/material/table'
+import { environment } from 'src/environments/environment'
+import { ActivatedRoute } from '@angular/router'
+
+@Component({
+  selector: 'ws-app-users-upload',
+  templateUrl: './users-upload.component.html',
+  styleUrls: ['./users-upload.component.scss'],
+})
+export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
+  private fileName: any
+  public displayLoader!: Observable<boolean>
+  public formGroup = this.fb.group({
+    file: ['', Validators.required],
+  })
+  fetching = false
+  showFileError = false
+  @ViewChild('toastSuccess', { static: true }) toastSuccess!: ElementRef<any>
+  @ViewChild('toastError', { static: true }) toastError!: ElementRef<any>
+  @ViewChild(MatSort, { static: true }) sort!: MatSort
+  bulkUploadData: any
+  uplaodSuccessMsg!: string
+  dataSource: MatTableDataSource<any>
+  displayedColumns: string[] = ['identifier', 'fileName', 'status', 'dateCreatedOn', 'dateUpdatedOn']
+  tabledata: any = {
+    actions: [],
+    columns: [
+      { displayName: 'Id', key: 'identifier' },
+      { displayName: 'Name', key: 'fileName' },
+      { displayName: 'Status', key: 'status' },
+      { displayName: 'Created on', key: 'dateCreatedOn' },
+      { displayName: 'Updated on', key: 'dateUpdatedOn' },
+    ],
+    needCheckBox: false,
+    needHash: false,
+    sortColumn: 'dateCreatedOn',
+    sortState: 'desc',
+    needUserMenus: false,
+  }
+  departments: string[] = []
+  contactUsUrl = ''
+  fileSelected!: any
+  pageDataSubscription!: any
+  downloadSampleFilePath = ''
+  downloadAsFileName = ''
+
+  objDataSource = new MatTableDataSource<any>()
+  @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | null = null
+
+  @ViewChild(MatPaginator, { static: false }) set matPaginator(paginator: MatPaginator) {
+    this.paginator = paginator
+    this.setDataSourceAttributes()
+  }
+  setDataSourceAttributes() {
+    this.dataSource.paginator = this.paginator
+  }
+
+  constructor(
+    private fb: FormBuilder,
+    private fileService: FileService,
+    private snackBar: MatSnackBar,
+    private route: ActivatedRoute,
+  ) {
+    this.dataSource = new MatTableDataSource(this.bulkUploadData)
+    this.dataSource.paginator = this.paginator
+
+    this.pageDataSubscription = this.route.data.subscribe(data => {
+      if (data && data.pageData) {
+        this.downloadSampleFilePath = data.pageData.data.downloadSampleFilePath
+        this.downloadAsFileName = data.pageData.data.downloadAsFileName
+      }
+    })
+  }
+
+  ngOnInit() {
+    this.displayLoader = this.fileService.isLoading()
+    this.contactUsUrl = `${environment.karmYogiPath}/public/contact `
+    this.getBulkUploadData()
+  }
+  ngAfterViewInit() {
+    this.dataSource.paginator = this.paginator
+    this.dataSource = new MatTableDataSource(this.bulkUploadData)
+    setTimeout(() => {
+      this.dataSource.sort = this.sort
+    })
+  }
+
+  getBulkUploadData() {
+    this.fetching = true
+    this.fileService.getBulkUploadData().then((res: any) => {
+      this.fetching = false
+      if (res.result && res.result.content) {
+        this.bulkUploadData = res.result.content
+        this.dataSource = new MatTableDataSource(this.bulkUploadData)
+        setTimeout(() => this.dataSource.paginator = this.paginator)
+        setTimeout(() => {
+          if (this.sort) {
+            this.sort.active = this.tabledata.sortColumn,
+              this.sort.start = this.tabledata.sortState
+
+          }
+          this.dataSource.sort = this.sort
+        })
+      }
+    })
+      .catch(() => { })
+      .finally(() => {
+        this.fetching = false
+      })
+  }
+
+  public onFileChange(event: any) {
+    this.showFileError = false
+    // const reader = new FileReader()
+    // if (event.target.files && event.target.files.length) {
+    //   this.fileName = event.target.files[0].name
+    //   const [file] = event.target.files
+    //   reader.readAsDataURL(file)
+
+    //   reader.onload = () => {
+    //     this.formGroup.patchValue({
+    //       file: reader.result,
+    //     })
+    //   }
+    // }
+
+    // const file: File = event.target.files[0]
+    // this.fileName = file.name
+
+    // this.fileSelected = file
+    // this.formGroup.patchValue({
+    //   file,
+    // })
+
+    const fileList = (<HTMLInputElement>event.target).files
+    if (fileList && fileList.length > 0) {
+      const file: File = fileList[0]
+      this.fileName = file.name
+      this.fileSelected = file
+      this.formGroup.patchValue({
+        file,
+      })
+    }
+  }
+
+  public onSubmit(form: any): void {
+    // Validate File type before uploading
+    if (this.fileService.validateFile(this.fileName)) {
+      if (this.formGroup && this.formGroup.get('file')) {
+        const formData: FormData = new FormData()
+        formData.append('data', this.fileSelected, this.fileName)
+        // tslint:disable-next-line: no-non-null-assertion
+        this.fileService.upload(this.fileName, formData)
+          .subscribe(
+            _res => {
+              // this.uplaodSuccessMsg = res
+              this.openSnackbar('File uploaded successfully..!')
+              // // tslint:disable-next-line: no-non-null-assertion
+              // this.formGroup!.get('file')!.setValue(['', Validators.required])
+              if (form && form.file) {
+                form.file.value = ''
+              }
+              this.formGroup.reset()
+              this.getBulkUploadData()
+            },
+            err => {
+              // tslint:disable-next-line: no-console
+              console.log('error', err)
+              this.openSnackbar(this.toastError.nativeElement.value)
+            })
+      }
+    } else {
+      this.showFileError = true
+      this.openSnackbar(this.toastError.nativeElement.value)
+    }
+  }
+
+  public refreshTable() {
+    this.getBulkUploadData()
+  }
+  public downloadFile(): void {
+    this.fileService.download(this.downloadSampleFilePath, this.downloadAsFileName)
+  }
+
+  private openSnackbar(primaryMsg: string, duration: number = 5000) {
+    this.snackBar.open(primaryMsg, 'X', {
+      duration,
+    })
+  }
+
+  public downloadReport(row: any) {
+    this.fileService.downloadReport(row.identifier, row.name)
+  }
+
+  ngOnDestroy() {
+    if (this.pageDataSubscription) {
+      this.pageDataSubscription.unsubscribe()
+    }
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/users/users.module.ts b/project/ws/app/src/lib/routes/users/users.module.ts
index 78c77e359..5c18b68a4 100644
--- a/project/ws/app/src/lib/routes/users/users.module.ts
+++ b/project/ws/app/src/lib/routes/users/users.module.ts
@@ -8,23 +8,26 @@ import { BreadcrumbsOrgModule, ScrollspyLeftMenuModule } from '@sunbird-cb/colle
 import {
   MatSidenavModule, MatGridListModule, MatListModule, MatCardModule, MatFormFieldModule, MatInputModule,
   MatIconModule, MatButtonModule, MatRadioModule, MatDialogModule, MatSelectModule, MatProgressSpinnerModule,
-  MatPaginatorModule, MatTableModule,
+  MatPaginatorModule, MatTableModule, MatSortModule,
 } from '@angular/material'
 import { MatExpansionModule } from '@angular/material/expansion'
 import { MatDividerModule } from '@angular/material/divider'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { WidgetResolverModule } from '@sunbird-cb/resolver'
 import { RolesService } from './services/roles.service'
+import { FileService } from './services/upload.service'
+import { UsersUploadComponent } from './components/users-upload/users-upload.component'
 
 @NgModule({
-  declarations: [CreateUserComponent, ViewUserComponent],
+  declarations: [CreateUserComponent, ViewUserComponent, UsersUploadComponent],
   imports: [
     CommonModule, RouterModule, UsersRoutingModule, BreadcrumbsOrgModule,
     MatSidenavModule, MatListModule, ScrollspyLeftMenuModule, MatCardModule, FormsModule,
     MatFormFieldModule, MatInputModule, MatButtonModule, MatIconModule, MatGridListModule,
     MatRadioModule, MatDialogModule, ReactiveFormsModule, MatSelectModule, MatProgressSpinnerModule,
-    MatExpansionModule, MatDividerModule, MatPaginatorModule, MatTableModule, WidgetResolverModule,
+    MatExpansionModule, MatDividerModule, MatPaginatorModule, MatTableModule, WidgetResolverModule, MatSortModule,
   ],
-  providers: [RolesService],
+  providers: [RolesService, FileService],
+  exports: [UsersUploadComponent],
 })
 export class UsersModule { }

From ee41717b0d63dd3c5c53d00232f88996832c23fe Mon Sep 17 00:00:00 2001
From: "christopher.fernandes" <christyabcd.05@gmail.com>
Date: Tue, 6 Sep 2022 16:43:21 +0530
Subject: [PATCH 018/887] Task #59374: user upload service added

---
 .../routes/users/services/upload.service.ts   | 85 +++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 project/ws/app/src/lib/routes/users/services/upload.service.ts

diff --git a/project/ws/app/src/lib/routes/users/services/upload.service.ts b/project/ws/app/src/lib/routes/users/services/upload.service.ts
new file mode 100644
index 000000000..947e6fc89
--- /dev/null
+++ b/project/ws/app/src/lib/routes/users/services/upload.service.ts
@@ -0,0 +1,85 @@
+import { Injectable } from '@angular/core'
+import { BehaviorSubject, Subject, Observable } from 'rxjs'
+import { finalize } from 'rxjs/operators'
+import { HttpClient } from '@angular/common/http'
+import * as fileSaver from 'file-saver'
+
+const API_ENDPOINTS = {
+  // bulkUpload: `/apis/protected/v8/admin/userRegistration/bulkUpload`,
+  bulkUpload: `/apis/proxies/v8/user/v1/bulkupload`,
+  downloadReport: `/apis/protected/v8/admin/userRegistration/bulkUploadReport`,
+  // getBulkUploadData: '/apis/protected/v8/admin/userRegistration/bulkUploadData',
+  getBulkUploadData: '/apis/proxies/v8/user/v1/bulkupload',
+}
+
+@Injectable()
+export class FileService {
+  // tslint:disable-next-line: prefer-array-literal
+  private fileList: string[] = new Array<string>()
+  private fileList$: Subject<string[]> = new Subject<string[]>()
+  private displayLoader$: Subject<boolean> = new BehaviorSubject<boolean>(false)
+
+  constructor(private http: HttpClient) { }
+
+  public isLoading(): Observable<boolean> {
+    return this.displayLoader$
+  }
+
+  public upload(_fileName: string, fileContent: FormData): Observable<any> {
+    this.displayLoader$.next(true)
+    return this.http.post<any>(API_ENDPOINTS.bulkUpload, fileContent)
+      .pipe(finalize(() => this.displayLoader$.next(false)))
+  }
+
+  public download(filePath: string, downloadAsFileName: string): void {
+    // const httpOptions = {
+    //   headers: new HttpHeaders({ responseType:  'blob',
+    //   'Content-Type':  'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'}),
+    // }
+    this.http.get(filePath, { responseType: 'blob' }).subscribe((res: any) => {
+      // window.open(window.URL.createObjectURL(res))
+      fileSaver.saveAs(res, downloadAsFileName)
+    })
+  }
+
+  public downloadReport(id: any, name: string) {
+    return this.http.get(`${API_ENDPOINTS.downloadReport}/${id}`).subscribe(
+      (response: any) => {
+        const blobObj = new Blob([new Uint8Array(response.report.data)])
+        fileSaver.saveAs(blobObj, `${name.split('.')[0]}-report.csv`)
+        return response
+      },
+    )
+  }
+
+  public remove(fileName: any): void {
+    this.http.delete('/files/${fileName}').subscribe(() => {
+      this.fileList.splice(this.fileList.findIndex(name => name === fileName), 1)
+      this.fileList$.next(this.fileList)
+    })
+  }
+
+  public list(): Observable<string[]> {
+    return this.fileList$
+  }
+
+  // private addFileToList(fileName: string): void {
+  //   this.fileList.push(fileName)
+  //   this.fileList$.next(this.fileList)
+  // }
+
+  validateFile(name: String) {
+    const allowedFormats = ['xlsx', 'csv']
+    const ext = name.substring(name.lastIndexOf('.') + 1).toLowerCase()
+    if (allowedFormats.indexOf(ext) > -1) {
+      return true
+      // tslint:disable-next-line: no-else-after-return
+    } else {
+      return false
+    }
+  }
+
+  async getBulkUploadData() {
+    return await this.http.get(`${API_ENDPOINTS.getBulkUploadData}`).toPromise()
+  }
+}

From 92d7dbd71539ea3d0f6042172952083cc4ae790d Mon Sep 17 00:00:00 2001
From: "christopher.fernandes" <christyabcd.05@gmail.com>
Date: Wed, 7 Sep 2022 10:41:46 +0530
Subject: [PATCH 019/887] Task #59374: removed yarn lock from gitignore

---
 .gitignore |     3 +-
 yarn.lock  | 11731 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 11732 insertions(+), 2 deletions(-)
 create mode 100644 yarn.lock

diff --git a/.gitignore b/.gitignore
index 2dd8855cf..c638e6ee7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,5 +50,4 @@ testem.log
 Thumbs.db
 
 /src/assets
-package-lock.json
-yarn.lock
+package-lock.json
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
new file mode 100644
index 000000000..149658ea3
--- /dev/null
+++ b/yarn.lock
@@ -0,0 +1,11731 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@angular-devkit/architect@0.802.2":
+  version "0.802.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.802.2.tgz#f2305052e731b68d0fcb98958426f62ce97b441e"
+  integrity sha512-bMMo8BejHi3+n4xqewgcfat5+OYDmQQCLxWQ2W+qr7/u08vmTQTix3Q/wClp0nxgN0Zc9/1gSPaeudHLAlEizg==
+  dependencies:
+    "@angular-devkit/core" "8.2.2"
+    rxjs "6.4.0"
+
+"@angular-devkit/architect@0.803.29":
+  version "0.803.29"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.803.29.tgz#0399969087ac77876b8e429cb26eebd20596607b"
+  integrity sha512-yHBud/fZHTelX24yjQg5lefZrfIebruoFTGeOwF0JdX8+KiHcTIxS4LOnUTYriasfHarcHRFXBAV/bRm+wv5ow==
+  dependencies:
+    "@angular-devkit/core" "8.3.29"
+    rxjs "6.4.0"
+
+"@angular-devkit/build-angular@^0.803.23":
+  version "0.803.29"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.803.29.tgz#4cc2ecb7c4ca48389f05d1e05d4708f82c8c7767"
+  integrity sha512-XAgfP1gi0rEJ3oVt+8ipvS5RfPNbeK5r2n8Ll2H3xkKjU0p1PN8+S6/0XVBtmMfeQ06SJWEAKFcAYqrxXhVTzw==
+  dependencies:
+    "@angular-devkit/architect" "0.803.29"
+    "@angular-devkit/build-optimizer" "0.803.29"
+    "@angular-devkit/build-webpack" "0.803.29"
+    "@angular-devkit/core" "8.3.29"
+    "@babel/core" "7.8.7"
+    "@babel/preset-env" "7.8.7"
+    "@ngtools/webpack" "8.3.29"
+    ajv "6.12.3"
+    autoprefixer "9.6.1"
+    browserslist "4.10.0"
+    cacache "12.0.2"
+    caniuse-lite "1.0.30001035"
+    circular-dependency-plugin "5.2.0"
+    clean-css "4.2.1"
+    copy-webpack-plugin "6.0.3"
+    core-js "3.6.4"
+    coverage-istanbul-loader "2.0.3"
+    file-loader "4.2.0"
+    find-cache-dir "3.0.0"
+    glob "7.1.4"
+    jest-worker "24.9.0"
+    karma-source-map-support "1.4.0"
+    less "3.9.0"
+    less-loader "5.0.0"
+    license-webpack-plugin "2.1.2"
+    loader-utils "1.2.3"
+    mini-css-extract-plugin "0.8.0"
+    minimatch "3.0.4"
+    open "6.4.0"
+    parse5 "4.0.0"
+    postcss "7.0.17"
+    postcss-import "12.0.1"
+    postcss-loader "3.0.0"
+    raw-loader "3.1.0"
+    regenerator-runtime "0.13.3"
+    rxjs "6.4.0"
+    sass "1.22.9"
+    sass-loader "7.2.0"
+    semver "6.3.0"
+    source-map "0.7.3"
+    source-map-loader "0.2.4"
+    source-map-support "0.5.13"
+    speed-measure-webpack-plugin "1.3.1"
+    style-loader "1.0.0"
+    stylus "0.54.5"
+    stylus-loader "3.0.2"
+    terser "4.6.3"
+    terser-webpack-plugin "3.0.3"
+    tree-kill "1.2.2"
+    webpack "4.39.2"
+    webpack-dev-middleware "3.7.2"
+    webpack-dev-server "3.11.0"
+    webpack-merge "4.2.1"
+    webpack-sources "1.4.3"
+    webpack-subresource-integrity "1.1.0-rc.6"
+    worker-plugin "3.2.0"
+
+"@angular-devkit/build-ng-packagr@~0.802.1":
+  version "0.802.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-ng-packagr/-/build-ng-packagr-0.802.2.tgz#8b83936667a955b91cc865f936b27428065000cc"
+  integrity sha512-6lY95tiW+KooPMWB3P4r54TUe5pSZgkv/6mphrUcxqwvN/jKOV4MkpoFxJsu7zNuiFPHU8K5URCWFsQPbiObPg==
+  dependencies:
+    "@angular-devkit/architect" "0.802.2"
+    rxjs "6.4.0"
+
+"@angular-devkit/build-optimizer@0.803.29":
+  version "0.803.29"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.803.29.tgz#91c033e6ab3313d338ec9c3d4c40d64ce1b324bc"
+  integrity sha512-E/MXtKc3oaP7UvQm0g4ayfH8ImEoQnRWseKD4jjYG6TbTIqfIyHCZRcKIr3svY28hzASbro5IZI6SugG+llvFw==
+  dependencies:
+    loader-utils "1.2.3"
+    source-map "0.7.3"
+    tslib "1.10.0"
+    typescript "3.5.3"
+    webpack-sources "1.4.3"
+
+"@angular-devkit/build-webpack@0.803.29":
+  version "0.803.29"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.803.29.tgz#ceaee658f0b71a0fee4f10b574b49e192d333a7c"
+  integrity sha512-3dJ3iEGU6AFT8VFTe72T9uNLobfd18Sq5Hz22UCCYji9K3ZyVc/bn5uXVVX+/Yj91MFtXuhOjLj7Z+XDeNy+OQ==
+  dependencies:
+    "@angular-devkit/architect" "0.803.29"
+    "@angular-devkit/core" "8.3.29"
+    rxjs "6.4.0"
+
+"@angular-devkit/core@8.2.2":
+  version "8.2.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-8.2.2.tgz#f7239b6fca785c5a85fbe7684f807b8fa41311d4"
+  integrity sha512-qA1lK/OQhNptCxoEGbTryn6yeFS1F/e/EiUTwgU/j4DkBwPyYGE8iqWBd/cgI9AVqQaRSLLhVWXtDPxoNL0TKg==
+  dependencies:
+    ajv "6.10.2"
+    fast-json-stable-stringify "2.0.0"
+    magic-string "0.25.3"
+    rxjs "6.4.0"
+    source-map "0.7.3"
+
+"@angular-devkit/core@8.3.29":
+  version "8.3.29"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-8.3.29.tgz#3477edd6458653f83e6d78684b100c1bef81382f"
+  integrity sha512-4jdja9QPwR6XG14ZSunyyOWT3nE2WtZC5IMDIBZADxujXvhzOU0n4oWpy6/JVHLUAxYNNgzLz+/LQORRWndcPg==
+  dependencies:
+    ajv "6.12.3"
+    fast-json-stable-stringify "2.0.0"
+    magic-string "0.25.3"
+    rxjs "6.4.0"
+    source-map "0.7.3"
+
+"@angular-devkit/schematics@8.3.29":
+  version "8.3.29"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-8.3.29.tgz#b3ba658b90fb3226a80ff12977be7dd583e99c49"
+  integrity sha512-AFJ9EK0XbcNlO5Dm9vr0OlBo1Nw6AaFXPR+DmHGBdcDDHxqEmYYLWfT+JU/8U2YFIdgrtlwvdtf6UQ3V2jdz1g==
+  dependencies:
+    "@angular-devkit/core" "8.3.29"
+    rxjs "6.4.0"
+
+"@angular/animations@~8.2.1":
+  version "8.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.2.14.tgz#76736b21e56165e6ca4925fb69605bdcc56aba7d"
+  integrity sha512-3Vc9TnNpKdtvKIXcWDFINSsnwgEMiDmLzjceWg1iYKwpeZGQahUXPoesLwQazBMmxJzQiA4HOMj0TTXKZ+Jzkg==
+  dependencies:
+    tslib "^1.9.0"
+
+"@angular/cdk@~8.1.2":
+  version "8.1.4"
+  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-8.1.4.tgz#69066053fe4cbd80cee2bb7fa238f1c9abb963fc"
+  integrity sha512-U0tjhAZM4qqUHGGKIKFZZ9d8929s2U/HO0FdoT/eX+oHPOA6mm3bBep7myrSzlkP9V7O1JJfYdhEgijXhYxprQ==
+  dependencies:
+    tslib "^1.7.1"
+  optionalDependencies:
+    parse5 "^5.0.0"
+
+"@angular/cli@^8.3.26":
+  version "8.3.29"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-8.3.29.tgz#481eb04a8240932adfb19049a5fb524f85453037"
+  integrity sha512-pW+iU0eKHIae+A1b9W5g8DKefMQcehZ+drGKs4Hryh8G+XGFS00BIWkmh6c1mydWTEhdsFlhdjD/rXCem7MAQQ==
+  dependencies:
+    "@angular-devkit/architect" "0.803.29"
+    "@angular-devkit/core" "8.3.29"
+    "@angular-devkit/schematics" "8.3.29"
+    "@schematics/angular" "8.3.29"
+    "@schematics/update" "0.803.29"
+    "@yarnpkg/lockfile" "1.1.0"
+    ansi-colors "4.1.1"
+    debug "^4.1.1"
+    ini "1.3.5"
+    inquirer "6.5.1"
+    npm-package-arg "6.1.0"
+    npm-pick-manifest "3.0.2"
+    open "6.4.0"
+    pacote "9.5.5"
+    read-package-tree "5.3.1"
+    rimraf "3.0.0"
+    semver "6.3.0"
+    symbol-observable "1.2.0"
+    universal-analytics "^0.4.20"
+    uuid "^3.3.2"
+
+"@angular/common@~8.2.1":
+  version "8.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.2.14.tgz#027e52b2951c14082d6e3af1a4ffa1356220e439"
+  integrity sha512-Qmt+aX2quUW54kaNT7QH7WGXnFxr/cC2C6sf5SW5SdkZfDQSiz8IaItvieZfXVQUbBOQKFRJ7TlSkt0jI/yjvw==
+  dependencies:
+    tslib "^1.9.0"
+
+"@angular/compiler-cli@~8.2.1":
+  version "8.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.2.14.tgz#1997bec04a6b9d022954e5747505fe8906994594"
+  integrity sha512-XDrTyrlIZM+0NquVT+Kbg5bn48AaWFT+B3bAT288PENrTdkuxuF9AhjFRZj8jnMdmaE4O2rioEkXBtl6z3zptA==
+  dependencies:
+    canonical-path "1.0.0"
+    chokidar "^2.1.1"
+    convert-source-map "^1.5.1"
+    dependency-graph "^0.7.2"
+    magic-string "^0.25.0"
+    minimist "^1.2.0"
+    reflect-metadata "^0.1.2"
+    source-map "^0.6.1"
+    tslib "^1.9.0"
+    yargs "13.1.0"
+
+"@angular/compiler@~8.2.1":
+  version "8.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.2.14.tgz#46db7a9d1c17f236126518ff26480c160d5a6183"
+  integrity sha512-ABZO4E7eeFA1QyJ2trDezxeQM5ZFa1dXw1Mpl/+1vuXDKNjJgNyWYwKp/NwRkLmrsuV0yv4UDCDe4kJOGbPKnw==
+  dependencies:
+    tslib "^1.9.0"
+
+"@angular/core@~8.2.1":
+  version "8.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.2.14.tgz#35566f5b19480369229477e7e0e0fde740bd5204"
+  integrity sha512-zeePkigi+hPh3rN7yoNENG/YUBUsIvUXdxx+AZq+QPaFeKEA2FBSrKn36ojHFrdJUjKzl0lPMEiGC2b6a6bo6g==
+  dependencies:
+    tslib "^1.9.0"
+
+"@angular/forms@~8.2.1":
+  version "8.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-8.2.14.tgz#7d357c346a3884881beb044c50ec4a09d3d7ee8e"
+  integrity sha512-zhyKL3CFIqcyHJ/TQF/h1OZztK611a6rxuPHCrt/5Sn1SuBTJJQ1pPTkOYIDy6IrCrtyANc8qB6P17Mao71DNQ==
+  dependencies:
+    tslib "^1.9.0"
+
+"@angular/language-service@~8.2.1":
+  version "8.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-8.2.14.tgz#e18b27a6841577ce489ad31540150da5a444ca37"
+  integrity sha512-7EhN9JJbAJcH2xCa+rIOmekjiEuB0qwPdHuD5qn/wwMfRzMZo+Db4hHbR9KHrLH6H82PTwYKye/LLpDaZqoHOA==
+
+"@angular/material-moment-adapter@^9.2.4":
+  version "9.2.4"
+  resolved "https://registry.yarnpkg.com/@angular/material-moment-adapter/-/material-moment-adapter-9.2.4.tgz#4d3cfcd5c2b8914bcca4e70a46cf7ec127c14b40"
+  integrity sha512-V5xkL+YUec3nDGRaJB72mJTUtdUvGaG9WCQEdr45viDWFGjQaEpS6msuScBLp0PwsN8Wt0n69eZg0ULgxPBa5g==
+
+"@angular/material@~8.1.2":
+  version "8.1.4"
+  resolved "https://registry.yarnpkg.com/@angular/material/-/material-8.1.4.tgz#8bda747bb023af8ccce2c2d3e9e8dc25f05b3605"
+  integrity sha512-HV1qU63MaOtAc+cWg21Y2ygQKdEDjsGQ/3d3qym9sfR0xU2vvY7OG6gH48BfPeU63oMYxQkhxfoGP8wWMXSU1w==
+  dependencies:
+    tslib "^1.7.1"
+
+"@angular/platform-browser-dynamic@~8.2.1":
+  version "8.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.2.14.tgz#4439a79fe10ec45170e6940a28835e9ff0918950"
+  integrity sha512-mO2JPR5kLU/A3AQngy9+R/Q5gaF9csMStBQjwsCRI0wNtlItOIGL6+wTYpiTuh/ux+WVN1F2sLcEYU4Zf1ud9A==
+  dependencies:
+    tslib "^1.9.0"
+
+"@angular/platform-browser@~8.2.1":
+  version "8.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.2.14.tgz#31f082e8ba977f9b89964d721c38cbc32ce0e433"
+  integrity sha512-MtJptptyKzsE37JZ2VB/tI4cvMrdAH+cT9pMBYZd66YSZfKjIj5s+AZo7z8ncoskQSB1o3HMfDjSK7QXGx1mLQ==
+  dependencies:
+    tslib "^1.9.0"
+
+"@angular/pwa@^0.803.14":
+  version "0.803.29"
+  resolved "https://registry.yarnpkg.com/@angular/pwa/-/pwa-0.803.29.tgz#3421745973793acf0c921fb85a16cf5417948be6"
+  integrity sha512-DR8qRfgkR3Dj8HKUnnW+17/f/uCPe7J8l8PC9VSC69Jqzc9XSsKZNfgrL3svaflIeU9+2YQ+5x5mJOL1f2m/Cg==
+  dependencies:
+    "@angular-devkit/core" "8.3.29"
+    "@angular-devkit/schematics" "8.3.29"
+    "@schematics/angular" "8.3.29"
+    parse5-html-rewriting-stream "5.1.0"
+
+"@angular/router@~8.2.1":
+  version "8.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.2.14.tgz#5f9f9707710983c2143aead79dcd2da520ae3eb8"
+  integrity sha512-DHA2BhODqV7F0g6ZKgFaZgbsqzHHWRcfWchCOrOVKu2rYiKUTwwHVLBgZAhrpNeinq2pWanVYSIhMr7wy+LfEA==
+  dependencies:
+    tslib "^1.9.0"
+
+"@angular/service-worker@~8.2.1":
+  version "8.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-8.2.14.tgz#fbea3899863cfa09196ce69fa470b163f25666ad"
+  integrity sha512-Xv1ES5bXDRxPJ5uyRqeKw6mGKaJVzKK0oFcR0mr4OSdyLXGZ+x6fC2S/QcLy4ugpb64fyEksrnHhHjeMVzGh2Q==
+  dependencies:
+    tslib "^1.9.0"
+
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"
+  integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==
+  dependencies:
+    "@babel/highlight" "^7.12.13"
+
+"@babel/compat-data@^7.13.15", "@babel/compat-data@^7.14.0", "@babel/compat-data@^7.8.6":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.0.tgz#a901128bce2ad02565df95e6ecbf195cf9465919"
+  integrity sha512-vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q==
+
+"@babel/core@7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.7.tgz#b69017d221ccdeb203145ae9da269d72cf102f3b"
+  integrity sha512-rBlqF3Yko9cynC5CCFy6+K/w2N+Sq/ff2BPy+Krp7rHlABIr5epbA7OxVeKoMHB39LZOp1UY5SuLjy6uWi35yA==
+  dependencies:
+    "@babel/code-frame" "^7.8.3"
+    "@babel/generator" "^7.8.7"
+    "@babel/helpers" "^7.8.4"
+    "@babel/parser" "^7.8.7"
+    "@babel/template" "^7.8.6"
+    "@babel/traverse" "^7.8.6"
+    "@babel/types" "^7.8.7"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.1"
+    json5 "^2.1.0"
+    lodash "^4.17.13"
+    resolve "^1.3.2"
+    semver "^5.4.1"
+    source-map "^0.5.0"
+
+"@babel/core@^7.7.5":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.2.tgz#54e45334ffc0172048e5c93ded36461d3ad4c417"
+  integrity sha512-OgC1mON+l4U4B4wiohJlQNUU3H73mpTyYY3j/c8U9dr9UagGGSm+WFpzjy/YLdoyjiG++c1kIDgxCo/mLwQJeQ==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@babel/generator" "^7.14.2"
+    "@babel/helper-compilation-targets" "^7.13.16"
+    "@babel/helper-module-transforms" "^7.14.2"
+    "@babel/helpers" "^7.14.0"
+    "@babel/parser" "^7.14.2"
+    "@babel/template" "^7.12.13"
+    "@babel/traverse" "^7.14.2"
+    "@babel/types" "^7.14.2"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.1.2"
+    semver "^6.3.0"
+    source-map "^0.5.0"
+
+"@babel/generator@^7.14.2", "@babel/generator@^7.4.0", "@babel/generator@^7.8.7":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.2.tgz#d5773e8b557d421fd6ce0d5efa5fd7fc22567c30"
+  integrity sha512-OnADYbKrffDVai5qcpkMxQ7caomHOoEwjkouqnN2QhydAjowFAZcsdecFIRUBdb+ZcruwYE4ythYmF1UBZU5xQ==
+  dependencies:
+    "@babel/types" "^7.14.2"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
+
+"@babel/helper-annotate-as-pure@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz#0f58e86dfc4bb3b1fcd7db806570e177d439b6ab"
+  integrity sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw==
+  dependencies:
+    "@babel/types" "^7.12.13"
+
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz#6bc20361c88b0a74d05137a65cac8d3cbf6f61fc"
+  integrity sha512-CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA==
+  dependencies:
+    "@babel/helper-explode-assignable-expression" "^7.12.13"
+    "@babel/types" "^7.12.13"
+
+"@babel/helper-compilation-targets@^7.13.16", "@babel/helper-compilation-targets@^7.8.7":
+  version "7.13.16"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz#6e91dccf15e3f43e5556dffe32d860109887563c"
+  integrity sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA==
+  dependencies:
+    "@babel/compat-data" "^7.13.15"
+    "@babel/helper-validator-option" "^7.12.17"
+    browserslist "^4.14.5"
+    semver "^6.3.0"
+
+"@babel/helper-create-regexp-features-plugin@^7.12.13":
+  version "7.12.17"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz#a2ac87e9e319269ac655b8d4415e94d38d663cb7"
+  integrity sha512-p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.12.13"
+    regexpu-core "^4.7.1"
+
+"@babel/helper-explode-assignable-expression@^7.12.13":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz#17b5c59ff473d9f956f40ef570cf3a76ca12657f"
+  integrity sha512-qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA==
+  dependencies:
+    "@babel/types" "^7.13.0"
+
+"@babel/helper-function-name@^7.12.13", "@babel/helper-function-name@^7.14.2":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.2.tgz#397688b590760b6ef7725b5f0860c82427ebaac2"
+  integrity sha512-NYZlkZRydxw+YT56IlhIcS8PAhb+FEUiOzuhFTfqDyPmzAhRge6ua0dQYT/Uh0t/EDHq05/i+e5M2d4XvjgarQ==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.12.13"
+    "@babel/template" "^7.12.13"
+    "@babel/types" "^7.14.2"
+
+"@babel/helper-get-function-arity@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583"
+  integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==
+  dependencies:
+    "@babel/types" "^7.12.13"
+
+"@babel/helper-hoist-variables@^7.13.0":
+  version "7.13.16"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.16.tgz#1b1651249e94b51f8f0d33439843e33e39775b30"
+  integrity sha512-1eMtTrXtrwscjcAeO4BVK+vvkxaLJSPFz1w1KLawz6HLNi9bPFGBNwwDyVfiu1Tv/vRRFYfoGaKhmAQPGPn5Wg==
+  dependencies:
+    "@babel/traverse" "^7.13.15"
+    "@babel/types" "^7.13.16"
+
+"@babel/helper-member-expression-to-functions@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz#dfe368f26d426a07299d8d6513821768216e6d72"
+  integrity sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw==
+  dependencies:
+    "@babel/types" "^7.13.12"
+
+"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.13.12", "@babel/helper-module-imports@^7.8.3":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz#c6a369a6f3621cb25da014078684da9196b61977"
+  integrity sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==
+  dependencies:
+    "@babel/types" "^7.13.12"
+
+"@babel/helper-module-transforms@^7.13.0", "@babel/helper-module-transforms@^7.14.0", "@babel/helper-module-transforms@^7.14.2":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.2.tgz#ac1cc30ee47b945e3e0c4db12fa0c5389509dfe5"
+  integrity sha512-OznJUda/soKXv0XhpvzGWDnml4Qnwp16GN+D/kZIdLsWoHj05kyu8Rm5kXmMef+rVJZ0+4pSGLkeixdqNUATDA==
+  dependencies:
+    "@babel/helper-module-imports" "^7.13.12"
+    "@babel/helper-replace-supers" "^7.13.12"
+    "@babel/helper-simple-access" "^7.13.12"
+    "@babel/helper-split-export-declaration" "^7.12.13"
+    "@babel/helper-validator-identifier" "^7.14.0"
+    "@babel/template" "^7.12.13"
+    "@babel/traverse" "^7.14.2"
+    "@babel/types" "^7.14.2"
+
+"@babel/helper-optimise-call-expression@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea"
+  integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==
+  dependencies:
+    "@babel/types" "^7.12.13"
+
+"@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af"
+  integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==
+
+"@babel/helper-remap-async-to-generator@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz#376a760d9f7b4b2077a9dd05aa9c3927cadb2209"
+  integrity sha512-pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.12.13"
+    "@babel/helper-wrap-function" "^7.13.0"
+    "@babel/types" "^7.13.0"
+
+"@babel/helper-replace-supers@^7.12.13", "@babel/helper-replace-supers@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz#6442f4c1ad912502481a564a7386de0c77ff3804"
+  integrity sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.13.12"
+    "@babel/helper-optimise-call-expression" "^7.12.13"
+    "@babel/traverse" "^7.13.0"
+    "@babel/types" "^7.13.12"
+
+"@babel/helper-simple-access@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz#dd6c538afb61819d205a012c31792a39c7a5eaf6"
+  integrity sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA==
+  dependencies:
+    "@babel/types" "^7.13.12"
+
+"@babel/helper-skip-transparent-expression-wrappers@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz#462dc63a7e435ade8468385c63d2b84cce4b3cbf"
+  integrity sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==
+  dependencies:
+    "@babel/types" "^7.12.1"
+
+"@babel/helper-split-export-declaration@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05"
+  integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==
+  dependencies:
+    "@babel/types" "^7.12.13"
+
+"@babel/helper-validator-identifier@^7.12.11", "@babel/helper-validator-identifier@^7.14.0":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz#d26cad8a47c65286b15df1547319a5d0bcf27288"
+  integrity sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==
+
+"@babel/helper-validator-option@^7.12.17":
+  version "7.12.17"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"
+  integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==
+
+"@babel/helper-wrap-function@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz#bdb5c66fda8526ec235ab894ad53a1235c79fcc4"
+  integrity sha512-1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA==
+  dependencies:
+    "@babel/helper-function-name" "^7.12.13"
+    "@babel/template" "^7.12.13"
+    "@babel/traverse" "^7.13.0"
+    "@babel/types" "^7.13.0"
+
+"@babel/helpers@^7.14.0", "@babel/helpers@^7.8.4":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.0.tgz#ea9b6be9478a13d6f961dbb5f36bf75e2f3b8f62"
+  integrity sha512-+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg==
+  dependencies:
+    "@babel/template" "^7.12.13"
+    "@babel/traverse" "^7.14.0"
+    "@babel/types" "^7.14.0"
+
+"@babel/highlight@^7.12.13":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz#3197e375711ef6bf834e67d0daec88e4f46113cf"
+  integrity sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.14.0"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
+"@babel/parser@^7.12.13", "@babel/parser@^7.14.2", "@babel/parser@^7.4.3", "@babel/parser@^7.8.7":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.2.tgz#0c1680aa44ad4605b16cbdcc5c341a61bde9c746"
+  integrity sha512-IoVDIHpsgE/fu7eXBeRWt8zLbDrSvD7H1gpomOkPpBoEN8KCruCqSDdqo8dddwQQrui30KSvQBaMUOJiuFu6QQ==
+
+"@babel/plugin-proposal-async-generator-functions@^7.8.3":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.2.tgz#3a2085abbf5d5f962d480dbc81347385ed62eb1e"
+  integrity sha512-b1AM4F6fwck4N8ItZ/AtC4FP/cqZqmKRQ4FaTDutwSYyjuhtvsGEMLK4N/ztV/ImP40BjIDyMgBQAeAMsQYVFQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-remap-async-to-generator" "^7.13.0"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+
+"@babel/plugin-proposal-dynamic-import@^7.8.3":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.2.tgz#01ebabd7c381cff231fa43e302939a9de5be9d9f"
+  integrity sha512-oxVQZIWFh91vuNEMKltqNsKLFWkOIyJc95k2Gv9lWVyDfPUQGSSlbDEgWuJUU1afGE9WwlzpucMZ3yDRHIItkA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+
+"@babel/plugin-proposal-json-strings@^7.8.3":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.2.tgz#830b4e2426a782e8b2878fbfe2cba85b70cbf98c"
+  integrity sha512-w2DtsfXBBJddJacXMBhElGEYqCZQqN99Se1qeYn8DVLB33owlrlLftIbMzn5nz1OITfDVknXF433tBrLEAOEjA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.2.tgz#425b11dc62fc26939a2ab42cbba680bdf5734546"
+  integrity sha512-ebR0zU9OvI2N4qiAC38KIAK75KItpIPTpAtd2r4OZmMFeKbKJpUFLYP2EuDut82+BmYi8sz42B+TfTptJ9iG5Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+
+"@babel/plugin-proposal-object-rest-spread@^7.8.3":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.2.tgz#e17d418f81cc103fedd4ce037e181c8056225abc"
+  integrity sha512-hBIQFxwZi8GIp934+nj5uV31mqclC1aYDhctDu5khTi9PCCUOczyy0b34W0oE9U/eJXiqQaKyVsmjeagOaSlbw==
+  dependencies:
+    "@babel/compat-data" "^7.14.0"
+    "@babel/helper-compilation-targets" "^7.13.16"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.14.2"
+
+"@babel/plugin-proposal-optional-catch-binding@^7.8.3":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.2.tgz#150d4e58e525b16a9a1431bd5326c4eed870d717"
+  integrity sha512-XtkJsmJtBaUbOxZsNk0Fvrv8eiqgneug0A6aqLFZ4TSkar2L5dSXWcnUKHgmjJt49pyB/6ZHvkr3dPgl9MOWRQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+
+"@babel/plugin-proposal-optional-chaining@^7.8.3":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.2.tgz#df8171a8b9c43ebf4c1dabe6311b432d83e1b34e"
+  integrity sha512-qQByMRPwMZJainfig10BoaDldx/+VDtNcrA7qdNaEOAj6VXud+gfrkA8j4CRAU5HjnWREXqIpSpH30qZX1xivA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+
+"@babel/plugin-proposal-unicode-property-regex@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz#bebde51339be829c17aaaaced18641deb62b39ba"
+  integrity sha512-XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-syntax-async-generators@^7.8.0", "@babel/plugin-syntax-async-generators@^7.8.4":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
+  integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-dynamic-import@^7.8.0", "@babel/plugin-syntax-dynamic-import@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
+  integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-json-strings@^7.8.0", "@babel/plugin-syntax-json-strings@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
+  integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
+  integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
+  integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-optional-catch-binding@^7.8.0", "@babel/plugin-syntax-optional-catch-binding@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
+  integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-optional-chaining@^7.8.0", "@babel/plugin-syntax-optional-chaining@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
+  integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-top-level-await@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178"
+  integrity sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-arrow-functions@^7.8.3":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz#10a59bebad52d637a027afa692e8d5ceff5e3dae"
+  integrity sha512-96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+
+"@babel/plugin-transform-async-to-generator@^7.8.3":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz#8e112bf6771b82bf1e974e5e26806c5c99aa516f"
+  integrity sha512-3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg==
+  dependencies:
+    "@babel/helper-module-imports" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-remap-async-to-generator" "^7.13.0"
+
+"@babel/plugin-transform-block-scoped-functions@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz#a9bf1836f2a39b4eb6cf09967739de29ea4bf4c4"
+  integrity sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-block-scoping@^7.8.3":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.2.tgz#761cb12ab5a88d640ad4af4aa81f820e6b5fdf5c"
+  integrity sha512-neZZcP19NugZZqNwMTH+KoBjx5WyvESPSIOQb4JHpfd+zPfqcH65RMu5xJju5+6q/Y2VzYrleQTr+b6METyyxg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+
+"@babel/plugin-transform-classes@^7.8.6":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.2.tgz#3f1196c5709f064c252ad056207d87b7aeb2d03d"
+  integrity sha512-7oafAVcucHquA/VZCsXv/gmuiHeYd64UJyyTYU+MPfNu0KeNlxw06IeENBO8bJjXVbolu+j1MM5aKQtH1OMCNg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.12.13"
+    "@babel/helper-function-name" "^7.14.2"
+    "@babel/helper-optimise-call-expression" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-replace-supers" "^7.13.12"
+    "@babel/helper-split-export-declaration" "^7.12.13"
+    globals "^11.1.0"
+
+"@babel/plugin-transform-computed-properties@^7.8.3":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz#845c6e8b9bb55376b1fa0b92ef0bdc8ea06644ed"
+  integrity sha512-RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+
+"@babel/plugin-transform-destructuring@^7.8.3":
+  version "7.13.17"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.17.tgz#678d96576638c19d5b36b332504d3fd6e06dea27"
+  integrity sha512-UAUqiLv+uRLO+xuBKKMEpC+t7YRNVRqBsWWq1yKXbBZBje/t3IXCiSinZhjn/DC3qzBfICeYd2EFGEbHsh5RLA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+
+"@babel/plugin-transform-dotall-regex@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz#3f1601cc29905bfcb67f53910f197aeafebb25ad"
+  integrity sha512-foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-duplicate-keys@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz#6f06b87a8b803fd928e54b81c258f0a0033904de"
+  integrity sha512-NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-exponentiation-operator@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz#4d52390b9a273e651e4aba6aee49ef40e80cd0a1"
+  integrity sha512-fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA==
+  dependencies:
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-for-of@^7.8.6":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz#c799f881a8091ac26b54867a845c3e97d2696062"
+  integrity sha512-IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+
+"@babel/plugin-transform-function-name@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz#bb024452f9aaed861d374c8e7a24252ce3a50051"
+  integrity sha512-6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ==
+  dependencies:
+    "@babel/helper-function-name" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-literals@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz#2ca45bafe4a820197cf315794a4d26560fe4bdb9"
+  integrity sha512-FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-member-expression-literals@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz#5ffa66cd59b9e191314c9f1f803b938e8c081e40"
+  integrity sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-modules-amd@^7.8.3":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.2.tgz#6622806fe1a7c07a1388444222ef9535f2ca17b0"
+  integrity sha512-hPC6XBswt8P3G2D1tSV2HzdKvkqOpmbyoy+g73JG0qlF/qx2y3KaMmXb1fLrpmWGLZYA0ojCvaHdzFWjlmV+Pw==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.14.2"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
+"@babel/plugin-transform-modules-commonjs@^7.8.3":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.0.tgz#52bc199cb581e0992edba0f0f80356467587f161"
+  integrity sha512-EX4QePlsTaRZQmw9BsoPeyh5OCtRGIhwfLquhxGp5e32w+dyL8htOcDwamlitmNFK6xBZYlygjdye9dbd9rUlQ==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.14.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-simple-access" "^7.13.12"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
+"@babel/plugin-transform-modules-systemjs@^7.8.3":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz#6d066ee2bff3c7b3d60bf28dec169ad993831ae3"
+  integrity sha512-hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A==
+  dependencies:
+    "@babel/helper-hoist-variables" "^7.13.0"
+    "@babel/helper-module-transforms" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-validator-identifier" "^7.12.11"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
+"@babel/plugin-transform-modules-umd@^7.8.3":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.0.tgz#2f8179d1bbc9263665ce4a65f305526b2ea8ac34"
+  integrity sha512-nPZdnWtXXeY7I87UZr9VlsWme3Y0cfFFE41Wbxz4bbaexAjNMInXPFUpRRUJ8NoMm0Cw+zxbqjdPmLhcjfazMw==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.14.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+
+"@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz#2213725a5f5bbbe364b50c3ba5998c9599c5c9d9"
+  integrity sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
+
+"@babel/plugin-transform-new-target@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz#e22d8c3af24b150dd528cbd6e685e799bf1c351c"
+  integrity sha512-/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-object-super@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz#b4416a2d63b8f7be314f3d349bd55a9c1b5171f7"
+  integrity sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-replace-supers" "^7.12.13"
+
+"@babel/plugin-transform-parameters@^7.14.2", "@babel/plugin-transform-parameters@^7.8.7":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.2.tgz#e4290f72e0e9e831000d066427c4667098decc31"
+  integrity sha512-NxoVmA3APNCC1JdMXkdYXuQS+EMdqy0vIwyDHeKHiJKRxmp1qGSdb0JLEIoPRhkx6H/8Qi3RJ3uqOCYw8giy9A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+
+"@babel/plugin-transform-property-literals@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz#4e6a9e37864d8f1b3bc0e2dce7bf8857db8b1a81"
+  integrity sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-regenerator@^7.8.7":
+  version "7.13.15"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.13.15.tgz#e5eb28945bf8b6563e7f818945f966a8d2997f39"
+  integrity sha512-Bk9cOLSz8DiurcMETZ8E2YtIVJbFCPGW28DJWUakmyVWtQSm6Wsf0p4B4BfEr/eL2Nkhe/CICiUiMOCi1TPhuQ==
+  dependencies:
+    regenerator-transform "^0.14.2"
+
+"@babel/plugin-transform-reserved-words@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz#7d9988d4f06e0fe697ea1d9803188aa18b472695"
+  integrity sha512-xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-shorthand-properties@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz#db755732b70c539d504c6390d9ce90fe64aff7ad"
+  integrity sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-spread@^7.8.3":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz#84887710e273c1815ace7ae459f6f42a5d31d5fd"
+  integrity sha512-V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
+
+"@babel/plugin-transform-sticky-regex@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz#760ffd936face73f860ae646fb86ee82f3d06d1f"
+  integrity sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-template-literals@^7.8.3":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz#a36049127977ad94438dee7443598d1cefdf409d"
+  integrity sha512-d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+
+"@babel/plugin-transform-typeof-symbol@^7.8.4":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz#785dd67a1f2ea579d9c2be722de8c84cb85f5a7f"
+  integrity sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-unicode-regex@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz#b52521685804e155b1202e83fc188d34bb70f5ac"
+  integrity sha512-mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/preset-env@7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.8.7.tgz#1fc7d89c7f75d2d70c2b6768de6c2e049b3cb9db"
+  integrity sha512-BYftCVOdAYJk5ASsznKAUl53EMhfBbr8CJ1X+AJLfGPscQkwJFiaV/Wn9DPH/7fzm2v6iRYJKYHSqyynTGw0nw==
+  dependencies:
+    "@babel/compat-data" "^7.8.6"
+    "@babel/helper-compilation-targets" "^7.8.7"
+    "@babel/helper-module-imports" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-proposal-async-generator-functions" "^7.8.3"
+    "@babel/plugin-proposal-dynamic-import" "^7.8.3"
+    "@babel/plugin-proposal-json-strings" "^7.8.3"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.8.3"
+    "@babel/plugin-proposal-object-rest-spread" "^7.8.3"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.8.3"
+    "@babel/plugin-proposal-optional-chaining" "^7.8.3"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.8.3"
+    "@babel/plugin-syntax-async-generators" "^7.8.0"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
+    "@babel/plugin-syntax-json-strings" "^7.8.0"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
+    "@babel/plugin-syntax-top-level-await" "^7.8.3"
+    "@babel/plugin-transform-arrow-functions" "^7.8.3"
+    "@babel/plugin-transform-async-to-generator" "^7.8.3"
+    "@babel/plugin-transform-block-scoped-functions" "^7.8.3"
+    "@babel/plugin-transform-block-scoping" "^7.8.3"
+    "@babel/plugin-transform-classes" "^7.8.6"
+    "@babel/plugin-transform-computed-properties" "^7.8.3"
+    "@babel/plugin-transform-destructuring" "^7.8.3"
+    "@babel/plugin-transform-dotall-regex" "^7.8.3"
+    "@babel/plugin-transform-duplicate-keys" "^7.8.3"
+    "@babel/plugin-transform-exponentiation-operator" "^7.8.3"
+    "@babel/plugin-transform-for-of" "^7.8.6"
+    "@babel/plugin-transform-function-name" "^7.8.3"
+    "@babel/plugin-transform-literals" "^7.8.3"
+    "@babel/plugin-transform-member-expression-literals" "^7.8.3"
+    "@babel/plugin-transform-modules-amd" "^7.8.3"
+    "@babel/plugin-transform-modules-commonjs" "^7.8.3"
+    "@babel/plugin-transform-modules-systemjs" "^7.8.3"
+    "@babel/plugin-transform-modules-umd" "^7.8.3"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3"
+    "@babel/plugin-transform-new-target" "^7.8.3"
+    "@babel/plugin-transform-object-super" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.8.7"
+    "@babel/plugin-transform-property-literals" "^7.8.3"
+    "@babel/plugin-transform-regenerator" "^7.8.7"
+    "@babel/plugin-transform-reserved-words" "^7.8.3"
+    "@babel/plugin-transform-shorthand-properties" "^7.8.3"
+    "@babel/plugin-transform-spread" "^7.8.3"
+    "@babel/plugin-transform-sticky-regex" "^7.8.3"
+    "@babel/plugin-transform-template-literals" "^7.8.3"
+    "@babel/plugin-transform-typeof-symbol" "^7.8.4"
+    "@babel/plugin-transform-unicode-regex" "^7.8.3"
+    "@babel/types" "^7.8.7"
+    browserslist "^4.8.5"
+    core-js-compat "^3.6.2"
+    invariant "^2.2.2"
+    levenary "^1.1.1"
+    semver "^5.5.0"
+
+"@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.0.tgz#46794bc20b612c5f75e62dd071e24dfd95f1cbe6"
+  integrity sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
+"@babel/runtime@^7.14.0":
+  version "7.18.3"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.3.tgz#c7b654b57f6f63cf7f8b418ac9ca04408c4579f4"
+  integrity sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
+"@babel/template@^7.12.13", "@babel/template@^7.4.0", "@babel/template@^7.8.6":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327"
+  integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@babel/parser" "^7.12.13"
+    "@babel/types" "^7.12.13"
+
+"@babel/traverse@^7.13.0", "@babel/traverse@^7.13.15", "@babel/traverse@^7.14.0", "@babel/traverse@^7.14.2", "@babel/traverse@^7.4.3", "@babel/traverse@^7.8.6":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.2.tgz#9201a8d912723a831c2679c7ebbf2fe1416d765b"
+  integrity sha512-TsdRgvBFHMyHOOzcP9S6QU0QQtjxlRpEYOy3mcCO5RgmC305ki42aSAmfZEMSSYBla2oZ9BMqYlncBaKmD/7iA==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@babel/generator" "^7.14.2"
+    "@babel/helper-function-name" "^7.14.2"
+    "@babel/helper-split-export-declaration" "^7.12.13"
+    "@babel/parser" "^7.14.2"
+    "@babel/types" "^7.14.2"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
+"@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.16", "@babel/types@^7.14.0", "@babel/types@^7.14.2", "@babel/types@^7.4.0", "@babel/types@^7.8.7":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.2.tgz#4208ae003107ef8a057ea8333e56eb64d2f6a2c3"
+  integrity sha512-SdjAG/3DikRHpUOjxZgnkbR11xUlyDMUFJdvnIgZEE16mqmY0BINMmc4//JMJglEmn6i7sq6p+mGrFWyZ98EEw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.14.0"
+    to-fast-properties "^2.0.0"
+
+"@egjs/hammerjs@^2.0.15":
+  version "2.0.17"
+  resolved "https://registry.yarnpkg.com/@egjs/hammerjs/-/hammerjs-2.0.17.tgz#5dc02af75a6a06e4c2db0202cae38c9263895124"
+  integrity sha512-XQsZgjm2EcVUiZQf11UBJQfmZeEmOW8DpI1gsFeln6w0ae0ii4dMQEQ0kjl6DspdWX1aGY1/loyXnP0JS06e/A==
+  dependencies:
+    "@types/hammerjs" "^2.0.36"
+
+"@fimbul/bifrost@^0.21.0":
+  version "0.21.0"
+  resolved "https://registry.yarnpkg.com/@fimbul/bifrost/-/bifrost-0.21.0.tgz#d0fafa25938fda475657a6a1e407a21bbe02c74e"
+  integrity sha512-ou8VU+nTmOW1jeg+FT+sn+an/M0Xb9G16RucrfhjXGWv1Q97kCoM5CG9Qj7GYOSdu7km72k7nY83Eyr53Bkakg==
+  dependencies:
+    "@fimbul/ymir" "^0.21.0"
+    get-caller-file "^2.0.0"
+    tslib "^1.8.1"
+    tsutils "^3.5.0"
+
+"@fimbul/ymir@^0.21.0":
+  version "0.21.0"
+  resolved "https://registry.yarnpkg.com/@fimbul/ymir/-/ymir-0.21.0.tgz#8525726787aceeafd4e199472c0d795160b5d4a1"
+  integrity sha512-T/y7WqPsm4n3zhT08EpB5sfdm2Kvw3gurAxr2Lr5dQeLi8ZsMlNT/Jby+ZmuuAAd1PnXYzKp+2SXgIkQIIMCUg==
+  dependencies:
+    inversify "^5.0.0"
+    reflect-metadata "^0.1.12"
+    tslib "^1.8.1"
+
+"@fullhuman/postcss-purgecss@^2.1.2":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@fullhuman/postcss-purgecss/-/postcss-purgecss-2.3.0.tgz#50a954757ec78696615d3e118e3fee2d9291882e"
+  integrity sha512-qnKm5dIOyPGJ70kPZ5jiz0I9foVOic0j+cOzNDoo8KoCf6HjicIZ99UfO2OmE7vCYSKAAepEwJtNzpiiZAh9xw==
+  dependencies:
+    postcss "7.0.32"
+    purgecss "^2.3.0"
+
+"@istanbuljs/schema@^0.1.2":
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
+  integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
+
+"@ngtools/webpack@8.3.29":
+  version "8.3.29"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-8.3.29.tgz#7b6984cdccd633dd687e9413a89a2d9e1360f76c"
+  integrity sha512-7uB7dlAHR7RmxcQCYidnWRR1tFRJq7CzI+MM3725ibAvi4HnM5viC/HnKRTK7V+3iS1C0l0u0Gyo/769NsUDTQ==
+  dependencies:
+    "@angular-devkit/core" "8.3.29"
+    enhanced-resolve "4.1.0"
+    rxjs "6.4.0"
+    tree-kill "1.2.2"
+    webpack-sources "1.4.3"
+
+"@nodelib/fs.scandir@2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69"
+  integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==
+  dependencies:
+    "@nodelib/fs.stat" "2.0.4"
+    run-parallel "^1.1.9"
+
+"@nodelib/fs.stat@2.0.4", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655"
+  integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==
+
+"@nodelib/fs.walk@^1.2.3":
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063"
+  integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==
+  dependencies:
+    "@nodelib/fs.scandir" "2.1.4"
+    fastq "^1.6.0"
+
+"@npmcli/move-file@^1.0.1":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
+  integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==
+  dependencies:
+    mkdirp "^1.0.4"
+    rimraf "^3.0.2"
+
+"@polka/url@^1.0.0-next.20":
+  version "1.0.0-next.21"
+  resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1"
+  integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==
+
+"@popperjs/core@^2.4.0":
+  version "2.9.2"
+  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.2.tgz#adea7b6953cbb34651766b0548468e743c6a2353"
+  integrity sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==
+
+"@project-sunbird/telemetry-sdk@0.0.26":
+  version "0.0.26"
+  resolved "https://registry.yarnpkg.com/@project-sunbird/telemetry-sdk/-/telemetry-sdk-0.0.26.tgz#15a7776e0d94da3c844161b1400612303756a830"
+  integrity sha512-8r8tf+YN+z8A4KHBmL8/wxDIKGkASDHMMxyhlI9/iWv83sueoN5qHB6QnqgtIRyEdFjt4Tum5u18/oB71Bb0PQ==
+  dependencies:
+    grunt-karma "^0.12.2"
+    karma "^3.0.0"
+
+"@schematics/angular@8.3.29":
+  version "8.3.29"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-8.3.29.tgz#da747539230dae16111c56422339c02dbb17681d"
+  integrity sha512-If+UhCsQzCgnQymiiF8dQRoic34+RgJ6rV0n4k7Tm4N2xNYJOG7ajjzKM7PIeafsF50FKnFP8dqaNGxCMyq5Ew==
+  dependencies:
+    "@angular-devkit/core" "8.3.29"
+    "@angular-devkit/schematics" "8.3.29"
+
+"@schematics/update@0.803.29":
+  version "0.803.29"
+  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.803.29.tgz#ad3c9bfe8c6d877a0ea692ae4760f0d72f3e0cc9"
+  integrity sha512-Syf6h6DYeu1WU9aLihMwIgVASpcHCxUYqhZyHfQABiK8NkdlZ+KAp4cOxihsZyDqIJNLWON+0/FLPAQF3BXh5Q==
+  dependencies:
+    "@angular-devkit/core" "8.3.29"
+    "@angular-devkit/schematics" "8.3.29"
+    "@yarnpkg/lockfile" "1.1.0"
+    ini "1.3.5"
+    pacote "9.5.5"
+    rxjs "6.4.0"
+    semver "6.3.0"
+    semver-intersect "1.4.0"
+
+"@sindresorhus/is@^0.14.0":
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
+  integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
+
+"@sunbird-cb/collection@1.0.15":
+  version "1.0.15"
+  resolved "https://registry.yarnpkg.com/@sunbird-cb/collection/-/collection-1.0.15.tgz#9865fc0f4a545542b316553fdb920d3a3445df37"
+  integrity sha512-2KvrZXKJ/KgTwOel6SoK4poTQG2UjJDlBminQ2Y8o7n1FDKRUslpYpYC1PqXQFbGAQDTI2sbJybVMsHxeXv6Bg==
+  dependencies:
+    tslib "^1.9.0"
+
+"@sunbird-cb/design-system@0.0.1":
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/@sunbird-cb/design-system/-/design-system-0.0.1.tgz#66795a90e6a3fe3609cd574e694ad296fdc9a1a5"
+  integrity sha512-GYfnfpNfzZjnU5Ss+xfSdVbvyek97Yq8cDVsfT4+R0MgsIYnI4gqx7G0Qvx9caZYgb3eoE6wlsyb0K2aWyO+UQ==
+
+"@sunbird-cb/rain-dashboards@^0.2.3":
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/@sunbird-cb/rain-dashboards/-/rain-dashboards-0.2.5.tgz#686e3ddb6840c13a2101ff4f1172f8c868956653"
+  integrity sha512-+ZltJsJbezZVJC2BD5EnFnziMlMOnzZe2RZtcocal44793F4ugkgCt2irffYW5G/VvvvhjGh447LS+IZkRK1wg==
+  dependencies:
+    tslib "^1.9.0"
+
+"@sunbird-cb/resolver@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@sunbird-cb/resolver/-/resolver-1.0.0.tgz#30e5350cbd54af259cdb279ed79bdacad6fd2650"
+  integrity sha512-UJkXVT4LurSVcOg/M/mHdYagfsvLl9n1iLFnn8mzD7jwrjcGQorc2Cmrj1WBvKQuve7me3zMCcATD8UMCHv4Ug==
+  dependencies:
+    tslib "^1.9.0"
+
+"@sunbird-cb/utils@^1.0.12":
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/@sunbird-cb/utils/-/utils-1.0.12.tgz#a5c76678769bfd4858bce457a64946e7ebb55fd9"
+  integrity sha512-QkcVHXthZGDtaJWWQgYHXp8vaY/V/oCrR4xXNrKK0qeZJ5NlrwjqRiDoyVNziG37sNX0V/G0ejmqqTUSBG0Oew==
+  dependencies:
+    tslib "^1.9.0"
+
+"@szmarczak/http-timer@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
+  integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==
+  dependencies:
+    defer-to-connect "^1.0.1"
+
+"@types/chart.js@^2.7.48", "@types/chart.js@^2.7.56":
+  version "2.9.32"
+  resolved "https://registry.yarnpkg.com/@types/chart.js/-/chart.js-2.9.32.tgz#b17d9a8c41ad348183a2ce041ebdeef892998251"
+  integrity sha512-d45JiRQwEOlZiKwukjqmqpbqbYzUX2yrXdH9qVn6kXpPDsTYCo6YbfFOlnUaJ8S/DhJwbBJiLsMjKpW5oP8B2A==
+  dependencies:
+    moment "^2.10.2"
+
+"@types/d3-array@^1":
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/@types/d3-array/-/d3-array-1.2.8.tgz#b852381cb68e31e46bfa23ee70a383cbc6d62146"
+  integrity sha512-wWV0wT6oLUGprrOR5LMK7Dh8EBiondhnqINsvazv6UucYfTdb2oaFF4knlqzZV2RKB9ZC9G7G1Iojt8b/wolsw==
+
+"@types/d3-axis@^1":
+  version "1.0.14"
+  resolved "https://registry.yarnpkg.com/@types/d3-axis/-/d3-axis-1.0.14.tgz#4ff27eb94fab10efbda6c972e1fbb26ea696655b"
+  integrity sha512-wZAKX/dtFT5t5iuCaiU0QL0BWB19TE6h7C7kgfBVyoka7zidQWvf8E9zQTJ5bNPBQxd0+JmplNqwy1M8O8FOjA==
+  dependencies:
+    "@types/d3-selection" "^1"
+
+"@types/d3-brush@^1":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@types/d3-brush/-/d3-brush-1.1.4.tgz#0b5cc9c57476d0144b991228b44664e08494b7f3"
+  integrity sha512-2t8CgWaha9PsPdSZJ9m6Jl4awqf3DGIXek2e7gfheyfP2R0a/18MX+wuLHx+LyI1Ad7lxDsPWcswKD0XhQEjmg==
+  dependencies:
+    "@types/d3-selection" "^1"
+
+"@types/d3-chord@^1":
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/@types/d3-chord/-/d3-chord-1.0.10.tgz#4c14ca40f61b89a3c615d63f5a34fcc81390805c"
+  integrity sha512-U6YojfET6ITL1/bUJo+/Lh3pMV9XPAfOWwbshl3y3RlgAX9VO/Bxa13IMAylZIDY4VsA3Gkh29kZP1AcAeyoYA==
+
+"@types/d3-collection@*":
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/@types/d3-collection/-/d3-collection-1.0.10.tgz#bca161e336156968f267c077f7f2bfa8ff224e58"
+  integrity sha512-54Fdv8u5JbuXymtmXm2SYzi1x/Svt+jfWBU5junkhrCewL92VjqtCBDn97coBRVwVFmYNnVTNDyV8gQyPYfm+A==
+
+"@types/d3-color@^1":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@types/d3-color/-/d3-color-1.4.1.tgz#0d9746c84dfef28807b2989eed4f37b2575e1f33"
+  integrity sha512-xkPLi+gbgUU9ED6QX4g6jqYL2KCB0/3AlM+ncMGqn49OgH0gFMY/ITGqPF8HwEiLzJaC+2L0I+gNwBgABv1Pvg==
+
+"@types/d3-contour@^1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@types/d3-contour/-/d3-contour-1.3.1.tgz#589dc3eec14168eea7e31edd1e3bbe246cc9d626"
+  integrity sha512-wWwsM/3NfKTRBdH00cSf+XlsaHlNTkvH66PgDedobyvKQZ4sJrXXpr16LXvDnAal4B67v8JGrWDgyx6dqqKLuQ==
+  dependencies:
+    "@types/d3-array" "^1"
+    "@types/geojson" "*"
+
+"@types/d3-dispatch@^1":
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/@types/d3-dispatch/-/d3-dispatch-1.0.9.tgz#c5a180f1e251de853b399cfbfbb6dd7f8bf842ae"
+  integrity sha512-zJ44YgjqALmyps+II7b1mZLhrtfV/FOxw9owT87mrweGWcg+WK5oiJX2M3SYJ0XUAExBduarysfgbR11YxzojQ==
+
+"@types/d3-drag@^1":
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/@types/d3-drag/-/d3-drag-1.2.5.tgz#0b1b852cb41577075aa625ae6149379ea6c34dfd"
+  integrity sha512-7NeTnfolst1Js3Vs7myctBkmJWu6DMI3k597AaHUX98saHjHWJ6vouT83UrpE+xfbSceHV+8A0JgxuwgqgmqWw==
+  dependencies:
+    "@types/d3-selection" "^1"
+
+"@types/d3-dsv@^1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@types/d3-dsv/-/d3-dsv-1.2.1.tgz#1524fee9f19d689c2f76aa0e24e230762bf96994"
+  integrity sha512-LLmJmjiqp/fTNEdij5bIwUJ6P6TVNk5hKM9/uk5RPO2YNgEu9XvKO0dJ7Iqd3psEdmZN1m7gB1bOsjr4HmO2BA==
+
+"@types/d3-ease@^1":
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/@types/d3-ease/-/d3-ease-1.0.10.tgz#09910e8558439b6038a7ed620650e510394ffa6d"
+  integrity sha512-fMFTCzd8DOwruE9zlu2O8ci5ct+U5jkGcDS+cH+HCidnJlDs0MZ+TuSVCFtEzh4E5MasItwy+HvgoFtxPHa5Cw==
+
+"@types/d3-fetch@^1":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@types/d3-fetch/-/d3-fetch-1.2.2.tgz#b93bfe248b8b761af82f4dac57959c989f67da3e"
+  integrity sha512-rtFs92GugtV/NpiJQd0WsmGLcg52tIL0uF0bKbbJg231pR9JEb6HT4AUwrtuLq3lOeKdLBhsjV14qb0pMmd0Aw==
+  dependencies:
+    "@types/d3-dsv" "^1"
+
+"@types/d3-force@^1":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@types/d3-force/-/d3-force-1.2.2.tgz#6337a146dbdf2781f5dde5bb491a646fd03d7bc4"
+  integrity sha512-TN7KO7sk0tJauedIt0q20RQRFo4V3v97pJKO/TDK40X3LaPM1aXRM2+zFF+nRMtseEiszg4KffudhjR8a3+4cg==
+
+"@types/d3-format@^1":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@types/d3-format/-/d3-format-1.4.1.tgz#1e657a219e4b1e3931508a610d570bdec8ecdd9d"
+  integrity sha512-ss9G2snEKmp2In5Z3T0Jpqv8QaDBc2xHltBw83KjnV5B5w+Iwphbvq5ph/Xnu4d03fmmsdt+o1aWch379rxIbA==
+
+"@types/d3-geo@^1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@types/d3-geo/-/d3-geo-1.12.1.tgz#bec8692ffee9f60e18483af9008f92d4a8428118"
+  integrity sha512-8+gyGFyMCXIHtnMNKQDT++tZ4XYFXgiP5NK7mcv34aYXA16GQFiBBITjKzxghpO8QNVceOd9rUn1JY92WLNGQw==
+  dependencies:
+    "@types/geojson" "*"
+
+"@types/d3-hierarchy@^1":
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/@types/d3-hierarchy/-/d3-hierarchy-1.1.7.tgz#14a57b0539f8929015f8ad96490de50a16211040"
+  integrity sha512-fvht6DOYKzqmXjMb/+xfgkmrWM4SD7rMA/ZbM+gGwr9ZTuIDfky95J8CARtaJo/ExeWyS0xGVdL2gqno2zrQ0Q==
+
+"@types/d3-interpolate@^1":
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/@types/d3-interpolate/-/d3-interpolate-1.4.2.tgz#88902a205f682773a517612299a44699285eed7b"
+  integrity sha512-ylycts6llFf8yAEs1tXzx2loxxzDZHseuhPokrqKprTQSTcD3JbJI1omZP1rphsELZO3Q+of3ff0ZS7+O6yVzg==
+  dependencies:
+    "@types/d3-color" "^1"
+
+"@types/d3-path@^1":
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/@types/d3-path/-/d3-path-1.0.9.tgz#73526b150d14cd96e701597cbf346cfd1fd4a58c"
+  integrity sha512-NaIeSIBiFgSC6IGUBjZWcscUJEq7vpVu7KthHN8eieTV9d9MqkSOZLH4chq1PmcKy06PNe3axLeKmRIyxJ+PZQ==
+
+"@types/d3-polygon@^1":
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@types/d3-polygon/-/d3-polygon-1.0.8.tgz#127ee83fccda5bf57384011da90f31367fea1530"
+  integrity sha512-1TOJPXCBJC9V3+K3tGbTqD/CsqLyv/YkTXAcwdsZzxqw5cvpdnCuDl42M4Dvi8XzMxZNCT9pL4ibrK2n4VmAcw==
+
+"@types/d3-quadtree@^1":
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@types/d3-quadtree/-/d3-quadtree-1.0.8.tgz#980998eb20d5e1c1494089ad9a8466a0e98825a7"
+  integrity sha512-FuqYiexeSQZlc+IcGAVK8jSJKDFKHcSf/jx8rqJUUVx6rzv7ecQiXKyatrLHHh3W4CAvgNeVI23JKgk4+x2wFg==
+
+"@types/d3-random@^1":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@types/d3-random/-/d3-random-1.1.3.tgz#8f7fdc23f92d1561e0694eb49567e8ab50537a19"
+  integrity sha512-XXR+ZbFCoOd4peXSMYJzwk0/elP37WWAzS/DG+90eilzVbUSsgKhBcWqylGWe+lA2ubgr7afWAOBaBxRgMUrBQ==
+
+"@types/d3-scale-chromatic@^1":
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/@types/d3-scale-chromatic/-/d3-scale-chromatic-1.5.1.tgz#e2b7c3401e5c13809f831911eb820e444f4fc67a"
+  integrity sha512-7FtJYrmXTEWLykShjYhoGuDNR/Bda0+tstZMkFj4RRxUEryv16AGh3be21tqg84B6KfEwiZyEpBcTyPyU+GWjg==
+
+"@types/d3-scale@^2":
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/@types/d3-scale/-/d3-scale-2.2.4.tgz#ca0d4b84d2f88fe058480f81354d14041a667b96"
+  integrity sha512-wkQXT+IfgfAnKB5rtS1qMJg3FS32r1rVFHvqtiqk8pX8o5aQR3VwX1P7ErHjzNIicTlkWsaMiUTrYB+E75HFeA==
+  dependencies:
+    "@types/d3-time" "^1"
+
+"@types/d3-selection@^1":
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/@types/d3-selection/-/d3-selection-1.4.3.tgz#36928bbe64eb8e0bbcbaa01fb05c21ff6c71fa93"
+  integrity sha512-GjKQWVZO6Sa96HiKO6R93VBE8DUW+DDkFpIMf9vpY5S78qZTlRRSNUsHr/afDpF7TvLDV7VxrUFOWW7vdIlYkA==
+
+"@types/d3-shape@^1":
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/@types/d3-shape/-/d3-shape-1.3.5.tgz#c0164c1be1429473016f855871d487f806c4e968"
+  integrity sha512-aPEax03owTAKynoK8ZkmkZEDZvvT4Y5pWgii4Jp4oQt0gH45j6siDl9gNDVC5kl64XHN2goN9jbYoHK88tFAcA==
+  dependencies:
+    "@types/d3-path" "^1"
+
+"@types/d3-time-format@^2":
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/@types/d3-time-format/-/d3-time-format-2.3.1.tgz#87a30e4513b9d1d53b920327a361f87255bf3372"
+  integrity sha512-fck0Z9RGfIQn3GJIEKVrp15h9m6Vlg0d5XXeiE/6+CQiBmMDZxfR21XtjEPuDeg7gC3bBM0SdieA5XF3GW1wKA==
+
+"@types/d3-time@^1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@types/d3-time/-/d3-time-1.1.1.tgz#6cf3a4242c3bbac00440dfb8ba7884f16bedfcbf"
+  integrity sha512-ULX7LoqXTCYtM+tLYOaeAJK7IwCT+4Gxlm2MaH0ErKLi07R5lh8NHCAyWcDkCCmx1AfRcBEV6H9QE9R25uP7jw==
+
+"@types/d3-timer@^1":
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/@types/d3-timer/-/d3-timer-1.0.10.tgz#329c51c2c931f44ed0acff78b8c84571acf0ed21"
+  integrity sha512-ZnAbquVqy+4ZjdW0cY6URp+qF/AzTVNda2jYyOzpR2cPT35FTXl78s15Bomph9+ckOiI1TtkljnWkwbIGAb6rg==
+
+"@types/d3-transition@^1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@types/d3-transition/-/d3-transition-1.3.1.tgz#5d658eea2db17684daa04eda81d7db9824d3463f"
+  integrity sha512-U9CpMlTL/NlqdGXBlHYxTZwbmy/vN1cFv8TuAIFPX+xOW/1iChbeJBY2xmINhDQfkGJbgkH4IovafCwI1ZDrgg==
+  dependencies:
+    "@types/d3-selection" "^1"
+
+"@types/d3-voronoi@*":
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/@types/d3-voronoi/-/d3-voronoi-1.1.9.tgz#7bbc210818a3a5c5e0bafb051420df206617c9e5"
+  integrity sha512-DExNQkaHd1F3dFPvGA/Aw2NGyjMln6E9QzsiqOcBgnE+VInYnFBHBBySbZQts6z6xD+5jTfKCP7M4OqMyVjdwQ==
+
+"@types/d3-zoom@^1":
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/@types/d3-zoom/-/d3-zoom-1.8.2.tgz#187d33f9ffa59811ce93b2eacd32d92c1ef03f16"
+  integrity sha512-rU0LirorUxkLxEHSzkFs7pPC0KWsxRGc0sHrxEDR0/iQq+7/xpNkKuuOOwthlgvOtpOvtTLJ2JFOD6Kr0Si4Uw==
+  dependencies:
+    "@types/d3-interpolate" "^1"
+    "@types/d3-selection" "^1"
+
+"@types/d3@^5.7.2":
+  version "5.16.4"
+  resolved "https://registry.yarnpkg.com/@types/d3/-/d3-5.16.4.tgz#a7dc24a3dc1c19922eee72ba16144fd5bcea987a"
+  integrity sha512-2u0O9iP1MubFiQ+AhR1id4Egs+07BLtvRATG6IL2Gs9+KzdrfaxCKNq5hxEyw1kxwsqB/lCgr108XuHcKtb/5w==
+  dependencies:
+    "@types/d3-array" "^1"
+    "@types/d3-axis" "^1"
+    "@types/d3-brush" "^1"
+    "@types/d3-chord" "^1"
+    "@types/d3-collection" "*"
+    "@types/d3-color" "^1"
+    "@types/d3-contour" "^1"
+    "@types/d3-dispatch" "^1"
+    "@types/d3-drag" "^1"
+    "@types/d3-dsv" "^1"
+    "@types/d3-ease" "^1"
+    "@types/d3-fetch" "^1"
+    "@types/d3-force" "^1"
+    "@types/d3-format" "^1"
+    "@types/d3-geo" "^1"
+    "@types/d3-hierarchy" "^1"
+    "@types/d3-interpolate" "^1"
+    "@types/d3-path" "^1"
+    "@types/d3-polygon" "^1"
+    "@types/d3-quadtree" "^1"
+    "@types/d3-random" "^1"
+    "@types/d3-scale" "^2"
+    "@types/d3-scale-chromatic" "^1"
+    "@types/d3-selection" "^1"
+    "@types/d3-shape" "^1"
+    "@types/d3-time" "^1"
+    "@types/d3-time-format" "^2"
+    "@types/d3-timer" "^1"
+    "@types/d3-transition" "^1"
+    "@types/d3-voronoi" "*"
+    "@types/d3-zoom" "^1"
+
+"@types/estree@*":
+  version "0.0.47"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.47.tgz#d7a51db20f0650efec24cd04994f523d93172ed4"
+  integrity sha512-c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg==
+
+"@types/file-saver@^2.0.1":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@types/file-saver/-/file-saver-2.0.2.tgz#bd593ccfaee42ff94a5c1c83bf69ae9be83493b9"
+  integrity sha512-xbqnZmGrCEqi/KUzOkeUSe77p7APvLuyellGaAoeww3CHJ1AbjQWjPSCFtKIzZn8L7LpEax4NXnC+gfa6nM7IA==
+
+"@types/geojson@*":
+  version "7946.0.7"
+  resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.7.tgz#c8fa532b60a0042219cdf173ca21a975ef0666ad"
+  integrity sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ==
+
+"@types/glob@^7.1.1":
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183"
+  integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==
+  dependencies:
+    "@types/minimatch" "*"
+    "@types/node" "*"
+
+"@types/hammerjs@^2.0.36":
+  version "2.0.39"
+  resolved "https://registry.yarnpkg.com/@types/hammerjs/-/hammerjs-2.0.39.tgz#4be64bbacf3813c79c0dab895c6b0fdc7d5e513f"
+  integrity sha512-lYR2Y/tV2ujpk/WyUc7S0VLI0a9hrtVIN9EwnrNo5oSEJI2cK2/XrgwOQmXLL3eTulOESvh9qP6si9+DWM9cOA==
+
+"@types/jasmine@*":
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.7.2.tgz#f83ca1936f8cf5d3375506b481f52f8903c2df21"
+  integrity sha512-w5Zc9pSwxlr1ne+froeIceYbrh0a2Us+0kTaX6JA0N7nPh+yv1zN10LyDMKwnT0x2AbIDGlrD1cv6plVjfCcZw==
+
+"@types/jasmine@~3.4.0":
+  version "3.4.6"
+  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.4.6.tgz#afcb210af0fa751b85a96b2034eedada65390be1"
+  integrity sha512-hpQHs+lmZ0uuCrGyqypdI1Ho7jRFolOBT6OkNdZPFziLSSEKvWu+VxWU6bGdNEA/hoV4jV8pdDeNx8EWlmfNAw==
+
+"@types/jasminewd2@~2.0.6":
+  version "2.0.9"
+  resolved "https://registry.yarnpkg.com/@types/jasminewd2/-/jasminewd2-2.0.9.tgz#db3946314605deea9d5c7aea0b61d807089ba76d"
+  integrity sha512-Oz+Faunpe2SimFvkMYMXxpK89WXl7rZHG8abTOKcGndu4xOoSbUZ+jUdZ0LQpmDqPEGLBWXF/yZP1tlsplGhzw==
+  dependencies:
+    "@types/jasmine" "*"
+
+"@types/json-schema@^7.0.5":
+  version "7.0.7"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
+  integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==
+
+"@types/lodash@^4.14.172":
+  version "4.14.182"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.182.tgz#05301a4d5e62963227eaafe0ce04dd77c54ea5c2"
+  integrity sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==
+
+"@types/minimatch@*":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz#f0ec25dbf2f0e4b18647313ac031134ca5b24b21"
+  integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA==
+
+"@types/mustache@^0.8.32":
+  version "0.8.32"
+  resolved "https://registry.yarnpkg.com/@types/mustache/-/mustache-0.8.32.tgz#7db3b81f2bf450bd38805f596d20eca97c4ed595"
+  integrity sha512-RTVWV485OOf4+nO2+feurk0chzHkSjkjALiejpHltyuMf/13fGymbbNNFrSKdSSUg1TIwzszXdWsVirxgqYiFA==
+
+"@types/node@*":
+  version "15.0.3"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.3.tgz#ee09fcaac513576474c327da5818d421b98db88a"
+  integrity sha512-/WbxFeBU+0F79z9RdEOXH4CsDga+ibi5M8uEYr91u3CkT/pdWcV8MCook+4wDPnZBexRdwWS+PiVZ2xJviAzcQ==
+
+"@types/node@^10.17.60":
+  version "10.17.60"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.60.tgz#35f3d6213daed95da7f0f73e75bcc6980e90597b"
+  integrity sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==
+
+"@types/normalize-package-data@^2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
+  integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
+
+"@types/parse-json@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
+  integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
+
+"@types/pdfjs-dist@^2.1.3":
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/@types/pdfjs-dist/-/pdfjs-dist-2.7.1.tgz#3f463b18849ef64e1879bf983ab36c40b3f26da0"
+  integrity sha512-5qfC+w0bL0IaPYR3Jg3IwdN1SB/xEPnofLvguML272PtA7T+oz6tftXwXjjfNfnw9wDCwx+5N0QfjPnNu5lGEw==
+
+"@types/pdfjs-dist@~2.1.7":
+  version "2.1.7"
+  resolved "https://registry.yarnpkg.com/@types/pdfjs-dist/-/pdfjs-dist-2.1.7.tgz#a92d94b9d699a93ab8a762839f7819dc04e96484"
+  integrity sha512-nQIwcPUhkAIyn7x9NS0lR/qxYfd5unRtfGkMjvpgF4Sh28IXftRymaNmFKTTdejDNY25NDGSIyjwj/BRwAPexg==
+
+"@types/q@^0.0.32":
+  version "0.0.32"
+  resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"
+  integrity sha1-vShOV8hPEyXacCur/IKlMoGQwMU=
+
+"@types/quill@^2.0.2":
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/@types/quill/-/quill-2.0.6.tgz#c52055eb2e4ff02d4134048576c5a9a47216c6c2"
+  integrity sha512-aWXfXBWfth7SgeZEObDZQcQ6p4pBrdafkryLlrQOrYU50tC0qde9AxHOe0WRF2rg0vul20j/GwUnHop6l+qYBQ==
+  dependencies:
+    parchment "^1.1.2"
+    quill-delta "^4.0.1"
+
+"@types/raf@^3.4.0":
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/@types/raf/-/raf-3.4.0.tgz#2b72cbd55405e071f1c4d29992638e022b20acc2"
+  integrity sha512-taW5/WYqo36N7V39oYyHP9Ipfd5pNFvGTIQsNGj86xV88YQ7GnI30/yMfKDF7Zgin0m3e+ikX88FvImnK4RjGw==
+
+"@types/resolve@0.0.8":
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-0.0.8.tgz#f26074d238e02659e323ce1a13d041eee280e194"
+  integrity sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==
+  dependencies:
+    "@types/node" "*"
+
+"@types/selenium-webdriver@^3.0.0":
+  version "3.0.17"
+  resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.17.tgz#50bea0c3c2acc31c959c5b1e747798b3b3d06d4b"
+  integrity sha512-tGomyEuzSC1H28y2zlW6XPCaDaXFaD6soTdb4GNdmte2qfHtrKqhy0ZFs4r/1hpazCfEZqeTSRLvSasmEx89uw==
+
+"@types/source-list-map@*":
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
+  integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
+
+"@types/uuid@^8.3.3":
+  version "8.3.4"
+  resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc"
+  integrity sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==
+
+"@types/video.js@7.2.12":
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@types/video.js/-/video.js-7.2.12.tgz#574682abeda408526b3592f450c5be1045483311"
+  integrity sha512-JDCmwi1L8NA69/G7i8OG6ApO21rB7J6CXcDr339V0xO6ViPAZJIor611Ymh2IZkiur7Iow+HbLBHIgQTdvgj8g==
+
+"@types/vis@^4.21.19":
+  version "4.21.21"
+  resolved "https://registry.yarnpkg.com/@types/vis/-/vis-4.21.21.tgz#5c911c0d43603d103938ea128ee83ca72d9a9347"
+  integrity sha512-mDh/6zKCTViWOPeED2DnWFpACY7HkusEzSDfb6lsc7iEklowTeoMAMm/nyQQYOOWfF5ALfMbevrhs9CjdI7SUA==
+  dependencies:
+    moment ">=2.13.0"
+
+"@types/webpack-sources@^0.1.5":
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-0.1.8.tgz#078d75410435993ec8a0a2855e88706f3f751f81"
+  integrity sha512-JHB2/xZlXOjzjBB6fMOpH1eQAfsrpqVVIbneE0Rok16WXwFaznaI5vfg75U5WgGJm7V9W1c4xeRQDjX/zwvghA==
+  dependencies:
+    "@types/node" "*"
+    "@types/source-list-map" "*"
+    source-map "^0.6.1"
+
+"@types/zip.js@2.0.28":
+  version "2.0.28"
+  resolved "https://registry.yarnpkg.com/@types/zip.js/-/zip.js-2.0.28.tgz#78354682ef76e637b1f445846e4d892ca3dbf344"
+  integrity sha512-OtimzIMnPu5RYleY8Zzp7nBFQqaZYcg7WqZci2gHjoylhaIL1qSur+ABUuuQ9HMP9Eu0ER2mEyI6AkLWWDGXNg==
+
+"@videojs/http-streaming@1.10.3":
+  version "1.10.3"
+  resolved "https://registry.yarnpkg.com/@videojs/http-streaming/-/http-streaming-1.10.3.tgz#0c028443b9a3c96da85e5995748ed94280884584"
+  integrity sha512-fxXtwVrQBdhOFh6GymPAPCb4utCI01Zs5fdyZgtR6FSsaz/zGmnzfNS5GvNjBi/hZviMsbNPFaOTTFMMNLNA3A==
+  dependencies:
+    aes-decrypter "3.0.0"
+    global "^4.3.0"
+    m3u8-parser "4.3.0"
+    mpd-parser "0.8.1"
+    mux.js "5.1.3"
+    url-toolkit "^2.1.3"
+    video.js "^6.8.0 || ^7.0.0"
+
+"@videojs/http-streaming@2.6.4":
+  version "2.6.4"
+  resolved "https://registry.yarnpkg.com/@videojs/http-streaming/-/http-streaming-2.6.4.tgz#a3d9eb62b02c6e48439f033675ec3a6f5f8cdb25"
+  integrity sha512-sFVE0MVXhawAkET8EgiUSMvDDv6u3uGidtO0BvNXG0/qKWlze/zEzhvLsyPU4HmLFRnffKeHK5RE2XpO5vHY8Q==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@videojs/vhs-utils" "^3.0.0"
+    aes-decrypter "3.1.2"
+    global "^4.4.0"
+    m3u8-parser "4.5.2"
+    mpd-parser "0.15.4"
+    mux.js "5.10.0"
+    video.js "^6 || ^7"
+
+"@videojs/vhs-utils@^3.0.0":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@videojs/vhs-utils/-/vhs-utils-3.0.1.tgz#6bd7b5309883dcbaccb0f766b08094bc2bde5dbc"
+  integrity sha512-kYHWcmzRyWfUXrrOZzRFzvt7XM+Sg+0vmsSbYONn2e/XeWD8+35K74+wZkW5/H9nYZDhYpZgeTKbLRUvxk+smA==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    global "^4.4.0"
+    url-toolkit "^2.2.1"
+
+"@videojs/xhr@2.5.1":
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/@videojs/xhr/-/xhr-2.5.1.tgz#26bc5a79dbb3b03bfb13742c6ce559f89e90719e"
+  integrity sha512-wV9nGESHseSK+S9ePEru2+OJZ1jq/ZbbzniGQ4weAmTIepuBMSYPx5zrxxQA0E786T5ykpO8ts+LayV+3/oI2w==
+  dependencies:
+    "@babel/runtime" "^7.5.5"
+    global "~4.4.0"
+    is-function "^1.0.1"
+
+"@webassemblyjs/ast@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359"
+  integrity sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==
+  dependencies:
+    "@webassemblyjs/helper-module-context" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/wast-parser" "1.8.5"
+
+"@webassemblyjs/floating-point-hex-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721"
+  integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==
+
+"@webassemblyjs/helper-api-error@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7"
+  integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==
+
+"@webassemblyjs/helper-buffer@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204"
+  integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==
+
+"@webassemblyjs/helper-code-frame@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz#9a740ff48e3faa3022b1dff54423df9aa293c25e"
+  integrity sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==
+  dependencies:
+    "@webassemblyjs/wast-printer" "1.8.5"
+
+"@webassemblyjs/helper-fsm@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452"
+  integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==
+
+"@webassemblyjs/helper-module-context@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz#def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245"
+  integrity sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    mamacro "^0.0.3"
+
+"@webassemblyjs/helper-wasm-bytecode@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61"
+  integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==
+
+"@webassemblyjs/helper-wasm-section@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz#74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf"
+  integrity sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+
+"@webassemblyjs/ieee754@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz#712329dbef240f36bf57bd2f7b8fb9bf4154421e"
+  integrity sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==
+  dependencies:
+    "@xtuc/ieee754" "^1.2.0"
+
+"@webassemblyjs/leb128@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10"
+  integrity sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==
+  dependencies:
+    "@xtuc/long" "4.2.2"
+
+"@webassemblyjs/utf8@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc"
+  integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==
+
+"@webassemblyjs/wasm-edit@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz#962da12aa5acc1c131c81c4232991c82ce56e01a"
+  integrity sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/helper-wasm-section" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+    "@webassemblyjs/wasm-opt" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+    "@webassemblyjs/wast-printer" "1.8.5"
+
+"@webassemblyjs/wasm-gen@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz#54840766c2c1002eb64ed1abe720aded714f98bc"
+  integrity sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/ieee754" "1.8.5"
+    "@webassemblyjs/leb128" "1.8.5"
+    "@webassemblyjs/utf8" "1.8.5"
+
+"@webassemblyjs/wasm-opt@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz#b24d9f6ba50394af1349f510afa8ffcb8a63d264"
+  integrity sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+
+"@webassemblyjs/wasm-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz#21576f0ec88b91427357b8536383668ef7c66b8d"
+  integrity sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-api-error" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/ieee754" "1.8.5"
+    "@webassemblyjs/leb128" "1.8.5"
+    "@webassemblyjs/utf8" "1.8.5"
+
+"@webassemblyjs/wast-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz#e10eecd542d0e7bd394f6827c49f3df6d4eefb8c"
+  integrity sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/floating-point-hex-parser" "1.8.5"
+    "@webassemblyjs/helper-api-error" "1.8.5"
+    "@webassemblyjs/helper-code-frame" "1.8.5"
+    "@webassemblyjs/helper-fsm" "1.8.5"
+    "@xtuc/long" "4.2.2"
+
+"@webassemblyjs/wast-printer@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz#114bbc481fd10ca0e23b3560fa812748b0bae5bc"
+  integrity sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/wast-parser" "1.8.5"
+    "@xtuc/long" "4.2.2"
+
+"@xtuc/ieee754@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
+  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
+
+"@xtuc/long@4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
+  integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
+
+"@yarnpkg/lockfile@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
+  integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
+
+JSONStream@^1.3.4:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
+  integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==
+  dependencies:
+    jsonparse "^1.2.0"
+    through ">=2.2.7 <3"
+
+abab@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
+  integrity sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4=
+
+accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
+  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
+  dependencies:
+    mime-types "~2.1.24"
+    negotiator "0.6.2"
+
+ace-builds@^1.4.2:
+  version "1.4.12"
+  resolved "https://registry.yarnpkg.com/ace-builds/-/ace-builds-1.4.12.tgz#888efa386e36f4345f40b5233fcc4fe4c588fae7"
+  integrity sha512-G+chJctFPiiLGvs3+/Mly3apXTcfgE45dT5yp12BcWZ1kUs+gm0qd3/fv4gsz6fVag4mM0moHVpjHDIgph6Psg==
+
+acorn-globals@^1.0.4:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-1.0.9.tgz#55bb5e98691507b74579d0513413217c380c54cf"
+  integrity sha1-VbtemGkVB7dFedBRNBMhfDgMVM8=
+  dependencies:
+    acorn "^2.1.0"
+
+acorn-node@^1.6.1:
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.8.2.tgz#114c95d64539e53dede23de8b9d96df7c7ae2af8"
+  integrity sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==
+  dependencies:
+    acorn "^7.0.0"
+    acorn-walk "^7.0.0"
+    xtend "^4.0.2"
+
+acorn-walk@^7.0.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
+  integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
+
+acorn-walk@^8.0.0:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
+  integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
+
+acorn@^2.1.0, acorn@^2.4.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-2.7.0.tgz#ab6e7d9d886aaca8b085bc3312b79a198433f0e7"
+  integrity sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=
+
+acorn@^6.2.1:
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
+  integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
+
+acorn@^7.0.0, acorn@^7.1.0:
+  version "7.4.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
+  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
+
+acorn@^8.0.4:
+  version "8.7.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
+  integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
+
+adler-32@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/adler-32/-/adler-32-1.2.0.tgz#6a3e6bf0a63900ba15652808cb15c6813d1a5f25"
+  integrity sha1-aj5r8KY5ALoVZSgIyxXGgT0aXyU=
+  dependencies:
+    exit-on-epipe "~1.0.1"
+    printj "~1.1.0"
+
+adm-zip@^0.4.9:
+  version "0.4.16"
+  resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.16.tgz#cf4c508fdffab02c269cbc7f471a875f05570365"
+  integrity sha512-TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg==
+
+aes-decrypter@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/aes-decrypter/-/aes-decrypter-3.0.0.tgz#7848a1c145b9fdbf57ae3e2b5b1bc7cf0644a8fb"
+  integrity sha1-eEihwUW5/b9Xrj4rWxvHzwZEqPs=
+  dependencies:
+    commander "^2.9.0"
+    global "^4.3.2"
+    pkcs7 "^1.0.2"
+
+aes-decrypter@3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/aes-decrypter/-/aes-decrypter-3.1.2.tgz#3545546f8e9f6b878640339a242efe221ba7a7cb"
+  integrity sha512-42nRwfQuPRj9R1zqZBdoxnaAmnIFyDi0MNyTVhjdFOd8fifXKKRfwIHIZ6AMn1or4x5WONzjwRTbTWcsIQ0O4A==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@videojs/vhs-utils" "^3.0.0"
+    global "^4.4.0"
+    pkcs7 "^1.0.4"
+
+after@0.8.2:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
+  integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
+
+agent-base@4, agent-base@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
+  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
+  dependencies:
+    es6-promisify "^5.0.0"
+
+agent-base@~4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
+  integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
+  dependencies:
+    es6-promisify "^5.0.0"
+
+agentkeepalive@^3.4.1:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.5.2.tgz#a113924dd3fa24a0bc3b78108c450c2abee00f67"
+  integrity sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==
+  dependencies:
+    humanize-ms "^1.2.1"
+
+aggregate-error@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
+  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
+  dependencies:
+    clean-stack "^2.0.0"
+    indent-string "^4.0.0"
+
+ajv-errors@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
+  integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
+
+ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
+  integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
+
+ajv@6.10.2:
+  version "6.10.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52"
+  integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==
+  dependencies:
+    fast-deep-equal "^2.0.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
+ajv@6.12.3:
+  version "6.12.3"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.3.tgz#18c5af38a111ddeb4f2697bd78d68abc1cabd706"
+  integrity sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
+ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4:
+  version "6.12.6"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
+amdefine@>=0.0.4:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
+
+angular-cli-alias@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/angular-cli-alias/-/angular-cli-alias-1.0.9.tgz#7b82d72d394cc42b81bd00e7b37013aae264d1b1"
+  integrity sha512-0RHDqEUfL1WoUG6uO74U+AGradG9bYaH2nf9/9CvM7ckoAb5P1XS8fMQYmVn8dOAfmVChj3x9XwxFVwT829rhw==
+
+ansi-align@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb"
+  integrity sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==
+  dependencies:
+    string-width "^3.0.0"
+
+ansi-colors@4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
+  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
+
+ansi-colors@^3.0.0:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
+  integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
+
+ansi-escapes@^4.2.1:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
+  integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
+  dependencies:
+    type-fest "^0.21.3"
+
+ansi-html@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
+  integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4=
+
+ansi-regex@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
+
+ansi-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
+
+ansi-regex@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
+  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
+
+ansi-regex@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
+  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+
+ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
+
+ansi-styles@^3.2.0, ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
+  dependencies:
+    color-convert "^1.9.0"
+
+ansi-styles@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+  dependencies:
+    color-convert "^2.0.1"
+
+any-promise@^1.0.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
+  integrity sha1-q8av7tzqUugJzcA3au0845Y10X8=
+
+anymatch@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
+  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
+  dependencies:
+    micromatch "^3.1.4"
+    normalize-path "^2.1.1"
+
+anymatch@~3.1.1:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
+  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
+app-root-path@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.2.1.tgz#d0df4a682ee408273583d43f6f79e9892624bc9a"
+  integrity sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==
+
+append-transform@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-1.0.0.tgz#046a52ae582a228bd72f58acfbe2967c678759ab"
+  integrity sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==
+  dependencies:
+    default-require-extensions "^2.0.0"
+
+aproba@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
+
+arg@^4.1.0:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
+  integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
+
+argparse@^1.0.7:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
+  dependencies:
+    sprintf-js "~1.0.2"
+
+aria-query@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-3.0.0.tgz#65b3fcc1ca1155a8c9ae64d6eee297f15d5133cc"
+  integrity sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=
+  dependencies:
+    ast-types-flow "0.0.7"
+    commander "^2.11.0"
+
+arr-diff@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
+
+arr-flatten@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
+
+arr-union@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
+
+array-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
+  integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=
+
+array-flatten@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
+
+array-flatten@^2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
+  integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
+
+array-slice@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
+  integrity sha512-rlVfZW/1Ph2SNySXwR9QYkChp8EkOEiTMO5Vwx60usw04i4nWemkm9RXmQqgkQFaLHsqLuADvjp6IfgL9l2M8Q==
+
+array-union@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
+  dependencies:
+    array-uniq "^1.0.1"
+
+array-union@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
+
+array-uniq@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
+
+array-unique@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
+  integrity sha512-G2n5bG5fSUCpnsXz4+8FUkYsGPkNfLn9YvS66U5qbTIXI2Ynnlo4Bi42bWv+omKUCqz+ejzfClwne0alJWJPhg==
+
+array-unique@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
+
+arraybuffer.slice@~0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
+  integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
+
+arrify@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
+
+asap@^2.0.0, asap@~2.0.3:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+  integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
+
+asn1.js@^5.2.0:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07"
+  integrity sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==
+  dependencies:
+    bn.js "^4.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+    safer-buffer "^2.1.0"
+
+asn1@~0.2.3:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
+  dependencies:
+    safer-buffer "~2.1.0"
+
+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
+
+assert@^1.1.1:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
+  integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==
+  dependencies:
+    object-assign "^4.1.1"
+    util "0.10.3"
+
+assign-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
+
+ast-types-flow@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
+  integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0=
+
+async-each@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
+  integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
+
+async-limiter@~1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
+  integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
+
+async@^2.5.0, async@^2.6.2:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
+  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
+  dependencies:
+    lodash "^4.17.14"
+
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+
+atob@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
+
+autoprefixer@9.6.1:
+  version "9.6.1"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.1.tgz#51967a02d2d2300bb01866c1611ec8348d355a47"
+  integrity sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==
+  dependencies:
+    browserslist "^4.6.3"
+    caniuse-lite "^1.0.30000980"
+    chalk "^2.4.2"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^7.0.17"
+    postcss-value-parser "^4.0.0"
+
+autoprefixer@^9.4.5, autoprefixer@^9.6.0:
+  version "9.8.6"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f"
+  integrity sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==
+  dependencies:
+    browserslist "^4.12.0"
+    caniuse-lite "^1.0.30001109"
+    colorette "^1.2.1"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^7.0.32"
+    postcss-value-parser "^4.1.0"
+
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
+
+aws4@^1.8.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
+  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
+
+axobject-query@2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.0.2.tgz#ea187abe5b9002b377f925d8bf7d1c561adf38f9"
+  integrity sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==
+  dependencies:
+    ast-types-flow "0.0.7"
+
+babel-plugin-dynamic-import-node@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
+  integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==
+  dependencies:
+    object.assign "^4.1.0"
+
+backo2@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
+  integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
+
+balanced-match@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
+
+base64-arraybuffer@0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
+  integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg=
+
+base64-arraybuffer@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.2.0.tgz#4b944fac0191aa5907afe2d8c999ccc57ce80f45"
+  integrity sha512-7emyCsu1/xiBXgQZrscw/8KPRT44I4Yq9Pe6EGs3aPRTsWuggML1/1DTuZUuIaJPIm1FTDUVXl4x/yW8s0kQDQ==
+
+base64-arraybuffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz#1c37589a7c4b0746e34bd1feb951da2df01c1bdc"
+  integrity sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==
+
+base64-js@^1.0.2, base64-js@^1.3.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
+
+base64id@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz#47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"
+  integrity sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=
+
+base@^0.11.1:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
+  dependencies:
+    cache-base "^1.0.1"
+    class-utils "^0.3.5"
+    component-emitter "^1.2.1"
+    define-property "^1.0.0"
+    isobject "^3.0.1"
+    mixin-deep "^1.2.0"
+    pascalcase "^0.1.1"
+
+batch@0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
+  integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
+
+bcrypt-pbkdf@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
+  dependencies:
+    tweetnacl "^0.14.3"
+
+better-assert@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
+  integrity sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=
+  dependencies:
+    callsite "1.0.0"
+
+big.js@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
+  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
+
+binary-extensions@^1.0.0:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
+  integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
+
+binary-extensions@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
+  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
+
+bindings@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
+  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
+  dependencies:
+    file-uri-to-path "1.0.0"
+
+blob@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
+  integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==
+
+blocking-proxy@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/blocking-proxy/-/blocking-proxy-1.0.1.tgz#81d6fd1fe13a4c0d6957df7f91b75e98dac40cb2"
+  integrity sha512-KE8NFMZr3mN2E0HcvCgRtX7DjhiIQrwle+nSVJVC/yqFb9+xznHl2ZcoBp2L9qzkI4t4cBFJ1efXF8Dwi132RA==
+  dependencies:
+    minimist "^1.2.0"
+
+bluebird@^3.3.0, bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3.5.5:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
+  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
+
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9:
+  version "4.12.0"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
+  integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
+
+bn.js@^5.0.0, bn.js@^5.1.1:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002"
+  integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==
+
+body-parser@1.19.0, body-parser@^1.16.1:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
+  integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
+  dependencies:
+    bytes "3.1.0"
+    content-type "~1.0.4"
+    debug "2.6.9"
+    depd "~1.1.2"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
+    on-finished "~2.3.0"
+    qs "6.7.0"
+    raw-body "2.4.0"
+    type-is "~1.6.17"
+
+bonjour@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
+  integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU=
+  dependencies:
+    array-flatten "^2.1.0"
+    deep-equal "^1.0.1"
+    dns-equal "^1.0.0"
+    dns-txt "^2.0.2"
+    multicast-dns "^6.0.1"
+    multicast-dns-service-types "^1.1.0"
+
+boxen@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/boxen/-/boxen-3.2.0.tgz#fbdff0de93636ab4450886b6ff45b92d098f45eb"
+  integrity sha512-cU4J/+NodM3IHdSL2yN8bqYqnmlBTidDR4RC7nJs61ZmtGz8VZzM3HLQX0zY5mrSmPtR3xWwsq2jOUQqFZN8+A==
+  dependencies:
+    ansi-align "^3.0.0"
+    camelcase "^5.3.1"
+    chalk "^2.4.2"
+    cli-boxes "^2.2.0"
+    string-width "^3.0.0"
+    term-size "^1.2.0"
+    type-fest "^0.3.0"
+    widest-line "^2.0.0"
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+brace@^0.11.1:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/brace/-/brace-0.11.1.tgz#4896fcc9d544eef45f4bb7660db320d3b379fe58"
+  integrity sha1-SJb8ydVE7vRfS7dmDbMg07N5/lg=
+
+braces@^0.1.2:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-0.1.5.tgz#c085711085291d8b75fdd74eab0f8597280711e6"
+  integrity sha512-EIMHIv2UXHWFY2xubUGKz+hq9hNkENj4Pjvr7h58cmJgpkK2yMlKA8I484f7MSttkzVAy/lL7X9xDaILd6avzA==
+  dependencies:
+    expand-range "^0.1.0"
+
+braces@^2.3.1, braces@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
+  dependencies:
+    arr-flatten "^1.1.0"
+    array-unique "^0.3.2"
+    extend-shallow "^2.0.1"
+    fill-range "^4.0.0"
+    isobject "^3.0.1"
+    repeat-element "^1.1.2"
+    snapdragon "^0.8.1"
+    snapdragon-node "^2.0.1"
+    split-string "^3.0.2"
+    to-regex "^3.0.1"
+
+braces@^3.0.1, braces@^3.0.2, braces@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
+brorand@^1.0.1, brorand@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
+  integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
+
+browserify-aes@^1.0.0, browserify-aes@^1.0.4:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
+  integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
+  dependencies:
+    buffer-xor "^1.0.3"
+    cipher-base "^1.0.0"
+    create-hash "^1.1.0"
+    evp_bytestokey "^1.0.3"
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+browserify-cipher@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
+  integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==
+  dependencies:
+    browserify-aes "^1.0.4"
+    browserify-des "^1.0.0"
+    evp_bytestokey "^1.0.0"
+
+browserify-des@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
+  integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==
+  dependencies:
+    cipher-base "^1.0.1"
+    des.js "^1.0.0"
+    inherits "^2.0.1"
+    safe-buffer "^5.1.2"
+
+browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d"
+  integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==
+  dependencies:
+    bn.js "^5.0.0"
+    randombytes "^2.0.1"
+
+browserify-sign@^4.0.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3"
+  integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==
+  dependencies:
+    bn.js "^5.1.1"
+    browserify-rsa "^4.0.1"
+    create-hash "^1.2.0"
+    create-hmac "^1.1.7"
+    elliptic "^6.5.3"
+    inherits "^2.0.4"
+    parse-asn1 "^5.1.5"
+    readable-stream "^3.6.0"
+    safe-buffer "^5.2.0"
+
+browserify-zlib@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
+  integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
+  dependencies:
+    pako "~1.0.5"
+
+browserslist@4.10.0:
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.10.0.tgz#f179737913eaf0d2b98e4926ac1ca6a15cbcc6a9"
+  integrity sha512-TpfK0TDgv71dzuTsEAlQiHeWQ/tiPqgNZVdv046fvNtBZrjbv2O3TsWCDU0AWGJJKCF/KsjNdLzR9hXOsh/CfA==
+  dependencies:
+    caniuse-lite "^1.0.30001035"
+    electron-to-chromium "^1.3.378"
+    node-releases "^1.1.52"
+    pkg-up "^3.1.0"
+
+browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.6.3, browserslist@^4.8.5:
+  version "4.16.6"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
+  integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
+  dependencies:
+    caniuse-lite "^1.0.30001219"
+    colorette "^1.2.2"
+    electron-to-chromium "^1.3.723"
+    escalade "^3.1.1"
+    node-releases "^1.1.71"
+
+browserstack@^1.5.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/browserstack/-/browserstack-1.6.1.tgz#e051f9733ec3b507659f395c7a4765a1b1e358b3"
+  integrity sha512-GxtFjpIaKdbAyzHfFDKixKO8IBT7wR3NjbzrGc78nNs/Ciys9wU3/nBtsqsWv5nDSrdI5tz0peKuzCPuNXNUiw==
+  dependencies:
+    https-proxy-agent "^2.2.1"
+
+btoa@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/btoa/-/btoa-1.2.1.tgz#01a9909f8b2c93f6bf680ba26131eb30f7fa3d73"
+  integrity sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==
+
+buffer-alloc-unsafe@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
+  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
+
+buffer-alloc@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
+  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
+  dependencies:
+    buffer-alloc-unsafe "^1.1.0"
+    buffer-fill "^1.0.0"
+
+buffer-fill@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
+  integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
+
+buffer-from@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
+
+buffer-indexof@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
+  integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==
+
+buffer-xor@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
+  integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
+
+buffer@^4.3.0:
+  version "4.9.2"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8"
+  integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==
+  dependencies:
+    base64-js "^1.0.2"
+    ieee754 "^1.1.4"
+    isarray "^1.0.0"
+
+buffer@^5.6.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
+  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.1.13"
+
+builtin-modules@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+  integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
+
+builtin-modules@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.2.0.tgz#45d5db99e7ee5e6bc4f362e008bf917ab5049887"
+  integrity sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==
+
+builtin-status-codes@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
+  integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
+
+builtins@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
+  integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og=
+
+bytes@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
+  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
+
+bytes@3.1.0, bytes@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
+  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
+
+cacache@12.0.2:
+  version "12.0.2"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.2.tgz#8db03205e36089a3df6954c66ce92541441ac46c"
+  integrity sha512-ifKgxH2CKhJEg6tNdAwziu6Q33EvuG26tYcda6PT3WKisZcYDXsnEdnRv67Po3yCzFfaSoMjGZzJyD2c3DT1dg==
+  dependencies:
+    bluebird "^3.5.5"
+    chownr "^1.1.1"
+    figgy-pudding "^3.5.1"
+    glob "^7.1.4"
+    graceful-fs "^4.1.15"
+    infer-owner "^1.0.3"
+    lru-cache "^5.1.1"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    move-concurrently "^1.0.1"
+    promise-inflight "^1.0.1"
+    rimraf "^2.6.3"
+    ssri "^6.0.1"
+    unique-filename "^1.1.1"
+    y18n "^4.0.0"
+
+cacache@^12.0.0, cacache@^12.0.2:
+  version "12.0.4"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c"
+  integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==
+  dependencies:
+    bluebird "^3.5.5"
+    chownr "^1.1.1"
+    figgy-pudding "^3.5.1"
+    glob "^7.1.4"
+    graceful-fs "^4.1.15"
+    infer-owner "^1.0.3"
+    lru-cache "^5.1.1"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    move-concurrently "^1.0.1"
+    promise-inflight "^1.0.1"
+    rimraf "^2.6.3"
+    ssri "^6.0.1"
+    unique-filename "^1.1.1"
+    y18n "^4.0.0"
+
+cacache@^15.0.4:
+  version "15.0.6"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.6.tgz#65a8c580fda15b59150fb76bf3f3a8e45d583099"
+  integrity sha512-g1WYDMct/jzW+JdWEyjaX2zoBkZ6ZT9VpOyp2I/VMtDsNLffNat3kqPFfi1eDRSK9/SuKGyORDHcQMcPF8sQ/w==
+  dependencies:
+    "@npmcli/move-file" "^1.0.1"
+    chownr "^2.0.0"
+    fs-minipass "^2.0.0"
+    glob "^7.1.4"
+    infer-owner "^1.0.4"
+    lru-cache "^6.0.0"
+    minipass "^3.1.1"
+    minipass-collect "^1.0.2"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.2"
+    mkdirp "^1.0.3"
+    p-map "^4.0.0"
+    promise-inflight "^1.0.1"
+    rimraf "^3.0.2"
+    ssri "^8.0.1"
+    tar "^6.0.2"
+    unique-filename "^1.1.1"
+
+cache-base@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
+  dependencies:
+    collection-visit "^1.0.0"
+    component-emitter "^1.2.1"
+    get-value "^2.0.6"
+    has-value "^1.0.0"
+    isobject "^3.0.1"
+    set-value "^2.0.0"
+    to-object-path "^0.3.0"
+    union-value "^1.0.0"
+    unset-value "^1.0.0"
+
+cacheable-request@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912"
+  integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==
+  dependencies:
+    clone-response "^1.0.2"
+    get-stream "^5.1.0"
+    http-cache-semantics "^4.0.0"
+    keyv "^3.0.0"
+    lowercase-keys "^2.0.0"
+    normalize-url "^4.1.0"
+    responselike "^1.0.2"
+
+call-bind@^1.0.0, call-bind@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
+  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
+  dependencies:
+    function-bind "^1.1.1"
+    get-intrinsic "^1.0.2"
+
+caller-callsite@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
+  integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=
+  dependencies:
+    callsites "^2.0.0"
+
+caller-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
+  integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=
+  dependencies:
+    caller-callsite "^2.0.0"
+
+callsite@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
+  integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA=
+
+callsites@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
+  integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
+
+callsites@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
+
+camelcase-css@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5"
+  integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==
+
+camelcase@^5.0.0, camelcase@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
+
+caniuse-lite@1.0.30001035:
+  version "1.0.30001035"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz#2bb53b8aa4716b2ed08e088d4dc816a5fe089a1e"
+  integrity sha512-C1ZxgkuA4/bUEdMbU5WrGY4+UhMFFiXrgNAfxiMIqWgFTWfv/xsZCS2xEHT2LMq7xAZfuAnu6mcqyDl0ZR6wLQ==
+
+caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001219:
+  version "1.0.30001228"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz#bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa"
+  integrity sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==
+
+canonical-path@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-1.0.0.tgz#fcb470c23958def85081856be7a86e904f180d1d"
+  integrity sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==
+
+canvg@^1.0:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/canvg/-/canvg-1.5.3.tgz#aad17915f33368bf8eb80b25d129e3ae922ddc5f"
+  integrity sha512-7Gn2IuQzvUQWPIuZuFHrzsTM0gkPz2RRT9OcbdmA03jeKk8kltrD8gqUzNX15ghY/4PV5bbe5lmD6yDLDY6Ybg==
+  dependencies:
+    jsdom "^8.1.0"
+    rgbcolor "^1.0.1"
+    stackblur-canvas "^1.4.1"
+    xmldom "^0.1.22"
+
+canvg@^3.0.6:
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/canvg/-/canvg-3.0.10.tgz#8e52a2d088b6ffa23ac78970b2a9eebfae0ef4b3"
+  integrity sha512-qwR2FRNO9NlzTeKIPIKpnTY6fqwuYSequ8Ru8c0YkYU7U0oW+hLUvWadLvAu1Rl72OMNiFhoLu4f8eUjQ7l/+Q==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@types/raf" "^3.4.0"
+    core-js "^3.8.3"
+    raf "^3.4.1"
+    regenerator-runtime "^0.13.7"
+    rgbcolor "^1.0.1"
+    stackblur-canvas "^2.0.0"
+    svg-pathdata "^6.0.3"
+
+cardboard-vr-display@1.0.13:
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/cardboard-vr-display/-/cardboard-vr-display-1.0.13.tgz#e192a220b2970002cfb5cc0f1b480ff5fd6748b6"
+  integrity sha512-/ovHu4nHfo3oaw2v20v7ErvDUmIBPih/e/6VG83XUUFs5vPQaGSM8hihqKClOlwy3Fz+52L0FrhcGSH3o+yn6w==
+  dependencies:
+    gl-preserve-state "^1.0.0"
+    nosleep.js "^0.7.0"
+    webvr-polyfill-dpdb "^1.0.7"
+
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
+
+cf-blob.js@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/cf-blob.js/-/cf-blob.js-0.0.1.tgz#f5ab7e12e798caf08ccf828c69aba0f063d83f99"
+  integrity sha1-9at+EueYyvCMz4KMaaug8GPYP5k=
+
+cfb@^1.1.2, cfb@^1.1.4:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/cfb/-/cfb-1.2.0.tgz#6a4d0872b525ed60349e1ef51fb4b0bf73eca9a8"
+  integrity sha512-sXMvHsKCICVR3Naq+J556K+ExBo9n50iKl6LGarlnvuA2035uMlGA/qVrc0wQtow5P1vJEw9UyrKLCbtIKz+TQ==
+  dependencies:
+    adler-32 "~1.2.0"
+    crc-32 "~1.2.0"
+    printj "~1.1.2"
+
+"chainsaw@>=0.0.7 <0.1":
+  version "0.0.9"
+  resolved "https://registry.yarnpkg.com/chainsaw/-/chainsaw-0.0.9.tgz#11a05102d1c4c785b6d0415d336d5a3a1612913e"
+  integrity sha1-EaBRAtHEx4W20EFdM21aOhYSkT4=
+  dependencies:
+    traverse ">=0.3.0 <0.4"
+
+chalk@^1.1.1, chalk@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
+  dependencies:
+    ansi-styles "^2.2.1"
+    escape-string-regexp "^1.0.2"
+    has-ansi "^2.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^2.0.0"
+
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1, chalk@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
+"chalk@^3.0.0 || ^4.0.0", chalk@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad"
+  integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+chalk@^4.1.0:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+chardet@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
+  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
+
+chart.js@^2.8.0:
+  version "2.9.4"
+  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.9.4.tgz#0827f9563faffb2dc5c06562f8eb10337d5b9684"
+  integrity sha512-B07aAzxcrikjAPyV+01j7BmOpxtQETxTSlQ26BEYJ+3iUkbNKaOJ/nDbT6JjyqYxseM0ON12COHYdU2cTIjC7A==
+  dependencies:
+    chartjs-color "^2.1.0"
+    moment "^2.10.2"
+
+chartjs-color-string@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz#1df096621c0e70720a64f4135ea171d051402f71"
+  integrity sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A==
+  dependencies:
+    color-name "^1.0.0"
+
+chartjs-color@^2.1.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.4.1.tgz#6118bba202fe1ea79dd7f7c0f9da93467296c3b0"
+  integrity sha512-haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w==
+  dependencies:
+    chartjs-color-string "^0.6.0"
+    color-convert "^1.9.3"
+
+"chokidar@>=2.0.0 <4.0.0", "chokidar@>=3.0.0 <4.0.0", chokidar@^3.0.0, chokidar@^3.4.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a"
+  integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==
+  dependencies:
+    anymatch "~3.1.1"
+    braces "~3.0.2"
+    glob-parent "~5.1.0"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.5.0"
+  optionalDependencies:
+    fsevents "~2.3.1"
+
+chokidar@^2.0.3, chokidar@^2.1.1, chokidar@^2.1.8:
+  version "2.1.8"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
+  integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
+  dependencies:
+    anymatch "^2.0.0"
+    async-each "^1.0.1"
+    braces "^2.3.2"
+    glob-parent "^3.1.0"
+    inherits "^2.0.3"
+    is-binary-path "^1.0.0"
+    is-glob "^4.0.0"
+    normalize-path "^3.0.0"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.2.1"
+    upath "^1.1.1"
+  optionalDependencies:
+    fsevents "^1.2.7"
+
+chownr@^1.1.1:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
+  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
+
+chownr@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
+  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
+
+chrome-trace-event@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
+  integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
+
+ci-info@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
+  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
+
+cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
+  integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+circular-dependency-plugin@5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-5.2.0.tgz#e09dbc2dd3e2928442403e2d45b41cea06bc0a93"
+  integrity sha512-7p4Kn/gffhQaavNfyDFg7LS5S/UT1JAjyGd4UqR2+jzoYF02eDkj0Ec3+48TsIa4zghjLY87nQHIh/ecK9qLdw==
+
+circular-json@^0.5.5:
+  version "0.5.9"
+  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.5.9.tgz#932763ae88f4f7dead7a0d09c8a51a4743a53b1d"
+  integrity sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==
+
+class-utils@^0.3.5:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
+  dependencies:
+    arr-union "^3.1.0"
+    define-property "^0.2.5"
+    isobject "^3.0.0"
+    static-extend "^0.1.1"
+
+clean-css@4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz#2d411ef76b8569b6d0c84068dabe85b0aa5e5c17"
+  integrity sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==
+  dependencies:
+    source-map "~0.6.0"
+
+clean-css@^4.1.11:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78"
+  integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==
+  dependencies:
+    source-map "~0.6.0"
+
+clean-stack@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
+  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
+
+cli-boxes@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f"
+  integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==
+
+cli-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
+  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
+  dependencies:
+    restore-cursor "^3.1.0"
+
+cli-width@^2.0.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
+  integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==
+
+cliui@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
+  integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==
+  dependencies:
+    string-width "^2.1.1"
+    strip-ansi "^4.0.0"
+    wrap-ansi "^2.0.0"
+
+cliui@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
+  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
+  dependencies:
+    string-width "^3.1.0"
+    strip-ansi "^5.2.0"
+    wrap-ansi "^5.1.0"
+
+clone-deep@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
+  integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
+  dependencies:
+    is-plain-object "^2.0.4"
+    kind-of "^6.0.2"
+    shallow-clone "^3.0.0"
+
+clone-response@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
+  integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
+  dependencies:
+    mimic-response "^1.0.0"
+
+clone@^2.1.1, clone@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
+  integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
+
+code-point-at@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
+
+codelyzer@^5.1.0:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-5.2.2.tgz#d0530a455784e6bea0b6d7e97166c73c30a5347f"
+  integrity sha512-jB4FZ1Sx7kZhvZVdf+N2BaKTdrrNZOL0Bj10RRfrhHrb3zEvXjJvvq298JPMJAiyiCS/v4zs1QlGU0ip7xGqeA==
+  dependencies:
+    app-root-path "^2.2.1"
+    aria-query "^3.0.0"
+    axobject-query "2.0.2"
+    css-selector-tokenizer "^0.7.1"
+    cssauron "^1.4.0"
+    damerau-levenshtein "^1.0.4"
+    semver-dsl "^1.0.1"
+    source-map "^0.5.7"
+    sprintf-js "^1.1.2"
+
+codepage@~1.14.0:
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/codepage/-/codepage-1.14.0.tgz#8cbe25481323559d7d307571b0fff91e7a1d2f99"
+  integrity sha1-jL4lSBMjVZ19MHVxsP/5HnodL5k=
+  dependencies:
+    commander "~2.14.1"
+    exit-on-epipe "~1.0.1"
+
+collection-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
+  dependencies:
+    map-visit "^1.0.0"
+    object-visit "^1.0.0"
+
+color-convert@^1.9.0, color-convert@^1.9.1, color-convert@^1.9.3:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
+  dependencies:
+    color-name "1.1.3"
+
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+
+color-name@^1.0.0, color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
+color-string@^1.5.4:
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.5.tgz#65474a8f0e7439625f3d27a6a19d89fc45223014"
+  integrity sha512-jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg==
+  dependencies:
+    color-name "^1.0.0"
+    simple-swizzle "^0.2.2"
+
+color@^3.1.2:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/color/-/color-3.1.3.tgz#ca67fb4e7b97d611dcde39eceed422067d91596e"
+  integrity sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ==
+  dependencies:
+    color-convert "^1.9.1"
+    color-string "^1.5.4"
+
+colorette@^1.2.1, colorette@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
+  integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
+
+colors@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
+  integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM=
+
+colors@^1.1.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
+  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
+
+combine-lists@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/combine-lists/-/combine-lists-1.0.1.tgz#458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"
+  integrity sha512-4Mi0V7N48B9KzC8Zl/U7wiWuxMFEHf44N3/PSoAvWDu8IOPrddNo1y1tC/kXbP7IvVMhgCFMMNzgKb0pWoin9w==
+  dependencies:
+    lodash "^4.5.0"
+
+combined-stream@^1.0.6, combined-stream@~1.0.6:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
+  dependencies:
+    delayed-stream "~1.0.0"
+
+commander@2, commander@^2.11.0, commander@^2.12.1, commander@^2.20.0, commander@^2.9.0:
+  version "2.20.3"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+
+commander@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-3.0.2.tgz#6837c3fb677ad9933d1cfba42dd14d5117d6b39e"
+  integrity sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==
+
+commander@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
+  integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
+
+commander@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
+  integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
+
+commander@~2.14.1:
+  version "2.14.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa"
+  integrity sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw==
+
+commander@~2.17.1:
+  version "2.17.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
+  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
+
+commondir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
+
+compare-versions@^3.4.0, compare-versions@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62"
+  integrity sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==
+
+component-bind@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
+  integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=
+
+component-emitter@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
+  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
+
+component-emitter@^1.2.1, component-emitter@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
+  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
+
+component-inherit@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
+  integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=
+
+compressible@~2.0.16:
+  version "2.0.18"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
+  integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==
+  dependencies:
+    mime-db ">= 1.43.0 < 2"
+
+compression@^1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
+  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
+  dependencies:
+    accepts "~1.3.5"
+    bytes "3.0.0"
+    compressible "~2.0.16"
+    debug "2.6.9"
+    on-headers "~1.0.2"
+    safe-buffer "5.1.2"
+    vary "~1.1.2"
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+
+concat-stream@^1.5.0:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
+  dependencies:
+    buffer-from "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
+
+configstore@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/configstore/-/configstore-4.0.0.tgz#5933311e95d3687efb592c528b922d9262d227e7"
+  integrity sha512-CmquAXFBocrzaSM8mtGPMM/HiWmyIpr4CcJl/rgY2uCObZ/S7cKU0silxslqJejl+t/T9HS8E0PUNQD81JGUEQ==
+  dependencies:
+    dot-prop "^4.1.0"
+    graceful-fs "^4.1.2"
+    make-dir "^1.0.0"
+    unique-string "^1.0.0"
+    write-file-atomic "^2.0.0"
+    xdg-basedir "^3.0.0"
+
+connect-history-api-fallback@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
+  integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
+
+connect@^3.6.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8"
+  integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==
+  dependencies:
+    debug "2.6.9"
+    finalhandler "1.1.2"
+    parseurl "~1.3.3"
+    utils-merge "1.0.1"
+
+console-browserify@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
+  integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
+
+constants-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
+  integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
+
+content-disposition@0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
+  integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
+  dependencies:
+    safe-buffer "5.1.2"
+
+content-type@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
+  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
+
+convert-source-map@^1.5.1, convert-source-map@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
+  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
+  dependencies:
+    safe-buffer "~5.1.1"
+
+cookie-signature@1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
+  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
+
+cookie@0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
+  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
+
+cookie@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
+  integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
+
+copy-anything@^2.0.1:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/copy-anything/-/copy-anything-2.0.3.tgz#842407ba02466b0df844819bbe3baebbe5d45d87"
+  integrity sha512-GK6QUtisv4fNS+XcI7shX0Gx9ORg7QqIznyfho79JTnX1XhLiyZHfftvGiziqzRiEi/Bjhgpi+D2o7HxJFPnDQ==
+  dependencies:
+    is-what "^3.12.0"
+
+copy-concurrently@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
+  integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==
+  dependencies:
+    aproba "^1.1.1"
+    fs-write-stream-atomic "^1.0.8"
+    iferr "^0.1.5"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.0"
+
+copy-descriptor@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
+
+copy-webpack-plugin@6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-6.0.3.tgz#2b3d2bfc6861b96432a65f0149720adbd902040b"
+  integrity sha512-q5m6Vz4elsuyVEIUXr7wJdIdePWTubsqVbEMvf1WQnHGv0Q+9yPRu7MtYFPt+GBOXRav9lvIINifTQ1vSCs+eA==
+  dependencies:
+    cacache "^15.0.4"
+    fast-glob "^3.2.4"
+    find-cache-dir "^3.3.1"
+    glob-parent "^5.1.1"
+    globby "^11.0.1"
+    loader-utils "^2.0.0"
+    normalize-path "^3.0.0"
+    p-limit "^3.0.1"
+    schema-utils "^2.7.0"
+    serialize-javascript "^4.0.0"
+    webpack-sources "^1.4.3"
+
+core-js-compat@^3.6.2:
+  version "3.12.1"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.12.1.tgz#2c302c4708505fa7072b0adb5156d26f7801a18b"
+  integrity sha512-i6h5qODpw6EsHAoIdQhKoZdWn+dGBF3dSS8m5tif36RlWvW3A6+yu2S16QHUo3CrkzrnEskMAt9f8FxmY9fhWQ==
+  dependencies:
+    browserslist "^4.16.6"
+    semver "7.0.0"
+
+core-js@3.6.4:
+  version "3.6.4"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.4.tgz#440a83536b458114b9cb2ac1580ba377dc470647"
+  integrity sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==
+
+core-js@^2.2.0:
+  version "2.6.12"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
+  integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
+
+core-js@^3.1.3:
+  version "3.12.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.12.1.tgz#6b5af4ff55616c08a44d386f1f510917ff204112"
+  integrity sha512-Ne9DKPHTObRuB09Dru5AjwKjY4cJHVGu+y5f7coGn1E9Grkc3p2iBwE9AI/nJzsE29mQF7oq+mhYYRqOMFN1Bw==
+
+core-js@^3.6.0, core-js@^3.8.3:
+  version "3.23.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.23.1.tgz#9f9a9255115f62c512db56d567f636da32ca0b78"
+  integrity sha512-wfMYHWi1WQjpgZNC9kAlN4ut04TM9fUTdi7CqIoTVM7yaiOUQTklOzfb+oWH3r9edQcT3F887swuVmxrV+CC8w==
+
+core-util-is@1.0.2, core-util-is@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+
+cosmiconfig@^5.0.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a"
+  integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==
+  dependencies:
+    import-fresh "^2.0.0"
+    is-directory "^0.3.1"
+    js-yaml "^3.13.1"
+    parse-json "^4.0.0"
+
+cosmiconfig@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3"
+  integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==
+  dependencies:
+    "@types/parse-json" "^4.0.0"
+    import-fresh "^3.2.1"
+    parse-json "^5.0.0"
+    path-type "^4.0.0"
+    yaml "^1.10.0"
+
+coverage-istanbul-loader@2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/coverage-istanbul-loader/-/coverage-istanbul-loader-2.0.3.tgz#87d42f03fa0fd3fa8743ec76945d9d67f105722a"
+  integrity sha512-LiGRvyIuzVYs3M1ZYK1tF0HekjH0DJ8zFdUwAZq378EJzqOgToyb1690dp3TAUlP6Y+82uu42LRjuROVeJ54CA==
+  dependencies:
+    convert-source-map "^1.7.0"
+    istanbul-lib-instrument "^4.0.0"
+    loader-utils "^1.2.3"
+    merge-source-map "^1.1.0"
+    schema-utils "^2.6.1"
+
+crc-32@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz#cb2db6e29b88508e32d9dd0ec1693e7b41a18208"
+  integrity sha512-1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA==
+  dependencies:
+    exit-on-epipe "~1.0.1"
+    printj "~1.1.0"
+
+create-ecdh@^4.0.0:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e"
+  integrity sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==
+  dependencies:
+    bn.js "^4.1.0"
+    elliptic "^6.5.3"
+
+create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
+  integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
+  dependencies:
+    cipher-base "^1.0.1"
+    inherits "^2.0.1"
+    md5.js "^1.3.4"
+    ripemd160 "^2.0.1"
+    sha.js "^2.4.0"
+
+create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
+  integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
+  dependencies:
+    cipher-base "^1.0.3"
+    create-hash "^1.1.0"
+    inherits "^2.0.1"
+    ripemd160 "^2.0.0"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
+
+cross-spawn@^5.0.1:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
+  integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
+  dependencies:
+    lru-cache "^4.0.1"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
+cross-spawn@^6.0.0:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+  dependencies:
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
+crypto-browserify@^3.11.0:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
+  integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
+  dependencies:
+    browserify-cipher "^1.0.0"
+    browserify-sign "^4.0.0"
+    create-ecdh "^4.0.0"
+    create-hash "^1.1.0"
+    create-hmac "^1.1.0"
+    diffie-hellman "^5.0.0"
+    inherits "^2.0.1"
+    pbkdf2 "^3.0.3"
+    public-encrypt "^4.0.0"
+    randombytes "^2.0.0"
+    randomfill "^1.0.3"
+
+crypto-random-string@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
+  integrity sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=
+
+css-line-break@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/css-line-break/-/css-line-break-1.1.1.tgz#d5e9bdd297840099eb0503c7310fd34927a026ef"
+  integrity sha512-1feNVaM4Fyzdj4mKPIQNL2n70MmuYzAXZ1aytlROFX1JsOo070OsugwGjj7nl6jnDJWHDM8zRZswkmeYVWZJQA==
+  dependencies:
+    base64-arraybuffer "^0.2.0"
+
+css-line-break@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/css-line-break/-/css-line-break-2.1.0.tgz#bfef660dfa6f5397ea54116bb3cb4873edbc4fa0"
+  integrity sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==
+  dependencies:
+    utrie "^1.0.2"
+
+css-parse@1.7.x:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-1.7.0.tgz#321f6cf73782a6ff751111390fc05e2c657d8c9b"
+  integrity sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=
+
+css-parse@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-2.0.0.tgz#a468ee667c16d81ccf05c58c38d2a97c780dbfd4"
+  integrity sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=
+  dependencies:
+    css "^2.0.0"
+
+css-selector-tokenizer@^0.7.1:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.3.tgz#735f26186e67c749aaf275783405cf0661fae8f1"
+  integrity sha512-jWQv3oCEL5kMErj4wRnK/OPoBi0D+P1FR2cDCKYPaMeD2eW3/mttav8HT4hT1CKopiJI/psEULjkClhvJo4Lvg==
+  dependencies:
+    cssesc "^3.0.0"
+    fastparse "^1.1.2"
+
+css-unit-converter@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.2.tgz#4c77f5a1954e6dbff60695ecb214e3270436ab21"
+  integrity sha512-IiJwMC8rdZE0+xiEZHeru6YoONC4rfPMqGm2W85jMIbkFvv5nFTwJVFHam2eFrN6txmoUYFAFXiv8ICVeTO0MA==
+
+css@^2.0.0:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929"
+  integrity sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==
+  dependencies:
+    inherits "^2.0.3"
+    source-map "^0.6.1"
+    source-map-resolve "^0.5.2"
+    urix "^0.1.0"
+
+cssauron@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/cssauron/-/cssauron-1.4.0.tgz#a6602dff7e04a8306dc0db9a551e92e8b5662ad8"
+  integrity sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=
+  dependencies:
+    through X.X.X
+
+cssesc@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
+  integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
+
+cssom@0.3.x, "cssom@>= 0.3.0 < 0.4.0":
+  version "0.3.8"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
+  integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
+
+"cssstyle@>= 0.2.34 < 0.3.0":
+  version "0.2.37"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.2.37.tgz#541097234cb2513c83ceed3acddc27ff27987d54"
+  integrity sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=
+  dependencies:
+    cssom "0.3.x"
+
+cuint@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/cuint/-/cuint-0.2.2.tgz#408086d409550c2631155619e9fa7bcadc3b991b"
+  integrity sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=
+
+custom-event@~1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425"
+  integrity sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=
+
+cyclist@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
+  integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
+
+d3-array@1, d3-array@^1.1.1, d3-array@^1.2.0:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.4.tgz#635ce4d5eea759f6f605863dbcfc30edc737f71f"
+  integrity sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw==
+
+d3-axis@1:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/d3-axis/-/d3-axis-1.0.12.tgz#cdf20ba210cfbb43795af33756886fb3638daac9"
+  integrity sha512-ejINPfPSNdGFKEOAtnBtdkpr24c4d4jsei6Lg98mxf424ivoDP2956/5HDpIAtmHo85lqT4pruy+zEgvRUBqaQ==
+
+d3-brush@1:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.1.6.tgz#b0a22c7372cabec128bdddf9bddc058592f89e9b"
+  integrity sha512-7RW+w7HfMCPyZLifTz/UnJmI5kdkXtpCbombUSs8xniAyo0vIbrDzDwUJB6eJOgl9u5DQOt2TQlYumxzD1SvYA==
+  dependencies:
+    d3-dispatch "1"
+    d3-drag "1"
+    d3-interpolate "1"
+    d3-selection "1"
+    d3-transition "1"
+
+d3-chord@1:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/d3-chord/-/d3-chord-1.0.6.tgz#309157e3f2db2c752f0280fedd35f2067ccbb15f"
+  integrity sha512-JXA2Dro1Fxw9rJe33Uv+Ckr5IrAa74TlfDEhE/jfLOaXegMQFQTAgAw9WnZL8+HxVBRXaRGCkrNU7pJeylRIuA==
+  dependencies:
+    d3-array "1"
+    d3-path "1"
+
+d3-collection@1:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.7.tgz#349bd2aa9977db071091c13144d5e4f16b5b310e"
+  integrity sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A==
+
+d3-color@1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.1.tgz#c52002bf8846ada4424d55d97982fef26eb3bc8a"
+  integrity sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q==
+
+d3-contour@1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/d3-contour/-/d3-contour-1.3.2.tgz#652aacd500d2264cb3423cee10db69f6f59bead3"
+  integrity sha512-hoPp4K/rJCu0ladiH6zmJUEz6+u3lgR+GSm/QdM2BBvDraU39Vr7YdDCicJcxP1z8i9B/2dJLgDC1NcvlF8WCg==
+  dependencies:
+    d3-array "^1.1.1"
+
+d3-dispatch@1:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-1.0.6.tgz#00d37bcee4dd8cd97729dd893a0ac29caaba5d58"
+  integrity sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA==
+
+d3-drag@1:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-1.2.5.tgz#2537f451acd39d31406677b7dc77c82f7d988f70"
+  integrity sha512-rD1ohlkKQwMZYkQlYVCrSFxsWPzI97+W+PaEIBNTMxRuxz9RF0Hi5nJWHGVJ3Om9d2fRTe1yOBINJyy/ahV95w==
+  dependencies:
+    d3-dispatch "1"
+    d3-selection "1"
+
+d3-dsv@1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-1.2.0.tgz#9d5f75c3a5f8abd611f74d3f5847b0d4338b885c"
+  integrity sha512-9yVlqvZcSOMhCYzniHE7EVUws7Fa1zgw+/EAV2BxJoG3ME19V6BQFBwI855XQDsxyOuG7NibqRMTtiF/Qup46g==
+  dependencies:
+    commander "2"
+    iconv-lite "0.4"
+    rw "1"
+
+d3-ease@1:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.7.tgz#9a834890ef8b8ae8c558b2fe55bd57f5993b85e2"
+  integrity sha512-lx14ZPYkhNx0s/2HX5sLFUI3mbasHjSSpwO/KaaNACweVwxUruKyWVcb293wMv1RqTPZyZ8kSZ2NogUZNcLOFQ==
+
+d3-fetch@1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/d3-fetch/-/d3-fetch-1.2.0.tgz#15ce2ecfc41b092b1db50abd2c552c2316cf7fc7"
+  integrity sha512-yC78NBVcd2zFAyR/HnUiBS7Lf6inSCoWcSxFfw8FYL7ydiqe80SazNwoffcqOfs95XaLo7yebsmQqDKSsXUtvA==
+  dependencies:
+    d3-dsv "1"
+
+d3-force@1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/d3-force/-/d3-force-1.2.1.tgz#fd29a5d1ff181c9e7f0669e4bd72bdb0e914ec0b"
+  integrity sha512-HHvehyaiUlVo5CxBJ0yF/xny4xoaxFxDnBXNvNcfW9adORGZfyNF1dj6DGLKyk4Yh3brP/1h3rnDzdIAwL08zg==
+  dependencies:
+    d3-collection "1"
+    d3-dispatch "1"
+    d3-quadtree "1"
+    d3-timer "1"
+
+d3-format@1:
+  version "1.4.5"
+  resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.4.5.tgz#374f2ba1320e3717eb74a9356c67daee17a7edb4"
+  integrity sha512-J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ==
+
+d3-geo@1:
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.12.1.tgz#7fc2ab7414b72e59fbcbd603e80d9adc029b035f"
+  integrity sha512-XG4d1c/UJSEX9NfU02KwBL6BYPj8YKHxgBEw5om2ZnTRSbIcego6dhHwcxuSR3clxh0EpE38os1DVPOmnYtTPg==
+  dependencies:
+    d3-array "1"
+
+d3-hierarchy@1:
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-1.1.9.tgz#2f6bee24caaea43f8dc37545fa01628559647a83"
+  integrity sha512-j8tPxlqh1srJHAtxfvOUwKNYJkQuBFdM1+JAUfq6xqH5eAqf93L7oG1NVqDa4CpFZNvnNKtCYEUC8KY9yEn9lQ==
+
+d3-interpolate@1:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.4.0.tgz#526e79e2d80daa383f9e0c1c1c7dcc0f0583e987"
+  integrity sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==
+  dependencies:
+    d3-color "1"
+
+d3-path@1:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-1.0.9.tgz#48c050bb1fe8c262493a8caf5524e3e9591701cf"
+  integrity sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg==
+
+d3-polygon@1:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/d3-polygon/-/d3-polygon-1.0.6.tgz#0bf8cb8180a6dc107f518ddf7975e12abbfbd38e"
+  integrity sha512-k+RF7WvI08PC8reEoXa/w2nSg5AUMTi+peBD9cmFc+0ixHfbs4QmxxkarVal1IkVkgxVuk9JSHhJURHiyHKAuQ==
+
+d3-quadtree@1:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-1.0.7.tgz#ca8b84df7bb53763fe3c2f24bd435137f4e53135"
+  integrity sha512-RKPAeXnkC59IDGD0Wu5mANy0Q2V28L+fNe65pOCXVdVuTJS3WPKaJlFHer32Rbh9gIo9qMuJXio8ra4+YmIymA==
+
+d3-random@1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/d3-random/-/d3-random-1.1.2.tgz#2833be7c124360bf9e2d3fd4f33847cfe6cab291"
+  integrity sha512-6AK5BNpIFqP+cx/sreKzNjWbwZQCSUatxq+pPRmFIQaWuoD+NrbVWw7YWpHiXpCQ/NanKdtGDuB+VQcZDaEmYQ==
+
+d3-scale-chromatic@1:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/d3-scale-chromatic/-/d3-scale-chromatic-1.5.0.tgz#54e333fc78212f439b14641fb55801dd81135a98"
+  integrity sha512-ACcL46DYImpRFMBcpk9HhtIyC7bTBR4fNOPxwVSl0LfulDAwyiHyPOTqcDG1+t5d4P9W7t/2NAuWu59aKko/cg==
+  dependencies:
+    d3-color "1"
+    d3-interpolate "1"
+
+d3-scale@2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-2.2.2.tgz#4e880e0b2745acaaddd3ede26a9e908a9e17b81f"
+  integrity sha512-LbeEvGgIb8UMcAa0EATLNX0lelKWGYDQiPdHj+gLblGVhGLyNbaCn3EvrJf0A3Y/uOOU5aD6MTh5ZFCdEwGiCw==
+  dependencies:
+    d3-array "^1.2.0"
+    d3-collection "1"
+    d3-format "1"
+    d3-interpolate "1"
+    d3-time "1"
+    d3-time-format "2"
+
+d3-selection@1, d3-selection@^1.1.0:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.2.tgz#dcaa49522c0dbf32d6c1858afc26b6094555bc5c"
+  integrity sha512-SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg==
+
+d3-shape@1:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.3.7.tgz#df63801be07bc986bc54f63789b4fe502992b5d7"
+  integrity sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==
+  dependencies:
+    d3-path "1"
+
+d3-time-format@2:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.3.0.tgz#107bdc028667788a8924ba040faf1fbccd5a7850"
+  integrity sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==
+  dependencies:
+    d3-time "1"
+
+d3-time@1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.1.0.tgz#b1e19d307dae9c900b7e5b25ffc5dcc249a8a0f1"
+  integrity sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA==
+
+d3-timer@1:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.10.tgz#dfe76b8a91748831b13b6d9c793ffbd508dd9de5"
+  integrity sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw==
+
+d3-transition@1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.3.2.tgz#a98ef2151be8d8600543434c1ca80140ae23b398"
+  integrity sha512-sc0gRU4PFqZ47lPVHloMn9tlPcv8jxgOQg+0zjhfZXMQuvppjG6YuwdMBE0TuqCZjeJkLecku/l9R0JPcRhaDA==
+  dependencies:
+    d3-color "1"
+    d3-dispatch "1"
+    d3-ease "1"
+    d3-interpolate "1"
+    d3-selection "^1.1.0"
+    d3-timer "1"
+
+d3-voronoi@1:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/d3-voronoi/-/d3-voronoi-1.1.4.tgz#dd3c78d7653d2bb359284ae478645d95944c8297"
+  integrity sha512-dArJ32hchFsrQ8uMiTBLq256MpnZjeuBtdHpaDlYuQyjU0CVzCJl/BVW+SkszaAeH95D/8gxqAhgx0ouAWAfRg==
+
+d3-zoom@1:
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-1.8.3.tgz#b6a3dbe738c7763121cd05b8a7795ffe17f4fc0a"
+  integrity sha512-VoLXTK4wvy1a0JpH2Il+F2CiOhVu7VRXWF5M/LroMIh3/zBAC3WAt7QoIvPibOavVo20hN6/37vwAsdBejLyKQ==
+  dependencies:
+    d3-dispatch "1"
+    d3-drag "1"
+    d3-interpolate "1"
+    d3-selection "1"
+    d3-transition "1"
+
+d3@^5.9.7:
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/d3/-/d3-5.16.0.tgz#9c5e8d3b56403c79d4ed42fbd62f6113f199c877"
+  integrity sha512-4PL5hHaHwX4m7Zr1UapXW23apo6pexCgdetdJ5kTmADpG/7T9Gkxw0M0tf/pjoB63ezCCm0u5UaFYy2aMt0Mcw==
+  dependencies:
+    d3-array "1"
+    d3-axis "1"
+    d3-brush "1"
+    d3-chord "1"
+    d3-collection "1"
+    d3-color "1"
+    d3-contour "1"
+    d3-dispatch "1"
+    d3-drag "1"
+    d3-dsv "1"
+    d3-ease "1"
+    d3-fetch "1"
+    d3-force "1"
+    d3-format "1"
+    d3-geo "1"
+    d3-hierarchy "1"
+    d3-interpolate "1"
+    d3-path "1"
+    d3-polygon "1"
+    d3-quadtree "1"
+    d3-random "1"
+    d3-scale "2"
+    d3-scale-chromatic "1"
+    d3-selection "1"
+    d3-shape "1"
+    d3-time "1"
+    d3-time-format "2"
+    d3-timer "1"
+    d3-transition "1"
+    d3-voronoi "1"
+    d3-zoom "1"
+
+damerau-levenshtein@^1.0.4:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz#64368003512a1a6992593741a09a9d31a836f55d"
+  integrity sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==
+
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
+  dependencies:
+    assert-plus "^1.0.0"
+
+date-format@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/date-format/-/date-format-1.2.0.tgz#615e828e233dd1ab9bb9ae0950e0ceccfa6ecad8"
+  integrity sha512-lAJqBmFzCLcDJdI9cEnJ7loSkLTh1PbIgZUndlzvYbf6NyFEr5n9rQhOwr6CIGwZqyQ3sYeQQiP9NOVQmgmRMA==
+
+date-format@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/date-format/-/date-format-2.1.0.tgz#31d5b5ea211cf5fd764cd38baf9d033df7e125cf"
+  integrity sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==
+
+debug@*, debug@^4.1.0, debug@^4.1.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
+  integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
+  dependencies:
+    ms "2.1.2"
+
+debug@2.6.9, debug@^2.2.0, debug@^2.3.3:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+  dependencies:
+    ms "2.0.0"
+
+debug@3.1.0, debug@~3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
+  dependencies:
+    ms "2.0.0"
+
+debug@^3.1.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
+  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
+  dependencies:
+    ms "^2.1.1"
+
+debuglog@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
+  integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
+
+decamelize@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
+
+decode-uri-component@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
+
+decompress-response@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
+  integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=
+  dependencies:
+    mimic-response "^1.0.0"
+
+deep-equal@^1.0.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a"
+  integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==
+  dependencies:
+    is-arguments "^1.0.4"
+    is-date-object "^1.0.1"
+    is-regex "^1.0.4"
+    object-is "^1.0.1"
+    object-keys "^1.1.1"
+    regexp.prototype.flags "^1.2.0"
+
+deep-extend@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
+
+deep-is@~0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
+
+deepmerge@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
+  integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
+
+default-gateway@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"
+  integrity sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==
+  dependencies:
+    execa "^1.0.0"
+    ip-regex "^2.1.0"
+
+default-require-extensions@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-2.0.0.tgz#f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7"
+  integrity sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=
+  dependencies:
+    strip-bom "^3.0.0"
+
+defer-to-connect@^1.0.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
+  integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
+
+define-properties@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
+  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
+  dependencies:
+    object-keys "^1.0.12"
+
+define-property@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
+  dependencies:
+    is-descriptor "^0.1.0"
+
+define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
+  dependencies:
+    is-descriptor "^1.0.0"
+
+define-property@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
+  dependencies:
+    is-descriptor "^1.0.2"
+    isobject "^3.0.1"
+
+defined@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
+  integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=
+
+del@^2.2.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
+  integrity sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=
+  dependencies:
+    globby "^5.0.0"
+    is-path-cwd "^1.0.0"
+    is-path-in-cwd "^1.0.0"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+    rimraf "^2.2.8"
+
+del@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4"
+  integrity sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==
+  dependencies:
+    "@types/glob" "^7.1.1"
+    globby "^6.1.0"
+    is-path-cwd "^2.0.0"
+    is-path-in-cwd "^2.0.0"
+    p-map "^2.0.0"
+    pify "^4.0.1"
+    rimraf "^2.6.3"
+
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
+
+depd@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
+
+dependency-graph@^0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-0.7.2.tgz#91db9de6eb72699209d88aea4c1fd5221cac1c49"
+  integrity sha512-KqtH4/EZdtdfWX0p6MGP9jljvxSY6msy/pRUD4jgNwVpv3v1QmNLlsB3LDSSUg79BRVSn7jI1QPRtArGABovAQ==
+
+des.js@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
+  integrity sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==
+  dependencies:
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+
+destroy@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
+
+detect-node@^2.0.4:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.5.tgz#9d270aa7eaa5af0b72c4c9d9b814e7f4ce738b79"
+  integrity sha512-qi86tE6hRcFHy8jI1m2VG+LaPUR1LhqDa5G8tVjuUXmOrpuAgqsA1pN0+ldgr3aKUH+QLI9hCY/OcRYisERejw==
+
+detective@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/detective/-/detective-5.2.0.tgz#feb2a77e85b904ecdea459ad897cc90a99bd2a7b"
+  integrity sha512-6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg==
+  dependencies:
+    acorn-node "^1.6.1"
+    defined "^1.0.0"
+    minimist "^1.1.1"
+
+dezalgo@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
+  integrity sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=
+  dependencies:
+    asap "^2.0.0"
+    wrappy "1"
+
+di@^0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
+  integrity sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=
+
+diff@^3.2.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
+  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
+
+diff@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
+  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
+
+diffie-hellman@^5.0.0:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
+  integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
+  dependencies:
+    bn.js "^4.1.0"
+    miller-rabin "^4.0.0"
+    randombytes "^2.0.0"
+
+dir-glob@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
+  dependencies:
+    path-type "^4.0.0"
+
+dns-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
+  integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
+
+dns-packet@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
+  integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==
+  dependencies:
+    ip "^1.1.0"
+    safe-buffer "^5.0.1"
+
+dns-txt@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6"
+  integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=
+  dependencies:
+    buffer-indexof "^1.0.0"
+
+doctrine@0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-0.7.2.tgz#7cb860359ba3be90e040b26b729ce4bfa654c523"
+  integrity sha1-fLhgNZujvpDgQLJrcpzkv6ZUxSM=
+  dependencies:
+    esutils "^1.1.6"
+    isarray "0.0.1"
+
+dom-serialize@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b"
+  integrity sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=
+  dependencies:
+    custom-event "~1.0.0"
+    ent "~2.2.0"
+    extend "^3.0.0"
+    void-elements "^2.0.0"
+
+dom-to-image@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/dom-to-image/-/dom-to-image-2.6.0.tgz#8a503608088c87b1c22f9034ae032e1898955867"
+  integrity sha1-ilA2CAiMh7HCL5A0rgMuGJiVWGc=
+
+dom-walk@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84"
+  integrity sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==
+
+domain-browser@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
+  integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
+
+dompurify@^2.2.0:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.8.tgz#224fe9ae57d7ebd9a1ae1ac18c1c1ca3f532226f"
+  integrity sha512-eVhaWoVibIzqdGYjwsBWodIQIaXFSB+cKDf4cfxLMsK0xiud6SE+/WCVx/Xw/UwQsa4cS3T2eITcdtmTg2UKcw==
+
+dot-prop@^4.1.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.1.tgz#45884194a71fc2cda71cbb4bceb3a4dd2f433ba4"
+  integrity sha512-l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ==
+  dependencies:
+    is-obj "^1.0.0"
+
+duplexer3@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
+  integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
+
+duplexer@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
+  integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
+
+duplexify@^3.4.2, duplexify@^3.6.0:
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
+  integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
+  dependencies:
+    end-of-stream "^1.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+    stream-shift "^1.0.0"
+
+ecc-jsbn@~0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
+  dependencies:
+    jsbn "~0.1.0"
+    safer-buffer "^2.1.0"
+
+ee-first@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
+
+electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.723:
+  version "1.3.727"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.727.tgz#857e310ca00f0b75da4e1db6ff0e073cc4a91ddf"
+  integrity sha512-Mfz4FIB4FSvEwBpDfdipRIrwd6uo8gUDoRDF4QEYb4h4tSuI3ov594OrjU6on042UlFHouIJpClDODGkPcBSbg==
+
+elliptic@^6.5.3:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
+  integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
+  dependencies:
+    bn.js "^4.11.9"
+    brorand "^1.1.0"
+    hash.js "^1.0.0"
+    hmac-drbg "^1.0.1"
+    inherits "^2.0.4"
+    minimalistic-assert "^1.0.1"
+    minimalistic-crypto-utils "^1.0.1"
+
+emoji-regex@^7.0.1:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
+  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
+
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
+emojis-list@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
+  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
+
+emojis-list@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
+  integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
+
+encodeurl@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
+  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
+
+encoding@^0.1.11:
+  version "0.1.13"
+  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
+  integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
+  dependencies:
+    iconv-lite "^0.6.2"
+
+end-of-stream@^1.0.0, end-of-stream@^1.1.0:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
+  dependencies:
+    once "^1.4.0"
+
+engine.io-client@~3.2.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.2.1.tgz#6f54c0475de487158a1a7c77d10178708b6add36"
+  integrity sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==
+  dependencies:
+    component-emitter "1.2.1"
+    component-inherit "0.0.3"
+    debug "~3.1.0"
+    engine.io-parser "~2.1.1"
+    has-cors "1.1.0"
+    indexof "0.0.1"
+    parseqs "0.0.5"
+    parseuri "0.0.5"
+    ws "~3.3.1"
+    xmlhttprequest-ssl "~1.5.4"
+    yeast "0.1.2"
+
+engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.3.tgz#757ab970fbf2dfb32c7b74b033216d5739ef79a6"
+  integrity sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==
+  dependencies:
+    after "0.8.2"
+    arraybuffer.slice "~0.0.7"
+    base64-arraybuffer "0.1.5"
+    blob "0.0.5"
+    has-binary2 "~1.0.2"
+
+engine.io@~3.2.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.2.1.tgz#b60281c35484a70ee0351ea0ebff83ec8c9522a2"
+  integrity sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==
+  dependencies:
+    accepts "~1.3.4"
+    base64id "1.0.0"
+    cookie "0.3.1"
+    debug "~3.1.0"
+    engine.io-parser "~2.1.0"
+    ws "~3.3.1"
+
+enhanced-resolve@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
+  integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==
+  dependencies:
+    graceful-fs "^4.1.2"
+    memory-fs "^0.4.0"
+    tapable "^1.0.0"
+
+enhanced-resolve@^4.1.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec"
+  integrity sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==
+  dependencies:
+    graceful-fs "^4.1.2"
+    memory-fs "^0.5.0"
+    tapable "^1.0.0"
+
+ent@~2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
+  integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0=
+
+err-code@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960"
+  integrity sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=
+
+errno@^0.1.1, errno@^0.1.3, errno@~0.1.7:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f"
+  integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==
+  dependencies:
+    prr "~1.0.1"
+
+error-ex@^1.3.1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
+  dependencies:
+    is-arrayish "^0.2.1"
+
+es-abstract@^1.18.0-next.2:
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0.tgz#ab80b359eecb7ede4c298000390bc5ac3ec7b5a4"
+  integrity sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==
+  dependencies:
+    call-bind "^1.0.2"
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    get-intrinsic "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.2"
+    is-callable "^1.2.3"
+    is-negative-zero "^2.0.1"
+    is-regex "^1.1.2"
+    is-string "^1.0.5"
+    object-inspect "^1.9.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.2"
+    string.prototype.trimend "^1.0.4"
+    string.prototype.trimstart "^1.0.4"
+    unbox-primitive "^1.0.0"
+
+es-to-primitive@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
+  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
+  dependencies:
+    is-callable "^1.1.4"
+    is-date-object "^1.0.1"
+    is-symbol "^1.0.2"
+
+es6-promise@^4.0.3, es6-promise@^4.2.5:
+  version "4.2.8"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
+  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
+
+es6-promisify@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
+  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
+  dependencies:
+    es6-promise "^4.0.3"
+
+escalade@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+
+escape-html@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
+
+escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+
+escodegen@^1.6.1:
+  version "1.14.3"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503"
+  integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==
+  dependencies:
+    esprima "^4.0.1"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
+eslint-scope@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
+  integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==
+  dependencies:
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
+
+esprima@^4.0.0, esprima@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
+
+esrecurse@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
+  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
+  dependencies:
+    estraverse "^5.2.0"
+
+estraverse@^4.1.1, estraverse@^4.2.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
+
+estraverse@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
+  integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
+
+estree-walker@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362"
+  integrity sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==
+
+esutils@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-1.1.6.tgz#c01ccaa9ae4b897c6d0c3e210ae52f3c7a844375"
+  integrity sha1-wBzKqa5LiXxtDD4hCuUvPHqEQ3U=
+
+esutils@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
+
+etag@~1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
+  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
+
+eventemitter3@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-2.0.3.tgz#b5e1079b59fb5e1ba2771c0a993be060a58c99ba"
+  integrity sha1-teEHm1n7XhuidxwKmTvgYKWMmbo=
+
+eventemitter3@^4.0.0:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
+  integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
+
+events@^3.0.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
+  integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
+
+eventsource@^1.0.7:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.0.tgz#00e8ca7c92109e94b0ddf32dac677d841028cfaf"
+  integrity sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==
+  dependencies:
+    original "^1.0.0"
+
+evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
+  integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==
+  dependencies:
+    md5.js "^1.3.4"
+    safe-buffer "^5.1.1"
+
+execa@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
+  integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=
+  dependencies:
+    cross-spawn "^5.0.1"
+    get-stream "^3.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
+execa@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
+  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
+  dependencies:
+    cross-spawn "^6.0.0"
+    get-stream "^4.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
+exit-on-epipe@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz#0bdd92e87d5285d267daa8171d0eb06159689692"
+  integrity sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw==
+
+exit@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
+  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
+
+expand-braces@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/expand-braces/-/expand-braces-0.1.2.tgz#488b1d1d2451cb3d3a6b192cfc030f44c5855fea"
+  integrity sha512-zOOsEnAhvIxxd0esCNbYG2xerGf46niZ1egS43eV7Fu4t7VIScgPXMcMabCLaPrqkzwvwo6zZipDiX3t0ILF2w==
+  dependencies:
+    array-slice "^0.2.3"
+    array-unique "^0.2.1"
+    braces "^0.1.2"
+
+expand-brackets@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
+  dependencies:
+    debug "^2.3.3"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    posix-character-classes "^0.1.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+expand-range@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-0.1.1.tgz#4cb8eda0993ca56fa4f41fc42f3cbb4ccadff044"
+  integrity sha512-busOHJ0t7t5UcutcyNDqmaDX+1cb0XlqsAUgTlmplVv0rIqBaMcBSZRLlkDm0nxtl8O3o/EvRRrdQ/WnyPERLQ==
+  dependencies:
+    is-number "^0.1.1"
+    repeat-string "^0.2.2"
+
+express@^4.17.1:
+  version "4.17.1"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
+  integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
+  dependencies:
+    accepts "~1.3.7"
+    array-flatten "1.1.1"
+    body-parser "1.19.0"
+    content-disposition "0.5.3"
+    content-type "~1.0.4"
+    cookie "0.4.0"
+    cookie-signature "1.0.6"
+    debug "2.6.9"
+    depd "~1.1.2"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    finalhandler "~1.1.2"
+    fresh "0.5.2"
+    merge-descriptors "1.0.1"
+    methods "~1.1.2"
+    on-finished "~2.3.0"
+    parseurl "~1.3.3"
+    path-to-regexp "0.1.7"
+    proxy-addr "~2.0.5"
+    qs "6.7.0"
+    range-parser "~1.2.1"
+    safe-buffer "5.1.2"
+    send "0.17.1"
+    serve-static "1.14.1"
+    setprototypeof "1.1.1"
+    statuses "~1.5.0"
+    type-is "~1.6.18"
+    utils-merge "1.0.1"
+    vary "~1.1.2"
+
+extend-shallow@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
+  dependencies:
+    is-extendable "^0.1.0"
+
+extend-shallow@^3.0.0, extend-shallow@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
+  dependencies:
+    assign-symbols "^1.0.0"
+    is-extendable "^1.0.1"
+
+extend@^3.0.0, extend@^3.0.2, extend@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
+external-editor@^3.0.3:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
+  integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
+  dependencies:
+    chardet "^0.7.0"
+    iconv-lite "^0.4.24"
+    tmp "^0.0.33"
+
+extglob@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
+  dependencies:
+    array-unique "^0.3.2"
+    define-property "^1.0.0"
+    expand-brackets "^2.1.4"
+    extend-shallow "^2.0.1"
+    fragment-cache "^0.2.1"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+extsprintf@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
+
+extsprintf@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
+
+fast-deep-equal@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
+  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
+
+fast-deep-equal@^3.1.1:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
+
+fast-diff@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.1.2.tgz#4b62c42b8e03de3f848460b639079920695d0154"
+  integrity sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==
+
+fast-diff@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
+  integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
+
+fast-glob@^3.1.1, fast-glob@^3.2.4:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661"
+  integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.0"
+    merge2 "^1.3.0"
+    micromatch "^4.0.2"
+    picomatch "^2.2.1"
+
+fast-json-stable-stringify@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
+
+fast-json-stable-stringify@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
+
+fast-levenshtein@~2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+
+fastparse@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9"
+  integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==
+
+fastq@^1.6.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz#bb9fb955a07130a918eb63c1f5161cc32a5d0858"
+  integrity sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==
+  dependencies:
+    reusify "^1.0.4"
+
+faye-websocket@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
+  integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=
+  dependencies:
+    websocket-driver ">=0.5.1"
+
+faye-websocket@~0.11.1:
+  version "0.11.3"
+  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz#5c0e9a8968e8912c286639fde977a8b209f2508e"
+  integrity sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==
+  dependencies:
+    websocket-driver ">=0.5.1"
+
+fflate@^0.3.8:
+  version "0.3.11"
+  resolved "https://registry.yarnpkg.com/fflate/-/fflate-0.3.11.tgz#2c440d7180fdeb819e64898d8858af327b042a5d"
+  integrity sha512-Rr5QlUeGN1mbOHlaqcSYMKVpPbgLy0AWT/W0EHxA6NGI12yO1jpoui2zBBvU2G824ltM6Ut8BFgfHSBGfkmS0A==
+
+fflate@^0.4.8:
+  version "0.4.8"
+  resolved "https://registry.yarnpkg.com/fflate/-/fflate-0.4.8.tgz#f90b82aefbd8ac174213abb338bd7ef848f0f5ae"
+  integrity sha512-FJqqoDBR00Mdj9ppamLa/Y7vxm+PRmNWA67N846RvsoYVMKB4q3y/de5PA7gUmRMYK/8CMz2GDZQmCRN1wBcWA==
+
+figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
+  integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==
+
+figures@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
+  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
+file-loader@4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-4.2.0.tgz#5fb124d2369d7075d70a9a5abecd12e60a95215e"
+  integrity sha512-+xZnaK5R8kBJrHK0/6HRlrKNamvVS5rjyuju+rnyxRGuwUJwpAMsVzUl5dz6rK8brkzjV6JpcFNjp6NqV0g1OQ==
+  dependencies:
+    loader-utils "^1.2.3"
+    schema-utils "^2.0.0"
+
+file-saver@1.3.8:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-1.3.8.tgz#e68a30c7cb044e2fb362b428469feb291c2e09d8"
+  integrity sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg==
+
+file-saver@^2.0.2:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-2.0.5.tgz#d61cfe2ce059f414d899e9dd6d4107ee25670c38"
+  integrity sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==
+
+file-uri-to-path@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
+  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
+
+fileset@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
+  integrity sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=
+  dependencies:
+    glob "^7.0.3"
+    minimatch "^3.0.3"
+
+fill-range@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+    to-regex-range "^2.1.0"
+
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
+finalhandler@1.1.2, finalhandler@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
+  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
+  dependencies:
+    debug "2.6.9"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    on-finished "~2.3.0"
+    parseurl "~1.3.3"
+    statuses "~1.5.0"
+    unpipe "~1.0.0"
+
+find-cache-dir@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.0.0.tgz#cd4b7dd97b7185b7e17dbfe2d6e4115ee3eeb8fc"
+  integrity sha512-t7ulV1fmbxh5G9l/492O1p5+EBbr3uwpt6odhFTMc+nWyhmbloe+ja9BZ8pIBtqFWhOmCWVjx+pTW4zDkFoclw==
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^3.0.0"
+    pkg-dir "^4.1.0"
+
+find-cache-dir@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
+  integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^2.0.0"
+    pkg-dir "^3.0.0"
+
+find-cache-dir@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880"
+  integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^3.0.2"
+    pkg-dir "^4.1.0"
+
+find-parent-dir@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54"
+  integrity sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ=
+
+find-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
+  dependencies:
+    locate-path "^3.0.0"
+
+find-up@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
+  dependencies:
+    locate-path "^5.0.0"
+    path-exists "^4.0.0"
+
+find-up@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+  dependencies:
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
+
+find-versions@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-4.0.0.tgz#3c57e573bf97769b8cb8df16934b627915da4965"
+  integrity sha512-wgpWy002tA+wgmO27buH/9KzyEOQnKsG/R0yrcjPT9BOFm0zRBVQbZ95nRGXWMywS8YR5knRbpohio0bcJABxQ==
+  dependencies:
+    semver-regex "^3.1.2"
+
+flatted@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
+  integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
+
+flush-write-stream@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
+  integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==
+  dependencies:
+    inherits "^2.0.3"
+    readable-stream "^2.3.6"
+
+follow-redirects@^1.0.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43"
+  integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==
+
+for-in@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
+
+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
+
+form-data@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.6"
+    mime-types "^2.1.12"
+
+forwarded@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
+  integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
+
+frac@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/frac/-/frac-1.1.2.tgz#3d74f7f6478c88a1b5020306d747dc6313c74d0b"
+  integrity sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==
+
+fragment-cache@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
+  dependencies:
+    map-cache "^0.2.2"
+
+fresh@0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
+  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
+
+from2@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
+  integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
+  dependencies:
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+
+fs-extra@^0.26.5:
+  version "0.26.7"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.26.7.tgz#9ae1fdd94897798edab76d0918cf42d0c3184fa9"
+  integrity sha1-muH92UiXeY7at20JGM9C0MMYT6k=
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^2.1.0"
+    klaw "^1.0.0"
+    path-is-absolute "^1.0.0"
+    rimraf "^2.2.8"
+
+fs-extra@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
+  integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+fs-extra@^8.0.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
+  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+fs-minipass@^1.2.5:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
+  integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
+  dependencies:
+    minipass "^2.6.0"
+
+fs-minipass@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
+  integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
+  dependencies:
+    minipass "^3.0.0"
+
+fs-promise@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/fs-promise/-/fs-promise-0.5.0.tgz#4347d6bf624655a7061a4319213c393276ad3ef3"
+  integrity sha1-Q0fWv2JGVacGGkMZITw5MnatPvM=
+  dependencies:
+    any-promise "^1.0.0"
+    fs-extra "^0.26.5"
+    mz "^2.3.1"
+    thenify-all "^1.6.0"
+
+fs-write-stream-atomic@^1.0.8:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
+  integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=
+  dependencies:
+    graceful-fs "^4.1.2"
+    iferr "^0.1.5"
+    imurmurhash "^0.1.4"
+    readable-stream "1 || 2"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+
+fsevents@^1.2.7:
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
+  integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==
+  dependencies:
+    bindings "^1.5.0"
+    nan "^2.12.1"
+
+fsevents@~2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
+
+function-bind@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+
+genfun@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537"
+  integrity sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==
+
+gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.2:
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
+  integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
+
+get-caller-file@^1.0.1, get-caller-file@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
+  integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
+
+get-caller-file@^2.0.0, get-caller-file@^2.0.1:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
+  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+
+get-stream@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
+  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
+
+get-stream@^4.0.0, get-stream@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
+  dependencies:
+    pump "^3.0.0"
+
+get-stream@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
+  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
+  dependencies:
+    pump "^3.0.0"
+
+get-value@^2.0.3, get-value@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
+
+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
+  dependencies:
+    assert-plus "^1.0.0"
+
+gl-preserve-state@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/gl-preserve-state/-/gl-preserve-state-1.0.0.tgz#4ef710d62873f1470ed015c6546c37dacddd4198"
+  integrity sha512-zQZ25l3haD4hvgJZ6C9+s0ebdkW9y+7U2qxvGu1uWOJh8a4RU+jURIKEQhf8elIlFpMH6CrAY2tH0mYrRjet3Q==
+
+glob-parent@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
+  dependencies:
+    is-glob "^3.1.0"
+    path-dirname "^1.0.0"
+
+glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@~5.1.0:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+  dependencies:
+    is-glob "^4.0.1"
+
+glob@7.0.x:
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a"
+  integrity sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.2"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@7.1.4:
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
+  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
+  version "7.1.7"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
+  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+global-dirs@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
+  integrity sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=
+  dependencies:
+    ini "^1.3.4"
+
+global@4.3.2, global@~4.3.0:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f"
+  integrity sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=
+  dependencies:
+    min-document "^2.19.0"
+    process "~0.5.1"
+
+global@^4.3.0, global@^4.3.1, global@^4.3.2, global@^4.4.0, global@~4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406"
+  integrity sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==
+  dependencies:
+    min-document "^2.19.0"
+    process "^0.11.10"
+
+globals@^11.1.0:
+  version "11.12.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
+  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
+
+globby@^11.0.1:
+  version "11.0.3"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz#9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb"
+  integrity sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==
+  dependencies:
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.1.1"
+    ignore "^5.1.4"
+    merge2 "^1.3.0"
+    slash "^3.0.0"
+
+globby@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
+  integrity sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=
+  dependencies:
+    array-union "^1.0.1"
+    arrify "^1.0.0"
+    glob "^7.0.3"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+globby@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
+  integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
+  dependencies:
+    array-union "^1.0.1"
+    glob "^7.0.3"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+got@^9.6.0:
+  version "9.6.0"
+  resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85"
+  integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==
+  dependencies:
+    "@sindresorhus/is" "^0.14.0"
+    "@szmarczak/http-timer" "^1.1.2"
+    cacheable-request "^6.0.0"
+    decompress-response "^3.3.0"
+    duplexer3 "^0.1.4"
+    get-stream "^4.1.0"
+    lowercase-keys "^1.0.1"
+    mimic-response "^1.0.1"
+    p-cancelable "^1.0.0"
+    to-readable-stream "^1.0.0"
+    url-parse-lax "^3.0.0"
+
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0:
+  version "4.2.6"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
+  integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
+
+grunt-karma@^0.12.2:
+  version "0.12.2"
+  resolved "https://registry.yarnpkg.com/grunt-karma/-/grunt-karma-0.12.2.tgz#d52676ab94779e4b20052b5f3519eb32653dc566"
+  integrity sha512-houkUR8sks8uliJ5khwvV4Cf2vrxSPkvCt+w9uwOOHhDOCLZ9ZE4/MeDmC7GgSajGK+h/svpacbKFHyjNbCsng==
+  dependencies:
+    lodash "^3.10.1"
+
+gzip-size@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462"
+  integrity sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==
+  dependencies:
+    duplexer "^0.1.2"
+
+gzipper@^2.8.1:
+  version "2.10.4"
+  resolved "https://registry.yarnpkg.com/gzipper/-/gzipper-2.10.4.tgz#01746933b0655dcebfa5d668d1dcab007002c1bb"
+  integrity sha512-5I10NtGBdwwWDVAty+/y3EHVS3vyLldAoAtiF79hcAxC6W4x17f1dc13ua5c8HaXOP6eSf7Tq2zJzZKYJogBOQ==
+  dependencies:
+    commander "^3.0.0"
+    uuid "^3.3.3"
+
+hammerjs@^2.0.8:
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/hammerjs/-/hammerjs-2.0.8.tgz#04ef77862cff2bb79d30f7692095930222bf60f1"
+  integrity sha1-BO93hiz/K7edMPdpIJWTAiK/YPE=
+
+handle-thing@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
+  integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==
+
+har-schema@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
+
+har-validator@~5.1.3:
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
+  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
+  dependencies:
+    ajv "^6.12.3"
+    har-schema "^2.0.0"
+
+has-ansi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
+  dependencies:
+    ansi-regex "^2.0.0"
+
+has-bigints@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
+  integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
+
+has-binary2@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
+  integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==
+  dependencies:
+    isarray "2.0.1"
+
+has-cors@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
+  integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
+
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
+has-symbols@^1.0.1, has-symbols@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
+  integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
+
+has-value@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
+  dependencies:
+    get-value "^2.0.3"
+    has-values "^0.1.4"
+    isobject "^2.0.0"
+
+has-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
+  dependencies:
+    get-value "^2.0.6"
+    has-values "^1.0.0"
+    isobject "^3.0.0"
+
+has-values@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
+
+has-values@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
+
+has-yarn@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"
+  integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==
+
+has@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+  dependencies:
+    function-bind "^1.1.1"
+
+hash-base@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"
+  integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==
+  dependencies:
+    inherits "^2.0.4"
+    readable-stream "^3.6.0"
+    safe-buffer "^5.2.0"
+
+hash.js@^1.0.0, hash.js@^1.0.3:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
+  integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
+  dependencies:
+    inherits "^2.0.3"
+    minimalistic-assert "^1.0.1"
+
+"hashish@>=0.0.2 <0.1":
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/hashish/-/hashish-0.0.4.tgz#6d60bc6ffaf711b6afd60e426d077988014e6554"
+  integrity sha1-bWC8b/r3Ebav1g5CbQd5iAFOZVQ=
+  dependencies:
+    traverse ">=0.2.4"
+
+hmac-drbg@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
+  integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
+  dependencies:
+    hash.js "^1.0.3"
+    minimalistic-assert "^1.0.0"
+    minimalistic-crypto-utils "^1.0.1"
+
+hosted-git-info@^2.1.4, hosted-git-info@^2.6.0, hosted-git-info@^2.7.1:
+  version "2.8.9"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
+  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
+
+hpack.js@^2.1.6:
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
+  integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=
+  dependencies:
+    inherits "^2.0.1"
+    obuf "^1.0.0"
+    readable-stream "^2.0.1"
+    wbuf "^1.1.0"
+
+html-entities@^1.3.1:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.4.0.tgz#cfbd1b01d2afaf9adca1b10ae7dffab98c71d2dc"
+  integrity sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==
+
+html-escaper@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
+  integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
+
+html-tags@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140"
+  integrity sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==
+
+html2canvas@^1.0.0-alpha.12:
+  version "1.0.0-rc.7"
+  resolved "https://registry.yarnpkg.com/html2canvas/-/html2canvas-1.0.0-rc.7.tgz#70c159ce0e63954a91169531894d08ad5627ac98"
+  integrity sha512-yvPNZGejB2KOyKleZspjK/NruXVQuowu8NnV2HYG7gW7ytzl+umffbtUI62v2dCHQLDdsK6HIDtyJZ0W3neerA==
+  dependencies:
+    css-line-break "1.1.1"
+
+html2canvas@^1.0.0-rc.5:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/html2canvas/-/html2canvas-1.4.1.tgz#7cef1888311b5011d507794a066041b14669a543"
+  integrity sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==
+  dependencies:
+    css-line-break "^2.1.0"
+    text-segmentation "^1.0.3"
+
+html2pdf.js@^0.9.1:
+  version "0.9.3"
+  resolved "https://registry.yarnpkg.com/html2pdf.js/-/html2pdf.js-0.9.3.tgz#e7fc6143f748ce253670eaae403987342b66b15c"
+  integrity sha512-M254g3Z+ZsjtQFDxJlU6E8Zgb8xOpCBQQM1lFPn4Lq+myAdWoYtMFnwlVo/eOI9R1cG75+YmMSDQofkugwOV/Q==
+  dependencies:
+    es6-promise "^4.2.5"
+    html2canvas "^1.0.0-alpha.12"
+    jspdf "1.4.1"
+
+http-cache-semantics@^3.8.1:
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
+  integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==
+
+http-cache-semantics@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
+  integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
+
+http-deceiver@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
+  integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=
+
+http-errors@1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
+  integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
+
+http-errors@~1.6.2:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
+  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.0"
+    statuses ">= 1.4.0 < 2"
+
+http-errors@~1.7.2:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
+  integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.4"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
+
+http-parser-js@>=0.5.1:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz#01d2709c79d41698bb01d4decc5e9da4e4a033d9"
+  integrity sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==
+
+http-proxy-agent@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
+  integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==
+  dependencies:
+    agent-base "4"
+    debug "3.1.0"
+
+http-proxy-middleware@0.19.1:
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
+  integrity sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==
+  dependencies:
+    http-proxy "^1.17.0"
+    is-glob "^4.0.0"
+    lodash "^4.17.11"
+    micromatch "^3.1.10"
+
+http-proxy@^1.13.0, http-proxy@^1.17.0:
+  version "1.18.1"
+  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
+  integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
+  dependencies:
+    eventemitter3 "^4.0.0"
+    follow-redirects "^1.0.0"
+    requires-port "^1.0.0"
+
+http-signature@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
+  dependencies:
+    assert-plus "^1.0.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
+https-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
+  integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
+
+https-proxy-agent@^2.2.1, https-proxy-agent@^2.2.3:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
+  integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
+  dependencies:
+    agent-base "^4.3.0"
+    debug "^3.1.0"
+
+humanize-ms@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
+  integrity sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=
+  dependencies:
+    ms "^2.0.0"
+
+husky@^4.2.3:
+  version "4.3.8"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-4.3.8.tgz#31144060be963fd6850e5cc8f019a1dfe194296d"
+  integrity sha512-LCqqsB0PzJQ/AlCgfrfzRe3e3+NvmefAdKQhRYpxS4u6clblBoDdzzvHi8fmxKRzvMxPY/1WZWzomPZww0Anow==
+  dependencies:
+    chalk "^4.0.0"
+    ci-info "^2.0.0"
+    compare-versions "^3.6.0"
+    cosmiconfig "^7.0.0"
+    find-versions "^4.0.0"
+    opencollective-postinstall "^2.0.2"
+    pkg-dir "^5.0.0"
+    please-upgrade-node "^3.2.0"
+    slash "^3.0.0"
+    which-pm-runs "^1.0.0"
+
+iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.13, iconv-lite@^0.4.24:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
+iconv-lite@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01"
+  integrity sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3.0.0"
+
+ieee754@^1.1.13, ieee754@^1.1.4:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
+
+iferr@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
+  integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
+
+ignore-walk@^3.0.1:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.4.tgz#c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335"
+  integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==
+  dependencies:
+    minimatch "^3.0.4"
+
+ignore@^5.1.4:
+  version "5.1.8"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
+  integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
+
+image-size@~0.5.0:
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
+  integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=
+
+immediate@~3.0.5:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
+  integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
+
+import-cwd@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
+  integrity sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=
+  dependencies:
+    import-from "^2.1.0"
+
+import-fresh@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
+  integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY=
+  dependencies:
+    caller-path "^2.0.0"
+    resolve-from "^3.0.0"
+
+import-fresh@^3.2.1:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
+  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
+  dependencies:
+    parent-module "^1.0.0"
+    resolve-from "^4.0.0"
+
+import-from@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1"
+  integrity sha1-M1238qev/VOqpHHUuAId7ja387E=
+  dependencies:
+    resolve-from "^3.0.0"
+
+import-lazy@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
+  integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=
+
+import-local@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
+  integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==
+  dependencies:
+    pkg-dir "^3.0.0"
+    resolve-cwd "^2.0.0"
+
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+
+indent-string@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
+  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
+
+indexof@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
+  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
+
+individual@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/individual/-/individual-2.0.0.tgz#833b097dad23294e76117a98fb38e0d9ad61bb97"
+  integrity sha1-gzsJfa0jKU52EXqY+zjg2a1hu5c=
+
+infer-owner@^1.0.3, infer-owner@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
+  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+inherits@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
+
+inherits@2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+
+ini@1.3.5:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+
+ini@^1.3.4, ini@~1.3.0:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
+
+injection-js@^2.2.1:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/injection-js/-/injection-js-2.4.0.tgz#ebe8871b1a349f23294eaa751bbd8209a636e754"
+  integrity sha512-6jiJt0tCAo9zjHbcwLiPL+IuNe9SQ6a9g0PEzafThW3fOQi0mrmiJGBJvDD6tmhPh8cQHIQtCOrJuBfQME4kPA==
+  dependencies:
+    tslib "^2.0.0"
+
+inquirer@6.5.1:
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.1.tgz#8bfb7a5ac02dac6ff641ac4c5ff17da112fcdb42"
+  integrity sha512-uxNHBeQhRXIoHWTSNYUFhQVrHYFThIt6IVo2fFmSe8aBwdR3/w6b58hJpiL/fMukFkvGzjg+hSxFtwvVmKZmXw==
+  dependencies:
+    ansi-escapes "^4.2.1"
+    chalk "^2.4.2"
+    cli-cursor "^3.1.0"
+    cli-width "^2.0.0"
+    external-editor "^3.0.3"
+    figures "^3.0.0"
+    lodash "^4.17.15"
+    mute-stream "0.0.8"
+    run-async "^2.2.0"
+    rxjs "^6.4.0"
+    string-width "^4.1.0"
+    strip-ansi "^5.1.0"
+    through "^2.3.6"
+
+internal-ip@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
+  integrity sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==
+  dependencies:
+    default-gateway "^4.2.0"
+    ipaddr.js "^1.9.0"
+
+invariant@^2.2.2:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
+  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
+  dependencies:
+    loose-envify "^1.0.0"
+
+inversify@^5.0.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/inversify/-/inversify-5.1.1.tgz#6fbd668c591337404e005a1946bfe0d802c08730"
+  integrity sha512-j8grHGDzv1v+8T1sAQ+3boTCntFPfvxLCkNcxB1J8qA0lUN+fAlSyYd+RXKvaPRL4AGyPxViutBEJHNXOyUdFQ==
+
+invert-kv@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
+  integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
+
+ip-regex@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
+  integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
+
+ip@1.1.5, ip@^1.1.0, ip@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
+  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
+
+ipaddr.js@1.9.1, ipaddr.js@^1.9.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
+  integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
+
+is-absolute-url@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698"
+  integrity sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==
+
+is-accessor-descriptor@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-accessor-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
+  dependencies:
+    kind-of "^6.0.0"
+
+is-arguments@^1.0.4:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.0.tgz#62353031dfbee07ceb34656a6bde59efecae8dd9"
+  integrity sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==
+  dependencies:
+    call-bind "^1.0.0"
+
+is-arrayish@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
+
+is-arrayish@^0.3.1:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
+  integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
+
+is-bigint@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz#ffb381442503235ad245ea89e45b3dbff040ee5a"
+  integrity sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==
+
+is-binary-path@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
+  dependencies:
+    binary-extensions "^1.0.0"
+
+is-binary-path@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
+  dependencies:
+    binary-extensions "^2.0.0"
+
+is-boolean-object@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz#3c0878f035cb821228d350d2e1e36719716a3de8"
+  integrity sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==
+  dependencies:
+    call-bind "^1.0.2"
+
+is-buffer@^1.1.5:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
+
+is-callable@^1.1.4, is-callable@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e"
+  integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==
+
+is-ci@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
+  integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
+  dependencies:
+    ci-info "^2.0.0"
+
+is-core-module@^2.2.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz#8e9fc8e15027b011418026e98f0e6f4d86305cc1"
+  integrity sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==
+  dependencies:
+    has "^1.0.3"
+
+is-data-descriptor@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-data-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
+  dependencies:
+    kind-of "^6.0.0"
+
+is-date-object@^1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz#550cfcc03afada05eea3dd30981c7b09551f73e5"
+  integrity sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==
+
+is-descriptor@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
+  dependencies:
+    is-accessor-descriptor "^0.1.6"
+    is-data-descriptor "^0.1.4"
+    kind-of "^5.0.0"
+
+is-descriptor@^1.0.0, is-descriptor@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
+  dependencies:
+    is-accessor-descriptor "^1.0.0"
+    is-data-descriptor "^1.0.0"
+    kind-of "^6.0.2"
+
+is-directory@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
+  integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
+
+is-extendable@^0.1.0, is-extendable@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
+
+is-extendable@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
+  dependencies:
+    is-plain-object "^2.0.4"
+
+is-extglob@^2.1.0, is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+
+is-fullwidth-code-point@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
+  dependencies:
+    number-is-nan "^1.0.0"
+
+is-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
+
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
+is-function@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.2.tgz#4f097f30abf6efadac9833b17ca5dc03f8144e08"
+  integrity sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==
+
+is-glob@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
+  dependencies:
+    is-extglob "^2.1.0"
+
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
+  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
+  dependencies:
+    is-extglob "^2.1.1"
+
+is-installed-globally@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80"
+  integrity sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=
+  dependencies:
+    global-dirs "^0.1.0"
+    is-path-inside "^1.0.0"
+
+is-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
+  integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
+
+is-negative-zero@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
+  integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
+
+is-npm@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-3.0.0.tgz#ec9147bfb629c43f494cf67936a961edec7e8053"
+  integrity sha512-wsigDr1Kkschp2opC4G3yA6r9EgVA6NjRpWzIi9axXqeIaAATPRJc4uLujXe3Nd9uO8KoDyA4MD6aZSeXTADhA==
+
+is-number-object@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz#6edfaeed7950cff19afedce9fbfca9ee6dd289eb"
+  integrity sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==
+
+is-number@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-0.1.1.tgz#69a7af116963d47206ec9bd9b48a14216f1e3806"
+  integrity sha512-la5kPULwIgkSSaZj9w7/A1uHqOBAgOhDUKQ5CkfL8LZ4Si6r4+2D0hI6b4o60MW4Uj2yNJARWIZUDPxlvOYQcw==
+
+is-number@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
+is-obj@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
+
+is-path-cwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
+  integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
+
+is-path-cwd@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
+  integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==
+
+is-path-in-cwd@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
+  integrity sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==
+  dependencies:
+    is-path-inside "^1.0.0"
+
+is-path-in-cwd@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz#bfe2dca26c69f397265a4009963602935a053acb"
+  integrity sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==
+  dependencies:
+    is-path-inside "^2.1.0"
+
+is-path-inside@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
+  integrity sha1-jvW33lBDej/cprToZe96pVy0gDY=
+  dependencies:
+    path-is-inside "^1.0.1"
+
+is-path-inside@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz#7c9810587d659a40d27bcdb4d5616eab059494b2"
+  integrity sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==
+  dependencies:
+    path-is-inside "^1.0.2"
+
+is-plain-obj@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
+
+is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
+  dependencies:
+    isobject "^3.0.1"
+
+is-reference@^1.1.2:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.2.1.tgz#8b2dac0b371f4bc994fdeaba9eb542d03002d0b7"
+  integrity sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==
+  dependencies:
+    "@types/estree" "*"
+
+is-regex@^1.0.4, is-regex@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz#d029f9aff6448b93ebbe3f33dac71511fdcbef9f"
+  integrity sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==
+  dependencies:
+    call-bind "^1.0.2"
+    has-symbols "^1.0.2"
+
+is-stream@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
+
+is-string@^1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz#3fe5d5992fb0d93404f32584d4b0179a71b54a5f"
+  integrity sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==
+
+is-symbol@^1.0.2, is-symbol@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
+  integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
+  dependencies:
+    has-symbols "^1.0.2"
+
+is-typedarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
+
+is-what@^3.12.0:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/is-what/-/is-what-3.14.1.tgz#e1222f46ddda85dead0fd1c9df131760e77755c1"
+  integrity sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==
+
+is-windows@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
+
+is-wsl@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
+  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
+
+is-yarn-global@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232"
+  integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==
+
+isarray@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
+
+isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+
+isarray@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
+  integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=
+
+isbinaryfile@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80"
+  integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==
+  dependencies:
+    buffer-alloc "^1.2.0"
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+
+isobject@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
+  dependencies:
+    isarray "1.0.0"
+
+isobject@^3.0.0, isobject@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
+
+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
+
+istanbul-api@^2.1.6:
+  version "2.1.7"
+  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-2.1.7.tgz#82786b79f3b93d481349c7aa1e2c2b4eeb48c8a8"
+  integrity sha512-LYTOa2UrYFyJ/aSczZi/6lBykVMjCCvUmT64gOe+jPZFy4w6FYfPGqFT2IiQ2BxVHHDOvCD7qrIXb0EOh4uGWw==
+  dependencies:
+    async "^2.6.2"
+    compare-versions "^3.4.0"
+    fileset "^2.0.3"
+    istanbul-lib-coverage "^2.0.5"
+    istanbul-lib-hook "^2.0.7"
+    istanbul-lib-instrument "^3.3.0"
+    istanbul-lib-report "^2.0.8"
+    istanbul-lib-source-maps "^3.0.6"
+    istanbul-reports "^2.2.5"
+    js-yaml "^3.13.1"
+    make-dir "^2.1.0"
+    minimatch "^3.0.4"
+    once "^1.4.0"
+
+istanbul-lib-coverage@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#675f0ab69503fad4b1d849f736baaca803344f49"
+  integrity sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==
+
+istanbul-lib-coverage@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec"
+  integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==
+
+istanbul-lib-hook@^2.0.7:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-2.0.7.tgz#c95695f383d4f8f60df1f04252a9550e15b5b133"
+  integrity sha512-vrRztU9VRRFDyC+aklfLoeXyNdTfga2EI3udDGn4cZ6fpSXpHLV9X6CHvfoMCPtggg8zvDDmC4b9xfu0z6/llA==
+  dependencies:
+    append-transform "^1.0.0"
+
+istanbul-lib-instrument@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz#a5f63d91f0bbc0c3e479ef4c5de027335ec6d630"
+  integrity sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==
+  dependencies:
+    "@babel/generator" "^7.4.0"
+    "@babel/parser" "^7.4.3"
+    "@babel/template" "^7.4.0"
+    "@babel/traverse" "^7.4.3"
+    "@babel/types" "^7.4.0"
+    istanbul-lib-coverage "^2.0.5"
+    semver "^6.0.0"
+
+istanbul-lib-instrument@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d"
+  integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==
+  dependencies:
+    "@babel/core" "^7.7.5"
+    "@istanbuljs/schema" "^0.1.2"
+    istanbul-lib-coverage "^3.0.0"
+    semver "^6.3.0"
+
+istanbul-lib-report@^2.0.8:
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz#5a8113cd746d43c4889eba36ab10e7d50c9b4f33"
+  integrity sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==
+  dependencies:
+    istanbul-lib-coverage "^2.0.5"
+    make-dir "^2.1.0"
+    supports-color "^6.1.0"
+
+istanbul-lib-source-maps@^3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz#284997c48211752ec486253da97e3879defba8c8"
+  integrity sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==
+  dependencies:
+    debug "^4.1.1"
+    istanbul-lib-coverage "^2.0.5"
+    make-dir "^2.1.0"
+    rimraf "^2.6.3"
+    source-map "^0.6.1"
+
+istanbul-reports@^2.2.5:
+  version "2.2.7"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.7.tgz#5d939f6237d7b48393cc0959eab40cd4fd056931"
+  integrity sha512-uu1F/L1o5Y6LzPVSVZXNOoD/KXpJue9aeLRd0sM9uMXfZvzomB0WxVamWb5ue8kA2vVWEmW7EG+A5n3f1kqHKg==
+  dependencies:
+    html-escaper "^2.0.0"
+
+jasmine-core@^3.3:
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.7.1.tgz#0401327f6249eac993d47bbfa18d4e8efacfb561"
+  integrity sha512-DH3oYDS/AUvvr22+xUBW62m1Xoy7tUlY1tsxKEJvl5JeJ7q8zd1K5bUwiOxdH+erj6l2vAMM3hV25Xs9/WrmuQ==
+
+jasmine-core@~2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
+  integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=
+
+jasmine-core@~3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.4.0.tgz#2a74618e966026530c3518f03e9f845d26473ce3"
+  integrity sha512-HU/YxV4i6GcmiH4duATwAbJQMlE0MsDIR5XmSVxURxKHn3aGAdbY1/ZJFmVRbKtnLwIxxMJD7gYaPsypcbYimg==
+
+jasmine-spec-reporter@~4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz#1d632aec0341670ad324f92ba84b4b32b35e9e22"
+  integrity sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==
+  dependencies:
+    colors "1.1.2"
+
+jasmine@2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.8.0.tgz#6b089c0a11576b1f16df11b80146d91d4e8b8a3e"
+  integrity sha1-awicChFXax8W3xG4AUbZHU6Lij4=
+  dependencies:
+    exit "^0.1.2"
+    glob "^7.0.6"
+    jasmine-core "~2.8.0"
+
+jasminewd2@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-2.2.0.tgz#e37cf0b17f199cce23bea71b2039395246b4ec4e"
+  integrity sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=
+
+jest-worker@24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.9.0.tgz#5dbfdb5b2d322e98567898238a9697bcce67b3e5"
+  integrity sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==
+  dependencies:
+    merge-stream "^2.0.0"
+    supports-color "^6.1.0"
+
+jest-worker@^26.0.0:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
+  integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
+  dependencies:
+    "@types/node" "*"
+    merge-stream "^2.0.0"
+    supports-color "^7.0.0"
+
+jquery@^3.4.1:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
+  integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
+
+"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
+
+js-yaml@^3.13.1:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
+
+jsdom@^8.1.0:
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-8.5.0.tgz#d4d8f5dbf2768635b62a62823b947cf7071ebc98"
+  integrity sha1-1Nj12/J2hjW2KmKCO5R89wcevJg=
+  dependencies:
+    abab "^1.0.0"
+    acorn "^2.4.0"
+    acorn-globals "^1.0.4"
+    array-equal "^1.0.0"
+    cssom ">= 0.3.0 < 0.4.0"
+    cssstyle ">= 0.2.34 < 0.3.0"
+    escodegen "^1.6.1"
+    iconv-lite "^0.4.13"
+    nwmatcher ">= 1.3.7 < 2.0.0"
+    parse5 "^1.5.1"
+    request "^2.55.0"
+    sax "^1.1.4"
+    symbol-tree ">= 3.1.0 < 4.0.0"
+    tough-cookie "^2.2.0"
+    webidl-conversions "^3.0.1"
+    whatwg-url "^2.0.1"
+    xml-name-validator ">= 2.0.1 < 3.0.0"
+
+jsesc@^2.5.1:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
+
+jsesc@~0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
+  integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
+
+json-buffer@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
+  integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=
+
+json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
+  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
+
+json-parse-even-better-errors@^2.3.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
+  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
+
+json-schema-traverse@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
+
+json-schema@0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
+
+json-stringify-safe@~5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
+
+json3@^3.3.2:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
+  integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==
+
+json5@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
+  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  dependencies:
+    minimist "^1.2.0"
+
+json5@^2.1.0, json5@^2.1.2:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
+  integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
+  dependencies:
+    minimist "^1.2.5"
+
+jsonfile@^2.1.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
+  integrity sha1-NzaitCi4e72gzIO1P6PWM6NcKug=
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+jsonfile@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+jsonparse@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
+  integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
+
+jspdf@1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jspdf/-/jspdf-1.4.1.tgz#8dbd437986346d65efe20ede5361927666b8e4ca"
+  integrity sha512-2vYVdrvrQUdKKPyWHw81t1jEYYAJ6uFJ/HtTcGbI4qXIQEdl18dLEuL2wTeSv2GzeQLSgUvEvwsXsszuHK+PTw==
+  dependencies:
+    canvg "^1.0"
+    cf-blob.js "0.0.1"
+    file-saver "1.3.8"
+    omggif "1.0.7"
+    stackblur "^1.0.0"
+
+jspdf@^2.3.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/jspdf/-/jspdf-2.5.1.tgz#00c85250abf5447a05f3b32ab9935ab4a56592cc"
+  integrity sha512-hXObxz7ZqoyhxET78+XR34Xu2qFGrJJ2I2bE5w4SM8eFaFEkW2xcGRVUss360fYelwRSid/jT078kbNvmoW0QA==
+  dependencies:
+    "@babel/runtime" "^7.14.0"
+    atob "^2.1.2"
+    btoa "^1.2.1"
+    fflate "^0.4.8"
+  optionalDependencies:
+    canvg "^3.0.6"
+    core-js "^3.6.0"
+    dompurify "^2.2.0"
+    html2canvas "^1.0.0-rc.5"
+
+jsplumb@2.11.2:
+  version "2.11.2"
+  resolved "https://registry.yarnpkg.com/jsplumb/-/jsplumb-2.11.2.tgz#f8de737ea4b2551ebd95ca4b57dc096c3833e7dd"
+  integrity sha512-GyZE8l2JeZ0haOzHhsgykD8k1j5st1v2nNWaNNMqmRmGU43iuP9iBDAXDxmGNPp1t+4W++sT1SkbI8754YMtIg==
+
+jsprim@^1.2.2:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.3.0"
+    json-schema "0.2.3"
+    verror "1.10.0"
+
+jszip@^3.1.3:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.6.0.tgz#839b72812e3f97819cc13ac4134ffced95dd6af9"
+  integrity sha512-jgnQoG9LKnWO3mnVNBnfhkh0QknICd1FGSrXcgrl67zioyJ4wgx25o9ZqwNtrROSflGBCGYnJfjrIyRIby1OoQ==
+  dependencies:
+    lie "~3.3.0"
+    pako "~1.0.2"
+    readable-stream "~2.3.6"
+    set-immediate-shim "~1.0.1"
+
+karma-chrome-launcher@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-3.0.0.tgz#5c3a7f877a304e90781c28fcd9a49e334a890f42"
+  integrity sha512-u/PnVgDOP97AUe/gJeABlC6Wa6aQ83MZsm0JgsJQ5bGQ9XcXON/7b2aRhl59A62Zom+q3PFveBkczc7E1RT7TA==
+  dependencies:
+    which "^1.2.1"
+
+karma-coverage-istanbul-reporter@~2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.1.1.tgz#37a775fbfbb3cbe98cebf19605c94c6277c3b88a"
+  integrity sha512-CH8lTi8+kKXGvrhy94+EkEMldLCiUA0xMOiL31vvli9qK0T+qcXJAwWBRVJWnVWxYkTmyWar8lPz63dxX6/z1A==
+  dependencies:
+    istanbul-api "^2.1.6"
+    minimatch "^3.0.4"
+
+karma-jasmine-html-reporter@^1.4.2:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.6.0.tgz#586e17025a1b4128e9fba55d5f1e8921bfc3bc1e"
+  integrity sha512-ELO9yf0cNqpzaNLsfFgXd/wxZVYkE2+ECUwhMHUD4PZ17kcsPsYsVyjquiRqyMn2jkd2sHt0IeMyAyq1MC23Fw==
+
+karma-jasmine@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-2.0.1.tgz#26e3e31f2faf272dd80ebb0e1898914cc3a19763"
+  integrity sha512-iuC0hmr9b+SNn1DaUD2QEYtUxkS1J+bSJSn7ejdEexs7P8EYvA1CWkEdrDQ+8jVH3AgWlCNwjYsT1chjcNW9lA==
+  dependencies:
+    jasmine-core "^3.3"
+
+karma-safaritechpreview-launcher@0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/karma-safaritechpreview-launcher/-/karma-safaritechpreview-launcher-0.0.6.tgz#7a841105aeb7053940e33df850edcf220eed906a"
+  integrity sha512-2QMxAGXPQ37H3KoR9SCdh0OoktQZ5MyrxkvBiZ+VVOQfYVrcyOQXGrPea0/DKvf8qoQvrvP2FHcP/BxsuxuyHw==
+  dependencies:
+    fs-promise "^0.5.0"
+    marcosc-async "^3.0.4"
+
+karma-source-map-support@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz#58526ceccf7e8730e56effd97a4de8d712ac0d6b"
+  integrity sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==
+  dependencies:
+    source-map-support "^0.5.5"
+
+karma@^3.0.0:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-3.1.4.tgz#3890ca9722b10d1d14b726e1335931455788499e"
+  integrity sha512-31Vo8Qr5glN+dZEVIpnPCxEGleqE0EY6CtC2X9TagRV3rRQ3SNrvfhddICkJgUK3AgqpeKSZau03QumTGhGoSw==
+  dependencies:
+    bluebird "^3.3.0"
+    body-parser "^1.16.1"
+    chokidar "^2.0.3"
+    colors "^1.1.0"
+    combine-lists "^1.0.0"
+    connect "^3.6.0"
+    core-js "^2.2.0"
+    di "^0.0.1"
+    dom-serialize "^2.2.0"
+    expand-braces "^0.1.1"
+    flatted "^2.0.0"
+    glob "^7.1.1"
+    graceful-fs "^4.1.2"
+    http-proxy "^1.13.0"
+    isbinaryfile "^3.0.0"
+    lodash "^4.17.5"
+    log4js "^3.0.0"
+    mime "^2.3.1"
+    minimatch "^3.0.2"
+    optimist "^0.6.1"
+    qjobs "^1.1.4"
+    range-parser "^1.2.0"
+    rimraf "^2.6.0"
+    safe-buffer "^5.0.1"
+    socket.io "2.1.1"
+    source-map "^0.6.1"
+    tmp "0.0.33"
+    useragent "2.3.0"
+
+karma@~4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-4.2.0.tgz#27e88b310cde090d016980ff5444e3a239196fca"
+  integrity sha512-fmCuxN1rwJxTdZfOXK5LjlmS4Ana/OvzNMpkyLL/TLE8hmgSkpVpMYQ7RTVa8TNKRVQDZNl5W1oF5cfKfgIMlA==
+  dependencies:
+    bluebird "^3.3.0"
+    body-parser "^1.16.1"
+    braces "^3.0.2"
+    chokidar "^3.0.0"
+    colors "^1.1.0"
+    connect "^3.6.0"
+    core-js "^3.1.3"
+    di "^0.0.1"
+    dom-serialize "^2.2.0"
+    flatted "^2.0.0"
+    glob "^7.1.1"
+    graceful-fs "^4.1.2"
+    http-proxy "^1.13.0"
+    isbinaryfile "^3.0.0"
+    lodash "^4.17.11"
+    log4js "^4.0.0"
+    mime "^2.3.1"
+    minimatch "^3.0.2"
+    optimist "^0.6.1"
+    qjobs "^1.1.4"
+    range-parser "^1.2.0"
+    rimraf "^2.6.0"
+    safe-buffer "^5.0.1"
+    socket.io "2.1.1"
+    source-map "^0.6.1"
+    tmp "0.0.33"
+    useragent "2.3.0"
+
+keycharm@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/keycharm/-/keycharm-0.2.0.tgz#fa6ea2e43b90a68028843d27f2075d35a8c3e6f9"
+  integrity sha1-+m6i5DuQpoAohD0n8gddNajD5vk=
+
+keycloak-angular@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/keycloak-angular/-/keycloak-angular-6.1.0.tgz#41d7c29d57bffddfea75e3e44c27e7e666e57398"
+  integrity sha512-TT3h6nWIXRf3u3NcEC25KBvgnZufpHaOKNfUUvt9Jk4p6zrDiKXxSIS8y+B1hg0kUhVsxzjXgSVngry39jljYw==
+  dependencies:
+    keycloak-js "^4.8.3"
+    tslib "^1.9.0"
+
+keycloak-js@^4.8.3:
+  version "4.8.3"
+  resolved "https://registry.yarnpkg.com/keycloak-js/-/keycloak-js-4.8.3.tgz#e065f41d144d260afa8466b5b587a65d5f308d30"
+  integrity sha512-TXoZdoOYu2ScYs58L95/xSYjsTto9KRvZ+vt6mv4Dyf4pYhYZSgwMPnmi128qj/z8sm4mL1Z8nncR6XdWgNKMQ==
+
+keycode@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.2.0.tgz#3d0af56dc7b8b8e5cba8d0a97f107204eec22b04"
+  integrity sha1-PQr1bce4uOXLqNCpfxByBO7CKwQ=
+
+keyv@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
+  integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==
+  dependencies:
+    json-buffer "3.0.0"
+
+killable@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
+  integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
+
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
+
+kind-of@^6.0.0, kind-of@^6.0.2:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
+
+klaw@^1.0.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
+  integrity sha1-QIhDO0azsbolnXh4XY6W9zugJDk=
+  optionalDependencies:
+    graceful-fs "^4.1.9"
+
+latest-version@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face"
+  integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==
+  dependencies:
+    package-json "^6.3.0"
+
+lcid@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
+  integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==
+  dependencies:
+    invert-kv "^2.0.0"
+
+less-loader@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-5.0.0.tgz#498dde3a6c6c4f887458ee9ed3f086a12ad1b466"
+  integrity sha512-bquCU89mO/yWLaUq0Clk7qCsKhsF/TZpJUzETRvJa9KSVEL9SO3ovCvdEHISBhrC81OwC8QSVX7E0bzElZj9cg==
+  dependencies:
+    clone "^2.1.1"
+    loader-utils "^1.1.0"
+    pify "^4.0.1"
+
+less-plugin-npm-import@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/less-plugin-npm-import/-/less-plugin-npm-import-2.1.0.tgz#823e6986c93318a98171ca858848b6bead55bf3e"
+  integrity sha1-gj5phskzGKmBccqFiEi2vq1Vvz4=
+  dependencies:
+    promise "~7.0.1"
+    resolve "~1.1.6"
+
+less@3.9.0:
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/less/-/less-3.9.0.tgz#b7511c43f37cf57dc87dffd9883ec121289b1474"
+  integrity sha512-31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w==
+  dependencies:
+    clone "^2.1.2"
+  optionalDependencies:
+    errno "^0.1.1"
+    graceful-fs "^4.1.2"
+    image-size "~0.5.0"
+    mime "^1.4.1"
+    mkdirp "^0.5.0"
+    promise "^7.1.1"
+    request "^2.83.0"
+    source-map "~0.6.0"
+
+less@^3.8.0:
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/less/-/less-3.13.1.tgz#0ebc91d2a0e9c0c6735b83d496b0ab0583077909"
+  integrity sha512-SwA1aQXGUvp+P5XdZslUOhhLnClSLIjWvJhmd+Vgib5BFIr9lMNlQwmwUNOjXThF/A0x+MCYYPeWEfeWiLRnTw==
+  dependencies:
+    copy-anything "^2.0.1"
+    tslib "^1.10.0"
+  optionalDependencies:
+    errno "^0.1.1"
+    graceful-fs "^4.1.2"
+    image-size "~0.5.0"
+    make-dir "^2.1.0"
+    mime "^1.4.1"
+    native-request "^1.0.5"
+    source-map "~0.6.0"
+
+leven@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
+  integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
+
+levenary@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/levenary/-/levenary-1.1.1.tgz#842a9ee98d2075aa7faeedbe32679e9205f46f77"
+  integrity sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==
+  dependencies:
+    leven "^3.1.0"
+
+levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
+license-webpack-plugin@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.1.2.tgz#63f7c571537a450ec47dc98f5d5ffdbca7b3b14f"
+  integrity sha512-7poZHRla+ae0eEButlwMrPpkXyhNVBf2EHePYWT0jyLnI6311/OXJkTI2sOIRungRpQgU2oDMpro5bSFPT5F0A==
+  dependencies:
+    "@types/webpack-sources" "^0.1.5"
+    webpack-sources "^1.2.0"
+
+lie@~3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a"
+  integrity sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==
+  dependencies:
+    immediate "~3.0.5"
+
+lines-and-columns@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
+  integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
+
+loader-runner@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
+  integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
+
+loader-utils@1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
+  integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^2.0.0"
+    json5 "^1.0.1"
+
+loader-utils@^1.0.0, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
+  integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^1.0.1"
+
+loader-utils@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0"
+  integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^2.1.2"
+
+locate-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
+  dependencies:
+    p-locate "^3.0.0"
+    path-exists "^3.0.0"
+
+locate-path@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
+  dependencies:
+    p-locate "^4.1.0"
+
+locate-path@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
+  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
+  dependencies:
+    p-locate "^5.0.0"
+
+lodash.clonedeep@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
+
+lodash.isequal@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
+  integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
+
+lodash.toarray@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz#24c4bfcd6b2fba38bfd0594db1179d8e9b656561"
+  integrity sha1-JMS/zWsvuji/0FlNsRedjptlZWE=
+
+lodash@^3.10.1:
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
+  integrity sha512-9mDDwqVIma6OZX79ZlDACZl8sBm0TEnkf99zV3iMA4GzkIT/9hiqP5mY0HoT1iNLCrKc/R1HByV+yJfRWVJryQ==
+
+lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.5, lodash@^4.5.0:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
+
+log4js@^3.0.0:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/log4js/-/log4js-3.0.6.tgz#e6caced94967eeeb9ce399f9f8682a4b2b28c8ff"
+  integrity sha512-ezXZk6oPJCWL483zj64pNkMuY/NcRX5MPiB0zE6tjZM137aeusrOnW1ecxgF9cmwMWkBMhjteQxBPoZBh9FDxQ==
+  dependencies:
+    circular-json "^0.5.5"
+    date-format "^1.2.0"
+    debug "^3.1.0"
+    rfdc "^1.1.2"
+    streamroller "0.7.0"
+
+log4js@^4.0.0:
+  version "4.5.1"
+  resolved "https://registry.yarnpkg.com/log4js/-/log4js-4.5.1.tgz#e543625e97d9e6f3e6e7c9fc196dd6ab2cae30b5"
+  integrity sha512-EEEgFcE9bLgaYUKuozyFfytQM2wDHtXn4tAN41pkaxpNjAykv11GVdeI4tHtmPWW4Xrgh9R/2d7XYghDVjbKKw==
+  dependencies:
+    date-format "^2.0.0"
+    debug "^4.1.1"
+    flatted "^2.0.0"
+    rfdc "^1.1.4"
+    streamroller "^1.0.6"
+
+loglevel@^1.6.8:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197"
+  integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==
+
+loose-envify@^1.0.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
+  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
+  dependencies:
+    js-tokens "^3.0.0 || ^4.0.0"
+
+lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
+  integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
+
+lowercase-keys@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
+  integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
+
+lru-cache@4.1.x, lru-cache@^4.0.1:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
+  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
+  dependencies:
+    pseudomap "^1.0.2"
+    yallist "^2.1.2"
+
+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
+  dependencies:
+    yallist "^3.0.2"
+
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
+m3u8-parser@4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/m3u8-parser/-/m3u8-parser-4.3.0.tgz#4b4e988f87b6d8b2401d209a1d17798285a9da04"
+  integrity sha512-bVbjuBMoVIgFL1vpXVIxjeaoB5TPDJRb0m5qiTdM738SGqv/LAmsnVVPlKjM4fulm/rr1XZsKM+owHm+zvqxYA==
+  dependencies:
+    global "^4.3.2"
+
+m3u8-parser@4.5.2:
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/m3u8-parser/-/m3u8-parser-4.5.2.tgz#f7d48a60112466e528324624c4e66d52ed341a75"
+  integrity sha512-sN/lu3TiRxmG2RFjZxo5c0/7Dr4RrEztl43jXrWwj5gFZ7vfa2iIxGfiPx485dm5QCazaIcKk+vNkUso8Aq0Ag==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@videojs/vhs-utils" "^3.0.0"
+    global "^4.4.0"
+
+magic-string@0.25.3:
+  version "0.25.3"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.3.tgz#34b8d2a2c7fec9d9bdf9929a3fd81d271ef35be9"
+  integrity sha512-6QK0OpF/phMz0Q2AxILkX2mFhi7m+WMwTRg0LQKq/WBB0cDP4rYH3Wp4/d3OTXlrPLVJT/RFqj8tFeAR4nk8AA==
+  dependencies:
+    sourcemap-codec "^1.4.4"
+
+magic-string@^0.25.0, magic-string@^0.25.2:
+  version "0.25.7"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051"
+  integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==
+  dependencies:
+    sourcemap-codec "^1.4.4"
+
+make-dir@^1.0.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
+  integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
+  dependencies:
+    pify "^3.0.0"
+
+make-dir@^2.0.0, make-dir@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
+  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
+  dependencies:
+    pify "^4.0.1"
+    semver "^5.6.0"
+
+make-dir@^3.0.0, make-dir@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
+  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
+  dependencies:
+    semver "^6.0.0"
+
+make-error@^1.1.1:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
+  integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
+
+make-fetch-happen@^5.0.0:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz#aa8387104f2687edca01c8687ee45013d02d19bd"
+  integrity sha512-07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag==
+  dependencies:
+    agentkeepalive "^3.4.1"
+    cacache "^12.0.0"
+    http-cache-semantics "^3.8.1"
+    http-proxy-agent "^2.1.0"
+    https-proxy-agent "^2.2.3"
+    lru-cache "^5.1.1"
+    mississippi "^3.0.0"
+    node-fetch-npm "^2.0.2"
+    promise-retry "^1.1.1"
+    socks-proxy-agent "^4.0.0"
+    ssri "^6.0.0"
+
+mamacro@^0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
+  integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==
+
+map-age-cleaner@^0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
+  integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
+  dependencies:
+    p-defer "^1.0.0"
+
+map-cache@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
+
+map-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
+  dependencies:
+    object-visit "^1.0.0"
+
+marcosc-async@^3.0.4:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/marcosc-async/-/marcosc-async-3.0.5.tgz#41e6d56c656c811859d34b97a0a26093f71dc360"
+  integrity sha1-QebVbGVsgRhZ00uXoKJgk/cdw2A=
+
+material-icons@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/material-icons/-/material-icons-0.7.1.tgz#30e4f9217f9aa78056e5c2617b36a177ac6db8e4"
+  integrity sha512-MV4qSDR0clISvUQK9d8PyktN0IAr1l2SJw8yDejBu8Ev+Xhh+kgnmVxYGgp4nRyGr495LeCGx7Nv4L+ZoJ7tvQ==
+
+md5.js@^1.3.4:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
+  integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==
+  dependencies:
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
+    safe-buffer "^5.1.2"
+
+media-typer@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
+
+mem@^4.0.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
+  integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==
+  dependencies:
+    map-age-cleaner "^0.1.1"
+    mimic-fn "^2.0.0"
+    p-is-promise "^2.0.0"
+
+memory-fs@^0.4.0, memory-fs@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
+  integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
+  dependencies:
+    errno "^0.1.3"
+    readable-stream "^2.0.1"
+
+memory-fs@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c"
+  integrity sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==
+  dependencies:
+    errno "^0.1.3"
+    readable-stream "^2.0.1"
+
+merge-descriptors@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
+
+merge-source-map@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646"
+  integrity sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==
+  dependencies:
+    source-map "^0.6.1"
+
+merge-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
+  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
+
+merge2@^1.3.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
+  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
+
+methods@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
+  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
+
+micromatch@^3.1.10, micromatch@^3.1.4:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    braces "^2.3.1"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    extglob "^2.0.4"
+    fragment-cache "^0.2.1"
+    kind-of "^6.0.2"
+    nanomatch "^1.2.9"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.2"
+
+micromatch@^4.0.2:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
+  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
+  dependencies:
+    braces "^3.0.1"
+    picomatch "^2.2.3"
+
+miller-rabin@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
+  integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==
+  dependencies:
+    bn.js "^4.0.0"
+    brorand "^1.0.1"
+
+mime-db@1.47.0, "mime-db@>= 1.43.0 < 2":
+  version "1.47.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz#8cb313e59965d3c05cfbf898915a267af46a335c"
+  integrity sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==
+
+mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
+  version "2.1.30"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz#6e7be8b4c479825f85ed6326695db73f9305d62d"
+  integrity sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==
+  dependencies:
+    mime-db "1.47.0"
+
+mime@1.6.0, mime@^1.4.1:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
+
+mime@^2.3.1, mime@^2.4.4:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe"
+  integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==
+
+mimic-fn@^2.0.0, mimic-fn@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+
+mimic-response@^1.0.0, mimic-response@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
+  integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
+
+min-document@^2.19.0:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685"
+  integrity sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=
+  dependencies:
+    dom-walk "^0.1.0"
+
+mini-css-extract-plugin@0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.8.0.tgz#81d41ec4fe58c713a96ad7c723cdb2d0bd4d70e1"
+  integrity sha512-MNpRGbNA52q6U92i0qbVpQNsgk7LExy41MdAlG84FeytfDOtRIf/mCHdEgG8rpTKOaNKiqUnZdlptF469hxqOw==
+  dependencies:
+    loader-utils "^1.1.0"
+    normalize-url "1.9.1"
+    schema-utils "^1.0.0"
+    webpack-sources "^1.1.0"
+
+minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
+  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
+
+minimalistic-crypto-utils@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
+  integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
+
+minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+
+minimist@~0.0.1:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+  integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
+
+minipass-collect@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
+  integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass-flush@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
+  integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass-pipeline@^1.2.2:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
+  integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass@^2.3.5, minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
+  integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
+  dependencies:
+    safe-buffer "^5.1.2"
+    yallist "^3.0.0"
+
+minipass@^3.0.0, minipass@^3.1.1:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd"
+  integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==
+  dependencies:
+    yallist "^4.0.0"
+
+minizlib@^1.2.1:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
+  integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
+  dependencies:
+    minipass "^2.9.0"
+
+minizlib@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
+  integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
+  dependencies:
+    minipass "^3.0.0"
+    yallist "^4.0.0"
+
+mississippi@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
+  integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==
+  dependencies:
+    concat-stream "^1.5.0"
+    duplexify "^3.4.2"
+    end-of-stream "^1.1.0"
+    flush-write-stream "^1.0.0"
+    from2 "^2.1.0"
+    parallel-transform "^1.1.0"
+    pump "^3.0.0"
+    pumpify "^1.3.3"
+    stream-each "^1.1.0"
+    through2 "^2.0.0"
+
+mixin-deep@^1.2.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
+  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
+  dependencies:
+    for-in "^1.0.2"
+    is-extendable "^1.0.1"
+
+mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.5:
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
+  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
+  dependencies:
+    minimist "^1.2.5"
+
+mkdirp@^1.0.3, mkdirp@^1.0.4, mkdirp@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
+mock-require@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/mock-require/-/mock-require-3.0.3.tgz#ccd544d9eae81dd576b3f219f69ec867318a1946"
+  integrity sha512-lLzfLHcyc10MKQnNUCv7dMcoY/2Qxd6wJfbqCcVk3LDb8An4hF6ohk5AztrvgKhJCqj36uyzi/p5se+tvyD+Wg==
+  dependencies:
+    get-caller-file "^1.0.2"
+    normalize-path "^2.1.1"
+
+moment@2.24.0:
+  version "2.24.0"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
+  integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
+
+moment@>=2.13.0, moment@^2.10.2, moment@^2.24.0, moment@^2.29.1:
+  version "2.29.1"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
+  integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
+
+move-concurrently@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
+  integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=
+  dependencies:
+    aproba "^1.1.1"
+    copy-concurrently "^1.0.0"
+    fs-write-stream-atomic "^1.0.8"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.3"
+
+mpd-parser@0.15.4:
+  version "0.15.4"
+  resolved "https://registry.yarnpkg.com/mpd-parser/-/mpd-parser-0.15.4.tgz#e1b445d0dc2aab1389fde6420ca9cca7c999575d"
+  integrity sha512-YcOclxKc5gnT87UQYwRoPJpWOFvQORwN+bXYmTWCJ4U2pCSS7jjtPrIhoOLHFAyekj48CHTX4hjGBV/VSNsUsg==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@videojs/vhs-utils" "^3.0.0"
+    global "^4.4.0"
+    xmldom "^0.4.0"
+
+mpd-parser@0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/mpd-parser/-/mpd-parser-0.8.1.tgz#db299dbec337999fbbbace989d227c7b03dc8ea7"
+  integrity sha512-WBTJ1bKk8OLUIxBh6s1ju1e2yz/5CzhPbgi6P3F3kJHKhGy1Z+ElvEnuzEbtC/dnbRcJtMXazE3f93N5LLdp9Q==
+  dependencies:
+    global "^4.3.2"
+    url-toolkit "^2.1.1"
+
+mrmime@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-1.0.1.tgz#5f90c825fad4bdd41dc914eff5d1a8cfdaf24f27"
+  integrity sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+
+ms@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+
+ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
+ms@^2.0.0, ms@^2.1.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
+multicast-dns-service-types@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
+  integrity sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=
+
+multicast-dns@^6.0.1:
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229"
+  integrity sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==
+  dependencies:
+    dns-packet "^1.3.1"
+    thunky "^1.0.2"
+
+mustache@^3.0.2:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/mustache/-/mustache-3.2.1.tgz#89e78a9d207d78f2799b1e95764a25bf71a28322"
+  integrity sha512-RERvMFdLpaFfSRIEe632yDm5nsd0SDKn8hGmcUwswnyiE5mtdZLDybtHAz6hjJhawokF0hXvGLtx9mrQfm6FkA==
+
+mute-stream@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
+  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
+
+mux.js@5.1.3:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/mux.js/-/mux.js-5.1.3.tgz#1a59b8979a6780be5bcb63983c7e883c90cd615b"
+  integrity sha512-FhDcysLvAkO9H8ftBJ2sK1O4Rmz0AWnMS+2uqP7WjrnaAyE/ox11GEiZkRzrWIdp8at9R9qBHDqdURY3/h/xTg==
+
+mux.js@5.10.0:
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/mux.js/-/mux.js-5.10.0.tgz#80fb30f9233c7902cac5cc8e1ae5f19e91cf8477"
+  integrity sha512-kLzvYsHYBwNa+ckkmpxWV3eImwntJbrwd1KbN4WR0hLe+dK/KB82aCuC0fQzAI2hkjYszdlSGsAWFgYdiFBUuA==
+  dependencies:
+    "@babel/runtime" "^7.11.2"
+
+mux.js@^5.9.2:
+  version "5.11.0"
+  resolved "https://registry.yarnpkg.com/mux.js/-/mux.js-5.11.0.tgz#3c2c1fbd9d30720af2a1b12c1f2a2840c63100f6"
+  integrity sha512-Q/iLfohHh5Pp6lW7EFtcxNuaCNJ3Ruywfy46pWLsY+yIxR1kXXImYY1wOhg8jLdBMs1kRaZqsiB4Zncsiw0a2Q==
+  dependencies:
+    "@babel/runtime" "^7.11.2"
+
+mz@^2.3.1:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
+  integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==
+  dependencies:
+    any-promise "^1.0.0"
+    object-assign "^4.0.1"
+    thenify-all "^1.0.0"
+
+nan@^2.12.1:
+  version "2.14.2"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
+  integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==
+
+nanomatch@^1.2.9:
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    fragment-cache "^0.2.1"
+    is-windows "^1.0.2"
+    kind-of "^6.0.2"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+native-request@^1.0.5:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/native-request/-/native-request-1.0.8.tgz#8f66bf606e0f7ea27c0e5995eb2f5d03e33ae6fb"
+  integrity sha512-vU2JojJVelUGp6jRcLwToPoWGxSx23z/0iX+I77J3Ht17rf2INGjrhOoQnjVo60nQd8wVsgzKkPfRXBiVdD2ag==
+
+negotiator@0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
+  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
+
+neo-async@^2.5.0, neo-async@^2.6.1:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
+  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
+
+ng-circle-progress@1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/ng-circle-progress/-/ng-circle-progress-1.5.1.tgz#ea4ea89318754b929dc1550d5779e391d7c5c646"
+  integrity sha512-gJ0SdWc+TkXckfbhbvUY522yjya3qcc1a3lGvvVyLsUfSOgll8LQaZGDEko84d8dk8vYO83n0O5vP+e8bJTInQ==
+  dependencies:
+    tslib "^1.9.0"
+
+ng-packagr@^5.4.3:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-5.7.1.tgz#8e082e38e7b6089296bf0491f2e5b29122f8e08d"
+  integrity sha512-NDAUcMtLyZnF3bP6JtC3ANpIQRclRDPilF7C0DsjQuIz1q0V3mT7f1PwV0jnRWy8iRpSZmJZr6AGl736gloHtQ==
+  dependencies:
+    ajv "^6.10.2"
+    autoprefixer "^9.6.0"
+    browserslist "^4.0.0"
+    chalk "^2.3.1"
+    chokidar "^3.0.0"
+    clean-css "^4.1.11"
+    commander "^3.0.0"
+    fs-extra "^8.0.0"
+    glob "^7.1.2"
+    injection-js "^2.2.1"
+    less "^3.8.0"
+    less-plugin-npm-import "^2.1.0"
+    node-sass-tilde-importer "^1.0.0"
+    postcss "^7.0.0"
+    postcss-url "^8.0.0"
+    read-pkg-up "^5.0.0"
+    rimraf "^3.0.0"
+    rollup "1.25.2"
+    rollup-plugin-commonjs "^10.0.0"
+    rollup-plugin-json "^4.0.0"
+    rollup-plugin-node-resolve "^5.0.0"
+    rollup-plugin-sourcemaps "^0.4.2"
+    rxjs "^6.0.0"
+    sass "^1.17.3"
+    stylus "^0.54.5"
+    terser "^4.1.2"
+    update-notifier "^3.0.0"
+
+ng2-ace-editor@^0.3.9:
+  version "0.3.9"
+  resolved "https://registry.yarnpkg.com/ng2-ace-editor/-/ng2-ace-editor-0.3.9.tgz#5ae68712e9ca49591eda31df8fe02eca1c3634e1"
+  integrity sha512-e8Q4YCirlL/OEiekewmzupG+zV3prYsiYmQnRzQzd0wNgsPjOLOdb0it7cCbzFfIXKGyIIHKTW5584WxPr2LnQ==
+  dependencies:
+    ace-builds "^1.4.2"
+    brace "^0.11.1"
+
+ng2-charts@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/ng2-charts/-/ng2-charts-2.3.0.tgz#e4dd1f7fe12dc2635d5e8c4f101a8d4c4f433754"
+  integrity sha512-D5K7OqF0m5lOBYvNOsraoEo4OPHja9zfGNj+HWy2nUcP0LP2s+Y/QaQlkG/1rHlwXq9HPm8rLxzSutA0eLHxGQ==
+  dependencies:
+    "@types/chart.js" "^2.7.48"
+    lodash "^4.17.11"
+    tslib "^1.9.0"
+
+ng2-ckeditor@1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/ng2-ckeditor/-/ng2-ckeditor-1.2.6.tgz#be5dc7872846e329f61d5b0d6ce084045044ab7f"
+  integrity sha512-/bw0ZzVBvHUrFrXFeP08XKSsIX67M85rTiZkcphn0kpripAj13JvX/l/SQ74Kfk5K226Y3c+rONDj6OtfZH0kA==
+  dependencies:
+    tslib "^1.9.0"
+
+ng2-pdf-viewer@6.4.1:
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/ng2-pdf-viewer/-/ng2-pdf-viewer-6.4.1.tgz#c84e7e4c6db9d759ebc6969ec60b5fc0c3e7fe16"
+  integrity sha512-A8R9SGa2bu4n+mtagGX8DqBrVAbuROrEgcAOQwCdciYTLAq9EFGEB8TCQZpjvYVaFTNwjKWTMTjFQVEorjbLeQ==
+  dependencies:
+    "@types/pdfjs-dist" "~2.1.7"
+    pdfjs-dist "~2.5.207"
+    tslib "^1.10.0"
+
+ng2-search-filter@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/ng2-search-filter/-/ng2-search-filter-0.5.1.tgz#6d5f4e26bd2b2c8c8cc4aad658aabae6a33fb4af"
+  integrity sha512-noN8R+Gyxo5ZuboEOvq+u0zKio6pEf1IVYQTCZfAfXm6ONmzWu/M2xK0di9oVUprDbPBQXCGUuvD5i2GD+35HA==
+
+ngx-export-as@1.4.2:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/ngx-export-as/-/ngx-export-as-1.4.2.tgz#6fb20ae104225f4a1449c1eea9c1a9ccbdc32a50"
+  integrity sha512-oKYYaj385Hazvsva4hrxSqo5/tU1SIJsfQy6jsfjPCAWbVI6p/18z2CRcrhvqd0zH0aE/fD55s6etJ2OnMxkag==
+  dependencies:
+    html2pdf.js "^0.9.1"
+    rxjs "~6.3.3"
+    xlsx "^0.14.0"
+
+ngx-image-cropper@^3.0.3:
+  version "3.3.5"
+  resolved "https://registry.yarnpkg.com/ngx-image-cropper/-/ngx-image-cropper-3.3.5.tgz#39f636e3989c5c84241f5130d0124ded6631fbeb"
+  integrity sha512-0yRVKG5XAbVo3rOaj/iFDlekGsxEqXKU9iXFbjyvHvRT2DFs+AjwtyvINsHCWw+4ed9yA4Y+wLIUNqzA0bfxLw==
+  dependencies:
+    tslib "^1.9.0"
+
+ngx-pagination@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/ngx-pagination/-/ngx-pagination-5.1.0.tgz#b09ad72c20283b392fb9ea457ec2d4825e149358"
+  integrity sha512-GDI5GwmYIaeLu3hW3tgdIw/LXOzLj05PjVhtf2Ze63QsJ6zhZ7g5tg6S4EhhuUOdbMdXWyOng/uMVZwbYpi0Eg==
+
+ngx-quill@^7.1.2:
+  version "7.3.12"
+  resolved "https://registry.yarnpkg.com/ngx-quill/-/ngx-quill-7.3.12.tgz#3321f005f729507577dc9b130d9334ebddd67fdc"
+  integrity sha512-A49Q5KvBtzTRc+hmjzpvPkar1hOoaeGKEispeQ91yUaIB95fjzykx6SqWtcBmGFckNllCOIQV9iel9+RCnd+8Q==
+  dependencies:
+    tslib "^1.9.0"
+
+ngx-take-until-destroy@5.4.0:
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/ngx-take-until-destroy/-/ngx-take-until-destroy-5.4.0.tgz#6c8606ee956584dc947e2eb609c48b8f98b09900"
+  integrity sha512-e+VfCrHbLybdKWoQ8prdhmVzWI6vTnedr/9cVGQTkfepMdLz5D++VDk+Wnbs7mru6S9C+kIpNWUlh2YMPl928Q==
+  dependencies:
+    tslib "^1.9.0"
+
+nice-try@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
+
+node-emoji@^1.8.1:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.10.0.tgz#8886abd25d9c7bb61802a658523d1f8d2a89b2da"
+  integrity sha512-Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw==
+  dependencies:
+    lodash.toarray "^4.4.0"
+
+node-ensure@^0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/node-ensure/-/node-ensure-0.0.0.tgz#ecae764150de99861ec5c810fd5d096b183932a7"
+  integrity sha1-7K52QVDemYYexcgQ/V0Jaxg5Mqc=
+
+node-fetch-npm@^2.0.2:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.4.tgz#6507d0e17a9ec0be3bec516958a497cec54bf5a4"
+  integrity sha512-iOuIQDWDyjhv9qSDrj9aq/klt6F9z1p2otB3AV7v3zBDcL/x+OfGsvGQZZCcMZbUf4Ujw1xGNQkjvGnVT22cKg==
+  dependencies:
+    encoding "^0.1.11"
+    json-parse-better-errors "^1.0.0"
+    safe-buffer "^5.1.1"
+
+node-forge@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
+  integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
+
+node-libs-browser@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425"
+  integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==
+  dependencies:
+    assert "^1.1.1"
+    browserify-zlib "^0.2.0"
+    buffer "^4.3.0"
+    console-browserify "^1.1.0"
+    constants-browserify "^1.0.0"
+    crypto-browserify "^3.11.0"
+    domain-browser "^1.1.1"
+    events "^3.0.0"
+    https-browserify "^1.0.0"
+    os-browserify "^0.3.0"
+    path-browserify "0.0.1"
+    process "^0.11.10"
+    punycode "^1.2.4"
+    querystring-es3 "^0.2.0"
+    readable-stream "^2.3.3"
+    stream-browserify "^2.0.1"
+    stream-http "^2.7.2"
+    string_decoder "^1.0.0"
+    timers-browserify "^2.0.4"
+    tty-browserify "0.0.0"
+    url "^0.11.0"
+    util "^0.11.0"
+    vm-browserify "^1.0.1"
+
+node-releases@^1.1.52, node-releases@^1.1.71:
+  version "1.1.71"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"
+  integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==
+
+node-sass-tilde-importer@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/node-sass-tilde-importer/-/node-sass-tilde-importer-1.0.2.tgz#1a15105c153f648323b4347693fdb0f331bad1ce"
+  integrity sha512-Swcmr38Y7uB78itQeBm3mThjxBy9/Ah/ykPIaURY/L6Nec9AyRoL/jJ7ECfMR+oZeCTVQNxVMu/aHU+TLRVbdg==
+  dependencies:
+    find-parent-dir "^0.3.0"
+
+normalize-package-data@^2.0.0, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
+  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
+  dependencies:
+    hosted-git-info "^2.1.4"
+    resolve "^1.10.0"
+    semver "2 || 3 || 4 || 5"
+    validate-npm-package-license "^3.0.1"
+
+normalize-path@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
+  dependencies:
+    remove-trailing-separator "^1.0.1"
+
+normalize-path@^3.0.0, normalize-path@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
+normalize-range@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
+  integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
+
+normalize-url@1.9.1:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
+  integrity sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=
+  dependencies:
+    object-assign "^4.0.1"
+    prepend-http "^1.0.0"
+    query-string "^4.1.0"
+    sort-keys "^1.0.0"
+
+normalize-url@^4.1.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129"
+  integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==
+
+normalize.css@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-8.0.1.tgz#9b98a208738b9cc2634caacbc42d131c97487bf3"
+  integrity sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg==
+
+nosleep.js@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/nosleep.js/-/nosleep.js-0.7.0.tgz#cfd919c25523ca0d0f4a69fb3305c083adaee289"
+  integrity sha1-z9kZwlUjyg0PSmn7MwXAg62u4ok=
+
+npm-bundled@^1.0.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.2.tgz#944c78789bd739035b70baa2ca5cc32b8d860bc1"
+  integrity sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==
+  dependencies:
+    npm-normalize-package-bin "^1.0.1"
+
+npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
+  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
+
+npm-package-arg@6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.0.tgz#15ae1e2758a5027efb4c250554b85a737db7fcc1"
+  integrity sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==
+  dependencies:
+    hosted-git-info "^2.6.0"
+    osenv "^0.1.5"
+    semver "^5.5.0"
+    validate-npm-package-name "^3.0.0"
+
+npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.1.tgz#02168cb0a49a2b75bf988a28698de7b529df5cb7"
+  integrity sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==
+  dependencies:
+    hosted-git-info "^2.7.1"
+    osenv "^0.1.5"
+    semver "^5.6.0"
+    validate-npm-package-name "^3.0.0"
+
+npm-packlist@^1.1.12:
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
+  integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
+  dependencies:
+    ignore-walk "^3.0.1"
+    npm-bundled "^1.0.1"
+    npm-normalize-package-bin "^1.0.1"
+
+npm-pick-manifest@3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-3.0.2.tgz#f4d9e5fd4be2153e5f4e5f9b7be8dc419a99abb7"
+  integrity sha512-wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw==
+  dependencies:
+    figgy-pudding "^3.5.1"
+    npm-package-arg "^6.0.0"
+    semver "^5.4.1"
+
+npm-pick-manifest@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz#32111d2a9562638bb2c8f2bf27f7f3092c8fae40"
+  integrity sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==
+  dependencies:
+    figgy-pudding "^3.5.1"
+    npm-package-arg "^6.0.0"
+    semver "^5.4.1"
+
+npm-registry-fetch@^4.0.0:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-4.0.7.tgz#57951bf6541e0246b34c9f9a38ab73607c9449d7"
+  integrity sha512-cny9v0+Mq6Tjz+e0erFAB+RYJ/AVGzkjnISiobqP8OWj9c9FLoZZu8/SPSKJWE17F1tk4018wfjV+ZbIbqC7fQ==
+  dependencies:
+    JSONStream "^1.3.4"
+    bluebird "^3.5.1"
+    figgy-pudding "^3.4.1"
+    lru-cache "^5.1.1"
+    make-fetch-happen "^5.0.0"
+    npm-package-arg "^6.1.0"
+    safe-buffer "^5.2.0"
+
+npm-run-path@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
+  dependencies:
+    path-key "^2.0.0"
+
+num2fraction@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
+  integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
+
+number-is-nan@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
+
+"nwmatcher@>= 1.3.7 < 2.0.0":
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.4.tgz#2285631f34a95f0d0395cd900c96ed39b58f346e"
+  integrity sha512-3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ==
+
+oauth-sign@~0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
+
+object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
+
+object-component@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
+  integrity sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=
+
+object-copy@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
+  dependencies:
+    copy-descriptor "^0.1.0"
+    define-property "^0.2.5"
+    kind-of "^3.0.3"
+
+object-hash@^2.0.3:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.1.1.tgz#9447d0279b4fcf80cff3259bf66a1dc73afabe09"
+  integrity sha512-VOJmgmS+7wvXf8CjbQmimtCnEx3IAoLxI3fp2fbWehxrWBcAQFbk+vcwb6vzR0VZv/eNCJ/27j151ZTwqW/JeQ==
+
+object-inspect@^1.9.0:
+  version "1.10.3"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz#c2aa7d2d09f50c99375704f7a0adf24c5782d369"
+  integrity sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==
+
+object-is@^1.0.1:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac"
+  integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+
+object-keys@^1.0.12, object-keys@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
+
+object-sizeof@^1.6.0:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/object-sizeof/-/object-sizeof-1.6.1.tgz#35971f3fd2102bd8b51c67b0a53ed773ff77ab56"
+  integrity sha512-gNKGcRnDRXwEpAdwUY3Ef+aVZIrcQVXozSaVzHz6Pv4JxysH8vf5F+nIgsqW5T/YNwZNveh0mIW7PEH1O2MrDw==
+  dependencies:
+    buffer "^5.6.0"
+
+object-visit@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
+  dependencies:
+    isobject "^3.0.0"
+
+object.assign@^4.1.0, object.assign@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
+  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+    has-symbols "^1.0.1"
+    object-keys "^1.1.1"
+
+object.getownpropertydescriptors@^2.0.3:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz#1bd63aeacf0d5d2d2f31b5e393b03a7c601a23f7"
+  integrity sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.18.0-next.2"
+
+object.pick@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
+  dependencies:
+    isobject "^3.0.1"
+
+obuf@^1.0.0, obuf@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
+  integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
+
+omggif@1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/omggif/-/omggif-1.0.7.tgz#59d2eecb0263de84635b3feb887c0c9973f1e49d"
+  integrity sha1-WdLuywJj3oRjWz/riHwMmXPx5J0=
+
+on-finished@~2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
+  dependencies:
+    ee-first "1.1.1"
+
+on-headers@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
+  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
+
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  dependencies:
+    wrappy "1"
+
+onetime@^5.1.0:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
+  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
+  dependencies:
+    mimic-fn "^2.1.0"
+
+open@6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-6.4.0.tgz#5c13e96d0dc894686164f18965ecfe889ecfc8a9"
+  integrity sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==
+  dependencies:
+    is-wsl "^1.1.0"
+
+opencollective-postinstall@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259"
+  integrity sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==
+
+opener@^1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
+  integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
+
+opn@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
+  integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==
+  dependencies:
+    is-wsl "^1.1.0"
+
+optimist@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
+  integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
+  dependencies:
+    minimist "~0.0.1"
+    wordwrap "~0.0.2"
+
+optionator@^0.8.1:
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
+  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
+  dependencies:
+    deep-is "~0.1.3"
+    fast-levenshtein "~2.0.6"
+    levn "~0.3.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+    word-wrap "~1.2.3"
+
+original@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
+  integrity sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==
+  dependencies:
+    url-parse "^1.4.3"
+
+os-browserify@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
+  integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
+
+os-homedir@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
+
+os-locale@^3.0.0, os-locale@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
+  integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
+  dependencies:
+    execa "^1.0.0"
+    lcid "^2.0.0"
+    mem "^4.0.0"
+
+os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
+
+osenv@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.0"
+
+p-cancelable@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
+  integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
+
+p-defer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
+  integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
+
+p-finally@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
+
+p-is-promise@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
+  integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
+
+p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
+  dependencies:
+    p-try "^2.0.0"
+
+p-limit@^3.0.1, p-limit@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
+  dependencies:
+    yocto-queue "^0.1.0"
+
+p-locate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
+  dependencies:
+    p-limit "^2.0.0"
+
+p-locate@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
+  dependencies:
+    p-limit "^2.2.0"
+
+p-locate@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
+  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
+  dependencies:
+    p-limit "^3.0.2"
+
+p-map@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
+  integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
+
+p-map@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
+  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
+  dependencies:
+    aggregate-error "^3.0.0"
+
+p-retry@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz#316b4c8893e2c8dc1cfa891f406c4b422bebf328"
+  integrity sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==
+  dependencies:
+    retry "^0.12.0"
+
+p-try@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
+
+package-json@^6.3.0:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0"
+  integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==
+  dependencies:
+    got "^9.6.0"
+    registry-auth-token "^4.0.0"
+    registry-url "^5.0.0"
+    semver "^6.2.0"
+
+pacote@9.5.5:
+  version "9.5.5"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.5.5.tgz#63355a393614c3424e735820c3731e2cbbedaeeb"
+  integrity sha512-jAEP+Nqj4kyMWyNpfTU/Whx1jA7jEc5cCOlurm0/0oL+v8TAp1QSsK83N7bYe+2bEdFzMAtPG5TBebjzzGV0cA==
+  dependencies:
+    bluebird "^3.5.3"
+    cacache "^12.0.2"
+    figgy-pudding "^3.5.1"
+    get-stream "^4.1.0"
+    glob "^7.1.3"
+    infer-owner "^1.0.4"
+    lru-cache "^5.1.1"
+    make-fetch-happen "^5.0.0"
+    minimatch "^3.0.4"
+    minipass "^2.3.5"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    normalize-package-data "^2.4.0"
+    npm-package-arg "^6.1.0"
+    npm-packlist "^1.1.12"
+    npm-pick-manifest "^2.2.3"
+    npm-registry-fetch "^4.0.0"
+    osenv "^0.1.5"
+    promise-inflight "^1.0.1"
+    promise-retry "^1.1.1"
+    protoduck "^5.0.1"
+    rimraf "^2.6.2"
+    safe-buffer "^5.1.2"
+    semver "^5.6.0"
+    ssri "^6.0.1"
+    tar "^4.4.8"
+    unique-filename "^1.1.1"
+    which "^1.3.1"
+
+pako@~1.0.2, pako@~1.0.5:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
+  integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
+
+parallel-transform@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc"
+  integrity sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==
+  dependencies:
+    cyclist "^1.0.1"
+    inherits "^2.0.3"
+    readable-stream "^2.1.5"
+
+parchment@^1.1.2, parchment@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/parchment/-/parchment-1.1.4.tgz#aeded7ab938fe921d4c34bc339ce1168bc2ffde5"
+  integrity sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg==
+
+parent-module@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
+  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
+  dependencies:
+    callsites "^3.0.0"
+
+parse-asn1@^5.0.0, parse-asn1@^5.1.5:
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4"
+  integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==
+  dependencies:
+    asn1.js "^5.2.0"
+    browserify-aes "^1.0.0"
+    evp_bytestokey "^1.0.0"
+    pbkdf2 "^3.0.3"
+    safe-buffer "^5.1.1"
+
+parse-headers@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.3.tgz#5e8e7512383d140ba02f0c7aa9f49b4399c92515"
+  integrity sha512-QhhZ+DCCit2Coi2vmAKbq5RGTRcQUOE2+REgv8vdyu7MnYx2eZztegqtTx99TZ86GTIwqiy3+4nQTWZ2tgmdCA==
+
+parse-json@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
+  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
+  dependencies:
+    error-ex "^1.3.1"
+    json-parse-better-errors "^1.0.1"
+
+parse-json@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
+  integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    error-ex "^1.3.1"
+    json-parse-even-better-errors "^2.3.0"
+    lines-and-columns "^1.1.6"
+
+parse5-html-rewriting-stream@5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-5.1.0.tgz#63f92c958764aea8cbe3aa68f2e5895c32068ab8"
+  integrity sha512-hZlaOTHJs4dpC5yFHnOSEMh26ErsqTsLzxKqkuRcUqtiu0kMsBQ9pkgANkECDyoBUhJ3+hvb2DPLsyqbtcS61Q==
+  dependencies:
+    parse5 "^5.1.0"
+    parse5-sax-parser "^5.1.0"
+
+parse5-sax-parser@^5.1.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/parse5-sax-parser/-/parse5-sax-parser-5.1.1.tgz#02834a9d08b23ea2d99584841c38be09d5247a15"
+  integrity sha512-9HIh6zd7bF1NJe95LPCUC311CekdOi55R+HWXNCsGY6053DWaMijVKOv1oPvdvPTvFicifZyimBVJ6/qvG039Q==
+  dependencies:
+    parse5 "^5.1.1"
+
+parse5@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
+  integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==
+
+parse5@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"
+  integrity sha1-m387DeMr543CQBsXVzzK8Pb1nZQ=
+
+parse5@^5.0.0, parse5@^5.1.0, parse5@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"
+  integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==
+
+parseqs@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
+  integrity sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=
+  dependencies:
+    better-assert "~1.0.0"
+
+parseuri@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a"
+  integrity sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=
+  dependencies:
+    better-assert "~1.0.0"
+
+parseurl@~1.3.2, parseurl@~1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
+  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
+
+pascalcase@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
+
+path-browserify@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"
+  integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==
+
+path-dirname@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
+
+path-exists@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
+
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+
+path-is-inside@^1.0.1, path-is-inside@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
+
+path-key@^2.0.0, path-key@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
+
+path-parse@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+
+path-to-regexp@0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
+
+path-type@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
+  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
+
+pbkdf2@^3.0.3:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075"
+  integrity sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==
+  dependencies:
+    create-hash "^1.1.2"
+    create-hmac "^1.1.4"
+    ripemd160 "^2.0.1"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
+
+pdfjs-dist@2.1.266:
+  version "2.1.266"
+  resolved "https://registry.yarnpkg.com/pdfjs-dist/-/pdfjs-dist-2.1.266.tgz#cded02268b389559e807f410d2a729db62160026"
+  integrity sha512-Jy7o1wE3NezPxozexSbq4ltuLT0Z21ew/qrEiAEeUZzHxMHGk4DUV1D7RuCXg5vJDvHmjX1YssN+we9QfRRgXQ==
+  dependencies:
+    node-ensure "^0.0.0"
+    worker-loader "^2.0.0"
+
+pdfjs-dist@~2.5.207:
+  version "2.5.207"
+  resolved "https://registry.yarnpkg.com/pdfjs-dist/-/pdfjs-dist-2.5.207.tgz#b5e8c19627be64269cd3fb6df3eaaf45ddffe7b6"
+  integrity sha512-xGDUhnCYPfHy+unMXCLCJtlpZaaZ17Ew3WIL0tnSgKFUZXHAPD49GO9xScyszSsQMoutNDgRb+rfBXIaX/lJbw==
+
+performance-now@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
+
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d"
+  integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==
+
+pify@^2.0.0, pify@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
+
+pify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
+
+pify@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
+  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
+
+pinkie-promise@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
+  dependencies:
+    pinkie "^2.0.0"
+
+pinkie@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
+
+pkcs7@^1.0.2, pkcs7@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/pkcs7/-/pkcs7-1.0.4.tgz#6090b9e71160dabf69209d719cbafa538b00a1cb"
+  integrity sha512-afRERtHn54AlwaF2/+LFszyAANTCggGilmcmILUzEjvs3XgFZT+xE6+QWQcAGmu4xajy+Xtj7acLOPdx5/eXWQ==
+  dependencies:
+    "@babel/runtime" "^7.5.5"
+
+pkg-dir@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
+  integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==
+  dependencies:
+    find-up "^3.0.0"
+
+pkg-dir@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
+  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
+  dependencies:
+    find-up "^4.0.0"
+
+pkg-dir@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-5.0.0.tgz#a02d6aebe6ba133a928f74aec20bafdfe6b8e760"
+  integrity sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==
+  dependencies:
+    find-up "^5.0.0"
+
+pkg-up@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5"
+  integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==
+  dependencies:
+    find-up "^3.0.0"
+
+please-upgrade-node@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942"
+  integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==
+  dependencies:
+    semver-compare "^1.0.0"
+
+portfinder@^1.0.26:
+  version "1.0.28"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
+  integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==
+  dependencies:
+    async "^2.6.2"
+    debug "^3.1.1"
+    mkdirp "^0.5.5"
+
+posix-character-classes@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
+
+postcss-functions@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-functions/-/postcss-functions-3.0.0.tgz#0e94d01444700a481de20de4d55fb2640564250e"
+  integrity sha1-DpTQFERwCkgd4g3k1V+yZAVkJQ4=
+  dependencies:
+    glob "^7.1.2"
+    object-assign "^4.1.1"
+    postcss "^6.0.9"
+    postcss-value-parser "^3.3.0"
+
+postcss-import@12.0.1:
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-12.0.1.tgz#cf8c7ab0b5ccab5649024536e565f841928b7153"
+  integrity sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==
+  dependencies:
+    postcss "^7.0.1"
+    postcss-value-parser "^3.2.3"
+    read-cache "^1.0.0"
+    resolve "^1.1.7"
+
+postcss-js@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-2.0.3.tgz#a96f0f23ff3d08cec7dc5b11bf11c5f8077cdab9"
+  integrity sha512-zS59pAk3deu6dVHyrGqmC3oDXBdNdajk4k1RyxeVXCrcEDBUBHoIhE4QTsmhxgzXxsaqFDAkUZfmMa5f/N/79w==
+  dependencies:
+    camelcase-css "^2.0.1"
+    postcss "^7.0.18"
+
+postcss-load-config@^2.0.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.2.tgz#c5ea504f2c4aef33c7359a34de3573772ad7502a"
+  integrity sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==
+  dependencies:
+    cosmiconfig "^5.0.0"
+    import-cwd "^2.0.0"
+
+postcss-loader@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-3.0.0.tgz#6b97943e47c72d845fa9e03f273773d4e8dd6c2d"
+  integrity sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==
+  dependencies:
+    loader-utils "^1.1.0"
+    postcss "^7.0.0"
+    postcss-load-config "^2.0.0"
+    schema-utils "^1.0.0"
+
+postcss-nested@^4.1.1:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-4.2.3.tgz#c6f255b0a720549776d220d00c4b70cd244136f6"
+  integrity sha512-rOv0W1HquRCamWy2kFl3QazJMMe1ku6rCFoAAH+9AcxdbpDeBr6k968MLWuLjvjMcGEip01ak09hKOEgpK9hvw==
+  dependencies:
+    postcss "^7.0.32"
+    postcss-selector-parser "^6.0.2"
+
+postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2:
+  version "6.0.6"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea"
+  integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==
+  dependencies:
+    cssesc "^3.0.0"
+    util-deprecate "^1.0.2"
+
+postcss-url@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-url/-/postcss-url-8.0.0.tgz#7b10059bd12929cdbb1971c60f61a0e5af86b4ca"
+  integrity sha512-E2cbOQ5aii2zNHh8F6fk1cxls7QVFZjLPSrqvmiza8OuXLzIpErij8BDS5Y3STPfJgpIMNCPEr8JlKQWEoozUw==
+  dependencies:
+    mime "^2.3.1"
+    minimatch "^3.0.4"
+    mkdirp "^0.5.0"
+    postcss "^7.0.2"
+    xxhashjs "^0.2.1"
+
+postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
+  integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
+
+postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
+  integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
+
+postcss@7.0.17:
+  version "7.0.17"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.17.tgz#4da1bdff5322d4a0acaab4d87f3e782436bad31f"
+  integrity sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==
+  dependencies:
+    chalk "^2.4.2"
+    source-map "^0.6.1"
+    supports-color "^6.1.0"
+
+postcss@7.0.32:
+  version "7.0.32"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d"
+  integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==
+  dependencies:
+    chalk "^2.4.2"
+    source-map "^0.6.1"
+    supports-color "^6.1.0"
+
+postcss@^6.0.9:
+  version "6.0.23"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
+  integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==
+  dependencies:
+    chalk "^2.4.1"
+    source-map "^0.6.1"
+    supports-color "^5.4.0"
+
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.11, postcss@^7.0.17, postcss@^7.0.18, postcss@^7.0.2, postcss@^7.0.32:
+  version "7.0.35"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24"
+  integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==
+  dependencies:
+    chalk "^2.4.2"
+    source-map "^0.6.1"
+    supports-color "^6.1.0"
+
+prelude-ls@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
+
+prepend-http@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
+  integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
+
+prepend-http@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
+  integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
+
+pretty-hrtime@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
+  integrity sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=
+
+printj@~1.1.0, printj@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222"
+  integrity sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==
+
+process-nextick-args@~2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
+
+process@^0.11.10:
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
+
+process@~0.5.1:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf"
+  integrity sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=
+
+promise-inflight@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
+  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
+
+promise-retry@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d"
+  integrity sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=
+  dependencies:
+    err-code "^1.0.0"
+    retry "^0.10.0"
+
+promise@^7.1.1:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
+  integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
+  dependencies:
+    asap "~2.0.3"
+
+promise@~7.0.1:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-7.0.4.tgz#363e84a4c36c8356b890fed62c91ce85d02ed539"
+  integrity sha1-Nj6EpMNsg1a4kP7WLJHOhdAu1Tk=
+  dependencies:
+    asap "~2.0.3"
+
+protoduck@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.1.tgz#03c3659ca18007b69a50fd82a7ebcc516261151f"
+  integrity sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==
+  dependencies:
+    genfun "^5.0.0"
+
+protractor@~5.4.2:
+  version "5.4.4"
+  resolved "https://registry.yarnpkg.com/protractor/-/protractor-5.4.4.tgz#b241466aaf83b76bc2c58df67deb9a5cdfc61529"
+  integrity sha512-BaL4vePgu3Vfa/whvTUAlgaCAId4uNSGxIFSCXMgj7LMYENPWLp85h5RBi9pdpX/bWQ8SF6flP7afmi2TC4eHw==
+  dependencies:
+    "@types/q" "^0.0.32"
+    "@types/selenium-webdriver" "^3.0.0"
+    blocking-proxy "^1.0.0"
+    browserstack "^1.5.1"
+    chalk "^1.1.3"
+    glob "^7.0.3"
+    jasmine "2.8.0"
+    jasminewd2 "^2.1.0"
+    q "1.4.1"
+    saucelabs "^1.5.0"
+    selenium-webdriver "3.6.0"
+    source-map-support "~0.4.0"
+    webdriver-js-extender "2.1.0"
+    webdriver-manager "^12.0.6"
+    yargs "^12.0.5"
+
+proxy-addr@~2.0.5:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf"
+  integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==
+  dependencies:
+    forwarded "~0.1.2"
+    ipaddr.js "1.9.1"
+
+prr@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
+  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
+
+pseudomap@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
+
+psl@^1.1.28:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
+  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
+
+public-encrypt@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
+  integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==
+  dependencies:
+    bn.js "^4.1.0"
+    browserify-rsa "^4.0.0"
+    create-hash "^1.1.0"
+    parse-asn1 "^5.0.0"
+    randombytes "^2.0.1"
+    safe-buffer "^5.1.2"
+
+pump@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
+  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+pump@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+pumpify@^1.3.3:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
+  integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
+  dependencies:
+    duplexify "^3.6.0"
+    inherits "^2.0.3"
+    pump "^2.0.0"
+
+punycode@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
+
+punycode@^1.2.4:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
+
+punycode@^2.1.0, punycode@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+
+purgecss@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/purgecss/-/purgecss-2.3.0.tgz#5327587abf5795e6541517af8b190a6fb5488bb3"
+  integrity sha512-BE5CROfVGsx2XIhxGuZAT7rTH9lLeQx/6M0P7DTXQH4IUc3BBzs9JUzt4yzGf3JrH9enkeq6YJBe9CTtkm1WmQ==
+  dependencies:
+    commander "^5.0.0"
+    glob "^7.0.0"
+    postcss "7.0.32"
+    postcss-selector-parser "^6.0.2"
+
+q@1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
+  integrity sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=
+
+q@^1.4.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
+  integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
+
+qjobs@^1.1.4:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
+  integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==
+
+qs@6.7.0:
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
+  integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
+
+qs@~6.5.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
+
+query-string@^4.1.0:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
+  integrity sha1-u7aTucqRXCMlFbIosaArYJBD2+s=
+  dependencies:
+    object-assign "^4.1.0"
+    strict-uri-encode "^1.0.0"
+
+querystring-es3@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
+  integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
+
+querystring@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
+
+querystringify@^2.1.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
+  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
+
+queue-microtask@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
+  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
+
+quill-delta@^3.6.2:
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/quill-delta/-/quill-delta-3.6.3.tgz#b19fd2b89412301c60e1ff213d8d860eac0f1032"
+  integrity sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg==
+  dependencies:
+    deep-equal "^1.0.1"
+    extend "^3.0.2"
+    fast-diff "1.1.2"
+
+quill-delta@^4.0.1:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/quill-delta/-/quill-delta-4.2.2.tgz#015397d046e0a3bed087cd8a51f98c11a1b8f351"
+  integrity sha512-qjbn82b/yJzOjstBgkhtBjN2TNK+ZHP/BgUQO+j6bRhWQQdmj2lH6hXG7+nwwLF41Xgn//7/83lxs9n2BkTtTg==
+  dependencies:
+    fast-diff "1.2.0"
+    lodash.clonedeep "^4.5.0"
+    lodash.isequal "^4.5.0"
+
+quill@^1.3.7:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/quill/-/quill-1.3.7.tgz#da5b2f3a2c470e932340cdbf3668c9f21f9286e8"
+  integrity sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==
+  dependencies:
+    clone "^2.1.1"
+    deep-equal "^1.0.1"
+    eventemitter3 "^2.0.3"
+    extend "^3.0.2"
+    parchment "^1.1.4"
+    quill-delta "^3.6.2"
+
+raf@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39"
+  integrity sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==
+  dependencies:
+    performance-now "^2.1.0"
+
+randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
+  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
+  dependencies:
+    safe-buffer "^5.1.0"
+
+randomfill@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
+  integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
+  dependencies:
+    randombytes "^2.0.5"
+    safe-buffer "^5.1.0"
+
+range-parser@^1.2.0, range-parser@^1.2.1, range-parser@~1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
+  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
+
+raw-body@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
+  integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
+  dependencies:
+    bytes "3.1.0"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
+    unpipe "1.0.0"
+
+raw-loader@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-3.1.0.tgz#5e9d399a5a222cc0de18f42c3bc5e49677532b3f"
+  integrity sha512-lzUVMuJ06HF4rYveaz9Tv0WRlUMxJ0Y1hgSkkgg+50iEdaI0TthyEDe08KIHb0XsF6rn8WYTqPCaGTZg3sX+qA==
+  dependencies:
+    loader-utils "^1.1.0"
+    schema-utils "^2.0.1"
+
+rc@^1.2.8:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
+  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
+  dependencies:
+    deep-extend "^0.6.0"
+    ini "~1.3.0"
+    minimist "^1.2.0"
+    strip-json-comments "~2.0.1"
+
+read-cache@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
+  integrity sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=
+  dependencies:
+    pify "^2.3.0"
+
+read-package-json@^2.0.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.1.2.tgz#6992b2b66c7177259feb8eaac73c3acd28b9222a"
+  integrity sha512-D1KmuLQr6ZSJS0tW8hf3WGpRlwszJOXZ3E8Yd/DNRaM5d+1wVRZdHlpGBLAuovjr28LbWvjpWkBHMxpRGGjzNA==
+  dependencies:
+    glob "^7.1.1"
+    json-parse-even-better-errors "^2.3.0"
+    normalize-package-data "^2.0.0"
+    npm-normalize-package-bin "^1.0.0"
+
+read-package-tree@5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.3.1.tgz#a32cb64c7f31eb8a6f31ef06f9cedf74068fe636"
+  integrity sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw==
+  dependencies:
+    read-package-json "^2.0.0"
+    readdir-scoped-modules "^1.0.0"
+    util-promisify "^2.1.0"
+
+read-pkg-up@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-5.0.0.tgz#b6a6741cb144ed3610554f40162aa07a6db621b8"
+  integrity sha512-XBQjqOBtTzyol2CpsQOw8LHV0XbDZVG7xMMjmXAJomlVY03WOBRmYgDJETlvcg0H63AJvPRwT7GFi5rvOzUOKg==
+  dependencies:
+    find-up "^3.0.0"
+    read-pkg "^5.0.0"
+
+read-pkg@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
+  integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
+  dependencies:
+    "@types/normalize-package-data" "^2.4.0"
+    normalize-package-data "^2.5.0"
+    parse-json "^5.0.0"
+    type-fest "^0.6.0"
+
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+  version "2.3.7"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
+  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
+
+readable-stream@^3.0.6, readable-stream@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
+readdir-scoped-modules@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309"
+  integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==
+  dependencies:
+    debuglog "^1.0.1"
+    dezalgo "^1.0.0"
+    graceful-fs "^4.1.2"
+    once "^1.3.0"
+
+readdirp@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
+  integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
+  dependencies:
+    graceful-fs "^4.1.11"
+    micromatch "^3.1.10"
+    readable-stream "^2.0.2"
+
+readdirp@~3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"
+  integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==
+  dependencies:
+    picomatch "^2.2.1"
+
+reduce-css-calc@^2.1.6:
+  version "2.1.8"
+  resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-2.1.8.tgz#7ef8761a28d614980dc0c982f772c93f7a99de03"
+  integrity sha512-8liAVezDmUcH+tdzoEGrhfbGcP7nOV4NkGE3a74+qqvE7nt9i4sKLGBuZNOnpI4WiGksiNPklZxva80061QiPg==
+  dependencies:
+    css-unit-converter "^1.1.1"
+    postcss-value-parser "^3.3.0"
+
+reflect-metadata@^0.1.12, reflect-metadata@^0.1.2:
+  version "0.1.13"
+  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08"
+  integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==
+
+regenerate-unicode-properties@^8.2.0:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
+  integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==
+  dependencies:
+    regenerate "^1.4.0"
+
+regenerate@^1.4.0:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
+  integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
+
+regenerator-runtime@0.13.3:
+  version "0.13.3"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"
+  integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==
+
+regenerator-runtime@^0.13.4:
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
+  integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==
+
+regenerator-runtime@^0.13.7:
+  version "0.13.9"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
+  integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
+
+regenerator-transform@^0.14.2:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4"
+  integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==
+  dependencies:
+    "@babel/runtime" "^7.8.4"
+
+regex-not@^1.0.0, regex-not@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
+  dependencies:
+    extend-shallow "^3.0.2"
+    safe-regex "^1.1.0"
+
+regexp.prototype.flags@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26"
+  integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+
+regexpu-core@^4.7.1:
+  version "4.7.1"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"
+  integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==
+  dependencies:
+    regenerate "^1.4.0"
+    regenerate-unicode-properties "^8.2.0"
+    regjsgen "^0.5.1"
+    regjsparser "^0.6.4"
+    unicode-match-property-ecmascript "^1.0.4"
+    unicode-match-property-value-ecmascript "^1.2.0"
+
+registry-auth-token@^4.0.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250"
+  integrity sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==
+  dependencies:
+    rc "^1.2.8"
+
+registry-url@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009"
+  integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==
+  dependencies:
+    rc "^1.2.8"
+
+regjsgen@^0.5.1:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
+  integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==
+
+regjsparser@^0.6.4:
+  version "0.6.9"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.9.tgz#b489eef7c9a2ce43727627011429cf833a7183e6"
+  integrity sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==
+  dependencies:
+    jsesc "~0.5.0"
+
+remove-trailing-separator@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
+
+remove@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/remove/-/remove-0.1.5.tgz#095ffd827d65c9f41ad97d33e416a75811079955"
+  integrity sha1-CV/9gn1lyfQa2X0z5BanWBEHmVU=
+  dependencies:
+    seq ">= 0.3.5"
+
+repeat-element@^1.1.2:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9"
+  integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==
+
+repeat-string@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-0.2.2.tgz#c7a8d3236068362059a7e4651fc6884e8b1fb4ae"
+  integrity sha512-yHeI3F9v20MY+8/5WAUgIWseMZwpLD+l9h5hGyzh6fQjhle2AwjjRDao1m5IozSDuVvMw09/mvE8AU1oDmZKpQ==
+
+repeat-string@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
+
+request@^2.55.0, request@^2.83.0, request@^2.87.0, request@^2.88.2:
+  version "2.88.2"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
+  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.8.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
+    forever-agent "~0.6.1"
+    form-data "~2.3.2"
+    har-validator "~5.1.3"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
+    performance-now "^2.1.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.5.0"
+    tunnel-agent "^0.6.0"
+    uuid "^3.3.2"
+
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+
+require-main-filename@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+  integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
+
+require-main-filename@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
+  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
+
+requires-port@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
+
+resolve-cwd@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
+  integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=
+  dependencies:
+    resolve-from "^3.0.0"
+
+resolve-from@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
+  integrity sha1-six699nWiBvItuZTM17rywoYh0g=
+
+resolve-from@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
+
+resolve-url@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
+
+resolve@^1.1.7, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.11.1, resolve@^1.14.2, resolve@^1.3.2:
+  version "1.20.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
+  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
+  dependencies:
+    is-core-module "^2.2.0"
+    path-parse "^1.0.6"
+
+resolve@~1.1.6:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
+  integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
+
+responselike@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
+  integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=
+  dependencies:
+    lowercase-keys "^1.0.0"
+
+restore-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
+  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
+  dependencies:
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+
+ret@~0.1.10:
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
+
+retry@^0.10.0:
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
+  integrity sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=
+
+retry@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
+  integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=
+
+reusify@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
+
+rfdc@^1.1.2, rfdc@^1.1.4:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b"
+  integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==
+
+rgbcolor@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/rgbcolor/-/rgbcolor-1.0.1.tgz#d6505ecdb304a6595da26fa4b43307306775945d"
+  integrity sha1-1lBezbMEplldom+ktDMHMGd1lF0=
+
+rimraf@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.0.tgz#614176d4b3010b75e5c390eb0ee96f6dc0cebb9b"
+  integrity sha512-NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg==
+  dependencies:
+    glob "^7.1.3"
+
+rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.2, rimraf@^2.6.3:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
+  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
+  dependencies:
+    glob "^7.1.3"
+
+rimraf@^3.0.0, rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
+ripemd160@^2.0.0, ripemd160@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
+  integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
+  dependencies:
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
+
+rollup-plugin-commonjs@^10.0.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-10.1.0.tgz#417af3b54503878e084d127adf4d1caf8beb86fb"
+  integrity sha512-jlXbjZSQg8EIeAAvepNwhJj++qJWNJw1Cl0YnOqKtP5Djx+fFGkp3WRh+W0ASCaFG5w1jhmzDxgu3SJuVxPF4Q==
+  dependencies:
+    estree-walker "^0.6.1"
+    is-reference "^1.1.2"
+    magic-string "^0.25.2"
+    resolve "^1.11.0"
+    rollup-pluginutils "^2.8.1"
+
+rollup-plugin-json@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-json/-/rollup-plugin-json-4.0.0.tgz#a18da0a4b30bf5ca1ee76ddb1422afbb84ae2b9e"
+  integrity sha512-hgb8N7Cgfw5SZAkb3jf0QXii6QX/FOkiIq2M7BAQIEydjHvTyxXHQiIzZaTFgx1GK0cRCHOCBHIyEkkLdWKxow==
+  dependencies:
+    rollup-pluginutils "^2.5.0"
+
+rollup-plugin-node-resolve@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-5.2.0.tgz#730f93d10ed202473b1fb54a5997a7db8c6d8523"
+  integrity sha512-jUlyaDXts7TW2CqQ4GaO5VJ4PwwaV8VUGA7+km3n6k6xtOEacf61u0VXwN80phY/evMcaS+9eIeJ9MOyDxt5Zw==
+  dependencies:
+    "@types/resolve" "0.0.8"
+    builtin-modules "^3.1.0"
+    is-module "^1.0.0"
+    resolve "^1.11.1"
+    rollup-pluginutils "^2.8.1"
+
+rollup-plugin-replace@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-replace/-/rollup-plugin-replace-2.2.0.tgz#f41ae5372e11e7a217cde349c8b5d5fd115e70e3"
+  integrity sha512-/5bxtUPkDHyBJAKketb4NfaeZjL5yLZdeUihSfbF2PQMz+rSTEb8ARKoOl3UBT4m7/X+QOXJo3sLTcq+yMMYTA==
+  dependencies:
+    magic-string "^0.25.2"
+    rollup-pluginutils "^2.6.0"
+
+rollup-plugin-sourcemaps@^0.4.2:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.4.2.tgz#62125aa94087aadf7b83ef4dfaf629b473135e87"
+  integrity sha1-YhJaqUCHqt97g+9N+vYptHMTXoc=
+  dependencies:
+    rollup-pluginutils "^2.0.1"
+    source-map-resolve "^0.5.0"
+
+rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.5.0, rollup-pluginutils@^2.6.0, rollup-pluginutils@^2.8.1:
+  version "2.8.2"
+  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"
+  integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==
+  dependencies:
+    estree-walker "^0.6.1"
+
+rollup@1.25.2:
+  version "1.25.2"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.25.2.tgz#739f508bd8f7ece52bb6c1fcda83466af82b7f6d"
+  integrity sha512-+7z6Wab/L45QCPcfpuTZKwKiB0tynj05s/+s2U3F2Bi7rOLPr9UcjUwO7/xpjlPNXA/hwnth6jBExFRGyf3tMg==
+  dependencies:
+    "@types/estree" "*"
+    "@types/node" "*"
+    acorn "^7.1.0"
+
+run-async@^2.2.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
+  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
+
+run-parallel@^1.1.9:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
+  integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
+  dependencies:
+    queue-microtask "^1.2.2"
+
+run-queue@^1.0.0, run-queue@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
+  integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=
+  dependencies:
+    aproba "^1.1.1"
+
+rust-result@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/rust-result/-/rust-result-1.0.0.tgz#34c75b2e6dc39fe5875e5bdec85b5e0f91536f72"
+  integrity sha1-NMdbLm3Dn+WHXlveyFteD5FTb3I=
+  dependencies:
+    individual "^2.0.0"
+
+rw@1:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
+  integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q=
+
+rxjs@6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
+  integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
+  dependencies:
+    tslib "^1.9.0"
+
+rxjs@^6.0.0, rxjs@^6.4.0:
+  version "6.6.7"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
+  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
+  dependencies:
+    tslib "^1.9.0"
+
+rxjs@~6.3.3:
+  version "6.3.3"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55"
+  integrity sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==
+  dependencies:
+    tslib "^1.9.0"
+
+rxjs@~6.5.2:
+  version "6.5.5"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz#c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec"
+  integrity sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==
+  dependencies:
+    tslib "^1.9.0"
+
+safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
+safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+
+safe-json-parse@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-4.0.0.tgz#7c0f578cfccd12d33a71c0e05413e2eca171eaac"
+  integrity sha1-fA9XjPzNEtM6ccDgVBPi7KFx6qw=
+  dependencies:
+    rust-result "^1.0.0"
+
+safe-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
+  dependencies:
+    ret "~0.1.10"
+
+"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@^2.1.2, safer-buffer@~2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+
+sass-loader@7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.2.0.tgz#e34115239309d15b2527cb62b5dfefb62a96ff7f"
+  integrity sha512-h8yUWaWtsbuIiOCgR9fd9c2lRXZ2uG+h8Dzg/AGNj+Hg/3TO8+BBAW9mEP+mh8ei+qBKqSJ0F1FLlYjNBc61OA==
+  dependencies:
+    clone-deep "^4.0.1"
+    loader-utils "^1.0.1"
+    neo-async "^2.5.0"
+    pify "^4.0.1"
+    semver "^5.5.0"
+
+sass@1.22.9:
+  version "1.22.9"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.22.9.tgz#41a2ed6038027f58be2bd5041293452a29c2cb84"
+  integrity sha512-FzU1X2V8DlnqabrL4u7OBwD2vcOzNMongEJEx3xMEhWY/v26FFR3aG0hyeu2T965sfR0E9ufJwmG+Qjz78vFPQ==
+  dependencies:
+    chokidar ">=2.0.0 <4.0.0"
+
+sass@^1.17.3:
+  version "1.32.13"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.13.tgz#8d29c849e625a415bce71609c7cf95e15f74ed00"
+  integrity sha512-dEgI9nShraqP7cXQH+lEXVf73WOPCse0QlFzSD8k+1TcOxCMwVXfQlr0jtoluZysQOyJGnfr21dLvYKDJq8HkA==
+  dependencies:
+    chokidar ">=3.0.0 <4.0.0"
+
+saucelabs@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/saucelabs/-/saucelabs-1.5.0.tgz#9405a73c360d449b232839919a86c396d379fd9d"
+  integrity sha512-jlX3FGdWvYf4Q3LFfFWS1QvPg3IGCGWxIc8QBFdPTbpTJnt/v17FHXYVAn7C8sHf1yUXo2c7yIM0isDryfYtHQ==
+  dependencies:
+    https-proxy-agent "^2.2.1"
+
+sax@0.5.x:
+  version "0.5.8"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
+  integrity sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=
+
+sax@>=0.6.0, sax@^1.1.4, sax@~1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+
+schema-utils@^0.4.0:
+  version "0.4.7"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
+  integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
+  dependencies:
+    ajv "^6.1.0"
+    ajv-keywords "^3.1.0"
+
+schema-utils@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
+  integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==
+  dependencies:
+    ajv "^6.1.0"
+    ajv-errors "^1.0.0"
+    ajv-keywords "^3.1.0"
+
+schema-utils@^2.0.0, schema-utils@^2.0.1, schema-utils@^2.6.1, schema-utils@^2.6.6, schema-utils@^2.7.0:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
+  integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==
+  dependencies:
+    "@types/json-schema" "^7.0.5"
+    ajv "^6.12.4"
+    ajv-keywords "^3.5.2"
+
+select-hose@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
+  integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
+
+selenium-webdriver@3.6.0, selenium-webdriver@^3.0.1:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-3.6.0.tgz#2ba87a1662c020b8988c981ae62cb2a01298eafc"
+  integrity sha512-WH7Aldse+2P5bbFBO4Gle/nuQOdVwpHMTL6raL3uuBj/vPG07k6uzt3aiahu352ONBr5xXh0hDlM3LhtXPOC4Q==
+  dependencies:
+    jszip "^3.1.3"
+    rimraf "^2.5.4"
+    tmp "0.0.30"
+    xml2js "^0.4.17"
+
+selfsigned@^1.10.7:
+  version "1.10.11"
+  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.11.tgz#24929cd906fe0f44b6d01fb23999a739537acbe9"
+  integrity sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA==
+  dependencies:
+    node-forge "^0.10.0"
+
+semver-compare@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
+  integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
+
+semver-diff@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"
+  integrity sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=
+  dependencies:
+    semver "^5.0.3"
+
+semver-dsl@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/semver-dsl/-/semver-dsl-1.0.1.tgz#d3678de5555e8a61f629eed025366ae5f27340a0"
+  integrity sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=
+  dependencies:
+    semver "^5.3.0"
+
+semver-intersect@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/semver-intersect/-/semver-intersect-1.4.0.tgz#bdd9c06bedcdd2fedb8cd352c3c43ee8c61321f3"
+  integrity sha512-d8fvGg5ycKAq0+I6nfWeCx6ffaWJCsBYU0H2Rq56+/zFePYfT8mXkB3tWBSjR5BerkHNZ5eTPIk1/LBYas35xQ==
+  dependencies:
+    semver "^5.0.0"
+
+semver-regex@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.2.tgz#34b4c0d361eef262e07199dbef316d0f2ab11807"
+  integrity sha512-bXWyL6EAKOJa81XG1OZ/Yyuq+oT0b2YLlxx7c+mrdYPaPbnj6WgVULXhinMIeZGufuUBu/eVRqXEhiv4imfwxA==
+
+"semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.0.3, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+
+semver@6.3.0, semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+
+semver@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
+  integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
+
+send@0.17.1:
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
+  integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==
+  dependencies:
+    debug "2.6.9"
+    depd "~1.1.2"
+    destroy "~1.0.4"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    fresh "0.5.2"
+    http-errors "~1.7.2"
+    mime "1.6.0"
+    ms "2.1.1"
+    on-finished "~2.3.0"
+    range-parser "~1.2.1"
+    statuses "~1.5.0"
+
+"seq@>= 0.3.5":
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/seq/-/seq-0.3.5.tgz#ae02af3a424793d8ccbf212d69174e0c54dffe38"
+  integrity sha1-rgKvOkJHk9jMvyEtaRdODFTf/jg=
+  dependencies:
+    chainsaw ">=0.0.7 <0.1"
+    hashish ">=0.0.2 <0.1"
+
+serialize-javascript@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-3.1.0.tgz#8bf3a9170712664ef2561b44b691eafe399214ea"
+  integrity sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==
+  dependencies:
+    randombytes "^2.1.0"
+
+serialize-javascript@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
+  integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==
+  dependencies:
+    randombytes "^2.1.0"
+
+serve-index@^1.9.1:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
+  integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
+  dependencies:
+    accepts "~1.3.4"
+    batch "0.6.1"
+    debug "2.6.9"
+    escape-html "~1.0.3"
+    http-errors "~1.6.2"
+    mime-types "~2.1.17"
+    parseurl "~1.3.2"
+
+serve-static@1.14.1:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
+  integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
+  dependencies:
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    parseurl "~1.3.3"
+    send "0.17.1"
+
+set-blocking@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
+
+set-immediate-shim@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
+  integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
+
+set-value@^2.0.0, set-value@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
+  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.3"
+    split-string "^3.0.1"
+
+setimmediate@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
+
+setprototypeof@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
+  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
+
+setprototypeof@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
+  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
+
+sha.js@^2.4.0, sha.js@^2.4.8:
+  version "2.4.11"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
+  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+shallow-clone@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
+  integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==
+  dependencies:
+    kind-of "^6.0.2"
+
+shebang-command@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
+  dependencies:
+    shebang-regex "^1.0.0"
+
+shebang-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
+
+shepherd.js@^7.1.0:
+  version "7.2.1"
+  resolved "https://registry.yarnpkg.com/shepherd.js/-/shepherd.js-7.2.1.tgz#9973fae7cb595c0c74ae16df5431089f72221680"
+  integrity sha512-IJP2cTv3F7BYjsiN6J+J36s0lKbbBd01p2vKQe2o6EutyVkJd6/Tsr5r+ndMgZ7/aJT7rEb6YkvNWqBfAkcX+A==
+  dependencies:
+    "@popperjs/core" "^2.4.0"
+    deepmerge "^4.2.2"
+    smoothscroll-polyfill "^0.4.4"
+
+signal-exit@^3.0.0, signal-exit@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
+  integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
+
+simple-swizzle@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
+  integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=
+  dependencies:
+    is-arrayish "^0.3.1"
+
+sirv@^1.0.7:
+  version "1.0.19"
+  resolved "https://registry.yarnpkg.com/sirv/-/sirv-1.0.19.tgz#1d73979b38c7fe91fcba49c85280daa9c2363b49"
+  integrity sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ==
+  dependencies:
+    "@polka/url" "^1.0.0-next.20"
+    mrmime "^1.0.0"
+    totalist "^1.0.0"
+
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
+smart-buffer@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.1.0.tgz#91605c25d91652f4661ea69ccf45f1b331ca21ba"
+  integrity sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==
+
+smoothscroll-polyfill@^0.4.4:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/smoothscroll-polyfill/-/smoothscroll-polyfill-0.4.4.tgz#3a259131dc6930e6ca80003e1cb03b603b69abf8"
+  integrity sha512-TK5ZA9U5RqCwMpfoMq/l1mrH0JAR7y7KRvOBx0n2869aLxch+gT9GhN3yUfjiw+d/DiF1mKo14+hd62JyMmoBg==
+
+snapdragon-node@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
+  dependencies:
+    define-property "^1.0.0"
+    isobject "^3.0.0"
+    snapdragon-util "^3.0.1"
+
+snapdragon-util@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
+  dependencies:
+    kind-of "^3.2.0"
+
+snapdragon@^0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
+  dependencies:
+    base "^0.11.1"
+    debug "^2.2.0"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    map-cache "^0.2.2"
+    source-map "^0.5.6"
+    source-map-resolve "^0.5.0"
+    use "^3.1.0"
+
+socket.io-adapter@~1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9"
+  integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==
+
+socket.io-client@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.1.1.tgz#dcb38103436ab4578ddb026638ae2f21b623671f"
+  integrity sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==
+  dependencies:
+    backo2 "1.0.2"
+    base64-arraybuffer "0.1.5"
+    component-bind "1.0.0"
+    component-emitter "1.2.1"
+    debug "~3.1.0"
+    engine.io-client "~3.2.0"
+    has-binary2 "~1.0.2"
+    has-cors "1.1.0"
+    indexof "0.0.1"
+    object-component "0.0.3"
+    parseqs "0.0.5"
+    parseuri "0.0.5"
+    socket.io-parser "~3.2.0"
+    to-array "0.1.4"
+
+socket.io-parser@~3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.2.0.tgz#e7c6228b6aa1f814e6148aea325b51aa9499e077"
+  integrity sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==
+  dependencies:
+    component-emitter "1.2.1"
+    debug "~3.1.0"
+    isarray "2.0.1"
+
+socket.io@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.1.1.tgz#a069c5feabee3e6b214a75b40ce0652e1cfb9980"
+  integrity sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==
+  dependencies:
+    debug "~3.1.0"
+    engine.io "~3.2.0"
+    has-binary2 "~1.0.2"
+    socket.io-adapter "~1.1.0"
+    socket.io-client "2.1.1"
+    socket.io-parser "~3.2.0"
+
+sockjs-client@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.4.0.tgz#c9f2568e19c8fd8173b4997ea3420e0bb306c7d5"
+  integrity sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==
+  dependencies:
+    debug "^3.2.5"
+    eventsource "^1.0.7"
+    faye-websocket "~0.11.1"
+    inherits "^2.0.3"
+    json3 "^3.3.2"
+    url-parse "^1.4.3"
+
+sockjs@0.3.20:
+  version "0.3.20"
+  resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.20.tgz#b26a283ec562ef8b2687b44033a4eeceac75d855"
+  integrity sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==
+  dependencies:
+    faye-websocket "^0.10.0"
+    uuid "^3.4.0"
+    websocket-driver "0.6.5"
+
+socks-proxy-agent@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz#3c8991f3145b2799e70e11bd5fbc8b1963116386"
+  integrity sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==
+  dependencies:
+    agent-base "~4.2.1"
+    socks "~2.3.2"
+
+socks@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.3.3.tgz#01129f0a5d534d2b897712ed8aceab7ee65d78e3"
+  integrity sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==
+  dependencies:
+    ip "1.1.5"
+    smart-buffer "^4.1.0"
+
+sort-keys@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
+  integrity sha1-RBttTTRnmPG05J6JIK37oOVD+a0=
+  dependencies:
+    is-plain-obj "^1.0.0"
+
+source-list-map@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
+  integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
+
+source-list-map@~0.1.7:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
+  integrity sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=
+
+source-map-loader@0.2.4:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-0.2.4.tgz#c18b0dc6e23bf66f6792437557c569a11e072271"
+  integrity sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==
+  dependencies:
+    async "^2.5.0"
+    loader-utils "^1.1.0"
+
+source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
+  integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
+  dependencies:
+    atob "^2.1.2"
+    decode-uri-component "^0.2.0"
+    resolve-url "^0.2.1"
+    source-map-url "^0.4.0"
+    urix "^0.1.0"
+
+source-map-support@0.5.13:
+  version "0.5.13"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
+  integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
+source-map-support@^0.5.5, source-map-support@^0.5.6, source-map-support@~0.5.12:
+  version "0.5.19"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
+  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
+source-map-support@~0.4.0:
+  version "0.4.18"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
+  integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==
+  dependencies:
+    source-map "^0.5.6"
+
+source-map-url@^0.4.0:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
+  integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
+
+source-map@0.1.x:
+  version "0.1.43"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
+  integrity sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=
+  dependencies:
+    amdefine ">=0.0.4"
+
+source-map@0.7.3, source-map@^0.7.3:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
+  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
+
+source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
+
+source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
+source-map@~0.4.1:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
+  dependencies:
+    amdefine ">=0.0.4"
+
+sourcemap-codec@^1.4.4:
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
+  integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
+
+spdx-correct@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
+  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
+  dependencies:
+    spdx-expression-parse "^3.0.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-exceptions@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
+  integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
+
+spdx-expression-parse@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
+  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
+  dependencies:
+    spdx-exceptions "^2.1.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-license-ids@^3.0.0:
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65"
+  integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==
+
+spdy-transport@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31"
+  integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==
+  dependencies:
+    debug "^4.1.0"
+    detect-node "^2.0.4"
+    hpack.js "^2.1.6"
+    obuf "^1.1.2"
+    readable-stream "^3.0.6"
+    wbuf "^1.7.3"
+
+spdy@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b"
+  integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==
+  dependencies:
+    debug "^4.1.0"
+    handle-thing "^2.0.0"
+    http-deceiver "^1.2.7"
+    select-hose "^2.0.0"
+    spdy-transport "^3.0.0"
+
+speed-measure-webpack-plugin@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz#69840a5cdc08b4638697dac7db037f595d7f36a0"
+  integrity sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==
+  dependencies:
+    chalk "^2.0.1"
+
+split-string@^3.0.1, split-string@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
+  dependencies:
+    extend-shallow "^3.0.0"
+
+sprintf-js@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
+  integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
+
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
+
+ssf@~0.10.2:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/ssf/-/ssf-0.10.3.tgz#8eae1fc29c90a552e7921208f81892d6f77acb2b"
+  integrity sha512-pRuUdW0WwyB2doSqqjWyzwCD6PkfxpHAHdZp39K3dp/Hq7f+xfMwNAWIi16DyrRg4gg9c/RvLYkJTSawTPTm1w==
+  dependencies:
+    frac "~1.1.2"
+
+ssf@~0.11.2:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/ssf/-/ssf-0.11.2.tgz#0b99698b237548d088fc43cdf2b70c1a7512c06c"
+  integrity sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==
+  dependencies:
+    frac "~1.1.2"
+
+sshpk@^1.7.0:
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
+  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    bcrypt-pbkdf "^1.0.0"
+    dashdash "^1.12.0"
+    ecc-jsbn "~0.1.1"
+    getpass "^0.1.1"
+    jsbn "~0.1.0"
+    safer-buffer "^2.0.2"
+    tweetnacl "~0.14.0"
+
+ssri@^6.0.0, ssri@^6.0.1:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5"
+  integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==
+  dependencies:
+    figgy-pudding "^3.5.1"
+
+ssri@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
+  integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
+  dependencies:
+    minipass "^3.1.1"
+
+stackblur-canvas@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/stackblur-canvas/-/stackblur-canvas-1.4.1.tgz#849aa6f94b272ff26f6471fa4130ed1f7e47955b"
+  integrity sha1-hJqm+UsnL/JvZHH6QTDtH35HlVs=
+
+stackblur-canvas@^2.0.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/stackblur-canvas/-/stackblur-canvas-2.5.0.tgz#aa87bbed1560fdcd3138fff344fc6a1c413ebac4"
+  integrity sha512-EeNzTVfj+1In7aSLPKDD03F/ly4RxEuF/EX0YcOG0cKoPXs+SLZxDawQbexQDBzwROs4VKLWTOaZQlZkGBFEIQ==
+
+stackblur@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/stackblur/-/stackblur-1.0.0.tgz#b407a7e05c93b08d66883bb808d7cba3a503f12f"
+  integrity sha1-tAen4FyTsI1miDu4CNfLo6UD8S8=
+
+static-extend@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
+  dependencies:
+    define-property "^0.2.5"
+    object-copy "^0.1.0"
+
+"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
+
+stream-browserify@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
+  integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==
+  dependencies:
+    inherits "~2.0.1"
+    readable-stream "^2.0.2"
+
+stream-each@^1.1.0:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
+  integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==
+  dependencies:
+    end-of-stream "^1.1.0"
+    stream-shift "^1.0.0"
+
+stream-http@^2.7.2:
+  version "2.8.3"
+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
+  integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==
+  dependencies:
+    builtin-status-codes "^3.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.3.6"
+    to-arraybuffer "^1.0.0"
+    xtend "^4.0.0"
+
+stream-shift@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
+  integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
+
+streamroller@0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-0.7.0.tgz#a1d1b7cf83d39afb0d63049a5acbf93493bdf64b"
+  integrity sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==
+  dependencies:
+    date-format "^1.2.0"
+    debug "^3.1.0"
+    mkdirp "^0.5.1"
+    readable-stream "^2.3.0"
+
+streamroller@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-1.0.6.tgz#8167d8496ed9f19f05ee4b158d9611321b8cacd9"
+  integrity sha512-3QC47Mhv3/aZNFpDDVO44qQb9gwB9QggMEE0sQmkTAwBVYdBRWISdsywlkfm5II1Q5y/pmrHflti/IgmIzdDBg==
+  dependencies:
+    async "^2.6.2"
+    date-format "^2.0.0"
+    debug "^3.2.6"
+    fs-extra "^7.0.1"
+    lodash "^4.17.14"
+
+strict-uri-encode@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
+  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
+
+string-width@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    strip-ansi "^3.0.0"
+
+string-width@^2.0.0, string-width@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^4.0.0"
+
+string-width@^3.0.0, string-width@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
+  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
+  dependencies:
+    emoji-regex "^7.0.1"
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^5.1.0"
+
+string-width@^4.1.0:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"
+  integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.0"
+
+string.prototype.trimend@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
+  integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+
+string.prototype.trimstart@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
+  integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+
+string_decoder@^1.0.0, string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  dependencies:
+    safe-buffer "~5.2.0"
+
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+  dependencies:
+    safe-buffer "~5.1.0"
+
+strip-ansi@^3.0.0, strip-ansi@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
+  dependencies:
+    ansi-regex "^2.0.0"
+
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
+  dependencies:
+    ansi-regex "^3.0.0"
+
+strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
+  dependencies:
+    ansi-regex "^4.1.0"
+
+strip-ansi@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
+  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+  dependencies:
+    ansi-regex "^5.0.0"
+
+strip-bom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
+
+strip-eof@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
+
+strip-json-comments@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
+
+style-loader@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.0.0.tgz#1d5296f9165e8e2c85d24eee0b7caf9ec8ca1f82"
+  integrity sha512-B0dOCFwv7/eY31a5PCieNwMgMhVGFe9w+rh7s/Bx8kfFkrth9zfTZquoYvdw8URgiqxObQKcpW51Ugz1HjfdZw==
+  dependencies:
+    loader-utils "^1.2.3"
+    schema-utils "^2.0.1"
+
+stylus-loader@3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-3.0.2.tgz#27a706420b05a38e038e7cacb153578d450513c6"
+  integrity sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==
+  dependencies:
+    loader-utils "^1.0.2"
+    lodash.clonedeep "^4.5.0"
+    when "~3.6.x"
+
+stylus@0.54.5:
+  version "0.54.5"
+  resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.5.tgz#42b9560931ca7090ce8515a798ba9e6aa3d6dc79"
+  integrity sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=
+  dependencies:
+    css-parse "1.7.x"
+    debug "*"
+    glob "7.0.x"
+    mkdirp "0.5.x"
+    sax "0.5.x"
+    source-map "0.1.x"
+
+stylus@^0.54.5:
+  version "0.54.8"
+  resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.8.tgz#3da3e65966bc567a7b044bfe0eece653e099d147"
+  integrity sha512-vr54Or4BZ7pJafo2mpf0ZcwA74rpuYCZbxrHBsH8kbcXOwSfvBFwsRfpGO5OD5fhG5HDCFW737PKaawI7OqEAg==
+  dependencies:
+    css-parse "~2.0.0"
+    debug "~3.1.0"
+    glob "^7.1.6"
+    mkdirp "~1.0.4"
+    safer-buffer "^2.1.2"
+    sax "~1.2.4"
+    semver "^6.3.0"
+    source-map "^0.7.3"
+
+supports-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
+
+supports-color@^5.3.0, supports-color@^5.4.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+  dependencies:
+    has-flag "^3.0.0"
+
+supports-color@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
+  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
+  dependencies:
+    has-flag "^3.0.0"
+
+supports-color@^7.0.0, supports-color@^7.1.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
+  dependencies:
+    has-flag "^4.0.0"
+
+svg-pathdata@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/svg-pathdata/-/svg-pathdata-6.0.3.tgz#80b0e0283b652ccbafb69ad4f8f73e8d3fbf2cac"
+  integrity sha512-qsjeeq5YjBZ5eMdFuUa4ZosMLxgr5RZ+F+Y1OrDhuOCEInRMA3x74XdBtggJcj9kOeInz0WE+LgCPDkZFlBYJw==
+
+symbol-observable@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
+  integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
+
+"symbol-tree@>= 3.1.0 < 4.0.0":
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
+  integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
+
+tailwindcss@^1.1.4:
+  version "1.9.6"
+  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-1.9.6.tgz#0c5089911d24e1e98e592a31bfdb3d8f34ecf1a0"
+  integrity sha512-nY8WYM/RLPqGsPEGEV2z63riyQPcHYZUJpAwdyBzVpxQHOHqHE+F/fvbCeXhdF1+TA5l72vSkZrtYCB9hRcwkQ==
+  dependencies:
+    "@fullhuman/postcss-purgecss" "^2.1.2"
+    autoprefixer "^9.4.5"
+    browserslist "^4.12.0"
+    bytes "^3.0.0"
+    chalk "^3.0.0 || ^4.0.0"
+    color "^3.1.2"
+    detective "^5.2.0"
+    fs-extra "^8.0.0"
+    html-tags "^3.1.0"
+    lodash "^4.17.20"
+    node-emoji "^1.8.1"
+    normalize.css "^8.0.1"
+    object-hash "^2.0.3"
+    postcss "^7.0.11"
+    postcss-functions "^3.0.0"
+    postcss-js "^2.0.0"
+    postcss-nested "^4.1.1"
+    postcss-selector-parser "^6.0.0"
+    postcss-value-parser "^4.1.0"
+    pretty-hrtime "^1.0.3"
+    reduce-css-calc "^2.1.6"
+    resolve "^1.14.2"
+
+tapable@^1.0.0, tapable@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
+  integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
+
+tar@^4.4.8:
+  version "4.4.13"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
+  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
+  dependencies:
+    chownr "^1.1.1"
+    fs-minipass "^1.2.5"
+    minipass "^2.8.6"
+    minizlib "^1.2.1"
+    mkdirp "^0.5.0"
+    safe-buffer "^5.1.2"
+    yallist "^3.0.3"
+
+tar@^6.0.2:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz#d1724e9bcc04b977b18d5c573b333a2207229a83"
+  integrity sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==
+  dependencies:
+    chownr "^2.0.0"
+    fs-minipass "^2.0.0"
+    minipass "^3.0.0"
+    minizlib "^2.1.1"
+    mkdirp "^1.0.3"
+    yallist "^4.0.0"
+
+term-size@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69"
+  integrity sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=
+  dependencies:
+    execa "^0.7.0"
+
+terser-webpack-plugin@3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-3.0.3.tgz#23bda2687b197f878a743373b9411d917adc2e45"
+  integrity sha512-bZFnotuIKq5Rqzrs+qIwFzGdKdffV9epG5vDSEbYzvKAhPeR5RbbrQysfPgbIIMhNAQtZD2hGwBfSKUXjXZZZw==
+  dependencies:
+    cacache "^15.0.4"
+    find-cache-dir "^3.3.1"
+    jest-worker "^26.0.0"
+    p-limit "^2.3.0"
+    schema-utils "^2.6.6"
+    serialize-javascript "^3.1.0"
+    source-map "^0.6.1"
+    terser "^4.6.13"
+    webpack-sources "^1.4.3"
+
+terser-webpack-plugin@^1.4.1:
+  version "1.4.5"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz#a217aefaea330e734ffacb6120ec1fa312d6040b"
+  integrity sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==
+  dependencies:
+    cacache "^12.0.2"
+    find-cache-dir "^2.1.0"
+    is-wsl "^1.1.0"
+    schema-utils "^1.0.0"
+    serialize-javascript "^4.0.0"
+    source-map "^0.6.1"
+    terser "^4.1.2"
+    webpack-sources "^1.4.0"
+    worker-farm "^1.7.0"
+
+terser@4.6.3:
+  version "4.6.3"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.3.tgz#e33aa42461ced5238d352d2df2a67f21921f8d87"
+  integrity sha512-Lw+ieAXmY69d09IIc/yqeBqXpEQIpDGZqT34ui1QWXIUpR2RjbqEkT8X7Lgex19hslSqcWM5iMN2kM11eMsESQ==
+  dependencies:
+    commander "^2.20.0"
+    source-map "~0.6.1"
+    source-map-support "~0.5.12"
+
+terser@^4.1.2, terser@^4.6.13:
+  version "4.8.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
+  integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
+  dependencies:
+    commander "^2.20.0"
+    source-map "~0.6.1"
+    source-map-support "~0.5.12"
+
+text-segmentation@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/text-segmentation/-/text-segmentation-1.0.3.tgz#52a388159efffe746b24a63ba311b6ac9f2d7943"
+  integrity sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==
+  dependencies:
+    utrie "^1.0.2"
+
+thenify-all@^1.0.0, thenify-all@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
+  integrity sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=
+  dependencies:
+    thenify ">= 3.1.0 < 4"
+
+"thenify@>= 3.1.0 < 4":
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f"
+  integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==
+  dependencies:
+    any-promise "^1.0.0"
+
+three@0.93.0:
+  version "0.93.0"
+  resolved "https://registry.yarnpkg.com/three/-/three-0.93.0.tgz#3fd6c367ef4554abbb6e16ad69936283e895c123"
+  integrity sha1-P9bDZ+9FVKu7bhataZNig+iVwSM=
+
+three@^0.113.2:
+  version "0.113.2"
+  resolved "https://registry.yarnpkg.com/three/-/three-0.113.2.tgz#04791d491fe4359330f9dbe7b767db18bfb35d67"
+  integrity sha512-x3vrKW41/UtbWbWduWKGlfIc043SvHWr3YltehYq+UGb9YglQ2oztNGvl2eut05JtNSmP11Mh3t6Xak5/0e+Fg==
+
+through2@^2.0.0:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
+  dependencies:
+    readable-stream "~2.3.6"
+    xtend "~4.0.1"
+
+"through@>=2.2.7 <3", through@X.X.X, through@^2.3.6:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
+
+thunky@^1.0.2:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
+  integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==
+
+timers-browserify@^2.0.4:
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz#44a45c11fbf407f34f97bccd1577c652361b00ee"
+  integrity sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==
+  dependencies:
+    setimmediate "^1.0.4"
+
+timsort@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
+  integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=
+
+tmp@0.0.30:
+  version "0.0.30"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.30.tgz#72419d4a8be7d6ce75148fd8b324e593a711c2ed"
+  integrity sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=
+  dependencies:
+    os-tmpdir "~1.0.1"
+
+tmp@0.0.33, tmp@0.0.x, tmp@^0.0.33:
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
+  dependencies:
+    os-tmpdir "~1.0.2"
+
+to-array@0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
+  integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA=
+
+to-arraybuffer@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
+  integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
+
+to-fast-properties@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
+
+to-object-path@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
+  dependencies:
+    kind-of "^3.0.2"
+
+to-readable-stream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771"
+  integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==
+
+to-regex-range@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
+  dependencies:
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
+to-regex@^3.0.1, to-regex@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
+  dependencies:
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    regex-not "^1.0.2"
+    safe-regex "^1.1.0"
+
+toidentifier@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
+  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
+
+topojson-client@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/topojson-client/-/topojson-client-3.1.0.tgz#22e8b1ed08a2b922feeb4af6f53b6ef09a467b99"
+  integrity sha512-605uxS6bcYxGXw9qi62XyrV6Q3xwbndjachmNxu8HWTtVPxZfEJN9fd/SZS1Q54Sn2y0TMyMxFj/cJINqGHrKw==
+  dependencies:
+    commander "2"
+
+totalist@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/totalist/-/totalist-1.1.0.tgz#a4d65a3e546517701e3e5c37a47a70ac97fe56df"
+  integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==
+
+tough-cookie@^2.2.0, tough-cookie@~2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
+  dependencies:
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
+tr46@~0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+  integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
+
+traverse@>=0.2.4:
+  version "0.6.6"
+  resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137"
+  integrity sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=
+
+"traverse@>=0.3.0 <0.4":
+  version "0.3.9"
+  resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9"
+  integrity sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=
+
+tree-kill@1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
+  integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
+
+ts-node@~8.3.0:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.3.0.tgz#e4059618411371924a1fb5f3b125915f324efb57"
+  integrity sha512-dyNS/RqyVTDcmNM4NIBAeDMpsAdaQ+ojdf0GOLqE6nwJOgzEkdRNzJywhDfwnuvB10oa6NLVG1rUJQCpRN7qoQ==
+  dependencies:
+    arg "^4.1.0"
+    diff "^4.0.1"
+    make-error "^1.1.1"
+    source-map-support "^0.5.6"
+    yn "^3.0.0"
+
+tsickle@^0.36.0:
+  version "0.36.0"
+  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.36.0.tgz#d6f47cdd14d009f3fea4e8516cd46c1393f3aa02"
+  integrity sha512-lrEMU5e+efx5DXtrRSGsxgkCOVRw4WeVaOkQ2pMIxCZDY5rISagVyP4yi7t6M396POFSbMHgQMT/vz0HmfxWVA==
+  dependencies:
+    minimist "^1.2.0"
+    mkdirp "^0.5.1"
+    source-map "^0.7.3"
+
+tslib@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
+  integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
+
+tslib@1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"
+  integrity sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ==
+
+tslib@^1.10.0, tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
+  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
+
+tslib@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c"
+  integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==
+
+tslint-angular@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/tslint-angular/-/tslint-angular-3.0.3.tgz#872d4fe36497d20582dbe4b8ed3338ff0c922c30"
+  integrity sha512-5xD1gLE89lBExfSbMslDw/ZfOZM0t0CJsoJa4svsgF7tlwVS3IpXjzNcNRN0RZqDBj+cdTlbeel6GpZ3PqpPiw==
+
+tslint-config-airbnb@^5.11.1:
+  version "5.11.2"
+  resolved "https://registry.yarnpkg.com/tslint-config-airbnb/-/tslint-config-airbnb-5.11.2.tgz#2f3d239fa3923be8e7a4372217a7ed552671528f"
+  integrity sha512-mUpHPTeeCFx8XARGG/kzYP4dPSOgoCqNiYbGHh09qTH8q+Y1ghsOgaeZKYYQT7IyxMos523z/QBaiv2zKNBcow==
+  dependencies:
+    tslint-consistent-codestyle "^1.14.1"
+    tslint-eslint-rules "^5.4.0"
+    tslint-microsoft-contrib "~5.2.1"
+
+tslint-consistent-codestyle@^1.14.1:
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/tslint-consistent-codestyle/-/tslint-consistent-codestyle-1.16.0.tgz#52348ea899a7e025b37cc6545751c6a566a19077"
+  integrity sha512-ebR/xHyMEuU36hGNOgCfjGBNYxBPixf0yU1Yoo6s3BrpBRFccjPOmIVaVvQsWAUAMdmfzHOCihVkcaMfimqvHw==
+  dependencies:
+    "@fimbul/bifrost" "^0.21.0"
+    tslib "^1.7.1"
+    tsutils "^2.29.0"
+
+tslint-eslint-rules@^5.4.0:
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/tslint-eslint-rules/-/tslint-eslint-rules-5.4.0.tgz#e488cc9181bf193fe5cd7bfca213a7695f1737b5"
+  integrity sha512-WlSXE+J2vY/VPgIcqQuijMQiel+UtmXS+4nvK4ZzlDiqBfXse8FAvkNnTcYhnQyOTW5KFM+uRRGXxYhFpuBc6w==
+  dependencies:
+    doctrine "0.7.2"
+    tslib "1.9.0"
+    tsutils "^3.0.0"
+
+tslint-microsoft-contrib@~5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/tslint-microsoft-contrib/-/tslint-microsoft-contrib-5.2.1.tgz#a6286839f800e2591d041ea2800c77487844ad81"
+  integrity sha512-PDYjvpo0gN9IfMULwKk0KpVOPMhU6cNoT9VwCOLeDl/QS8v8W2yspRpFFuUS7/c5EIH/n8ApMi8TxJAz1tfFUA==
+  dependencies:
+    tsutils "^2.27.2 <2.29.0"
+
+tslint@~5.18.0:
+  version "5.18.0"
+  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.18.0.tgz#f61a6ddcf372344ac5e41708095bbf043a147ac6"
+  integrity sha512-Q3kXkuDEijQ37nXZZLKErssQVnwCV/+23gFEMROi8IlbaBG6tXqLPQJ5Wjcyt/yHPKBC+hD5SzuGaMora+ZS6w==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    builtin-modules "^1.1.1"
+    chalk "^2.3.0"
+    commander "^2.12.1"
+    diff "^3.2.0"
+    glob "^7.1.1"
+    js-yaml "^3.13.1"
+    minimatch "^3.0.4"
+    mkdirp "^0.5.1"
+    resolve "^1.3.2"
+    semver "^5.3.0"
+    tslib "^1.8.0"
+    tsutils "^2.29.0"
+
+tsml@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/tsml/-/tsml-1.0.1.tgz#89f8218b9d9e257f47d7f6b56d01c5a4d2c68fc3"
+  integrity sha1-ifghi52eJX9H1/a1bQHFpNLGj8M=
+
+"tsutils@^2.27.2 <2.29.0":
+  version "2.28.0"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.28.0.tgz#6bd71e160828f9d019b6f4e844742228f85169a1"
+  integrity sha512-bh5nAtW0tuhvOJnx1GLRn5ScraRLICGyJV5wJhtRWOLsxW70Kk5tZtpK3O/hW6LDnqKS9mlUMPZj9fEMJ0gxqA==
+  dependencies:
+    tslib "^1.8.1"
+
+tsutils@^2.29.0:
+  version "2.29.0"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
+  integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==
+  dependencies:
+    tslib "^1.8.1"
+
+tsutils@^3.0.0, tsutils@^3.5.0:
+  version "3.21.0"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
+  integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
+  dependencies:
+    tslib "^1.8.1"
+
+tty-browserify@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
+  integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
+
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
+  dependencies:
+    safe-buffer "^5.0.1"
+
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
+
+type-check@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
+  dependencies:
+    prelude-ls "~1.1.2"
+
+type-fest@^0.21.3:
+  version "0.21.3"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
+  integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
+
+type-fest@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1"
+  integrity sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==
+
+type-fest@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
+  integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
+
+type-is@~1.6.17, type-is@~1.6.18:
+  version "1.6.18"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
+  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
+  dependencies:
+    media-typer "0.3.0"
+    mime-types "~2.1.24"
+
+typedarray@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
+
+typeface-roboto@0.0.75:
+  version "0.0.75"
+  resolved "https://registry.yarnpkg.com/typeface-roboto/-/typeface-roboto-0.0.75.tgz#98d5ba35ec234bbc7172374c8297277099cc712b"
+  integrity sha512-VrR/IiH00Z1tFP4vDGfwZ1esNqTiDMchBEXYY9kilT6wRGgFoCAlgkEUMHb1E3mB0FsfZhv756IF0+R+SFPfdg==
+
+typescript-tslint-plugin@^0.5.4:
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/typescript-tslint-plugin/-/typescript-tslint-plugin-0.5.5.tgz#673875c43640251f1ab3d63745d7d49726ff961c"
+  integrity sha512-tR5igNQP+6FhxaPJYRlUBVsEl0n5cSuXRbg7L1y80mL4B1jUHb8uiIcbQBJ9zWyypJEdFYFUccpXxvMwZR8+AA==
+  dependencies:
+    minimatch "^3.0.4"
+    mock-require "^3.0.3"
+    vscode-languageserver "^5.2.1"
+
+typescript@3.5.3, typescript@~3.5.3:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977"
+  integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==
+
+ultron@~1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
+  integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==
+
+unbox-primitive@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
+  integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==
+  dependencies:
+    function-bind "^1.1.1"
+    has-bigints "^1.0.1"
+    has-symbols "^1.0.2"
+    which-boxed-primitive "^1.0.2"
+
+unicode-canonical-property-names-ecmascript@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
+  integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==
+
+unicode-match-property-ecmascript@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
+  integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==
+  dependencies:
+    unicode-canonical-property-names-ecmascript "^1.0.4"
+    unicode-property-aliases-ecmascript "^1.0.4"
+
+unicode-match-property-value-ecmascript@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531"
+  integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==
+
+unicode-property-aliases-ecmascript@^1.0.4:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4"
+  integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==
+
+union-value@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
+  integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
+  dependencies:
+    arr-union "^3.1.0"
+    get-value "^2.0.6"
+    is-extendable "^0.1.1"
+    set-value "^2.0.1"
+
+unique-filename@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
+  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
+  dependencies:
+    unique-slug "^2.0.0"
+
+unique-slug@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
+  integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
+  dependencies:
+    imurmurhash "^0.1.4"
+
+unique-string@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a"
+  integrity sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=
+  dependencies:
+    crypto-random-string "^1.0.0"
+
+universal-analytics@^0.4.20:
+  version "0.4.23"
+  resolved "https://registry.yarnpkg.com/universal-analytics/-/universal-analytics-0.4.23.tgz#d915e676850c25c4156762471bdd7cf2eaaca8ac"
+  integrity sha512-lgMIH7XBI6OgYn1woDEmxhGdj8yDefMKg7GkWdeATAlQZFrMrNyxSkpDzY57iY0/6fdlzTbBV03OawvvzG+q7A==
+  dependencies:
+    debug "^4.1.1"
+    request "^2.88.2"
+    uuid "^3.0.0"
+
+universalify@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+
+unpipe@1.0.0, unpipe@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
+
+unset-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
+  dependencies:
+    has-value "^0.3.1"
+    isobject "^3.0.0"
+
+upath@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
+  integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
+
+update-notifier@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-3.0.1.tgz#78ecb68b915e2fd1be9f767f6e298ce87b736250"
+  integrity sha512-grrmrB6Zb8DUiyDIaeRTBCkgISYUgETNe7NglEbVsrLWXeESnlCSP50WfRSj/GmzMPl6Uchj24S/p80nP/ZQrQ==
+  dependencies:
+    boxen "^3.0.0"
+    chalk "^2.0.1"
+    configstore "^4.0.0"
+    has-yarn "^2.1.0"
+    import-lazy "^2.1.0"
+    is-ci "^2.0.0"
+    is-installed-globally "^0.1.0"
+    is-npm "^3.0.0"
+    is-yarn-global "^0.3.0"
+    latest-version "^5.0.0"
+    semver-diff "^2.0.0"
+    xdg-basedir "^3.0.0"
+
+uri-js@^4.2.2:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
+  dependencies:
+    punycode "^2.1.0"
+
+urix@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
+
+url-parse-lax@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
+  integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=
+  dependencies:
+    prepend-http "^2.0.0"
+
+url-parse@^1.4.3:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.1.tgz#d5fa9890af8a5e1f274a2c98376510f6425f6e3b"
+  integrity sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==
+  dependencies:
+    querystringify "^2.1.1"
+    requires-port "^1.0.0"
+
+url-toolkit@^2.1.1, url-toolkit@^2.1.3, url-toolkit@^2.2.1:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/url-toolkit/-/url-toolkit-2.2.2.tgz#51ef27b56d3187185f9ecf4a8ac7e8f55203c89d"
+  integrity sha512-l25w6Sy+Iy3/IbogunxhWwljPaDnqpiKvrQRoLBm6DfISco7NyRIS7Zf6+Oxhy1T8kHxWdwLND7ZZba6NjXMug==
+
+url@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
+  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
+  dependencies:
+    punycode "1.3.2"
+    querystring "0.2.0"
+
+use@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
+
+useragent@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.3.0.tgz#217f943ad540cb2128658ab23fc960f6a88c9972"
+  integrity sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==
+  dependencies:
+    lru-cache "4.1.x"
+    tmp "0.0.x"
+
+util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+
+util-promisify@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/util-promisify/-/util-promisify-2.1.0.tgz#3c2236476c4d32c5ff3c47002add7c13b9a82a53"
+  integrity sha1-PCI2R2xNMsX/PEcAKt18E7moKlM=
+  dependencies:
+    object.getownpropertydescriptors "^2.0.3"
+
+util@0.10.3:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+  integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
+  dependencies:
+    inherits "2.0.1"
+
+util@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61"
+  integrity sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==
+  dependencies:
+    inherits "2.0.3"
+
+utils-merge@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
+
+utrie@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/utrie/-/utrie-1.0.2.tgz#d42fe44de9bc0119c25de7f564a6ed1b2c87a645"
+  integrity sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==
+  dependencies:
+    base64-arraybuffer "^1.0.2"
+
+uuid@^3.0.0, uuid@^3.3.2, uuid@^3.3.3, uuid@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+
+uuid@^8.3.2:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
+
+validate-npm-package-license@^3.0.1:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
+  dependencies:
+    spdx-correct "^3.0.0"
+    spdx-expression-parse "^3.0.0"
+
+validate-npm-package-name@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
+  integrity sha1-X6kS2B630MdK/BQN5zF/DKffQ34=
+  dependencies:
+    builtins "^1.0.3"
+
+vary@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
+
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
+  dependencies:
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
+
+video.js@7.6.0:
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/video.js/-/video.js-7.6.0.tgz#556c151004e27d340be3a732a14bf7c1aaf7e8b4"
+  integrity sha512-A0HSKzAmcYkd1xyExqUlM6n8bkghcX54iCvW08bPvvl3UHt8d8zijuylfIWu8vo1Z8fYyk9HPOFs1i3Cldr/cw==
+  dependencies:
+    "@babel/runtime" "^7.4.5"
+    "@videojs/http-streaming" "1.10.3"
+    global "4.3.2"
+    keycode "^2.2.0"
+    safe-json-parse "4.0.0"
+    tsml "1.0.1"
+    videojs-font "3.2.0"
+    videojs-vtt.js "^0.14.1"
+    xhr "2.4.0"
+
+"video.js@^5.6.0 || ^6.2.8 || ^7.0.2", "video.js@^6 || ^7", "video.js@^6.8.0 || ^7.0.0", video.js@^7.5.5:
+  version "7.11.8"
+  resolved "https://registry.yarnpkg.com/video.js/-/video.js-7.11.8.tgz#1fa27c56f30a436b06b44f21560f223e264aec51"
+  integrity sha512-iQmNYB+pdgu8b45Za1AKSa5J7uDyHIqfJy+picw4voKfjErXK/BEvs+A3f99Ck7SCZU4cmMmX/s17AwaaNs+1w==
+  dependencies:
+    "@babel/runtime" "^7.9.2"
+    "@videojs/http-streaming" "2.6.4"
+    "@videojs/xhr" "2.5.1"
+    global "4.3.2"
+    keycode "^2.2.0"
+    remove "^0.1.5"
+    rollup-plugin-replace "^2.2.0"
+    safe-json-parse "4.0.0"
+    videojs-font "3.2.0"
+    videojs-vtt.js "^0.15.2"
+
+videojs-contrib-quality-levels@^2.0.9:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/videojs-contrib-quality-levels/-/videojs-contrib-quality-levels-2.1.0.tgz#046e9e21ed01043f512b83a1916001d552457083"
+  integrity sha512-dqGQGbL9AFhucxki7Zh0c3kIhH0PAPcHEh6jUdRyaFCVeOuqnJrOYs/3wNtsokDdBdRf2Du2annpu4Z2XaSZRg==
+  dependencies:
+    global "^4.3.2"
+    video.js "^6 || ^7"
+
+videojs-font@3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/videojs-font/-/videojs-font-3.2.0.tgz#212c9d3f4e4ec3fa7345167d64316add35e92232"
+  integrity sha512-g8vHMKK2/JGorSfqAZQUmYYNnXmfec4MLhwtEFS+mMs2IDY398GLysy6BH6K+aS1KMNu/xWZ8Sue/X/mdQPliA==
+
+videojs-hls-quality-selector@^1.0.5:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/videojs-hls-quality-selector/-/videojs-hls-quality-selector-1.1.4.tgz#281b78c6653137b08c544e806aa9c91b71d16989"
+  integrity sha512-wWAjlLQui02gp//t9KHGd3XnbYO7wdOptskh3ZYCrbl/5Lbkveqb9yBVjH4e0zIQBPvGdWPMcOeDukf8iuYeBw==
+  dependencies:
+    global "^4.3.2"
+    karma-safaritechpreview-launcher "0.0.6"
+    video.js "^7.5.5"
+    videojs-contrib-quality-levels "^2.0.9"
+
+videojs-vr@1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/videojs-vr/-/videojs-vr-1.5.0.tgz#507953228c626847a732ce651a6efede9f643dc1"
+  integrity sha512-S3/pnk0xP7tGuRX/qe9x4DDppyGGrOGho1IEaBuSyOBnxb1n75Qq+OT4Y7vf9YQp416/wfO6chml1tA5MhMhnw==
+  dependencies:
+    global "^4.3.2"
+    three "0.93.0"
+    video.js "^6 || ^7"
+    webvr-polyfill "0.10.6"
+
+videojs-vtt.js@^0.14.1:
+  version "0.14.1"
+  resolved "https://registry.yarnpkg.com/videojs-vtt.js/-/videojs-vtt.js-0.14.1.tgz#da583eb1fc9c81c826a9432b706040e8dea49911"
+  integrity sha512-YxOiywx6N9t3J5nqsE5WN2Sw4CSqVe3zV+AZm2T4syOc2buNJaD6ZoexSdeszx2sHLU/RRo2r4BJAXFDQ7Qo2Q==
+  dependencies:
+    global "^4.3.1"
+
+videojs-vtt.js@^0.15.2:
+  version "0.15.3"
+  resolved "https://registry.yarnpkg.com/videojs-vtt.js/-/videojs-vtt.js-0.15.3.tgz#84260393b79487fcf195d9372f812d7fab83a993"
+  integrity sha512-5FvVsICuMRx6Hd7H/Y9s9GDeEtYcXQWzGMS+sl4UX3t/zoHp3y+isSfIPRochnTH7h+Bh1ILyC639xy9Z6kPag==
+  dependencies:
+    global "^4.3.1"
+
+videojs-youtube@^2.6.0:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/videojs-youtube/-/videojs-youtube-2.6.1.tgz#3f7cce15229509ea6d54582e28793df530254860"
+  integrity sha512-qvwrkgXixbX8xzdkBa7o5r9KUITRISAy4bbyrpBgub3m0mhwz6WLXDIwJZ6/w4Z/JijWjLQqlg8W1jYhCEgHZw==
+  dependencies:
+    video.js "^5.6.0 || ^6.2.8 || ^7.0.2"
+
+vis-data@^6.1.1:
+  version "6.6.1"
+  resolved "https://registry.yarnpkg.com/vis-data/-/vis-data-6.6.1.tgz#2aa52e46c305ad46bb7abe6e7634e2eecd743b15"
+  integrity sha512-xmujDB2Dzf8T04rGFJ9OP4OA6zRVrz8R9hb0CVKryBrZRCljCga9JjSfgctA8S7wdZu7otDtUIwX4ZOgfV/57w==
+
+vis-network@^5.2.4:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/vis-network/-/vis-network-5.4.1.tgz#e0e33d23775e834f4cfd961bd7b92bf11df097c6"
+  integrity sha512-hUJlFWoCmLup6IxoXCr//OO2ZCkC8jrXEkkHLG1DhBgB54Y3K33+e5q4tc436inMlGzfqqaKTIToNbOGr8Szww==
+  dependencies:
+    "@egjs/hammerjs" "^2.0.15"
+    component-emitter "^1.3.0"
+    keycharm "^0.2.0"
+    moment "^2.24.0"
+    timsort "^0.3.0"
+    vis-data "^6.1.1"
+    vis-util "^1.1.6"
+
+vis-util@^1.1.6:
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/vis-util/-/vis-util-1.1.10.tgz#1c0ebb17ad5139959122dcd12aae54a4e173846a"
+  integrity sha512-8hGSxsFi2ogYYweClQyITzWnirWgQ8p0i9M4d3OXMuUO8vjXrf+2zHOYI9OZbtUduxAWuMEePnS9BXDtPJmJ7Q==
+  dependencies:
+    moment "2.24.0"
+    vis-uuid "1.1.3"
+
+vis-util@^5.0.2:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/vis-util/-/vis-util-5.0.3.tgz#6a9d67c6ed92f2bfa67e50c20166bb5f59ac07bf"
+  integrity sha512-Wf9STUcFrDzK4/Zr7B6epW2Kvm3ORNWF+WiwEz2dpf5RdWkLUXFSbLcuB88n1W6tCdFwVN+v3V4/Xmn9PeL39g==
+
+vis-uuid@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/vis-uuid/-/vis-uuid-1.1.3.tgz#2f53ff35e9e026b0ec93bc433ce685c40c2f784c"
+  integrity sha512-2B6XdY1bkzbUh+TugmnAaFa61KO9R5pzBzIuFIm8a9FrkbxIdSmQXV+FbfkL8QunkQV/bT0JDLQ2puqCS2+0Og==
+
+vm-browserify@^1.0.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
+  integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
+
+void-elements@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
+  integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
+
+vscode-jsonrpc@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz#a7bf74ef3254d0a0c272fab15c82128e378b3be9"
+  integrity sha512-perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg==
+
+vscode-languageserver-protocol@3.14.1:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz#b8aab6afae2849c84a8983d39a1cf742417afe2f"
+  integrity sha512-IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g==
+  dependencies:
+    vscode-jsonrpc "^4.0.0"
+    vscode-languageserver-types "3.14.0"
+
+vscode-languageserver-types@3.14.0:
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz#d3b5952246d30e5241592b6dde8280e03942e743"
+  integrity sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==
+
+vscode-languageserver@^5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.2.1.tgz#0d2feddd33f92aadf5da32450df498d52f6f14eb"
+  integrity sha512-GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A==
+  dependencies:
+    vscode-languageserver-protocol "3.14.1"
+    vscode-uri "^1.0.6"
+
+vscode-uri@^1.0.6:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.8.tgz#9769aaececae4026fb6e22359cb38946580ded59"
+  integrity sha512-obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ==
+
+watchpack-chokidar2@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz#38500072ee6ece66f3769936950ea1771be1c957"
+  integrity sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==
+  dependencies:
+    chokidar "^2.1.8"
+
+watchpack@^1.6.0:
+  version "1.7.5"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453"
+  integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==
+  dependencies:
+    graceful-fs "^4.1.2"
+    neo-async "^2.5.0"
+  optionalDependencies:
+    chokidar "^3.4.1"
+    watchpack-chokidar2 "^2.0.1"
+
+wbuf@^1.1.0, wbuf@^1.7.3:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
+  integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==
+  dependencies:
+    minimalistic-assert "^1.0.0"
+
+webdriver-js-extender@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/webdriver-js-extender/-/webdriver-js-extender-2.1.0.tgz#57d7a93c00db4cc8d556e4d3db4b5db0a80c3bb7"
+  integrity sha512-lcUKrjbBfCK6MNsh7xaY2UAUmZwe+/ib03AjVOpFobX4O7+83BUveSrLfU0Qsyb1DaKJdQRbuU+kM9aZ6QUhiQ==
+  dependencies:
+    "@types/selenium-webdriver" "^3.0.0"
+    selenium-webdriver "^3.0.1"
+
+webdriver-manager@^12.0.6:
+  version "12.1.8"
+  resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.8.tgz#5e70e73eaaf53a0767d5745270addafbc5905fd4"
+  integrity sha512-qJR36SXG2VwKugPcdwhaqcLQOD7r8P2Xiv9sfNbfZrKBnX243iAkOueX1yAmeNgIKhJ3YAT/F2gq6IiEZzahsg==
+  dependencies:
+    adm-zip "^0.4.9"
+    chalk "^1.1.1"
+    del "^2.2.0"
+    glob "^7.0.3"
+    ini "^1.3.4"
+    minimist "^1.2.0"
+    q "^1.4.1"
+    request "^2.87.0"
+    rimraf "^2.5.2"
+    semver "^5.3.0"
+    xml2js "^0.4.17"
+
+webidl-conversions@^3.0.0, webidl-conversions@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+  integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
+
+webpack-bundle-analyzer@^4.4.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.5.0.tgz#1b0eea2947e73528754a6f9af3e91b2b6e0f79d5"
+  integrity sha512-GUMZlM3SKwS8Z+CKeIFx7CVoHn3dXFcUAjT/dcZQQmfSZGvitPfMob2ipjai7ovFFqPvTqkEZ/leL4O0YOdAYQ==
+  dependencies:
+    acorn "^8.0.4"
+    acorn-walk "^8.0.0"
+    chalk "^4.1.0"
+    commander "^7.2.0"
+    gzip-size "^6.0.0"
+    lodash "^4.17.20"
+    opener "^1.5.2"
+    sirv "^1.0.7"
+    ws "^7.3.1"
+
+webpack-core@^0.6.8:
+  version "0.6.9"
+  resolved "https://registry.yarnpkg.com/webpack-core/-/webpack-core-0.6.9.tgz#fc571588c8558da77be9efb6debdc5a3b172bdc2"
+  integrity sha1-/FcViMhVjad76e+23r3Fo7FyvcI=
+  dependencies:
+    source-list-map "~0.1.7"
+    source-map "~0.4.1"
+
+webpack-dev-middleware@3.7.2:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz#0019c3db716e3fa5cecbf64f2ab88a74bab331f3"
+  integrity sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==
+  dependencies:
+    memory-fs "^0.4.1"
+    mime "^2.4.4"
+    mkdirp "^0.5.1"
+    range-parser "^1.2.1"
+    webpack-log "^2.0.0"
+
+webpack-dev-middleware@^3.7.2:
+  version "3.7.3"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz#0639372b143262e2b84ab95d3b91a7597061c2c5"
+  integrity sha512-djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ==
+  dependencies:
+    memory-fs "^0.4.1"
+    mime "^2.4.4"
+    mkdirp "^0.5.1"
+    range-parser "^1.2.1"
+    webpack-log "^2.0.0"
+
+webpack-dev-server@3.11.0:
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz#8f154a3bce1bcfd1cc618ef4e703278855e7ff8c"
+  integrity sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg==
+  dependencies:
+    ansi-html "0.0.7"
+    bonjour "^3.5.0"
+    chokidar "^2.1.8"
+    compression "^1.7.4"
+    connect-history-api-fallback "^1.6.0"
+    debug "^4.1.1"
+    del "^4.1.1"
+    express "^4.17.1"
+    html-entities "^1.3.1"
+    http-proxy-middleware "0.19.1"
+    import-local "^2.0.0"
+    internal-ip "^4.3.0"
+    ip "^1.1.5"
+    is-absolute-url "^3.0.3"
+    killable "^1.0.1"
+    loglevel "^1.6.8"
+    opn "^5.5.0"
+    p-retry "^3.0.1"
+    portfinder "^1.0.26"
+    schema-utils "^1.0.0"
+    selfsigned "^1.10.7"
+    semver "^6.3.0"
+    serve-index "^1.9.1"
+    sockjs "0.3.20"
+    sockjs-client "1.4.0"
+    spdy "^4.0.2"
+    strip-ansi "^3.0.1"
+    supports-color "^6.1.0"
+    url "^0.11.0"
+    webpack-dev-middleware "^3.7.2"
+    webpack-log "^2.0.0"
+    ws "^6.2.1"
+    yargs "^13.3.2"
+
+webpack-log@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f"
+  integrity sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==
+  dependencies:
+    ansi-colors "^3.0.0"
+    uuid "^3.3.2"
+
+webpack-merge@4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.1.tgz#5e923cf802ea2ace4fd5af1d3247368a633489b4"
+  integrity sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==
+  dependencies:
+    lodash "^4.17.5"
+
+webpack-sources@1.4.3, webpack-sources@^1.1.0, webpack-sources@^1.2.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
+  integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==
+  dependencies:
+    source-list-map "^2.0.0"
+    source-map "~0.6.1"
+
+webpack-subresource-integrity@1.1.0-rc.6:
+  version "1.1.0-rc.6"
+  resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.1.0-rc.6.tgz#37f6f1264e1eb378e41465a98da80fad76ab8886"
+  integrity sha512-Az7y8xTniNhaA0620AV1KPwWOqawurVVDzQSpPAeR5RwNbL91GoBSJAAo9cfd+GiFHwsS5bbHepBw1e6Hzxy4w==
+  dependencies:
+    webpack-core "^0.6.8"
+
+webpack@4.39.2:
+  version "4.39.2"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.39.2.tgz#c9aa5c1776d7c309d1b3911764f0288c8c2816aa"
+  integrity sha512-AKgTfz3xPSsEibH00JfZ9sHXGUwIQ6eZ9tLN8+VLzachk1Cw2LVmy+4R7ZiwTa9cZZ15tzySjeMui/UnSCAZhA==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-module-context" "1.8.5"
+    "@webassemblyjs/wasm-edit" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+    acorn "^6.2.1"
+    ajv "^6.10.2"
+    ajv-keywords "^3.4.1"
+    chrome-trace-event "^1.0.2"
+    enhanced-resolve "^4.1.0"
+    eslint-scope "^4.0.3"
+    json-parse-better-errors "^1.0.2"
+    loader-runner "^2.4.0"
+    loader-utils "^1.2.3"
+    memory-fs "^0.4.1"
+    micromatch "^3.1.10"
+    mkdirp "^0.5.1"
+    neo-async "^2.6.1"
+    node-libs-browser "^2.2.1"
+    schema-utils "^1.0.0"
+    tapable "^1.1.3"
+    terser-webpack-plugin "^1.4.1"
+    watchpack "^1.6.0"
+    webpack-sources "^1.4.1"
+
+websocket-driver@0.6.5:
+  version "0.6.5"
+  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz#5cb2556ceb85f4373c6d8238aa691c8454e13a36"
+  integrity sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=
+  dependencies:
+    websocket-extensions ">=0.1.1"
+
+websocket-driver@>=0.5.1:
+  version "0.7.4"
+  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"
+  integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==
+  dependencies:
+    http-parser-js ">=0.5.1"
+    safe-buffer ">=5.1.0"
+    websocket-extensions ">=0.1.1"
+
+websocket-extensions@>=0.1.1:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
+  integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
+
+webvr-polyfill-dpdb@^1.0.7:
+  version "1.0.18"
+  resolved "https://registry.yarnpkg.com/webvr-polyfill-dpdb/-/webvr-polyfill-dpdb-1.0.18.tgz#258484ce06b057bf18898acc911bd173847bce11"
+  integrity sha512-O0S1ZGEWyPvyZEkS2VbyV7mtir/NM9MNK3EuhbHPoJ8EHTky2pTXehjIl+IiDPr+Lldgx129QGt3NGly7rwRPw==
+
+webvr-polyfill@0.10.6:
+  version "0.10.6"
+  resolved "https://registry.yarnpkg.com/webvr-polyfill/-/webvr-polyfill-0.10.6.tgz#c1c5f5e3801784bc131a05aacfa2169872ce0b1c"
+  integrity sha512-H+2LI+rHMguGaUAg+1QuiIQ+1Y1wTSkkUXjQfF/GFD2wUL0AdiN8+uPGxnE7bHMBIG7NswN6kgkZhgy4WpwTlw==
+  dependencies:
+    cardboard-vr-display "1.0.13"
+
+whatwg-url@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-2.0.1.tgz#5396b2043f020ee6f704d9c45ea8519e724de659"
+  integrity sha1-U5ayBD8CDub3BNnEXqhRnnJN5lk=
+  dependencies:
+    tr46 "~0.0.3"
+    webidl-conversions "^3.0.0"
+
+when@~3.6.x:
+  version "3.6.4"
+  resolved "https://registry.yarnpkg.com/when/-/when-3.6.4.tgz#473b517ec159e2b85005497a13983f095412e34e"
+  integrity sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=
+
+which-boxed-primitive@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
+  integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
+  dependencies:
+    is-bigint "^1.0.1"
+    is-boolean-object "^1.1.0"
+    is-number-object "^1.0.4"
+    is-string "^1.0.5"
+    is-symbol "^1.0.3"
+
+which-module@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
+
+which-pm-runs@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb"
+  integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=
+
+which@^1.2.1, which@^1.2.9, which@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+  dependencies:
+    isexe "^2.0.0"
+
+widest-line@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.1.tgz#7438764730ec7ef4381ce4df82fb98a53142a3fc"
+  integrity sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==
+  dependencies:
+    string-width "^2.1.1"
+
+wmf@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wmf/-/wmf-1.0.2.tgz#7d19d621071a08c2bdc6b7e688a9c435298cc2da"
+  integrity sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==
+
+word-wrap@~1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
+  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+
+word@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/word/-/word-0.3.0.tgz#8542157e4f8e849f4a363a288992d47612db9961"
+  integrity sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==
+
+wordwrap@~0.0.2:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
+
+worker-farm@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"
+  integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==
+  dependencies:
+    errno "~0.1.7"
+
+worker-loader@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/worker-loader/-/worker-loader-2.0.0.tgz#45fda3ef76aca815771a89107399ee4119b430ac"
+  integrity sha512-tnvNp4K3KQOpfRnD20m8xltE3eWh89Ye+5oj7wXEEHKac1P4oZ6p9oTj8/8ExqoSBnk9nu5Pr4nKfQ1hn2APJw==
+  dependencies:
+    loader-utils "^1.0.0"
+    schema-utils "^0.4.0"
+
+worker-plugin@3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/worker-plugin/-/worker-plugin-3.2.0.tgz#ddae9f161b76fcbaacf8f54ecd037844584e43e7"
+  integrity sha512-W5nRkw7+HlbsEt3qRP6MczwDDISjiRj2GYt9+bpe8A2La00TmJdwzG5bpdMXhRt1qcWmwAvl1TiKaHRa+XDS9Q==
+  dependencies:
+    loader-utils "^1.1.0"
+
+wrap-ansi@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+
+wrap-ansi@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
+  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
+  dependencies:
+    ansi-styles "^3.2.0"
+    string-width "^3.0.0"
+    strip-ansi "^5.0.0"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+
+write-file-atomic@^2.0.0:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481"
+  integrity sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==
+  dependencies:
+    graceful-fs "^4.1.11"
+    imurmurhash "^0.1.4"
+    signal-exit "^3.0.2"
+
+ws@^6.2.1:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
+  integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
+  dependencies:
+    async-limiter "~1.0.0"
+
+ws@^7.3.1:
+  version "7.5.8"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.8.tgz#ac2729881ab9e7cbaf8787fe3469a48c5c7f636a"
+  integrity sha512-ri1Id1WinAX5Jqn9HejiGb8crfRio0Qgu8+MtL36rlTA6RLsMdWt1Az/19A2Qij6uSHUMphEFaTKa4WG+UNHNw==
+
+ws@~3.3.1:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
+  integrity sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==
+  dependencies:
+    async-limiter "~1.0.0"
+    safe-buffer "~5.1.0"
+    ultron "~1.1.0"
+
+xdg-basedir@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
+  integrity sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=
+
+xhr@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/xhr/-/xhr-2.4.0.tgz#e16e66a45f869861eeefab416d5eff722dc40993"
+  integrity sha1-4W5mpF+GmGHu76tBbV7/ci3ECZM=
+  dependencies:
+    global "~4.3.0"
+    is-function "^1.0.1"
+    parse-headers "^2.0.0"
+    xtend "^4.0.0"
+
+xlsx@^0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/xlsx/-/xlsx-0.14.5.tgz#3637e914d791bdca7382816e173f7d725ed0e0d2"
+  integrity sha512-s/5f4/mjeWREmIWZ+HtDfh/rnz51ar+dZ4LWKZU3u9VBx2zLdSIWTdXgoa52/pnZ9Oe/Vu1W1qzcKzLVe+lq4w==
+  dependencies:
+    adler-32 "~1.2.0"
+    cfb "^1.1.2"
+    codepage "~1.14.0"
+    commander "~2.17.1"
+    crc-32 "~1.2.0"
+    exit-on-epipe "~1.0.1"
+    ssf "~0.10.2"
+
+xlsx@^0.16.1:
+  version "0.16.9"
+  resolved "https://registry.yarnpkg.com/xlsx/-/xlsx-0.16.9.tgz#dacd5bb46bda6dd3743940c9c3dc1e2171826256"
+  integrity sha512-gxi1I3EasYvgCX1vN9pGyq920Ron4NO8PNfhuoA3Hpq6Y8f0ECXiy4OLrK4QZBnj1jx3QD+8Fq5YZ/3mPZ5iXw==
+  dependencies:
+    adler-32 "~1.2.0"
+    cfb "^1.1.4"
+    codepage "~1.14.0"
+    commander "~2.17.1"
+    crc-32 "~1.2.0"
+    exit-on-epipe "~1.0.1"
+    fflate "^0.3.8"
+    ssf "~0.11.2"
+    wmf "~1.0.1"
+    word "~0.3.0"
+
+"xml-name-validator@>= 2.0.1 < 3.0.0":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635"
+  integrity sha1-TYuPHszTQZqjYgYb7O9RXh5VljU=
+
+xml2js@^0.4.17:
+  version "0.4.23"
+  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66"
+  integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==
+  dependencies:
+    sax ">=0.6.0"
+    xmlbuilder "~11.0.0"
+
+xmlbuilder@~11.0.0:
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
+  integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
+
+xmldom@^0.1.22:
+  version "0.1.31"
+  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff"
+  integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==
+
+xmldom@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.4.0.tgz#8771e482a333af44587e30ce026f0998c23f3830"
+  integrity sha512-2E93k08T30Ugs+34HBSTQLVtpi6mCddaY8uO+pMNk1pqSjV5vElzn4mmh6KLxN3hki8rNcHSYzILoh3TEWORvA==
+
+xmlhttprequest-ssl@~1.5.4:
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
+  integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=
+
+xtend@^4.0.0, xtend@^4.0.2, xtend@~4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
+  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
+
+xxhashjs@^0.2.1:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/xxhashjs/-/xxhashjs-0.2.2.tgz#8a6251567621a1c46a5ae204da0249c7f8caa9d8"
+  integrity sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==
+  dependencies:
+    cuint "^0.2.2"
+
+"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
+  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
+
+yallist@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
+
+yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
+
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+
+yaml@^1.10.0:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
+  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
+
+yargs-parser@^11.1.1:
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
+  integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
+yargs-parser@^13.0.0, yargs-parser@^13.1.2:
+  version "13.1.2"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
+  integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
+yargs@13.1.0:
+  version "13.1.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.1.0.tgz#b2729ce4bfc0c584939719514099d8a916ad2301"
+  integrity sha512-1UhJbXfzHiPqkfXNHYhiz79qM/kZqjTE8yGlEjZa85Q+3+OwcV6NRkV7XOV1W2Eom2bzILeUn55pQYffjVOLAg==
+  dependencies:
+    cliui "^4.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
+    os-locale "^3.1.0"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^3.0.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^13.0.0"
+
+yargs@^12.0.5:
+  version "12.0.5"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
+  integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
+  dependencies:
+    cliui "^4.0.0"
+    decamelize "^1.2.0"
+    find-up "^3.0.0"
+    get-caller-file "^1.0.1"
+    os-locale "^3.0.0"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1 || ^4.0.0"
+    yargs-parser "^11.1.1"
+
+yargs@^13.3.2:
+  version "13.3.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
+  integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
+  dependencies:
+    cliui "^5.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^3.0.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^13.1.2"
+
+yeast@0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
+  integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
+
+yn@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
+  integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
+
+yocto-queue@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
+
+zone.js@~0.10.1:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.10.3.tgz#3e5e4da03c607c9dcd92e37dd35687a14a140c16"
+  integrity sha512-LXVLVEq0NNOqK/fLJo3d0kfzd4sxwn2/h67/02pjCjfKDxgx1i9QqpvtHD8CrBnSSwMw5+dy11O7FRX5mkO7Cg==

From 473a8ad4ba300dabc5140537c3a8dc5c6ba08c98 Mon Sep 17 00:00:00 2001
From: "christopher.fernandes" <christyabcd.05@gmail.com>
Date: Wed, 7 Sep 2022 12:09:19 +0530
Subject: [PATCH 020/887] Task #59374: loaders conditions and style changes

---
 .../users-upload/users-upload.component.html  | 24 +++++++++----------
 .../users-upload/users-upload.component.scss  |  4 ----
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
index bb0313933..533bc50c5 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
@@ -1,6 +1,6 @@
 <div class="flex flex-wrap">
   <div class="flex flex-row fle-wrap w-full">
-    <div class="card-notify flex-1 inline-flex items-end justify-end">
+    <div class="flex-1 inline-flex items-end justify-end">
       <!-- <span class="mat-body-1 mr-5 pl-1">Download the sample file</span> -->
       <button class="download-btn mat-accent-border mat-button mat-button-base" i18n (click)="downloadFile()">
         <ng-container i18n>Download sample file</ng-container>
@@ -30,22 +30,22 @@
       </div>
     </mat-card>
   </div>
-  <div>
+  <div class="w-full relative">
     <h2 class="w-full contacts-head">File uploads</h2>
     <div class="mb-4 ws-mat-black60-text">
       Need help? contact us <a class="mat-accent" target="_blank" href="{{contactUsUrl}}">here</a>
     </div>
-    <div [hidden]="!bulkUploadData && fetching">
+    <div class="example-loading w-full text-center" *ngIf="fetching">
+      <mat-spinner></mat-spinner>
+    </div>
+    <div *ngIf="bulkUploadData && bulkUploadData.length">
       <div class=" mx-5 my-5 table-container w-full">
-        <div class="example-loading-shade" *ngIf="fetching">
-          <mat-spinner *ngIf="fetching"></mat-spinner>
-        </div>
         <div class="pt-2 ">
-          <!-- <div class="m-5 flex items-end justify-end">
-                <button mat-raised-button color="primary" class="self-end" i18n (click)="refreshTable()">
-                  <ng-container i18n>Refresh</ng-container>
-                </button>
-              </div> -->
+          <!-- <div class=" m-5 flex items-end justify-end">
+          <button mat-raised-button color="primary" class="self-end" i18n (click)="refreshTable()">
+            <ng-container i18n>Refresh</ng-container>
+          </button>
+        </div> -->
           <mat-table mat-table [dataSource]="dataSource" matSort [matSortActive]="tabledata?.sortColumn"
             [matSortDirection]="tabledata?.sortState">
 
@@ -114,7 +114,7 @@ <h2 class="w-full contacts-head">File uploads</h2>
         </div>
       </div>
     </div>
-    <ng-container *ngIf="!bulkUploadData && !fetching">
+    <ng-container *ngIf="(!bulkUploadData || !bulkUploadData.length) && !fetching">
       <h4 class="w-full
        ws-mat-black60-text text-center">No data to be displayed!</h4>
     </ng-container>
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
index 207920774..70c1a67fb 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
@@ -28,10 +28,6 @@ table {
     justify-content: center;
   }
 
-.card-notify {
-    min-height: 74px;
-}
-
 .download-btn {
     min-width: 112px;
     width: auto;

From adbfea95bfa5135e93f6c08ce233de6218b2078e Mon Sep 17 00:00:00 2001
From: Amit Sengar <amitsengar@yahoo.com>
Date: Thu, 8 Sep 2022 15:20:37 +0530
Subject: [PATCH 021/887] Avtivate BLock and Profile Menu

---
 package.json                                                | 6 +++---
 .../routes/home/routes/users-view/users-view.component.ts   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 2edefed4b..557863ced 100644
--- a/package.json
+++ b/package.json
@@ -42,9 +42,9 @@
     "@angular/router": "~8.2.1",
     "@angular/service-worker": "~8.2.1",
     "@project-sunbird/telemetry-sdk": "0.0.26",
-    "@sunbird-cb/collection": "1.0.13",
+    "@sunbird-cb/collection": "^1.0.15",
     "@sunbird-cb/design-system": "0.0.1",
-    "@sunbird-cb/rain-dashboards": "^0.2.3",
+    "@sunbird-cb/rain-dashboards": "^0.2.6",
     "@sunbird-cb/resolver": "^1.0.0",
     "@sunbird-cb/utils": "^1.0.12",
     "@types/file-saver": "^2.0.1",
@@ -136,4 +136,4 @@
     "typescript-tslint-plugin": "^0.5.4",
     "webpack-bundle-analyzer": "^4.4.0"
   }
-}
\ No newline at end of file
+}
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index e8eaf10d5..9e7dc0b8e 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -281,7 +281,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
         // _.set(user, 'roles', _.map(_.get($event.row, 'role'), i => i))
         // this.usersService.deActiveUser(user).subscribe(response => {
         this.usersService.newBlockUser(loggedInUserId, user.request.userId).subscribe(response => {
-          if (response.params.status === 'success') {
+          if (_.toUpper(response.params.status) === 'SUCCESS') {
             setTimeout(() => {
               this.getAllUsers()
 
@@ -311,7 +311,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
         _.set(user, 'roles', _.map(_.get($event.row, 'role'), i => i))
         // this.usersService.deActiveUser(user).subscribe(response => {
         this.usersService.newUnBlockUser(loggedInUserId, user.request.userId).subscribe(response => {
-          if (response.params.status === 'success') {
+          if (_.toUpper(response.params.status) === 'SUCCESS') {
             setTimeout(() => {
               this.getAllUsers()
               this.snackBar.open('Activated successfully!')

From 27ad8f538f3bf7bd4af332ee09b41e80caddcf5f Mon Sep 17 00:00:00 2001
From: Amit Sengar <amitsengar@yahoo.com>
Date: Thu, 8 Sep 2022 15:47:28 +0530
Subject: [PATCH 022/887] Add karmyogi User Fixed

---
 package.json                                  |  2 +-
 .../participants/participants.component.html  | 26 ++++++++++---------
 .../participants/participants.component.ts    |  7 +++--
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 557863ced..739bcbba4 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@angular/router": "~8.2.1",
     "@angular/service-worker": "~8.2.1",
     "@project-sunbird/telemetry-sdk": "0.0.26",
-    "@sunbird-cb/collection": "^1.0.15",
+    "@sunbird-cb/collection": "^1.0.16",
     "@sunbird-cb/design-system": "0.0.1",
     "@sunbird-cb/rain-dashboards": "^0.2.6",
     "@sunbird-cb/resolver": "^1.0.0",
diff --git a/project/ws/app/src/lib/routes/events/components/participants/participants.component.html b/project/ws/app/src/lib/routes/events/components/participants/participants.component.html
index 0b8c89ec6..51803c7f2 100644
--- a/project/ws/app/src/lib/routes/events/components/participants/participants.component.html
+++ b/project/ws/app/src/lib/routes/events/components/participants/participants.component.html
@@ -37,23 +37,25 @@
             </ng-container>
             <ng-container matColumnDef="email">
                 <th mat-header-cell *matHeaderCellDef> Email </th>
-                <td mat-cell *matCellDef="let element"> {{element.email}} </td>
+                <td mat-cell *matCellDef="let element"> {{element.profileDetails.personalDetails.primaryEmail}} </td>
             </ng-container>
             <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
             <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
         </table>
     </div>
-    <div class="flex flex-1 custom button-row" align="end" *ngIf="participants.length > 0">
-        <button mat-stroked-button color="accent" type="button" class="mat-accent-border flex-auto-display"
-            (click)="dialogRef.close()">
-            <span i18n>Cancel</span>
-        </button>
-        <button mat-button type="button" class="create-btn ml-10 mat-accent-border flex-auto-display"
-            (click)="confirm()">
-            <span i18n>Add</span>
-        </button>
-        <!-- <button mat-button class="create-btn"  type="button" (click)="onSubmit()">
+    <mat-card-actions>
+        <div class="flex flex-1 custom button-row" align="end" *ngIf="participants.length > 0">
+            <button mat-stroked-button color="accent" type="button" class="mat-accent-border flex-auto-display"
+                (click)="dialogRef.close()">
+                <span i18n>Cancel</span>
+            </button>
+            <button mat-button type="button" class="create-btn ml-10 mat-accent-border flex-auto-display"
+                (click)="confirm()">
+                <span i18n>Add</span>
+            </button>
+            <!-- <button mat-button class="create-btn"  type="button" (click)="onSubmit()">
             <span i18n>Save and Publish</span>
         </button> -->
-    </div>
+        </div>
+    </mat-card-actions>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/events/components/participants/participants.component.ts b/project/ws/app/src/lib/routes/events/components/participants/participants.component.ts
index 29a54db78..2e8f91fe6 100644
--- a/project/ws/app/src/lib/routes/events/components/participants/participants.component.ts
+++ b/project/ws/app/src/lib/routes/events/components/participants/participants.component.ts
@@ -6,6 +6,8 @@ import { MatTableDataSource } from '@angular/material'
 import { debounceTime, distinctUntilChanged } from 'rxjs/operators'
 import { EventsService } from '../../services/events.service'
 import { HttpClient } from '@angular/common/http'
+// tslint:disable-next-line
+import _ from 'lodash'
 
 export interface IParticipantElement {
     firstname: string,
@@ -100,11 +102,12 @@ export class ParticipantsComponent implements OnInit {
                 this.participants = []
                 Object.keys(resultdata).forEach((key: any) => {
                     const obj = resultdata[key]
-                    if (obj.email !== undefined) {
+                    const email = _.get(obj, 'profileDetails.personalDetails.primaryEmail')
+                    if (email !== undefined) {
                         const participantObj = {
+                            email,
                             firstname: obj.firstName,
                             lastname: obj.lastName,
-                            email: obj.email,
                             id: obj.userId,
                         }
                         this.participants.push(participantObj)

From d352b745a50e44c08bd51cf3caa358ab100d542f Mon Sep 17 00:00:00 2001
From: Amit Sengar <amitsengar@yahoo.com>
Date: Thu, 8 Sep 2022 15:48:50 +0530
Subject: [PATCH 023/887] lodash FIx to v 4.17.21

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 739bcbba4..03488f5a2 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "jspdf": "^2.3.1",
     "jsplumb": "2.11.2",
     "keycloak-angular": "^6.1.0",
-    "lodash": "^4.17.21",
+    "lodash": "4.17.21",
     "material-icons": "^0.7.1",
     "moment": "^2.29.1",
     "mustache": "^3.0.2",
@@ -106,7 +106,7 @@
     "@types/d3": "^5.7.2",
     "@types/jasmine": "~3.4.0",
     "@types/jasminewd2": "~2.0.6",
-    "@types/lodash": "^4.14.172",
+    "@types/lodash": "4.14.172",
     "@types/mustache": "^0.8.32",
     "@types/node": "^10.17.60",
     "@types/pdfjs-dist": "^2.1.3",

From 23434a5b38b556ba331039a4cd534555cff9326f Mon Sep 17 00:00:00 2001
From: "christopher.fernandes" <christyabcd.05@gmail.com>
Date: Thu, 15 Sep 2022 14:56:33 +0530
Subject: [PATCH 024/887] Task #59544: Sort fixes, click issues fix

---
 package.json                                  |  2 +-
 .../users-upload/users-upload.component.html  |  4 ++-
 .../users-upload/users-upload.component.ts    | 20 ++++++-----
 yarn.lock                                     | 34 +++++++++----------
 4 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/package.json b/package.json
index 03488f5a2..659692d80 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@angular/router": "~8.2.1",
     "@angular/service-worker": "~8.2.1",
     "@project-sunbird/telemetry-sdk": "0.0.26",
-    "@sunbird-cb/collection": "^1.0.16",
+    "@sunbird-cb/collection": "^1.0.17",
     "@sunbird-cb/design-system": "0.0.1",
     "@sunbird-cb/rain-dashboards": "^0.2.6",
     "@sunbird-cb/resolver": "^1.0.0",
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
index 533bc50c5..7d0cd54d6 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
@@ -12,6 +12,7 @@
       <div>
         <form [formGroup]="formGroup" (ngSubmit)="onSubmit(form)" #form>
           <input type="file" class="mb-5" (change)="onFileChange($event)" name="file" placeholder="Choose file"
+            (dblclick)="$event.preventDefault();"
             accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel, .xlsx, .xls" />
           <!-- <input type="submit" [disabled]="formGroup.invalid" value="upload" /> -->
           <mat-error *ngIf="showFileError">Only .xlsx or .csv files are accepted</mat-error>
@@ -38,7 +39,8 @@ <h2 class="w-full contacts-head">File uploads</h2>
     <div class="example-loading w-full text-center" *ngIf="fetching">
       <mat-spinner></mat-spinner>
     </div>
-    <div *ngIf="bulkUploadData && bulkUploadData.length">
+    <!-- <div *ngIf="bulkUploadData && bulkUploadData.length"> -->
+    <div [hidden]="!bulkUploadData || (bulkUploadData && !bulkUploadData.length) || fetching">
       <div class=" mx-5 my-5 table-container w-full">
         <div class="pt-2 ">
           <!-- <div class=" m-5 flex items-end justify-end">
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
index 7ab2f7492..55c333ae3 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
@@ -85,7 +85,7 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
   }
   ngAfterViewInit() {
     this.dataSource.paginator = this.paginator
-    this.dataSource = new MatTableDataSource(this.bulkUploadData)
+    // this.dataSource = new MatTableDataSource(this.bulkUploadData)
     setTimeout(() => {
       this.dataSource.sort = this.sort
     })
@@ -97,16 +97,18 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
       this.fetching = false
       if (res.result && res.result.content) {
         this.bulkUploadData = res.result.content
+        // this.bulkUploadData = []
         this.dataSource = new MatTableDataSource(this.bulkUploadData)
         setTimeout(() => this.dataSource.paginator = this.paginator)
-        setTimeout(() => {
-          if (this.sort) {
-            this.sort.active = this.tabledata.sortColumn,
-              this.sort.start = this.tabledata.sortState
-
-          }
-          this.dataSource.sort = this.sort
-        })
+        setTimeout(
+          () => {
+            if (this.sort) {
+              this.sort.active = this.tabledata.sortColumn,
+                this.sort.start = this.tabledata.sortState
+            }
+            this.dataSource.sort = this.sort
+          },
+          100)
       }
     })
       .catch(() => { })
diff --git a/yarn.lock b/yarn.lock
index 149658ea3..b84d18e53 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1127,10 +1127,10 @@
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
   integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
 
-"@sunbird-cb/collection@1.0.15":
-  version "1.0.15"
-  resolved "https://registry.yarnpkg.com/@sunbird-cb/collection/-/collection-1.0.15.tgz#9865fc0f4a545542b316553fdb920d3a3445df37"
-  integrity sha512-2KvrZXKJ/KgTwOel6SoK4poTQG2UjJDlBminQ2Y8o7n1FDKRUslpYpYC1PqXQFbGAQDTI2sbJybVMsHxeXv6Bg==
+"@sunbird-cb/collection@^1.0.17":
+  version "1.0.17"
+  resolved "https://registry.yarnpkg.com/@sunbird-cb/collection/-/collection-1.0.17.tgz#8e94672da429e8ae4a26024dea546e4bf4386deb"
+  integrity sha512-KKIKHmIgOFbZh/q1ZB0EyqpsuwGv2rV2DSmkACUKhM8DmCD76PY9wUi/D9X3xd2jZ6zte2K4wxGdW/dxX9BEuQ==
   dependencies:
     tslib "^1.9.0"
 
@@ -1139,10 +1139,10 @@
   resolved "https://registry.yarnpkg.com/@sunbird-cb/design-system/-/design-system-0.0.1.tgz#66795a90e6a3fe3609cd574e694ad296fdc9a1a5"
   integrity sha512-GYfnfpNfzZjnU5Ss+xfSdVbvyek97Yq8cDVsfT4+R0MgsIYnI4gqx7G0Qvx9caZYgb3eoE6wlsyb0K2aWyO+UQ==
 
-"@sunbird-cb/rain-dashboards@^0.2.3":
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/@sunbird-cb/rain-dashboards/-/rain-dashboards-0.2.5.tgz#686e3ddb6840c13a2101ff4f1172f8c868956653"
-  integrity sha512-+ZltJsJbezZVJC2BD5EnFnziMlMOnzZe2RZtcocal44793F4ugkgCt2irffYW5G/VvvvhjGh447LS+IZkRK1wg==
+"@sunbird-cb/rain-dashboards@^0.2.6":
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/@sunbird-cb/rain-dashboards/-/rain-dashboards-0.2.6.tgz#fa7756dddbfd5679770232884bf41a43afb953e2"
+  integrity sha512-kAn28KzMniibhSi+jV6zLzl3+VF1mEBD6Da4AeTP1itP+dNVwiDw1SgvzJV1SgcGmbEnfLoBY/FTSECA25x2AA==
   dependencies:
     tslib "^1.9.0"
 
@@ -1440,10 +1440,10 @@
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
   integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==
 
-"@types/lodash@^4.14.172":
-  version "4.14.182"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.182.tgz#05301a4d5e62963227eaafe0ce04dd77c54ea5c2"
-  integrity sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==
+"@types/lodash@4.14.172":
+  version "4.14.172"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.172.tgz#aad774c28e7bfd7a67de25408e03ee5a8c3d028a"
+  integrity sha512-/BHF5HAx3em7/KkzVKm3LrsD6HZAXuXO1AJZQ3cRRBZj4oHZDviWPYu0aEplAqDFNHZPW6d3G7KN+ONcCCC7pw==
 
 "@types/minimatch@*":
   version "3.0.4"
@@ -6842,16 +6842,16 @@ lodash.toarray@^4.4.0:
   resolved "https://registry.yarnpkg.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz#24c4bfcd6b2fba38bfd0594db1179d8e9b656561"
   integrity sha1-JMS/zWsvuji/0FlNsRedjptlZWE=
 
+lodash@4.17.21, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.5, lodash@^4.5.0:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
+
 lodash@^3.10.1:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
   integrity sha512-9mDDwqVIma6OZX79ZlDACZl8sBm0TEnkf99zV3iMA4GzkIT/9hiqP5mY0HoT1iNLCrKc/R1HByV+yJfRWVJryQ==
 
-lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.5, lodash@^4.5.0:
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
-  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
-
 log4js@^3.0.0:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/log4js/-/log4js-3.0.6.tgz#e6caced94967eeeb9ce399f9f8682a4b2b28c8ff"

From 299360da537acb61ec1dfaa2d792e651b5b9bd1d Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Fri, 16 Sep 2022 11:56:50 +0530
Subject: [PATCH 025/887] Updated rain dashboard lib

---
 package.json                                          |  4 ++--
 .../routes/home/routes/welcome/welcome.component.ts   |  4 ++--
 .../my-dashboard-home/my-dashboard-home.component.ts  | 11 +++++------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 03488f5a2..69a072a3a 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "@project-sunbird/telemetry-sdk": "0.0.26",
     "@sunbird-cb/collection": "^1.0.16",
     "@sunbird-cb/design-system": "0.0.1",
-    "@sunbird-cb/rain-dashboards": "^0.2.6",
+    "@sunbird-cb/rain-dashboards": "^0.2.7",
     "@sunbird-cb/resolver": "^1.0.0",
     "@sunbird-cb/utils": "^1.0.12",
     "@types/file-saver": "^2.0.1",
@@ -136,4 +136,4 @@
     "typescript-tslint-plugin": "^0.5.4",
     "webpack-bundle-analyzer": "^4.4.0"
   }
-}
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/welcome/welcome.component.ts b/project/ws/app/src/lib/routes/home/routes/welcome/welcome.component.ts
index c33f9a944..752a462ab 100644
--- a/project/ws/app/src/lib/routes/home/routes/welcome/welcome.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/welcome/welcome.component.ts
@@ -26,7 +26,7 @@ export class WelcomeComponent implements OnInit, AfterViewInit, OnDestroy {
   getDashboardForKM =
     '/apis/proxies/v8/dashboard/analytics/getDashboardConfig/Karmayogi'
   getDashboardForProfile =
-    '/apis/proxies/v8/dashboard/analytics/getDashboardsForProfile/Karmayogi'
+    '/apis/proxies/v8/dashboard/analytics/getDashboardsForProfile/Karmayogi?realm=mdo'
   getChartV2 =
     '/apis/proxies/v8/dashboard/analytics/getChartV2/Karmayogi'
 
@@ -42,7 +42,7 @@ export class WelcomeComponent implements OnInit, AfterViewInit, OnDestroy {
   dashboardEmpty = dashboardEmptyData
 
   constructor(@Inject(DOCUMENT) private document: Document, private homeResolver: ProfileV2Service, private router: Router,
-              private events: EventService) {
+    private events: EventService) {
   }
   filterR(type: string) {
     this.resolutionFilter = type
diff --git a/project/ws/app/src/lib/routes/my-dashboard/components/my-dashboard-home/my-dashboard-home.component.ts b/project/ws/app/src/lib/routes/my-dashboard/components/my-dashboard-home/my-dashboard-home.component.ts
index 4239cbd0d..7cdd041d4 100644
--- a/project/ws/app/src/lib/routes/my-dashboard/components/my-dashboard-home/my-dashboard-home.component.ts
+++ b/project/ws/app/src/lib/routes/my-dashboard/components/my-dashboard-home/my-dashboard-home.component.ts
@@ -15,13 +15,12 @@ export class MyDashboardHomeComponent implements OnInit {
 
   constructor(private router: Router, private configSvc: ConfigurationsService) { }
   pageNavbar: Partial<NsPage.INavBackground> = this.configSvc.pageNavBar
-
   getDashboardForKM =
-      '/apis/proxies/v8/dashboard/analytics/getDashboardConfig/Karmayogi'
-    getDashboardForProfile =
-      '/apis/proxies/v8/dashboard/analytics/getDashboardsForProfile/Karmayogi'
-    getChartV2 =
-      '/apis/proxies/v8/dashboard/analytics/getChartV2/Karmayogi'
+    '/apis/proxies/v8/dashboard/analytics/getDashboardConfig/Karmayogi'
+  getDashboardForProfile =
+    '/apis/proxies/v8/dashboard/analytics/getDashboardsForProfile/Karmayogi?realm=mdo'
+  getChartV2 =
+    '/apis/proxies/v8/dashboard/analytics/getChartV2/Karmayogi'
 
   selectedDashboardId = ''
 

From ce7d48002f2a953aa435ffe5c27e95d77a3854aa Mon Sep 17 00:00:00 2001
From: "christopher.fernandes" <christyabcd.05@gmail.com>
Date: Fri, 16 Sep 2022 13:16:37 +0530
Subject: [PATCH 026/887] Task #59544: Changes in api integrated

---
 .../users/components/users-upload/users-upload.component.ts | 6 +++++-
 .../ws/app/src/lib/routes/users/services/upload.service.ts  | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
index 55c333ae3..253d4247c 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
@@ -7,6 +7,8 @@ import { MatPaginator } from '@angular/material/paginator'
 import { MatTableDataSource } from '@angular/material/table'
 import { environment } from 'src/environments/environment'
 import { ActivatedRoute } from '@angular/router'
+// tslint:disable-next-line
+import _ from 'lodash'
 
 @Component({
   selector: 'ws-app-users-upload',
@@ -49,6 +51,7 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
   pageDataSubscription!: any
   downloadSampleFilePath = ''
   downloadAsFileName = ''
+  rootOrgId!: any
 
   objDataSource = new MatTableDataSource<any>()
   @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | null = null
@@ -67,6 +70,7 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
     private snackBar: MatSnackBar,
     private route: ActivatedRoute,
   ) {
+    this.rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
     this.dataSource = new MatTableDataSource(this.bulkUploadData)
     this.dataSource.paginator = this.paginator
 
@@ -93,7 +97,7 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
 
   getBulkUploadData() {
     this.fetching = true
-    this.fileService.getBulkUploadData().then((res: any) => {
+    this.fileService.getBulkUploadDataV1(this.rootOrgId).then((res: any) => {
       this.fetching = false
       if (res.result && res.result.content) {
         this.bulkUploadData = res.result.content
diff --git a/project/ws/app/src/lib/routes/users/services/upload.service.ts b/project/ws/app/src/lib/routes/users/services/upload.service.ts
index 947e6fc89..ac414d039 100644
--- a/project/ws/app/src/lib/routes/users/services/upload.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/upload.service.ts
@@ -82,4 +82,8 @@ export class FileService {
   async getBulkUploadData() {
     return await this.http.get(`${API_ENDPOINTS.getBulkUploadData}`).toPromise()
   }
+
+  async getBulkUploadDataV1(rootOrgId: any) {
+    return await this.http.get(`${API_ENDPOINTS.getBulkUploadData}/${rootOrgId}`).toPromise()
+  }
 }

From ab6909090d0e1c9478c045304fc7962c801b8283 Mon Sep 17 00:00:00 2001
From: "christopher.fernandes" <christyabcd.05@gmail.com>
Date: Fri, 16 Sep 2022 16:40:37 +0530
Subject: [PATCH 027/887] Task #59544: Fix multiple clicks on upload

---
 .../components/users-upload/users-upload.component.html      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
index 7d0cd54d6..a889c8482 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
@@ -10,7 +10,7 @@
   <div class="flex flex-row fle-wrap w-full">
     <mat-card class="my-5 flex-custom ws-mat-accent-border mat-card w-full">
       <div>
-        <form [formGroup]="formGroup" (ngSubmit)="onSubmit(form)" #form>
+        <form [formGroup]="formGroup" #form>
           <input type="file" class="mb-5" (change)="onFileChange($event)" name="file" placeholder="Choose file"
             (dblclick)="$event.preventDefault();"
             accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel, .xlsx, .xls" />
@@ -22,7 +22,8 @@
               <mat-spinner [diameter]="30"></mat-spinner>
             </div>
             <button mat-button class="upload-btn mat-button mat-button-base" type="submit" i18n
-              [disabled]="formGroup.invalid">
+              [disabled]="formGroup.invalid || (displayLoader | async)" (click)="onSubmit(form)"
+              (dblclick)="$event.preventDefault();">
               <ng-container i18n>Upload</ng-container>
             </button>
           </div>

From dca4dc9a603690acec708466a17f0ecebb704917 Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Thu, 22 Sep 2022 16:06:31 +0530
Subject: [PATCH 028/887] Updated Rain dashboard to latest version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7f088a14e..d134b527c 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "@project-sunbird/telemetry-sdk": "0.0.26",
     "@sunbird-cb/collection": "^1.0.17",
     "@sunbird-cb/design-system": "0.0.1",
-    "@sunbird-cb/rain-dashboards": "^0.2.7",
+    "@sunbird-cb/rain-dashboards": "^0.2.8",
     "@sunbird-cb/resolver": "^1.0.0",
     "@sunbird-cb/utils": "^1.0.12",
     "@types/file-saver": "^2.0.1",

From f178049704d2fc5660b55f8622cfd13c8b4a1791 Mon Sep 17 00:00:00 2001
From: Afzal <mohd.afzal@tarento.com>
Date: Tue, 27 Sep 2022 16:57:26 +0530
Subject: [PATCH 029/887] Add button for Edit Info

---
 .../home/routes/users-view/users-view.component.html      | 8 ++++++--
 .../routes/home/routes/users-view/users-view.component.ts | 3 +++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index c11726722..b6cdc50e7 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -31,9 +31,13 @@
       </div>
       <ng-container *ngIf="usersData && currentFilter !== 'upload'">
         <ws-widget-org-user-table [tableData]="tabledata" [data]="dataForTable" [isUpload]=true [isCreate]=true
-          (eOnButtonClick)="clickHandler($event)" (eOnRowClick)="onRoleClick($event)"
-          (actionsClick)="menuActions($event)" (searchByEnterKey)="onEnterkySearch($event)">
+          (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuActions($event)"
+          (searchByEnterKey)="onEnterkySearch($event)">
         </ws-widget-org-user-table>
+        <!-- <ws-widget-org-user-table [tableData]="tabledata" [data]="dataForTable" [isUpload]=true [isCreate]=true
+          (eOnButtonClick)="clickHandler($event)" (eOnRowClick)="onRoleClick($event)" (actionsClick)="menuActions($event)"
+          (searchByEnterKey)="onEnterkySearch($event)">
+        </ws-widget-org-user-table> -->
       </ng-container>
       <ng-container *ngIf="currentFilter === 'upload'">
         <ws-app-users-upload></ws-app-users-upload>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 4409f21be..98d311a05 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -272,6 +272,9 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       case 'showOnKarma':
         window.open(`${environment.karmYogiPath}/app/person-profile/${user.request.userId}`)
         break
+      case 'editInfo':
+        this.onRoleClick($event.row)
+        break
       case 'block':
         _.set(user, 'isBlocked', true)
         _.set(user, 'isDeleted', false)

From 2716c10ae6a5eb2e51ba38cf4a0b7bf9a8225962 Mon Sep 17 00:00:00 2001
From: Afzal <mohd.afzal@tarento.com>
Date: Tue, 27 Sep 2022 17:03:24 +0530
Subject: [PATCH 030/887] Add button for Edit Info

---
 .../app/src/lib/routes/home/routes/welcome/welcome.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/welcome/welcome.component.ts b/project/ws/app/src/lib/routes/home/routes/welcome/welcome.component.ts
index 752a462ab..f566194da 100644
--- a/project/ws/app/src/lib/routes/home/routes/welcome/welcome.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/welcome/welcome.component.ts
@@ -42,7 +42,7 @@ export class WelcomeComponent implements OnInit, AfterViewInit, OnDestroy {
   dashboardEmpty = dashboardEmptyData
 
   constructor(@Inject(DOCUMENT) private document: Document, private homeResolver: ProfileV2Service, private router: Router,
-    private events: EventService) {
+              private events: EventService) {
   }
   filterR(type: string) {
     this.resolutionFilter = type

From 9738258077971323eec09e8d5e2c05bf54c53601 Mon Sep 17 00:00:00 2001
From: nitin raj <nitin.raj@tarento.com>
Date: Tue, 27 Sep 2022 17:57:12 +0530
Subject: [PATCH 031/887] mdo url fixes

---
 .../work-allocation-list/table.component.ts   |  1 +
 .../lib/routes/home/home.rounting.module.ts   | 20 ++++++++
 .../users-view/users-view.component.html      | 10 ++--
 .../routes/users-view/users-view.component.ts | 10 ++--
 .../workallocation.component.html             | 21 ++++++---
 .../workallocation.component.ts               | 46 ++++++++++++++-----
 .../routes/view-user/view-user.component.html |  4 +-
 .../routes/view-user/view-user.component.ts   |  1 +
 .../draft-allocations.component.html          | 18 +++++---
 .../draft-allocations.component.ts            |  2 +-
 .../published-allocations.component.html      | 24 ++++++----
 .../published-allocations.component.ts        |  2 +-
 12 files changed, 110 insertions(+), 49 deletions(-)

diff --git a/project/ws/app/src/lib/head/work-allocation-table/work-allocation-list/table.component.ts b/project/ws/app/src/lib/head/work-allocation-table/work-allocation-list/table.component.ts
index e29ae0883..6bf8f2777 100644
--- a/project/ws/app/src/lib/head/work-allocation-table/work-allocation-list/table.component.ts
+++ b/project/ws/app/src/lib/head/work-allocation-table/work-allocation-list/table.component.ts
@@ -30,6 +30,7 @@ export class WorkAllocationTableComponent implements OnInit, OnChanges {
   @Output() clicked?: EventEmitter<any>
   @Output() actionsClick?: EventEmitter<any>
   @Output() eOnRowClick = new EventEmitter<any>()
+  @Input() currentFilter!: any
   bodyHeight = document.body.clientHeight - 125
   displayedColumns: IColums[] | undefined
   viewPaginator = false
diff --git a/project/ws/app/src/lib/routes/home/home.rounting.module.ts b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
index 3789428a5..ba51c4c13 100644
--- a/project/ws/app/src/lib/routes/home/home.rounting.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
@@ -40,6 +40,17 @@ const routes: Routes = [
           module: 'home',
         },
       },
+      {
+        path: 'users/:tab',
+        component: UsersViewComponent,
+        resolve: {
+          usersList: UsersListResolve,
+        },
+        data: {
+          pageId: 'users',
+          module: 'home',
+        },
+      },
       {
         path: 'users',
         component: UsersViewComponent,
@@ -78,8 +89,17 @@ const routes: Routes = [
           module: 'home',
         },
       },
+      {
+        path: 'workallocation/:tab',
+        data: {
+          pageId: 'workallocation',
+          module: 'home',
+        },
+        component: WorkallocationComponent,
+      },
       {
         path: 'workallocation',
+        // redirectTo: 'workallocation/:tab', pathMatch: 'full',
         data: {
           pageId: 'workallocation',
           module: 'home',
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index 39577ec05..958ff7c53 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -15,12 +15,12 @@
           <!-- <a href="javascript:void(0)" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'underreview',
               'ws-mat-accent-border font-medium':currentFilter !== 'underreview'}" mat-button
             (click)="filter('underreview')" role="button">Under review</a> -->
-          <a href="javascript:void(0)" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'active',
+          <a routerLink="/app/home/users/active" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'active',
               'ws-mat-accent-border font-medium':currentFilter !== 'active'}"
-            mat-button (click)="filter('active'); tabTelemetry('active', 0)" role="button">Active</a>
-          <a href="javascript:void(0)" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'inactive',
+            (click)="filter('active'); tabTelemetry('active', 0)" role="link">Active</a>
+          <a routerLink="/app/home/users/inactive" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'inactive',
                           'ws-mat-accent-border font-medium':currentFilter !== 'inactive'}"
-            mat-button (click)="filter('inactive'); tabTelemetry('inactive', 1)" role="button">Inactive</a>
+            (click)="filter('inactive'); tabTelemetry('inactive', 1)" role="link">Inactive</a>
           <!-- <a href="javascript:void(0)" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'blocked',
                           'ws-mat-accent-border font-medium':currentFilter !== 'blocked'}" mat-button
             (click)="filter('blocked')" role="button">Blocked</a> -->
@@ -34,4 +34,4 @@
       </ng-container>
     </mat-card-content>
   </mat-card>
-</div>
\ No newline at end of file
+</div>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 9e7dc0b8e..cfca9d17f 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -28,6 +28,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   Math: any
   /* tslint:enable */
   currentFilter = 'active'
+  filterPath = '/app/home/users'
   discussionList!: any
   discussProfileData!: any
   portalProfile!: NSProfileDataV2.IProfile
@@ -75,7 +76,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     this.Math = Math
     this.configSvc = this.route.parent && this.route.parent.snapshot.data.configService
     this.currentUser = this.configSvc.userProfile && this.configSvc.userProfile.userId
-    // console.log(_.get(this.route, 'snapshot.data.usersList.data'))
+
     // this.usersData = _.get(this.route, 'snapshot.data.usersList.data') || {}
     // this.filterData()
   }
@@ -83,9 +84,9 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   // decideAPICall() {
   // }
   ngOnDestroy() {
-    if (this.tabs) {
-      this.tabs.unsubscribe()
-    }
+    // if (this.tabs) {
+    //   this.tabs.unsubscribe()
+    // }
   }
   ngOnInit() {
     this.getAllUsers()
@@ -201,7 +202,6 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     //   },
     // }
     // this.usersService.getAllUsers(filterObj).subscribe(data => {
-    //   console.log(data)
     //   this.usersData = data
     //   this.filterData()
     // })
diff --git a/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.html b/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.html
index 701069bc9..88c16b3fd 100644
--- a/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.html
@@ -13,15 +13,18 @@
     <mat-card-content>
       <div class="flex flex-1">
         <div class="flex flex-1 filter max-height-60">
-          <a href="javascript:void(0)" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'Draft',
+          <a routerLink="/app/home/workallocation/draft" routerLinkActive="router-link-active" class="filter-option"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'Draft',
           'ws-mat-accent-border font-medium':currentFilter !== 'Draft'}" mat-button
-            (click)="filter('Draft'); tabTelemetry('Drafts', 0)" role="button">Drafts</a>
-          <a href="javascript:void(0)" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'Published',
+            (click)="filter('Draft'); tabTelemetry('Drafts', 0)">Drafts-{{ this.currentFilter}}</a>
+          <a routerLink="/app/home/workallocation/published" routerLinkActive="router-link-active" class="filter-option"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'Published',
           'ws-mat-accent-border font-medium':currentFilter !== 'Published'}" mat-button
-            (click)="filter('Published'); tabTelemetry('Published', 1)" role="button">Published</a>
-          <a href="javascript:void(0)" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'Archived',
+            (click)="filter('Published'); tabTelemetry('Published', 1)">Published-{{ currentFilter}}</a>
+          <a routerLink="/app/home/workallocation/archived" routerLinkActive="router-link-active" class="filter-option"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'Archived',
           'ws-mat-accent-border font-medium':currentFilter !== 'Archived'}" mat-button
-            (click)="filter('Archived'); tabTelemetry('Archived', 2)" role="button">Archived</a>
+            (click)="filter('Archived'); tabTelemetry('Archived', 2)">Archived- {{currentFilter}}</a>
         </div>
       </div>
       <ng-container>
@@ -36,6 +39,10 @@
                 </div>
               </div>
             </div>
+
+            <div>
+
+            </div>
             <div class="flex-2">
               <!-- <button type="button" mat-button class="downlaod-btn" (click)="export()"  *ngIf="data && data.length > 0">
                 <mat-icon>cloud_download</mat-icon> Download
@@ -86,4 +93,4 @@
   <!-- <ws-app-download-allocation id="downloadtemp" [data]="data" [deptname]="departmentName"
     [currentFilter]="currentFilter"></ws-app-download-allocation> -->
   <!-- </div> -->
-</div>
\ No newline at end of file
+</div>
diff --git a/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.ts b/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.ts
index 20451417f..4bd715849 100644
--- a/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.ts
@@ -32,6 +32,9 @@ export class WorkallocationComponent implements OnInit, OnDestroy {
   departmentID: any
   selectedPDFid: any
   searchQuery!: string
+  publishUrl = "app/home/workallocation/published"
+  draftUrl = "app/home/workallocation/draft"
+  currentUrl: any
 
   config: ExportAsConfig = {
     type: 'pdf',
@@ -47,21 +50,29 @@ export class WorkallocationComponent implements OnInit, OnDestroy {
 
 
   ngOnDestroy() {
-    if (this.tabs) {
-      this.tabs.unsubscribe()
-    }
+    // if (this.tabs) {
+    //   this.tabs.unsubscribe()
+    // }
   }
 
   constructor(private exportAsService: ExportAsService, private router: Router, private wrkAllocServ: WorkallocationService,
     private workallocationSrvc: WorkallocationService, private activeRoute: ActivatedRoute, private events: EventService, private route: ActivatedRoute,
     public dialog: MatDialog, public eventSvc: EventService) {
-    this.configSvc = this.route.parent && this.route.parent.snapshot.data.configService
-    const paramsMap = this.activeRoute.snapshot.params.tab
-    if (paramsMap === 'Published') {
-      this.currentFilter = 'Published'
-    } else {
-      this.currentFilter = 'Draft'
-    }
+    // this.configSvc = this.route.parent && this.route.parent.snapshot.data.configService
+    // const paramsMap = this.activeRoute.snapshot.params.tab
+    // console.log(paramsMap, '-paramsMap====')
+    // if (paramsMap === 'published') {
+    //   this.currentUrl = "app/home/workallocation/published"
+    //   this.currentFilter = 'Published'
+    //   console.log(this.currentUrl, 'this.currentUrl published==========')
+    //   console.log(paramsMap, '- published paramsMap====')
+    // }
+    // if (paramsMap === 'draft') {
+    //   this.currentUrl = "app/home/workallocation/draft"
+    //   this.currentFilter = 'Draft'
+    //   console.log(this.currentUrl, 'this.currentUrl draft ==========')
+    //   console.log(paramsMap, '- draft paramsMap====')
+    // }
   }
 
   ngOnInit() {
@@ -81,11 +92,24 @@ export class WorkallocationComponent implements OnInit, OnDestroy {
       sortState: 'asc',
       needUserMenus: true,
     }
-    this.filter("Draft")
+    this.configSvc = this.route.parent && this.route.parent.snapshot.data.configService
+    const paramsMap = this.activeRoute.snapshot.params.tab
+    if (paramsMap === 'published') {
+      this.currentUrl = "app/home/workallocation/published"
+      this.currentFilter = 'Published'
+      this.filter("Published")
+
+    }
+    if (paramsMap === 'draft') {
+      this.currentUrl = "app/home/workallocation/draft"
+      this.currentFilter = 'Draft'
+      this.filter("Draft")
+    }
   }
 
   get getTableData() {
     return this.data
+
   }
   // Download format
   export() {
diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
index 62b4856b8..236e404cc 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
@@ -3,7 +3,7 @@
     <div class="flex-3">
       <div class="flex flex-1 margin-left-xl">
         <ws-widget-breadcrumbs-org
-          [widgetData]="{titles:[{title:'Users', url:'/app/home/users'},{title: userStatus, url:'none'},{title:fullname,url:'none'}] }">
+          [widgetData]="{titles:[{title:'Users', url:'/app/home/users'},{title: userStatus, url:'/app/home/users/'+ userStatus.toLowerCase() },{title:fullname,url:'none'}] }">
         </ws-widget-breadcrumbs-org>
 
         <!-- <ws-widget-breadcrumbs-org [widgetData]="breadcrumbs">
@@ -555,4 +555,4 @@
       </ng-container>
     </div> -->
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
index 4695ce8a9..1414c463d 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
@@ -77,6 +77,7 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
           this.skillDetails = profileData.skills
           this.interests = profileData.interests
           this.userStatus = profileDataAll.isDeleted ? 'Inactive' : 'Active'
+
         }
         const fullProfile = _.get(this.activeRoute.snapshot, 'data.configService')
         this.department = fullProfile.unMappedUser.rootOrgId
diff --git a/project/ws/app/src/lib/routes/workallocation-v2/routes/draft-allocations/draft-allocations.component.html b/project/ws/app/src/lib/routes/workallocation-v2/routes/draft-allocations/draft-allocations.component.html
index 8d350e5c0..69ecea1a2 100644
--- a/project/ws/app/src/lib/routes/workallocation-v2/routes/draft-allocations/draft-allocations.component.html
+++ b/project/ws/app/src/lib/routes/workallocation-v2/routes/draft-allocations/draft-allocations.component.html
@@ -12,6 +12,7 @@
         <div class="flex-4">
           <ws-widget-breadcrumbs-org [widgetData]="{titles: bdtitles }">
           </ws-widget-breadcrumbs-org>
+
         </div>
         <div class="flex-2">
           <!-- <button type="button" mat-button class="print-btn" *ngIf="data && data.length > 0">
@@ -23,8 +24,9 @@
           <button type="button" mat-button class="allocation-btn mat-accent-border" (click)="onNewAllocationClick()">
             New officer
           </button>
-          <button mat-stroked-button color="accent" type="button" class="publish-btn mat-accent-border flex-auto-display"
-            (click)="publishWorkOrder()" id="publishbtn" *ngIf="data && data.length > 0">
+          <button mat-stroked-button color="accent" type="button"
+            class="publish-btn mat-accent-border flex-auto-display" (click)="publishWorkOrder()" id="publishbtn"
+            *ngIf="data && data.length > 0">
             <span i18n>Publish</span>
           </button>
         </div>
@@ -78,14 +80,15 @@
               <div class="search margin-top-l">
                 <div class=rsearch>
                   <mat-icon class="color-60 search-icon">search</mat-icon>
-                  <input class="sinput color-60 margin-top-m mat-body-2" type="Standard" label="searchVal" [(ngModel)]="term"
-                    placeholder="Search">
+                  <input class="sinput color-60 margin-top-m mat-body-2" type="Standard" label="searchVal"
+                    [(ngModel)]="term" placeholder="Search">
                 </div>
               </div>
             </div>
           </div>
         </div>
-        <table class="allocation-table margin-bottom-l mat-body-2" id="allocation-table" cell-spacing='0' cell-padding='0'>
+        <table class="allocation-table margin-bottom-l mat-body-2" id="allocation-table" cell-spacing='0'
+          cell-padding='0'>
           <tr>
             <th>Name and designation <mat-icon class="sort-icon">arrow_upward</mat-icon>
             </th>
@@ -153,7 +156,8 @@
                                 <mat-icon class="ws-mat-default-text veralign-btm">sports_score</mat-icon>
                               </span>
                               <span class="initials" *ngIf="a.submittedFromId">
-                                <ws-app-initial-avatar *ngIf="a.submittedFromName !== null" [name]="a.submittedFromName">
+                                <ws-app-initial-avatar *ngIf="a.submittedFromName !== null"
+                                  [name]="a.submittedFromName">
                                 </ws-app-initial-avatar>
                               </span>
                               {{a.submittedFromName}}
@@ -204,4 +208,4 @@
         <div *ngIf="!downloaddata && data && data.length > 0"> -->
   <!-- <ws-app-download-allocation id="downloadtemp" [data]="data" [deptname]="departmentName"></ws-app-download-allocation> -->
   <!-- </div> -->
-</div>
\ No newline at end of file
+</div>
diff --git a/project/ws/app/src/lib/routes/workallocation-v2/routes/draft-allocations/draft-allocations.component.ts b/project/ws/app/src/lib/routes/workallocation-v2/routes/draft-allocations/draft-allocations.component.ts
index a18506a4a..1c7682fe6 100644
--- a/project/ws/app/src/lib/routes/workallocation-v2/routes/draft-allocations/draft-allocations.component.ts
+++ b/project/ws/app/src/lib/routes/workallocation-v2/routes/draft-allocations/draft-allocations.component.ts
@@ -26,7 +26,7 @@ export class DraftAllocationsComponent implements OnInit {
   departmentName: any
   departmentID: any
   bdtitles = [{ title: 'Work allocation tool', url: '/app/home/workallocation' },
-  { title: 'Drafts', url: '/app/home/workallocation' }]
+  { title: 'Drafts', url: '/app/home/workallocation/draft' }]
 
   userslist: any[] = []
   downloaddata: any = []
diff --git a/project/ws/app/src/lib/routes/workallocation-v2/routes/published-allocations/published-allocations.component.html b/project/ws/app/src/lib/routes/workallocation-v2/routes/published-allocations/published-allocations.component.html
index 9b30b9109..5dd5d5f26 100644
--- a/project/ws/app/src/lib/routes/workallocation-v2/routes/published-allocations/published-allocations.component.html
+++ b/project/ws/app/src/lib/routes/workallocation-v2/routes/published-allocations/published-allocations.component.html
@@ -72,14 +72,15 @@
               <div class="search margin-top-l">
                 <div class=rsearch>
                   <mat-icon class="color-60 search-icon">search</mat-icon>
-                  <input class="sinput color-60 margin-top-m mat-body-2" type="Standard" label="searchVal" [(ngModel)]="term"
-                    placeholder="Search">
+                  <input class="sinput color-60 margin-top-m mat-body-2" type="Standard" label="searchVal"
+                    [(ngModel)]="term" placeholder="Search">
                 </div>
               </div>
             </div>
           </div>
         </div>
-        <table class="allocation-table margin-bottom-l mat-body-2" id="allocation-table" cell-spacing='0' cell-padding='0'>
+        <table class="allocation-table margin-bottom-l mat-body-2" id="allocation-table" cell-spacing='0'
+          cell-padding='0'>
           <tr>
             <th>Name and designation <mat-icon class="sort-icon">arrow_upward</mat-icon>
             </th>
@@ -88,7 +89,8 @@
             <th>Submit to</th>
             <th>Submission from</th>
           </tr>
-          <tr *ngFor="let d of data | filter: term | paginate: { itemsPerPage: 5, currentPage: p, totalItems: data.length }"
+          <tr
+            *ngFor="let d of data | filter: term | paginate: { itemsPerPage: 5, currentPage: p, totalItems: data.length }"
             class="data-row">
             <td aria-rowspan="d.roles.length+1">
               <div class="initials">
@@ -139,7 +141,8 @@
                                 <mat-icon class="ws-mat-default-text veralign-btm">sports_score</mat-icon>
                               </span>
                               <span class="initials" *ngIf="a.submittedFromId">
-                                <ws-app-initial-avatar *ngIf="a.submittedFromName !== null" [name]="a.submittedFromName">
+                                <ws-app-initial-avatar *ngIf="a.submittedFromName !== null"
+                                  [name]="a.submittedFromName">
                                 </ws-app-initial-avatar>
                               </span>
                               {{a.submittedFromName}}
@@ -165,16 +168,17 @@
 
         <mat-menu #cardMenu="matMenu">
           <ng-template matMenuContent let-rowData="data">
-            <button type="button" (click)="buttonClick('Download',rowData)" mat-menu-item name="channel-analytics-button"
-              class="ws-mat-primary-text downlaod-btn" i18n-aria-label aria-label="Analytics">
+            <button type="button" (click)="buttonClick('Download',rowData)" mat-menu-item
+              name="channel-analytics-button" class="ws-mat-primary-text downlaod-btn" i18n-aria-label
+              aria-label="Analytics">
               <mat-icon>cloud_download</mat-icon> <span>Download</span>
             </button>
             <!-- <button (click)="buttonClick('Print',rowData)"mat-menu-item name="channel-analytics-button" class="ws-mat-primary-text" i18n-aria-label
                         aria-label="Analytics">
                         <mat-icon>print</mat-icon> <span>Print</span>
                     </button> -->
-            <button (click)="buttonClick('Archive',rowData)" mat-menu-item name="channel-analytics-button" class="ws-mat-primary-text"
-              i18n-aria-label aria-label="Analytics">
+            <button (click)="buttonClick('Archive',rowData)" mat-menu-item name="channel-analytics-button"
+              class="ws-mat-primary-text" i18n-aria-label aria-label="Analytics">
               <mat-icon>archive</mat-icon> <span>Archive allocation</span>
             </button>
           </ng-template>
@@ -189,4 +193,4 @@
         <div *ngIf="!downloaddata && data && data.length > 0"> -->
   <!-- <ws-app-download-allocation id="downloadtemp" [data]="data" [deptname]="departmentName" [currentFilter]="currentFilter"></ws-app-download-allocation> -->
   <!-- </div> -->
-</div>
\ No newline at end of file
+</div>
diff --git a/project/ws/app/src/lib/routes/workallocation-v2/routes/published-allocations/published-allocations.component.ts b/project/ws/app/src/lib/routes/workallocation-v2/routes/published-allocations/published-allocations.component.ts
index b839cc9d6..4203c01dc 100644
--- a/project/ws/app/src/lib/routes/workallocation-v2/routes/published-allocations/published-allocations.component.ts
+++ b/project/ws/app/src/lib/routes/workallocation-v2/routes/published-allocations/published-allocations.component.ts
@@ -22,7 +22,7 @@ export class PublishedAllocationsComponent implements OnInit {
   departmentName: any
   departmentID: any
   bdtitles = [{ title: 'Work allocation tool', url: '/app/home/workallocation' },
-  { title: 'Published', url: '/app/home/workallocation' }]
+  { title: 'Published', url: '/app/home/workallocation/published' }]
 
   config: ExportAsConfig = {
     type: 'pdf',

From 47d6d8731d248a1cfe00c3dad2f3d945bd5a79b9 Mon Sep 17 00:00:00 2001
From: nitin raj <nitin.raj@tarento.com>
Date: Tue, 27 Sep 2022 18:53:22 +0530
Subject: [PATCH 032/887] merge conflict

---
 .../src/lib/routes/home/routes/welcome/welcome.component.ts  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/welcome/welcome.component.ts b/project/ws/app/src/lib/routes/home/routes/welcome/welcome.component.ts
index 752a462ab..a6a62b5e3 100644
--- a/project/ws/app/src/lib/routes/home/routes/welcome/welcome.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/welcome/welcome.component.ts
@@ -41,7 +41,10 @@ export class WelcomeComponent implements OnInit, AfterViewInit, OnDestroy {
   currentDashboard: any = []
   dashboardEmpty = dashboardEmptyData
 
-  constructor(@Inject(DOCUMENT) private document: Document, private homeResolver: ProfileV2Service, private router: Router,
+  constructor(
+    @Inject(DOCUMENT) private document: Document,
+    private homeResolver: ProfileV2Service,
+    private router: Router,
     private events: EventService) {
   }
   filterR(type: string) {

From c9ca388bde3df4671f2fab015c02d714fb66c466 Mon Sep 17 00:00:00 2001
From: Afzal <mohd.afzal@tarento.com>
Date: Wed, 28 Sep 2022 14:06:13 +0530
Subject: [PATCH 033/887] library version upgrade

---
 package.json |  2 +-
 yarn.lock    | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index d134b527c..a293725e3 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@angular/router": "~8.2.1",
     "@angular/service-worker": "~8.2.1",
     "@project-sunbird/telemetry-sdk": "0.0.26",
-    "@sunbird-cb/collection": "^1.0.17",
+    "@sunbird-cb/collection": "^1.0.18",
     "@sunbird-cb/design-system": "0.0.1",
     "@sunbird-cb/rain-dashboards": "^0.2.8",
     "@sunbird-cb/resolver": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index b84d18e53..a582f60f3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1127,10 +1127,10 @@
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
   integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
 
-"@sunbird-cb/collection@^1.0.17":
-  version "1.0.17"
-  resolved "https://registry.yarnpkg.com/@sunbird-cb/collection/-/collection-1.0.17.tgz#8e94672da429e8ae4a26024dea546e4bf4386deb"
-  integrity sha512-KKIKHmIgOFbZh/q1ZB0EyqpsuwGv2rV2DSmkACUKhM8DmCD76PY9wUi/D9X3xd2jZ6zte2K4wxGdW/dxX9BEuQ==
+"@sunbird-cb/collection@^1.0.18":
+  version "1.0.18"
+  resolved "https://registry.yarnpkg.com/@sunbird-cb/collection/-/collection-1.0.18.tgz#e97b688f80a9b0d0dfd217c899a7a1493f7d90a5"
+  integrity sha512-8dAqZmvAQ/kcc4Dv82r9421E+/GuGwgagPyvUuQSOzt6WS2Y0l/w7RHkoyDXu5blpnB9i/1NSqT3IKD/eTWSyw==
   dependencies:
     tslib "^1.9.0"
 
@@ -1139,10 +1139,10 @@
   resolved "https://registry.yarnpkg.com/@sunbird-cb/design-system/-/design-system-0.0.1.tgz#66795a90e6a3fe3609cd574e694ad296fdc9a1a5"
   integrity sha512-GYfnfpNfzZjnU5Ss+xfSdVbvyek97Yq8cDVsfT4+R0MgsIYnI4gqx7G0Qvx9caZYgb3eoE6wlsyb0K2aWyO+UQ==
 
-"@sunbird-cb/rain-dashboards@^0.2.6":
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/@sunbird-cb/rain-dashboards/-/rain-dashboards-0.2.6.tgz#fa7756dddbfd5679770232884bf41a43afb953e2"
-  integrity sha512-kAn28KzMniibhSi+jV6zLzl3+VF1mEBD6Da4AeTP1itP+dNVwiDw1SgvzJV1SgcGmbEnfLoBY/FTSECA25x2AA==
+"@sunbird-cb/rain-dashboards@^0.2.8":
+  version "0.2.9"
+  resolved "https://registry.yarnpkg.com/@sunbird-cb/rain-dashboards/-/rain-dashboards-0.2.9.tgz#6fbcf82386e09475901137411ca5fee7d0c8c29f"
+  integrity sha512-4i3AL3r0MIS0cLTR2bW1sNJ9QdQY0Yyx2z3HIcqZlvWQdb6GE3vobYwtX1Tn1APy/2eUBlLKwO+BDF0QqQ50LA==
   dependencies:
     tslib "^1.9.0"
 

From 2991f4a4a217302d597bcbd34d3a4b20eff1d21c Mon Sep 17 00:00:00 2001
From: nitin raj <nitin.raj@tarento.com>
Date: Thu, 29 Sep 2022 01:27:13 +0530
Subject: [PATCH 034/887] user tab issue fixed

---
 .../ws/app/src/lib/routes/home/home.rounting.module.ts   | 3 ++-
 .../home/routes/users-view/users-view.component.html     | 8 ++++----
 .../users/routes/view-user/view-user.component.html      | 9 ++++-----
 .../routes/users/routes/view-user/view-user.component.ts | 2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/home.rounting.module.ts b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
index 91158fab8..d4f06ed8a 100644
--- a/project/ws/app/src/lib/routes/home/home.rounting.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
@@ -52,6 +52,7 @@ const routes: Routes = [
       },
       {
         path: 'users',
+        redirectTo: 'users/active',
         component: UsersViewComponent,
         resolve: {
           usersList: UsersListResolve,
@@ -98,7 +99,7 @@ const routes: Routes = [
       },
       {
         path: 'workallocation',
-        // redirectTo: 'workallocation/:tab', pathMatch: 'full',
+        redirectTo: 'workallocation/draft', pathMatch: 'full',
         data: {
           pageId: 'workallocation',
           module: 'home',
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index 0f29b5bfe..345c3cc7d 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -16,11 +16,11 @@
               'ws-mat-accent-border font-medium':currentFilter !== 'underreview'}" mat-button
             (click)="filter('underreview')" role="button">Under review</a> -->
           <a routerLink="/app/home/users/active" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'active',
-              'ws-mat-accent-border font-medium':currentFilter !== 'active'}"
-            (click)="filter('active'); tabTelemetry('active', 0)" role="link">Active</a>
+              'ws-mat-accent-border font-medium':currentFilter !== 'active'}" mat-button
+            (click)="filter('active'); tabTelemetry('active', 0)" role="button">Active</a>
           <a routerLink="/app/home/users/inactive" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'inactive',
-                          'ws-mat-accent-border font-medium':currentFilter !== 'inactive'}"
-            (click)="filter('inactive'); tabTelemetry('inactive', 1)" role="link">Inactive</a>
+                          'ws-mat-accent-border font-medium':currentFilter !== 'inactive'}" mat-button
+            (click)="filter('inactive'); tabTelemetry('inactive', 1)" role="button">Inactive</a>
           <!-- <a href="javascript:void(0)" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'blocked',
                           'ws-mat-accent-border font-medium':currentFilter !== 'blocked'}" mat-button
             (click)="filter('blocked')" role="button">Blocked</a> -->
diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
index 236e404cc..6c337abc7 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
@@ -2,12 +2,11 @@
   <div class="flex flex-1 custom">
     <div class="flex-3">
       <div class="flex flex-1 margin-left-xl">
-        <ws-widget-breadcrumbs-org
-          [widgetData]="{titles:[{title:'Users', url:'/app/home/users'},{title: userStatus, url:'/app/home/users/'+ userStatus.toLowerCase() },{title:fullname,url:'none'}] }">
-        </ws-widget-breadcrumbs-org>
 
-        <!-- <ws-widget-breadcrumbs-org [widgetData]="breadcrumbs">
-        </ws-widget-breadcrumbs-org> -->
+
+        <ws-widget-breadcrumbs-org [widgetData]="{url: 'home',titles: breadcrumbs}">
+        </ws-widget-breadcrumbs-org>
+        {{ breadcrumbs |json }}
       </div>
       <div class="flex flex-4 flex-column">
         <div class="flex flex-1 custom">
diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
index 1414c463d..1a45644a8 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
@@ -150,7 +150,7 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
             this.breadcrumbs = { titles: [{ title: 'Users', url: '/app/home/users' }, { title: this.userStatus, url: 'none' }, { title: 'MDO information', url: '/app/home/mdoinfo/leadership' }, { title: this.fullname, url: 'none' }] }
           } else {
             // tslint:disable-next-line:max-line-length
-            this.breadcrumbs = { titles: [{ title: 'Users', url: '/app/home/users' }, { title: this.userStatus, url: 'none' }, { title: this.fullname, url: 'none' }] }
+            this.breadcrumbs = [{ title: 'Users', url: '/app/home/users/active' }, { title: this.userStatus, url: `/app/home/users/${this.userStatus.toLowerCase()}` }, { title: this.fullname, url: 'none' }]
           }
         })
 

From 72a4c8705b02cbf59eee62b20d287f0e6a032690 Mon Sep 17 00:00:00 2001
From: "christopher.fernandes" <christyabcd.05@gmail.com>
Date: Thu, 29 Sep 2022 11:21:12 +0530
Subject: [PATCH 035/887] Task #59712: file download feature

---
 .../users/components/users-upload/users-upload.component.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
index a889c8482..6afc44f9c 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
@@ -66,7 +66,9 @@ <h2 class="w-full contacts-head">File uploads</h2>
             <ng-container matColumnDef="fileName">
               <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Name
               </th>
-              <td mat-cell *matCellDef="let row"> {{row.fileName}} </td>
+              <td mat-cell *matCellDef="let row">
+                <a href="{{row.filePath}}" download="{{row.fileName}}"> {{row.fileName}}</a>
+              </td>
             </ng-container>
 
             <!-- status Column -->

From a1d7011528215ea12ef92c56d11ef50153a78734 Mon Sep 17 00:00:00 2001
From: "christopher.fernandes" <christyabcd.05@gmail.com>
Date: Thu, 29 Sep 2022 11:21:49 +0530
Subject: [PATCH 036/887] Task #59712: fixed the resolve to read json for
 assets

---
 project/ws/app/src/lib/routes/home/home.rounting.module.ts | 7 +++++++
 .../home/routes/users-view/users-view.component.html       | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/home.rounting.module.ts b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
index d4f06ed8a..cec7fbe6c 100644
--- a/project/ws/app/src/lib/routes/home/home.rounting.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
@@ -16,6 +16,7 @@ import { LeadershipComponent } from './routes/leadership/leadership.component'
 import { StaffComponent } from './routes/staff/staff.component'
 import { BudgetComponent } from './routes/budget/budget.component'
 import { MdoinfoComponent } from './routes/mdoinfo/mdoinfo.component'
+import { PageResolve } from '@sunbird-cb/utils'
 const routes: Routes = [
   {
     path: '',
@@ -44,10 +45,13 @@ const routes: Routes = [
         component: UsersViewComponent,
         resolve: {
           usersList: UsersListResolve,
+          pageData: PageResolve,
         },
         data: {
           pageId: 'users',
           module: 'home',
+          pageType: 'feature',
+          pageKey: 'users-view',
         },
       },
       {
@@ -56,10 +60,13 @@ const routes: Routes = [
         component: UsersViewComponent,
         resolve: {
           usersList: UsersListResolve,
+          pageData: PageResolve,
         },
         data: {
           pageId: 'users',
           module: 'home',
+          pageType: 'feature',
+          pageKey: 'users-view',
         },
       },
       {
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index c972d7a9e..cdaef6fe4 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -24,7 +24,7 @@
           <!-- <a href="javascript:void(0)" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'blocked',
                           'ws-mat-accent-border font-medium':currentFilter !== 'blocked'}" mat-button
             (click)="filter('blocked')" role="button">Blocked</a> -->
-          <a href="javascript:void(0)" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'upload',
+          <a routerLink="/app/home/users/fileupload" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'upload',
                                       'ws-mat-accent-border font-medium':currentFilter !== 'upload'}" mat-button
             (click)="filter('upload'); tabTelemetry('upload', 2)" role="button">File uploads</a>
         </div>
@@ -44,4 +44,4 @@
       </ng-container>
     </mat-card-content>
   </mat-card>
-</div>
+</div>
\ No newline at end of file

From 86054eeb5c1db9473913dc168328b68d8bd092e5 Mon Sep 17 00:00:00 2001
From: nitin raj <nitin.raj@tarento.com>
Date: Thu, 29 Sep 2022 14:11:07 +0530
Subject: [PATCH 037/887] page loading issue on same tab reolved

---
 .../home/routes/users-view/users-view.component.html   | 10 ++++++----
 .../home/routes/users-view/users-view.component.ts     |  7 +++++++
 .../routes/workallocation/workallocation.component.ts  |  7 +++++++
 .../users/routes/view-user/view-user.component.html    |  1 -
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index cdaef6fe4..ea82c55b8 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -15,16 +15,18 @@
           <!-- <a href="javascript:void(0)" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'underreview',
               'ws-mat-accent-border font-medium':currentFilter !== 'underreview'}" mat-button
             (click)="filter('underreview')" role="button">Under review</a> -->
-          <a routerLink="/app/home/users/active" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'active',
+          <a routerLink="/app/home/users/active" routerLinkActive="router-link-active" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'active',
               'ws-mat-accent-border font-medium':currentFilter !== 'active'}" mat-button
             (click)="filter('active'); tabTelemetry('active', 0)" role="button">Active</a>
-          <a routerLink="/app/home/users/inactive" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'inactive',
+          <a routerLink="/app/home/users/inactive" routerLinkActive="router-link-active" class="filter-option"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'inactive',
                           'ws-mat-accent-border font-medium':currentFilter !== 'inactive'}" mat-button
             (click)="filter('inactive'); tabTelemetry('inactive', 1)" role="button">Inactive</a>
           <!-- <a href="javascript:void(0)" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'blocked',
                           'ws-mat-accent-border font-medium':currentFilter !== 'blocked'}" mat-button
             (click)="filter('blocked')" role="button">Blocked</a> -->
-          <a routerLink="/app/home/users/fileupload" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'upload',
+          <a routerLink="/app/home/users/fileupload" routerLinkActive="router-link-active" class="filter-option"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'upload',
                                       'ws-mat-accent-border font-medium':currentFilter !== 'upload'}" mat-button
             (click)="filter('upload'); tabTelemetry('upload', 2)" role="button">File uploads</a>
         </div>
@@ -44,4 +46,4 @@
       </ng-container>
     </mat-card-content>
   </mat-card>
-</div>
\ No newline at end of file
+</div>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 604a9a11f..da4c21837 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -89,7 +89,14 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     // }
   }
   ngOnInit() {
+    this.route.params.subscribe(params => {
+      this.currentFilter = params['tab']
+      if (this.currentFilter === null || this.currentFilter === undefined) {
+        this.currentFilter = 'active'
+      }
+    })
     this.getAllUsers()
+    this.filter(this.currentFilter)
   }
 
   filter(filter: string) {
diff --git a/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.ts b/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.ts
index 4bd715849..d4f11ff68 100644
--- a/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.ts
@@ -105,6 +105,12 @@ export class WorkallocationComponent implements OnInit, OnDestroy {
       this.currentFilter = 'Draft'
       this.filter("Draft")
     }
+    if (paramsMap === 'archived') {
+      this.currentUrl = "app/home/workallocation/archived"
+      this.currentFilter = 'Archived'
+      this.filter("Archived")
+
+    }
   }
 
   get getTableData() {
@@ -155,6 +161,7 @@ export class WorkallocationComponent implements OnInit, OnDestroy {
       pageSize: 1000,
       departmentName: this.departmentName,
       status: (statusKey !== '') ? statusKey : "Draft",
+
     }
     //if (this.currentFilter !== statusKey) {
     this.workallocationSrvc.getUsers(req).subscribe(res => {
diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
index 6c337abc7..666e28907 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
@@ -6,7 +6,6 @@
 
         <ws-widget-breadcrumbs-org [widgetData]="{url: 'home',titles: breadcrumbs}">
         </ws-widget-breadcrumbs-org>
-        {{ breadcrumbs |json }}
       </div>
       <div class="flex flex-4 flex-column">
         <div class="flex flex-1 custom">

From 6bb5219f5d0561d857a4d55cbfd3f15ee3528b4b Mon Sep 17 00:00:00 2001
From: nitin raj <nitin.raj@tarento.com>
Date: Thu, 29 Sep 2022 16:57:00 +0530
Subject: [PATCH 038/887] page reloading erro on user fixed

---
 .../routes/users-view/users-view.component.html  |  3 +--
 .../routes/users-view/users-view.component.ts    | 16 ++--------------
 .../workallocation/workallocation.component.ts   |  4 ++++
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index ea82c55b8..d8a9ed4d5 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -25,8 +25,7 @@
           <!-- <a href="javascript:void(0)" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'blocked',
                           'ws-mat-accent-border font-medium':currentFilter !== 'blocked'}" mat-button
             (click)="filter('blocked')" role="button">Blocked</a> -->
-          <a routerLink="/app/home/users/fileupload" routerLinkActive="router-link-active" class="filter-option"
-            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'upload',
+          <a routerLink="/app/home/users/upload" routerLinkActive="router-link-active" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'upload',
                                       'ws-mat-accent-border font-medium':currentFilter !== 'upload'}" mat-button
             (click)="filter('upload'); tabTelemetry('upload', 2)" role="button">File uploads</a>
         </div>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index da4c21837..8b52cb27c 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -89,24 +89,13 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     // }
   }
   ngOnInit() {
-    this.route.params.subscribe(params => {
-      this.currentFilter = params['tab']
-      if (this.currentFilter === null || this.currentFilter === undefined) {
-        this.currentFilter = 'active'
-      }
-    })
+    this.currentFilter = this.route.snapshot.params['tab'] || 'active'
     this.getAllUsers()
-    this.filter(this.currentFilter)
   }
 
   filter(filter: string) {
     this.currentFilter = filter
-    // this.events.raiseInteractTelemetry(
-    //   {
-    //     type: TelemetryEvents.EnumInteractTypes.CLICK,
-    //     subType: TelemetryEvents.EnumInteractSubTypes.TAB_CONTENT,
-    //   }, {}
-    // )
+
   }
 
   public tabTelemetry(label: string, index: number) {
@@ -121,7 +110,6 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   }
 
   get dataForTable() {
-
     switch (this.currentFilter) {
       case 'active':
         return this.activeUsersData
diff --git a/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.ts b/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.ts
index d4f11ff68..6ae97ce91 100644
--- a/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.ts
@@ -111,6 +111,10 @@ export class WorkallocationComponent implements OnInit, OnDestroy {
       this.filter("Archived")
 
     }
+
+
+
+
   }
 
   get getTableData() {

From eacfd59fd2321f21d1ee7012edce7d7bcca59b7d Mon Sep 17 00:00:00 2001
From: Afzal84 <110979654+Afzal84@users.noreply.github.com>
Date: Fri, 7 Oct 2022 17:05:34 +0530
Subject: [PATCH 039/887] Roles and count Issue for MDO portal (#170)

* Role count Issue fixing for MDO portal

* Role count Issue fixing for MDO portal
---
 .../access/routes/users/users.component.ts    |  3 +-
 .../roles-access/roles-access.component.html  | 10 ++++--
 .../roles-access/roles-access.component.scss  |  5 +++
 .../roles-access/roles-access.component.ts    | 33 +++++++++++++++++--
 .../routes/users/services/users.service.ts    | 21 +++++++++++-
 5 files changed, 65 insertions(+), 7 deletions(-)

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
index 3ab8947bc..27294d865 100644
--- 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
@@ -30,7 +30,8 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
     this.configSvc = _.get(this.route, 'snapshot.parent.data.configService') || {}
     // int left blank
     this.tabledata = {
-      actions: [{ name: 'Details', label: 'Details', icon: 'remove_red_eye', type: 'link' }],
+      // actions: [{ name: 'Details', label: 'Details', icon: 'remove_red_eye', type: 'link' }],
+      actions: [],
       columns: [
         { displayName: 'Full name', key: 'fullName' },
         { displayName: 'Email', key: 'email' },
diff --git a/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.html b/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.html
index 4f0d13064..1394f7e83 100644
--- a/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.html
@@ -10,10 +10,16 @@
       </div>
     </mat-card-header>
     <mat-card-content>
-      <ng-container>
-        <ws-widget-org-user-table [tableData]="tabledata" [data]="data" (eOnRowClick)="onRoleClick($event)">
+      <ng-container *ngIf="data?.length > 0">
+        <ws-widget-org-user-table [tableData]="tabledata" [data]="data" (eOnRowClick)="onRoleClick($event)"
+          (actionsClick)="actionsClick($event)">
         </ws-widget-org-user-table>
       </ng-container>
+      <ng-container *ngIf="!roleCountSpinner">
+        <div class="flex flex-1 loader-box">
+          <mat-spinner strokeWidth="3" diameter="50"></mat-spinner>
+        </div>
+      </ng-container>
     </mat-card-content>
   </mat-card>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.scss b/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.scss
index 4dcf02656..66537a495 100644
--- a/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.scss
@@ -1,3 +1,8 @@
 .mat-card-title{
   margin-left: -31px !important;
 }
+.loader-box{
+  position: absolute;
+    top: 40%;
+    left: 40%;
+}
diff --git a/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.ts b/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.ts
index fe108b86d..33d861c6a 100644
--- a/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.ts
@@ -1,20 +1,24 @@
 import { AfterViewInit, Component, OnInit, OnDestroy } from '@angular/core'
 import { Router, ActivatedRoute } from '@angular/router'
+import { ITableData } from '@sunbird-cb/collection/lib/ui-org-table/interface/interfaces'
 import { EventService } from '@sunbird-cb/utils'
 // tslint:disable-next-line
 import _ from 'lodash'
 import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
+import { UsersService } from '../../../users/services/users.service'
 @Component({
   selector: 'ws-app-roles-access',
   templateUrl: './roles-access.component.html',
   styleUrls: ['./roles-access.component.scss'],
 })
 export class RolesAccessComponent implements OnInit, AfterViewInit, OnDestroy {
-  tabledata: any = []
+  tabledata!: ITableData
   data: any = []
+  roleCountSpinner = true
 
   constructor(private router: Router,
               private activeRouter: ActivatedRoute,
+              private usersService: UsersService,
     // private telemetrySvc: TelemetryService,
               private events: EventService) { }
 
@@ -25,10 +29,13 @@ export class RolesAccessComponent implements OnInit, AfterViewInit, OnDestroy {
         { displayName: 'Role', key: 'role' },
         { displayName: 'Number of users', key: 'count' },
       ],
+      actions: [{ icon: 'refresh', label: 'Refresh', name: 'ViewCount', type: 'link', disabled: false }],
       needCheckBox: false,
       needHash: false,
       sortColumn: '',
       sortState: 'asc',
+      needUserMenus: false,
+      actionColumnName: 'Refresh',
     }
     this.fetchRolesNew()
   }
@@ -54,16 +61,36 @@ export class RolesAccessComponent implements OnInit, AfterViewInit, OnDestroy {
     )
 
   }
+  fetchIndidualRoleData(rootOrgId: string, rolename: string) {
+    this.usersService.getAllRoleUsers(rootOrgId, rolename).subscribe(data => {
+      this.roleCountSpinner = true
+      const individualCount = data.count
+      for (let i = 0; i < this.data.length; i += 1) {
+        if (this.data[i].role === rolename) {
+          this.data[i].count = individualCount
+        }
+      }
+    })
+  }
+  actionsClick(evt: any) {
+    if (evt.action === 'ViewCount') {
+      this.roleCountSpinner = false
+      const individualRole = evt.row.role
+      const rootOrgId = _.get(this.activeRouter.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
+      this.fetchIndidualRoleData(rootOrgId, individualRole)
+    }
+  }
 
   /* API call to get all roles*/
   fetchRolesNew() {
     let totalUsers: any[] = []
     const usrsList = _.get(this.activeRouter.snapshot, 'data.usersList.data.content') || []
-    totalUsers = _.map(_.groupBy(_.flatten(_.map(_.flatten(_.map(usrsList, 'organisations')), 'roles'))), (k, v) => {
+    totalUsers = _.map(_.groupBy(_.flatten(_.map(_.flatten(_.map(usrsList, 'organisations')), 'roles'))), (_k, v) => {
       return {
         role: (v || ''),
         // .replace(/[/_/]/g, ' '),
-        count: (k || []).length || 0,
+        // count: (k || []).length || 0,
+        count: 0,
       }
     })
     this.data = totalUsers
diff --git a/project/ws/app/src/lib/routes/users/services/users.service.ts b/project/ws/app/src/lib/routes/users/services/users.service.ts
index d721b280c..b392cc833 100644
--- a/project/ws/app/src/lib/routes/users/services/users.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/users.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core'
 import { HttpClient } from '@angular/common/http'
 import { Observable } from 'rxjs'
-import { map } from 'rxjs/operators'
+import { map, retry } from 'rxjs/operators'
 // tslint:disable
 import _ from 'lodash'
 // tslint:enable
@@ -118,6 +118,25 @@ export class UsersService {
     }
     return this.http.post<any>(`${API_END_POINTS.GET_ALL_USERS}`, reqBody)
   }
+  // getAllRoleUsers(depId: string, role: {}): Observable<any> {
+  getAllRoleUsers(depId: string, role: string): Observable<any> {
+    const reqBody = {
+      request: {
+        filters: {
+          rootOrgId: depId,
+          status: 1,
+          'organisations.roles':
+            [role],
+
+        },
+        limit: 1,
+      },
+    }
+    return this.http.post<any>(`${API_END_POINTS.GET_ALL_USERS}`, reqBody).pipe(
+      retry(1),
+      map(
+        (data: any) => ({ role, count: _.get(data, 'result.response.count') })))
+  }
 
   searchUserByenter(value: string, rootOrgId: string) {
     const reqBody = {

From 424e9442528deb79d6e83d095ead779f8d9da2bf Mon Sep 17 00:00:00 2001
From: Afzal84 <110979654+Afzal84@users.noreply.github.com>
Date: Mon, 10 Oct 2022 12:20:13 +0530
Subject: [PATCH 040/887] upgrade the version of ui-collection library (#171)

* Role count Issue fixing for MDO portal

* Role count Issue fixing for MDO portal

* upgrade the version of ui-collection library
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index a293725e3..55be25160 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@angular/router": "~8.2.1",
     "@angular/service-worker": "~8.2.1",
     "@project-sunbird/telemetry-sdk": "0.0.26",
-    "@sunbird-cb/collection": "^1.0.18",
+    "@sunbird-cb/collection": "^1.0.19",
     "@sunbird-cb/design-system": "0.0.1",
     "@sunbird-cb/rain-dashboards": "^0.2.8",
     "@sunbird-cb/resolver": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index a582f60f3..d7908f3c3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1127,10 +1127,10 @@
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
   integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
 
-"@sunbird-cb/collection@^1.0.18":
-  version "1.0.18"
-  resolved "https://registry.yarnpkg.com/@sunbird-cb/collection/-/collection-1.0.18.tgz#e97b688f80a9b0d0dfd217c899a7a1493f7d90a5"
-  integrity sha512-8dAqZmvAQ/kcc4Dv82r9421E+/GuGwgagPyvUuQSOzt6WS2Y0l/w7RHkoyDXu5blpnB9i/1NSqT3IKD/eTWSyw==
+"@sunbird-cb/collection@^1.0.19":
+  version "1.0.19"
+  resolved "https://registry.yarnpkg.com/@sunbird-cb/collection/-/collection-1.0.19.tgz#ee857cf41667d90ab40086130b90033176e8d928"
+  integrity sha512-uo1L6JzKyc1WAOae3UonpAwgRotAMUbTxoDrP60iXnbiC5eBgK6yOleiGJ6szW51YfYte/Pc5rTUGuQ9ew+MRQ==
   dependencies:
     tslib "^1.9.0"
 

From f5a6d0083deb81c2ac7f757131229bbc823f36cb Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Wed, 26 Oct 2022 15:16:43 +0530
Subject: [PATCH 041/887] workorder alignment fixes

---
 .../workallocation/workallocation.component.html    | 13 ++++++++-----
 .../workallocation/workallocation.component.scss    |  4 +++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.html b/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.html
index dc92527bb..019876c26 100644
--- a/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.html
@@ -1,15 +1,18 @@
 <div class="flex flex-4 flex-column">
-  <mat-card class="flex-custom">
-    <mat-card-header class="flex-custom-m">
+  <mat-card>
+    <!-- <mat-card-header class="flex-custom-m">
       <div class="flex-1" role="link" tabindex="0">
         <div class="flex flex-1">
           <mat-card-title class="flex-4 mobile-margin mat-h2">
             Work allocation tool
           </mat-card-title>
-          <!-- <span class="h-600-s-20-m mt-10 mb-10 color-87">Work allocation tool</span> -->
+           <span class="h-600-s-20-m mt-10 mb-10 color-87">Work allocation tool</span>
         </div>
       </div>
-    </mat-card-header>
+    </mat-card-header> -->
+    <mat-card-title class="flex-4 mobile-margin mat-h2">
+      Work allocation tool
+    </mat-card-title>
     <mat-card-content>
       <div class="flex flex-1">
         <div class="flex flex-1 filter max-height-60">
@@ -93,4 +96,4 @@
   <!-- <ws-app-download-allocation id="downloadtemp" [data]="data" [deptname]="departmentName"
     [currentFilter]="currentFilter"></ws-app-download-allocation> -->
   <!-- </div> -->
-</div>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.scss b/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.scss
index 2938a92f0..a75176a85 100644
--- a/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.scss
@@ -155,7 +155,9 @@ a:not([href]):not([tabindex]) {
 }
 
 .mat-card-title {
-  margin-left: -31px !important;
+  // margin-left: -31px !important;
+  position: relative;
+  font-size: 20px !important;
 }
 
 .allocation-table {

From 184ae30e291dc9f1f6b878f476aea4a8d10ff562 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Thu, 27 Oct 2022 15:12:07 +0530
Subject: [PATCH 042/887] tab alignment fixes

---
 .../events/routes/list/list-event.component.html      |  9 ++++++---
 .../events/routes/list/list-event.component.scss      |  3 ++-
 .../home/routes/approvals/approvals.component.html    |  9 ++++++---
 .../home/routes/approvals/approvals.component.scss    |  3 ++-
 .../routes/roles-access/roles-access.component.html   |  9 ++++++---
 .../routes/roles-access/roles-access.component.scss   |  3 ++-
 .../home/routes/users-view/users-view.component.html  | 11 +++++++----
 .../home/routes/users-view/users-view.component.scss  |  3 ++-
 8 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/project/ws/app/src/lib/routes/events/routes/list/list-event.component.html b/project/ws/app/src/lib/routes/events/routes/list/list-event.component.html
index 5f1410971..847e0e281 100644
--- a/project/ws/app/src/lib/routes/events/routes/list/list-event.component.html
+++ b/project/ws/app/src/lib/routes/events/routes/list/list-event.component.html
@@ -1,6 +1,6 @@
 <div class="flex flex-4 flex-column">
-  <mat-card class="flex-custom">
-    <mat-card-header class="flex-custom-m">
+  <mat-card>
+    <!-- <mat-card-header class="flex-custom-m">
       <div class="flex-1" role="link" tabindex="0">
         <div class="flex flex-1">
           <mat-card-title class="flex-4 mobile-margin text-capitalize">
@@ -8,7 +8,10 @@
           </mat-card-title>
         </div>
       </div>
-    </mat-card-header>
+    </mat-card-header> -->
+    <mat-card-title class="flex-4 mobile-margin text-capitalize">
+      <span class="h-600-s-20-m color-87">Events</span>
+    </mat-card-title>
     <mat-card-content>
       <div class="flex flex-1 flex-column margin-fix">
         <div class="flex flex-1 filter max-height-60">
diff --git a/project/ws/app/src/lib/routes/events/routes/list/list-event.component.scss b/project/ws/app/src/lib/routes/events/routes/list/list-event.component.scss
index b0cfa45d1..898c250ac 100644
--- a/project/ws/app/src/lib/routes/events/routes/list/list-event.component.scss
+++ b/project/ws/app/src/lib/routes/events/routes/list/list-event.component.scss
@@ -283,5 +283,6 @@ a:not([href]):not([tabindex]) {
 }
 
 .mat-card-title{
-  margin-left: -31px !important;
+  // margin-left: -31px !important;
+  font-size: 20px !important;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.html
index 9f2d72e4b..613e1cad4 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.html
@@ -1,6 +1,6 @@
 <div class="flex flex-4 flex-column">
-  <mat-card class="flex-custom">
-    <mat-card-header class="flex-custom-m">
+  <mat-card>
+    <!-- <mat-card-header class="flex-custom-m">
       <div class="flex-1" role="link" tabindex="0">
         <div class="flex flex-1">
           <mat-card-title class="flex-4 mobile-margin text-capitalize">
@@ -8,7 +8,10 @@
           </mat-card-title>
         </div>
       </div>
-    </mat-card-header>
+    </mat-card-header> -->
+    <mat-card-title class="flex-4 mobile-margin text-capitalize">
+      <span class="mat-subheading-1">Approvals</span>
+    </mat-card-title>
     <mat-card-content>
       <div class="flex flex-1 flex-column margin-fix">
         <div class="flex flex-1 filter max-height-60">
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.scss b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.scss
index 327837ae3..a31eb3d19 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.scss
@@ -286,6 +286,7 @@ a:not([href]):not([tabindex]) {
 }
 
 .mat-card-title{
-  margin-left: -31px !important;
+  // margin-left: -31px !important;
+  font-size: 20px !important;
 }
 
diff --git a/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.html b/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.html
index 1394f7e83..92e39b5f4 100644
--- a/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.html
@@ -1,6 +1,6 @@
 <div class="flex flex-4 flex-column">
-  <mat-card class="flex-custom">
-    <mat-card-header class="flex-custom-m">
+  <mat-card>
+    <!-- <mat-card-header class="flex-custom-m">
       <div class="flex-1" role="link" tabindex="1">
         <div class="flex flex-1">
           <mat-card-title class="flex-4 mobile-margin mat-h2">
@@ -8,7 +8,10 @@
           </mat-card-title>
         </div>
       </div>
-    </mat-card-header>
+    </mat-card-header> -->
+    <mat-card-title class="flex-4 mobile-margin mat-h2">
+      Roles and access
+    </mat-card-title>
     <mat-card-content>
       <ng-container *ngIf="data?.length > 0">
         <ws-widget-org-user-table [tableData]="tabledata" [data]="data" (eOnRowClick)="onRoleClick($event)"
diff --git a/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.scss b/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.scss
index 66537a495..f302d633b 100644
--- a/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.scss
@@ -1,5 +1,6 @@
 .mat-card-title{
-  margin-left: -31px !important;
+  // margin-left: -31px !important;
+  font-size: 20px !important;
 }
 .loader-box{
   position: absolute;
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index d8a9ed4d5..6d7584400 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -1,6 +1,6 @@
 <div class="flex flex-4 flex-column">
-  <mat-card class="flex-custom ws-mat-accent-border">
-    <mat-card-header class="flex-custom-m">
+  <mat-card class="ws-mat-accent-border">
+    <!-- <mat-card-header class="flex-custom-m">
       <div class="flex-1" role="link" tabindex="0">
         <div class="flex flex-1">
           <mat-card-title class="flex-4 mobile-margin text-capitalize">
@@ -8,7 +8,10 @@
           </mat-card-title>
         </div>
       </div>
-    </mat-card-header>
+    </mat-card-header> -->
+    <mat-card-title class="flex-4 mobile-margin text-capitalize">
+      <span class="h-600-s-20-m color-87">Users</span>
+    </mat-card-title>
     <mat-card-content>
       <div class="flex flex-1 flex-column margin-fix">
         <div class="flex flex-1 filter max-height-60">
@@ -45,4 +48,4 @@
       </ng-container>
     </mat-card-content>
   </mat-card>
-</div>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.scss b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.scss
index 877434832..c3981dc74 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.scss
@@ -283,7 +283,8 @@ a:not([href]):not([tabindex]) {
 }
 
 .mat-card-title{
-  margin-left: -31px !important;
+  // margin-left: -31px !important;
+  font-size: 20px !important;
 }
 
 ::ng-deep.mat-header-cell .mat-icon {

From 25e44816349baec32d6caeef6eadf2c1993317b2 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Wed, 30 Nov 2022 14:50:31 +0530
Subject: [PATCH 043/887] fixed departmant name while creating new user

---
 .../routes/events/routes/list/list-event.component.ts    | 9 +++++++--
 .../users/routes/create-user/create-user.component.ts    | 5 ++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/events/routes/list/list-event.component.ts b/project/ws/app/src/lib/routes/events/routes/list/list-event.component.ts
index a02fb98ab..719faddd4 100644
--- a/project/ws/app/src/lib/routes/events/routes/list/list-event.component.ts
+++ b/project/ws/app/src/lib/routes/events/routes/list/list-event.component.ts
@@ -28,7 +28,7 @@ export class ListEventComponent implements OnInit, AfterViewInit, OnDestroy {
     usersData!: any
     department: any
     departmentID: any
-
+    configService: any
     constructor(
         private router: Router,
         private eventSvc: EventsService,
@@ -37,6 +37,7 @@ export class ListEventComponent implements OnInit, AfterViewInit, OnDestroy {
         private events: EventService
     ) {
         this.math = Math
+        this.configService = this.activeRoute.snapshot.data.configService
         if (this.configSvc.userProfile) {
             this.currentUser = this.configSvc.userProfile && this.configSvc.userProfile.userId
             this.department = this.configSvc.userProfile && this.configSvc.userProfile.departmentName
@@ -47,10 +48,14 @@ export class ListEventComponent implements OnInit, AfterViewInit, OnDestroy {
             }
             if (_.get(this.activeRoute, 'snapshot.data.configService.userProfile.departmentName')) {
                 this.department = _.get(this.activeRoute, 'snapshot.data.configService.userProfile.departmentName')
+                _.set(this.department, 'snapshot.data.configService.userProfile.departmentName', this.department ? this.department : '')
             }
             if (_.get(this.activeRoute, 'snapshot.data.configService.userProfile.userId')) {
                 this.currentUser = _.get(this.activeRoute, 'snapshot.data.configService.userProfile.userId')
             }
+            if (this.configService.userProfile && this.configService.userProfile.departmentName) {
+                this.configService.userProfile.departmentName = this.department
+            }
         }
     }
 
@@ -121,7 +126,7 @@ export class ListEventComponent implements OnInit, AfterViewInit, OnDestroy {
                     const minutes = obj.duration % 60
                     const duration = (hours === 0) ? ((minutes === 0) ? '---' : `${minutes} minutes`) : (minutes === 0) ? (hours === 1) ?
                         `${hours} hour` : `${hours} hours` : (hours === 1) ? `${hours} hour ${minutes} minutes` :
-                            `${hours} hours ${minutes} minutes`
+                        `${hours} hours ${minutes} minutes`
                     const creatordata = obj.creatorDetails !== undefined ? obj.creatorDetails : []
                     const str = creatordata && creatordata.length > 0 ? creatordata.replace(/\\/g, '') : []
                     const creatorDetails = str && str.length > 0 ? JSON.parse(str) : creatordata
diff --git a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
index cbedf129a..089443d71 100644
--- a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
@@ -73,7 +73,10 @@ export class CreateUserComponent implements OnInit, OnDestroy {
           _.set(leftData, 'widgetData.userRoles', this.myRoles)
           this.widgetData = leftData
         } else {
-          this.widgetData = this.activeRoute.snapshot.data.pageData.data.menus
+          const leftData = this.activeRoute.snapshot.data.pageData.data.menus
+          const fullProfile = _.get(this.activeRoute.snapshot, 'data.configService')
+          _.set(leftData, 'widgetData.name', fullProfile ? fullProfile.unMappedUser.channel : '')
+          this.widgetData = leftData
         }
       }
     })

From bdd6c01d566ca8db1dfa3e8ad6c96d01597c5f75 Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <75484189+nitinraj-tarento@users.noreply.github.com>
Date: Thu, 1 Dec 2022 19:21:37 +0530
Subject: [PATCH 044/887] Update public-logout.component.html

---
 .../routes/public/public-logout/public-logout.component.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/routes/public/public-logout/public-logout.component.html b/src/app/routes/public/public-logout/public-logout.component.html
index 1c67d8a40..434870de0 100644
--- a/src/app/routes/public/public-logout/public-logout.component.html
+++ b/src/app/routes/public/public-logout/public-logout.component.html
@@ -36,7 +36,7 @@
   <div class=" right_container flex flex-col items-center justify-center">
     <div class="right_inner_container">
       <div class="right_logo_box right_logo_box flex items-center justify-center">
-        <img src="/assets/instances/eagle/app_logos/iGOT_Karmayogi_logo_with_karmayogi_bharat.png" alt="logo">
+      <img src="/assets/instances/eagle/app_logos/eagle-logo-transparent.svg" alt="logo" class="logout_logo">
       </div>
       <div class="text_box flex items-center justify-center">
         <h2 class="mat-h2">Welcome to MDO Portal!</h2>

From bff940fffa014f8b85a9633aa0c02312e947f2f8 Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <75484189+nitinraj-tarento@users.noreply.github.com>
Date: Thu, 1 Dec 2022 19:22:13 +0530
Subject: [PATCH 045/887] Update public-logout.component.scss

---
 .../routes/public/public-logout/public-logout.component.scss  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/app/routes/public/public-logout/public-logout.component.scss b/src/app/routes/public/public-logout/public-logout.component.scss
index 73ea6b56d..b4433a537 100644
--- a/src/app/routes/public/public-logout/public-logout.component.scss
+++ b/src/app/routes/public/public-logout/public-logout.component.scss
@@ -40,6 +40,10 @@
       }
     }
 
+.logout_logo {
+width:300px;
+}
+
     .slider_box {
       padding: 5rem 0 2rem 0;
       width: 320px;

From 77cce050517b6cc74991345e727fba3cae1ff11f Mon Sep 17 00:00:00 2001
From: ajithkumar1995 <ajith.gajendheran@tarento.com>
Date: Thu, 8 Dec 2022 15:28:57 +0530
Subject: [PATCH 046/887] favicon mdo

---
 angular.json    |   5 ++---
 src/favicon.png | Bin 829 -> 6062 bytes
 src/index.html  |  10 ++++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/angular.json b/angular.json
index 4037c51b9..a05870731 100644
--- a/angular.json
+++ b/angular.json
@@ -18,8 +18,7 @@
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
             "assets": [
-              "src/favicon.ico",
-              "src/favicon.png",
+              "favicon.png",
               "src/mdo-assets"
             ],
             "stylePreprocessorOptions": {
@@ -253,7 +252,7 @@
             "tsConfig": "tsconfig.spec.json",
             "karmaConfig": "karma.conf.js",
             "assets": [
-              "src/favicon.ico",
+              "favicon.png",
               "src/mdo-assets"
             ],
             "styles": [
diff --git a/src/favicon.png b/src/favicon.png
index fb6983cbd23ee0109755f8dd55e004a78b5de478..6dd7061240a4acce62fb4326f00d85a778a52bec 100644
GIT binary patch
literal 6062
zcmb_gSx}qT8C9o!=}RY%dF)fCNz-Yk4}EQCx;%7wNgmQIZ8B{pnM~73;*Q<4aa<>{
zF}73N*v4iFATax4KpP-dNoYX}J4i@E3j!gufY836)9+p*kYuTjJN{;_^xyBE@7(pj
z_xx8N_=@1Gg6EzS(Em3DZ+}f7_@O``c>eiE`72)+2%5-OnE%!{1cGl9hC(Rf5sv-@
z0>YIVfY&JPQ_4MM3KhiC<Eib3f@r9@f#rGQsk8hO<0!IhCWBj5pW&6C{s?okN+c3-
z$c7$bu)7l;x2p(C8P?_^v#hNmLmZ5UJ$DJ45RFDSMm*40gr&@5@%D`kXcRNN&Y4*~
zR;?~<tgmt3qS5fg_&i`Ia)h@!%=l}!1>WdU-d+0tSp5tTP99;%634Z7-$C`?-o>aj
z#(ky1ls}12XLAr6T(~D)!c~bGXGLzz+^@#e-AlM2+d{Q?9ktR$!Z?vWItj}qGdYYe
zxX>#%Vq$3<y6rSX)+EkM93tqn!EZO?U(*rp)9s`Q<3W#H&tsC=T+SaqLZ`xtOMNDE
ztRzsQkKwK%h7ZOMahN(nirU4vYK<{o)=rp9eMWRBHV}wEYDlfZgSyT!v?}a)uoOd`
zDGo8U!5Ye7>oCjfX1+EmYg5{BuR{hFlkY!c2`6)Clj-3I#L>E(z|vM2s;v|Z-ZU2J
zS-2dBGe~7p9m1&`j)&l6AZA?&R5g#{)1h@ZtyZ)SDG?zYORd97I4l-?HoT6@O){w6
ziTqTY#Ix~dCexU4?|}ragLEDP*M1tcZ6e6DX70;lDZ_#ePJr~F-b(Vm6#Cfn0rgKq
zWhKVm+ds16691RUve?&3_k*X+vweoPBEk15vHgh~?MbCZb-hUG0i`G<*6(ML*o)0L
zU!c@Zsp5-9Wk{#fh(;pF<yh5U+8AfP-DQK0j*hTk(BtCS5Ag2me}H|%QWp0=oR2oB
z3V^-cUA+J18~Di&zKh@f;%Bg|u5hH^w~Ixip7u!<%qz=CCQjC6DO1G`M-IbqI~)-A
z_d-}#3#)k@sZ<JDl>(j3jTq|bf?Og(Yr}nBS1Ivvz9RpY)5$sWaglHsl7U|Iw6*YY
zVspZ5ZD|qXQZdq0cNwe5@AY_~o|%HvZsT+Cu&W)DlL{;>ufs-tSuz<p_vr8-Ru>n_
zP;*yB{%kf2yTuIk^b}N+6R^2<Xn#te-V~$#Er(b%iuIKxxSg9|*a}vWzYrg!*Zan(
z6|daU;nn*F+#Xp&pyHGkMxLGnMc(5KtDLrZ%=>|h)%E!B++}?D(REy@zK4}Sj+Z^5
zfn|$X|5dhqh_zM>sI91-c0)L*#N9VuM$PLlqibjy4N5naZ4hPyvxH^)X&EbW9wxI;
zS%YX48_+sp!i@<xYNoewQSQaV<pW61zYWnp--K)}gsMp|ZcTgep9vR)BL*~x=ct|_
z7)OEeH$D{0VA0`6`_wx6q_Y^A--6g2h2EP*uQ`Pa$|wdbN!Vwkuucv`YD?m?*%&V~
z5JqH<V8rA`uS7{4Yn&?-&(MB?92<+4xjnppa|ol7G0a%^G383bzMsXgHHDU?1kTWz
z*tM2GHW5WO9>L&75@#nPyi7zGhGj7`)(}QSGQ4+l04@4G9Hw)*6m@5l7KohA=nMTT
zs2bZs_j(G~bx~ZJjpCL*jw*GOxZ=p4FRU)+yEPZXW%_4W7IS&bjgR}6I2YrjW15eD
zh|ZY0X(z6=j6k#Oz`!ES!F-gT-Hi)zI#1K+Tutz^D3;FQA&nLDv9h~#zBia?{FZ`H
zFKwc_S%SJ5C-#YxjQ_a8Sv*j?&^@(+&gnIrX;ffvd7qDoX*a{q{8l=rnO-7ofNp9(
z(;}>_Yc)yO5Z-T`rr1^DSSBtfTw%WD7p))W(bz%|k0{{q_|c#X@^)LjhY&4z;W#*g
zhxD0zWfvQ}5p+<W8gv1|?qOIu35`8edXN<H@5O-6dv$2(kl<>c9##D&?0EN}($1q-
zX+eVKilsi41+%&ZY<qpU+-JbGem$BxM7Z9o!Ct&zbsmpT-s3vR;DOGI>5T(uoDmF+
z>!FfQph;?kH*&hJcSsvCpK5#@{c;^)qnM%?7V8RU@^tLKsQrb<--^SBb2oZXFE+wm
zpjq<4%vUGU<J`?|Fl^omIga^hR30~@Cjp^8h+zD*-K8j2)}jx<xLt9xW169ZQqlR&
zI+Y<ISJb&u^5Z;fFT<8G#>un;(<iKsvi%_c|6`1calcTihn{u*DRkI(s6DKoOmnaS
zc^2uAcvwI4+(nCz{6)reO8DRaOgBA+F-}$oTMK24@foyguEXB@%j-qDqin$APS%f#
zw&(NV%v*oPkH7aKe)r3tV|{svV}k)duXkELij{?Vt}`o;lwE)f8{Xe14dH;OuLtd4
zG{CiKM=F_wL8Ip1($c|x{>*d}>thA0$ZsVL<J<L~gfSh)G+%dXGhB|%6HV;2+aVW=
zPVy%Kj~*)Wdt6Rvl?vFc7U<Qp81CuBn0yMWW*gkp7dBR=IW5<C%k!oZ+LLTWem1u*
zhn;_i&l8Ws<0BnL--^Zv0+AG=q+`9?9{9Xo{_TIlSo~0tzYyl5xAwZsir>`E;rI1M
z+>p`O#lBSN6G3dnD?M4<yxoF-e0T-t&fmbDnlGT;$rf*Jg$+7=evF?v4(PC1bRVEk
zzm2*HD?XL)U{qnky+8dLcVGJzW>f}LP3++Q#0FtJ^gVn)F~^7gDK~p6;*XN1nKB0;
zlp4?|Tfl9(4ML3vACGt-TMa^T;T?!RdJ8j_06rPphEVN6jogYxsfl9dcr4>6FrEpM
zHZyJp&^5V&z7Y+i1_wrLacH+Q{Jj6SDoWZS1+)Ai)?|Gc-Ar*E#x#<4C&RH)y&b)z
z;W{UmITzz(?GGk$xTV;^r+0dwnl)g|atOIIja7e^>j|bWE|Sh`B0ZKN4VH-=qGvsc
zPpD3IZ_vG##9AQBW5z6DC{=U#<aQ@&6kdc9xm<=O&`IC((nT-Mx9f0qVw-ea3ODKA
zqhUUdYE2YZDBYv`3WjASBu#dO^jEcpFbfIXBt6Drs>eO}s6z`0aWPK9^YLMtscC8h
zH7&z1F07-=u#1|xDC&v7nYa{gx=%315hV>qcQ9yKOkjq5&5Lo4Vc2epF)pm(R`Vd|
zD%4?a(oA1yeQ2Drqh8^{nbtYT*8^x>Nn&X)0}1KgJH#KPHNx&ynuuR)OYyQ+y1$XH
z`SF2J%VQg-Y-rN%(mf6D>|>K{aO^`O*J69ehpRJw^qG^e`AG9BU0`=){&)@@8aMf(
z=%abKMwsoLU5LhJVRW)9iXtoG571m+?wLbF#|Z8Wn{ZaB#$I3_YK;l)bSK4@1Zi8e
zE3MG#=CS7w;qT2V!WvQEA*EOy^|6SuC}Rs{(Wdu9zZt@uI|^a{1k{t$s23UFi=G~F
zzDNdjVm;JT(`fD;gPyP~hQ%^XUtmT2g&C70i1VMfp<XhNtx7sfVkC?Z44bz?4)U>V
z+4FI3D}i={|A{*6fng7N(rgusosXTAPCI`LOw%|YUx8H!edJ~shAm_H^Zg|%V|6@B
P9hTRRFFkABRm%5Yo`pc9

literal 829
zcmV-D1H$}?P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px%_en%SR5%fBQ%y)zQ4~Js-1lZipNWMP{YXEg<XAdm5wt6-O{*Y?+C-abYeGo5
zd8K1nSy7uPXp?P%EUJwW)F#?gqow@{QHVJRHaX)Po%ilNop}V6bl>K2?svZPednBu
z@So##ZKz?4v;*Q^W;Vdk2UxsV(J`Ev52yJ7zOpXLXdgm=BpP#u5PK0ZsW`He?|_<*
zx8?^R7pnrmt;~44Ja~N_#y6q2!o2r|AvUp2@T2<goRENzfDOwVqSFA80^6-XP_4B|
zqYFX)ba5k4B&7(J7IKxBXHxZj+SmR9_>?W(<7_IiOC$9F^CJeVMWp@WJ1f3houOBK
zUSskQ5M2k9k8zFxJh3Mt&1Y>)8);DI1e^x;9|$G}!X%Bc5V-;xN=d<>z+WK4M`MCs
zF#Z8Vb66O@5z<*pAl1Tl%{ejr(mS2Fz>22ia#9)dxFqrEwzor@Tbhn4QVS}yKaB23
zz9b-@O5_l&o0#uz&e&j%Mo$jj7kN18HaLqbe`;tOn-!@N`g5k;x@xqXc!dhy&ak~l
z6n9!+V8BP!Sx6<y^94#PznF&)OD7P<{!Q*~s#9S13*CCpkl5unvLd(03FcanO}|0v
zrZOCgl}De=tm2kGb$|b9RVR9ui6|1=tBLiK@0pxS;%N#4eFK2r%Y`%#1%%D)$}s;r
z7V0#hz9*CTA=W+wL?3Ifj?RU9@NWD~roN`Rp9!}}g)szw07d}4RMS4gv`3ikehG>X
z<7L4y&v!C1?zmvW0wF>D%0xoyMI3*&7Tl4nR4_AL$<6W>E|nB9L&Iu2_66Htz0P$d
z2PAVlv05bpGa-viev!yN=vk4qrR40HjSCrJhsdoAT}Zj24#K8dC|e6ifoyH*PVfNP
z&c-!1*_UJkqk#NG!f`@qG#Z|g0+x;YDr!`?XpFlF%{cpT+;P+6Awj8ObE>h{D62yr
zQH#)yNY;60YVtYM02I6>P12uJGKIL*dsOswPnA3PRg(D^O;Jkf@b<G|00000NkvXX
Hu0mjf7-@Xh

diff --git a/src/index.html b/src/index.html
index 922f413cc..de828ef42 100644
--- a/src/index.html
+++ b/src/index.html
@@ -14,7 +14,9 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <!-- <link id="id-app-fav-icon" rel="icon" type="image/png" /> -->
   <link id="id-app-x-icon" rel="icon" type="x-icon" />
-  <link id="id-app-fav-icon" rel="icon" type="image/png" href="favicon.png" />
+  <link id="id-app-fav-icon" rel="icon" type="image/x-icon" href="favicon.png" />
+  <!-- <link rel="icon" type="image/x-icon" href="assets/favicon.ico"> -->
+  <!-- <link id="id-app-fav-icon" rel="icon" type="image/png" href="favicon.png" /> -->
   <link id="id-app-webmanifest" rel="manifest" />
   <meta id="id-app-theme-color" name="theme-color" content="#000" />
   <link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Open+Sans" />
@@ -79,13 +81,13 @@
   <noscript>Please enable JavaScript to continue using this application.</noscript>
 </body>
 <script>
-  var MATCHING_IE = navigator.userAgent.match(/(msie|trident(?=\/))\/?\s*(\d+)/i) || [];
+  var MATCHING_IE = navigator.userAgent.match(/(msie|trident(?=\/))\/?\s*(\d+)/i) || []
   if (/trident/i.test(MATCHING_IE[1])) {
     // tslint:disable-next-line: max-line-length
     document.body.innerHTML =
-      '<h1 style="margin-top: 50px; text-align: center">IE 11 and lesser version browsers are not supported.</h1><h3 style="margin-top: 16px; text-align: center">For best experience, use Google Chrome</h3>';
+      '<h1 style="margin-top: 50px; text-align: center">IE 11 and lesser version browsers are not supported.</h1><h3 style="margin-top: 16px; text-align: center">For best experience, use Google Chrome</h3>'
   }
 
 </script>
 
-</html>
+</html>
\ No newline at end of file

From 718e60e2dcc56a6b157c5daeba8424ababdb58e8 Mon Sep 17 00:00:00 2001
From: Ajithkumar1995 <107622611+Ajithkumar1995@users.noreply.github.com>
Date: Thu, 8 Dec 2022 17:06:12 +0530
Subject: [PATCH 047/887] favicon mdo (#175)

---
 angular.json    |   5 ++---
 src/favicon.png | Bin 829 -> 6062 bytes
 src/index.html  |  10 ++++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/angular.json b/angular.json
index 4037c51b9..a05870731 100644
--- a/angular.json
+++ b/angular.json
@@ -18,8 +18,7 @@
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
             "assets": [
-              "src/favicon.ico",
-              "src/favicon.png",
+              "favicon.png",
               "src/mdo-assets"
             ],
             "stylePreprocessorOptions": {
@@ -253,7 +252,7 @@
             "tsConfig": "tsconfig.spec.json",
             "karmaConfig": "karma.conf.js",
             "assets": [
-              "src/favicon.ico",
+              "favicon.png",
               "src/mdo-assets"
             ],
             "styles": [
diff --git a/src/favicon.png b/src/favicon.png
index fb6983cbd23ee0109755f8dd55e004a78b5de478..6dd7061240a4acce62fb4326f00d85a778a52bec 100644
GIT binary patch
literal 6062
zcmb_gSx}qT8C9o!=}RY%dF)fCNz-Yk4}EQCx;%7wNgmQIZ8B{pnM~73;*Q<4aa<>{
zF}73N*v4iFATax4KpP-dNoYX}J4i@E3j!gufY836)9+p*kYuTjJN{;_^xyBE@7(pj
z_xx8N_=@1Gg6EzS(Em3DZ+}f7_@O``c>eiE`72)+2%5-OnE%!{1cGl9hC(Rf5sv-@
z0>YIVfY&JPQ_4MM3KhiC<Eib3f@r9@f#rGQsk8hO<0!IhCWBj5pW&6C{s?okN+c3-
z$c7$bu)7l;x2p(C8P?_^v#hNmLmZ5UJ$DJ45RFDSMm*40gr&@5@%D`kXcRNN&Y4*~
zR;?~<tgmt3qS5fg_&i`Ia)h@!%=l}!1>WdU-d+0tSp5tTP99;%634Z7-$C`?-o>aj
z#(ky1ls}12XLAr6T(~D)!c~bGXGLzz+^@#e-AlM2+d{Q?9ktR$!Z?vWItj}qGdYYe
zxX>#%Vq$3<y6rSX)+EkM93tqn!EZO?U(*rp)9s`Q<3W#H&tsC=T+SaqLZ`xtOMNDE
ztRzsQkKwK%h7ZOMahN(nirU4vYK<{o)=rp9eMWRBHV}wEYDlfZgSyT!v?}a)uoOd`
zDGo8U!5Ye7>oCjfX1+EmYg5{BuR{hFlkY!c2`6)Clj-3I#L>E(z|vM2s;v|Z-ZU2J
zS-2dBGe~7p9m1&`j)&l6AZA?&R5g#{)1h@ZtyZ)SDG?zYORd97I4l-?HoT6@O){w6
ziTqTY#Ix~dCexU4?|}ragLEDP*M1tcZ6e6DX70;lDZ_#ePJr~F-b(Vm6#Cfn0rgKq
zWhKVm+ds16691RUve?&3_k*X+vweoPBEk15vHgh~?MbCZb-hUG0i`G<*6(ML*o)0L
zU!c@Zsp5-9Wk{#fh(;pF<yh5U+8AfP-DQK0j*hTk(BtCS5Ag2me}H|%QWp0=oR2oB
z3V^-cUA+J18~Di&zKh@f;%Bg|u5hH^w~Ixip7u!<%qz=CCQjC6DO1G`M-IbqI~)-A
z_d-}#3#)k@sZ<JDl>(j3jTq|bf?Og(Yr}nBS1Ivvz9RpY)5$sWaglHsl7U|Iw6*YY
zVspZ5ZD|qXQZdq0cNwe5@AY_~o|%HvZsT+Cu&W)DlL{;>ufs-tSuz<p_vr8-Ru>n_
zP;*yB{%kf2yTuIk^b}N+6R^2<Xn#te-V~$#Er(b%iuIKxxSg9|*a}vWzYrg!*Zan(
z6|daU;nn*F+#Xp&pyHGkMxLGnMc(5KtDLrZ%=>|h)%E!B++}?D(REy@zK4}Sj+Z^5
zfn|$X|5dhqh_zM>sI91-c0)L*#N9VuM$PLlqibjy4N5naZ4hPyvxH^)X&EbW9wxI;
zS%YX48_+sp!i@<xYNoewQSQaV<pW61zYWnp--K)}gsMp|ZcTgep9vR)BL*~x=ct|_
z7)OEeH$D{0VA0`6`_wx6q_Y^A--6g2h2EP*uQ`Pa$|wdbN!Vwkuucv`YD?m?*%&V~
z5JqH<V8rA`uS7{4Yn&?-&(MB?92<+4xjnppa|ol7G0a%^G383bzMsXgHHDU?1kTWz
z*tM2GHW5WO9>L&75@#nPyi7zGhGj7`)(}QSGQ4+l04@4G9Hw)*6m@5l7KohA=nMTT
zs2bZs_j(G~bx~ZJjpCL*jw*GOxZ=p4FRU)+yEPZXW%_4W7IS&bjgR}6I2YrjW15eD
zh|ZY0X(z6=j6k#Oz`!ES!F-gT-Hi)zI#1K+Tutz^D3;FQA&nLDv9h~#zBia?{FZ`H
zFKwc_S%SJ5C-#YxjQ_a8Sv*j?&^@(+&gnIrX;ffvd7qDoX*a{q{8l=rnO-7ofNp9(
z(;}>_Yc)yO5Z-T`rr1^DSSBtfTw%WD7p))W(bz%|k0{{q_|c#X@^)LjhY&4z;W#*g
zhxD0zWfvQ}5p+<W8gv1|?qOIu35`8edXN<H@5O-6dv$2(kl<>c9##D&?0EN}($1q-
zX+eVKilsi41+%&ZY<qpU+-JbGem$BxM7Z9o!Ct&zbsmpT-s3vR;DOGI>5T(uoDmF+
z>!FfQph;?kH*&hJcSsvCpK5#@{c;^)qnM%?7V8RU@^tLKsQrb<--^SBb2oZXFE+wm
zpjq<4%vUGU<J`?|Fl^omIga^hR30~@Cjp^8h+zD*-K8j2)}jx<xLt9xW169ZQqlR&
zI+Y<ISJb&u^5Z;fFT<8G#>un;(<iKsvi%_c|6`1calcTihn{u*DRkI(s6DKoOmnaS
zc^2uAcvwI4+(nCz{6)reO8DRaOgBA+F-}$oTMK24@foyguEXB@%j-qDqin$APS%f#
zw&(NV%v*oPkH7aKe)r3tV|{svV}k)duXkELij{?Vt}`o;lwE)f8{Xe14dH;OuLtd4
zG{CiKM=F_wL8Ip1($c|x{>*d}>thA0$ZsVL<J<L~gfSh)G+%dXGhB|%6HV;2+aVW=
zPVy%Kj~*)Wdt6Rvl?vFc7U<Qp81CuBn0yMWW*gkp7dBR=IW5<C%k!oZ+LLTWem1u*
zhn;_i&l8Ws<0BnL--^Zv0+AG=q+`9?9{9Xo{_TIlSo~0tzYyl5xAwZsir>`E;rI1M
z+>p`O#lBSN6G3dnD?M4<yxoF-e0T-t&fmbDnlGT;$rf*Jg$+7=evF?v4(PC1bRVEk
zzm2*HD?XL)U{qnky+8dLcVGJzW>f}LP3++Q#0FtJ^gVn)F~^7gDK~p6;*XN1nKB0;
zlp4?|Tfl9(4ML3vACGt-TMa^T;T?!RdJ8j_06rPphEVN6jogYxsfl9dcr4>6FrEpM
zHZyJp&^5V&z7Y+i1_wrLacH+Q{Jj6SDoWZS1+)Ai)?|Gc-Ar*E#x#<4C&RH)y&b)z
z;W{UmITzz(?GGk$xTV;^r+0dwnl)g|atOIIja7e^>j|bWE|Sh`B0ZKN4VH-=qGvsc
zPpD3IZ_vG##9AQBW5z6DC{=U#<aQ@&6kdc9xm<=O&`IC((nT-Mx9f0qVw-ea3ODKA
zqhUUdYE2YZDBYv`3WjASBu#dO^jEcpFbfIXBt6Drs>eO}s6z`0aWPK9^YLMtscC8h
zH7&z1F07-=u#1|xDC&v7nYa{gx=%315hV>qcQ9yKOkjq5&5Lo4Vc2epF)pm(R`Vd|
zD%4?a(oA1yeQ2Drqh8^{nbtYT*8^x>Nn&X)0}1KgJH#KPHNx&ynuuR)OYyQ+y1$XH
z`SF2J%VQg-Y-rN%(mf6D>|>K{aO^`O*J69ehpRJw^qG^e`AG9BU0`=){&)@@8aMf(
z=%abKMwsoLU5LhJVRW)9iXtoG571m+?wLbF#|Z8Wn{ZaB#$I3_YK;l)bSK4@1Zi8e
zE3MG#=CS7w;qT2V!WvQEA*EOy^|6SuC}Rs{(Wdu9zZt@uI|^a{1k{t$s23UFi=G~F
zzDNdjVm;JT(`fD;gPyP~hQ%^XUtmT2g&C70i1VMfp<XhNtx7sfVkC?Z44bz?4)U>V
z+4FI3D}i={|A{*6fng7N(rgusosXTAPCI`LOw%|YUx8H!edJ~shAm_H^Zg|%V|6@B
P9hTRRFFkABRm%5Yo`pc9

literal 829
zcmV-D1H$}?P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px%_en%SR5%fBQ%y)zQ4~Js-1lZipNWMP{YXEg<XAdm5wt6-O{*Y?+C-abYeGo5
zd8K1nSy7uPXp?P%EUJwW)F#?gqow@{QHVJRHaX)Po%ilNop}V6bl>K2?svZPednBu
z@So##ZKz?4v;*Q^W;Vdk2UxsV(J`Ev52yJ7zOpXLXdgm=BpP#u5PK0ZsW`He?|_<*
zx8?^R7pnrmt;~44Ja~N_#y6q2!o2r|AvUp2@T2<goRENzfDOwVqSFA80^6-XP_4B|
zqYFX)ba5k4B&7(J7IKxBXHxZj+SmR9_>?W(<7_IiOC$9F^CJeVMWp@WJ1f3houOBK
zUSskQ5M2k9k8zFxJh3Mt&1Y>)8);DI1e^x;9|$G}!X%Bc5V-;xN=d<>z+WK4M`MCs
zF#Z8Vb66O@5z<*pAl1Tl%{ejr(mS2Fz>22ia#9)dxFqrEwzor@Tbhn4QVS}yKaB23
zz9b-@O5_l&o0#uz&e&j%Mo$jj7kN18HaLqbe`;tOn-!@N`g5k;x@xqXc!dhy&ak~l
z6n9!+V8BP!Sx6<y^94#PznF&)OD7P<{!Q*~s#9S13*CCpkl5unvLd(03FcanO}|0v
zrZOCgl}De=tm2kGb$|b9RVR9ui6|1=tBLiK@0pxS;%N#4eFK2r%Y`%#1%%D)$}s;r
z7V0#hz9*CTA=W+wL?3Ifj?RU9@NWD~roN`Rp9!}}g)szw07d}4RMS4gv`3ikehG>X
z<7L4y&v!C1?zmvW0wF>D%0xoyMI3*&7Tl4nR4_AL$<6W>E|nB9L&Iu2_66Htz0P$d
z2PAVlv05bpGa-viev!yN=vk4qrR40HjSCrJhsdoAT}Zj24#K8dC|e6ifoyH*PVfNP
z&c-!1*_UJkqk#NG!f`@qG#Z|g0+x;YDr!`?XpFlF%{cpT+;P+6Awj8ObE>h{D62yr
zQH#)yNY;60YVtYM02I6>P12uJGKIL*dsOswPnA3PRg(D^O;Jkf@b<G|00000NkvXX
Hu0mjf7-@Xh

diff --git a/src/index.html b/src/index.html
index 922f413cc..de828ef42 100644
--- a/src/index.html
+++ b/src/index.html
@@ -14,7 +14,9 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <!-- <link id="id-app-fav-icon" rel="icon" type="image/png" /> -->
   <link id="id-app-x-icon" rel="icon" type="x-icon" />
-  <link id="id-app-fav-icon" rel="icon" type="image/png" href="favicon.png" />
+  <link id="id-app-fav-icon" rel="icon" type="image/x-icon" href="favicon.png" />
+  <!-- <link rel="icon" type="image/x-icon" href="assets/favicon.ico"> -->
+  <!-- <link id="id-app-fav-icon" rel="icon" type="image/png" href="favicon.png" /> -->
   <link id="id-app-webmanifest" rel="manifest" />
   <meta id="id-app-theme-color" name="theme-color" content="#000" />
   <link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Open+Sans" />
@@ -79,13 +81,13 @@
   <noscript>Please enable JavaScript to continue using this application.</noscript>
 </body>
 <script>
-  var MATCHING_IE = navigator.userAgent.match(/(msie|trident(?=\/))\/?\s*(\d+)/i) || [];
+  var MATCHING_IE = navigator.userAgent.match(/(msie|trident(?=\/))\/?\s*(\d+)/i) || []
   if (/trident/i.test(MATCHING_IE[1])) {
     // tslint:disable-next-line: max-line-length
     document.body.innerHTML =
-      '<h1 style="margin-top: 50px; text-align: center">IE 11 and lesser version browsers are not supported.</h1><h3 style="margin-top: 16px; text-align: center">For best experience, use Google Chrome</h3>';
+      '<h1 style="margin-top: 50px; text-align: center">IE 11 and lesser version browsers are not supported.</h1><h3 style="margin-top: 16px; text-align: center">For best experience, use Google Chrome</h3>'
   }
 
 </script>
 
-</html>
+</html>
\ No newline at end of file

From 4cf9437dab2fff1d35d27681161528d9d3ae28b9 Mon Sep 17 00:00:00 2001
From: ajithkumar1995 <ajith.gajendheran@tarento.com>
Date: Mon, 12 Dec 2022 11:32:52 +0530
Subject: [PATCH 048/887] mdo favicon build fix

---
 angular.json | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/angular.json b/angular.json
index a05870731..b411a5367 100644
--- a/angular.json
+++ b/angular.json
@@ -18,8 +18,7 @@
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
             "assets": [
-              "favicon.png",
-              "src/mdo-assets"
+              "src/favicon.png"
             ],
             "stylePreprocessorOptions": {
               "includePaths": [
@@ -252,8 +251,7 @@
             "tsConfig": "tsconfig.spec.json",
             "karmaConfig": "karma.conf.js",
             "assets": [
-              "favicon.png",
-              "src/mdo-assets"
+              "src/favicon.png"
             ],
             "styles": [
               "src/styles.scss"

From 5bb29826677e9e8ade9a75404e9400b633e32cda Mon Sep 17 00:00:00 2001
From: Christopher B Fernandes <Christyabcd.05@gmail.com>
Date: Thu, 22 Dec 2022 15:04:53 +0530
Subject: [PATCH 049/887] Updated the rain ui library version

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 55be25160..4616ab749 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "@project-sunbird/telemetry-sdk": "0.0.26",
     "@sunbird-cb/collection": "^1.0.19",
     "@sunbird-cb/design-system": "0.0.1",
-    "@sunbird-cb/rain-dashboards": "^0.2.8",
+    "@sunbird-cb/rain-dashboards": "^0.3.8",
     "@sunbird-cb/resolver": "^1.0.0",
     "@sunbird-cb/utils": "^1.0.12",
     "@types/file-saver": "^2.0.1",
@@ -136,4 +136,4 @@
     "typescript-tslint-plugin": "^0.5.4",
     "webpack-bundle-analyzer": "^4.4.0"
   }
-}
\ No newline at end of file
+}

From 7131e19b396fece46e9f5824c0ed3303a419ece9 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Mon, 16 Jan 2023 12:29:59 +0530
Subject: [PATCH 050/887] download User

---
 .../users-view/users-view.component.html      |  2 +-
 .../routes/users-view/users-view.component.ts | 53 +++++++++++++++++++
 .../routes/users/services/users.service.ts    |  4 ++
 src/environments/environment.bm.ts            |  3 +-
 src/environments/environment.dev.ts           |  2 +
 src/environments/environment.np.ts            |  2 +
 src/environments/environment.preprod.ts       |  3 +-
 src/environments/environment.prod.ts          |  2 +
 src/environments/environment.ts               |  4 ++
 9 files changed, 72 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index 6d7584400..20787aeeb 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -35,7 +35,7 @@
       </div>
       <ng-container *ngIf="usersData && currentFilter !== 'upload'">
         <ws-widget-org-user-table [tableData]="tabledata" [data]="dataForTable" [isUpload]=true [isCreate]=true
-          (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuActions($event)"
+          [isDownload]=true (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuActions($event)"
           (searchByEnterKey)="onEnterkySearch($event)">
         </ws-widget-org-user-table>
         <!-- <ws-widget-org-user-table [tableData]="tabledata" [data]="dataForTable" [isUpload]=true [isCreate]=true
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 8b52cb27c..1e2d0bc22 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -13,6 +13,7 @@ import { EventService } from '@sunbird-cb/utils'
 import { NsContent } from '@sunbird-cb/collection'
 import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
 import { LoaderService } from '../../../../../../../../../src/app/services/loader.service'
+// import * as XLSX from 'xlsx'
 
 @Component({
   selector: 'ws-app-users-view',
@@ -141,6 +142,8 @@ export class UsersViewComponent implements OnInit, OnDestroy {
           active: !user.isDeleted,
           blocked: user.blocked,
           roles: _.join(_.map((org.roles || []), i => `<li>${i}</li>`), ''),
+          orgId: user.rootOrgId,
+          orgName: user.rootOrgName,
         })
       })
     }
@@ -161,6 +164,8 @@ export class UsersViewComponent implements OnInit, OnDestroy {
           active: !user.isDeleted,
           blocked: user.blocked,
           roles: _.join(_.map((org.roles || []), i => `<li>${i}</li>`), ''),
+          orgId: user.rootOrgId,
+          orgName: user.rootOrgName,
         })
       })
     }
@@ -216,6 +221,9 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       case 'upload':
         this.onUploadClick()
         break
+      case 'download':
+        this.downloadUserList()
+        break
     }
   }
 
@@ -230,6 +238,51 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     )
   }
 
+  async downloadUserList() {
+    // const tempData: any = []
+    // if (this.currentFilter === 'active') {
+    //   this.activeUsers.forEach((element: any) => {
+    //     let tempRoles = ''
+    //     element.role.forEach((roleEle: any, index: any) => {
+    //       tempRoles = `${roleEle}${(index === 0) ? '' : ', '}${tempRoles}`
+    //     })
+    //     tempData.push({
+    //       'Full Name': element.fullname,
+    //       Email: element.email,
+    //       Roles: tempRoles,
+    //       Active: element.active,
+    //       // 'Organisation ID': element.orgId,
+    //       // 'Organisation Name': element.orgName,
+    //     })
+    //   })
+    // }
+    // if (this.currentFilter === 'inactive') {
+    //   this.inActiveUsers.forEach((element: any) => {
+    //     let tempRoles = ''
+    //     element.role.forEach((roleEle: any, index: any) => {
+    //       tempRoles = `${roleEle}${(index === 0) ? '' : ', '}${tempRoles}`
+    //     })
+    //     tempData.push({
+    //       'Full Name': element.fullname,
+    //       Email: element.email,
+    //       Roles: tempRoles,
+    //       Active: element.active,
+    //       // 'Organisation ID': element.orgId,
+    //       // 'Organisation Name': element.orgName,
+    //     })
+    //   })
+    // }
+    // const ws: XLSX.WorkSheet = XLSX.utils.json_to_sheet(tempData)
+    // const wb: XLSX.WorkBook = XLSX.utils.book_new()
+    // XLSX.utils.book_append_sheet(wb, ws, 'Sheet1')
+    // XLSX.writeFile(wb, `${(this.currentFilter === 'active') ?
+    // 'Active-' : (this.currentFilter === 'inactive') ? 'Inactive-' : ''}UserList.xlsx`)
+    const tempDate = new Date()
+    const fileName = `userReport-${tempDate.getFullYear()}-${tempDate.getMonth() + 1}-${tempDate.getDate()}.xlsx`
+    const downloadUrl = `${environment.domainName}${environment.userBucket}${this.configSvc.userProfile.rootOrgId}/${fileName}`
+    window.location.href = downloadUrl
+  }
+
   onUploadClick() {
     this.filter('upload')
   }
diff --git a/project/ws/app/src/lib/routes/users/services/users.service.ts b/project/ws/app/src/lib/routes/users/services/users.service.ts
index b392cc833..03f185950 100644
--- a/project/ws/app/src/lib/routes/users/services/users.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/users.service.ts
@@ -150,4 +150,8 @@ export class UsersService {
 
     return this.http.post<any>(`${API_END_POINTS.SEARCH_USER_TABLE}`, reqBody)
   }
+
+  checkForUserReport(url: string) {
+    return this.http.get<any>(url)
+  }
 }
diff --git a/src/environments/environment.bm.ts b/src/environments/environment.bm.ts
index 6d87b1cba..24412506b 100644
--- a/src/environments/environment.bm.ts
+++ b/src/environments/environment.bm.ts
@@ -7,5 +7,6 @@ export const environment = {
   portalRoles: (((window as { [key: string]: any })['env']['portalRoles'] || '').split(',')) || [],
   contentHost: (window as { [key: string]: any })['env']['contentHost'] || '',
   contentBucket: (window as { [key: string]: any })['env']['azureBucket'] || '',
-
+  userBucket: (window as { [key: string]: any })['env']['userBucket'] || '',
+  domainName: (window as { [key: string]: any })['env']['domainName'] || '',
 }
diff --git a/src/environments/environment.dev.ts b/src/environments/environment.dev.ts
index 6a0cbc8d8..1fc55536e 100644
--- a/src/environments/environment.dev.ts
+++ b/src/environments/environment.dev.ts
@@ -7,4 +7,6 @@ export const environment = {
   portalRoles: (((window as { [key: string]: any })['env']['portalRoles'] || '').split(',')) || [],
   contentHost: (window as { [key: string]: any })['env']['contentHost'] || '',
   contentBucket: (window as { [key: string]: any })['env']['azureBucket'] || '',
+  userBucket: (window as { [key: string]: any })['env']['userBucket'] || '',
+  domainName: (window as { [key: string]: any })['env']['domainName'] || '',
 }
diff --git a/src/environments/environment.np.ts b/src/environments/environment.np.ts
index def0650bc..f2599bb9e 100644
--- a/src/environments/environment.np.ts
+++ b/src/environments/environment.np.ts
@@ -7,4 +7,6 @@ export const environment = {
   portalRoles: (((window as { [key: string]: any })['env']['portalRoles'] || '').split(',')) || [],
   contentHost: (window as { [key: string]: any })['env']['contentHost'] || '',
   contentBucket: (window as { [key: string]: any })['env']['azureBucket'] || '',
+  userBucket: (window as { [key: string]: any })['env']['userBucket'] || '',
+  domainName: (window as { [key: string]: any })['env']['domainName'] || '',
 }
diff --git a/src/environments/environment.preprod.ts b/src/environments/environment.preprod.ts
index 296013a95..1fc55536e 100644
--- a/src/environments/environment.preprod.ts
+++ b/src/environments/environment.preprod.ts
@@ -7,5 +7,6 @@ export const environment = {
   portalRoles: (((window as { [key: string]: any })['env']['portalRoles'] || '').split(',')) || [],
   contentHost: (window as { [key: string]: any })['env']['contentHost'] || '',
   contentBucket: (window as { [key: string]: any })['env']['azureBucket'] || '',
-
+  userBucket: (window as { [key: string]: any })['env']['userBucket'] || '',
+  domainName: (window as { [key: string]: any })['env']['domainName'] || '',
 }
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 6a0cbc8d8..1fc55536e 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -7,4 +7,6 @@ export const environment = {
   portalRoles: (((window as { [key: string]: any })['env']['portalRoles'] || '').split(',')) || [],
   contentHost: (window as { [key: string]: any })['env']['contentHost'] || '',
   contentBucket: (window as { [key: string]: any })['env']['azureBucket'] || '',
+  userBucket: (window as { [key: string]: any })['env']['userBucket'] || '',
+  domainName: (window as { [key: string]: any })['env']['domainName'] || '',
 }
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index b234f8fb8..09bc35305 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -11,6 +11,8 @@ export const environment: IEnvironment = {
   portalRoles: (((window as { [key: string]: any })['env']['portalRoles'] || '').split(',')) || [],
   contentHost: (window as { [key: string]: any })['env']['contentHost'] || '',
   contentBucket: (window as { [key: string]: any })['env']['azureBucket'] || '',
+  userBucket: (window as { [key: string]: any })['env']['userBucket'] || '',
+  domainName: (window as { [key: string]: any })['env']['domainName'] || '',
 }
 interface IEnvironment {
   name: null | string
@@ -21,6 +23,8 @@ interface IEnvironment {
   portalRoles: string[]
   contentHost: string
   contentBucket?: string
+  userBucket?: string
+  domainName?: string
 }
 
 /*

From e480f7e690027527983dc7953f14a2702eb15a72 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Mon, 23 Jan 2023 14:58:48 +0530
Subject: [PATCH 051/887] Users & Consumption Report

---
 .../routes/users-view/users-view.component.html     |  6 +++---
 .../home/routes/users-view/users-view.component.ts  | 13 +++++++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index 20787aeeb..c447116d2 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -34,9 +34,9 @@
         </div>
       </div>
       <ng-container *ngIf="usersData && currentFilter !== 'upload'">
-        <ws-widget-org-user-table [tableData]="tabledata" [data]="dataForTable" [isUpload]=true [isCreate]=true
-          [isDownload]=true (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuActions($event)"
-          (searchByEnterKey)="onEnterkySearch($event)">
+        <ws-widget-org-user-table [tableData]="tabledata" [data]="dataForTable" [isUpload]=false [isCreate]=true
+          [isDownload]=true [isConsumptionReport]=true (eOnButtonClick)="clickHandler($event)"
+          (actionsClick)="menuActions($event)" (searchByEnterKey)="onEnterkySearch($event)">
         </ws-widget-org-user-table>
         <!-- <ws-widget-org-user-table [tableData]="tabledata" [data]="dataForTable" [isUpload]=true [isCreate]=true
           (eOnButtonClick)="clickHandler($event)" (eOnRowClick)="onRoleClick($event)" (actionsClick)="menuActions($event)"
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 1e2d0bc22..8e735ae2b 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -224,6 +224,9 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       case 'download':
         this.downloadUserList()
         break
+      case 'consumptionReport':
+        this.downloadConsumptionReport()
+        break
     }
   }
 
@@ -277,8 +280,14 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     // XLSX.utils.book_append_sheet(wb, ws, 'Sheet1')
     // XLSX.writeFile(wb, `${(this.currentFilter === 'active') ?
     // 'Active-' : (this.currentFilter === 'inactive') ? 'Inactive-' : ''}UserList.xlsx`)
-    const tempDate = new Date()
-    const fileName = `userReport-${tempDate.getFullYear()}-${tempDate.getMonth() + 1}-${tempDate.getDate()}.xlsx`
+    // const tempDate = new Date() ${tempDate.getFullYear()}-${month}-${tempDate.getDate()}
+    const fileName = `userReport.xlsx`
+    const downloadUrl = `${environment.domainName}${environment.userBucket}/system/${fileName}`
+    window.location.href = downloadUrl
+  }
+
+  downloadConsumptionReport() {
+    const fileName = `userReport.xlsx`
     const downloadUrl = `${environment.domainName}${environment.userBucket}${this.configSvc.userProfile.rootOrgId}/${fileName}`
     window.location.href = downloadUrl
   }

From a6a62db5862aa9e38894b97090b16ced01107d81 Mon Sep 17 00:00:00 2001
From: garima468 <115453503+garima468@users.noreply.github.com>
Date: Mon, 23 Jan 2023 15:21:04 +0530
Subject: [PATCH 052/887] Download user list (#178)

* download User

* Users & Consumption Report

Co-authored-by: abhishek-K-P <abishek.koira@tarento.com>
---
 .../users-view/users-view.component.html      |  6 +-
 .../routes/users-view/users-view.component.ts | 62 +++++++++++++++++++
 .../routes/users/services/users.service.ts    |  4 ++
 src/environments/environment.bm.ts            |  3 +-
 src/environments/environment.dev.ts           |  2 +
 src/environments/environment.np.ts            |  2 +
 src/environments/environment.preprod.ts       |  3 +-
 src/environments/environment.prod.ts          |  2 +
 src/environments/environment.ts               |  4 ++
 9 files changed, 83 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index 6d7584400..c447116d2 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -34,9 +34,9 @@
         </div>
       </div>
       <ng-container *ngIf="usersData && currentFilter !== 'upload'">
-        <ws-widget-org-user-table [tableData]="tabledata" [data]="dataForTable" [isUpload]=true [isCreate]=true
-          (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuActions($event)"
-          (searchByEnterKey)="onEnterkySearch($event)">
+        <ws-widget-org-user-table [tableData]="tabledata" [data]="dataForTable" [isUpload]=false [isCreate]=true
+          [isDownload]=true [isConsumptionReport]=true (eOnButtonClick)="clickHandler($event)"
+          (actionsClick)="menuActions($event)" (searchByEnterKey)="onEnterkySearch($event)">
         </ws-widget-org-user-table>
         <!-- <ws-widget-org-user-table [tableData]="tabledata" [data]="dataForTable" [isUpload]=true [isCreate]=true
           (eOnButtonClick)="clickHandler($event)" (eOnRowClick)="onRoleClick($event)" (actionsClick)="menuActions($event)"
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 8b52cb27c..8e735ae2b 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -13,6 +13,7 @@ import { EventService } from '@sunbird-cb/utils'
 import { NsContent } from '@sunbird-cb/collection'
 import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
 import { LoaderService } from '../../../../../../../../../src/app/services/loader.service'
+// import * as XLSX from 'xlsx'
 
 @Component({
   selector: 'ws-app-users-view',
@@ -141,6 +142,8 @@ export class UsersViewComponent implements OnInit, OnDestroy {
           active: !user.isDeleted,
           blocked: user.blocked,
           roles: _.join(_.map((org.roles || []), i => `<li>${i}</li>`), ''),
+          orgId: user.rootOrgId,
+          orgName: user.rootOrgName,
         })
       })
     }
@@ -161,6 +164,8 @@ export class UsersViewComponent implements OnInit, OnDestroy {
           active: !user.isDeleted,
           blocked: user.blocked,
           roles: _.join(_.map((org.roles || []), i => `<li>${i}</li>`), ''),
+          orgId: user.rootOrgId,
+          orgName: user.rootOrgName,
         })
       })
     }
@@ -216,6 +221,12 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       case 'upload':
         this.onUploadClick()
         break
+      case 'download':
+        this.downloadUserList()
+        break
+      case 'consumptionReport':
+        this.downloadConsumptionReport()
+        break
     }
   }
 
@@ -230,6 +241,57 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     )
   }
 
+  async downloadUserList() {
+    // const tempData: any = []
+    // if (this.currentFilter === 'active') {
+    //   this.activeUsers.forEach((element: any) => {
+    //     let tempRoles = ''
+    //     element.role.forEach((roleEle: any, index: any) => {
+    //       tempRoles = `${roleEle}${(index === 0) ? '' : ', '}${tempRoles}`
+    //     })
+    //     tempData.push({
+    //       'Full Name': element.fullname,
+    //       Email: element.email,
+    //       Roles: tempRoles,
+    //       Active: element.active,
+    //       // 'Organisation ID': element.orgId,
+    //       // 'Organisation Name': element.orgName,
+    //     })
+    //   })
+    // }
+    // if (this.currentFilter === 'inactive') {
+    //   this.inActiveUsers.forEach((element: any) => {
+    //     let tempRoles = ''
+    //     element.role.forEach((roleEle: any, index: any) => {
+    //       tempRoles = `${roleEle}${(index === 0) ? '' : ', '}${tempRoles}`
+    //     })
+    //     tempData.push({
+    //       'Full Name': element.fullname,
+    //       Email: element.email,
+    //       Roles: tempRoles,
+    //       Active: element.active,
+    //       // 'Organisation ID': element.orgId,
+    //       // 'Organisation Name': element.orgName,
+    //     })
+    //   })
+    // }
+    // const ws: XLSX.WorkSheet = XLSX.utils.json_to_sheet(tempData)
+    // const wb: XLSX.WorkBook = XLSX.utils.book_new()
+    // XLSX.utils.book_append_sheet(wb, ws, 'Sheet1')
+    // XLSX.writeFile(wb, `${(this.currentFilter === 'active') ?
+    // 'Active-' : (this.currentFilter === 'inactive') ? 'Inactive-' : ''}UserList.xlsx`)
+    // const tempDate = new Date() ${tempDate.getFullYear()}-${month}-${tempDate.getDate()}
+    const fileName = `userReport.xlsx`
+    const downloadUrl = `${environment.domainName}${environment.userBucket}/system/${fileName}`
+    window.location.href = downloadUrl
+  }
+
+  downloadConsumptionReport() {
+    const fileName = `userReport.xlsx`
+    const downloadUrl = `${environment.domainName}${environment.userBucket}${this.configSvc.userProfile.rootOrgId}/${fileName}`
+    window.location.href = downloadUrl
+  }
+
   onUploadClick() {
     this.filter('upload')
   }
diff --git a/project/ws/app/src/lib/routes/users/services/users.service.ts b/project/ws/app/src/lib/routes/users/services/users.service.ts
index b392cc833..03f185950 100644
--- a/project/ws/app/src/lib/routes/users/services/users.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/users.service.ts
@@ -150,4 +150,8 @@ export class UsersService {
 
     return this.http.post<any>(`${API_END_POINTS.SEARCH_USER_TABLE}`, reqBody)
   }
+
+  checkForUserReport(url: string) {
+    return this.http.get<any>(url)
+  }
 }
diff --git a/src/environments/environment.bm.ts b/src/environments/environment.bm.ts
index 6d87b1cba..24412506b 100644
--- a/src/environments/environment.bm.ts
+++ b/src/environments/environment.bm.ts
@@ -7,5 +7,6 @@ export const environment = {
   portalRoles: (((window as { [key: string]: any })['env']['portalRoles'] || '').split(',')) || [],
   contentHost: (window as { [key: string]: any })['env']['contentHost'] || '',
   contentBucket: (window as { [key: string]: any })['env']['azureBucket'] || '',
-
+  userBucket: (window as { [key: string]: any })['env']['userBucket'] || '',
+  domainName: (window as { [key: string]: any })['env']['domainName'] || '',
 }
diff --git a/src/environments/environment.dev.ts b/src/environments/environment.dev.ts
index 6a0cbc8d8..1fc55536e 100644
--- a/src/environments/environment.dev.ts
+++ b/src/environments/environment.dev.ts
@@ -7,4 +7,6 @@ export const environment = {
   portalRoles: (((window as { [key: string]: any })['env']['portalRoles'] || '').split(',')) || [],
   contentHost: (window as { [key: string]: any })['env']['contentHost'] || '',
   contentBucket: (window as { [key: string]: any })['env']['azureBucket'] || '',
+  userBucket: (window as { [key: string]: any })['env']['userBucket'] || '',
+  domainName: (window as { [key: string]: any })['env']['domainName'] || '',
 }
diff --git a/src/environments/environment.np.ts b/src/environments/environment.np.ts
index def0650bc..f2599bb9e 100644
--- a/src/environments/environment.np.ts
+++ b/src/environments/environment.np.ts
@@ -7,4 +7,6 @@ export const environment = {
   portalRoles: (((window as { [key: string]: any })['env']['portalRoles'] || '').split(',')) || [],
   contentHost: (window as { [key: string]: any })['env']['contentHost'] || '',
   contentBucket: (window as { [key: string]: any })['env']['azureBucket'] || '',
+  userBucket: (window as { [key: string]: any })['env']['userBucket'] || '',
+  domainName: (window as { [key: string]: any })['env']['domainName'] || '',
 }
diff --git a/src/environments/environment.preprod.ts b/src/environments/environment.preprod.ts
index 296013a95..1fc55536e 100644
--- a/src/environments/environment.preprod.ts
+++ b/src/environments/environment.preprod.ts
@@ -7,5 +7,6 @@ export const environment = {
   portalRoles: (((window as { [key: string]: any })['env']['portalRoles'] || '').split(',')) || [],
   contentHost: (window as { [key: string]: any })['env']['contentHost'] || '',
   contentBucket: (window as { [key: string]: any })['env']['azureBucket'] || '',
-
+  userBucket: (window as { [key: string]: any })['env']['userBucket'] || '',
+  domainName: (window as { [key: string]: any })['env']['domainName'] || '',
 }
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 6a0cbc8d8..1fc55536e 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -7,4 +7,6 @@ export const environment = {
   portalRoles: (((window as { [key: string]: any })['env']['portalRoles'] || '').split(',')) || [],
   contentHost: (window as { [key: string]: any })['env']['contentHost'] || '',
   contentBucket: (window as { [key: string]: any })['env']['azureBucket'] || '',
+  userBucket: (window as { [key: string]: any })['env']['userBucket'] || '',
+  domainName: (window as { [key: string]: any })['env']['domainName'] || '',
 }
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index b234f8fb8..09bc35305 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -11,6 +11,8 @@ export const environment: IEnvironment = {
   portalRoles: (((window as { [key: string]: any })['env']['portalRoles'] || '').split(',')) || [],
   contentHost: (window as { [key: string]: any })['env']['contentHost'] || '',
   contentBucket: (window as { [key: string]: any })['env']['azureBucket'] || '',
+  userBucket: (window as { [key: string]: any })['env']['userBucket'] || '',
+  domainName: (window as { [key: string]: any })['env']['domainName'] || '',
 }
 interface IEnvironment {
   name: null | string
@@ -21,6 +23,8 @@ interface IEnvironment {
   portalRoles: string[]
   contentHost: string
   contentBucket?: string
+  userBucket?: string
+  domainName?: string
 }
 
 /*

From 20d063a1291355080ccf2f1040d4fa1998d3404d Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Tue, 24 Jan 2023 10:41:19 +0530
Subject: [PATCH 053/887] updated collection lib package version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4616ab749..909d52e0b 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@angular/router": "~8.2.1",
     "@angular/service-worker": "~8.2.1",
     "@project-sunbird/telemetry-sdk": "0.0.26",
-    "@sunbird-cb/collection": "^1.0.19",
+    "@sunbird-cb/collection": "^1.0.21",
     "@sunbird-cb/design-system": "0.0.1",
     "@sunbird-cb/rain-dashboards": "^0.3.8",
     "@sunbird-cb/resolver": "^1.0.0",

From 817a6be69251c5ec1c198a9d5fa6902862245204 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Tue, 24 Jan 2023 13:57:08 +0530
Subject: [PATCH 054/887] updated userEnrolmentReport filename

---
 .../lib/routes/home/routes/users-view/users-view.component.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 8e735ae2b..9f4013549 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -282,12 +282,12 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     // 'Active-' : (this.currentFilter === 'inactive') ? 'Inactive-' : ''}UserList.xlsx`)
     // const tempDate = new Date() ${tempDate.getFullYear()}-${month}-${tempDate.getDate()}
     const fileName = `userReport.xlsx`
-    const downloadUrl = `${environment.domainName}${environment.userBucket}/system/${fileName}`
+    const downloadUrl = `${environment.domainName}${environment.userBucket}${this.configSvc.userProfile.rootOrgId}/${fileName}`
     window.location.href = downloadUrl
   }
 
   downloadConsumptionReport() {
-    const fileName = `userReport.xlsx`
+    const fileName = `userEnrolmentReport.xlsx`
     const downloadUrl = `${environment.domainName}${environment.userBucket}${this.configSvc.userProfile.rootOrgId}/${fileName}`
     window.location.href = downloadUrl
   }

From ae926a6e24a2ecf01410b9c32c5b36c0633819b5 Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <75484189+nitinraj-tarento@users.noreply.github.com>
Date: Tue, 24 Jan 2023 16:51:27 +0530
Subject: [PATCH 055/887] Update index.html

---
 src/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/index.html b/src/index.html
index de828ef42..7e61a0a7e 100644
--- a/src/index.html
+++ b/src/index.html
@@ -14,7 +14,7 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <!-- <link id="id-app-fav-icon" rel="icon" type="image/png" /> -->
   <link id="id-app-x-icon" rel="icon" type="x-icon" />
-  <link id="id-app-fav-icon" rel="icon" type="image/x-icon" href="favicon.png" />
+  <link id="id-app-fav-icon" rel="icon" type="image/x-icon" href="/assets/configurations/manifest/favicon.ico" />
   <!-- <link rel="icon" type="image/x-icon" href="assets/favicon.ico"> -->
   <!-- <link id="id-app-fav-icon" rel="icon" type="image/png" href="favicon.png" /> -->
   <link id="id-app-webmanifest" rel="manifest" />
@@ -90,4 +90,4 @@
 
 </script>
 
-</html>
\ No newline at end of file
+</html>

From 745626496b327db21d370e2857a86a572c74a176 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Mon, 6 Feb 2023 22:52:00 +0530
Subject: [PATCH 056/887] mdo admin inactive  fixes

---
 .../routes/home/routes/users-view/users-view.component.html   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index c447116d2..c637b388e 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -34,8 +34,8 @@
         </div>
       </div>
       <ng-container *ngIf="usersData && currentFilter !== 'upload'">
-        <ws-widget-org-user-table [tableData]="tabledata" [data]="dataForTable" [isUpload]=false [isCreate]=true
-          [isDownload]=true [isConsumptionReport]=true (eOnButtonClick)="clickHandler($event)"
+        <ws-widget-org-user-table [userId]="currentUser" [tableData]="tabledata" [data]="dataForTable" [isUpload]=false
+          [isCreate]=true [isDownload]=true [isConsumptionReport]=true (eOnButtonClick)="clickHandler($event)"
           (actionsClick)="menuActions($event)" (searchByEnterKey)="onEnterkySearch($event)">
         </ws-widget-org-user-table>
         <!-- <ws-widget-org-user-table [tableData]="tabledata" [data]="dataForTable" [isUpload]=true [isCreate]=true

From f60d364b94bd0bb0340d727946bbe05196e6e00a Mon Sep 17 00:00:00 2001
From: garima468 <115453503+garima468@users.noreply.github.com>
Date: Wed, 8 Feb 2023 14:53:05 +0530
Subject: [PATCH 057/887] updated collection lib package version (#182)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 909d52e0b..a16add7ae 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@angular/router": "~8.2.1",
     "@angular/service-worker": "~8.2.1",
     "@project-sunbird/telemetry-sdk": "0.0.26",
-    "@sunbird-cb/collection": "^1.0.21",
+    "@sunbird-cb/collection": "^1.0.22",
     "@sunbird-cb/design-system": "0.0.1",
     "@sunbird-cb/rain-dashboards": "^0.3.8",
     "@sunbird-cb/resolver": "^1.0.0",

From 1c0dd2ca7d532b8a45601b94d02b872becf5fc3b Mon Sep 17 00:00:00 2001
From: Afzal84 <110979654+Afzal84@users.noreply.github.com>
Date: Wed, 8 Feb 2023 14:54:18 +0530
Subject: [PATCH 058/887] fix: roles issue for user creation, updation & under
 the role and access tab (#183)

---
 .../roles-access/roles-access.component.ts    | 39 ++++++++++++-----
 .../create-user/create-user.component.ts      | 42 +++++++++++++++----
 .../routes/view-user/view-user.component.ts   | 40 ++++++++++++++----
 3 files changed, 93 insertions(+), 28 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.ts b/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.ts
index 33d861c6a..58e932b39 100644
--- a/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.ts
@@ -5,6 +5,7 @@ import { EventService } from '@sunbird-cb/utils'
 // tslint:disable-next-line
 import _ from 'lodash'
 import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
+import { RolesService } from '../../../users/services/roles.service'
 import { UsersService } from '../../../users/services/users.service'
 @Component({
   selector: 'ws-app-roles-access',
@@ -15,12 +16,16 @@ export class RolesAccessComponent implements OnInit, AfterViewInit, OnDestroy {
   tabledata!: ITableData
   data: any = []
   roleCountSpinner = true
+  parseRoledata: any = []
+  rolesObject: any = []
+  uniqueRoles: any = []
 
   constructor(private router: Router,
               private activeRouter: ActivatedRoute,
               private usersService: UsersService,
     // private telemetrySvc: TelemetryService,
-              private events: EventService) { }
+              private events: EventService,
+              private roleservice: RolesService) { }
 
   ngOnInit() {
     this.tabledata = {
@@ -83,17 +88,31 @@ export class RolesAccessComponent implements OnInit, AfterViewInit, OnDestroy {
 
   /* API call to get all roles*/
   fetchRolesNew() {
-    let totalUsers: any[] = []
-    const usrsList = _.get(this.activeRouter.snapshot, 'data.usersList.data.content') || []
-    totalUsers = _.map(_.groupBy(_.flatten(_.map(_.flatten(_.map(usrsList, 'organisations')), 'roles'))), (_k, v) => {
-      return {
-        role: (v || ''),
-        // .replace(/[/_/]/g, ' '),
-        // count: (k || []).length || 0,
-        count: 0,
+    this.roleservice.getAllRoles().subscribe(data => {
+      this.parseRoledata = JSON.parse(data.result.response.value)
+      for (let i = 0; i < this.parseRoledata.orgTypeList.length; i += 1) {
+        if (this.parseRoledata.orgTypeList[i].name === 'MDO') {
+          this.rolesObject.push(this.parseRoledata.orgTypeList[i].roles)
+        }
       }
+      const arrayConcat = _.uniq([].concat(...this.rolesObject))
+      _.each(arrayConcat, rolesObject => {
+        this.uniqueRoles.push({ role: rolesObject, count: '0' })
+      })
+      this.data = _.uniq(this.uniqueRoles)
     })
-    this.data = totalUsers
+    // Old code
+    // let totalUsers: any[] = []
+    // const usrsList = _.get(this.activeRouter.snapshot, 'data.usersList.data.content') || []
+    // totalUsers = _.map(_.groupBy(_.flatten(_.map(_.flatten(_.map(usrsList, 'organisations')), 'roles'))), (_k, v) => {
+    //   return {
+    //     role: (v || ''),
+    //     // .replace(/[/_/]/g, ' '),
+    //     // count: (k || []).length || 0,
+    //     count: 0,
+    //   }
+    // })
+    // this.data = totalUsers
   }
 
   ngOnDestroy() { }
diff --git a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
index 089443d71..e4219dab3 100644
--- a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
@@ -32,6 +32,8 @@ export class CreateUserComponent implements OnInit, OnDestroy {
   departmentName = ''
   toastSuccess: any
   rolesList: any = []
+  rolesObject: any = []
+  uniqueRoles: any = []
   public userRoles: Set<string> = new Set()
   configService: any
   routeSubscription: Subscription | null = null
@@ -86,21 +88,43 @@ export class CreateUserComponent implements OnInit, OnDestroy {
         this.department = fullProfile.unMappedUser.rootOrgId
         this.departmentName = fullProfile ? fullProfile.unMappedUser.channel : ''
         const orgLst = _.get(this.activeRoute.snapshot, 'data.rolesList.data.orgTypeList')
-        const filteredDept = _.compact(_.map(orgLst, ls => {
-          const f = _.filter(ls.flags, (fl: any) => fullProfile.unMappedUser.rootOrg[fl])
-          if (f && f.length > 0) {
-            return ls
+
+        // new code
+        for (let i = 0; i < orgLst.length; i += 1) {
+          if (orgLst[i].name === 'MDO') {
+            _.each(orgLst[i].roles, rolesObject => {
+              this.uniqueRoles.push({
+                roleName: rolesObject, description: rolesObject,
+              })
+            })
           }
-          return null
-        }))
-        /* tslint:disable-next-line */
-        const rolesListFull = _.uniq(_.map(_.compact(_.flatten(_.map(filteredDept, 'roles'))), rol => ({ roleName: rol, description: rol })))
+        }
 
-        rolesListFull.forEach((role: any) => {
+        this.uniqueRoles.forEach((role: any) => {
           if (!this.rolesList.some((item: any) => item.roleName === role.roleName)) {
             this.rolesList.push(role)
           }
         })
+
+        /// old code
+        /* tslint:disable-next-line */
+
+        // const filteredDept = _.compact(_.map(orgLst, ls => {
+        //   const f = _.filter(ls.flags, (fl: any) => fullProfile.unMappedUser.rootOrg[fl])
+        //   if (f && f.length > 0) {
+        //     return ls
+        //   }
+        //   return null
+        // }))
+        // const rolesListFull = _.uniq(_.map(_.compact(_.flatten(_.map(filteredDept, 'roles'))),
+        //  rol => ({ roleName: rol, description: rol })))
+
+        // rolesListFull.forEach((role: any) => {
+        //   if (!this.rolesList.some((item: any) => item.roleName === role.roleName)) {
+        //     this.rolesList.push(role)
+        //   }
+        // })
+
         if (this.configService.userProfile && this.configService.userProfile.departmentName) {
           this.configService.userProfile.departmentName = this.departmentName
         }
diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
index 1a45644a8..391f8beac 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
@@ -34,6 +34,8 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
   department: any = {}
   departmentName = ''
   rolesList: any = []
+  rolesObject: any = []
+  uniqueRoles: any = []
   configSvc: any
   userID: any
   public userRoles: Set<string> = new Set()
@@ -83,22 +85,42 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
         this.department = fullProfile.unMappedUser.rootOrgId
         this.departmentName = fullProfile ? fullProfile.unMappedUser.channel : ''
         const orgLst = _.get(this.activeRoute.snapshot, 'data.rolesList.data.orgTypeList')
-        const filteredDept = _.compact(_.map(orgLst, ls => {
-          const f = _.filter(ls.flags, (fl: any) => fullProfile.unMappedUser.rootOrg[fl])
-          if (f && f.length > 0) {
-            return ls
+
+        // New code for roles
+        for (let i = 0; i < orgLst.length; i += 1) {
+          if (orgLst[i].name === 'MDO') {
+            _.each(orgLst[i].roles, rolesObject => {
+              this.uniqueRoles.push({
+                roleName: rolesObject, description: rolesObject,
+              })
+            })
           }
-          return null
-        }))
-        /* tslint:disable-next-line */
-        const rolesListFull = _.uniq(_.map(_.compact(_.flatten(_.map(filteredDept, 'roles'))), rol => ({ roleName: rol, description: rol })))
+        }
 
-        rolesListFull.forEach((role: any) => {
+        this.uniqueRoles.forEach((role: any) => {
           if (!this.rolesList.some((item: any) => item.roleName === role.roleName)) {
             this.rolesList.push(role)
           }
         })
 
+        // Old code
+        // const filteredDept = _.compact(_.map(orgLst, ls => {
+        //   const f = _.filter(ls.flags, (fl: any) => fullProfile.unMappedUser.rootOrg[fl])
+        //   if (f && f.length > 0) {
+        //     return ls
+        //   }
+        //   return null
+        // }))
+
+        /* tslint:disable-next-line */
+        // const rolesListFull = _.uniq(_.map(_.compact(_.flatten(_.map(filteredDept, 'roles'))), rol => ({ roleName: rol, description: rol })))
+
+        // rolesListFull.forEach((role: any) => {
+        //   if (!this.rolesList.some((item: any) => item.roleName === role.roleName)) {
+        //     this.rolesList.push(role)
+        //   }
+        // })
+
         const usrRoles = profileDataAll.roles
         usrRoles.forEach((role: any) => {
           this.orguserRoles.push(role)

From 179efb24928d69f42fc5a2fd1212c9cb6b98fdb1 Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Mon, 27 Feb 2023 19:04:11 +0530
Subject: [PATCH 059/887] email issue of user  for event creation form fixed

---
 .../routes/events/routes/create-event/create-event.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
index 08a67251e..3d7cd9e68 100644
--- a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
+++ b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
@@ -244,7 +244,7 @@ export class CreateEventComponent implements OnInit {
       const setSelectedPresentersObj = {
         firstname: obj.firstName || obj.firstname,
         lastname: obj.lastName || obj.lastname,
-        email: obj.email,
+        email: obj.profileDetails.personalDetails.primaryEmail,
         type: 'Karmayogi User',
       }
       const contactsObj = {

From cd48886514cf658a581173beb627e1fc26d61780 Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Thu, 2 Mar 2023 00:22:08 +0530
Subject: [PATCH 060/887] email id security fixed

---
 .../lib/routes/access/routes/users/users.component.ts | 11 ++++++-----
 .../routes/create-event/create-event.component.ts     |  5 +++--
 .../components/admintable/admintable.component.ts     |  7 +++++--
 .../leadershiptable/leadershiptable.component.ts      |  6 ++++--
 .../home/routes/leadership/leadership.component.ts    |  6 ++++--
 .../home/routes/users-view/users-view.component.ts    | 11 ++++++++---
 .../lib/routes/home/services/home-utill.service.ts    |  6 ++++++
 7 files changed, 36 insertions(+), 16 deletions(-)

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
index 27294d865..c853b2c83 100644
--- 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
@@ -5,6 +5,7 @@ import { UsersService } from '../../services/users.service'
 /* tslint:disable */
 import _ from 'lodash'
 import { ITableData } from '@sunbird-cb/collection/lib/ui-org-table/interface/interfaces'
+import { ProfileV2UtillService } from '../../../home/services/home-utill.service'
 /* tslint:enable */
 @Component({
   selector: 'ws-app-users',
@@ -22,7 +23,7 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
   roleName: string | undefined
   private defaultSideNavBarOpenedSubscription: any
 
-  constructor(private usersSvc: UsersService, private router: Router, private route: ActivatedRoute) { }
+  constructor(private usersSvc: UsersService, private router: Router, private route: ActivatedRoute, private profileUtilSvc: ProfileV2UtillService,) { }
   ngOnInit() {
     const url = this.router.url.split('/')
     this.role = url[url.length - 2]
@@ -34,9 +35,9 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
       actions: [],
       columns: [
         { displayName: 'Full name', key: 'fullName' },
-        { displayName: 'Email', key: 'email' },
+        { displayName: 'Email id', key: 'email' },
         // { displayName: 'Position', key: 'position' },
-        { displayName: 'Role', key: 'role', isList: true },
+        { displayName: 'Role acc', key: 'role', isList: true },
       ],
       needCheckBox: false,
       needHash: false,
@@ -59,7 +60,7 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
       this.data = res.users.map((user: any) => {
         return {
           fullName: `${user.first_name} ${user.last_name}`,
-          email: user.email,
+          email: this.profileUtilSvc.emailTransform(user.email),
           position: user.department_name,
           role: this.role,
           wid: user.wid,
@@ -92,7 +93,7 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
         user => {
           return {
             fullName: `${user.firstName} ${user.lastName}`,
-            email: _.get(user, 'profileDetails.personalDetails.primaryEmail') || user.email,
+            email: _.get(user, 'this.profileUtilSvc.emailTransform(profileDetails.personalDetails.primaryEmail)') || this.profileUtilSvc.emailTransform(user.email),
             position: user.department_name,
             role: this.getRoleList(user),
             wid: user.userId,
diff --git a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
index 3d7cd9e68..105f47a1f 100644
--- a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
+++ b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
@@ -13,6 +13,7 @@ import * as moment from 'moment'
 /* tslint:disable */
 import _ from 'lodash'
 import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
+import { ProfileV2UtillService } from '../../../home/services/home-utill.service'
 /* tslint:enable */
 @Component({
   selector: 'ws-app-create-event',
@@ -98,7 +99,7 @@ export class CreateEventComponent implements OnInit {
     // tslint:disable-next-line:align
     private router: Router, private configSvc: ConfigurationsService, private changeDetectorRefs: ChangeDetectorRef,
     // tslint:disable-next-line:align
-    private activeRoute: ActivatedRoute, private events: EventService,
+    private activeRoute: ActivatedRoute, private events: EventService, private profileUtilSvc: ProfileV2UtillService
   ) {
 
     if (this.configSvc.userProfile) {
@@ -244,7 +245,7 @@ export class CreateEventComponent implements OnInit {
       const setSelectedPresentersObj = {
         firstname: obj.firstName || obj.firstname,
         lastname: obj.lastName || obj.lastname,
-        email: obj.profileDetails.personalDetails.primaryEmail,
+        email: this.profileUtilSvc.emailTransform(obj.profileDetails.personalDetails.primaryEmail),
         type: 'Karmayogi User',
       }
       const contactsObj = {
diff --git a/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.ts b/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.ts
index 8c0c5b424..3f5afe290 100644
--- a/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.ts
@@ -9,6 +9,7 @@ import { AdduserpopupComponent } from '../adduserpopup/adduserpopup.component'
 import { MdoInfoService } from '../../services/mdoinfo.service'
 // import { ConfigurationsService } from '@sunbird-cb/utils'
 import { Router } from '@angular/router'
+import { ProfileV2UtillService } from '../../services/home-utill.service'
 
 @Component({
   selector: 'ws-app-admintable',
@@ -49,7 +50,9 @@ export class AdmintableComponent implements OnInit, OnChanges {
     }
   }
 
-  constructor(public dialog: MatDialog, private snackBar: MatSnackBar, private mdoinfoSrvc: MdoInfoService, private router: Router) {
+  constructor(public dialog: MatDialog, private snackBar: MatSnackBar,
+    private mdoinfoSrvc: MdoInfoService, private router: Router,
+    private profileUtilSvc: ProfileV2UtillService) {
     this.dataSource = new MatTableDataSource<any>()
     this.dataSource.paginator = this.paginator
 
@@ -139,7 +142,7 @@ export class AdmintableComponent implements OnInit, OnChanges {
               const obj = {
                 srnumber: index + 1,
                 fullname: `${user.firstName} ${user.lastName}`,
-                email: user.email,
+                email: this.profileUtilSvc.emailTransform(user.email),
                 position: pos,
                 id: user.id,
               }
diff --git a/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.ts b/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.ts
index d499ce5f0..f4e2a313d 100644
--- a/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.ts
@@ -9,6 +9,7 @@ import { AdduserpopupComponent } from '../adduserpopup/adduserpopup.component'
 import { MdoInfoService } from '../../services/mdoinfo.service'
 import { ConfigurationsService } from '@sunbird-cb/utils'
 import { ActivatedRoute, Router } from '@angular/router'
+import { ProfileV2UtillService } from '../../services/home-utill.service'
 
 @Component({
   selector: 'ws-app-leadershiptable',
@@ -52,7 +53,8 @@ export class LeadershiptableComponent implements OnInit, OnChanges {
 
   constructor(public dialog: MatDialog, private activeRoute: ActivatedRoute, private snackBar: MatSnackBar,
     // tslint:disable-next-line:align
-    private mdoinfoSrvc: MdoInfoService, private configSvc: ConfigurationsService, private router: Router) {
+    private mdoinfoSrvc: MdoInfoService, private configSvc: ConfigurationsService, private router: Router,
+    private profileUtilSvc: ProfileV2UtillService) {
     this.dataSource = new MatTableDataSource<any>()
     this.dataSource.paginator = this.paginator
   }
@@ -142,7 +144,7 @@ export class LeadershiptableComponent implements OnInit, OnChanges {
               const obj = {
                 srnumber: index + 1,
                 fullname: `${user.firstName} ${user.lastName}`,
-                email: user.email,
+                email: this.profileUtilSvc.emailTransform(user.email),
                 position: pos,
                 id: user.id,
               }
diff --git a/project/ws/app/src/lib/routes/home/routes/leadership/leadership.component.ts b/project/ws/app/src/lib/routes/home/routes/leadership/leadership.component.ts
index 5e2bcf6b2..ade1512ef 100644
--- a/project/ws/app/src/lib/routes/home/routes/leadership/leadership.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/leadership/leadership.component.ts
@@ -6,6 +6,7 @@ import { IColums, ITableData } from '../../interface/interfaces'
 import { MatSort } from '@angular/material/sort'
 import * as _ from 'lodash'
 import { MdoInfoService } from '../../services/mdoinfo.service'
+import { ProfileV2UtillService } from '../../services/home-utill.service'
 
 @Component({
   selector: 'ws-app-leadership',
@@ -48,7 +49,8 @@ export class LeadershipComponent implements OnInit, AfterViewInit, OnChanges {
   deptID: any
   tabData = 'MDO_LEADER'
 
-  constructor(private activeRoute: ActivatedRoute, private configSvc: ConfigurationsService, private mdoinfoSrvc: MdoInfoService) {
+  constructor(private activeRoute: ActivatedRoute, private configSvc: ConfigurationsService,
+    private mdoinfoSrvc: MdoInfoService, private profileUtilSvc: ProfileV2UtillService) {
     this.dataSource = new MatTableDataSource<any>()
     this.dataSource.paginator = this.paginator
   }
@@ -138,7 +140,7 @@ export class LeadershipComponent implements OnInit, AfterViewInit, OnChanges {
           this.usersData.forEach((user: any, index: any)  => {
             const obj = {
               fullname: `${user.firstName} ${user.lastName}`,
-              email: user.email,
+              email: this.profileUtilSvc.emailTransform(user.email),
               position: user.channel,
               id: user.id,
               srnumber: index + 1,
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 9f4013549..427502bbe 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -13,6 +13,8 @@ import { EventService } from '@sunbird-cb/utils'
 import { NsContent } from '@sunbird-cb/collection'
 import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
 import { LoaderService } from '../../../../../../../../../src/app/services/loader.service'
+import { ProfileV2UtillService } from '../../services/home-utill.service'
+
 // import * as XLSX from 'xlsx'
 
 @Component({
@@ -66,6 +68,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     private snackBar: MatSnackBar,
     private events: EventService,
     private loaderService: LoaderService,
+    private profileUtilSvc: ProfileV2UtillService,
     // private telemetrySvc: TelemetryService,
     // private configSvc: ConfigurationsService,
     // private discussService: DiscussService,
@@ -136,7 +139,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
         const org = { roles: _.get(_.first(_.filter(user.organisations, { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') }
         activeUsersData.push({
           fullname: user ? `${user.firstName} ${user.lastName}` : null,
-          email: user.personalDetails && user.personalDetails.primaryEmail ? user.personalDetails.primaryEmail : user.email,
+          email: user.personalDetails && user.personalDetails.primaryEmail ? this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
           role: org.roles || [],
           userId: user.id,
           active: !user.isDeleted,
@@ -158,7 +161,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
         const org = { roles: _.get(_.first(_.filter(user.organisations, { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') || [] }
         inactiveUsersData.push({
           fullname: user ? `${user.firstName} ${user.lastName}` : null,
-          email: user.personalDetails && user.personalDetails.primaryEmail ? user.personalDetails.primaryEmail : user.email,
+          email: user.personalDetails && user.personalDetails.primaryEmail ? this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
           role: org.roles || [],
           userId: user.id,
           active: !user.isDeleted,
@@ -172,13 +175,15 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     return inactiveUsersData
   }
 
+
+
   blockedUsers() {
     const blockedUsersData: any[] = []
     if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
       _.filter(this.usersData.content, { isDeleted: false }).forEach((user: any) => {
         blockedUsersData.push({
           fullname: user ? `${user.firstName} ${user.lastName}` : null,
-          email: user.personalDetails && user.personalDetails.primaryEmail ? user.personalDetails.primaryEmail : user.email,
+          email: user.personalDetails && user.personalDetails.primaryEmail ? this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
           role: user.roles,
           userId: user.id,
           active: !user.isDeleted,
diff --git a/project/ws/app/src/lib/routes/home/services/home-utill.service.ts b/project/ws/app/src/lib/routes/home/services/home-utill.service.ts
index 41110c04e..267ab2e91 100644
--- a/project/ws/app/src/lib/routes/home/services/home-utill.service.ts
+++ b/project/ws/app/src/lib/routes/home/services/home-utill.service.ts
@@ -30,4 +30,10 @@ export class ProfileV2UtillService {
       .get<any>(API_END_POINTS.USER_BADGE_RECENT)
       .pipe(map(notifications => notifications))
   }
+
+  emailTransform(value: string): any {
+    return value.split(".").join("[dot]").replace("@", "[at]")
+
+  }
+
 }

From 50701155f9f6458155a6e58653954099fe35f53f Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Thu, 2 Mar 2023 10:51:34 +0530
Subject: [PATCH 061/887] lint issue fixed

---
 .../lib/routes/access/routes/users/users.component.ts |  6 ++++--
 .../components/admintable/admintable.component.ts     |  4 ++--
 .../leadershiptable/leadershiptable.component.ts      |  2 +-
 .../home/routes/leadership/leadership.component.ts    |  2 +-
 .../home/routes/users-view/users-view.component.ts    | 11 ++++++-----
 .../lib/routes/home/services/home-utill.service.ts    |  2 +-
 6 files changed, 15 insertions(+), 12 deletions(-)

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
index c853b2c83..2c465a693 100644
--- 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
@@ -23,7 +23,8 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
   roleName: string | undefined
   private defaultSideNavBarOpenedSubscription: any
 
-  constructor(private usersSvc: UsersService, private router: Router, private route: ActivatedRoute, private profileUtilSvc: ProfileV2UtillService,) { }
+  constructor(private usersSvc: UsersService, private router: Router, private route: ActivatedRoute,
+    private profileUtilSvc: ProfileV2UtillService) { }
   ngOnInit() {
     const url = this.router.url.split('/')
     this.role = url[url.length - 2]
@@ -93,7 +94,8 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
         user => {
           return {
             fullName: `${user.firstName} ${user.lastName}`,
-            email: _.get(user, 'this.profileUtilSvc.emailTransform(profileDetails.personalDetails.primaryEmail)') || this.profileUtilSvc.emailTransform(user.email),
+            email: _.get(user, 'this.profileUtilSvc.emailTransform(profileDetails.personalDetails.primaryEmail)')
+              || this.profileUtilSvc.emailTransform(user.email),
             position: user.department_name,
             role: this.getRoleList(user),
             wid: user.userId,
diff --git a/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.ts b/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.ts
index 3f5afe290..2ba1d2cd6 100644
--- a/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.ts
@@ -51,8 +51,8 @@ export class AdmintableComponent implements OnInit, OnChanges {
   }
 
   constructor(public dialog: MatDialog, private snackBar: MatSnackBar,
-    private mdoinfoSrvc: MdoInfoService, private router: Router,
-    private profileUtilSvc: ProfileV2UtillService) {
+              private mdoinfoSrvc: MdoInfoService, private router: Router,
+              private profileUtilSvc: ProfileV2UtillService) {
     this.dataSource = new MatTableDataSource<any>()
     this.dataSource.paginator = this.paginator
 
diff --git a/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.ts b/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.ts
index f4e2a313d..e40e7ef8c 100644
--- a/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.ts
@@ -54,7 +54,7 @@ export class LeadershiptableComponent implements OnInit, OnChanges {
   constructor(public dialog: MatDialog, private activeRoute: ActivatedRoute, private snackBar: MatSnackBar,
     // tslint:disable-next-line:align
     private mdoinfoSrvc: MdoInfoService, private configSvc: ConfigurationsService, private router: Router,
-    private profileUtilSvc: ProfileV2UtillService) {
+              private profileUtilSvc: ProfileV2UtillService) {
     this.dataSource = new MatTableDataSource<any>()
     this.dataSource.paginator = this.paginator
   }
diff --git a/project/ws/app/src/lib/routes/home/routes/leadership/leadership.component.ts b/project/ws/app/src/lib/routes/home/routes/leadership/leadership.component.ts
index ade1512ef..500e073cf 100644
--- a/project/ws/app/src/lib/routes/home/routes/leadership/leadership.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/leadership/leadership.component.ts
@@ -50,7 +50,7 @@ export class LeadershipComponent implements OnInit, AfterViewInit, OnChanges {
   tabData = 'MDO_LEADER'
 
   constructor(private activeRoute: ActivatedRoute, private configSvc: ConfigurationsService,
-    private mdoinfoSrvc: MdoInfoService, private profileUtilSvc: ProfileV2UtillService) {
+              private mdoinfoSrvc: MdoInfoService, private profileUtilSvc: ProfileV2UtillService) {
     this.dataSource = new MatTableDataSource<any>()
     this.dataSource.paginator = this.paginator
   }
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 427502bbe..92ee29b8c 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -139,7 +139,8 @@ export class UsersViewComponent implements OnInit, OnDestroy {
         const org = { roles: _.get(_.first(_.filter(user.organisations, { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') }
         activeUsersData.push({
           fullname: user ? `${user.firstName} ${user.lastName}` : null,
-          email: user.personalDetails && user.personalDetails.primaryEmail ? this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
+          email: user.personalDetails && user.personalDetails.primaryEmail ?
+            this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
           role: org.roles || [],
           userId: user.id,
           active: !user.isDeleted,
@@ -161,7 +162,8 @@ export class UsersViewComponent implements OnInit, OnDestroy {
         const org = { roles: _.get(_.first(_.filter(user.organisations, { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') || [] }
         inactiveUsersData.push({
           fullname: user ? `${user.firstName} ${user.lastName}` : null,
-          email: user.personalDetails && user.personalDetails.primaryEmail ? this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
+          email: user.personalDetails && user.personalDetails.primaryEmail ?
+          this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
           role: org.roles || [],
           userId: user.id,
           active: !user.isDeleted,
@@ -175,15 +177,14 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     return inactiveUsersData
   }
 
-
-
   blockedUsers() {
     const blockedUsersData: any[] = []
     if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
       _.filter(this.usersData.content, { isDeleted: false }).forEach((user: any) => {
         blockedUsersData.push({
           fullname: user ? `${user.firstName} ${user.lastName}` : null,
-          email: user.personalDetails && user.personalDetails.primaryEmail ? this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
+          email: user.personalDetails && user.personalDetails.primaryEmail ?
+          this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
           role: user.roles,
           userId: user.id,
           active: !user.isDeleted,
diff --git a/project/ws/app/src/lib/routes/home/services/home-utill.service.ts b/project/ws/app/src/lib/routes/home/services/home-utill.service.ts
index 267ab2e91..f26740219 100644
--- a/project/ws/app/src/lib/routes/home/services/home-utill.service.ts
+++ b/project/ws/app/src/lib/routes/home/services/home-utill.service.ts
@@ -32,7 +32,7 @@ export class ProfileV2UtillService {
   }
 
   emailTransform(value: string): any {
-    return value.split(".").join("[dot]").replace("@", "[at]")
+    return value.split('.').join('[dot]').replace('@', '[at]')
 
   }
 

From 82c1b2c6fdb9da941c998cdebbbdae45697c1e31 Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Thu, 2 Mar 2023 10:55:23 +0530
Subject: [PATCH 062/887] lint issue fixed

---
 .../app/src/lib/routes/access/routes/users/users.component.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 2c465a693..5d4b38062 100644
--- 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
@@ -24,7 +24,7 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
   private defaultSideNavBarOpenedSubscription: any
 
   constructor(private usersSvc: UsersService, private router: Router, private route: ActivatedRoute,
-    private profileUtilSvc: ProfileV2UtillService) { }
+              private profileUtilSvc: ProfileV2UtillService) { }
   ngOnInit() {
     const url = this.router.url.split('/')
     this.role = url[url.length - 2]

From bd4f2d0a351a3ea6bb9fdf8d0f87ba06609a3a05 Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Mon, 6 Mar 2023 13:43:56 +0530
Subject: [PATCH 063/887] email issue fix-2

---
 .../access/routes/users/users.component.ts     |  6 ++++--
 .../participants/participants.component.html   |  3 ++-
 .../participants/participants.component.ts     |  5 ++++-
 .../app/src/lib/routes/events/events.module.ts |  2 ++
 .../routes/home/services/home-utill.service.ts |  3 ++-
 .../pipes/pipe-email/pipe-email.module.ts      | 12 ++++++++++++
 .../routes/pipes/pipe-email/pipe-email.pipe.ts | 14 ++++++++++++++
 .../routes/view-user/view-user.component.html  |  6 +++---
 .../routes/view-user/view-user.component.ts    | 18 +++++++++++++-----
 .../app/src/lib/routes/users/users.module.ts   |  3 ++-
 project/ws/app/src/public-api.ts               |  2 ++
 11 files changed, 60 insertions(+), 14 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/pipes/pipe-email/pipe-email.module.ts
 create mode 100644 project/ws/app/src/lib/routes/pipes/pipe-email/pipe-email.pipe.ts

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
index 5d4b38062..219048177 100644
--- 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
@@ -92,9 +92,10 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
       })),
         // tslint:disable-next-line
         user => {
+
           return {
             fullName: `${user.firstName} ${user.lastName}`,
-            email: _.get(user, 'this.profileUtilSvc.emailTransform(profileDetails.personalDetails.primaryEmail)')
+            email: this.profileUtilSvc.emailTransform(_.get(user, 'profileDetails.personalDetails.primaryEmail'))
               || this.profileUtilSvc.emailTransform(user.email),
             position: user.department_name,
             role: this.getRoleList(user),
@@ -188,7 +189,8 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
           user => {
             return {
               fullName: `${user.firstName} ${user.lastName}`,
-              email: _.get(user, 'profileDetails.personalDetails.primaryEmail') || user.email,
+              email: this.profileUtilSvc.emailTransform(_.get(user, 'profileDetails.personalDetails.primaryEmail'))
+                || this.profileUtilSvc.emailTransform(user.email),
               position: user.department_name,
               role: this.getRoleList(user),
               wid: user.userId,
diff --git a/project/ws/app/src/lib/routes/events/components/participants/participants.component.html b/project/ws/app/src/lib/routes/events/components/participants/participants.component.html
index 51803c7f2..43cf1e299 100644
--- a/project/ws/app/src/lib/routes/events/components/participants/participants.component.html
+++ b/project/ws/app/src/lib/routes/events/components/participants/participants.component.html
@@ -37,7 +37,8 @@
             </ng-container>
             <ng-container matColumnDef="email">
                 <th mat-header-cell *matHeaderCellDef> Email </th>
-                <td mat-cell *matCellDef="let element"> {{element.profileDetails.personalDetails.primaryEmail}} </td>
+                <td mat-cell *matCellDef="let element"> {{element.profileDetails.personalDetails.primaryEmail |
+                    pipeEmail}} </td>
             </ng-container>
             <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
             <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
diff --git a/project/ws/app/src/lib/routes/events/components/participants/participants.component.ts b/project/ws/app/src/lib/routes/events/components/participants/participants.component.ts
index 2e8f91fe6..a068dae3d 100644
--- a/project/ws/app/src/lib/routes/events/components/participants/participants.component.ts
+++ b/project/ws/app/src/lib/routes/events/components/participants/participants.component.ts
@@ -8,6 +8,7 @@ import { EventsService } from '../../services/events.service'
 import { HttpClient } from '@angular/common/http'
 // tslint:disable-next-line
 import _ from 'lodash'
+import { ProfileV2UtillService } from '../../../home/services/home-utill.service'
 
 export interface IParticipantElement {
     firstname: string,
@@ -34,6 +35,7 @@ export class ParticipantsComponent implements OnInit {
     constructor(
         public eventSrc: EventsService,
         public http: HttpClient,
+        private profileUtilSvc: ProfileV2UtillService,
         public dialogRef: MatDialogRef<ParticipantsComponent>,
         @Inject(MAT_DIALOG_DATA) public data: any
     ) { }
@@ -102,7 +104,8 @@ export class ParticipantsComponent implements OnInit {
                 this.participants = []
                 Object.keys(resultdata).forEach((key: any) => {
                     const obj = resultdata[key]
-                    const email = _.get(obj, 'profileDetails.personalDetails.primaryEmail')
+                    const email_id = _.get(obj, 'profileDetails.personalDetails.primaryEmail')
+                    const email = this.profileUtilSvc.emailTransform(email_id)
                     if (email !== undefined) {
                         const participantObj = {
                             email,
diff --git a/project/ws/app/src/lib/routes/events/events.module.ts b/project/ws/app/src/lib/routes/events/events.module.ts
index 848dbca91..7a0ee5607 100644
--- a/project/ws/app/src/lib/routes/events/events.module.ts
+++ b/project/ws/app/src/lib/routes/events/events.module.ts
@@ -23,6 +23,7 @@ import {
 } from '@angular/material'
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { PipeEmailModule } from '../pipes/pipe-email/pipe-email.module'
 
 @NgModule({
   declarations: [
@@ -74,6 +75,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'
       MatRadioModule,
       MatExpansionModule,
       MatDividerModule,
+      PipeEmailModule,
     ],
   entryComponents: [
     ParticipantsComponent,
diff --git a/project/ws/app/src/lib/routes/home/services/home-utill.service.ts b/project/ws/app/src/lib/routes/home/services/home-utill.service.ts
index f26740219..a8361ea05 100644
--- a/project/ws/app/src/lib/routes/home/services/home-utill.service.ts
+++ b/project/ws/app/src/lib/routes/home/services/home-utill.service.ts
@@ -32,7 +32,8 @@ export class ProfileV2UtillService {
   }
 
   emailTransform(value: string): any {
-    return value.split('.').join('[dot]').replace('@', '[at]')
+    // return value.split('.').join('[dot]').replace('@', '[at]')
+    return value.replace(/\./g, '[dot]').replace('@', '[at]')
 
   }
 
diff --git a/project/ws/app/src/lib/routes/pipes/pipe-email/pipe-email.module.ts b/project/ws/app/src/lib/routes/pipes/pipe-email/pipe-email.module.ts
new file mode 100644
index 000000000..16405a2c1
--- /dev/null
+++ b/project/ws/app/src/lib/routes/pipes/pipe-email/pipe-email.module.ts
@@ -0,0 +1,12 @@
+import { NgModule } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { PipeEmailPipe } from './pipe-email.pipe'
+
+@NgModule({
+  declarations: [PipeEmailPipe],
+  imports: [
+    CommonModule,
+  ],
+  exports: [PipeEmailPipe],
+})
+export class PipeEmailModule { }
diff --git a/project/ws/app/src/lib/routes/pipes/pipe-email/pipe-email.pipe.ts b/project/ws/app/src/lib/routes/pipes/pipe-email/pipe-email.pipe.ts
new file mode 100644
index 000000000..df5c5da84
--- /dev/null
+++ b/project/ws/app/src/lib/routes/pipes/pipe-email/pipe-email.pipe.ts
@@ -0,0 +1,14 @@
+import { Pipe, PipeTransform } from '@angular/core'
+
+@Pipe({
+  name: 'pipeEmail',
+})
+export class PipeEmailPipe implements PipeTransform {
+
+  transform(value: string): any {
+    // return value.split(".").join("[dot]").replace("@", "[at]")
+    return value.replace(/\./g, '[dot]').replace('@', '[at]')
+
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
index 666e28907..d607adfe6 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
@@ -123,14 +123,14 @@
                               <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                                 <label class="appr-text-label">Primary email</label>
                                 <input type="text" [disabled]="true"
-                                  [value]="basicInfo.primaryEmail ? basicInfo.primaryEmail : ''"
+                                  [value]="basicInfo.primaryEmail ? (basicInfo.primaryEmail | pipeEmail) : ''"
                                   class="appr-text-field">
                               </mat-grid-tile>
 
                               <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                                 <label class="appr-text-label">Secondary email</label>
                                 <input type="text" [disabled]="true"
-                                  [value]="basicInfo.personalEmail ? basicInfo.personalEmail : ''"
+                                  [value]="basicInfo.personalEmail ? ( basicInfo.personalEmail | pipeEmail) : ''"
                                   class="appr-text-field">
                               </mat-grid-tile>
 
@@ -553,4 +553,4 @@
       </ng-container>
     </div> -->
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
index 391f8beac..98a56da51 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
@@ -64,6 +64,8 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
     private snackBar: MatSnackBar) {
     this.router.events.subscribe((event: Event) => {
       if (event instanceof NavigationEnd) {
+        // console.log(this.activeRoute.snapshot.data, 'this.activeRoute.snapshot.data====')
+        // console.log(this.activeRoute.snapshot.data.profileData.data, 'this.activeRoute.snapshot.data.profileData.data')
         this.configSvc = this.activeRoute.snapshot.data.configService || {}
         const profileDataAll = this.activeRoute.snapshot.data.profileData.data || {}
         const profileData = profileDataAll.profileDetails
@@ -81,6 +83,7 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
           this.userStatus = profileDataAll.isDeleted ? 'Inactive' : 'Active'
 
         }
+        console.log(this.userStatus, 'this.userStatus==')
         const fullProfile = _.get(this.activeRoute.snapshot, 'data.configService')
         this.department = fullProfile.unMappedUser.rootOrgId
         this.departmentName = fullProfile ? fullProfile.unMappedUser.channel : ''
@@ -121,11 +124,16 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
         //   }
         // })
 
-        const usrRoles = profileDataAll.roles
-        usrRoles.forEach((role: any) => {
-          this.orguserRoles.push(role)
-          this.modifyUserRoles(role)
-        })
+        console.log(profileDataAll, 'profileDataAll==')
+        if (profileDataAll.length > 0) {
+          const usrRoles = profileDataAll.roles
+          console.log(usrRoles, 'usrRoles==')
+          usrRoles.forEach((role: any) => {
+            this.orguserRoles.push(role)
+            this.modifyUserRoles(role)
+          })
+        }
+
         // if (this.department.active_users && this.department.active_users.length > 0) {
         //   this.department.active_users.forEach((user: any) => {
         //     if (this.userID === user.userId) {
diff --git a/project/ws/app/src/lib/routes/users/users.module.ts b/project/ws/app/src/lib/routes/users/users.module.ts
index 5c18b68a4..8e2821526 100644
--- a/project/ws/app/src/lib/routes/users/users.module.ts
+++ b/project/ws/app/src/lib/routes/users/users.module.ts
@@ -17,6 +17,7 @@ import { WidgetResolverModule } from '@sunbird-cb/resolver'
 import { RolesService } from './services/roles.service'
 import { FileService } from './services/upload.service'
 import { UsersUploadComponent } from './components/users-upload/users-upload.component'
+import { PipeEmailModule } from '../pipes/pipe-email/pipe-email.module'
 
 @NgModule({
   declarations: [CreateUserComponent, ViewUserComponent, UsersUploadComponent],
@@ -25,7 +26,7 @@ import { UsersUploadComponent } from './components/users-upload/users-upload.com
     MatSidenavModule, MatListModule, ScrollspyLeftMenuModule, MatCardModule, FormsModule,
     MatFormFieldModule, MatInputModule, MatButtonModule, MatIconModule, MatGridListModule,
     MatRadioModule, MatDialogModule, ReactiveFormsModule, MatSelectModule, MatProgressSpinnerModule,
-    MatExpansionModule, MatDividerModule, MatPaginatorModule, MatTableModule, WidgetResolverModule, MatSortModule,
+    MatExpansionModule, MatDividerModule, MatPaginatorModule, MatTableModule, WidgetResolverModule, MatSortModule, PipeEmailModule,
   ],
   providers: [RolesService, FileService],
   exports: [UsersUploadComponent],
diff --git a/project/ws/app/src/public-api.ts b/project/ws/app/src/public-api.ts
index 4c84fd4b9..77e9e876e 100644
--- a/project/ws/app/src/public-api.ts
+++ b/project/ws/app/src/public-api.ts
@@ -23,3 +23,5 @@ export * from './lib/routes/events/events.module'
 export * from './lib/routes/workallocation/workallocation.module'
 export * from './lib/routes/workallocation-v2/workallocation-v2.module'
 export * from './lib/routes/state-profile/state-profile.module'
+export * from './lib/routes/pipes/pipe-email/pipe-email.module'
+export * from './lib/routes/pipes/pipe-email/pipe-email.pipe'

From f1316d9e8061f6199bd514930b8e6a737d4b8037 Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Mon, 6 Mar 2023 16:11:44 +0530
Subject: [PATCH 064/887] lint error fixed

---
 .../participants/participants.component.ts      |  3 +--
 .../routes/view-user/view-user.component.ts     | 17 +++++++----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/project/ws/app/src/lib/routes/events/components/participants/participants.component.ts b/project/ws/app/src/lib/routes/events/components/participants/participants.component.ts
index a068dae3d..66d72bdab 100644
--- a/project/ws/app/src/lib/routes/events/components/participants/participants.component.ts
+++ b/project/ws/app/src/lib/routes/events/components/participants/participants.component.ts
@@ -104,8 +104,7 @@ export class ParticipantsComponent implements OnInit {
                 this.participants = []
                 Object.keys(resultdata).forEach((key: any) => {
                     const obj = resultdata[key]
-                    const email_id = _.get(obj, 'profileDetails.personalDetails.primaryEmail')
-                    const email = this.profileUtilSvc.emailTransform(email_id)
+                    const email = this.profileUtilSvc.emailTransform(_.get(obj, 'profileDetails.personalDetails.primaryEmail'))
                     if (email !== undefined) {
                         const participantObj = {
                             email,
diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
index 98a56da51..dbf87ee29 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
@@ -83,7 +83,6 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
           this.userStatus = profileDataAll.isDeleted ? 'Inactive' : 'Active'
 
         }
-        console.log(this.userStatus, 'this.userStatus==')
         const fullProfile = _.get(this.activeRoute.snapshot, 'data.configService')
         this.department = fullProfile.unMappedUser.rootOrgId
         this.departmentName = fullProfile ? fullProfile.unMappedUser.channel : ''
@@ -124,15 +123,13 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
         //   }
         // })
 
-        console.log(profileDataAll, 'profileDataAll==')
-        if (profileDataAll.length > 0) {
-          const usrRoles = profileDataAll.roles
-          console.log(usrRoles, 'usrRoles==')
-          usrRoles.forEach((role: any) => {
-            this.orguserRoles.push(role)
-            this.modifyUserRoles(role)
-          })
-        }
+
+        const usrRoles = profileDataAll.roles
+        usrRoles.forEach((role: any) => {
+          this.orguserRoles.push(role)
+          this.modifyUserRoles(role)
+        })
+
 
         // if (this.department.active_users && this.department.active_users.length > 0) {
         //   this.department.active_users.forEach((user: any) => {

From 634216240741b4e624602a613af9e94ec88110b9 Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Mon, 6 Mar 2023 17:31:06 +0530
Subject: [PATCH 065/887] email fix -3

---
 .../lib/routes/users/routes/view-user/view-user.component.ts    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
index dbf87ee29..e4994cf34 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
@@ -123,14 +123,12 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
         //   }
         // })
 
-
         const usrRoles = profileDataAll.roles
         usrRoles.forEach((role: any) => {
           this.orguserRoles.push(role)
           this.modifyUserRoles(role)
         })
 
-
         // if (this.department.active_users && this.department.active_users.length > 0) {
         //   this.department.active_users.forEach((user: any) => {
         //     if (this.userID === user.userId) {

From 47d777f84636b5d2e9b391f5f3fc06baf2407b2a Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Fri, 10 Mar 2023 20:08:29 +0530
Subject: [PATCH 066/887] Added maxlength validations for input field

---
 .../adduserpopup/adduserpopup.component.html  |  23 +--
 .../admintable/admintable.component.html      |  12 +-
 .../budgetschemepopup.component.html          |  43 +++---
 .../leadershiptable.component.html            |  12 +-
 .../staffdetailspopup.component.html          |   6 +-
 .../home/routes/budget/budget.component.html  | 132 ++++++++++++------
 .../home/routes/staff/staff.component.html    |  74 ++++++----
 .../create-user/create-user.component.html    |  10 +-
 8 files changed, 197 insertions(+), 115 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/adduserpopup/adduserpopup.component.html b/project/ws/app/src/lib/routes/home/components/adduserpopup/adduserpopup.component.html
index 198bd31d5..52ad5f926 100644
--- a/project/ws/app/src/lib/routes/home/components/adduserpopup/adduserpopup.component.html
+++ b/project/ws/app/src/lib/routes/home/components/adduserpopup/adduserpopup.component.html
@@ -4,7 +4,8 @@
             <div class="mat-title margin-top-s margin-bottom-m">
                 Add users
                 <a [routerLink]="['/app/users/create-user']" [queryParams]="statedata" [mat-dialog-close]="true"
-                    mat-button type="button" class="flex-auto-display custom-btn margin-right-s mat-accent-border float-right">
+                    mat-button type="button"
+                    class="flex-auto-display custom-btn margin-right-s mat-accent-border float-right">
                     <span class="ws-mat-default-text" i18n>New user</span>
                 </a>
             </div>
@@ -15,7 +16,7 @@
                             <div class=rsearch>
                                 <mat-icon class="color-60 search-icon">search</mat-icon>
                                 <input class="sinput color-60 mat-body-2 margin-remove-top" type="Standard" label=""
-                                    (input)="applyFilter($event.target.value)" placeholder="Search">
+                                    (input)="applyFilter($event.target.value)" placeholder="Search" maxlength="50">
                             </div>
                         </div>
                     </div>
@@ -29,13 +30,16 @@
                     <!-- Checkbox Column -->
                     <ng-container matColumnDef="select">
                         <th mat-header-cell *matHeaderCellDef>
-                            <mat-checkbox (change)="$event ? masterToggle() : null" [checked]="selection.hasValue() && isAllSelected()"
-                                [indeterminate]="selection.hasValue() && !isAllSelected()" [aria-label]="checkboxLabel()">
+                            <mat-checkbox (change)="$event ? masterToggle() : null"
+                                [checked]="selection.hasValue() && isAllSelected()"
+                                [indeterminate]="selection.hasValue() && !isAllSelected()"
+                                [aria-label]="checkboxLabel()">
                             </mat-checkbox>
                         </th>
                         <td mat-cell *matCellDef="let row">
-                            <mat-checkbox (click)="$event.stopPropagation()" (change)="$event ? selection.toggle(row) : null"
-                                [checked]="selection.isSelected(row)" [aria-label]="checkboxLabel(row)">
+                            <mat-checkbox (click)="$event.stopPropagation()"
+                                (change)="$event ? selection.toggle(row) : null" [checked]="selection.isSelected(row)"
+                                [aria-label]="checkboxLabel(row)">
                             </mat-checkbox>
                         </td>
                     </ng-container>
@@ -80,11 +84,12 @@
                 <p>{{this.selection.selected.length}} profile selected</p>
             </div>
             <div class="display-inline-block float-right">
-                <button mat-button type="button" [mat-dialog-close]="true" class="custom-btn flex-auto-display mat-accent-border margin-right-s">
+                <button mat-button type="button" [mat-dialog-close]="true"
+                    class="custom-btn flex-auto-display mat-accent-border margin-right-s">
                     <span class="ws-mat-default-text" i18n>Cancel</span>
                 </button>
-                <button mat-raised-button type="button" [disabled]="this.selection.selected.length === 0" class="next-btn ws-mat-primary-background flex-auto-display"
-                    (click)="addUser()">
+                <button mat-raised-button type="button" [disabled]="this.selection.selected.length === 0"
+                    class="next-btn ws-mat-primary-background flex-auto-display" (click)="addUser()">
                     <span class="text-white" i18n>Add user</span>
                 </button>
             </div>
diff --git a/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.html b/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.html
index 85882d3a7..7385a2f8a 100644
--- a/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.html
+++ b/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.html
@@ -8,7 +8,7 @@
                         <div class=rsearch>
                             <mat-icon class="color-60 search-icon">search</mat-icon>
                             <input class="sinput color-60 mat-body-2 margin-remove-top" type="Standard" label=""
-                                (input)="applyFilter($event.target.value)" placeholder="Search">
+                                (input)="applyFilter($event.target.value)" placeholder="Search" maxlength="50">
                         </div>
                     </div>
                 </div>
@@ -60,8 +60,8 @@
                         [matMenuTriggerData]="{'data':row}" class="action-btn">
                         <mat-icon>more_horiz</mat-icon>
                     </button> -->
-                    <button type="button" mat-icon-button i18n-aria-label aria-label="action items" (click)="updateData(row)"
-                        class="action-btn">
+                    <button type="button" mat-icon-button i18n-aria-label aria-label="action items"
+                        (click)="updateData(row)" class="action-btn">
                         <mat-icon class="ws-mat-black60-text font-22">edit</mat-icon>
                     </button>
                 </mat-cell>
@@ -70,7 +70,8 @@
             <mat-row *matRowDef="let row; columns: getFinalColumns();" (click)="selection.toggle(row);">
             </mat-row>
         </mat-table>
-        <mat-card class="flex-1" role="none" *ngIf="!dataSource.filter && dataSource.filteredData && dataSource.filteredData.length == 0">
+        <mat-card class="flex-1" role="none"
+            *ngIf="!dataSource.filter && dataSource.filteredData && dataSource.filteredData.length == 0">
             <span class="mat-subtitle ws-mat-black40-text">Click on 'Add user' to add users to the admin team.</span>
         </mat-card>
         <mat-card class="flex-1" role="none" *ngIf="dataSource.filter && dataSource.filteredData.length == 0">
@@ -92,7 +93,8 @@
             <mat-icon>block</mat-icon><span>{{rowData && rowData.blocked ? 'Unblock user':'Block user' }}</span>
         </button> -->
         <button (click)="rowData && rowData.active ? buttonClick('deactive',rowData): buttonClick('active',rowData)"
-            mat-menu-item name="channel-analytics-button" class="ws-mat-primary-text" i18n-aria-label aria-label="Analytics">
+            mat-menu-item name="channel-analytics-button" class="ws-mat-primary-text" i18n-aria-label
+            aria-label="Analytics">
             <mat-icon>edit_attributes</mat-icon>
             <span>Edit</span>
         </button>
diff --git a/project/ws/app/src/lib/routes/home/components/budgetschemepopup/budgetschemepopup.component.html b/project/ws/app/src/lib/routes/home/components/budgetschemepopup/budgetschemepopup.component.html
index 4a1ef6959..41c6ec84e 100644
--- a/project/ws/app/src/lib/routes/home/components/budgetschemepopup/budgetschemepopup.component.html
+++ b/project/ws/app/src/lib/routes/home/components/budgetschemepopup/budgetschemepopup.component.html
@@ -11,7 +11,8 @@
                 <form class="schemeform-form" [formGroup]="schemeform">
                     <div class="display-block">
                         <div class="width-44 display-inline-block formgroup margin-right-xl margin-bottom-s">
-                            <label for="budgetyear" class="display-block mat-subheading-2 margin-remove-bottom form-label required"
+                            <label for="budgetyear"
+                                class="display-block mat-subheading-2 margin-remove-bottom form-label required"
                                 i18n="Financial year label|Label which explains the user to enter Financial year"
                                 i18n-aria-label aria-label="Financial year label">
                                 Financial year
@@ -25,16 +26,18 @@
                                     </mat-option>
                                 </mat-select> -->
                                 <input id="budgetyear" matInput #budgetyear formControlName="budgetyear"
-                                    i18n-placeholder placeholder="Type here" i18n-aria-label aria-label="Budget year input"
-                                    class="form-input" autocomplete="off" />
+                                    i18n-placeholder placeholder="Type here" i18n-aria-label
+                                    aria-label="Budget year input" class="form-input" autocomplete="off" />
                                 <mat-error [hidden]="false" i18n="Budget year Error|Explains name is required"
-                                    i18n-aria-label aria-label="Budget year Error|Explains name is required" *ngIf="schemeform?.controls['budgetyear']?.touched && schemeform?.controls['budgetyear'].errors?.required">
+                                    i18n-aria-label aria-label="Budget year Error|Explains name is required"
+                                    *ngIf="schemeform?.controls['budgetyear']?.touched && schemeform?.controls['budgetyear'].errors?.required">
                                     Field is mandatory
                                 </mat-error>
                             </mat-form-field>
                         </div>
                         <div class="width-44 display-inline-block formgroup margin-right-xl margin-bottom-s">
-                            <label for="schemename" class="display-block mat-subheading-2 margin-remove-bottom form-label required"
+                            <label for="schemename"
+                                class="display-block mat-subheading-2 margin-remove-bottom form-label required"
                                 i18n="Scheme name label|Label which explains the user to enter Scheme name"
                                 i18n-aria-label aria-label="Scheme name label">
                                 Scheme name
@@ -42,15 +45,18 @@
                             <mat-form-field appearance="outline" class="margin-top-xs">
                                 <input id="schemename" matInput #schemename formControlName="schemename"
                                     i18n-placeholder placeholder="Add scheme name (min 10 characters)" i18n-aria-label
-                                    aria-label="Scheme name input" class="form-input" autocomplete="off" />
+                                    aria-label="Scheme name input" class="form-input" autocomplete="off"
+                                    maxlength="250" />
                                 <mat-error [hidden]="false" i18n="Scheme name Error|Explains name is required"
-                                    i18n-aria-label aria-label="Scheme name Error|Explains name is required " *ngIf="schemeform?.controls['schemename']?.touched && schemeform?.controls['schemename'].errors?.required">
+                                    i18n-aria-label aria-label="Scheme name Error|Explains name is required "
+                                    *ngIf="schemeform?.controls['schemename']?.touched && schemeform?.controls['schemename'].errors?.required">
                                     Field is mandatory
                                 </mat-error>
                             </mat-form-field>
                         </div>
                         <div class="width-44 display-inline-block formgroup margin-right-xl margin-bottom-s">
-                            <label for="budgetallocated" class="display-block mat-subheading-2 margin-remove-bottom form-label required"
+                            <label for="budgetallocated"
+                                class="display-block mat-subheading-2 margin-remove-bottom form-label required"
                                 i18n="Budget allocated label|Label which explains the user to enter Budget allocated"
                                 i18n-aria-label aria-label="Budget allocated label">
                                 Allocated training/capacity building budget
@@ -58,7 +64,8 @@
                             <mat-form-field appearance="outline" class="margin-top-xs">
                                 <input id="budgetallocated" matInput #budgetallocated formControlName="budgetallocated"
                                     i18n-placeholder placeholder="0" i18n-aria-label aria-label="Budget allocated input"
-                                    class="form-input" autocomplete="off" (keypress)="keyPressNumbers($event)" />
+                                    class="form-input" autocomplete="off" (keypress)="keyPressNumbers($event)"
+                                    maxlength="14" />
                                 <mat-error [hidden]="false" i18n="Budget allocated Error|Explains name is required"
                                     i18n-aria-label aria-label="Budget allocated Error|Explains name is required "
                                     *ngIf="schemeform?.controls['budgetallocated']?.touched && schemeform?.controls['budgetallocated'].errors?.required">
@@ -67,17 +74,20 @@
                             </mat-form-field>
                         </div>
                         <div class="width-44 display-inline-block formgroup margin-right-xl margin-bottom-s">
-                            <label for="budgetutilized" class="display-block mat-subheading-2 margin-remove-bottom form-label required"
+                            <label for="budgetutilized"
+                                class="display-block mat-subheading-2 margin-remove-bottom form-label required"
                                 i18n="Budget utilized label|Label which explains the user to enter Budget utilized"
                                 i18n-aria-label aria-label="Budget utilized label">
                                 Proposed utilization of training budget
                             </label>
                             <mat-form-field appearance="outline" class="margin-top-xs">
                                 <input id="budgetutilized" matInput #budgetutilized formControlName="budgetutilized"
-                                    i18n-placeholder placeholder="Add budget" i18n-aria-label aria-label="Budget utilized input"
-                                    class="form-input" autocomplete="off" (keypress)="keyPressNumbers($event)" />
+                                    i18n-placeholder placeholder="Add budget" i18n-aria-label
+                                    aria-label="Budget utilized input" class="form-input" autocomplete="off"
+                                    (keypress)="keyPressNumbers($event)" maxlength="14" />
                                 <mat-error [hidden]="false" i18n="Budget utilized Error|Explains name is required"
-                                    i18n-aria-label aria-label="Budget utilized Error|Explains name is required " *ngIf="schemeform?.controls['budgetutilized']?.touched && schemeform?.controls['budgetutilized'].errors?.required">
+                                    i18n-aria-label aria-label="Budget utilized Error|Explains name is required "
+                                    *ngIf="schemeform?.controls['budgetutilized']?.touched && schemeform?.controls['budgetutilized'].errors?.required">
                                     Field is mandatory
                                 </mat-error>
                             </mat-form-field>
@@ -94,11 +104,12 @@
     <mat-dialog-actions>
         <div class="schemeform-footer">
             <div class="display-inline-block float-right">
-                <button mat-raised-button type="button" [mat-dialog-close]="true" class="flex-auto-display margin-right-s">
+                <button mat-raised-button type="button" [mat-dialog-close]="true"
+                    class="flex-auto-display margin-right-s">
                     <span class="ws-mat-default-text" i18n>Cancel</span>
                 </button>
-                <button mat-raised-button type="submit" [disabled]="schemeform?.invalid" class="next-btn ws-mat-primary-background flex-auto-display"
-                    (click)="addsheme(schemeform)">
+                <button mat-raised-button type="submit" [disabled]="schemeform?.invalid"
+                    class="next-btn ws-mat-primary-background flex-auto-display" (click)="addsheme(schemeform)">
                     <span class="text-white" i18n *ngIf="!formInputData.id">Add</span>
                     <span class="text-white" i18n *ngIf="formInputData.id">Update</span>
                 </button>
diff --git a/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.html b/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.html
index 3d59cbf99..8a58f2d14 100644
--- a/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.html
+++ b/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.html
@@ -8,7 +8,7 @@
                         <div class=rsearch>
                             <mat-icon class="color-60 search-icon">search</mat-icon>
                             <input class="sinput color-60 mat-body-2 margin-remove-top" type="Standard" label=""
-                                (input)="applyFilter($event.target.value)" placeholder="Search">
+                                (input)="applyFilter($event.target.value)" placeholder="Search" maxlength="50">
                         </div>
                     </div>
                 </div>
@@ -57,8 +57,8 @@
                 <mat-header-cell *matHeaderCellDef class="clr-darkish-blue action-header">
                 </mat-header-cell>
                 <mat-cell *matCellDef="let row" class="action-cell">
-                    <button type="button" mat-icon-button i18n-aria-label aria-label="action items" (click)="updateData(row)"
-                        class="action-btn">
+                    <button type="button" mat-icon-button i18n-aria-label aria-label="action items"
+                        (click)="updateData(row)" class="action-btn">
                         <mat-icon class="ws-mat-black60-text font-22">edit</mat-icon>
                     </button>
                 </mat-cell>
@@ -67,8 +67,10 @@
             <mat-row *matRowDef="let row; columns: getFinalColumns();" (click)="selection.toggle(row);">
             </mat-row>
         </mat-table>
-        <mat-card class="flex-1" role="none" *ngIf="!dataSource.filter && dataSource.filteredData && dataSource.filteredData.length == 0">
-            <span class="mat-subtitle ws-mat-black40-text">Click on 'Add user' to add users to the leadership team.</span>
+        <mat-card class="flex-1" role="none"
+            *ngIf="!dataSource.filter && dataSource.filteredData && dataSource.filteredData.length == 0">
+            <span class="mat-subtitle ws-mat-black40-text">Click on 'Add user' to add users to the leadership
+                team.</span>
         </mat-card>
         <mat-card class="flex-1" role="none" *ngIf="dataSource.filter && dataSource.filteredData.length == 0">
             <span class="mat-subtitle ws-mat-black40-text">No search reuslts found.</span>
diff --git a/project/ws/app/src/lib/routes/home/components/staffdetailspopup/staffdetailspopup.component.html b/project/ws/app/src/lib/routes/home/components/staffdetailspopup/staffdetailspopup.component.html
index 03ec66b38..0c5d63035 100644
--- a/project/ws/app/src/lib/routes/home/components/staffdetailspopup/staffdetailspopup.component.html
+++ b/project/ws/app/src/lib/routes/home/components/staffdetailspopup/staffdetailspopup.component.html
@@ -46,7 +46,8 @@
                             <mat-form-field appearance="outline" class="margin-top-xs">
                                 <input id="posfilled" matInput #posfilled formControlName="posfilled" i18n-placeholder
                                     placeholder="Add number" i18n-aria-label aria-label="Total positions filled input"
-                                    class="form-input" autocomplete="off" (keypress)="keyPressNumbers($event)" />
+                                    class="form-input" autocomplete="off" (keypress)="keyPressNumbers($event)"
+                                    maxlength="5" />
                                 <mat-error [hidden]="false"
                                     i18n="Total positions filled Error|Explains name is required" i18n-aria-label
                                     aria-label="Total positions filled Error|Explains name is required "
@@ -65,7 +66,8 @@
                             <mat-form-field appearance="outline" class="margin-top-xs">
                                 <input id="posvacant" matInput #posvacant formControlName="posvacant" i18n-placeholder
                                     placeholder="Add number" i18n-aria-label aria-label="Total positions vacant input"
-                                    class="form-input" autocomplete="off" (keypress)="keyPressNumbers($event)" />
+                                    class="form-input" autocomplete="off" (keypress)="keyPressNumbers($event)"
+                                    maxlength="5" />
                                 <mat-error [hidden]="false"
                                     i18n="Total positions vacant Error|Explains name is required" i18n-aria-label
                                     aria-label="Total positions vacant Error|Explains name is required "
diff --git a/project/ws/app/src/lib/routes/home/routes/budget/budget.component.html b/project/ws/app/src/lib/routes/home/routes/budget/budget.component.html
index cdb007d81..b3ccc3a09 100644
--- a/project/ws/app/src/lib/routes/home/routes/budget/budget.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/budget/budget.component.html
@@ -16,21 +16,27 @@
                                             <form class="example-container" [formGroup]="budgetdata">
                                                 <div>
                                                     <div class="margin-bottom-m">
-                                                        <label for="budgetyear" class="custom-label display-block mat-subheading-2 margin-remove-bottom form-label required"
+                                                        <label for="budgetyear"
+                                                            class="custom-label display-block mat-subheading-2 margin-remove-bottom form-label required"
                                                             i18n="Budget year label|Label which explains the user to enter Budget year"
                                                             i18n-aria-label aria-label="Budget year label">
                                                             Budget for financial year
                                                         </label>
-                                                        <mat-form-field appearance="outline" class="custom-select margin-top-xs">
+                                                        <mat-form-field appearance="outline"
+                                                            class="custom-select margin-top-xs">
                                                             <mat-label>Select year</mat-label>
                                                             <mat-select formControlName="budgetyear" #budgetyear
-                                                                [(value)]="selectedYear" (selectionChange)="changeBudgetYear($event)">
-                                                                <mat-option *ngFor="let year of yearsList" [value]="year">
+                                                                [(value)]="selectedYear"
+                                                                (selectionChange)="changeBudgetYear($event)">
+                                                                <mat-option *ngFor="let year of yearsList"
+                                                                    [value]="year">
                                                                     {{year}}
                                                                 </mat-option>
                                                             </mat-select>
-                                                            <mat-error [hidden]="false" i18n="Budget year Error|Explains name is required"
-                                                                i18n-aria-label aria-label="Budget year Error|Explains name is required "
+                                                            <mat-error [hidden]="false"
+                                                                i18n="Budget year Error|Explains name is required"
+                                                                i18n-aria-label
+                                                                aria-label="Budget year Error|Explains name is required "
                                                                 *ngIf="budgetdata?.controls['budgetyear']?.touched && budgetdata?.controls['budgetyear'].errors?.required">
                                                                 Field is mandatory
                                                             </mat-error>
@@ -39,7 +45,8 @@
                                                 </div>
                                                 <div class="display-inline-block margin-right-xl width-44">
                                                     <div class="margin-bottom-m">
-                                                        <label for="salarybudget" class="display-block mat-subheading-2 margin-remove-bottom form-label required"
+                                                        <label for="salarybudget"
+                                                            class="display-block mat-subheading-2 margin-remove-bottom form-label required"
                                                             i18n="Salary budget allocated label|Label which explains the user to enter Salary budget allocated"
                                                             i18n-aria-label aria-label="Salary budget allocated label">
                                                             Allocate salary budget
@@ -47,18 +54,24 @@
                                                         <mat-form-field appearance="outline" class="margin-top-xs">
                                                             <input type="text" id="salarybudget" matInput #salarybudget
                                                                 formControlName="salarybudget" i18n-placeholder
-                                                                placeholder="Add budget" i18n-aria-label aria-label="Salary budget allocated input"
-                                                                class="form-input" autocomplete="off" (ngModelChange)='onSalarayChange($event)'
-                                                                [disabled]=overallbudget (keypress)="keyPressNumbers($event)" />
-                                                            <mat-error [hidden]="false" i18n="Salary budget allocated Error|Explains name is required"
-                                                                i18n-aria-label aria-label="Salary budget allocated Error|Explains name is required "
+                                                                placeholder="Add budget" i18n-aria-label
+                                                                aria-label="Salary budget allocated input"
+                                                                class="form-input" autocomplete="off"
+                                                                (ngModelChange)='onSalarayChange($event)'
+                                                                [disabled]=overallbudget
+                                                                (keypress)="keyPressNumbers($event)" maxlength="14" />
+                                                            <mat-error [hidden]="false"
+                                                                i18n="Salary budget allocated Error|Explains name is required"
+                                                                i18n-aria-label
+                                                                aria-label="Salary budget allocated Error|Explains name is required "
                                                                 *ngIf="budgetdata?.controls['salarybudget']?.touched && budgetdata?.controls['salarybudget'].errors?.required">
                                                                 Field is mandatory
                                                             </mat-error>
                                                         </mat-form-field>
                                                     </div>
                                                     <div class="margin-bottom-m">
-                                                        <label for="trainingbudget" class="display-block mat-subheading-2 margin-remove-bottom form-label required"
+                                                        <label for="trainingbudget"
+                                                            class="display-block mat-subheading-2 margin-remove-bottom form-label required"
                                                             i18n="Training budget allocated label|Label which explains the user to enter Training budget allocated"
                                                             i18n-aria-label aria-label="Training budget allocated">
                                                             Allocate training/capacity building budget
@@ -66,35 +79,48 @@
                                                         <mat-form-field appearance="outline" class="margin-top-xs">
                                                             <input id="trainingbudget" matInput #trainingbudget
                                                                 formControlName="trainingbudget" i18n-placeholder
-                                                                placeholder="Add budget" i18n-aria-label aria-label="Training budget allocated input"
-                                                                (ngModelChange)='onTrainingChange($event)' class="form-input"
-                                                                autocomplete="off" [disabled]=overallbudget (keypress)="keyPressNumbers($event)" />
-                                                            <mat-error [hidden]="false" i18n="Training budget allocated Error|Explains name is required"
-                                                                i18n-aria-label aria-label="Training budget allocated Error|Explains name is required "
+                                                                placeholder="Add budget" i18n-aria-label
+                                                                aria-label="Training budget allocated input"
+                                                                (ngModelChange)='onTrainingChange($event)'
+                                                                class="form-input" autocomplete="off"
+                                                                [disabled]=overallbudget
+                                                                (keypress)="keyPressNumbers($event)" maxlength="14" />
+                                                            <mat-error [hidden]="false"
+                                                                i18n="Training budget allocated Error|Explains name is required"
+                                                                i18n-aria-label
+                                                                aria-label="Training budget allocated Error|Explains name is required "
                                                                 *ngIf="budgetdata?.controls['trainingbudget']?.touched && budgetdata?.controls['trainingbudget'].errors?.required">
                                                                 Field is mandatory
                                                             </mat-error>
                                                         </mat-form-field>
                                                     </div>
                                                     <div class="margin-bottom-m">
-                                                        <label for="budgetutilized" class="display-block mat-subheading-2 margin-remove-bottom form-label required"
+                                                        <label for="budgetutilized"
+                                                            class="display-block mat-subheading-2 margin-remove-bottom form-label required"
                                                             i18n="Training budget utilization label|Label which explains the user to enter Training budget utilization"
-                                                            i18n-aria-label aria-label="Training budget utilization label">
+                                                            i18n-aria-label
+                                                            aria-label="Training budget utilization label">
                                                             Projected utilization of training budget
                                                         </label>
                                                         <mat-form-field appearance="outline" class="margin-top-xs">
                                                             <input id="budgetutilized" matInput #budgetutilized
                                                                 formControlName="budgetutilized" i18n-placeholder
-                                                                placeholder="Add budget" i18n-aria-label aria-label="Training budget utilization input"
-                                                                (ngModelChange)='onUtilizedChange($event)' class="form-input"
-                                                                autocomplete="off" (keypress)="keyPressNumbers($event)" />
-                                                            <mat-error [hidden]="false" i18n="Training budget utilization Error|Explains name is required"
-                                                                i18n-aria-label aria-label="Training budget utilization Error|Explains name is required "
+                                                                placeholder="Add budget" i18n-aria-label
+                                                                aria-label="Training budget utilization input"
+                                                                (ngModelChange)='onUtilizedChange($event)'
+                                                                class="form-input" autocomplete="off"
+                                                                (keypress)="keyPressNumbers($event)" maxlength="14" />
+                                                            <mat-error [hidden]="false"
+                                                                i18n="Training budget utilization Error|Explains name is required"
+                                                                i18n-aria-label
+                                                                aria-label="Training budget utilization Error|Explains name is required "
                                                                 *ngIf="budgetdata?.controls['budgetutilized']?.touched && budgetdata?.controls['budgetutilized'].errors?.required">
                                                                 Field is mandatory
                                                             </mat-error>
-                                                            <mat-error [hidden]="false" i18n="Training budget utilization Error|Explains name is required"
-                                                                i18n-aria-label aria-label="Training budget utilization Error|Explains name is required "
+                                                            <mat-error [hidden]="false"
+                                                                i18n="Training budget utilization Error|Explains name is required"
+                                                                i18n-aria-label
+                                                                aria-label="Training budget utilization Error|Explains name is required "
                                                                 *ngIf="utilizedChangeError">
                                                                 Projected utilization should be less than allocated
                                                             </mat-error>
@@ -104,7 +130,8 @@
                                                 <div class="display-inline-block float-right width-44">
                                                     <div class="margin-bottom-m avg-box">
                                                         <p class="mat-title">{{totalbudget}}</p>
-                                                        <p class="mat-subheading-2">Overall budget allocated for the FY</p>
+                                                        <p class="mat-subheading-2">Overall budget allocated for the FY
+                                                        </p>
                                                     </div>
                                                     <div class="margin-bottom-m avg-box">
                                                         <p class="mat-title">{{totalbudgetpercent}}%</p>
@@ -135,14 +162,16 @@
                                                         <div class=rsearch>
                                                             <mat-icon class="color-60 search-icon">search</mat-icon>
                                                             <input class="sinput color-60 mat-body-2 margin-remove-top"
-                                                                type="Standard" label="" (input)="applyFilter($event.target.value)"
-                                                                placeholder="Search">
+                                                                type="Standard" label=""
+                                                                (input)="applyFilter($event.target.value)"
+                                                                placeholder="Search" maxlength="50">
                                                         </div>
                                                     </div>
                                                 </div>
                                                 <div class="flex-1 right-align">
                                                     <button type="button" mat-button class="create-btn mat-subheading-2"
-                                                        (click)="onaddScehme('')" *ngIf="selectedYear !== prevBudgetYear">
+                                                        (click)="onaddScehme('')"
+                                                        *ngIf="selectedYear !== prevBudgetYear">
                                                         Add scheme
                                                     </button>
                                                 </div>
@@ -151,8 +180,10 @@
                                         <mat-table #table matSort [matSortActive]="scehemetableData!.sortColumn"
                                             [matSortDirection]="scehemetableData!.sortState" [dataSource]="dataSource"
                                             class="schemetable responsiveTable">
-                                            <ng-container matColumnDef="{{col.key}}" *ngFor="let col of scehemetableData!.columns">
-                                                <mat-header-cell *matHeaderCellDef mat-sort-header class=".h-400-r-14-l color-60">
+                                            <ng-container matColumnDef="{{col.key}}"
+                                                *ngFor="let col of scehemetableData!.columns">
+                                                <mat-header-cell *matHeaderCellDef mat-sort-header
+                                                    class=".h-400-r-14-l color-60">
                                                     {{col.displayName}}
                                                 </mat-header-cell>
                                                 <mat-cell *matCellDef="let element">
@@ -164,8 +195,10 @@
                                                     </span>
                                                 </mat-cell>
                                             </ng-container>
-                                            <ng-container matColumnDef="Actions" *ngIf="scehemetableData!.actions && scehemetableData!.actions.length > 0">
-                                                <mat-header-cell *matHeaderCellDef class="clr-darkish-blue action-header">
+                                            <ng-container matColumnDef="Actions"
+                                                *ngIf="scehemetableData!.actions && scehemetableData!.actions.length > 0">
+                                                <mat-header-cell *matHeaderCellDef
+                                                    class="clr-darkish-blue action-header">
                                                     Actions
                                                 </mat-header-cell>
                                                 <mat-cell *matCellDef="let row" class="action-cell">
@@ -184,13 +217,14 @@
                                                 </mat-cell>
                                             </ng-container>
                                             <ng-container matColumnDef="Menu">
-                                                <mat-header-cell *matHeaderCellDef class="clr-darkish-blue action-header">
+                                                <mat-header-cell *matHeaderCellDef
+                                                    class="clr-darkish-blue action-header">
                                                     <!-- <mat-icon>view_comfy</mat-icon> -->
                                                 </mat-header-cell>
                                                 <mat-cell *matCellDef="let row" class="action-cell">
-                                                    <button type="button" mat-icon-button i18n-aria-label aria-label="action items"
-                                                        [matMenuTriggerFor]="cardMenu" [matMenuTriggerData]="{'data':row}"
-                                                        class="action-btn">
+                                                    <button type="button" mat-icon-button i18n-aria-label
+                                                        aria-label="action items" [matMenuTriggerFor]="cardMenu"
+                                                        [matMenuTriggerData]="{'data':row}" class="action-btn">
                                                         <mat-icon>more_horiz</mat-icon>
                                                     </button>
                                                 </mat-cell>
@@ -198,24 +232,30 @@
 
                                             <mat-header-row *matHeaderRowDef="getFinalColumns()"></mat-header-row>
 
-                                            <mat-row *matRowDef="let row; columns: getFinalColumns();" (click)="selection.toggle(row);">
+                                            <mat-row *matRowDef="let row; columns: getFinalColumns();"
+                                                (click)="selection.toggle(row);">
                                             </mat-row>
                                         </mat-table>
-                                        <mat-card class="flex-1" role="none" *ngIf="!dataSource.filter && dataSource.filteredData.length == 0">
+                                        <mat-card class="flex-1" role="none"
+                                            *ngIf="!dataSource.filter && dataSource.filteredData.length == 0">
                                             <span class="mat-subtitle ws-mat-black40-text">Click on 'Add scheme' to
                                                 start entering data</span>
                                         </mat-card>
-                                        <mat-card class="flex-1" role="none" *ngIf="dataSource.filter && dataSource.filteredData.length == 0">
-                                            <span class="mat-subtitle ws-mat-black40-text">No search reuslts found.</span>
+                                        <mat-card class="flex-1" role="none"
+                                            *ngIf="dataSource.filter && dataSource.filteredData.length == 0">
+                                            <span class="mat-subtitle ws-mat-black40-text">No search reuslts
+                                                found.</span>
                                         </mat-card>
                                     </div>
-                                    <mat-paginator [length]="length" [pageSize]="pageSize" [pageSizeOptions]="pageSizeOptions">
+                                    <mat-paginator [length]="length" [pageSize]="pageSize"
+                                        [pageSizeOptions]="pageSizeOptions">
                                     </mat-paginator>
                                 </div>
                                 <mat-menu #cardMenu="matMenu">
                                     <ng-template matMenuContent let-rowData="data">
-                                        <button (click)="updateData(rowData)" mat-menu-item name="channel-analytics-button"
-                                            class="ws-mat-primary-text" i18n-aria-label aria-label="Analytics">
+                                        <button (click)="updateData(rowData)" mat-menu-item
+                                            name="channel-analytics-button" class="ws-mat-primary-text" i18n-aria-label
+                                            aria-label="Analytics">
                                             <span>Edit</span>
                                         </button>
                                         <!-- <button (click)="deleteBudgetDetails(rowData)" mat-menu-item name="channel-analytics-button"
diff --git a/project/ws/app/src/lib/routes/home/routes/staff/staff.component.html b/project/ws/app/src/lib/routes/home/routes/staff/staff.component.html
index 2d50cdb0c..718e5a102 100644
--- a/project/ws/app/src/lib/routes/home/routes/staff/staff.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/staff/staff.component.html
@@ -11,7 +11,8 @@
                         <form class="example-container" [formGroup]="staffdata">
                             <div class="display-block">
                                 <div class="display-inline-block margin-right-xl">
-                                    <label for="totalpositions" class="display-block mat-subheading-2 margin-remove-bottom form-label"
+                                    <label for="totalpositions"
+                                        class="display-block mat-subheading-2 margin-remove-bottom form-label"
                                         i18n="Total positions label|Label which explains the user to enter total positions"
                                         i18n-aria-label aria-label="Total positions label">
                                         Total positions
@@ -19,8 +20,9 @@
                                     <mat-form-field appearance="outline" class="margin-top-xs">
                                         <input type="text" [readonly]="isDisabled" id="totalpositions" matInput
                                             #totalpositions formControlName="totalpositions" i18n-placeholder
-                                            placeholder="0" i18n-aria-label aria-label="Total positions input" class="form-input"
-                                            autocomplete="off" [disabled]="isDisabled" style="opacity: 0.9" />
+                                            placeholder="0" i18n-aria-label aria-label="Total positions input"
+                                            class="form-input" autocomplete="off" [disabled]="isDisabled"
+                                            style="opacity: 0.9" maxlength="5" />
                                         <!-- <mat-error [hidden]="false" i18n="Total positions Error|Explains name is required" i18n-aria-label
                                     aria-label="Total positions Error|Explains name is required "
                                     *ngIf="staffdata?.controls['totalpositions']?.touched && staffdata?.controls['totalpositions'].errors?.required">
@@ -29,42 +31,50 @@
                                     </mat-form-field>
                                 </div>
                                 <div class="display-inline-block margin-right-xl">
-                                    <label for="posfilled" class="display-block mat-subheading-2 margin-remove-bottom form-label required"
+                                    <label for="posfilled"
+                                        class="display-block mat-subheading-2 margin-remove-bottom form-label required"
                                         i18n="Total positions filled label|Label which explains the user to enter total positions"
                                         i18n-aria-label aria-label="Total positions label">
                                         Total positions filled
                                     </label>
                                     <mat-form-field appearance="outline" class="margin-top-xs">
                                         <input id="posfilled" matInput #posfilled formControlName="posfilled"
-                                            i18n-placeholder placeholder="Add number" i18n-aria-label aria-label="Total positions filled input"
-                                            class="form-input" autocomplete="off" (keypress)="keyPressNumbers($event)" />
-                                        <mat-error [hidden]="false" i18n="Total positions filled Error|Explains name is required"
-                                            i18n-aria-label aria-label="Total positions filled Error|Explains name is required "
+                                            i18n-placeholder placeholder="Add number" i18n-aria-label
+                                            aria-label="Total positions filled input" class="form-input"
+                                            autocomplete="off" (keypress)="keyPressNumbers($event)" maxlength="5" />
+                                        <mat-error [hidden]="false"
+                                            i18n="Total positions filled Error|Explains name is required"
+                                            i18n-aria-label
+                                            aria-label="Total positions filled Error|Explains name is required "
                                             *ngIf="staffdata?.controls['posfilled']?.touched && staffdata?.controls['posfilled'].errors?.required">
                                             Field is mandatory
                                         </mat-error>
                                     </mat-form-field>
                                 </div>
                                 <div class="display-inline-block margin-right-xl">
-                                    <label for="posvacant" class="display-block mat-subheading-2 margin-remove-bottom form-label required"
+                                    <label for="posvacant"
+                                        class="display-block mat-subheading-2 margin-remove-bottom form-label required"
                                         i18n="Total positions vacant label|Label which explains the user to enter total positions"
                                         i18n-aria-label aria-label="Total positions label">
                                         Total positions vacant
                                     </label>
                                     <mat-form-field appearance="outline" class="margin-top-xs">
                                         <input id="posvacant" matInput #posvacant formControlName="posvacant"
-                                            i18n-placeholder placeholder="Add number" i18n-aria-label aria-label="Total positions vacant input"
-                                            class="form-input" autocomplete="off" (keypress)="keyPressNumbers($event)" />
-                                        <mat-error [hidden]="false" i18n="Total positions vacant Error|Explains name is required"
-                                            i18n-aria-label aria-label="Total positions vacant Error|Explains name is required "
+                                            i18n-placeholder placeholder="Add number" i18n-aria-label
+                                            aria-label="Total positions vacant input" class="form-input"
+                                            autocomplete="off" (keypress)="keyPressNumbers($event)" maxlength="5" />
+                                        <mat-error [hidden]="false"
+                                            i18n="Total positions vacant Error|Explains name is required"
+                                            i18n-aria-label
+                                            aria-label="Total positions vacant Error|Explains name is required "
                                             *ngIf="staffdata?.controls['posvacant']?.touched && staffdata?.controls['posvacant'].errors?.required">
                                             Field is mandatory
                                         </mat-error>
                                     </mat-form-field>
                                 </div>
                             </div>
-                            <button mat-raised-button type="submit" (click)="onSubmit(staffdata)" class="text-white btn-success btn-responsive"
-                                [disabled]="staffdata?.invalid">
+                            <button mat-raised-button type="submit" (click)="onSubmit(staffdata)"
+                                class="text-white btn-success btn-responsive" [disabled]="staffdata?.invalid">
                                 <span class="text-white" i18n>Save</span>
                             </button>
                         </form>
@@ -84,19 +94,22 @@
                                     <div class=rsearch>
                                         <mat-icon class="color-60 search-icon">search</mat-icon>
                                         <input class="sinput color-60 mat-body-2 margin-remove-top" type="Standard"
-                                            label="" (input)="applyFilter($event.target.value)" placeholder="Search">
+                                            label="" (input)="applyFilter($event.target.value)" placeholder="Search"
+                                            maxlength="50">
                                     </div>
                                 </div>
                             </div>
                             <div class="flex-1 right-align">
-                                <button type="button" mat-button class="create-btn mat-subheading-2" (click)="onAddPosition('')">
+                                <button type="button" mat-button class="create-btn mat-subheading-2"
+                                    (click)="onAddPosition('')">
                                     Add position
                                 </button>
                             </div>
                         </div>
                     </div>
-                    <mat-table #table matSort [matSortActive]="tableData!.sortColumn" [matSortDirection]="tableData!.sortState"
-                        [dataSource]="dataSource" class="example-table table1 responsiveTable">
+                    <mat-table #table matSort [matSortActive]="tableData!.sortColumn"
+                        [matSortDirection]="tableData!.sortState" [dataSource]="dataSource"
+                        class="example-table table1 responsiveTable">
                         <ng-container matColumnDef="{{col.key}}" *ngFor="let col of tableData!.columns">
                             <mat-header-cell *matHeaderCellDef mat-sort-header class=".h-400-r-14-l color-60">
                                 {{col.displayName}}
@@ -110,7 +123,8 @@
                                 </span>
                             </mat-cell>
                         </ng-container>
-                        <ng-container matColumnDef="Actions" *ngIf="tableData!.actions && tableData!.actions.length > 0">
+                        <ng-container matColumnDef="Actions"
+                            *ngIf="tableData!.actions && tableData!.actions.length > 0">
                             <mat-header-cell *matHeaderCellDef class="clr-darkish-blue action-header"> Actions
                             </mat-header-cell>
                             <mat-cell *matCellDef="let row" class="action-cell">
@@ -134,7 +148,8 @@
                             </mat-header-cell>
                             <mat-cell *matCellDef="let row" class="action-cell">
                                 <button type="button" mat-icon-button i18n-aria-label aria-label="action items"
-                                    [matMenuTriggerFor]="cardMenu" [matMenuTriggerData]="{'data':row}" class="action-btn">
+                                    [matMenuTriggerFor]="cardMenu" [matMenuTriggerData]="{'data':row}"
+                                    class="action-btn">
                                     <mat-icon>more_horiz</mat-icon>
                                 </button>
                             </mat-cell>
@@ -145,10 +160,13 @@
                         <mat-row *matRowDef="let row; columns: getFinalColumns();" (click)="selection.toggle(row);">
                         </mat-row>
                     </mat-table>
-                    <mat-card class="flex-1" role="none" *ngIf="!dataSource.filter && dataSource.filteredData.length == 0">
-                        <span class="mat-subtitle ws-mat-black40-text">Click on 'Add position' to start entering data</span>
+                    <mat-card class="flex-1" role="none"
+                        *ngIf="!dataSource.filter && dataSource.filteredData.length == 0">
+                        <span class="mat-subtitle ws-mat-black40-text">Click on 'Add position' to start entering
+                            data</span>
                     </mat-card>
-                    <mat-card class="flex-1" role="none" *ngIf="dataSource.filter && dataSource.filteredData.length == 0">
+                    <mat-card class="flex-1" role="none"
+                        *ngIf="dataSource.filter && dataSource.filteredData.length == 0">
                         <span class="mat-subtitle ws-mat-black40-text">No search reuslts found.</span>
                     </mat-card>
                 </div>
@@ -157,12 +175,12 @@
             </div>
             <mat-menu #cardMenu="matMenu">
                 <ng-template matMenuContent let-rowData="data">
-                    <button (click)="updateData(rowData)" mat-menu-item name="channel-analytics-button" class="ws-mat-primary-text"
-                        i18n-aria-label aria-label="Analytics">
+                    <button (click)="updateData(rowData)" mat-menu-item name="channel-analytics-button"
+                        class="ws-mat-primary-text" i18n-aria-label aria-label="Analytics">
                         <span>Edit</span>
                     </button>
-                    <button (click)="deleteStaffDetails(rowData)" mat-menu-item name="channel-analytics-button" class="ws-mat-primary-text"
-                        i18n-aria-label aria-label="Analytics">
+                    <button (click)="deleteStaffDetails(rowData)" mat-menu-item name="channel-analytics-button"
+                        class="ws-mat-primary-text" i18n-aria-label aria-label="Analytics">
                         <span>Delete</span>
                     </button>
                 </ng-template>
diff --git a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html
index d75c6723a..6b0cda620 100644
--- a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html
+++ b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html
@@ -30,7 +30,8 @@
                   </label>
                   <mat-form-field appearance="outline" class="margin-top-xs">
                     <input id="fname" matInput #fname formControlName="fname" i18n-placeholder placeholder="Type here"
-                      i18n-aria-label aria-label="First name input" class="form-input" autocomplete="off" />
+                      i18n-aria-label aria-label="First name input" class="form-input" autocomplete="off"
+                      maxlength="150" />
                     <mat-error [hidden]="false" i18n="First name Error|Explains name is required" i18n-aria-label
                       aria-label="First name Error|Explains name is required "
                       *ngIf="createUserForm?.controls['fname']?.touched && createUserForm?.controls['fname'].errors?.required">
@@ -50,7 +51,8 @@
                   </label>
                   <mat-form-field appearance="outline" class="margin-top-xs">
                     <input id="lname" matInput #lname formControlName="lname" i18n-placeholder placeholder="Type here"
-                      i18n-aria-label aria-label="Last name input" class="form-input" autocomplete="off" />
+                      i18n-aria-label aria-label="Last name input" class="form-input" autocomplete="off"
+                      maxlength="150" />
                     <mat-error [hidden]="false" i18n="Last name Error|Explains name is required" i18n-aria-label
                       aria-label="Last name Error|Explains name is required "
                       *ngIf="createUserForm?.controls['lname']?.touched && createUserForm?.controls['lname'].errors?.required">
@@ -70,7 +72,7 @@
                   </label>
                   <mat-form-field appearance="outline" class="margin-top-xs">
                     <input id="email" matInput #email formControlName="email" i18n-placeholder placeholder="Type here"
-                      i18n-aria-label aria-label="Email input" class="form-input" autocomplete="off" />
+                      i18n-aria-label aria-label="Email input" class="form-input" autocomplete="off" maxlength="150" />
                     <mat-error [hidden]="false" i18n="Email Error|Explains name is required" i18n-aria-label
                       aria-label="Email Error|Explains name is required "
                       *ngIf="createUserForm?.controls['email']?.touched && createUserForm?.controls['email'].errors?.required">
@@ -91,7 +93,7 @@
                     <mat-form-field appearance="outline" class="w-full margin-top-xs">
                       <input id="department" class="form-input" [(ngModel)]="departmentName" type="text" matInput
                         placeholder="Type here" formControlName="department" i18n-aria-label
-                        aria-label="Department input filed" readonly>
+                        aria-label="Department input filed" readonly maxlength="250">
                     </mat-form-field>
                   </div>
 

From 7a06a861d2b8e9b5d9a41a59e40210b04d14ec82 Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Sat, 11 Mar 2023 06:51:11 +0530
Subject: [PATCH 067/887] Added maxlength inpu validations for events & wat

---
 .../work-order-popup/pop-up.component.html      |  8 ++++----
 .../event-list-view.component.html              | 17 ++++++-----------
 .../participants/participants.component.html    |  3 ++-
 .../create-event/create-event.component.html    | 14 +++++++-------
 .../activity-labels.component.html              |  9 +++++----
 .../competency-labels.component.html            |  7 ++++---
 .../components/officer/officer.component.html   |  7 ++++---
 .../draft-allocations.component.html            |  4 ++--
 .../published-allocations.component.html        |  4 ++--
 9 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/project/ws/app/src/lib/head/work-allocation-table/work-order-popup/pop-up.component.html b/project/ws/app/src/lib/head/work-allocation-table/work-order-popup/pop-up.component.html
index 86458f825..058d45d8a 100644
--- a/project/ws/app/src/lib/head/work-allocation-table/work-order-popup/pop-up.component.html
+++ b/project/ws/app/src/lib/head/work-allocation-table/work-order-popup/pop-up.component.html
@@ -4,12 +4,12 @@ <h1 class="title-margin">Create a new draft work order</h1>
         <div>
             <span class="mat-button mar-15">Name of the draft</span> <br />
             <input class="sinput-1" type="Standard" [(ngModel)]="workOrder" [disabled]='true' placeholder="Work Order"
-                required>
+                required maxlength="500">
         </div>
         <span class="hypen">-</span>
         <div>
             <input class="sinput-2" type="Standard" [(ngModel)]="currentCheckedValue" #wordOrderName="ngModel"
-                placeholder="Type the name here" required> <br />
+                placeholder="Type the name here" required maxlength="500"> <br />
             <span class="ws-mat-red-text" *ngIf="(!wordOrderName.valid) && wordOrderName.touched && isBlank">
                 Please enter the blank work order name</span>
             <span class="ws-mat-red-text" *ngIf="(!wordOrderName.valid) && wordOrderName.touched && !isBlank">
@@ -25,7 +25,7 @@ <h1 class="title-margin">Create a new draft work order</h1>
                     <div class=rsearch>
                         <mat-icon class="color-60 search-icon">search</mat-icon>
                         <input class="sinput" type="Standard" label="" placeholder="Search"
-                            (input)="applyFilter($event.target.value)">
+                            (input)="applyFilter($event.target.value)" maxlength="200">
                     </div>
                 </div>
             </div>
@@ -84,4 +84,4 @@ <h1 class="title-margin">Create a new draft work order</h1>
         <span class="text-white" i18n>Create copy work order</span>
     </button>
 
-</mat-dialog-actions>
+</mat-dialog-actions>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.html b/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.html
index 9ca1742fd..7d00ee514 100644
--- a/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.html
+++ b/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.html
@@ -8,7 +8,7 @@
                         <div class=rsearch>
                             <mat-icon class="color-60 search-icon">search</mat-icon>
                             <input class="sinput color-60" type="Standard" label=""
-                                (input)="applyFilter($event.target.value)" placeholder="Search">
+                                (input)="applyFilter($event.target.value)" placeholder="Search" maxlength="200">
                         </div>
                     </div>
                 </div>
@@ -34,7 +34,8 @@
                         {{element[col.key]}} {{col.isList}}
                     </span>
                     <span *ngIf="!col.isList && col.key == 'eventThumbnail'" class="h-400-r-14-l color-87 textclass">
-                        <img src="{{element[col.key]}}" height="50" *ngIf="element[col.key] != undefined" (click)="showImageDialog(element[col.key])">
+                        <img src="{{element[col.key]}}" height="50" *ngIf="element[col.key] != undefined"
+                            (click)="showImageDialog(element[col.key])">
                         <ng-container *ngIf="element[col.key] == undefined">
                             <span style="padding-left:7px;">---</span>
                         </ng-container>
@@ -53,9 +54,7 @@
                 </mat-cell>
             </ng-container>
             <mat-header-row *matHeaderRowDef="getFinalColumns()"></mat-header-row>
-            <mat-row 
-                *matRowDef="let row; columns: getFinalColumns();" 
-                (click)="selection.toggle(row);">
+            <mat-row *matRowDef="let row; columns: getFinalColumns();" (click)="selection.toggle(row);">
             </mat-row>
             <div *ngIf="dataSource.filteredData.length <= 0">
                 <mat-row *matRowDef="let row; columns: getFinalColumns();"
@@ -65,13 +64,9 @@
             </div>
         </mat-table>
     </div>
-    <div *ngIf="dataSource.filteredData.length <= 0" 
-        class="h-600-s-20-m color-60 text-center">
+    <div *ngIf="dataSource.filteredData.length <= 0" class="h-600-s-20-m color-60 text-center">
         No result found
     </div>
-    <mat-paginator 
-        [length]="length" 
-        [pageSize]="pageSize" 
-        [pageSizeOptions]="pageSizeOptions">
+    <mat-paginator [length]="length" [pageSize]="pageSize" [pageSizeOptions]="pageSizeOptions">
     </mat-paginator>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/events/components/participants/participants.component.html b/project/ws/app/src/lib/routes/events/components/participants/participants.component.html
index 43cf1e299..5c058c80a 100644
--- a/project/ws/app/src/lib/routes/events/components/participants/participants.component.html
+++ b/project/ws/app/src/lib/routes/events/components/participants/participants.component.html
@@ -5,7 +5,8 @@
         </p>
     </div>
     <mat-form-field appearance="outline" class="margin-top-xs">
-        <input matInput placeholder="Search" aria-label="State" [matAutocomplete]="auto" [formControl]="searchUserCtrl">
+        <input matInput placeholder="Search" aria-label="State" [matAutocomplete]="auto" [formControl]="searchUserCtrl"
+            maxlength="200">
         <mat-autocomplete #auto="matAutocomplete">
             <mat-option *ngIf="isLoading" class="is-loading">Loading...</mat-option>
             <ng-container *ngIf="!isLoading">
diff --git a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.html b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.html
index b5979b819..c0e498194 100644
--- a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.html
+++ b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.html
@@ -83,7 +83,7 @@
                                                         formControlName="eventTitle" i18n-placeholder
                                                         placeholder="Type here" i18n-aria-label
                                                         aria-label="Event Title input" class="form-input"
-                                                        (keypress)="omit_special_char($event)" />
+                                                        (keypress)="omit_special_char($event)" maxlength="500" />
                                                     <mat-error [hidden]="false"
                                                         i18n="Event title Error|Explains event title is required"
                                                         i18n-aria-label
@@ -105,8 +105,8 @@
                                                 <mat-form-field appearance="outline" class="margin-top-xs">
                                                     <textarea id="summary" matInput #summary formControlName="summary"
                                                         i18n-placeholder placeholder="Type here" i18n-aria-label
-                                                        aria-label="Summary input" class="form-input" rows="8"
-                                                        cols="40"></textarea>
+                                                        aria-label="Summary input" class="form-input" rows="8" cols="40"
+                                                        maxlength="2000"></textarea>
                                                     <mat-error [hidden]="false"
                                                         i18n="Summary Error|Explains summary is required"
                                                         i18n-aria-label
@@ -132,7 +132,7 @@
                                                         formControlName="description" i18n-placeholder
                                                         placeholder="Type here" i18n-aria-label
                                                         aria-label="description input" class="form-input" rows="8"
-                                                        cols="40"></textarea>
+                                                        cols="40" maxlength="2000"></textarea>
                                                     <mat-error [hidden]="false"
                                                         i18n="description Error|Explains description is required"
                                                         i18n-aria-label
@@ -154,8 +154,8 @@
                                                 <mat-form-field appearance="outline" class="margin-top-xs">
                                                     <textarea id="agenda" matInput #agenda formControlName="agenda"
                                                         i18n-placeholder placeholder="Type here" i18n-aria-label
-                                                        aria-label="agenda input" class="form-input" rows="8"
-                                                        cols="40"></textarea>
+                                                        aria-label="agenda input" class="form-input" rows="8" cols="40"
+                                                        maxlength="2000"></textarea>
                                                     <mat-error [hidden]="false"
                                                         i18n="agenda Error|Explains agenda is required" i18n-aria-label
                                                         aria-label="agenda Error|Explains agenda is required "
@@ -315,7 +315,7 @@
                                                         formControlName="conferenceLink" i18n-placeholder
                                                         placeholder="Type here" i18n-aria-label
                                                         aria-label="conferenceLink input" class="form-input" rows="4"
-                                                        cols="40" />
+                                                        cols="40" maxlength="500" />
                                                     <mat-error [hidden]="false"
                                                         i18n="conferenceLink Error|Explains conferenceLink is required"
                                                         i18n-aria-label
diff --git a/project/ws/app/src/lib/routes/workallocation-v2/components/activity-labels/activity-labels.component.html b/project/ws/app/src/lib/routes/workallocation-v2/components/activity-labels/activity-labels.component.html
index 4872e6410..d921e6e85 100644
--- a/project/ws/app/src/lib/routes/workallocation-v2/components/activity-labels/activity-labels.component.html
+++ b/project/ws/app/src/lib/routes/workallocation-v2/components/activity-labels/activity-labels.component.html
@@ -39,7 +39,7 @@
                     <input [attr.id]="'actDesc_' + i" matInput #actDesc formControlName="activityDescription"
                       i18n-placeholder placeholder="Type here" i18n-aria-label aria-label="Activity name input"
                       class="form-input flex-1" (input)="filterActivities(actDesc.value)"
-                      [matAutocomplete]="activityAuto" autocomplete="off" />
+                      [matAutocomplete]="activityAuto" autocomplete="off" maxlength="250" />
                     <mat-autocomplete #activityAuto="matAutocomplete">
                       <div class="mat-body-4 ws-mat-accent-text padding-s">From activity dictionary</div>
                       <mat-option *ngFor="let activity of filteredActivityDesc | async" [value]="activity.description">
@@ -57,7 +57,8 @@
                     </ws-app-initial-avatar>
                     <input [attr.id]="'assignto_' + i" matInput #assignto formControlName="assignedTo" i18n-placeholder
                       placeholder="Type here" i18n-aria-label #assignedTo class="form-input flex-1"
-                      [matAutocomplete]="assignToAuto" (input)="filterUsers(assignedTo.value)" autocomplete="off" />
+                      [matAutocomplete]="assignToAuto" (input)="filterUsers(assignedTo.value)" autocomplete="off"
+                      maxlength="250" />
                     <mat-autocomplete #assignToAuto="matAutocomplete" (optionSelected)="userClicked($event, i,'to')">
                       <mat-option [value]="''">
                         <div class="ws-mat-accent-border-bottom padding-m padding-left-s padding-bottom-xs">
@@ -195,7 +196,7 @@
                         class="form-input flex-1" [matAutocomplete]="roleDescriptionAuto"
                         (click)="setSelectedFilter(gaIdx)" (input)="filterActivities(actDesc.value, gaIdx)"
                         autocomplete="off" cdkTextareaAutosize #autosize="cdkTextareaAutosize" cdkAutosizeMinRows="1"
-                        cdkAutosizeMaxRows="5"></textarea>
+                        cdkAutosizeMaxRows="5" maxlength="2000"></textarea>
                       <mat-autocomplete #roleDescriptionAuto="matAutocomplete"
                         (optionSelected)="activitySelected($event,i)">
                         <ng-container
@@ -240,7 +241,7 @@
                       <input [attr.id]="'assignto_' + gaIdx" class="form-input flex-1" matInput #assignedTo
                         formControlName="assignedTo" i18n-placeholder placeholder="Type here" i18n-aria-label
                         aria-label="Type here" [matAutocomplete]="auto" (input)="filterUsers(assignedTo.value)"
-                        autocomplete="off" (click)="setSelectedFilter(gaIdx)">
+                        autocomplete="off" (click)="setSelectedFilter(gaIdx)" maxlength="250">
                       <mat-autocomplete #auto="matAutocomplete" (optionSelected)="userClicked($event, i,'to')">
                         <mat-option [value]="'Final authority'">
                           <div class="ws-mat-accent-border-bottom padding-m padding-left-s padding-bottom-xs">
diff --git a/project/ws/app/src/lib/routes/workallocation-v2/components/competency-labels/competency-labels.component.html b/project/ws/app/src/lib/routes/workallocation-v2/components/competency-labels/competency-labels.component.html
index 5496d62e1..e8d707b78 100644
--- a/project/ws/app/src/lib/routes/workallocation-v2/components/competency-labels/competency-labels.component.html
+++ b/project/ws/app/src/lib/routes/workallocation-v2/components/competency-labels/competency-labels.component.html
@@ -40,7 +40,7 @@
                     <input [attr.id]="'compName_' + i" matInput #compName formControlName="compDescription"
                       i18n-placeholder placeholder="Type here" i18n-aria-label aria-label="Activity name input"
                       class="form-input flex-1" (input)="filterCompetencies(compName.value)"
-                      [matAutocomplete]="competencyAuto" autocomplete="off" />
+                      [matAutocomplete]="competencyAuto" autocomplete="off" maxlength="250" />
                     <mat-autocomplete [attr.id]="'compAuto1_' + i" #competencyAuto="matAutocomplete"
                       (optionSelected)="competencySelected($event,i)">
                       <ng-container
@@ -168,7 +168,8 @@
                       <input [attr.id]="'compName_' + gaIdx" formControlName="compName" matInput #compName
                         i18n-placeholder placeholder="Type here" i18n-aria-label aria-label="Activity name input"
                         class="form-input flex-1" autocomplete="off" (click)="setSelectedFilter(gaIdx)"
-                        (input)="filterCompetencies(compName.value, gaIdx)" [matAutocomplete]="competencyAuto1" />
+                        (input)="filterCompetencies(compName.value, gaIdx)" [matAutocomplete]="competencyAuto1"
+                        maxlength="250" />
                       <mat-autocomplete [attr.id]="'compAuto_' + gaIdx" #competencyAuto1="matAutocomplete"
                         (optionSelected)="competencySelected($event,i)">
                         <ng-container
@@ -210,7 +211,7 @@
                       <textarea [attr.id]="'compt_' + gaIdx" class="form-input flex-1" matInput #OfficerName
                         formControlName="compDescription" i18n-placeholder placeholder="Type here" i18n-aria-label
                         aria-label="Type here" autocomplete="off" cdkTextareaAutosize #autosize="cdkTextareaAutosize"
-                        cdkAutosizeMinRows="1" cdkAutosizeMaxRows="5"></textarea>
+                        cdkAutosizeMinRows="1" cdkAutosizeMaxRows="5" maxlength="2000"></textarea>
                     </mat-form-field>
                   </div>
                   <div *ngIf="i === 0" class="flex margin-auto">
diff --git a/project/ws/app/src/lib/routes/workallocation-v2/components/officer/officer.component.html b/project/ws/app/src/lib/routes/workallocation-v2/components/officer/officer.component.html
index 1532abee3..96ba4952f 100644
--- a/project/ws/app/src/lib/routes/workallocation-v2/components/officer/officer.component.html
+++ b/project/ws/app/src/lib/routes/workallocation-v2/components/officer/officer.component.html
@@ -9,7 +9,7 @@
           <ws-app-initial-avatar *ngIf="officerName.value.length" [name]="officerName.value"></ws-app-initial-avatar>
           <input matInput onfocus="this.select()" aria-label="Officer" [matAutocomplete]="auto" #officerName
             name="officerName" formControlName="officerName" i18n-placeholder placeholder="Type here" i18n-aria-label
-            aria-label="Type here" (input)="filterUsers(officerName.value)">
+            aria-label="Type here" (input)="filterUsers(officerName.value)" maxlength="250">
           <mat-autocomplete #auto="matAutocomplete" (optionSelected)="officerClicked($event)">
             <div class="mat-body-4 ws-mat-accent-text padding-s">From Karmayogi officer portal</div>
             <mat-option *ngFor="let user of filteredUserslist | async" [value]="user">
@@ -70,7 +70,8 @@
           <textarea onfocus="this.select()" id="position" class="form-input flex-1" matInput #position name="position"
             formControlName="position" i18n-placeholder placeholder="Type here" i18n-aria-label aria-label="Type here"
             autocomplete="off" [matAutocomplete]="positionAuto" (input)="filterPositions(position.value)"
-            cdkTextareaAutosize #autosize="cdkTextareaAutosize" cdkAutosizeMinRows="1" cdkAutosizeMaxRows="5">
+            cdkTextareaAutosize #autosize="cdkTextareaAutosize" cdkAutosizeMinRows="1" cdkAutosizeMaxRows="5"
+            maxlength="250">
             </textarea>
           <mat-autocomplete #positionAuto="matAutocomplete" (optionSelected)="postionClicked($event)">
             <div class="mat-body-4 ws-mat-accent-text padding-s">From position dictionary</div>
@@ -93,7 +94,7 @@
           <textarea onfocus="this.select()" id="description" class="form-input flex-1" matInput #description
             name="description" formControlName="positionDescription" i18n-placeholder placeholder="Type here"
             i18n-aria-label aria-label="Type here" autocomplete="off" matTextareaAutosize matAutosizeMinRows=1
-            matAutosizeMaxRows=5>
+            matAutosizeMaxRows=5 maxlength="2000">
           </textarea>
         </mat-form-field>
       </div>
diff --git a/project/ws/app/src/lib/routes/workallocation-v2/routes/draft-allocations/draft-allocations.component.html b/project/ws/app/src/lib/routes/workallocation-v2/routes/draft-allocations/draft-allocations.component.html
index 69ecea1a2..6195205b2 100644
--- a/project/ws/app/src/lib/routes/workallocation-v2/routes/draft-allocations/draft-allocations.component.html
+++ b/project/ws/app/src/lib/routes/workallocation-v2/routes/draft-allocations/draft-allocations.component.html
@@ -81,7 +81,7 @@
                 <div class=rsearch>
                   <mat-icon class="color-60 search-icon">search</mat-icon>
                   <input class="sinput color-60 margin-top-m mat-body-2" type="Standard" label="searchVal"
-                    [(ngModel)]="term" placeholder="Search">
+                    [(ngModel)]="term" placeholder="Search" maxlength="200">
                 </div>
               </div>
             </div>
@@ -208,4 +208,4 @@
         <div *ngIf="!downloaddata && data && data.length > 0"> -->
   <!-- <ws-app-download-allocation id="downloadtemp" [data]="data" [deptname]="departmentName"></ws-app-download-allocation> -->
   <!-- </div> -->
-</div>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/workallocation-v2/routes/published-allocations/published-allocations.component.html b/project/ws/app/src/lib/routes/workallocation-v2/routes/published-allocations/published-allocations.component.html
index 5dd5d5f26..630c92801 100644
--- a/project/ws/app/src/lib/routes/workallocation-v2/routes/published-allocations/published-allocations.component.html
+++ b/project/ws/app/src/lib/routes/workallocation-v2/routes/published-allocations/published-allocations.component.html
@@ -73,7 +73,7 @@
                 <div class=rsearch>
                   <mat-icon class="color-60 search-icon">search</mat-icon>
                   <input class="sinput color-60 margin-top-m mat-body-2" type="Standard" label="searchVal"
-                    [(ngModel)]="term" placeholder="Search">
+                    [(ngModel)]="term" placeholder="Search" maxlength="200">
                 </div>
               </div>
             </div>
@@ -193,4 +193,4 @@
         <div *ngIf="!downloaddata && data && data.length > 0"> -->
   <!-- <ws-app-download-allocation id="downloadtemp" [data]="data" [deptname]="departmentName" [currentFilter]="currentFilter"></ws-app-download-allocation> -->
   <!-- </div> -->
-</div>
+</div>
\ No newline at end of file

From c3d0f2cd2714216905faa7df8b52bfeb7221f0b2 Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Tue, 14 Mar 2023 15:37:44 +0530
Subject: [PATCH 068/887] Updated maxlength for presenters search bar

---
 .../events/components/participants/participants.component.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/events/components/participants/participants.component.html b/project/ws/app/src/lib/routes/events/components/participants/participants.component.html
index 5c058c80a..f8b484948 100644
--- a/project/ws/app/src/lib/routes/events/components/participants/participants.component.html
+++ b/project/ws/app/src/lib/routes/events/components/participants/participants.component.html
@@ -6,7 +6,7 @@
     </div>
     <mat-form-field appearance="outline" class="margin-top-xs">
         <input matInput placeholder="Search" aria-label="State" [matAutocomplete]="auto" [formControl]="searchUserCtrl"
-            maxlength="200">
+            maxlength="50">
         <mat-autocomplete #auto="matAutocomplete">
             <mat-option *ngIf="isLoading" class="is-loading">Loading...</mat-option>
             <ng-container *ngIf="!isLoading">

From d61ca591f5c8da12c099d1680874e3d4c70c57dd Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Fri, 17 Mar 2023 10:20:23 +0530
Subject: [PATCH 069/887] ui fixes and email validation with new parameters

---
 .../basic-info/basic-info.component.html      | 14 +++--
 .../routes/basic-info/basic-info.component.ts |  1 +
 .../routes/position/position.component.html   | 60 ++++++++++---------
 .../event-thumbnail.component.html            | 11 +++-
 .../event-thumbnail.component.scss            | 16 ++++-
 .../create-user/create-user.component.html    |  6 +-
 .../create-user/create-user.component.scss    |  7 +++
 .../create-user/create-user.component.ts      | 15 +++++
 8 files changed, 95 insertions(+), 35 deletions(-)

diff --git a/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.html b/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.html
index 545568828..3c8faa251 100644
--- a/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.html
+++ b/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.html
@@ -31,7 +31,7 @@
                 </mat-grid-tile>
 
                 <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                  <label class="appr-text-label">Date of birth (dd-mm-yy)</label>
+                  <label class="appr-text-label">Date of birth (dd-mm-yyyy)</label>
                   <input type="text" [disabled]="true" [value]="basicInfo.dob" class="appr-text-field">
                 </mat-grid-tile>
 
@@ -69,12 +69,14 @@
 
                 <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                   <label class="appr-text-label">Domicile medium (Mother tongue)</label>
-                  <input type="text" [disabled]="true" [value]="basicInfo.domicileMedium" class="appr-text-field">
+                  <input type="text" [disabled]="true"
+                    [value]="basicInfo.domicileMedium ? basicInfo.domicileMedium : ''" class="appr-text-field">
                 </mat-grid-tile>
 
                 <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                   <label class="appr-text-label">Other languages known</label>
-                  <input type="text" [disabled]="true" [value]="basicInfo.knownLanguages" class="appr-text-field">
+                  <input type="text" [disabled]="true"
+                    [value]="basicInfo.knownLanguages ? basicInfo.knownLanguages : ''" class="appr-text-field">
                 </mat-grid-tile>
 
                 <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
@@ -84,7 +86,8 @@
 
                 <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                   <label class="appr-text-label">Telephone number</label>
-                  <input type="text" [disabled]="true" [value]="basicInfo.telephone" class="appr-text-field">
+                  <input type="text" [disabled]="true" [value]="basicInfo.telephone ? basicInfo.telephone : ''"
+                    class="appr-text-field">
                 </mat-grid-tile>
 
                 <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
@@ -94,7 +97,8 @@
 
                 <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                   <label class="appr-text-label">Secondary email</label>
-                  <input type="text" [disabled]="true" [value]="basicInfo.personalEmail" class="appr-text-field">
+                  <input type="text" [disabled]="true" [value]="basicInfo.personalEmail ? basicInfo.personalEmail : ''"
+                    class="appr-text-field">
                 </mat-grid-tile>
 
                 <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
diff --git a/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.ts b/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.ts
index 2ed33439e..7b21aa1ae 100644
--- a/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.ts
+++ b/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.ts
@@ -21,6 +21,7 @@ export class BasicInfoComponent implements OnInit {
         // if (this.configSvc.userProfile && this.configSvc.userProfile.departmentName) {
         //   this.configSvc.userProfile.departmentName = _.get(this.activeRoute, 'snapshot.data.department.data.deptName')
         // }
+        // console.log(this.activeRoute.snapshot, 'this.activeRoute.snapshot====')
         this.basicInfo = profileData.personalDetails
         this.imagePath = profileData.photo
       }
diff --git a/project/ws/app/src/lib/routes/approvals/routes/position/position.component.html b/project/ws/app/src/lib/routes/approvals/routes/position/position.component.html
index bd0c9a0f0..6e3fa1a8d 100644
--- a/project/ws/app/src/lib/routes/approvals/routes/position/position.component.html
+++ b/project/ws/app/src/lib/routes/approvals/routes/position/position.component.html
@@ -1,4 +1,5 @@
-<mat-card id="profdetails" class="flex flex-1 flex-column margin-left-m margin-bottom-m margin-right-m ws-mat-accent-border">
+<mat-card id="profdetails"
+  class="flex flex-1 flex-column margin-left-m margin-bottom-m margin-right-m ws-mat-accent-border">
   <div class="flex-custom">
     <mat-card-content class="margin-top-m margin-bottom-m margin-left-m margin-right-m">
       <span class="mat-subheading-1 flex-4 mobile-margin appr-section-heading" role="link" tabindex="0">
@@ -11,7 +12,8 @@
               <mat-grid-list cols="1" rowHeight="100px">
                 <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                   <label class="appr-text-label">Type of organisation</label>
-                  <mat-radio-group [value]="professionalDetails.organisationType" [disabled]="true" aria-label="Select an option">
+                  <mat-radio-group [value]="professionalDetails.organisationType" [disabled]="true"
+                    aria-label="Select an option">
                     <mat-radio-button value="Government" class="radio-btn">Government organisation</mat-radio-button>
                     <mat-radio-button value="Non-Government" class="radio-btn">Non-government organisation
                     </mat-radio-button>
@@ -20,26 +22,29 @@
 
                 <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                   <label class="appr-text-label">MDO</label>
-                  <input type="text" [disabled]="true" class="appr-text-field" [value]="employmentDetails.departmentName">
+                  <input type="text" [disabled]="true" class="appr-text-field"
+                    [value]="employmentDetails.departmentName">
                 </mat-grid-tile>
                 <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                   <label class="appr-text-label">Industry</label>
-                  <input type="text" [disabled]="true" [value]="professionalDetails.industry ? professionalDetails.industry : ''"
-                    class="appr-text-field">
+                  <input type="text" [disabled]="true"
+                    [value]="professionalDetails.industry ? professionalDetails.industry : ''" class="appr-text-field">
                 </mat-grid-tile>
                 <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                   <label class="appr-text-label">Designation</label>
-                  <input type="text" [disabled]="true" [value]="professionalDetails.designation ? professionalDetails.designation : ''"
+                  <input type="text" [disabled]="true"
+                    [value]="professionalDetails.designation ? professionalDetails.designation : ''"
                     class="appr-text-field">
                 </mat-grid-tile>
                 <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                   <label class="appr-text-label">Location</label>
-                  <input type="text" [disabled]="true" [value]="professionalDetails.location ? professionalDetails.location : ''"
-                    class="appr-text-field">
+                  <input type="text" [disabled]="true"
+                    [value]="professionalDetails.location ? professionalDetails.location : ''" class="appr-text-field">
                 </mat-grid-tile>
                 <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                   <label class="appr-text-label">Description</label>
-                  <textarea [disabled]="true" rows="3" [value]="professionalDetails.description ? professionalDetails.description : ''"
+                  <textarea [disabled]="true" rows="3"
+                    [value]="professionalDetails.description ? professionalDetails.description : ''"
                     class="appr-text-field"></textarea>
                 </mat-grid-tile>
               </mat-grid-list>
@@ -54,23 +59,23 @@
               <mat-grid-list cols="2" rowHeight="100px">
                 <mat-grid-tile [colspan]="2" [rowspan]="1" class="input-wrapper">
                   <label class="appr-text-label">Pay band (grade pay)</label>
-                  <input type="text" [disabled]="true" [value]="professionalDetails.industry ? professionalDetails.industry : ''"
-                    class="appr-text-field">
+                  <input type="text" [disabled]="true"
+                    [value]="professionalDetails.industry ? professionalDetails.industry : ''" class="appr-text-field">
                 </mat-grid-tile>
                 <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                   <label class="appr-text-label">Service</label>
-                  <input type="text" [disabled]="true" [value]="professionalDetails.industry ? professionalDetails.industry : ''"
-                    class="appr-text-field">
+                  <input type="text" [disabled]="true"
+                    [value]="professionalDetails.industry ? professionalDetails.industry : ''" class="appr-text-field">
                 </mat-grid-tile>
                 <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                   <label class="appr-text-label">Cadre</label>
-                  <input type="text" [disabled]="true" [value]="professionalDetails.industry ? professionalDetails.industry : ''"
-                    class="appr-text-field">
+                  <input type="text" [disabled]="true"
+                    [value]="professionalDetails.industry ? professionalDetails.industry : ''" class="appr-text-field">
                 </mat-grid-tile>
                 <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                   <label class="appr-text-label">Allotment year of service</label>
-                  <input type="text" [disabled]="true" [value]="professionalDetails.industry ? professionalDetails.industry : ''"
-                    class="appr-text-field">
+                  <input type="text" [disabled]="true"
+                    [value]="professionalDetails.industry ? professionalDetails.industry : ''" class="appr-text-field">
                 </mat-grid-tile>
                 <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                   <label class="appr-text-label">Date of joining</label>
@@ -79,28 +84,29 @@
                 </mat-grid-tile>
                 <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                   <label class="appr-text-label">Civil list number</label>
-                  <input type="text" [disabled]="true" [value]="professionalDetails.industry ? professionalDetails.industry : ''"
-                    class="appr-text-field">
+                  <input type="text" [disabled]="true"
+                    [value]="professionalDetails.industry ? professionalDetails.industry : ''" class="appr-text-field">
                 </mat-grid-tile>
                 <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                  <label class="appr-text-label">Emplyee code</label>
-                  <input type="text" [disabled]="true" [value]="professionalDetails.industry ? professionalDetails.industry : ''"
-                    class="appr-text-field">
+                  <label class="appr-text-label">Employee code</label>
+                  <input type="text" [disabled]="true"
+                    [value]="professionalDetails.industry ? professionalDetails.industry : ''" class="appr-text-field">
                 </mat-grid-tile>
                 <mat-grid-tile [colspan]="2" [rowspan]="1" class="input-wrapper">
                   <label class="appr-text-label">Location</label>
-                  <input type="text" [disabled]="true" [value]="professionalDetails.location ? professionalDetails.location : ''"
-                    class="appr-text-field">
+                  <input type="text" [disabled]="true"
+                    [value]="professionalDetails.location ? professionalDetails.location : ''" class="appr-text-field">
                 </mat-grid-tile>
                 <mat-grid-tile [colspan]="2" [rowspan]="1" class="input-wrapper">
                   <label class="appr-text-label">Official postal address</label>
-                  <textarea [disabled]="true" rows="3" [value]="professionalDetails.completePostalAddress ? professionalDetails.completePostalAddress : ''"
+                  <textarea [disabled]="true" rows="3"
+                    [value]="professionalDetails.completePostalAddress ? professionalDetails.completePostalAddress : ''"
                     class="appr-text-field"></textarea>
                 </mat-grid-tile>
                 <mat-grid-tile [colspan]="2" [rowspan]="1" class="input-wrapper">
                   <label class="appr-text-label">Pin code</label>
-                  <input type="text" [disabled]="true" [value]="professionalDetails.industry ? professionalDetails.industry : ''"
-                    class="appr-text-field">
+                  <input type="text" [disabled]="true"
+                    [value]="professionalDetails.industry ? professionalDetails.industry : ''" class="appr-text-field">
                 </mat-grid-tile>
               </mat-grid-list>
             </ng-container>
diff --git a/project/ws/app/src/lib/routes/events/components/event-thumbnail/event-thumbnail.component.html b/project/ws/app/src/lib/routes/events/components/event-thumbnail/event-thumbnail.component.html
index 43bca1c5a..f6fe3034e 100644
--- a/project/ws/app/src/lib/routes/events/components/event-thumbnail/event-thumbnail.component.html
+++ b/project/ws/app/src/lib/routes/events/components/event-thumbnail/event-thumbnail.component.html
@@ -1 +1,10 @@
-<img [src]="data">
\ No newline at end of file
+<mat-dialog-actions class="mat-action-box">
+  <button mat-button mat-dialog-close class="close-btn">
+    <mat-icon>close</mat-icon>
+  </button>
+  <!-- The mat-dialog-close directive optionally accepts a value as a result for the dialog. -->
+
+</mat-dialog-actions>
+<mat-dialog-content>
+  <img [src]="data">
+</mat-dialog-content>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/events/components/event-thumbnail/event-thumbnail.component.scss b/project/ws/app/src/lib/routes/events/components/event-thumbnail/event-thumbnail.component.scss
index cda0fc794..3726aded9 100644
--- a/project/ws/app/src/lib/routes/events/components/event-thumbnail/event-thumbnail.component.scss
+++ b/project/ws/app/src/lib/routes/events/components/event-thumbnail/event-thumbnail.component.scss
@@ -1,2 +1,16 @@
 @import 'ws-common';
-@import 'ws-vars';
\ No newline at end of file
+@import 'ws-vars';
+
+
+
+.mat-action-box {
+  position: relative;
+}
+
+.close-btn {
+  position: absolute;
+  right: 0;
+  margin-right: 0px;
+  top: 0;
+  margin-top: 0px;
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html
index d75c6723a..e8bf62fa8 100644
--- a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html
+++ b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html
@@ -70,7 +70,8 @@
                   </label>
                   <mat-form-field appearance="outline" class="margin-top-xs">
                     <input id="email" matInput #email formControlName="email" i18n-placeholder placeholder="Type here"
-                      i18n-aria-label aria-label="Email input" class="form-input" autocomplete="off" />
+                      i18n-aria-label aria-label="Email input" class="form-input" autocomplete="off" maxlength="320"
+                      (input)="emailVerification($event.target.value)" />
                     <mat-error [hidden]="false" i18n="Email Error|Explains name is required" i18n-aria-label
                       aria-label="Email Error|Explains name is required "
                       *ngIf="createUserForm?.controls['email']?.touched && createUserForm?.controls['email'].errors?.required">
@@ -80,6 +81,9 @@
                       i18n-aria-label aria-label="Email Error|Name fields not valid ">
                       Email field is not valid
                     </mat-error>
+                    <div *ngIf="emailLengthVal" class="email-error" i18n="Email Error|Explains character validation">
+                      Max 64 characters before "@" & 255 characters after "@" are valid.
+                    </div>
                   </mat-form-field>
 
                   <div class="input-wrapper margin-top-s">
diff --git a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.scss b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.scss
index 0b1c655a0..1d0c1faba 100644
--- a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.scss
+++ b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.scss
@@ -559,3 +559,10 @@ input.mat-input-element {
     margin-left: 45%;
     z-index: 1;
 }
+
+.email-error {
+  position: absolute;
+  font-size: 10px;
+  color: #f44336;
+  top: 35px;
+}
diff --git a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
index e4219dab3..48868cf18 100644
--- a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
@@ -42,6 +42,7 @@ export class CreateUserComponent implements OnInit, OnDestroy {
   breadcrumbs: any
   disableCreateButton = false
   displayLoader = false
+  emailLengthVal = false
 
   @HostListener('window:scroll', ['$event'])
   handleScroll() {
@@ -158,6 +159,20 @@ export class CreateUserComponent implements OnInit, OnDestroy {
     })
   }
 
+  emailVerification(emailId: string) {
+    this.emailLengthVal = false
+    if (emailId && emailId.length > 0) {
+      const email = emailId.split('@')
+      if (email && email.length === 2) {
+        if ((email[0] && email[0].length > 64) || (email[1] && email[1].length > 255)) {
+          this.emailLengthVal = true
+        }
+      } else {
+        this.emailLengthVal = false
+      }
+    }
+  }
+
   onSubmit(form: any) {
     this.disableCreateButton = true
     this.displayLoader = true

From 325f481bab79c1c1b65a14ecb005ebaec25dd3ed Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <75484189+nitinraj-tarento@users.noreply.github.com>
Date: Mon, 20 Mar 2023 15:01:22 +0530
Subject: [PATCH 070/887] Update app-footer.component.html

---
 src/app/component/app-footer/app-footer.component.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/component/app-footer/app-footer.component.html b/src/app/component/app-footer/app-footer.component.html
index 5e147c65b..1b2edb128 100644
--- a/src/app/component/app-footer/app-footer.component.html
+++ b/src/app/component/app-footer/app-footer.component.html
@@ -2,14 +2,14 @@
   <div class="mat-body text-right flex-1">
     <ng-container i18n>
       <span i18n>&copy; Copyright 2020 -2021</span>
-      &nbsp;&nbsp; | &nbsp;&nbsp;
+<!--       &nbsp;&nbsp; | &nbsp;&nbsp;
       <a routerLink="/app/home/about" i18n> <span i18n>About Us</span></a>
       &nbsp;&nbsp; | &nbsp;&nbsp;
-      <a routerLink="/app/tnc" i18n>Privacy</a>
+      <a routerLink="/app/tnc" i18n>Privacy</a> -->
       <!-- &nbsp;&nbsp; | &nbsp;&nbsp;
       <a routerLink="/app/info/faq" i18n>Help </a>
        &
       <a routerLink="/public/contact" i18n> Contact</a>-->
     </ng-container>
   </div>
-</div>
\ No newline at end of file
+</div>

From 0bc8f09154ac7541084bf5e6e730d74711174e1b Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Tue, 21 Mar 2023 16:06:36 +0530
Subject: [PATCH 071/887] Added sort for Changed log in approvals

---
 .../src/lib/routes/approvals/routes/home/home.component.ts   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/approvals/routes/home/home.component.ts b/project/ws/app/src/lib/routes/approvals/routes/home/home.component.ts
index 4bdadf3e6..5ed9626fa 100644
--- a/project/ws/app/src/lib/routes/approvals/routes/home/home.component.ts
+++ b/project/ws/app/src/lib/routes/approvals/routes/home/home.component.ts
@@ -55,13 +55,16 @@ export class HomeComponent implements OnInit, AfterViewInit, OnDestroy {
           : ''
         const datas: any[] = Object.values(wfHistoryDatas)
         wfHistoryDatas = [].concat.apply([], datas)
-        const wfHistoryData = wfHistoryDatas.filter((wfh: { inWorkflow: any }) => !wfh.inWorkflow)
+        let wfHistoryData = wfHistoryDatas.filter((wfh: { inWorkflow: any }) => !wfh.inWorkflow)
         let currentdate: Date
 
         this.activeRoute.data.subscribe(data => {
           this.profileData = data.pageData.data.profileData
           this.profileDataKeys = data.pageData.data.profileDataKey
         })
+        wfHistoryData = wfHistoryData.sort((a: any, b: any) => {
+          return b.createdOn - a.createdOn
+        })
 
         wfHistoryData.forEach((wfh: any) => {
           currentdate = new Date(wfh.createdOn)

From 9a198de523cc63cd39f42cde7e9112e9cb3f90a5 Mon Sep 17 00:00:00 2001
From: saurav <saurav.verma@tarento.com>
Date: Thu, 6 Apr 2023 10:56:03 +0530
Subject: [PATCH 072/887] File upload table 3 columns added for fail, success
 and total records count

---
 .../users-upload/users-upload.component.html  | 24 +++++++++++++++++++
 .../users-upload/users-upload.component.ts    |  6 ++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
index 6afc44f9c..3be09675c 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
@@ -78,6 +78,30 @@ <h2 class="w-full contacts-head">File uploads</h2>
               <td mat-cell *matCellDef="let row"> {{row.status}} </td>
             </ng-container>
 
+            <!-- Failed Record Count Column -->
+            <ng-container matColumnDef="failedRecordsCount">
+              <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Created
+                on
+              </th>
+              <td mat-cell *matCellDef="let row"> {{row.failedRecordsCount}} </td>
+            </ng-container>
+
+            <!-- Success Records COunt Column -->
+            <ng-container matColumnDef="successfulRecordsCount">
+              <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Created
+                on
+              </th>
+              <td mat-cell *matCellDef="let row"> {{row.successfulRecordsCount }} </td>
+            </ng-container>
+
+            <!-- Total Records COunt Column -->
+            <ng-container matColumnDef="totalRecords">
+              <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Created
+                on
+              </th>
+              <td mat-cell *matCellDef="let row"> {{row.totalRecords }} </td>
+            </ng-container>
+
             <!-- status Column -->
             <ng-container matColumnDef="dateCreatedOn">
               <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Created
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
index 253d4247c..ee85b4ab8 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
@@ -29,13 +29,17 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
   bulkUploadData: any
   uplaodSuccessMsg!: string
   dataSource: MatTableDataSource<any>
-  displayedColumns: string[] = ['identifier', 'fileName', 'status', 'dateCreatedOn', 'dateUpdatedOn']
+  // tslint:disable-next-line:max-line-length
+  displayedColumns: string[] = ['identifier', 'fileName', 'status', 'failedRecordsCount', 'successfulRecordsCount', 'totalRecords', 'dateCreatedOn', 'dateUpdatedOn']
   tabledata: any = {
     actions: [],
     columns: [
       { displayName: 'Id', key: 'identifier' },
       { displayName: 'Name', key: 'fileName' },
       { displayName: 'Status', key: 'status' },
+      { displayName: 'Failed Records', key: 'failedRecordsCount' },
+      { displayName: 'Success Records', key: 'successfulRecordsCount' },
+      { displayName: 'Total Records', key: 'totalRecords' },
       { displayName: 'Created on', key: 'dateCreatedOn' },
       { displayName: 'Updated on', key: 'dateUpdatedOn' },
     ],

From 6f10b3fb534839473c5e964b6da387acfabc0473 Mon Sep 17 00:00:00 2001
From: saurav <saurav.verma@tarento.com>
Date: Thu, 6 Apr 2023 15:00:06 +0530
Subject: [PATCH 073/887] Modified column name

---
 .../components/users-upload/users-upload.component.html  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
index 3be09675c..24272706b 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
@@ -80,7 +80,8 @@ <h2 class="w-full contacts-head">File uploads</h2>
 
             <!-- Failed Record Count Column -->
             <ng-container matColumnDef="failedRecordsCount">
-              <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Created
+              <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Failed
+                Records
                 on
               </th>
               <td mat-cell *matCellDef="let row"> {{row.failedRecordsCount}} </td>
@@ -88,7 +89,8 @@ <h2 class="w-full contacts-head">File uploads</h2>
 
             <!-- Success Records COunt Column -->
             <ng-container matColumnDef="successfulRecordsCount">
-              <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Created
+              <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Success
+                Records
                 on
               </th>
               <td mat-cell *matCellDef="let row"> {{row.successfulRecordsCount }} </td>
@@ -96,7 +98,8 @@ <h2 class="w-full contacts-head">File uploads</h2>
 
             <!-- Total Records COunt Column -->
             <ng-container matColumnDef="totalRecords">
-              <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Created
+              <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Total
+                Records
                 on
               </th>
               <td mat-cell *matCellDef="let row"> {{row.totalRecords }} </td>

From afae55819f5ee79b0883ed825b7f77cc9d647a5b Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Mon, 24 Apr 2023 16:20:45 +0530
Subject: [PATCH 074/887] Updated bulkupload download api call

---
 .../users-upload/users-upload.component.html          |  3 ++-
 .../components/users-upload/users-upload.component.ts |  7 +++++++
 .../src/lib/routes/users/services/upload.service.ts   | 11 +++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
index 24272706b..70e0d2a2d 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
@@ -67,7 +67,8 @@ <h2 class="w-full contacts-head">File uploads</h2>
               <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Name
               </th>
               <td mat-cell *matCellDef="let row">
-                <a href="{{row.filePath}}" download="{{row.fileName}}"> {{row.fileName}}</a>
+                <!-- <a href="{{row.filePath}}" download="{{row.fileName}}"> {{row.fileName}}</a> -->
+                <a href="" (click)="downloadFullFile(row)"> {{row.fileName}}</a>
               </td>
             </ng-container>
 
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
index ee85b4ab8..619108b52 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
@@ -214,4 +214,11 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
     }
   }
 
+  downloadFullFile(file: any) {
+    console.log('file', file)
+    this.fileService.downloadFile(file.fileName).subscribe((res: any) => {
+      console.log('res', res)
+    })
+  }
+
 }
diff --git a/project/ws/app/src/lib/routes/users/services/upload.service.ts b/project/ws/app/src/lib/routes/users/services/upload.service.ts
index ac414d039..d98f2e103 100644
--- a/project/ws/app/src/lib/routes/users/services/upload.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/upload.service.ts
@@ -10,6 +10,7 @@ const API_ENDPOINTS = {
   downloadReport: `/apis/protected/v8/admin/userRegistration/bulkUploadReport`,
   // getBulkUploadData: '/apis/protected/v8/admin/userRegistration/bulkUploadData',
   getBulkUploadData: '/apis/proxies/v8/user/v1/bulkupload',
+  downloadfile: '/apis/proxies/v8/user/v1/bulkuser/download',
 }
 
 @Injectable()
@@ -86,4 +87,14 @@ export class FileService {
   async getBulkUploadDataV1(rootOrgId: any) {
     return await this.http.get(`${API_ENDPOINTS.getBulkUploadData}/${rootOrgId}`).toPromise()
   }
+
+  public downloadFile(filename: string) {
+    // return this.http.get(`${API_ENDPOINTS.downloadfile}/${filename}`)
+    this.http.get<any>(`${API_ENDPOINTS.downloadfile}/${filename}`, {
+      headers: {
+        'content-type': 'multipart/form-data',
+      },
+    })
+    return this.http.get<any>(`${API_ENDPOINTS.downloadfile}/${filename}`)
+  }
 }

From 0053447bf6da10097facd317ffe7ea2939c6f8f2 Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Mon, 24 Apr 2023 16:46:56 +0530
Subject: [PATCH 075/887] REmoved console logs

---
 .../users/components/users-upload/users-upload.component.ts   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
index 619108b52..62aa1384c 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
@@ -215,9 +215,9 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   downloadFullFile(file: any) {
-    console.log('file', file)
+    // console.log('file', file)
     this.fileService.downloadFile(file.fileName).subscribe((res: any) => {
-      console.log('res', res)
+      // console.log('res', res)
     })
   }
 

From 17f01e93e3c6d328d88dbf2e25e2592520c37c4f Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Mon, 24 Apr 2023 17:08:14 +0530
Subject: [PATCH 076/887] REmoved console logs

---
 .../users/components/users-upload/users-upload.component.ts    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
index 62aa1384c..c8c36b387 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
@@ -217,7 +217,8 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
   downloadFullFile(file: any) {
     // console.log('file', file)
     this.fileService.downloadFile(file.fileName).subscribe((res: any) => {
-      // console.log('res', res)
+      // tslint:disable-next-line:no-console
+      console.log('res', res)
     })
   }
 

From e64901bdb40fafb5731e49d6235edf1fddfc9f69 Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Tue, 25 Apr 2023 15:08:24 +0530
Subject: [PATCH 077/887] Fixed new bulk file download flow

---
 .../users-upload/users-upload.component.html       |  2 +-
 .../users-upload/users-upload.component.scss       |  5 +++++
 .../users-upload/users-upload.component.ts         |  9 +++------
 .../lib/routes/users/services/upload.service.ts    | 14 ++++----------
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
index 70e0d2a2d..d2fe92aa8 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
@@ -68,7 +68,7 @@ <h2 class="w-full contacts-head">File uploads</h2>
               </th>
               <td mat-cell *matCellDef="let row">
                 <!-- <a href="{{row.filePath}}" download="{{row.fileName}}"> {{row.fileName}}</a> -->
-                <a href="" (click)="downloadFullFile(row)"> {{row.fileName}}</a>
+                <span class="blue-text" (click)="downloadFullFile(row)"> {{row.fileName}}</span>
               </td>
             </ng-container>
 
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
index 70c1a67fb..f9d21a428 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
@@ -44,4 +44,9 @@ table {
 
 .upload-btn:disabled {
     opacity: 0.7;
+}
+
+.blue-text {
+  color: #0075b7!important;
+  cursor: pointer;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
index c8c36b387..9c350951c 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
@@ -215,11 +215,8 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   downloadFullFile(file: any) {
-    // console.log('file', file)
-    this.fileService.downloadFile(file.fileName).subscribe((res: any) => {
-      // tslint:disable-next-line:no-console
-      console.log('res', res)
-    })
+    const fname = file.fileName
+    const url = `/apis/proxies/v8/user/v1/bulkuser/download/${fname}`
+    window.open(url, '_blank')
   }
-
 }
diff --git a/project/ws/app/src/lib/routes/users/services/upload.service.ts b/project/ws/app/src/lib/routes/users/services/upload.service.ts
index d98f2e103..0badf3952 100644
--- a/project/ws/app/src/lib/routes/users/services/upload.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/upload.service.ts
@@ -10,7 +10,7 @@ const API_ENDPOINTS = {
   downloadReport: `/apis/protected/v8/admin/userRegistration/bulkUploadReport`,
   // getBulkUploadData: '/apis/protected/v8/admin/userRegistration/bulkUploadData',
   getBulkUploadData: '/apis/proxies/v8/user/v1/bulkupload',
-  downloadfile: '/apis/proxies/v8/user/v1/bulkuser/download',
+  // downloadfile: '/apis/proxies/v8/user/v1/bulkuser/download',
 }
 
 @Injectable()
@@ -88,13 +88,7 @@ export class FileService {
     return await this.http.get(`${API_ENDPOINTS.getBulkUploadData}/${rootOrgId}`).toPromise()
   }
 
-  public downloadFile(filename: string) {
-    // return this.http.get(`${API_ENDPOINTS.downloadfile}/${filename}`)
-    this.http.get<any>(`${API_ENDPOINTS.downloadfile}/${filename}`, {
-      headers: {
-        'content-type': 'multipart/form-data',
-      },
-    })
-    return this.http.get<any>(`${API_ENDPOINTS.downloadfile}/${filename}`)
-  }
+  // public downloadFile(filename: string) {
+  //   return this.http.get(`${API_ENDPOINTS.downloadfile}/${filename}`)
+  // }
 }

From 15c875f2da5b3c8b565351c03b95a48df8e1aaf6 Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Fri, 28 Apr 2023 12:06:01 +0530
Subject: [PATCH 078/887] Removed custom classes

---
 .../components/users-upload/users-upload.component.html      | 2 +-
 .../components/users-upload/users-upload.component.scss      | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
index d2fe92aa8..370f5a6ae 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
@@ -68,7 +68,7 @@ <h2 class="w-full contacts-head">File uploads</h2>
               </th>
               <td mat-cell *matCellDef="let row">
                 <!-- <a href="{{row.filePath}}" download="{{row.fileName}}"> {{row.fileName}}</a> -->
-                <span class="blue-text" (click)="downloadFullFile(row)"> {{row.fileName}}</span>
+                <span class="cursor-pointer ws-mat-accent-text" (click)="downloadFullFile(row)"> {{row.fileName}}</span>
               </td>
             </ng-container>
 
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
index f9d21a428..0ed43f930 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
@@ -45,8 +45,3 @@ table {
 .upload-btn:disabled {
     opacity: 0.7;
 }
-
-.blue-text {
-  color: #0075b7!important;
-  cursor: pointer;
-}
\ No newline at end of file

From 65060375ffd4685ab464cfb10e88df4359f5146c Mon Sep 17 00:00:00 2001
From: Amit Sengar <aAmitSengar@users.noreply.github.com>
Date: Fri, 28 Apr 2023 14:35:00 +0530
Subject: [PATCH 079/887] Update package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a16add7ae..0e2703c4e 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "@project-sunbird/telemetry-sdk": "0.0.26",
     "@sunbird-cb/collection": "^1.0.22",
     "@sunbird-cb/design-system": "0.0.1",
-    "@sunbird-cb/rain-dashboards": "^0.3.8",
+    "@sunbird-cb/rain-dashboards": "^0.4.10",
     "@sunbird-cb/resolver": "^1.0.0",
     "@sunbird-cb/utils": "^1.0.12",
     "@types/file-saver": "^2.0.1",

From 481f5d3e18bb0b289d1978e88623b10f84eb0126 Mon Sep 17 00:00:00 2001
From: Amit Sengar <aAmitSengar@users.noreply.github.com>
Date: Fri, 28 Apr 2023 14:35:23 +0530
Subject: [PATCH 080/887] Update package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a16add7ae..0e2703c4e 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "@project-sunbird/telemetry-sdk": "0.0.26",
     "@sunbird-cb/collection": "^1.0.22",
     "@sunbird-cb/design-system": "0.0.1",
-    "@sunbird-cb/rain-dashboards": "^0.3.8",
+    "@sunbird-cb/rain-dashboards": "^0.4.10",
     "@sunbird-cb/resolver": "^1.0.0",
     "@sunbird-cb/utils": "^1.0.12",
     "@types/file-saver": "^2.0.1",

From 6fdb03bef19c93d4d66baaebf9629937815f0153 Mon Sep 17 00:00:00 2001
From: Amit Sengar <aAmitSengar@users.noreply.github.com>
Date: Fri, 28 Apr 2023 15:04:40 +0530
Subject: [PATCH 081/887] Delete yarn.lock

---
 yarn.lock | 11731 ----------------------------------------------------
 1 file changed, 11731 deletions(-)
 delete mode 100644 yarn.lock

diff --git a/yarn.lock b/yarn.lock
deleted file mode 100644
index d7908f3c3..000000000
--- a/yarn.lock
+++ /dev/null
@@ -1,11731 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@angular-devkit/architect@0.802.2":
-  version "0.802.2"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.802.2.tgz#f2305052e731b68d0fcb98958426f62ce97b441e"
-  integrity sha512-bMMo8BejHi3+n4xqewgcfat5+OYDmQQCLxWQ2W+qr7/u08vmTQTix3Q/wClp0nxgN0Zc9/1gSPaeudHLAlEizg==
-  dependencies:
-    "@angular-devkit/core" "8.2.2"
-    rxjs "6.4.0"
-
-"@angular-devkit/architect@0.803.29":
-  version "0.803.29"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.803.29.tgz#0399969087ac77876b8e429cb26eebd20596607b"
-  integrity sha512-yHBud/fZHTelX24yjQg5lefZrfIebruoFTGeOwF0JdX8+KiHcTIxS4LOnUTYriasfHarcHRFXBAV/bRm+wv5ow==
-  dependencies:
-    "@angular-devkit/core" "8.3.29"
-    rxjs "6.4.0"
-
-"@angular-devkit/build-angular@^0.803.23":
-  version "0.803.29"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.803.29.tgz#4cc2ecb7c4ca48389f05d1e05d4708f82c8c7767"
-  integrity sha512-XAgfP1gi0rEJ3oVt+8ipvS5RfPNbeK5r2n8Ll2H3xkKjU0p1PN8+S6/0XVBtmMfeQ06SJWEAKFcAYqrxXhVTzw==
-  dependencies:
-    "@angular-devkit/architect" "0.803.29"
-    "@angular-devkit/build-optimizer" "0.803.29"
-    "@angular-devkit/build-webpack" "0.803.29"
-    "@angular-devkit/core" "8.3.29"
-    "@babel/core" "7.8.7"
-    "@babel/preset-env" "7.8.7"
-    "@ngtools/webpack" "8.3.29"
-    ajv "6.12.3"
-    autoprefixer "9.6.1"
-    browserslist "4.10.0"
-    cacache "12.0.2"
-    caniuse-lite "1.0.30001035"
-    circular-dependency-plugin "5.2.0"
-    clean-css "4.2.1"
-    copy-webpack-plugin "6.0.3"
-    core-js "3.6.4"
-    coverage-istanbul-loader "2.0.3"
-    file-loader "4.2.0"
-    find-cache-dir "3.0.0"
-    glob "7.1.4"
-    jest-worker "24.9.0"
-    karma-source-map-support "1.4.0"
-    less "3.9.0"
-    less-loader "5.0.0"
-    license-webpack-plugin "2.1.2"
-    loader-utils "1.2.3"
-    mini-css-extract-plugin "0.8.0"
-    minimatch "3.0.4"
-    open "6.4.0"
-    parse5 "4.0.0"
-    postcss "7.0.17"
-    postcss-import "12.0.1"
-    postcss-loader "3.0.0"
-    raw-loader "3.1.0"
-    regenerator-runtime "0.13.3"
-    rxjs "6.4.0"
-    sass "1.22.9"
-    sass-loader "7.2.0"
-    semver "6.3.0"
-    source-map "0.7.3"
-    source-map-loader "0.2.4"
-    source-map-support "0.5.13"
-    speed-measure-webpack-plugin "1.3.1"
-    style-loader "1.0.0"
-    stylus "0.54.5"
-    stylus-loader "3.0.2"
-    terser "4.6.3"
-    terser-webpack-plugin "3.0.3"
-    tree-kill "1.2.2"
-    webpack "4.39.2"
-    webpack-dev-middleware "3.7.2"
-    webpack-dev-server "3.11.0"
-    webpack-merge "4.2.1"
-    webpack-sources "1.4.3"
-    webpack-subresource-integrity "1.1.0-rc.6"
-    worker-plugin "3.2.0"
-
-"@angular-devkit/build-ng-packagr@~0.802.1":
-  version "0.802.2"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-ng-packagr/-/build-ng-packagr-0.802.2.tgz#8b83936667a955b91cc865f936b27428065000cc"
-  integrity sha512-6lY95tiW+KooPMWB3P4r54TUe5pSZgkv/6mphrUcxqwvN/jKOV4MkpoFxJsu7zNuiFPHU8K5URCWFsQPbiObPg==
-  dependencies:
-    "@angular-devkit/architect" "0.802.2"
-    rxjs "6.4.0"
-
-"@angular-devkit/build-optimizer@0.803.29":
-  version "0.803.29"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.803.29.tgz#91c033e6ab3313d338ec9c3d4c40d64ce1b324bc"
-  integrity sha512-E/MXtKc3oaP7UvQm0g4ayfH8ImEoQnRWseKD4jjYG6TbTIqfIyHCZRcKIr3svY28hzASbro5IZI6SugG+llvFw==
-  dependencies:
-    loader-utils "1.2.3"
-    source-map "0.7.3"
-    tslib "1.10.0"
-    typescript "3.5.3"
-    webpack-sources "1.4.3"
-
-"@angular-devkit/build-webpack@0.803.29":
-  version "0.803.29"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.803.29.tgz#ceaee658f0b71a0fee4f10b574b49e192d333a7c"
-  integrity sha512-3dJ3iEGU6AFT8VFTe72T9uNLobfd18Sq5Hz22UCCYji9K3ZyVc/bn5uXVVX+/Yj91MFtXuhOjLj7Z+XDeNy+OQ==
-  dependencies:
-    "@angular-devkit/architect" "0.803.29"
-    "@angular-devkit/core" "8.3.29"
-    rxjs "6.4.0"
-
-"@angular-devkit/core@8.2.2":
-  version "8.2.2"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-8.2.2.tgz#f7239b6fca785c5a85fbe7684f807b8fa41311d4"
-  integrity sha512-qA1lK/OQhNptCxoEGbTryn6yeFS1F/e/EiUTwgU/j4DkBwPyYGE8iqWBd/cgI9AVqQaRSLLhVWXtDPxoNL0TKg==
-  dependencies:
-    ajv "6.10.2"
-    fast-json-stable-stringify "2.0.0"
-    magic-string "0.25.3"
-    rxjs "6.4.0"
-    source-map "0.7.3"
-
-"@angular-devkit/core@8.3.29":
-  version "8.3.29"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-8.3.29.tgz#3477edd6458653f83e6d78684b100c1bef81382f"
-  integrity sha512-4jdja9QPwR6XG14ZSunyyOWT3nE2WtZC5IMDIBZADxujXvhzOU0n4oWpy6/JVHLUAxYNNgzLz+/LQORRWndcPg==
-  dependencies:
-    ajv "6.12.3"
-    fast-json-stable-stringify "2.0.0"
-    magic-string "0.25.3"
-    rxjs "6.4.0"
-    source-map "0.7.3"
-
-"@angular-devkit/schematics@8.3.29":
-  version "8.3.29"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-8.3.29.tgz#b3ba658b90fb3226a80ff12977be7dd583e99c49"
-  integrity sha512-AFJ9EK0XbcNlO5Dm9vr0OlBo1Nw6AaFXPR+DmHGBdcDDHxqEmYYLWfT+JU/8U2YFIdgrtlwvdtf6UQ3V2jdz1g==
-  dependencies:
-    "@angular-devkit/core" "8.3.29"
-    rxjs "6.4.0"
-
-"@angular/animations@~8.2.1":
-  version "8.2.14"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.2.14.tgz#76736b21e56165e6ca4925fb69605bdcc56aba7d"
-  integrity sha512-3Vc9TnNpKdtvKIXcWDFINSsnwgEMiDmLzjceWg1iYKwpeZGQahUXPoesLwQazBMmxJzQiA4HOMj0TTXKZ+Jzkg==
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/cdk@~8.1.2":
-  version "8.1.4"
-  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-8.1.4.tgz#69066053fe4cbd80cee2bb7fa238f1c9abb963fc"
-  integrity sha512-U0tjhAZM4qqUHGGKIKFZZ9d8929s2U/HO0FdoT/eX+oHPOA6mm3bBep7myrSzlkP9V7O1JJfYdhEgijXhYxprQ==
-  dependencies:
-    tslib "^1.7.1"
-  optionalDependencies:
-    parse5 "^5.0.0"
-
-"@angular/cli@^8.3.26":
-  version "8.3.29"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-8.3.29.tgz#481eb04a8240932adfb19049a5fb524f85453037"
-  integrity sha512-pW+iU0eKHIae+A1b9W5g8DKefMQcehZ+drGKs4Hryh8G+XGFS00BIWkmh6c1mydWTEhdsFlhdjD/rXCem7MAQQ==
-  dependencies:
-    "@angular-devkit/architect" "0.803.29"
-    "@angular-devkit/core" "8.3.29"
-    "@angular-devkit/schematics" "8.3.29"
-    "@schematics/angular" "8.3.29"
-    "@schematics/update" "0.803.29"
-    "@yarnpkg/lockfile" "1.1.0"
-    ansi-colors "4.1.1"
-    debug "^4.1.1"
-    ini "1.3.5"
-    inquirer "6.5.1"
-    npm-package-arg "6.1.0"
-    npm-pick-manifest "3.0.2"
-    open "6.4.0"
-    pacote "9.5.5"
-    read-package-tree "5.3.1"
-    rimraf "3.0.0"
-    semver "6.3.0"
-    symbol-observable "1.2.0"
-    universal-analytics "^0.4.20"
-    uuid "^3.3.2"
-
-"@angular/common@~8.2.1":
-  version "8.2.14"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.2.14.tgz#027e52b2951c14082d6e3af1a4ffa1356220e439"
-  integrity sha512-Qmt+aX2quUW54kaNT7QH7WGXnFxr/cC2C6sf5SW5SdkZfDQSiz8IaItvieZfXVQUbBOQKFRJ7TlSkt0jI/yjvw==
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/compiler-cli@~8.2.1":
-  version "8.2.14"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.2.14.tgz#1997bec04a6b9d022954e5747505fe8906994594"
-  integrity sha512-XDrTyrlIZM+0NquVT+Kbg5bn48AaWFT+B3bAT288PENrTdkuxuF9AhjFRZj8jnMdmaE4O2rioEkXBtl6z3zptA==
-  dependencies:
-    canonical-path "1.0.0"
-    chokidar "^2.1.1"
-    convert-source-map "^1.5.1"
-    dependency-graph "^0.7.2"
-    magic-string "^0.25.0"
-    minimist "^1.2.0"
-    reflect-metadata "^0.1.2"
-    source-map "^0.6.1"
-    tslib "^1.9.0"
-    yargs "13.1.0"
-
-"@angular/compiler@~8.2.1":
-  version "8.2.14"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.2.14.tgz#46db7a9d1c17f236126518ff26480c160d5a6183"
-  integrity sha512-ABZO4E7eeFA1QyJ2trDezxeQM5ZFa1dXw1Mpl/+1vuXDKNjJgNyWYwKp/NwRkLmrsuV0yv4UDCDe4kJOGbPKnw==
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/core@~8.2.1":
-  version "8.2.14"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.2.14.tgz#35566f5b19480369229477e7e0e0fde740bd5204"
-  integrity sha512-zeePkigi+hPh3rN7yoNENG/YUBUsIvUXdxx+AZq+QPaFeKEA2FBSrKn36ojHFrdJUjKzl0lPMEiGC2b6a6bo6g==
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/forms@~8.2.1":
-  version "8.2.14"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-8.2.14.tgz#7d357c346a3884881beb044c50ec4a09d3d7ee8e"
-  integrity sha512-zhyKL3CFIqcyHJ/TQF/h1OZztK611a6rxuPHCrt/5Sn1SuBTJJQ1pPTkOYIDy6IrCrtyANc8qB6P17Mao71DNQ==
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/language-service@~8.2.1":
-  version "8.2.14"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-8.2.14.tgz#e18b27a6841577ce489ad31540150da5a444ca37"
-  integrity sha512-7EhN9JJbAJcH2xCa+rIOmekjiEuB0qwPdHuD5qn/wwMfRzMZo+Db4hHbR9KHrLH6H82PTwYKye/LLpDaZqoHOA==
-
-"@angular/material-moment-adapter@^9.2.4":
-  version "9.2.4"
-  resolved "https://registry.yarnpkg.com/@angular/material-moment-adapter/-/material-moment-adapter-9.2.4.tgz#4d3cfcd5c2b8914bcca4e70a46cf7ec127c14b40"
-  integrity sha512-V5xkL+YUec3nDGRaJB72mJTUtdUvGaG9WCQEdr45viDWFGjQaEpS6msuScBLp0PwsN8Wt0n69eZg0ULgxPBa5g==
-
-"@angular/material@~8.1.2":
-  version "8.1.4"
-  resolved "https://registry.yarnpkg.com/@angular/material/-/material-8.1.4.tgz#8bda747bb023af8ccce2c2d3e9e8dc25f05b3605"
-  integrity sha512-HV1qU63MaOtAc+cWg21Y2ygQKdEDjsGQ/3d3qym9sfR0xU2vvY7OG6gH48BfPeU63oMYxQkhxfoGP8wWMXSU1w==
-  dependencies:
-    tslib "^1.7.1"
-
-"@angular/platform-browser-dynamic@~8.2.1":
-  version "8.2.14"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.2.14.tgz#4439a79fe10ec45170e6940a28835e9ff0918950"
-  integrity sha512-mO2JPR5kLU/A3AQngy9+R/Q5gaF9csMStBQjwsCRI0wNtlItOIGL6+wTYpiTuh/ux+WVN1F2sLcEYU4Zf1ud9A==
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/platform-browser@~8.2.1":
-  version "8.2.14"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.2.14.tgz#31f082e8ba977f9b89964d721c38cbc32ce0e433"
-  integrity sha512-MtJptptyKzsE37JZ2VB/tI4cvMrdAH+cT9pMBYZd66YSZfKjIj5s+AZo7z8ncoskQSB1o3HMfDjSK7QXGx1mLQ==
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/pwa@^0.803.14":
-  version "0.803.29"
-  resolved "https://registry.yarnpkg.com/@angular/pwa/-/pwa-0.803.29.tgz#3421745973793acf0c921fb85a16cf5417948be6"
-  integrity sha512-DR8qRfgkR3Dj8HKUnnW+17/f/uCPe7J8l8PC9VSC69Jqzc9XSsKZNfgrL3svaflIeU9+2YQ+5x5mJOL1f2m/Cg==
-  dependencies:
-    "@angular-devkit/core" "8.3.29"
-    "@angular-devkit/schematics" "8.3.29"
-    "@schematics/angular" "8.3.29"
-    parse5-html-rewriting-stream "5.1.0"
-
-"@angular/router@~8.2.1":
-  version "8.2.14"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.2.14.tgz#5f9f9707710983c2143aead79dcd2da520ae3eb8"
-  integrity sha512-DHA2BhODqV7F0g6ZKgFaZgbsqzHHWRcfWchCOrOVKu2rYiKUTwwHVLBgZAhrpNeinq2pWanVYSIhMr7wy+LfEA==
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/service-worker@~8.2.1":
-  version "8.2.14"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-8.2.14.tgz#fbea3899863cfa09196ce69fa470b163f25666ad"
-  integrity sha512-Xv1ES5bXDRxPJ5uyRqeKw6mGKaJVzKK0oFcR0mr4OSdyLXGZ+x6fC2S/QcLy4ugpb64fyEksrnHhHjeMVzGh2Q==
-  dependencies:
-    tslib "^1.9.0"
-
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"
-  integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==
-  dependencies:
-    "@babel/highlight" "^7.12.13"
-
-"@babel/compat-data@^7.13.15", "@babel/compat-data@^7.14.0", "@babel/compat-data@^7.8.6":
-  version "7.14.0"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.0.tgz#a901128bce2ad02565df95e6ecbf195cf9465919"
-  integrity sha512-vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q==
-
-"@babel/core@7.8.7":
-  version "7.8.7"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.7.tgz#b69017d221ccdeb203145ae9da269d72cf102f3b"
-  integrity sha512-rBlqF3Yko9cynC5CCFy6+K/w2N+Sq/ff2BPy+Krp7rHlABIr5epbA7OxVeKoMHB39LZOp1UY5SuLjy6uWi35yA==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.8.7"
-    "@babel/helpers" "^7.8.4"
-    "@babel/parser" "^7.8.7"
-    "@babel/template" "^7.8.6"
-    "@babel/traverse" "^7.8.6"
-    "@babel/types" "^7.8.7"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.1"
-    json5 "^2.1.0"
-    lodash "^4.17.13"
-    resolve "^1.3.2"
-    semver "^5.4.1"
-    source-map "^0.5.0"
-
-"@babel/core@^7.7.5":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.2.tgz#54e45334ffc0172048e5c93ded36461d3ad4c417"
-  integrity sha512-OgC1mON+l4U4B4wiohJlQNUU3H73mpTyYY3j/c8U9dr9UagGGSm+WFpzjy/YLdoyjiG++c1kIDgxCo/mLwQJeQ==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.14.2"
-    "@babel/helper-compilation-targets" "^7.13.16"
-    "@babel/helper-module-transforms" "^7.14.2"
-    "@babel/helpers" "^7.14.0"
-    "@babel/parser" "^7.14.2"
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.14.2"
-    "@babel/types" "^7.14.2"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.2"
-    json5 "^2.1.2"
-    semver "^6.3.0"
-    source-map "^0.5.0"
-
-"@babel/generator@^7.14.2", "@babel/generator@^7.4.0", "@babel/generator@^7.8.7":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.2.tgz#d5773e8b557d421fd6ce0d5efa5fd7fc22567c30"
-  integrity sha512-OnADYbKrffDVai5qcpkMxQ7caomHOoEwjkouqnN2QhydAjowFAZcsdecFIRUBdb+ZcruwYE4ythYmF1UBZU5xQ==
-  dependencies:
-    "@babel/types" "^7.14.2"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
-
-"@babel/helper-annotate-as-pure@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz#0f58e86dfc4bb3b1fcd7db806570e177d439b6ab"
-  integrity sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw==
-  dependencies:
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz#6bc20361c88b0a74d05137a65cac8d3cbf6f61fc"
-  integrity sha512-CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA==
-  dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.12.13"
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-compilation-targets@^7.13.16", "@babel/helper-compilation-targets@^7.8.7":
-  version "7.13.16"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz#6e91dccf15e3f43e5556dffe32d860109887563c"
-  integrity sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA==
-  dependencies:
-    "@babel/compat-data" "^7.13.15"
-    "@babel/helper-validator-option" "^7.12.17"
-    browserslist "^4.14.5"
-    semver "^6.3.0"
-
-"@babel/helper-create-regexp-features-plugin@^7.12.13":
-  version "7.12.17"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz#a2ac87e9e319269ac655b8d4415e94d38d663cb7"
-  integrity sha512-p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.12.13"
-    regexpu-core "^4.7.1"
-
-"@babel/helper-explode-assignable-expression@^7.12.13":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz#17b5c59ff473d9f956f40ef570cf3a76ca12657f"
-  integrity sha512-qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA==
-  dependencies:
-    "@babel/types" "^7.13.0"
-
-"@babel/helper-function-name@^7.12.13", "@babel/helper-function-name@^7.14.2":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.2.tgz#397688b590760b6ef7725b5f0860c82427ebaac2"
-  integrity sha512-NYZlkZRydxw+YT56IlhIcS8PAhb+FEUiOzuhFTfqDyPmzAhRge6ua0dQYT/Uh0t/EDHq05/i+e5M2d4XvjgarQ==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.12.13"
-    "@babel/template" "^7.12.13"
-    "@babel/types" "^7.14.2"
-
-"@babel/helper-get-function-arity@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583"
-  integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==
-  dependencies:
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-hoist-variables@^7.13.0":
-  version "7.13.16"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.16.tgz#1b1651249e94b51f8f0d33439843e33e39775b30"
-  integrity sha512-1eMtTrXtrwscjcAeO4BVK+vvkxaLJSPFz1w1KLawz6HLNi9bPFGBNwwDyVfiu1Tv/vRRFYfoGaKhmAQPGPn5Wg==
-  dependencies:
-    "@babel/traverse" "^7.13.15"
-    "@babel/types" "^7.13.16"
-
-"@babel/helper-member-expression-to-functions@^7.13.12":
-  version "7.13.12"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz#dfe368f26d426a07299d8d6513821768216e6d72"
-  integrity sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw==
-  dependencies:
-    "@babel/types" "^7.13.12"
-
-"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.13.12", "@babel/helper-module-imports@^7.8.3":
-  version "7.13.12"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz#c6a369a6f3621cb25da014078684da9196b61977"
-  integrity sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==
-  dependencies:
-    "@babel/types" "^7.13.12"
-
-"@babel/helper-module-transforms@^7.13.0", "@babel/helper-module-transforms@^7.14.0", "@babel/helper-module-transforms@^7.14.2":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.2.tgz#ac1cc30ee47b945e3e0c4db12fa0c5389509dfe5"
-  integrity sha512-OznJUda/soKXv0XhpvzGWDnml4Qnwp16GN+D/kZIdLsWoHj05kyu8Rm5kXmMef+rVJZ0+4pSGLkeixdqNUATDA==
-  dependencies:
-    "@babel/helper-module-imports" "^7.13.12"
-    "@babel/helper-replace-supers" "^7.13.12"
-    "@babel/helper-simple-access" "^7.13.12"
-    "@babel/helper-split-export-declaration" "^7.12.13"
-    "@babel/helper-validator-identifier" "^7.14.0"
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.14.2"
-    "@babel/types" "^7.14.2"
-
-"@babel/helper-optimise-call-expression@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea"
-  integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==
-  dependencies:
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af"
-  integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==
-
-"@babel/helper-remap-async-to-generator@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz#376a760d9f7b4b2077a9dd05aa9c3927cadb2209"
-  integrity sha512-pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.12.13"
-    "@babel/helper-wrap-function" "^7.13.0"
-    "@babel/types" "^7.13.0"
-
-"@babel/helper-replace-supers@^7.12.13", "@babel/helper-replace-supers@^7.13.12":
-  version "7.13.12"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz#6442f4c1ad912502481a564a7386de0c77ff3804"
-  integrity sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.13.12"
-    "@babel/helper-optimise-call-expression" "^7.12.13"
-    "@babel/traverse" "^7.13.0"
-    "@babel/types" "^7.13.12"
-
-"@babel/helper-simple-access@^7.13.12":
-  version "7.13.12"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz#dd6c538afb61819d205a012c31792a39c7a5eaf6"
-  integrity sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA==
-  dependencies:
-    "@babel/types" "^7.13.12"
-
-"@babel/helper-skip-transparent-expression-wrappers@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz#462dc63a7e435ade8468385c63d2b84cce4b3cbf"
-  integrity sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==
-  dependencies:
-    "@babel/types" "^7.12.1"
-
-"@babel/helper-split-export-declaration@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05"
-  integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==
-  dependencies:
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-validator-identifier@^7.12.11", "@babel/helper-validator-identifier@^7.14.0":
-  version "7.14.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz#d26cad8a47c65286b15df1547319a5d0bcf27288"
-  integrity sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==
-
-"@babel/helper-validator-option@^7.12.17":
-  version "7.12.17"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"
-  integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==
-
-"@babel/helper-wrap-function@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz#bdb5c66fda8526ec235ab894ad53a1235c79fcc4"
-  integrity sha512-1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA==
-  dependencies:
-    "@babel/helper-function-name" "^7.12.13"
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.13.0"
-    "@babel/types" "^7.13.0"
-
-"@babel/helpers@^7.14.0", "@babel/helpers@^7.8.4":
-  version "7.14.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.0.tgz#ea9b6be9478a13d6f961dbb5f36bf75e2f3b8f62"
-  integrity sha512-+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg==
-  dependencies:
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.14.0"
-    "@babel/types" "^7.14.0"
-
-"@babel/highlight@^7.12.13":
-  version "7.14.0"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz#3197e375711ef6bf834e67d0daec88e4f46113cf"
-  integrity sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.14.0"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
-
-"@babel/parser@^7.12.13", "@babel/parser@^7.14.2", "@babel/parser@^7.4.3", "@babel/parser@^7.8.7":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.2.tgz#0c1680aa44ad4605b16cbdcc5c341a61bde9c746"
-  integrity sha512-IoVDIHpsgE/fu7eXBeRWt8zLbDrSvD7H1gpomOkPpBoEN8KCruCqSDdqo8dddwQQrui30KSvQBaMUOJiuFu6QQ==
-
-"@babel/plugin-proposal-async-generator-functions@^7.8.3":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.2.tgz#3a2085abbf5d5f962d480dbc81347385ed62eb1e"
-  integrity sha512-b1AM4F6fwck4N8ItZ/AtC4FP/cqZqmKRQ4FaTDutwSYyjuhtvsGEMLK4N/ztV/ImP40BjIDyMgBQAeAMsQYVFQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/helper-remap-async-to-generator" "^7.13.0"
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
-
-"@babel/plugin-proposal-dynamic-import@^7.8.3":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.2.tgz#01ebabd7c381cff231fa43e302939a9de5be9d9f"
-  integrity sha512-oxVQZIWFh91vuNEMKltqNsKLFWkOIyJc95k2Gv9lWVyDfPUQGSSlbDEgWuJUU1afGE9WwlzpucMZ3yDRHIItkA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
-
-"@babel/plugin-proposal-json-strings@^7.8.3":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.2.tgz#830b4e2426a782e8b2878fbfe2cba85b70cbf98c"
-  integrity sha512-w2DtsfXBBJddJacXMBhElGEYqCZQqN99Se1qeYn8DVLB33owlrlLftIbMzn5nz1OITfDVknXF433tBrLEAOEjA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
-
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.2.tgz#425b11dc62fc26939a2ab42cbba680bdf5734546"
-  integrity sha512-ebR0zU9OvI2N4qiAC38KIAK75KItpIPTpAtd2r4OZmMFeKbKJpUFLYP2EuDut82+BmYi8sz42B+TfTptJ9iG5Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-
-"@babel/plugin-proposal-object-rest-spread@^7.8.3":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.2.tgz#e17d418f81cc103fedd4ce037e181c8056225abc"
-  integrity sha512-hBIQFxwZi8GIp934+nj5uV31mqclC1aYDhctDu5khTi9PCCUOczyy0b34W0oE9U/eJXiqQaKyVsmjeagOaSlbw==
-  dependencies:
-    "@babel/compat-data" "^7.14.0"
-    "@babel/helper-compilation-targets" "^7.13.16"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.14.2"
-
-"@babel/plugin-proposal-optional-catch-binding@^7.8.3":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.2.tgz#150d4e58e525b16a9a1431bd5326c4eed870d717"
-  integrity sha512-XtkJsmJtBaUbOxZsNk0Fvrv8eiqgneug0A6aqLFZ4TSkar2L5dSXWcnUKHgmjJt49pyB/6ZHvkr3dPgl9MOWRQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-
-"@babel/plugin-proposal-optional-chaining@^7.8.3":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.2.tgz#df8171a8b9c43ebf4c1dabe6311b432d83e1b34e"
-  integrity sha512-qQByMRPwMZJainfig10BoaDldx/+VDtNcrA7qdNaEOAj6VXud+gfrkA8j4CRAU5HjnWREXqIpSpH30qZX1xivA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
-
-"@babel/plugin-proposal-unicode-property-regex@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz#bebde51339be829c17aaaaced18641deb62b39ba"
-  integrity sha512-XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-syntax-async-generators@^7.8.0", "@babel/plugin-syntax-async-generators@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
-  integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-dynamic-import@^7.8.0", "@babel/plugin-syntax-dynamic-import@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
-  integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-json-strings@^7.8.0", "@babel/plugin-syntax-json-strings@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
-  integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
-  integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
-  integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-optional-catch-binding@^7.8.0", "@babel/plugin-syntax-optional-catch-binding@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
-  integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-optional-chaining@^7.8.0", "@babel/plugin-syntax-optional-chaining@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
-  integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-top-level-await@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178"
-  integrity sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-arrow-functions@^7.8.3":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz#10a59bebad52d637a027afa692e8d5ceff5e3dae"
-  integrity sha512-96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-
-"@babel/plugin-transform-async-to-generator@^7.8.3":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz#8e112bf6771b82bf1e974e5e26806c5c99aa516f"
-  integrity sha512-3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg==
-  dependencies:
-    "@babel/helper-module-imports" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/helper-remap-async-to-generator" "^7.13.0"
-
-"@babel/plugin-transform-block-scoped-functions@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz#a9bf1836f2a39b4eb6cf09967739de29ea4bf4c4"
-  integrity sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-block-scoping@^7.8.3":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.2.tgz#761cb12ab5a88d640ad4af4aa81f820e6b5fdf5c"
-  integrity sha512-neZZcP19NugZZqNwMTH+KoBjx5WyvESPSIOQb4JHpfd+zPfqcH65RMu5xJju5+6q/Y2VzYrleQTr+b6METyyxg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-
-"@babel/plugin-transform-classes@^7.8.6":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.2.tgz#3f1196c5709f064c252ad056207d87b7aeb2d03d"
-  integrity sha512-7oafAVcucHquA/VZCsXv/gmuiHeYd64UJyyTYU+MPfNu0KeNlxw06IeENBO8bJjXVbolu+j1MM5aKQtH1OMCNg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.12.13"
-    "@babel/helper-function-name" "^7.14.2"
-    "@babel/helper-optimise-call-expression" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/helper-replace-supers" "^7.13.12"
-    "@babel/helper-split-export-declaration" "^7.12.13"
-    globals "^11.1.0"
-
-"@babel/plugin-transform-computed-properties@^7.8.3":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz#845c6e8b9bb55376b1fa0b92ef0bdc8ea06644ed"
-  integrity sha512-RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-
-"@babel/plugin-transform-destructuring@^7.8.3":
-  version "7.13.17"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.17.tgz#678d96576638c19d5b36b332504d3fd6e06dea27"
-  integrity sha512-UAUqiLv+uRLO+xuBKKMEpC+t7YRNVRqBsWWq1yKXbBZBje/t3IXCiSinZhjn/DC3qzBfICeYd2EFGEbHsh5RLA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-
-"@babel/plugin-transform-dotall-regex@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz#3f1601cc29905bfcb67f53910f197aeafebb25ad"
-  integrity sha512-foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-duplicate-keys@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz#6f06b87a8b803fd928e54b81c258f0a0033904de"
-  integrity sha512-NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-exponentiation-operator@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz#4d52390b9a273e651e4aba6aee49ef40e80cd0a1"
-  integrity sha512-fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA==
-  dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-for-of@^7.8.6":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz#c799f881a8091ac26b54867a845c3e97d2696062"
-  integrity sha512-IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-
-"@babel/plugin-transform-function-name@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz#bb024452f9aaed861d374c8e7a24252ce3a50051"
-  integrity sha512-6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ==
-  dependencies:
-    "@babel/helper-function-name" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-literals@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz#2ca45bafe4a820197cf315794a4d26560fe4bdb9"
-  integrity sha512-FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-member-expression-literals@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz#5ffa66cd59b9e191314c9f1f803b938e8c081e40"
-  integrity sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-modules-amd@^7.8.3":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.2.tgz#6622806fe1a7c07a1388444222ef9535f2ca17b0"
-  integrity sha512-hPC6XBswt8P3G2D1tSV2HzdKvkqOpmbyoy+g73JG0qlF/qx2y3KaMmXb1fLrpmWGLZYA0ojCvaHdzFWjlmV+Pw==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.14.2"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    babel-plugin-dynamic-import-node "^2.3.3"
-
-"@babel/plugin-transform-modules-commonjs@^7.8.3":
-  version "7.14.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.0.tgz#52bc199cb581e0992edba0f0f80356467587f161"
-  integrity sha512-EX4QePlsTaRZQmw9BsoPeyh5OCtRGIhwfLquhxGp5e32w+dyL8htOcDwamlitmNFK6xBZYlygjdye9dbd9rUlQ==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.14.0"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/helper-simple-access" "^7.13.12"
-    babel-plugin-dynamic-import-node "^2.3.3"
-
-"@babel/plugin-transform-modules-systemjs@^7.8.3":
-  version "7.13.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz#6d066ee2bff3c7b3d60bf28dec169ad993831ae3"
-  integrity sha512-hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A==
-  dependencies:
-    "@babel/helper-hoist-variables" "^7.13.0"
-    "@babel/helper-module-transforms" "^7.13.0"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/helper-validator-identifier" "^7.12.11"
-    babel-plugin-dynamic-import-node "^2.3.3"
-
-"@babel/plugin-transform-modules-umd@^7.8.3":
-  version "7.14.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.0.tgz#2f8179d1bbc9263665ce4a65f305526b2ea8ac34"
-  integrity sha512-nPZdnWtXXeY7I87UZr9VlsWme3Y0cfFFE41Wbxz4bbaexAjNMInXPFUpRRUJ8NoMm0Cw+zxbqjdPmLhcjfazMw==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.14.0"
-    "@babel/helper-plugin-utils" "^7.13.0"
-
-"@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz#2213725a5f5bbbe364b50c3ba5998c9599c5c9d9"
-  integrity sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
-
-"@babel/plugin-transform-new-target@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz#e22d8c3af24b150dd528cbd6e685e799bf1c351c"
-  integrity sha512-/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-object-super@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz#b4416a2d63b8f7be314f3d349bd55a9c1b5171f7"
-  integrity sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-    "@babel/helper-replace-supers" "^7.12.13"
-
-"@babel/plugin-transform-parameters@^7.14.2", "@babel/plugin-transform-parameters@^7.8.7":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.2.tgz#e4290f72e0e9e831000d066427c4667098decc31"
-  integrity sha512-NxoVmA3APNCC1JdMXkdYXuQS+EMdqy0vIwyDHeKHiJKRxmp1qGSdb0JLEIoPRhkx6H/8Qi3RJ3uqOCYw8giy9A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-
-"@babel/plugin-transform-property-literals@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz#4e6a9e37864d8f1b3bc0e2dce7bf8857db8b1a81"
-  integrity sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-regenerator@^7.8.7":
-  version "7.13.15"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.13.15.tgz#e5eb28945bf8b6563e7f818945f966a8d2997f39"
-  integrity sha512-Bk9cOLSz8DiurcMETZ8E2YtIVJbFCPGW28DJWUakmyVWtQSm6Wsf0p4B4BfEr/eL2Nkhe/CICiUiMOCi1TPhuQ==
-  dependencies:
-    regenerator-transform "^0.14.2"
-
-"@babel/plugin-transform-reserved-words@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz#7d9988d4f06e0fe697ea1d9803188aa18b472695"
-  integrity sha512-xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-shorthand-properties@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz#db755732b70c539d504c6390d9ce90fe64aff7ad"
-  integrity sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-spread@^7.8.3":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz#84887710e273c1815ace7ae459f6f42a5d31d5fd"
-  integrity sha512-V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
-
-"@babel/plugin-transform-sticky-regex@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz#760ffd936face73f860ae646fb86ee82f3d06d1f"
-  integrity sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-template-literals@^7.8.3":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz#a36049127977ad94438dee7443598d1cefdf409d"
-  integrity sha512-d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-
-"@babel/plugin-transform-typeof-symbol@^7.8.4":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz#785dd67a1f2ea579d9c2be722de8c84cb85f5a7f"
-  integrity sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-unicode-regex@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz#b52521685804e155b1202e83fc188d34bb70f5ac"
-  integrity sha512-mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/preset-env@7.8.7":
-  version "7.8.7"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.8.7.tgz#1fc7d89c7f75d2d70c2b6768de6c2e049b3cb9db"
-  integrity sha512-BYftCVOdAYJk5ASsznKAUl53EMhfBbr8CJ1X+AJLfGPscQkwJFiaV/Wn9DPH/7fzm2v6iRYJKYHSqyynTGw0nw==
-  dependencies:
-    "@babel/compat-data" "^7.8.6"
-    "@babel/helper-compilation-targets" "^7.8.7"
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-proposal-async-generator-functions" "^7.8.3"
-    "@babel/plugin-proposal-dynamic-import" "^7.8.3"
-    "@babel/plugin-proposal-json-strings" "^7.8.3"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-proposal-object-rest-spread" "^7.8.3"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.8.3"
-    "@babel/plugin-proposal-optional-chaining" "^7.8.3"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.8.3"
-    "@babel/plugin-syntax-async-generators" "^7.8.0"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
-    "@babel/plugin-syntax-json-strings" "^7.8.0"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
-    "@babel/plugin-syntax-top-level-await" "^7.8.3"
-    "@babel/plugin-transform-arrow-functions" "^7.8.3"
-    "@babel/plugin-transform-async-to-generator" "^7.8.3"
-    "@babel/plugin-transform-block-scoped-functions" "^7.8.3"
-    "@babel/plugin-transform-block-scoping" "^7.8.3"
-    "@babel/plugin-transform-classes" "^7.8.6"
-    "@babel/plugin-transform-computed-properties" "^7.8.3"
-    "@babel/plugin-transform-destructuring" "^7.8.3"
-    "@babel/plugin-transform-dotall-regex" "^7.8.3"
-    "@babel/plugin-transform-duplicate-keys" "^7.8.3"
-    "@babel/plugin-transform-exponentiation-operator" "^7.8.3"
-    "@babel/plugin-transform-for-of" "^7.8.6"
-    "@babel/plugin-transform-function-name" "^7.8.3"
-    "@babel/plugin-transform-literals" "^7.8.3"
-    "@babel/plugin-transform-member-expression-literals" "^7.8.3"
-    "@babel/plugin-transform-modules-amd" "^7.8.3"
-    "@babel/plugin-transform-modules-commonjs" "^7.8.3"
-    "@babel/plugin-transform-modules-systemjs" "^7.8.3"
-    "@babel/plugin-transform-modules-umd" "^7.8.3"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3"
-    "@babel/plugin-transform-new-target" "^7.8.3"
-    "@babel/plugin-transform-object-super" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.8.7"
-    "@babel/plugin-transform-property-literals" "^7.8.3"
-    "@babel/plugin-transform-regenerator" "^7.8.7"
-    "@babel/plugin-transform-reserved-words" "^7.8.3"
-    "@babel/plugin-transform-shorthand-properties" "^7.8.3"
-    "@babel/plugin-transform-spread" "^7.8.3"
-    "@babel/plugin-transform-sticky-regex" "^7.8.3"
-    "@babel/plugin-transform-template-literals" "^7.8.3"
-    "@babel/plugin-transform-typeof-symbol" "^7.8.4"
-    "@babel/plugin-transform-unicode-regex" "^7.8.3"
-    "@babel/types" "^7.8.7"
-    browserslist "^4.8.5"
-    core-js-compat "^3.6.2"
-    invariant "^2.2.2"
-    levenary "^1.1.1"
-    semver "^5.5.0"
-
-"@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
-  version "7.14.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.0.tgz#46794bc20b612c5f75e62dd071e24dfd95f1cbe6"
-  integrity sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==
-  dependencies:
-    regenerator-runtime "^0.13.4"
-
-"@babel/runtime@^7.14.0":
-  version "7.18.3"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.3.tgz#c7b654b57f6f63cf7f8b418ac9ca04408c4579f4"
-  integrity sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug==
-  dependencies:
-    regenerator-runtime "^0.13.4"
-
-"@babel/template@^7.12.13", "@babel/template@^7.4.0", "@babel/template@^7.8.6":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327"
-  integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@babel/parser" "^7.12.13"
-    "@babel/types" "^7.12.13"
-
-"@babel/traverse@^7.13.0", "@babel/traverse@^7.13.15", "@babel/traverse@^7.14.0", "@babel/traverse@^7.14.2", "@babel/traverse@^7.4.3", "@babel/traverse@^7.8.6":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.2.tgz#9201a8d912723a831c2679c7ebbf2fe1416d765b"
-  integrity sha512-TsdRgvBFHMyHOOzcP9S6QU0QQtjxlRpEYOy3mcCO5RgmC305ki42aSAmfZEMSSYBla2oZ9BMqYlncBaKmD/7iA==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.14.2"
-    "@babel/helper-function-name" "^7.14.2"
-    "@babel/helper-split-export-declaration" "^7.12.13"
-    "@babel/parser" "^7.14.2"
-    "@babel/types" "^7.14.2"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.16", "@babel/types@^7.14.0", "@babel/types@^7.14.2", "@babel/types@^7.4.0", "@babel/types@^7.8.7":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.2.tgz#4208ae003107ef8a057ea8333e56eb64d2f6a2c3"
-  integrity sha512-SdjAG/3DikRHpUOjxZgnkbR11xUlyDMUFJdvnIgZEE16mqmY0BINMmc4//JMJglEmn6i7sq6p+mGrFWyZ98EEw==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.14.0"
-    to-fast-properties "^2.0.0"
-
-"@egjs/hammerjs@^2.0.15":
-  version "2.0.17"
-  resolved "https://registry.yarnpkg.com/@egjs/hammerjs/-/hammerjs-2.0.17.tgz#5dc02af75a6a06e4c2db0202cae38c9263895124"
-  integrity sha512-XQsZgjm2EcVUiZQf11UBJQfmZeEmOW8DpI1gsFeln6w0ae0ii4dMQEQ0kjl6DspdWX1aGY1/loyXnP0JS06e/A==
-  dependencies:
-    "@types/hammerjs" "^2.0.36"
-
-"@fimbul/bifrost@^0.21.0":
-  version "0.21.0"
-  resolved "https://registry.yarnpkg.com/@fimbul/bifrost/-/bifrost-0.21.0.tgz#d0fafa25938fda475657a6a1e407a21bbe02c74e"
-  integrity sha512-ou8VU+nTmOW1jeg+FT+sn+an/M0Xb9G16RucrfhjXGWv1Q97kCoM5CG9Qj7GYOSdu7km72k7nY83Eyr53Bkakg==
-  dependencies:
-    "@fimbul/ymir" "^0.21.0"
-    get-caller-file "^2.0.0"
-    tslib "^1.8.1"
-    tsutils "^3.5.0"
-
-"@fimbul/ymir@^0.21.0":
-  version "0.21.0"
-  resolved "https://registry.yarnpkg.com/@fimbul/ymir/-/ymir-0.21.0.tgz#8525726787aceeafd4e199472c0d795160b5d4a1"
-  integrity sha512-T/y7WqPsm4n3zhT08EpB5sfdm2Kvw3gurAxr2Lr5dQeLi8ZsMlNT/Jby+ZmuuAAd1PnXYzKp+2SXgIkQIIMCUg==
-  dependencies:
-    inversify "^5.0.0"
-    reflect-metadata "^0.1.12"
-    tslib "^1.8.1"
-
-"@fullhuman/postcss-purgecss@^2.1.2":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@fullhuman/postcss-purgecss/-/postcss-purgecss-2.3.0.tgz#50a954757ec78696615d3e118e3fee2d9291882e"
-  integrity sha512-qnKm5dIOyPGJ70kPZ5jiz0I9foVOic0j+cOzNDoo8KoCf6HjicIZ99UfO2OmE7vCYSKAAepEwJtNzpiiZAh9xw==
-  dependencies:
-    postcss "7.0.32"
-    purgecss "^2.3.0"
-
-"@istanbuljs/schema@^0.1.2":
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
-  integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
-
-"@ngtools/webpack@8.3.29":
-  version "8.3.29"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-8.3.29.tgz#7b6984cdccd633dd687e9413a89a2d9e1360f76c"
-  integrity sha512-7uB7dlAHR7RmxcQCYidnWRR1tFRJq7CzI+MM3725ibAvi4HnM5viC/HnKRTK7V+3iS1C0l0u0Gyo/769NsUDTQ==
-  dependencies:
-    "@angular-devkit/core" "8.3.29"
-    enhanced-resolve "4.1.0"
-    rxjs "6.4.0"
-    tree-kill "1.2.2"
-    webpack-sources "1.4.3"
-
-"@nodelib/fs.scandir@2.1.4":
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69"
-  integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==
-  dependencies:
-    "@nodelib/fs.stat" "2.0.4"
-    run-parallel "^1.1.9"
-
-"@nodelib/fs.stat@2.0.4", "@nodelib/fs.stat@^2.0.2":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655"
-  integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==
-
-"@nodelib/fs.walk@^1.2.3":
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063"
-  integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==
-  dependencies:
-    "@nodelib/fs.scandir" "2.1.4"
-    fastq "^1.6.0"
-
-"@npmcli/move-file@^1.0.1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
-  integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==
-  dependencies:
-    mkdirp "^1.0.4"
-    rimraf "^3.0.2"
-
-"@polka/url@^1.0.0-next.20":
-  version "1.0.0-next.21"
-  resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1"
-  integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==
-
-"@popperjs/core@^2.4.0":
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.2.tgz#adea7b6953cbb34651766b0548468e743c6a2353"
-  integrity sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==
-
-"@project-sunbird/telemetry-sdk@0.0.26":
-  version "0.0.26"
-  resolved "https://registry.yarnpkg.com/@project-sunbird/telemetry-sdk/-/telemetry-sdk-0.0.26.tgz#15a7776e0d94da3c844161b1400612303756a830"
-  integrity sha512-8r8tf+YN+z8A4KHBmL8/wxDIKGkASDHMMxyhlI9/iWv83sueoN5qHB6QnqgtIRyEdFjt4Tum5u18/oB71Bb0PQ==
-  dependencies:
-    grunt-karma "^0.12.2"
-    karma "^3.0.0"
-
-"@schematics/angular@8.3.29":
-  version "8.3.29"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-8.3.29.tgz#da747539230dae16111c56422339c02dbb17681d"
-  integrity sha512-If+UhCsQzCgnQymiiF8dQRoic34+RgJ6rV0n4k7Tm4N2xNYJOG7ajjzKM7PIeafsF50FKnFP8dqaNGxCMyq5Ew==
-  dependencies:
-    "@angular-devkit/core" "8.3.29"
-    "@angular-devkit/schematics" "8.3.29"
-
-"@schematics/update@0.803.29":
-  version "0.803.29"
-  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.803.29.tgz#ad3c9bfe8c6d877a0ea692ae4760f0d72f3e0cc9"
-  integrity sha512-Syf6h6DYeu1WU9aLihMwIgVASpcHCxUYqhZyHfQABiK8NkdlZ+KAp4cOxihsZyDqIJNLWON+0/FLPAQF3BXh5Q==
-  dependencies:
-    "@angular-devkit/core" "8.3.29"
-    "@angular-devkit/schematics" "8.3.29"
-    "@yarnpkg/lockfile" "1.1.0"
-    ini "1.3.5"
-    pacote "9.5.5"
-    rxjs "6.4.0"
-    semver "6.3.0"
-    semver-intersect "1.4.0"
-
-"@sindresorhus/is@^0.14.0":
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
-  integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
-
-"@sunbird-cb/collection@^1.0.19":
-  version "1.0.19"
-  resolved "https://registry.yarnpkg.com/@sunbird-cb/collection/-/collection-1.0.19.tgz#ee857cf41667d90ab40086130b90033176e8d928"
-  integrity sha512-uo1L6JzKyc1WAOae3UonpAwgRotAMUbTxoDrP60iXnbiC5eBgK6yOleiGJ6szW51YfYte/Pc5rTUGuQ9ew+MRQ==
-  dependencies:
-    tslib "^1.9.0"
-
-"@sunbird-cb/design-system@0.0.1":
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/@sunbird-cb/design-system/-/design-system-0.0.1.tgz#66795a90e6a3fe3609cd574e694ad296fdc9a1a5"
-  integrity sha512-GYfnfpNfzZjnU5Ss+xfSdVbvyek97Yq8cDVsfT4+R0MgsIYnI4gqx7G0Qvx9caZYgb3eoE6wlsyb0K2aWyO+UQ==
-
-"@sunbird-cb/rain-dashboards@^0.2.8":
-  version "0.2.9"
-  resolved "https://registry.yarnpkg.com/@sunbird-cb/rain-dashboards/-/rain-dashboards-0.2.9.tgz#6fbcf82386e09475901137411ca5fee7d0c8c29f"
-  integrity sha512-4i3AL3r0MIS0cLTR2bW1sNJ9QdQY0Yyx2z3HIcqZlvWQdb6GE3vobYwtX1Tn1APy/2eUBlLKwO+BDF0QqQ50LA==
-  dependencies:
-    tslib "^1.9.0"
-
-"@sunbird-cb/resolver@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@sunbird-cb/resolver/-/resolver-1.0.0.tgz#30e5350cbd54af259cdb279ed79bdacad6fd2650"
-  integrity sha512-UJkXVT4LurSVcOg/M/mHdYagfsvLl9n1iLFnn8mzD7jwrjcGQorc2Cmrj1WBvKQuve7me3zMCcATD8UMCHv4Ug==
-  dependencies:
-    tslib "^1.9.0"
-
-"@sunbird-cb/utils@^1.0.12":
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/@sunbird-cb/utils/-/utils-1.0.12.tgz#a5c76678769bfd4858bce457a64946e7ebb55fd9"
-  integrity sha512-QkcVHXthZGDtaJWWQgYHXp8vaY/V/oCrR4xXNrKK0qeZJ5NlrwjqRiDoyVNziG37sNX0V/G0ejmqqTUSBG0Oew==
-  dependencies:
-    tslib "^1.9.0"
-
-"@szmarczak/http-timer@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
-  integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==
-  dependencies:
-    defer-to-connect "^1.0.1"
-
-"@types/chart.js@^2.7.48", "@types/chart.js@^2.7.56":
-  version "2.9.32"
-  resolved "https://registry.yarnpkg.com/@types/chart.js/-/chart.js-2.9.32.tgz#b17d9a8c41ad348183a2ce041ebdeef892998251"
-  integrity sha512-d45JiRQwEOlZiKwukjqmqpbqbYzUX2yrXdH9qVn6kXpPDsTYCo6YbfFOlnUaJ8S/DhJwbBJiLsMjKpW5oP8B2A==
-  dependencies:
-    moment "^2.10.2"
-
-"@types/d3-array@^1":
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/@types/d3-array/-/d3-array-1.2.8.tgz#b852381cb68e31e46bfa23ee70a383cbc6d62146"
-  integrity sha512-wWV0wT6oLUGprrOR5LMK7Dh8EBiondhnqINsvazv6UucYfTdb2oaFF4knlqzZV2RKB9ZC9G7G1Iojt8b/wolsw==
-
-"@types/d3-axis@^1":
-  version "1.0.14"
-  resolved "https://registry.yarnpkg.com/@types/d3-axis/-/d3-axis-1.0.14.tgz#4ff27eb94fab10efbda6c972e1fbb26ea696655b"
-  integrity sha512-wZAKX/dtFT5t5iuCaiU0QL0BWB19TE6h7C7kgfBVyoka7zidQWvf8E9zQTJ5bNPBQxd0+JmplNqwy1M8O8FOjA==
-  dependencies:
-    "@types/d3-selection" "^1"
-
-"@types/d3-brush@^1":
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/@types/d3-brush/-/d3-brush-1.1.4.tgz#0b5cc9c57476d0144b991228b44664e08494b7f3"
-  integrity sha512-2t8CgWaha9PsPdSZJ9m6Jl4awqf3DGIXek2e7gfheyfP2R0a/18MX+wuLHx+LyI1Ad7lxDsPWcswKD0XhQEjmg==
-  dependencies:
-    "@types/d3-selection" "^1"
-
-"@types/d3-chord@^1":
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/@types/d3-chord/-/d3-chord-1.0.10.tgz#4c14ca40f61b89a3c615d63f5a34fcc81390805c"
-  integrity sha512-U6YojfET6ITL1/bUJo+/Lh3pMV9XPAfOWwbshl3y3RlgAX9VO/Bxa13IMAylZIDY4VsA3Gkh29kZP1AcAeyoYA==
-
-"@types/d3-collection@*":
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/@types/d3-collection/-/d3-collection-1.0.10.tgz#bca161e336156968f267c077f7f2bfa8ff224e58"
-  integrity sha512-54Fdv8u5JbuXymtmXm2SYzi1x/Svt+jfWBU5junkhrCewL92VjqtCBDn97coBRVwVFmYNnVTNDyV8gQyPYfm+A==
-
-"@types/d3-color@^1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@types/d3-color/-/d3-color-1.4.1.tgz#0d9746c84dfef28807b2989eed4f37b2575e1f33"
-  integrity sha512-xkPLi+gbgUU9ED6QX4g6jqYL2KCB0/3AlM+ncMGqn49OgH0gFMY/ITGqPF8HwEiLzJaC+2L0I+gNwBgABv1Pvg==
-
-"@types/d3-contour@^1":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/@types/d3-contour/-/d3-contour-1.3.1.tgz#589dc3eec14168eea7e31edd1e3bbe246cc9d626"
-  integrity sha512-wWwsM/3NfKTRBdH00cSf+XlsaHlNTkvH66PgDedobyvKQZ4sJrXXpr16LXvDnAal4B67v8JGrWDgyx6dqqKLuQ==
-  dependencies:
-    "@types/d3-array" "^1"
-    "@types/geojson" "*"
-
-"@types/d3-dispatch@^1":
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/@types/d3-dispatch/-/d3-dispatch-1.0.9.tgz#c5a180f1e251de853b399cfbfbb6dd7f8bf842ae"
-  integrity sha512-zJ44YgjqALmyps+II7b1mZLhrtfV/FOxw9owT87mrweGWcg+WK5oiJX2M3SYJ0XUAExBduarysfgbR11YxzojQ==
-
-"@types/d3-drag@^1":
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/@types/d3-drag/-/d3-drag-1.2.5.tgz#0b1b852cb41577075aa625ae6149379ea6c34dfd"
-  integrity sha512-7NeTnfolst1Js3Vs7myctBkmJWu6DMI3k597AaHUX98saHjHWJ6vouT83UrpE+xfbSceHV+8A0JgxuwgqgmqWw==
-  dependencies:
-    "@types/d3-selection" "^1"
-
-"@types/d3-dsv@^1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@types/d3-dsv/-/d3-dsv-1.2.1.tgz#1524fee9f19d689c2f76aa0e24e230762bf96994"
-  integrity sha512-LLmJmjiqp/fTNEdij5bIwUJ6P6TVNk5hKM9/uk5RPO2YNgEu9XvKO0dJ7Iqd3psEdmZN1m7gB1bOsjr4HmO2BA==
-
-"@types/d3-ease@^1":
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/@types/d3-ease/-/d3-ease-1.0.10.tgz#09910e8558439b6038a7ed620650e510394ffa6d"
-  integrity sha512-fMFTCzd8DOwruE9zlu2O8ci5ct+U5jkGcDS+cH+HCidnJlDs0MZ+TuSVCFtEzh4E5MasItwy+HvgoFtxPHa5Cw==
-
-"@types/d3-fetch@^1":
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/@types/d3-fetch/-/d3-fetch-1.2.2.tgz#b93bfe248b8b761af82f4dac57959c989f67da3e"
-  integrity sha512-rtFs92GugtV/NpiJQd0WsmGLcg52tIL0uF0bKbbJg231pR9JEb6HT4AUwrtuLq3lOeKdLBhsjV14qb0pMmd0Aw==
-  dependencies:
-    "@types/d3-dsv" "^1"
-
-"@types/d3-force@^1":
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/@types/d3-force/-/d3-force-1.2.2.tgz#6337a146dbdf2781f5dde5bb491a646fd03d7bc4"
-  integrity sha512-TN7KO7sk0tJauedIt0q20RQRFo4V3v97pJKO/TDK40X3LaPM1aXRM2+zFF+nRMtseEiszg4KffudhjR8a3+4cg==
-
-"@types/d3-format@^1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@types/d3-format/-/d3-format-1.4.1.tgz#1e657a219e4b1e3931508a610d570bdec8ecdd9d"
-  integrity sha512-ss9G2snEKmp2In5Z3T0Jpqv8QaDBc2xHltBw83KjnV5B5w+Iwphbvq5ph/Xnu4d03fmmsdt+o1aWch379rxIbA==
-
-"@types/d3-geo@^1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@types/d3-geo/-/d3-geo-1.12.1.tgz#bec8692ffee9f60e18483af9008f92d4a8428118"
-  integrity sha512-8+gyGFyMCXIHtnMNKQDT++tZ4XYFXgiP5NK7mcv34aYXA16GQFiBBITjKzxghpO8QNVceOd9rUn1JY92WLNGQw==
-  dependencies:
-    "@types/geojson" "*"
-
-"@types/d3-hierarchy@^1":
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/@types/d3-hierarchy/-/d3-hierarchy-1.1.7.tgz#14a57b0539f8929015f8ad96490de50a16211040"
-  integrity sha512-fvht6DOYKzqmXjMb/+xfgkmrWM4SD7rMA/ZbM+gGwr9ZTuIDfky95J8CARtaJo/ExeWyS0xGVdL2gqno2zrQ0Q==
-
-"@types/d3-interpolate@^1":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@types/d3-interpolate/-/d3-interpolate-1.4.2.tgz#88902a205f682773a517612299a44699285eed7b"
-  integrity sha512-ylycts6llFf8yAEs1tXzx2loxxzDZHseuhPokrqKprTQSTcD3JbJI1omZP1rphsELZO3Q+of3ff0ZS7+O6yVzg==
-  dependencies:
-    "@types/d3-color" "^1"
-
-"@types/d3-path@^1":
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/@types/d3-path/-/d3-path-1.0.9.tgz#73526b150d14cd96e701597cbf346cfd1fd4a58c"
-  integrity sha512-NaIeSIBiFgSC6IGUBjZWcscUJEq7vpVu7KthHN8eieTV9d9MqkSOZLH4chq1PmcKy06PNe3axLeKmRIyxJ+PZQ==
-
-"@types/d3-polygon@^1":
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/@types/d3-polygon/-/d3-polygon-1.0.8.tgz#127ee83fccda5bf57384011da90f31367fea1530"
-  integrity sha512-1TOJPXCBJC9V3+K3tGbTqD/CsqLyv/YkTXAcwdsZzxqw5cvpdnCuDl42M4Dvi8XzMxZNCT9pL4ibrK2n4VmAcw==
-
-"@types/d3-quadtree@^1":
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/@types/d3-quadtree/-/d3-quadtree-1.0.8.tgz#980998eb20d5e1c1494089ad9a8466a0e98825a7"
-  integrity sha512-FuqYiexeSQZlc+IcGAVK8jSJKDFKHcSf/jx8rqJUUVx6rzv7ecQiXKyatrLHHh3W4CAvgNeVI23JKgk4+x2wFg==
-
-"@types/d3-random@^1":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@types/d3-random/-/d3-random-1.1.3.tgz#8f7fdc23f92d1561e0694eb49567e8ab50537a19"
-  integrity sha512-XXR+ZbFCoOd4peXSMYJzwk0/elP37WWAzS/DG+90eilzVbUSsgKhBcWqylGWe+lA2ubgr7afWAOBaBxRgMUrBQ==
-
-"@types/d3-scale-chromatic@^1":
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/@types/d3-scale-chromatic/-/d3-scale-chromatic-1.5.1.tgz#e2b7c3401e5c13809f831911eb820e444f4fc67a"
-  integrity sha512-7FtJYrmXTEWLykShjYhoGuDNR/Bda0+tstZMkFj4RRxUEryv16AGh3be21tqg84B6KfEwiZyEpBcTyPyU+GWjg==
-
-"@types/d3-scale@^2":
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/@types/d3-scale/-/d3-scale-2.2.4.tgz#ca0d4b84d2f88fe058480f81354d14041a667b96"
-  integrity sha512-wkQXT+IfgfAnKB5rtS1qMJg3FS32r1rVFHvqtiqk8pX8o5aQR3VwX1P7ErHjzNIicTlkWsaMiUTrYB+E75HFeA==
-  dependencies:
-    "@types/d3-time" "^1"
-
-"@types/d3-selection@^1":
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/@types/d3-selection/-/d3-selection-1.4.3.tgz#36928bbe64eb8e0bbcbaa01fb05c21ff6c71fa93"
-  integrity sha512-GjKQWVZO6Sa96HiKO6R93VBE8DUW+DDkFpIMf9vpY5S78qZTlRRSNUsHr/afDpF7TvLDV7VxrUFOWW7vdIlYkA==
-
-"@types/d3-shape@^1":
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/@types/d3-shape/-/d3-shape-1.3.5.tgz#c0164c1be1429473016f855871d487f806c4e968"
-  integrity sha512-aPEax03owTAKynoK8ZkmkZEDZvvT4Y5pWgii4Jp4oQt0gH45j6siDl9gNDVC5kl64XHN2goN9jbYoHK88tFAcA==
-  dependencies:
-    "@types/d3-path" "^1"
-
-"@types/d3-time-format@^2":
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/@types/d3-time-format/-/d3-time-format-2.3.1.tgz#87a30e4513b9d1d53b920327a361f87255bf3372"
-  integrity sha512-fck0Z9RGfIQn3GJIEKVrp15h9m6Vlg0d5XXeiE/6+CQiBmMDZxfR21XtjEPuDeg7gC3bBM0SdieA5XF3GW1wKA==
-
-"@types/d3-time@^1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@types/d3-time/-/d3-time-1.1.1.tgz#6cf3a4242c3bbac00440dfb8ba7884f16bedfcbf"
-  integrity sha512-ULX7LoqXTCYtM+tLYOaeAJK7IwCT+4Gxlm2MaH0ErKLi07R5lh8NHCAyWcDkCCmx1AfRcBEV6H9QE9R25uP7jw==
-
-"@types/d3-timer@^1":
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/@types/d3-timer/-/d3-timer-1.0.10.tgz#329c51c2c931f44ed0acff78b8c84571acf0ed21"
-  integrity sha512-ZnAbquVqy+4ZjdW0cY6URp+qF/AzTVNda2jYyOzpR2cPT35FTXl78s15Bomph9+ckOiI1TtkljnWkwbIGAb6rg==
-
-"@types/d3-transition@^1":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/@types/d3-transition/-/d3-transition-1.3.1.tgz#5d658eea2db17684daa04eda81d7db9824d3463f"
-  integrity sha512-U9CpMlTL/NlqdGXBlHYxTZwbmy/vN1cFv8TuAIFPX+xOW/1iChbeJBY2xmINhDQfkGJbgkH4IovafCwI1ZDrgg==
-  dependencies:
-    "@types/d3-selection" "^1"
-
-"@types/d3-voronoi@*":
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/@types/d3-voronoi/-/d3-voronoi-1.1.9.tgz#7bbc210818a3a5c5e0bafb051420df206617c9e5"
-  integrity sha512-DExNQkaHd1F3dFPvGA/Aw2NGyjMln6E9QzsiqOcBgnE+VInYnFBHBBySbZQts6z6xD+5jTfKCP7M4OqMyVjdwQ==
-
-"@types/d3-zoom@^1":
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/@types/d3-zoom/-/d3-zoom-1.8.2.tgz#187d33f9ffa59811ce93b2eacd32d92c1ef03f16"
-  integrity sha512-rU0LirorUxkLxEHSzkFs7pPC0KWsxRGc0sHrxEDR0/iQq+7/xpNkKuuOOwthlgvOtpOvtTLJ2JFOD6Kr0Si4Uw==
-  dependencies:
-    "@types/d3-interpolate" "^1"
-    "@types/d3-selection" "^1"
-
-"@types/d3@^5.7.2":
-  version "5.16.4"
-  resolved "https://registry.yarnpkg.com/@types/d3/-/d3-5.16.4.tgz#a7dc24a3dc1c19922eee72ba16144fd5bcea987a"
-  integrity sha512-2u0O9iP1MubFiQ+AhR1id4Egs+07BLtvRATG6IL2Gs9+KzdrfaxCKNq5hxEyw1kxwsqB/lCgr108XuHcKtb/5w==
-  dependencies:
-    "@types/d3-array" "^1"
-    "@types/d3-axis" "^1"
-    "@types/d3-brush" "^1"
-    "@types/d3-chord" "^1"
-    "@types/d3-collection" "*"
-    "@types/d3-color" "^1"
-    "@types/d3-contour" "^1"
-    "@types/d3-dispatch" "^1"
-    "@types/d3-drag" "^1"
-    "@types/d3-dsv" "^1"
-    "@types/d3-ease" "^1"
-    "@types/d3-fetch" "^1"
-    "@types/d3-force" "^1"
-    "@types/d3-format" "^1"
-    "@types/d3-geo" "^1"
-    "@types/d3-hierarchy" "^1"
-    "@types/d3-interpolate" "^1"
-    "@types/d3-path" "^1"
-    "@types/d3-polygon" "^1"
-    "@types/d3-quadtree" "^1"
-    "@types/d3-random" "^1"
-    "@types/d3-scale" "^2"
-    "@types/d3-scale-chromatic" "^1"
-    "@types/d3-selection" "^1"
-    "@types/d3-shape" "^1"
-    "@types/d3-time" "^1"
-    "@types/d3-time-format" "^2"
-    "@types/d3-timer" "^1"
-    "@types/d3-transition" "^1"
-    "@types/d3-voronoi" "*"
-    "@types/d3-zoom" "^1"
-
-"@types/estree@*":
-  version "0.0.47"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.47.tgz#d7a51db20f0650efec24cd04994f523d93172ed4"
-  integrity sha512-c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg==
-
-"@types/file-saver@^2.0.1":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@types/file-saver/-/file-saver-2.0.2.tgz#bd593ccfaee42ff94a5c1c83bf69ae9be83493b9"
-  integrity sha512-xbqnZmGrCEqi/KUzOkeUSe77p7APvLuyellGaAoeww3CHJ1AbjQWjPSCFtKIzZn8L7LpEax4NXnC+gfa6nM7IA==
-
-"@types/geojson@*":
-  version "7946.0.7"
-  resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.7.tgz#c8fa532b60a0042219cdf173ca21a975ef0666ad"
-  integrity sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ==
-
-"@types/glob@^7.1.1":
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183"
-  integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==
-  dependencies:
-    "@types/minimatch" "*"
-    "@types/node" "*"
-
-"@types/hammerjs@^2.0.36":
-  version "2.0.39"
-  resolved "https://registry.yarnpkg.com/@types/hammerjs/-/hammerjs-2.0.39.tgz#4be64bbacf3813c79c0dab895c6b0fdc7d5e513f"
-  integrity sha512-lYR2Y/tV2ujpk/WyUc7S0VLI0a9hrtVIN9EwnrNo5oSEJI2cK2/XrgwOQmXLL3eTulOESvh9qP6si9+DWM9cOA==
-
-"@types/jasmine@*":
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.7.2.tgz#f83ca1936f8cf5d3375506b481f52f8903c2df21"
-  integrity sha512-w5Zc9pSwxlr1ne+froeIceYbrh0a2Us+0kTaX6JA0N7nPh+yv1zN10LyDMKwnT0x2AbIDGlrD1cv6plVjfCcZw==
-
-"@types/jasmine@~3.4.0":
-  version "3.4.6"
-  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.4.6.tgz#afcb210af0fa751b85a96b2034eedada65390be1"
-  integrity sha512-hpQHs+lmZ0uuCrGyqypdI1Ho7jRFolOBT6OkNdZPFziLSSEKvWu+VxWU6bGdNEA/hoV4jV8pdDeNx8EWlmfNAw==
-
-"@types/jasminewd2@~2.0.6":
-  version "2.0.9"
-  resolved "https://registry.yarnpkg.com/@types/jasminewd2/-/jasminewd2-2.0.9.tgz#db3946314605deea9d5c7aea0b61d807089ba76d"
-  integrity sha512-Oz+Faunpe2SimFvkMYMXxpK89WXl7rZHG8abTOKcGndu4xOoSbUZ+jUdZ0LQpmDqPEGLBWXF/yZP1tlsplGhzw==
-  dependencies:
-    "@types/jasmine" "*"
-
-"@types/json-schema@^7.0.5":
-  version "7.0.7"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
-  integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==
-
-"@types/lodash@4.14.172":
-  version "4.14.172"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.172.tgz#aad774c28e7bfd7a67de25408e03ee5a8c3d028a"
-  integrity sha512-/BHF5HAx3em7/KkzVKm3LrsD6HZAXuXO1AJZQ3cRRBZj4oHZDviWPYu0aEplAqDFNHZPW6d3G7KN+ONcCCC7pw==
-
-"@types/minimatch@*":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz#f0ec25dbf2f0e4b18647313ac031134ca5b24b21"
-  integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA==
-
-"@types/mustache@^0.8.32":
-  version "0.8.32"
-  resolved "https://registry.yarnpkg.com/@types/mustache/-/mustache-0.8.32.tgz#7db3b81f2bf450bd38805f596d20eca97c4ed595"
-  integrity sha512-RTVWV485OOf4+nO2+feurk0chzHkSjkjALiejpHltyuMf/13fGymbbNNFrSKdSSUg1TIwzszXdWsVirxgqYiFA==
-
-"@types/node@*":
-  version "15.0.3"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.3.tgz#ee09fcaac513576474c327da5818d421b98db88a"
-  integrity sha512-/WbxFeBU+0F79z9RdEOXH4CsDga+ibi5M8uEYr91u3CkT/pdWcV8MCook+4wDPnZBexRdwWS+PiVZ2xJviAzcQ==
-
-"@types/node@^10.17.60":
-  version "10.17.60"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.60.tgz#35f3d6213daed95da7f0f73e75bcc6980e90597b"
-  integrity sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==
-
-"@types/normalize-package-data@^2.4.0":
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
-  integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
-
-"@types/parse-json@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
-  integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
-
-"@types/pdfjs-dist@^2.1.3":
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/@types/pdfjs-dist/-/pdfjs-dist-2.7.1.tgz#3f463b18849ef64e1879bf983ab36c40b3f26da0"
-  integrity sha512-5qfC+w0bL0IaPYR3Jg3IwdN1SB/xEPnofLvguML272PtA7T+oz6tftXwXjjfNfnw9wDCwx+5N0QfjPnNu5lGEw==
-
-"@types/pdfjs-dist@~2.1.7":
-  version "2.1.7"
-  resolved "https://registry.yarnpkg.com/@types/pdfjs-dist/-/pdfjs-dist-2.1.7.tgz#a92d94b9d699a93ab8a762839f7819dc04e96484"
-  integrity sha512-nQIwcPUhkAIyn7x9NS0lR/qxYfd5unRtfGkMjvpgF4Sh28IXftRymaNmFKTTdejDNY25NDGSIyjwj/BRwAPexg==
-
-"@types/q@^0.0.32":
-  version "0.0.32"
-  resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"
-  integrity sha1-vShOV8hPEyXacCur/IKlMoGQwMU=
-
-"@types/quill@^2.0.2":
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/@types/quill/-/quill-2.0.6.tgz#c52055eb2e4ff02d4134048576c5a9a47216c6c2"
-  integrity sha512-aWXfXBWfth7SgeZEObDZQcQ6p4pBrdafkryLlrQOrYU50tC0qde9AxHOe0WRF2rg0vul20j/GwUnHop6l+qYBQ==
-  dependencies:
-    parchment "^1.1.2"
-    quill-delta "^4.0.1"
-
-"@types/raf@^3.4.0":
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/@types/raf/-/raf-3.4.0.tgz#2b72cbd55405e071f1c4d29992638e022b20acc2"
-  integrity sha512-taW5/WYqo36N7V39oYyHP9Ipfd5pNFvGTIQsNGj86xV88YQ7GnI30/yMfKDF7Zgin0m3e+ikX88FvImnK4RjGw==
-
-"@types/resolve@0.0.8":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-0.0.8.tgz#f26074d238e02659e323ce1a13d041eee280e194"
-  integrity sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==
-  dependencies:
-    "@types/node" "*"
-
-"@types/selenium-webdriver@^3.0.0":
-  version "3.0.17"
-  resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.17.tgz#50bea0c3c2acc31c959c5b1e747798b3b3d06d4b"
-  integrity sha512-tGomyEuzSC1H28y2zlW6XPCaDaXFaD6soTdb4GNdmte2qfHtrKqhy0ZFs4r/1hpazCfEZqeTSRLvSasmEx89uw==
-
-"@types/source-list-map@*":
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
-  integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
-
-"@types/uuid@^8.3.3":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc"
-  integrity sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==
-
-"@types/video.js@7.2.12":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@types/video.js/-/video.js-7.2.12.tgz#574682abeda408526b3592f450c5be1045483311"
-  integrity sha512-JDCmwi1L8NA69/G7i8OG6ApO21rB7J6CXcDr339V0xO6ViPAZJIor611Ymh2IZkiur7Iow+HbLBHIgQTdvgj8g==
-
-"@types/vis@^4.21.19":
-  version "4.21.21"
-  resolved "https://registry.yarnpkg.com/@types/vis/-/vis-4.21.21.tgz#5c911c0d43603d103938ea128ee83ca72d9a9347"
-  integrity sha512-mDh/6zKCTViWOPeED2DnWFpACY7HkusEzSDfb6lsc7iEklowTeoMAMm/nyQQYOOWfF5ALfMbevrhs9CjdI7SUA==
-  dependencies:
-    moment ">=2.13.0"
-
-"@types/webpack-sources@^0.1.5":
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-0.1.8.tgz#078d75410435993ec8a0a2855e88706f3f751f81"
-  integrity sha512-JHB2/xZlXOjzjBB6fMOpH1eQAfsrpqVVIbneE0Rok16WXwFaznaI5vfg75U5WgGJm7V9W1c4xeRQDjX/zwvghA==
-  dependencies:
-    "@types/node" "*"
-    "@types/source-list-map" "*"
-    source-map "^0.6.1"
-
-"@types/zip.js@2.0.28":
-  version "2.0.28"
-  resolved "https://registry.yarnpkg.com/@types/zip.js/-/zip.js-2.0.28.tgz#78354682ef76e637b1f445846e4d892ca3dbf344"
-  integrity sha512-OtimzIMnPu5RYleY8Zzp7nBFQqaZYcg7WqZci2gHjoylhaIL1qSur+ABUuuQ9HMP9Eu0ER2mEyI6AkLWWDGXNg==
-
-"@videojs/http-streaming@1.10.3":
-  version "1.10.3"
-  resolved "https://registry.yarnpkg.com/@videojs/http-streaming/-/http-streaming-1.10.3.tgz#0c028443b9a3c96da85e5995748ed94280884584"
-  integrity sha512-fxXtwVrQBdhOFh6GymPAPCb4utCI01Zs5fdyZgtR6FSsaz/zGmnzfNS5GvNjBi/hZviMsbNPFaOTTFMMNLNA3A==
-  dependencies:
-    aes-decrypter "3.0.0"
-    global "^4.3.0"
-    m3u8-parser "4.3.0"
-    mpd-parser "0.8.1"
-    mux.js "5.1.3"
-    url-toolkit "^2.1.3"
-    video.js "^6.8.0 || ^7.0.0"
-
-"@videojs/http-streaming@2.6.4":
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/@videojs/http-streaming/-/http-streaming-2.6.4.tgz#a3d9eb62b02c6e48439f033675ec3a6f5f8cdb25"
-  integrity sha512-sFVE0MVXhawAkET8EgiUSMvDDv6u3uGidtO0BvNXG0/qKWlze/zEzhvLsyPU4HmLFRnffKeHK5RE2XpO5vHY8Q==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    "@videojs/vhs-utils" "^3.0.0"
-    aes-decrypter "3.1.2"
-    global "^4.4.0"
-    m3u8-parser "4.5.2"
-    mpd-parser "0.15.4"
-    mux.js "5.10.0"
-    video.js "^6 || ^7"
-
-"@videojs/vhs-utils@^3.0.0":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@videojs/vhs-utils/-/vhs-utils-3.0.1.tgz#6bd7b5309883dcbaccb0f766b08094bc2bde5dbc"
-  integrity sha512-kYHWcmzRyWfUXrrOZzRFzvt7XM+Sg+0vmsSbYONn2e/XeWD8+35K74+wZkW5/H9nYZDhYpZgeTKbLRUvxk+smA==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    global "^4.4.0"
-    url-toolkit "^2.2.1"
-
-"@videojs/xhr@2.5.1":
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/@videojs/xhr/-/xhr-2.5.1.tgz#26bc5a79dbb3b03bfb13742c6ce559f89e90719e"
-  integrity sha512-wV9nGESHseSK+S9ePEru2+OJZ1jq/ZbbzniGQ4weAmTIepuBMSYPx5zrxxQA0E786T5ykpO8ts+LayV+3/oI2w==
-  dependencies:
-    "@babel/runtime" "^7.5.5"
-    global "~4.4.0"
-    is-function "^1.0.1"
-
-"@webassemblyjs/ast@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359"
-  integrity sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==
-  dependencies:
-    "@webassemblyjs/helper-module-context" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/wast-parser" "1.8.5"
-
-"@webassemblyjs/floating-point-hex-parser@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721"
-  integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==
-
-"@webassemblyjs/helper-api-error@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7"
-  integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==
-
-"@webassemblyjs/helper-buffer@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204"
-  integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==
-
-"@webassemblyjs/helper-code-frame@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz#9a740ff48e3faa3022b1dff54423df9aa293c25e"
-  integrity sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==
-  dependencies:
-    "@webassemblyjs/wast-printer" "1.8.5"
-
-"@webassemblyjs/helper-fsm@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452"
-  integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==
-
-"@webassemblyjs/helper-module-context@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz#def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245"
-  integrity sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    mamacro "^0.0.3"
-
-"@webassemblyjs/helper-wasm-bytecode@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61"
-  integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==
-
-"@webassemblyjs/helper-wasm-section@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz#74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf"
-  integrity sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-buffer" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/wasm-gen" "1.8.5"
-
-"@webassemblyjs/ieee754@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz#712329dbef240f36bf57bd2f7b8fb9bf4154421e"
-  integrity sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==
-  dependencies:
-    "@xtuc/ieee754" "^1.2.0"
-
-"@webassemblyjs/leb128@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10"
-  integrity sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==
-  dependencies:
-    "@xtuc/long" "4.2.2"
-
-"@webassemblyjs/utf8@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc"
-  integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==
-
-"@webassemblyjs/wasm-edit@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz#962da12aa5acc1c131c81c4232991c82ce56e01a"
-  integrity sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-buffer" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/helper-wasm-section" "1.8.5"
-    "@webassemblyjs/wasm-gen" "1.8.5"
-    "@webassemblyjs/wasm-opt" "1.8.5"
-    "@webassemblyjs/wasm-parser" "1.8.5"
-    "@webassemblyjs/wast-printer" "1.8.5"
-
-"@webassemblyjs/wasm-gen@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz#54840766c2c1002eb64ed1abe720aded714f98bc"
-  integrity sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/ieee754" "1.8.5"
-    "@webassemblyjs/leb128" "1.8.5"
-    "@webassemblyjs/utf8" "1.8.5"
-
-"@webassemblyjs/wasm-opt@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz#b24d9f6ba50394af1349f510afa8ffcb8a63d264"
-  integrity sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-buffer" "1.8.5"
-    "@webassemblyjs/wasm-gen" "1.8.5"
-    "@webassemblyjs/wasm-parser" "1.8.5"
-
-"@webassemblyjs/wasm-parser@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz#21576f0ec88b91427357b8536383668ef7c66b8d"
-  integrity sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-api-error" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/ieee754" "1.8.5"
-    "@webassemblyjs/leb128" "1.8.5"
-    "@webassemblyjs/utf8" "1.8.5"
-
-"@webassemblyjs/wast-parser@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz#e10eecd542d0e7bd394f6827c49f3df6d4eefb8c"
-  integrity sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/floating-point-hex-parser" "1.8.5"
-    "@webassemblyjs/helper-api-error" "1.8.5"
-    "@webassemblyjs/helper-code-frame" "1.8.5"
-    "@webassemblyjs/helper-fsm" "1.8.5"
-    "@xtuc/long" "4.2.2"
-
-"@webassemblyjs/wast-printer@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz#114bbc481fd10ca0e23b3560fa812748b0bae5bc"
-  integrity sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/wast-parser" "1.8.5"
-    "@xtuc/long" "4.2.2"
-
-"@xtuc/ieee754@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
-  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
-
-"@xtuc/long@4.2.2":
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
-  integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
-
-"@yarnpkg/lockfile@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
-  integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
-
-JSONStream@^1.3.4:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
-  integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==
-  dependencies:
-    jsonparse "^1.2.0"
-    through ">=2.2.7 <3"
-
-abab@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
-  integrity sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4=
-
-accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
-  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
-  dependencies:
-    mime-types "~2.1.24"
-    negotiator "0.6.2"
-
-ace-builds@^1.4.2:
-  version "1.4.12"
-  resolved "https://registry.yarnpkg.com/ace-builds/-/ace-builds-1.4.12.tgz#888efa386e36f4345f40b5233fcc4fe4c588fae7"
-  integrity sha512-G+chJctFPiiLGvs3+/Mly3apXTcfgE45dT5yp12BcWZ1kUs+gm0qd3/fv4gsz6fVag4mM0moHVpjHDIgph6Psg==
-
-acorn-globals@^1.0.4:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-1.0.9.tgz#55bb5e98691507b74579d0513413217c380c54cf"
-  integrity sha1-VbtemGkVB7dFedBRNBMhfDgMVM8=
-  dependencies:
-    acorn "^2.1.0"
-
-acorn-node@^1.6.1:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.8.2.tgz#114c95d64539e53dede23de8b9d96df7c7ae2af8"
-  integrity sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==
-  dependencies:
-    acorn "^7.0.0"
-    acorn-walk "^7.0.0"
-    xtend "^4.0.2"
-
-acorn-walk@^7.0.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
-  integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
-
-acorn-walk@^8.0.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
-  integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
-
-acorn@^2.1.0, acorn@^2.4.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-2.7.0.tgz#ab6e7d9d886aaca8b085bc3312b79a198433f0e7"
-  integrity sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=
-
-acorn@^6.2.1:
-  version "6.4.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
-  integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
-
-acorn@^7.0.0, acorn@^7.1.0:
-  version "7.4.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
-  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
-
-acorn@^8.0.4:
-  version "8.7.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
-  integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
-
-adler-32@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/adler-32/-/adler-32-1.2.0.tgz#6a3e6bf0a63900ba15652808cb15c6813d1a5f25"
-  integrity sha1-aj5r8KY5ALoVZSgIyxXGgT0aXyU=
-  dependencies:
-    exit-on-epipe "~1.0.1"
-    printj "~1.1.0"
-
-adm-zip@^0.4.9:
-  version "0.4.16"
-  resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.16.tgz#cf4c508fdffab02c269cbc7f471a875f05570365"
-  integrity sha512-TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg==
-
-aes-decrypter@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/aes-decrypter/-/aes-decrypter-3.0.0.tgz#7848a1c145b9fdbf57ae3e2b5b1bc7cf0644a8fb"
-  integrity sha1-eEihwUW5/b9Xrj4rWxvHzwZEqPs=
-  dependencies:
-    commander "^2.9.0"
-    global "^4.3.2"
-    pkcs7 "^1.0.2"
-
-aes-decrypter@3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/aes-decrypter/-/aes-decrypter-3.1.2.tgz#3545546f8e9f6b878640339a242efe221ba7a7cb"
-  integrity sha512-42nRwfQuPRj9R1zqZBdoxnaAmnIFyDi0MNyTVhjdFOd8fifXKKRfwIHIZ6AMn1or4x5WONzjwRTbTWcsIQ0O4A==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    "@videojs/vhs-utils" "^3.0.0"
-    global "^4.4.0"
-    pkcs7 "^1.0.4"
-
-after@0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
-  integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
-
-agent-base@4, agent-base@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
-  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
-  dependencies:
-    es6-promisify "^5.0.0"
-
-agent-base@~4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
-  integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
-  dependencies:
-    es6-promisify "^5.0.0"
-
-agentkeepalive@^3.4.1:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.5.2.tgz#a113924dd3fa24a0bc3b78108c450c2abee00f67"
-  integrity sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==
-  dependencies:
-    humanize-ms "^1.2.1"
-
-aggregate-error@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
-  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
-  dependencies:
-    clean-stack "^2.0.0"
-    indent-string "^4.0.0"
-
-ajv-errors@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
-  integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
-
-ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
-  integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
-
-ajv@6.10.2:
-  version "6.10.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52"
-  integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==
-  dependencies:
-    fast-deep-equal "^2.0.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-ajv@6.12.3:
-  version "6.12.3"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.3.tgz#18c5af38a111ddeb4f2697bd78d68abc1cabd706"
-  integrity sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4:
-  version "6.12.6"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
-  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-amdefine@>=0.0.4:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
-  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
-
-angular-cli-alias@^1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/angular-cli-alias/-/angular-cli-alias-1.0.9.tgz#7b82d72d394cc42b81bd00e7b37013aae264d1b1"
-  integrity sha512-0RHDqEUfL1WoUG6uO74U+AGradG9bYaH2nf9/9CvM7ckoAb5P1XS8fMQYmVn8dOAfmVChj3x9XwxFVwT829rhw==
-
-ansi-align@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb"
-  integrity sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==
-  dependencies:
-    string-width "^3.0.0"
-
-ansi-colors@4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
-  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
-
-ansi-colors@^3.0.0:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
-  integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
-
-ansi-escapes@^4.2.1:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
-  integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
-  dependencies:
-    type-fest "^0.21.3"
-
-ansi-html@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
-  integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4=
-
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
-
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
-
-ansi-regex@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
-  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
-
-ansi-regex@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
-  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
-
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
-
-ansi-styles@^3.2.0, ansi-styles@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
-  dependencies:
-    color-convert "^1.9.0"
-
-ansi-styles@^4.1.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
-  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
-  dependencies:
-    color-convert "^2.0.1"
-
-any-promise@^1.0.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
-  integrity sha1-q8av7tzqUugJzcA3au0845Y10X8=
-
-anymatch@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
-  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
-  dependencies:
-    micromatch "^3.1.4"
-    normalize-path "^2.1.1"
-
-anymatch@~3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
-  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
-  dependencies:
-    normalize-path "^3.0.0"
-    picomatch "^2.0.4"
-
-app-root-path@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.2.1.tgz#d0df4a682ee408273583d43f6f79e9892624bc9a"
-  integrity sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==
-
-append-transform@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-1.0.0.tgz#046a52ae582a228bd72f58acfbe2967c678759ab"
-  integrity sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==
-  dependencies:
-    default-require-extensions "^2.0.0"
-
-aproba@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
-
-arg@^4.1.0:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
-  integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
-
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
-
-aria-query@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-3.0.0.tgz#65b3fcc1ca1155a8c9ae64d6eee297f15d5133cc"
-  integrity sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=
-  dependencies:
-    ast-types-flow "0.0.7"
-    commander "^2.11.0"
-
-arr-diff@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
-  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
-
-arr-flatten@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
-  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
-
-arr-union@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
-  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
-
-array-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
-  integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=
-
-array-flatten@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
-  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
-
-array-flatten@^2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
-  integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
-
-array-slice@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
-  integrity sha512-rlVfZW/1Ph2SNySXwR9QYkChp8EkOEiTMO5Vwx60usw04i4nWemkm9RXmQqgkQFaLHsqLuADvjp6IfgL9l2M8Q==
-
-array-union@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
-  dependencies:
-    array-uniq "^1.0.1"
-
-array-union@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
-  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
-
-array-uniq@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
-
-array-unique@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
-  integrity sha512-G2n5bG5fSUCpnsXz4+8FUkYsGPkNfLn9YvS66U5qbTIXI2Ynnlo4Bi42bWv+omKUCqz+ejzfClwne0alJWJPhg==
-
-array-unique@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
-  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
-
-arraybuffer.slice@~0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
-  integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
-
-arrify@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
-
-asap@^2.0.0, asap@~2.0.3:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
-  integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
-
-asn1.js@^5.2.0:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07"
-  integrity sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==
-  dependencies:
-    bn.js "^4.0.0"
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-    safer-buffer "^2.1.0"
-
-asn1@~0.2.3:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
-  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
-  dependencies:
-    safer-buffer "~2.1.0"
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
-
-assert@^1.1.1:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
-  integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==
-  dependencies:
-    object-assign "^4.1.1"
-    util "0.10.3"
-
-assign-symbols@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
-  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
-
-ast-types-flow@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
-  integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0=
-
-async-each@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
-  integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
-
-async-limiter@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
-  integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
-
-async@^2.5.0, async@^2.6.2:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
-  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
-  dependencies:
-    lodash "^4.17.14"
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
-
-atob@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
-  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
-
-autoprefixer@9.6.1:
-  version "9.6.1"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.1.tgz#51967a02d2d2300bb01866c1611ec8348d355a47"
-  integrity sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==
-  dependencies:
-    browserslist "^4.6.3"
-    caniuse-lite "^1.0.30000980"
-    chalk "^2.4.2"
-    normalize-range "^0.1.2"
-    num2fraction "^1.2.2"
-    postcss "^7.0.17"
-    postcss-value-parser "^4.0.0"
-
-autoprefixer@^9.4.5, autoprefixer@^9.6.0:
-  version "9.8.6"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f"
-  integrity sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==
-  dependencies:
-    browserslist "^4.12.0"
-    caniuse-lite "^1.0.30001109"
-    colorette "^1.2.1"
-    normalize-range "^0.1.2"
-    num2fraction "^1.2.2"
-    postcss "^7.0.32"
-    postcss-value-parser "^4.1.0"
-
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
-
-aws4@^1.8.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
-  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
-
-axobject-query@2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.0.2.tgz#ea187abe5b9002b377f925d8bf7d1c561adf38f9"
-  integrity sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==
-  dependencies:
-    ast-types-flow "0.0.7"
-
-babel-plugin-dynamic-import-node@^2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
-  integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==
-  dependencies:
-    object.assign "^4.1.0"
-
-backo2@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
-  integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
-
-balanced-match@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
-  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
-
-base64-arraybuffer@0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
-  integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg=
-
-base64-arraybuffer@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.2.0.tgz#4b944fac0191aa5907afe2d8c999ccc57ce80f45"
-  integrity sha512-7emyCsu1/xiBXgQZrscw/8KPRT44I4Yq9Pe6EGs3aPRTsWuggML1/1DTuZUuIaJPIm1FTDUVXl4x/yW8s0kQDQ==
-
-base64-arraybuffer@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz#1c37589a7c4b0746e34bd1feb951da2df01c1bdc"
-  integrity sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==
-
-base64-js@^1.0.2, base64-js@^1.3.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
-  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
-
-base64id@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz#47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"
-  integrity sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=
-
-base@^0.11.1:
-  version "0.11.2"
-  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
-  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
-  dependencies:
-    cache-base "^1.0.1"
-    class-utils "^0.3.5"
-    component-emitter "^1.2.1"
-    define-property "^1.0.0"
-    isobject "^3.0.1"
-    mixin-deep "^1.2.0"
-    pascalcase "^0.1.1"
-
-batch@0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
-  integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
-
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
-  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
-  dependencies:
-    tweetnacl "^0.14.3"
-
-better-assert@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
-  integrity sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=
-  dependencies:
-    callsite "1.0.0"
-
-big.js@^5.2.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
-  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
-
-binary-extensions@^1.0.0:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
-  integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
-
-binary-extensions@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
-  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
-
-bindings@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
-  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
-  dependencies:
-    file-uri-to-path "1.0.0"
-
-blob@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
-  integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==
-
-blocking-proxy@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/blocking-proxy/-/blocking-proxy-1.0.1.tgz#81d6fd1fe13a4c0d6957df7f91b75e98dac40cb2"
-  integrity sha512-KE8NFMZr3mN2E0HcvCgRtX7DjhiIQrwle+nSVJVC/yqFb9+xznHl2ZcoBp2L9qzkI4t4cBFJ1efXF8Dwi132RA==
-  dependencies:
-    minimist "^1.2.0"
-
-bluebird@^3.3.0, bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3.5.5:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
-  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
-
-bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9:
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
-  integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
-
-bn.js@^5.0.0, bn.js@^5.1.1:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002"
-  integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==
-
-body-parser@1.19.0, body-parser@^1.16.1:
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
-  integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
-  dependencies:
-    bytes "3.1.0"
-    content-type "~1.0.4"
-    debug "2.6.9"
-    depd "~1.1.2"
-    http-errors "1.7.2"
-    iconv-lite "0.4.24"
-    on-finished "~2.3.0"
-    qs "6.7.0"
-    raw-body "2.4.0"
-    type-is "~1.6.17"
-
-bonjour@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
-  integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU=
-  dependencies:
-    array-flatten "^2.1.0"
-    deep-equal "^1.0.1"
-    dns-equal "^1.0.0"
-    dns-txt "^2.0.2"
-    multicast-dns "^6.0.1"
-    multicast-dns-service-types "^1.1.0"
-
-boxen@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/boxen/-/boxen-3.2.0.tgz#fbdff0de93636ab4450886b6ff45b92d098f45eb"
-  integrity sha512-cU4J/+NodM3IHdSL2yN8bqYqnmlBTidDR4RC7nJs61ZmtGz8VZzM3HLQX0zY5mrSmPtR3xWwsq2jOUQqFZN8+A==
-  dependencies:
-    ansi-align "^3.0.0"
-    camelcase "^5.3.1"
-    chalk "^2.4.2"
-    cli-boxes "^2.2.0"
-    string-width "^3.0.0"
-    term-size "^1.2.0"
-    type-fest "^0.3.0"
-    widest-line "^2.0.0"
-
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-brace@^0.11.1:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/brace/-/brace-0.11.1.tgz#4896fcc9d544eef45f4bb7660db320d3b379fe58"
-  integrity sha1-SJb8ydVE7vRfS7dmDbMg07N5/lg=
-
-braces@^0.1.2:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-0.1.5.tgz#c085711085291d8b75fdd74eab0f8597280711e6"
-  integrity sha512-EIMHIv2UXHWFY2xubUGKz+hq9hNkENj4Pjvr7h58cmJgpkK2yMlKA8I484f7MSttkzVAy/lL7X9xDaILd6avzA==
-  dependencies:
-    expand-range "^0.1.0"
-
-braces@^2.3.1, braces@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
-  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
-  dependencies:
-    arr-flatten "^1.1.0"
-    array-unique "^0.3.2"
-    extend-shallow "^2.0.1"
-    fill-range "^4.0.0"
-    isobject "^3.0.1"
-    repeat-element "^1.1.2"
-    snapdragon "^0.8.1"
-    snapdragon-node "^2.0.1"
-    split-string "^3.0.2"
-    to-regex "^3.0.1"
-
-braces@^3.0.1, braces@^3.0.2, braces@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
-  dependencies:
-    fill-range "^7.0.1"
-
-brorand@^1.0.1, brorand@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
-  integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
-
-browserify-aes@^1.0.0, browserify-aes@^1.0.4:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
-  integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
-  dependencies:
-    buffer-xor "^1.0.3"
-    cipher-base "^1.0.0"
-    create-hash "^1.1.0"
-    evp_bytestokey "^1.0.3"
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
-browserify-cipher@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
-  integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==
-  dependencies:
-    browserify-aes "^1.0.4"
-    browserify-des "^1.0.0"
-    evp_bytestokey "^1.0.0"
-
-browserify-des@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
-  integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==
-  dependencies:
-    cipher-base "^1.0.1"
-    des.js "^1.0.0"
-    inherits "^2.0.1"
-    safe-buffer "^5.1.2"
-
-browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d"
-  integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==
-  dependencies:
-    bn.js "^5.0.0"
-    randombytes "^2.0.1"
-
-browserify-sign@^4.0.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3"
-  integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==
-  dependencies:
-    bn.js "^5.1.1"
-    browserify-rsa "^4.0.1"
-    create-hash "^1.2.0"
-    create-hmac "^1.1.7"
-    elliptic "^6.5.3"
-    inherits "^2.0.4"
-    parse-asn1 "^5.1.5"
-    readable-stream "^3.6.0"
-    safe-buffer "^5.2.0"
-
-browserify-zlib@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
-  integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
-  dependencies:
-    pako "~1.0.5"
-
-browserslist@4.10.0:
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.10.0.tgz#f179737913eaf0d2b98e4926ac1ca6a15cbcc6a9"
-  integrity sha512-TpfK0TDgv71dzuTsEAlQiHeWQ/tiPqgNZVdv046fvNtBZrjbv2O3TsWCDU0AWGJJKCF/KsjNdLzR9hXOsh/CfA==
-  dependencies:
-    caniuse-lite "^1.0.30001035"
-    electron-to-chromium "^1.3.378"
-    node-releases "^1.1.52"
-    pkg-up "^3.1.0"
-
-browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.6.3, browserslist@^4.8.5:
-  version "4.16.6"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
-  integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
-  dependencies:
-    caniuse-lite "^1.0.30001219"
-    colorette "^1.2.2"
-    electron-to-chromium "^1.3.723"
-    escalade "^3.1.1"
-    node-releases "^1.1.71"
-
-browserstack@^1.5.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/browserstack/-/browserstack-1.6.1.tgz#e051f9733ec3b507659f395c7a4765a1b1e358b3"
-  integrity sha512-GxtFjpIaKdbAyzHfFDKixKO8IBT7wR3NjbzrGc78nNs/Ciys9wU3/nBtsqsWv5nDSrdI5tz0peKuzCPuNXNUiw==
-  dependencies:
-    https-proxy-agent "^2.2.1"
-
-btoa@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/btoa/-/btoa-1.2.1.tgz#01a9909f8b2c93f6bf680ba26131eb30f7fa3d73"
-  integrity sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==
-
-buffer-alloc-unsafe@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
-  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
-
-buffer-alloc@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
-  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
-  dependencies:
-    buffer-alloc-unsafe "^1.1.0"
-    buffer-fill "^1.0.0"
-
-buffer-fill@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
-  integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
-
-buffer-from@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
-  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
-
-buffer-indexof@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
-  integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==
-
-buffer-xor@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
-  integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
-
-buffer@^4.3.0:
-  version "4.9.2"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8"
-  integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==
-  dependencies:
-    base64-js "^1.0.2"
-    ieee754 "^1.1.4"
-    isarray "^1.0.0"
-
-buffer@^5.6.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
-  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
-  dependencies:
-    base64-js "^1.3.1"
-    ieee754 "^1.1.13"
-
-builtin-modules@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
-  integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
-
-builtin-modules@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.2.0.tgz#45d5db99e7ee5e6bc4f362e008bf917ab5049887"
-  integrity sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==
-
-builtin-status-codes@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
-  integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
-
-builtins@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
-  integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og=
-
-bytes@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
-  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
-
-bytes@3.1.0, bytes@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
-  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
-
-cacache@12.0.2:
-  version "12.0.2"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.2.tgz#8db03205e36089a3df6954c66ce92541441ac46c"
-  integrity sha512-ifKgxH2CKhJEg6tNdAwziu6Q33EvuG26tYcda6PT3WKisZcYDXsnEdnRv67Po3yCzFfaSoMjGZzJyD2c3DT1dg==
-  dependencies:
-    bluebird "^3.5.5"
-    chownr "^1.1.1"
-    figgy-pudding "^3.5.1"
-    glob "^7.1.4"
-    graceful-fs "^4.1.15"
-    infer-owner "^1.0.3"
-    lru-cache "^5.1.1"
-    mississippi "^3.0.0"
-    mkdirp "^0.5.1"
-    move-concurrently "^1.0.1"
-    promise-inflight "^1.0.1"
-    rimraf "^2.6.3"
-    ssri "^6.0.1"
-    unique-filename "^1.1.1"
-    y18n "^4.0.0"
-
-cacache@^12.0.0, cacache@^12.0.2:
-  version "12.0.4"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c"
-  integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==
-  dependencies:
-    bluebird "^3.5.5"
-    chownr "^1.1.1"
-    figgy-pudding "^3.5.1"
-    glob "^7.1.4"
-    graceful-fs "^4.1.15"
-    infer-owner "^1.0.3"
-    lru-cache "^5.1.1"
-    mississippi "^3.0.0"
-    mkdirp "^0.5.1"
-    move-concurrently "^1.0.1"
-    promise-inflight "^1.0.1"
-    rimraf "^2.6.3"
-    ssri "^6.0.1"
-    unique-filename "^1.1.1"
-    y18n "^4.0.0"
-
-cacache@^15.0.4:
-  version "15.0.6"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.6.tgz#65a8c580fda15b59150fb76bf3f3a8e45d583099"
-  integrity sha512-g1WYDMct/jzW+JdWEyjaX2zoBkZ6ZT9VpOyp2I/VMtDsNLffNat3kqPFfi1eDRSK9/SuKGyORDHcQMcPF8sQ/w==
-  dependencies:
-    "@npmcli/move-file" "^1.0.1"
-    chownr "^2.0.0"
-    fs-minipass "^2.0.0"
-    glob "^7.1.4"
-    infer-owner "^1.0.4"
-    lru-cache "^6.0.0"
-    minipass "^3.1.1"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.2"
-    mkdirp "^1.0.3"
-    p-map "^4.0.0"
-    promise-inflight "^1.0.1"
-    rimraf "^3.0.2"
-    ssri "^8.0.1"
-    tar "^6.0.2"
-    unique-filename "^1.1.1"
-
-cache-base@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
-  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
-  dependencies:
-    collection-visit "^1.0.0"
-    component-emitter "^1.2.1"
-    get-value "^2.0.6"
-    has-value "^1.0.0"
-    isobject "^3.0.1"
-    set-value "^2.0.0"
-    to-object-path "^0.3.0"
-    union-value "^1.0.0"
-    unset-value "^1.0.0"
-
-cacheable-request@^6.0.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912"
-  integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==
-  dependencies:
-    clone-response "^1.0.2"
-    get-stream "^5.1.0"
-    http-cache-semantics "^4.0.0"
-    keyv "^3.0.0"
-    lowercase-keys "^2.0.0"
-    normalize-url "^4.1.0"
-    responselike "^1.0.2"
-
-call-bind@^1.0.0, call-bind@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
-  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
-  dependencies:
-    function-bind "^1.1.1"
-    get-intrinsic "^1.0.2"
-
-caller-callsite@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
-  integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=
-  dependencies:
-    callsites "^2.0.0"
-
-caller-path@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
-  integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=
-  dependencies:
-    caller-callsite "^2.0.0"
-
-callsite@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
-  integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA=
-
-callsites@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
-  integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
-
-callsites@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
-  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
-
-camelcase-css@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5"
-  integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==
-
-camelcase@^5.0.0, camelcase@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
-  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
-
-caniuse-lite@1.0.30001035:
-  version "1.0.30001035"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz#2bb53b8aa4716b2ed08e088d4dc816a5fe089a1e"
-  integrity sha512-C1ZxgkuA4/bUEdMbU5WrGY4+UhMFFiXrgNAfxiMIqWgFTWfv/xsZCS2xEHT2LMq7xAZfuAnu6mcqyDl0ZR6wLQ==
-
-caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001219:
-  version "1.0.30001228"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz#bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa"
-  integrity sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==
-
-canonical-path@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-1.0.0.tgz#fcb470c23958def85081856be7a86e904f180d1d"
-  integrity sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==
-
-canvg@^1.0:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/canvg/-/canvg-1.5.3.tgz#aad17915f33368bf8eb80b25d129e3ae922ddc5f"
-  integrity sha512-7Gn2IuQzvUQWPIuZuFHrzsTM0gkPz2RRT9OcbdmA03jeKk8kltrD8gqUzNX15ghY/4PV5bbe5lmD6yDLDY6Ybg==
-  dependencies:
-    jsdom "^8.1.0"
-    rgbcolor "^1.0.1"
-    stackblur-canvas "^1.4.1"
-    xmldom "^0.1.22"
-
-canvg@^3.0.6:
-  version "3.0.10"
-  resolved "https://registry.yarnpkg.com/canvg/-/canvg-3.0.10.tgz#8e52a2d088b6ffa23ac78970b2a9eebfae0ef4b3"
-  integrity sha512-qwR2FRNO9NlzTeKIPIKpnTY6fqwuYSequ8Ru8c0YkYU7U0oW+hLUvWadLvAu1Rl72OMNiFhoLu4f8eUjQ7l/+Q==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    "@types/raf" "^3.4.0"
-    core-js "^3.8.3"
-    raf "^3.4.1"
-    regenerator-runtime "^0.13.7"
-    rgbcolor "^1.0.1"
-    stackblur-canvas "^2.0.0"
-    svg-pathdata "^6.0.3"
-
-cardboard-vr-display@1.0.13:
-  version "1.0.13"
-  resolved "https://registry.yarnpkg.com/cardboard-vr-display/-/cardboard-vr-display-1.0.13.tgz#e192a220b2970002cfb5cc0f1b480ff5fd6748b6"
-  integrity sha512-/ovHu4nHfo3oaw2v20v7ErvDUmIBPih/e/6VG83XUUFs5vPQaGSM8hihqKClOlwy3Fz+52L0FrhcGSH3o+yn6w==
-  dependencies:
-    gl-preserve-state "^1.0.0"
-    nosleep.js "^0.7.0"
-    webvr-polyfill-dpdb "^1.0.7"
-
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
-
-cf-blob.js@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/cf-blob.js/-/cf-blob.js-0.0.1.tgz#f5ab7e12e798caf08ccf828c69aba0f063d83f99"
-  integrity sha1-9at+EueYyvCMz4KMaaug8GPYP5k=
-
-cfb@^1.1.2, cfb@^1.1.4:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/cfb/-/cfb-1.2.0.tgz#6a4d0872b525ed60349e1ef51fb4b0bf73eca9a8"
-  integrity sha512-sXMvHsKCICVR3Naq+J556K+ExBo9n50iKl6LGarlnvuA2035uMlGA/qVrc0wQtow5P1vJEw9UyrKLCbtIKz+TQ==
-  dependencies:
-    adler-32 "~1.2.0"
-    crc-32 "~1.2.0"
-    printj "~1.1.2"
-
-"chainsaw@>=0.0.7 <0.1":
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/chainsaw/-/chainsaw-0.0.9.tgz#11a05102d1c4c785b6d0415d336d5a3a1612913e"
-  integrity sha1-EaBRAtHEx4W20EFdM21aOhYSkT4=
-  dependencies:
-    traverse ">=0.3.0 <0.4"
-
-chalk@^1.1.1, chalk@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1, chalk@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-"chalk@^3.0.0 || ^4.0.0", chalk@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad"
-  integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
-chalk@^4.1.0:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
-  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
-chardet@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
-  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
-
-chart.js@^2.8.0:
-  version "2.9.4"
-  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.9.4.tgz#0827f9563faffb2dc5c06562f8eb10337d5b9684"
-  integrity sha512-B07aAzxcrikjAPyV+01j7BmOpxtQETxTSlQ26BEYJ+3iUkbNKaOJ/nDbT6JjyqYxseM0ON12COHYdU2cTIjC7A==
-  dependencies:
-    chartjs-color "^2.1.0"
-    moment "^2.10.2"
-
-chartjs-color-string@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz#1df096621c0e70720a64f4135ea171d051402f71"
-  integrity sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A==
-  dependencies:
-    color-name "^1.0.0"
-
-chartjs-color@^2.1.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.4.1.tgz#6118bba202fe1ea79dd7f7c0f9da93467296c3b0"
-  integrity sha512-haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w==
-  dependencies:
-    chartjs-color-string "^0.6.0"
-    color-convert "^1.9.3"
-
-"chokidar@>=2.0.0 <4.0.0", "chokidar@>=3.0.0 <4.0.0", chokidar@^3.0.0, chokidar@^3.4.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a"
-  integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==
-  dependencies:
-    anymatch "~3.1.1"
-    braces "~3.0.2"
-    glob-parent "~5.1.0"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.5.0"
-  optionalDependencies:
-    fsevents "~2.3.1"
-
-chokidar@^2.0.3, chokidar@^2.1.1, chokidar@^2.1.8:
-  version "2.1.8"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
-  integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
-  dependencies:
-    anymatch "^2.0.0"
-    async-each "^1.0.1"
-    braces "^2.3.2"
-    glob-parent "^3.1.0"
-    inherits "^2.0.3"
-    is-binary-path "^1.0.0"
-    is-glob "^4.0.0"
-    normalize-path "^3.0.0"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.2.1"
-    upath "^1.1.1"
-  optionalDependencies:
-    fsevents "^1.2.7"
-
-chownr@^1.1.1:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
-  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
-
-chownr@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
-  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
-
-chrome-trace-event@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
-  integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
-
-ci-info@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
-  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
-
-cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
-  integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==
-  dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
-circular-dependency-plugin@5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-5.2.0.tgz#e09dbc2dd3e2928442403e2d45b41cea06bc0a93"
-  integrity sha512-7p4Kn/gffhQaavNfyDFg7LS5S/UT1JAjyGd4UqR2+jzoYF02eDkj0Ec3+48TsIa4zghjLY87nQHIh/ecK9qLdw==
-
-circular-json@^0.5.5:
-  version "0.5.9"
-  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.5.9.tgz#932763ae88f4f7dead7a0d09c8a51a4743a53b1d"
-  integrity sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==
-
-class-utils@^0.3.5:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
-  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
-  dependencies:
-    arr-union "^3.1.0"
-    define-property "^0.2.5"
-    isobject "^3.0.0"
-    static-extend "^0.1.1"
-
-clean-css@4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz#2d411ef76b8569b6d0c84068dabe85b0aa5e5c17"
-  integrity sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==
-  dependencies:
-    source-map "~0.6.0"
-
-clean-css@^4.1.11:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78"
-  integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==
-  dependencies:
-    source-map "~0.6.0"
-
-clean-stack@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
-  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
-
-cli-boxes@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f"
-  integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==
-
-cli-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
-  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
-  dependencies:
-    restore-cursor "^3.1.0"
-
-cli-width@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
-  integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==
-
-cliui@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
-  integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==
-  dependencies:
-    string-width "^2.1.1"
-    strip-ansi "^4.0.0"
-    wrap-ansi "^2.0.0"
-
-cliui@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
-  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
-  dependencies:
-    string-width "^3.1.0"
-    strip-ansi "^5.2.0"
-    wrap-ansi "^5.1.0"
-
-clone-deep@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
-  integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
-  dependencies:
-    is-plain-object "^2.0.4"
-    kind-of "^6.0.2"
-    shallow-clone "^3.0.0"
-
-clone-response@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
-  integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
-  dependencies:
-    mimic-response "^1.0.0"
-
-clone@^2.1.1, clone@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
-  integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
-
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
-
-codelyzer@^5.1.0:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-5.2.2.tgz#d0530a455784e6bea0b6d7e97166c73c30a5347f"
-  integrity sha512-jB4FZ1Sx7kZhvZVdf+N2BaKTdrrNZOL0Bj10RRfrhHrb3zEvXjJvvq298JPMJAiyiCS/v4zs1QlGU0ip7xGqeA==
-  dependencies:
-    app-root-path "^2.2.1"
-    aria-query "^3.0.0"
-    axobject-query "2.0.2"
-    css-selector-tokenizer "^0.7.1"
-    cssauron "^1.4.0"
-    damerau-levenshtein "^1.0.4"
-    semver-dsl "^1.0.1"
-    source-map "^0.5.7"
-    sprintf-js "^1.1.2"
-
-codepage@~1.14.0:
-  version "1.14.0"
-  resolved "https://registry.yarnpkg.com/codepage/-/codepage-1.14.0.tgz#8cbe25481323559d7d307571b0fff91e7a1d2f99"
-  integrity sha1-jL4lSBMjVZ19MHVxsP/5HnodL5k=
-  dependencies:
-    commander "~2.14.1"
-    exit-on-epipe "~1.0.1"
-
-collection-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
-  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
-  dependencies:
-    map-visit "^1.0.0"
-    object-visit "^1.0.0"
-
-color-convert@^1.9.0, color-convert@^1.9.1, color-convert@^1.9.3:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
-  dependencies:
-    color-name "1.1.3"
-
-color-convert@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
-  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
-  dependencies:
-    color-name "~1.1.4"
-
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
-
-color-name@^1.0.0, color-name@~1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
-  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-
-color-string@^1.5.4:
-  version "1.5.5"
-  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.5.tgz#65474a8f0e7439625f3d27a6a19d89fc45223014"
-  integrity sha512-jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg==
-  dependencies:
-    color-name "^1.0.0"
-    simple-swizzle "^0.2.2"
-
-color@^3.1.2:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/color/-/color-3.1.3.tgz#ca67fb4e7b97d611dcde39eceed422067d91596e"
-  integrity sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ==
-  dependencies:
-    color-convert "^1.9.1"
-    color-string "^1.5.4"
-
-colorette@^1.2.1, colorette@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
-  integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
-
-colors@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
-  integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM=
-
-colors@^1.1.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
-  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
-
-combine-lists@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/combine-lists/-/combine-lists-1.0.1.tgz#458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"
-  integrity sha512-4Mi0V7N48B9KzC8Zl/U7wiWuxMFEHf44N3/PSoAvWDu8IOPrddNo1y1tC/kXbP7IvVMhgCFMMNzgKb0pWoin9w==
-  dependencies:
-    lodash "^4.5.0"
-
-combined-stream@^1.0.6, combined-stream@~1.0.6:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
-  dependencies:
-    delayed-stream "~1.0.0"
-
-commander@2, commander@^2.11.0, commander@^2.12.1, commander@^2.20.0, commander@^2.9.0:
-  version "2.20.3"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
-  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
-
-commander@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-3.0.2.tgz#6837c3fb677ad9933d1cfba42dd14d5117d6b39e"
-  integrity sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==
-
-commander@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
-  integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
-
-commander@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
-  integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
-
-commander@~2.14.1:
-  version "2.14.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa"
-  integrity sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw==
-
-commander@~2.17.1:
-  version "2.17.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
-  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
-
-commondir@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
-
-compare-versions@^3.4.0, compare-versions@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62"
-  integrity sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==
-
-component-bind@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
-  integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=
-
-component-emitter@1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
-  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
-
-component-emitter@^1.2.1, component-emitter@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
-  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
-
-component-inherit@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
-  integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=
-
-compressible@~2.0.16:
-  version "2.0.18"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
-  integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==
-  dependencies:
-    mime-db ">= 1.43.0 < 2"
-
-compression@^1.7.4:
-  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
-  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
-  dependencies:
-    accepts "~1.3.5"
-    bytes "3.0.0"
-    compressible "~2.0.16"
-    debug "2.6.9"
-    on-headers "~1.0.2"
-    safe-buffer "5.1.2"
-    vary "~1.1.2"
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
-
-concat-stream@^1.5.0:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
-  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
-  dependencies:
-    buffer-from "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^2.2.2"
-    typedarray "^0.0.6"
-
-configstore@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/configstore/-/configstore-4.0.0.tgz#5933311e95d3687efb592c528b922d9262d227e7"
-  integrity sha512-CmquAXFBocrzaSM8mtGPMM/HiWmyIpr4CcJl/rgY2uCObZ/S7cKU0silxslqJejl+t/T9HS8E0PUNQD81JGUEQ==
-  dependencies:
-    dot-prop "^4.1.0"
-    graceful-fs "^4.1.2"
-    make-dir "^1.0.0"
-    unique-string "^1.0.0"
-    write-file-atomic "^2.0.0"
-    xdg-basedir "^3.0.0"
-
-connect-history-api-fallback@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
-  integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
-
-connect@^3.6.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8"
-  integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==
-  dependencies:
-    debug "2.6.9"
-    finalhandler "1.1.2"
-    parseurl "~1.3.3"
-    utils-merge "1.0.1"
-
-console-browserify@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
-  integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
-
-constants-browserify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
-  integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
-
-content-disposition@0.5.3:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
-  integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
-  dependencies:
-    safe-buffer "5.1.2"
-
-content-type@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
-  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
-
-convert-source-map@^1.5.1, convert-source-map@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
-  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
-  dependencies:
-    safe-buffer "~5.1.1"
-
-cookie-signature@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
-  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
-
-cookie@0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
-  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
-
-cookie@0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
-  integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
-
-copy-anything@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/copy-anything/-/copy-anything-2.0.3.tgz#842407ba02466b0df844819bbe3baebbe5d45d87"
-  integrity sha512-GK6QUtisv4fNS+XcI7shX0Gx9ORg7QqIznyfho79JTnX1XhLiyZHfftvGiziqzRiEi/Bjhgpi+D2o7HxJFPnDQ==
-  dependencies:
-    is-what "^3.12.0"
-
-copy-concurrently@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
-  integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==
-  dependencies:
-    aproba "^1.1.1"
-    fs-write-stream-atomic "^1.0.8"
-    iferr "^0.1.5"
-    mkdirp "^0.5.1"
-    rimraf "^2.5.4"
-    run-queue "^1.0.0"
-
-copy-descriptor@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
-  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
-
-copy-webpack-plugin@6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-6.0.3.tgz#2b3d2bfc6861b96432a65f0149720adbd902040b"
-  integrity sha512-q5m6Vz4elsuyVEIUXr7wJdIdePWTubsqVbEMvf1WQnHGv0Q+9yPRu7MtYFPt+GBOXRav9lvIINifTQ1vSCs+eA==
-  dependencies:
-    cacache "^15.0.4"
-    fast-glob "^3.2.4"
-    find-cache-dir "^3.3.1"
-    glob-parent "^5.1.1"
-    globby "^11.0.1"
-    loader-utils "^2.0.0"
-    normalize-path "^3.0.0"
-    p-limit "^3.0.1"
-    schema-utils "^2.7.0"
-    serialize-javascript "^4.0.0"
-    webpack-sources "^1.4.3"
-
-core-js-compat@^3.6.2:
-  version "3.12.1"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.12.1.tgz#2c302c4708505fa7072b0adb5156d26f7801a18b"
-  integrity sha512-i6h5qODpw6EsHAoIdQhKoZdWn+dGBF3dSS8m5tif36RlWvW3A6+yu2S16QHUo3CrkzrnEskMAt9f8FxmY9fhWQ==
-  dependencies:
-    browserslist "^4.16.6"
-    semver "7.0.0"
-
-core-js@3.6.4:
-  version "3.6.4"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.4.tgz#440a83536b458114b9cb2ac1580ba377dc470647"
-  integrity sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==
-
-core-js@^2.2.0:
-  version "2.6.12"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
-  integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
-
-core-js@^3.1.3:
-  version "3.12.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.12.1.tgz#6b5af4ff55616c08a44d386f1f510917ff204112"
-  integrity sha512-Ne9DKPHTObRuB09Dru5AjwKjY4cJHVGu+y5f7coGn1E9Grkc3p2iBwE9AI/nJzsE29mQF7oq+mhYYRqOMFN1Bw==
-
-core-js@^3.6.0, core-js@^3.8.3:
-  version "3.23.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.23.1.tgz#9f9a9255115f62c512db56d567f636da32ca0b78"
-  integrity sha512-wfMYHWi1WQjpgZNC9kAlN4ut04TM9fUTdi7CqIoTVM7yaiOUQTklOzfb+oWH3r9edQcT3F887swuVmxrV+CC8w==
-
-core-util-is@1.0.2, core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
-
-cosmiconfig@^5.0.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a"
-  integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==
-  dependencies:
-    import-fresh "^2.0.0"
-    is-directory "^0.3.1"
-    js-yaml "^3.13.1"
-    parse-json "^4.0.0"
-
-cosmiconfig@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3"
-  integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==
-  dependencies:
-    "@types/parse-json" "^4.0.0"
-    import-fresh "^3.2.1"
-    parse-json "^5.0.0"
-    path-type "^4.0.0"
-    yaml "^1.10.0"
-
-coverage-istanbul-loader@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/coverage-istanbul-loader/-/coverage-istanbul-loader-2.0.3.tgz#87d42f03fa0fd3fa8743ec76945d9d67f105722a"
-  integrity sha512-LiGRvyIuzVYs3M1ZYK1tF0HekjH0DJ8zFdUwAZq378EJzqOgToyb1690dp3TAUlP6Y+82uu42LRjuROVeJ54CA==
-  dependencies:
-    convert-source-map "^1.7.0"
-    istanbul-lib-instrument "^4.0.0"
-    loader-utils "^1.2.3"
-    merge-source-map "^1.1.0"
-    schema-utils "^2.6.1"
-
-crc-32@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz#cb2db6e29b88508e32d9dd0ec1693e7b41a18208"
-  integrity sha512-1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA==
-  dependencies:
-    exit-on-epipe "~1.0.1"
-    printj "~1.1.0"
-
-create-ecdh@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e"
-  integrity sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==
-  dependencies:
-    bn.js "^4.1.0"
-    elliptic "^6.5.3"
-
-create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
-  integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
-  dependencies:
-    cipher-base "^1.0.1"
-    inherits "^2.0.1"
-    md5.js "^1.3.4"
-    ripemd160 "^2.0.1"
-    sha.js "^2.4.0"
-
-create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
-  integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
-  dependencies:
-    cipher-base "^1.0.3"
-    create-hash "^1.1.0"
-    inherits "^2.0.1"
-    ripemd160 "^2.0.0"
-    safe-buffer "^5.0.1"
-    sha.js "^2.4.8"
-
-cross-spawn@^5.0.1:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
-  integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
-  dependencies:
-    lru-cache "^4.0.1"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
-cross-spawn@^6.0.0:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
-  dependencies:
-    nice-try "^1.0.4"
-    path-key "^2.0.1"
-    semver "^5.5.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
-crypto-browserify@^3.11.0:
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
-  integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
-  dependencies:
-    browserify-cipher "^1.0.0"
-    browserify-sign "^4.0.0"
-    create-ecdh "^4.0.0"
-    create-hash "^1.1.0"
-    create-hmac "^1.1.0"
-    diffie-hellman "^5.0.0"
-    inherits "^2.0.1"
-    pbkdf2 "^3.0.3"
-    public-encrypt "^4.0.0"
-    randombytes "^2.0.0"
-    randomfill "^1.0.3"
-
-crypto-random-string@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
-  integrity sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=
-
-css-line-break@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/css-line-break/-/css-line-break-1.1.1.tgz#d5e9bdd297840099eb0503c7310fd34927a026ef"
-  integrity sha512-1feNVaM4Fyzdj4mKPIQNL2n70MmuYzAXZ1aytlROFX1JsOo070OsugwGjj7nl6jnDJWHDM8zRZswkmeYVWZJQA==
-  dependencies:
-    base64-arraybuffer "^0.2.0"
-
-css-line-break@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/css-line-break/-/css-line-break-2.1.0.tgz#bfef660dfa6f5397ea54116bb3cb4873edbc4fa0"
-  integrity sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==
-  dependencies:
-    utrie "^1.0.2"
-
-css-parse@1.7.x:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-1.7.0.tgz#321f6cf73782a6ff751111390fc05e2c657d8c9b"
-  integrity sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=
-
-css-parse@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-2.0.0.tgz#a468ee667c16d81ccf05c58c38d2a97c780dbfd4"
-  integrity sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=
-  dependencies:
-    css "^2.0.0"
-
-css-selector-tokenizer@^0.7.1:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.3.tgz#735f26186e67c749aaf275783405cf0661fae8f1"
-  integrity sha512-jWQv3oCEL5kMErj4wRnK/OPoBi0D+P1FR2cDCKYPaMeD2eW3/mttav8HT4hT1CKopiJI/psEULjkClhvJo4Lvg==
-  dependencies:
-    cssesc "^3.0.0"
-    fastparse "^1.1.2"
-
-css-unit-converter@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.2.tgz#4c77f5a1954e6dbff60695ecb214e3270436ab21"
-  integrity sha512-IiJwMC8rdZE0+xiEZHeru6YoONC4rfPMqGm2W85jMIbkFvv5nFTwJVFHam2eFrN6txmoUYFAFXiv8ICVeTO0MA==
-
-css@^2.0.0:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929"
-  integrity sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==
-  dependencies:
-    inherits "^2.0.3"
-    source-map "^0.6.1"
-    source-map-resolve "^0.5.2"
-    urix "^0.1.0"
-
-cssauron@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/cssauron/-/cssauron-1.4.0.tgz#a6602dff7e04a8306dc0db9a551e92e8b5662ad8"
-  integrity sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=
-  dependencies:
-    through X.X.X
-
-cssesc@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
-  integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
-
-cssom@0.3.x, "cssom@>= 0.3.0 < 0.4.0":
-  version "0.3.8"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
-  integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
-
-"cssstyle@>= 0.2.34 < 0.3.0":
-  version "0.2.37"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.2.37.tgz#541097234cb2513c83ceed3acddc27ff27987d54"
-  integrity sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=
-  dependencies:
-    cssom "0.3.x"
-
-cuint@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/cuint/-/cuint-0.2.2.tgz#408086d409550c2631155619e9fa7bcadc3b991b"
-  integrity sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=
-
-custom-event@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425"
-  integrity sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=
-
-cyclist@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
-  integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
-
-d3-array@1, d3-array@^1.1.1, d3-array@^1.2.0:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.4.tgz#635ce4d5eea759f6f605863dbcfc30edc737f71f"
-  integrity sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw==
-
-d3-axis@1:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/d3-axis/-/d3-axis-1.0.12.tgz#cdf20ba210cfbb43795af33756886fb3638daac9"
-  integrity sha512-ejINPfPSNdGFKEOAtnBtdkpr24c4d4jsei6Lg98mxf424ivoDP2956/5HDpIAtmHo85lqT4pruy+zEgvRUBqaQ==
-
-d3-brush@1:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.1.6.tgz#b0a22c7372cabec128bdddf9bddc058592f89e9b"
-  integrity sha512-7RW+w7HfMCPyZLifTz/UnJmI5kdkXtpCbombUSs8xniAyo0vIbrDzDwUJB6eJOgl9u5DQOt2TQlYumxzD1SvYA==
-  dependencies:
-    d3-dispatch "1"
-    d3-drag "1"
-    d3-interpolate "1"
-    d3-selection "1"
-    d3-transition "1"
-
-d3-chord@1:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/d3-chord/-/d3-chord-1.0.6.tgz#309157e3f2db2c752f0280fedd35f2067ccbb15f"
-  integrity sha512-JXA2Dro1Fxw9rJe33Uv+Ckr5IrAa74TlfDEhE/jfLOaXegMQFQTAgAw9WnZL8+HxVBRXaRGCkrNU7pJeylRIuA==
-  dependencies:
-    d3-array "1"
-    d3-path "1"
-
-d3-collection@1:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.7.tgz#349bd2aa9977db071091c13144d5e4f16b5b310e"
-  integrity sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A==
-
-d3-color@1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.1.tgz#c52002bf8846ada4424d55d97982fef26eb3bc8a"
-  integrity sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q==
-
-d3-contour@1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/d3-contour/-/d3-contour-1.3.2.tgz#652aacd500d2264cb3423cee10db69f6f59bead3"
-  integrity sha512-hoPp4K/rJCu0ladiH6zmJUEz6+u3lgR+GSm/QdM2BBvDraU39Vr7YdDCicJcxP1z8i9B/2dJLgDC1NcvlF8WCg==
-  dependencies:
-    d3-array "^1.1.1"
-
-d3-dispatch@1:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-1.0.6.tgz#00d37bcee4dd8cd97729dd893a0ac29caaba5d58"
-  integrity sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA==
-
-d3-drag@1:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-1.2.5.tgz#2537f451acd39d31406677b7dc77c82f7d988f70"
-  integrity sha512-rD1ohlkKQwMZYkQlYVCrSFxsWPzI97+W+PaEIBNTMxRuxz9RF0Hi5nJWHGVJ3Om9d2fRTe1yOBINJyy/ahV95w==
-  dependencies:
-    d3-dispatch "1"
-    d3-selection "1"
-
-d3-dsv@1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-1.2.0.tgz#9d5f75c3a5f8abd611f74d3f5847b0d4338b885c"
-  integrity sha512-9yVlqvZcSOMhCYzniHE7EVUws7Fa1zgw+/EAV2BxJoG3ME19V6BQFBwI855XQDsxyOuG7NibqRMTtiF/Qup46g==
-  dependencies:
-    commander "2"
-    iconv-lite "0.4"
-    rw "1"
-
-d3-ease@1:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.7.tgz#9a834890ef8b8ae8c558b2fe55bd57f5993b85e2"
-  integrity sha512-lx14ZPYkhNx0s/2HX5sLFUI3mbasHjSSpwO/KaaNACweVwxUruKyWVcb293wMv1RqTPZyZ8kSZ2NogUZNcLOFQ==
-
-d3-fetch@1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/d3-fetch/-/d3-fetch-1.2.0.tgz#15ce2ecfc41b092b1db50abd2c552c2316cf7fc7"
-  integrity sha512-yC78NBVcd2zFAyR/HnUiBS7Lf6inSCoWcSxFfw8FYL7ydiqe80SazNwoffcqOfs95XaLo7yebsmQqDKSsXUtvA==
-  dependencies:
-    d3-dsv "1"
-
-d3-force@1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/d3-force/-/d3-force-1.2.1.tgz#fd29a5d1ff181c9e7f0669e4bd72bdb0e914ec0b"
-  integrity sha512-HHvehyaiUlVo5CxBJ0yF/xny4xoaxFxDnBXNvNcfW9adORGZfyNF1dj6DGLKyk4Yh3brP/1h3rnDzdIAwL08zg==
-  dependencies:
-    d3-collection "1"
-    d3-dispatch "1"
-    d3-quadtree "1"
-    d3-timer "1"
-
-d3-format@1:
-  version "1.4.5"
-  resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.4.5.tgz#374f2ba1320e3717eb74a9356c67daee17a7edb4"
-  integrity sha512-J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ==
-
-d3-geo@1:
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.12.1.tgz#7fc2ab7414b72e59fbcbd603e80d9adc029b035f"
-  integrity sha512-XG4d1c/UJSEX9NfU02KwBL6BYPj8YKHxgBEw5om2ZnTRSbIcego6dhHwcxuSR3clxh0EpE38os1DVPOmnYtTPg==
-  dependencies:
-    d3-array "1"
-
-d3-hierarchy@1:
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-1.1.9.tgz#2f6bee24caaea43f8dc37545fa01628559647a83"
-  integrity sha512-j8tPxlqh1srJHAtxfvOUwKNYJkQuBFdM1+JAUfq6xqH5eAqf93L7oG1NVqDa4CpFZNvnNKtCYEUC8KY9yEn9lQ==
-
-d3-interpolate@1:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.4.0.tgz#526e79e2d80daa383f9e0c1c1c7dcc0f0583e987"
-  integrity sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==
-  dependencies:
-    d3-color "1"
-
-d3-path@1:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-1.0.9.tgz#48c050bb1fe8c262493a8caf5524e3e9591701cf"
-  integrity sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg==
-
-d3-polygon@1:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/d3-polygon/-/d3-polygon-1.0.6.tgz#0bf8cb8180a6dc107f518ddf7975e12abbfbd38e"
-  integrity sha512-k+RF7WvI08PC8reEoXa/w2nSg5AUMTi+peBD9cmFc+0ixHfbs4QmxxkarVal1IkVkgxVuk9JSHhJURHiyHKAuQ==
-
-d3-quadtree@1:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-1.0.7.tgz#ca8b84df7bb53763fe3c2f24bd435137f4e53135"
-  integrity sha512-RKPAeXnkC59IDGD0Wu5mANy0Q2V28L+fNe65pOCXVdVuTJS3WPKaJlFHer32Rbh9gIo9qMuJXio8ra4+YmIymA==
-
-d3-random@1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/d3-random/-/d3-random-1.1.2.tgz#2833be7c124360bf9e2d3fd4f33847cfe6cab291"
-  integrity sha512-6AK5BNpIFqP+cx/sreKzNjWbwZQCSUatxq+pPRmFIQaWuoD+NrbVWw7YWpHiXpCQ/NanKdtGDuB+VQcZDaEmYQ==
-
-d3-scale-chromatic@1:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/d3-scale-chromatic/-/d3-scale-chromatic-1.5.0.tgz#54e333fc78212f439b14641fb55801dd81135a98"
-  integrity sha512-ACcL46DYImpRFMBcpk9HhtIyC7bTBR4fNOPxwVSl0LfulDAwyiHyPOTqcDG1+t5d4P9W7t/2NAuWu59aKko/cg==
-  dependencies:
-    d3-color "1"
-    d3-interpolate "1"
-
-d3-scale@2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-2.2.2.tgz#4e880e0b2745acaaddd3ede26a9e908a9e17b81f"
-  integrity sha512-LbeEvGgIb8UMcAa0EATLNX0lelKWGYDQiPdHj+gLblGVhGLyNbaCn3EvrJf0A3Y/uOOU5aD6MTh5ZFCdEwGiCw==
-  dependencies:
-    d3-array "^1.2.0"
-    d3-collection "1"
-    d3-format "1"
-    d3-interpolate "1"
-    d3-time "1"
-    d3-time-format "2"
-
-d3-selection@1, d3-selection@^1.1.0:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.2.tgz#dcaa49522c0dbf32d6c1858afc26b6094555bc5c"
-  integrity sha512-SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg==
-
-d3-shape@1:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.3.7.tgz#df63801be07bc986bc54f63789b4fe502992b5d7"
-  integrity sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==
-  dependencies:
-    d3-path "1"
-
-d3-time-format@2:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.3.0.tgz#107bdc028667788a8924ba040faf1fbccd5a7850"
-  integrity sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==
-  dependencies:
-    d3-time "1"
-
-d3-time@1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.1.0.tgz#b1e19d307dae9c900b7e5b25ffc5dcc249a8a0f1"
-  integrity sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA==
-
-d3-timer@1:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.10.tgz#dfe76b8a91748831b13b6d9c793ffbd508dd9de5"
-  integrity sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw==
-
-d3-transition@1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.3.2.tgz#a98ef2151be8d8600543434c1ca80140ae23b398"
-  integrity sha512-sc0gRU4PFqZ47lPVHloMn9tlPcv8jxgOQg+0zjhfZXMQuvppjG6YuwdMBE0TuqCZjeJkLecku/l9R0JPcRhaDA==
-  dependencies:
-    d3-color "1"
-    d3-dispatch "1"
-    d3-ease "1"
-    d3-interpolate "1"
-    d3-selection "^1.1.0"
-    d3-timer "1"
-
-d3-voronoi@1:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/d3-voronoi/-/d3-voronoi-1.1.4.tgz#dd3c78d7653d2bb359284ae478645d95944c8297"
-  integrity sha512-dArJ32hchFsrQ8uMiTBLq256MpnZjeuBtdHpaDlYuQyjU0CVzCJl/BVW+SkszaAeH95D/8gxqAhgx0ouAWAfRg==
-
-d3-zoom@1:
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-1.8.3.tgz#b6a3dbe738c7763121cd05b8a7795ffe17f4fc0a"
-  integrity sha512-VoLXTK4wvy1a0JpH2Il+F2CiOhVu7VRXWF5M/LroMIh3/zBAC3WAt7QoIvPibOavVo20hN6/37vwAsdBejLyKQ==
-  dependencies:
-    d3-dispatch "1"
-    d3-drag "1"
-    d3-interpolate "1"
-    d3-selection "1"
-    d3-transition "1"
-
-d3@^5.9.7:
-  version "5.16.0"
-  resolved "https://registry.yarnpkg.com/d3/-/d3-5.16.0.tgz#9c5e8d3b56403c79d4ed42fbd62f6113f199c877"
-  integrity sha512-4PL5hHaHwX4m7Zr1UapXW23apo6pexCgdetdJ5kTmADpG/7T9Gkxw0M0tf/pjoB63ezCCm0u5UaFYy2aMt0Mcw==
-  dependencies:
-    d3-array "1"
-    d3-axis "1"
-    d3-brush "1"
-    d3-chord "1"
-    d3-collection "1"
-    d3-color "1"
-    d3-contour "1"
-    d3-dispatch "1"
-    d3-drag "1"
-    d3-dsv "1"
-    d3-ease "1"
-    d3-fetch "1"
-    d3-force "1"
-    d3-format "1"
-    d3-geo "1"
-    d3-hierarchy "1"
-    d3-interpolate "1"
-    d3-path "1"
-    d3-polygon "1"
-    d3-quadtree "1"
-    d3-random "1"
-    d3-scale "2"
-    d3-scale-chromatic "1"
-    d3-selection "1"
-    d3-shape "1"
-    d3-time "1"
-    d3-time-format "2"
-    d3-timer "1"
-    d3-transition "1"
-    d3-voronoi "1"
-    d3-zoom "1"
-
-damerau-levenshtein@^1.0.4:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz#64368003512a1a6992593741a09a9d31a836f55d"
-  integrity sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==
-
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
-  dependencies:
-    assert-plus "^1.0.0"
-
-date-format@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/date-format/-/date-format-1.2.0.tgz#615e828e233dd1ab9bb9ae0950e0ceccfa6ecad8"
-  integrity sha512-lAJqBmFzCLcDJdI9cEnJ7loSkLTh1PbIgZUndlzvYbf6NyFEr5n9rQhOwr6CIGwZqyQ3sYeQQiP9NOVQmgmRMA==
-
-date-format@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/date-format/-/date-format-2.1.0.tgz#31d5b5ea211cf5fd764cd38baf9d033df7e125cf"
-  integrity sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==
-
-debug@*, debug@^4.1.0, debug@^4.1.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
-  integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
-  dependencies:
-    ms "2.1.2"
-
-debug@2.6.9, debug@^2.2.0, debug@^2.3.3:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
-  dependencies:
-    ms "2.0.0"
-
-debug@3.1.0, debug@~3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
-  dependencies:
-    ms "2.0.0"
-
-debug@^3.1.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
-  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
-  dependencies:
-    ms "^2.1.1"
-
-debuglog@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
-  integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
-
-decamelize@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
-
-decode-uri-component@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
-
-decompress-response@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
-  integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=
-  dependencies:
-    mimic-response "^1.0.0"
-
-deep-equal@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a"
-  integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==
-  dependencies:
-    is-arguments "^1.0.4"
-    is-date-object "^1.0.1"
-    is-regex "^1.0.4"
-    object-is "^1.0.1"
-    object-keys "^1.1.1"
-    regexp.prototype.flags "^1.2.0"
-
-deep-extend@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
-  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
-
-deep-is@~0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
-  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
-
-deepmerge@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
-  integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
-
-default-gateway@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"
-  integrity sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==
-  dependencies:
-    execa "^1.0.0"
-    ip-regex "^2.1.0"
-
-default-require-extensions@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-2.0.0.tgz#f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7"
-  integrity sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=
-  dependencies:
-    strip-bom "^3.0.0"
-
-defer-to-connect@^1.0.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
-  integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
-
-define-properties@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
-  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
-  dependencies:
-    object-keys "^1.0.12"
-
-define-property@^0.2.5:
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
-  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
-  dependencies:
-    is-descriptor "^0.1.0"
-
-define-property@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
-  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
-  dependencies:
-    is-descriptor "^1.0.0"
-
-define-property@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
-  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
-  dependencies:
-    is-descriptor "^1.0.2"
-    isobject "^3.0.1"
-
-defined@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
-  integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=
-
-del@^2.2.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
-  integrity sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=
-  dependencies:
-    globby "^5.0.0"
-    is-path-cwd "^1.0.0"
-    is-path-in-cwd "^1.0.0"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    rimraf "^2.2.8"
-
-del@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4"
-  integrity sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==
-  dependencies:
-    "@types/glob" "^7.1.1"
-    globby "^6.1.0"
-    is-path-cwd "^2.0.0"
-    is-path-in-cwd "^2.0.0"
-    p-map "^2.0.0"
-    pify "^4.0.1"
-    rimraf "^2.6.3"
-
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
-
-depd@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
-
-dependency-graph@^0.7.2:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-0.7.2.tgz#91db9de6eb72699209d88aea4c1fd5221cac1c49"
-  integrity sha512-KqtH4/EZdtdfWX0p6MGP9jljvxSY6msy/pRUD4jgNwVpv3v1QmNLlsB3LDSSUg79BRVSn7jI1QPRtArGABovAQ==
-
-des.js@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
-  integrity sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==
-  dependencies:
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-
-destroy@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
-  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
-
-detect-node@^2.0.4:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.5.tgz#9d270aa7eaa5af0b72c4c9d9b814e7f4ce738b79"
-  integrity sha512-qi86tE6hRcFHy8jI1m2VG+LaPUR1LhqDa5G8tVjuUXmOrpuAgqsA1pN0+ldgr3aKUH+QLI9hCY/OcRYisERejw==
-
-detective@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/detective/-/detective-5.2.0.tgz#feb2a77e85b904ecdea459ad897cc90a99bd2a7b"
-  integrity sha512-6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg==
-  dependencies:
-    acorn-node "^1.6.1"
-    defined "^1.0.0"
-    minimist "^1.1.1"
-
-dezalgo@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
-  integrity sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=
-  dependencies:
-    asap "^2.0.0"
-    wrappy "1"
-
-di@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
-  integrity sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=
-
-diff@^3.2.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
-  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
-
-diff@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
-  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
-
-diffie-hellman@^5.0.0:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
-  integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
-  dependencies:
-    bn.js "^4.1.0"
-    miller-rabin "^4.0.0"
-    randombytes "^2.0.0"
-
-dir-glob@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
-  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
-  dependencies:
-    path-type "^4.0.0"
-
-dns-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
-  integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
-
-dns-packet@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
-  integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==
-  dependencies:
-    ip "^1.1.0"
-    safe-buffer "^5.0.1"
-
-dns-txt@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6"
-  integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=
-  dependencies:
-    buffer-indexof "^1.0.0"
-
-doctrine@0.7.2:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-0.7.2.tgz#7cb860359ba3be90e040b26b729ce4bfa654c523"
-  integrity sha1-fLhgNZujvpDgQLJrcpzkv6ZUxSM=
-  dependencies:
-    esutils "^1.1.6"
-    isarray "0.0.1"
-
-dom-serialize@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b"
-  integrity sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=
-  dependencies:
-    custom-event "~1.0.0"
-    ent "~2.2.0"
-    extend "^3.0.0"
-    void-elements "^2.0.0"
-
-dom-to-image@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/dom-to-image/-/dom-to-image-2.6.0.tgz#8a503608088c87b1c22f9034ae032e1898955867"
-  integrity sha1-ilA2CAiMh7HCL5A0rgMuGJiVWGc=
-
-dom-walk@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84"
-  integrity sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==
-
-domain-browser@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
-  integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
-
-dompurify@^2.2.0:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.8.tgz#224fe9ae57d7ebd9a1ae1ac18c1c1ca3f532226f"
-  integrity sha512-eVhaWoVibIzqdGYjwsBWodIQIaXFSB+cKDf4cfxLMsK0xiud6SE+/WCVx/Xw/UwQsa4cS3T2eITcdtmTg2UKcw==
-
-dot-prop@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.1.tgz#45884194a71fc2cda71cbb4bceb3a4dd2f433ba4"
-  integrity sha512-l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ==
-  dependencies:
-    is-obj "^1.0.0"
-
-duplexer3@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
-  integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
-
-duplexer@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
-  integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
-
-duplexify@^3.4.2, duplexify@^3.6.0:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
-  integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
-  dependencies:
-    end-of-stream "^1.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-    stream-shift "^1.0.0"
-
-ecc-jsbn@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
-  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
-  dependencies:
-    jsbn "~0.1.0"
-    safer-buffer "^2.1.0"
-
-ee-first@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
-
-electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.723:
-  version "1.3.727"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.727.tgz#857e310ca00f0b75da4e1db6ff0e073cc4a91ddf"
-  integrity sha512-Mfz4FIB4FSvEwBpDfdipRIrwd6uo8gUDoRDF4QEYb4h4tSuI3ov594OrjU6on042UlFHouIJpClDODGkPcBSbg==
-
-elliptic@^6.5.3:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
-  integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
-  dependencies:
-    bn.js "^4.11.9"
-    brorand "^1.1.0"
-    hash.js "^1.0.0"
-    hmac-drbg "^1.0.1"
-    inherits "^2.0.4"
-    minimalistic-assert "^1.0.1"
-    minimalistic-crypto-utils "^1.0.1"
-
-emoji-regex@^7.0.1:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
-  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
-
-emoji-regex@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
-  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
-
-emojis-list@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
-  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
-
-emojis-list@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
-  integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
-
-encodeurl@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
-
-encoding@^0.1.11:
-  version "0.1.13"
-  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
-  integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
-  dependencies:
-    iconv-lite "^0.6.2"
-
-end-of-stream@^1.0.0, end-of-stream@^1.1.0:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
-  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
-  dependencies:
-    once "^1.4.0"
-
-engine.io-client@~3.2.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.2.1.tgz#6f54c0475de487158a1a7c77d10178708b6add36"
-  integrity sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==
-  dependencies:
-    component-emitter "1.2.1"
-    component-inherit "0.0.3"
-    debug "~3.1.0"
-    engine.io-parser "~2.1.1"
-    has-cors "1.1.0"
-    indexof "0.0.1"
-    parseqs "0.0.5"
-    parseuri "0.0.5"
-    ws "~3.3.1"
-    xmlhttprequest-ssl "~1.5.4"
-    yeast "0.1.2"
-
-engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.3.tgz#757ab970fbf2dfb32c7b74b033216d5739ef79a6"
-  integrity sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==
-  dependencies:
-    after "0.8.2"
-    arraybuffer.slice "~0.0.7"
-    base64-arraybuffer "0.1.5"
-    blob "0.0.5"
-    has-binary2 "~1.0.2"
-
-engine.io@~3.2.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.2.1.tgz#b60281c35484a70ee0351ea0ebff83ec8c9522a2"
-  integrity sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==
-  dependencies:
-    accepts "~1.3.4"
-    base64id "1.0.0"
-    cookie "0.3.1"
-    debug "~3.1.0"
-    engine.io-parser "~2.1.0"
-    ws "~3.3.1"
-
-enhanced-resolve@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
-  integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==
-  dependencies:
-    graceful-fs "^4.1.2"
-    memory-fs "^0.4.0"
-    tapable "^1.0.0"
-
-enhanced-resolve@^4.1.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec"
-  integrity sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==
-  dependencies:
-    graceful-fs "^4.1.2"
-    memory-fs "^0.5.0"
-    tapable "^1.0.0"
-
-ent@~2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
-  integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0=
-
-err-code@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960"
-  integrity sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=
-
-errno@^0.1.1, errno@^0.1.3, errno@~0.1.7:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f"
-  integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==
-  dependencies:
-    prr "~1.0.1"
-
-error-ex@^1.3.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
-  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
-  dependencies:
-    is-arrayish "^0.2.1"
-
-es-abstract@^1.18.0-next.2:
-  version "1.18.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0.tgz#ab80b359eecb7ede4c298000390bc5ac3ec7b5a4"
-  integrity sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==
-  dependencies:
-    call-bind "^1.0.2"
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    get-intrinsic "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.2"
-    is-callable "^1.2.3"
-    is-negative-zero "^2.0.1"
-    is-regex "^1.1.2"
-    is-string "^1.0.5"
-    object-inspect "^1.9.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.2"
-    string.prototype.trimend "^1.0.4"
-    string.prototype.trimstart "^1.0.4"
-    unbox-primitive "^1.0.0"
-
-es-to-primitive@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
-  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
-  dependencies:
-    is-callable "^1.1.4"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.2"
-
-es6-promise@^4.0.3, es6-promise@^4.2.5:
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
-  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
-
-es6-promisify@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
-  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
-  dependencies:
-    es6-promise "^4.0.3"
-
-escalade@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
-  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
-
-escape-html@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
-  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
-
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-
-escodegen@^1.6.1:
-  version "1.14.3"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503"
-  integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==
-  dependencies:
-    esprima "^4.0.1"
-    estraverse "^4.2.0"
-    esutils "^2.0.2"
-    optionator "^0.8.1"
-  optionalDependencies:
-    source-map "~0.6.1"
-
-eslint-scope@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
-  integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==
-  dependencies:
-    esrecurse "^4.1.0"
-    estraverse "^4.1.1"
-
-esprima@^4.0.0, esprima@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
-esrecurse@^4.1.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
-  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
-  dependencies:
-    estraverse "^5.2.0"
-
-estraverse@^4.1.1, estraverse@^4.2.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
-  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
-
-estraverse@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
-  integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
-
-estree-walker@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362"
-  integrity sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==
-
-esutils@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-1.1.6.tgz#c01ccaa9ae4b897c6d0c3e210ae52f3c7a844375"
-  integrity sha1-wBzKqa5LiXxtDD4hCuUvPHqEQ3U=
-
-esutils@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
-  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
-
-etag@~1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
-  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
-
-eventemitter3@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-2.0.3.tgz#b5e1079b59fb5e1ba2771c0a993be060a58c99ba"
-  integrity sha1-teEHm1n7XhuidxwKmTvgYKWMmbo=
-
-eventemitter3@^4.0.0:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
-  integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
-
-events@^3.0.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
-  integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
-
-eventsource@^1.0.7:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.0.tgz#00e8ca7c92109e94b0ddf32dac677d841028cfaf"
-  integrity sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==
-  dependencies:
-    original "^1.0.0"
-
-evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
-  integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==
-  dependencies:
-    md5.js "^1.3.4"
-    safe-buffer "^5.1.1"
-
-execa@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
-  integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=
-  dependencies:
-    cross-spawn "^5.0.1"
-    get-stream "^3.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
-execa@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
-  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
-  dependencies:
-    cross-spawn "^6.0.0"
-    get-stream "^4.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
-exit-on-epipe@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz#0bdd92e87d5285d267daa8171d0eb06159689692"
-  integrity sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw==
-
-exit@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
-  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
-
-expand-braces@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/expand-braces/-/expand-braces-0.1.2.tgz#488b1d1d2451cb3d3a6b192cfc030f44c5855fea"
-  integrity sha512-zOOsEnAhvIxxd0esCNbYG2xerGf46niZ1egS43eV7Fu4t7VIScgPXMcMabCLaPrqkzwvwo6zZipDiX3t0ILF2w==
-  dependencies:
-    array-slice "^0.2.3"
-    array-unique "^0.2.1"
-    braces "^0.1.2"
-
-expand-brackets@^2.1.4:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
-  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
-  dependencies:
-    debug "^2.3.3"
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    posix-character-classes "^0.1.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-expand-range@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-0.1.1.tgz#4cb8eda0993ca56fa4f41fc42f3cbb4ccadff044"
-  integrity sha512-busOHJ0t7t5UcutcyNDqmaDX+1cb0XlqsAUgTlmplVv0rIqBaMcBSZRLlkDm0nxtl8O3o/EvRRrdQ/WnyPERLQ==
-  dependencies:
-    is-number "^0.1.1"
-    repeat-string "^0.2.2"
-
-express@^4.17.1:
-  version "4.17.1"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
-  integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
-  dependencies:
-    accepts "~1.3.7"
-    array-flatten "1.1.1"
-    body-parser "1.19.0"
-    content-disposition "0.5.3"
-    content-type "~1.0.4"
-    cookie "0.4.0"
-    cookie-signature "1.0.6"
-    debug "2.6.9"
-    depd "~1.1.2"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    finalhandler "~1.1.2"
-    fresh "0.5.2"
-    merge-descriptors "1.0.1"
-    methods "~1.1.2"
-    on-finished "~2.3.0"
-    parseurl "~1.3.3"
-    path-to-regexp "0.1.7"
-    proxy-addr "~2.0.5"
-    qs "6.7.0"
-    range-parser "~1.2.1"
-    safe-buffer "5.1.2"
-    send "0.17.1"
-    serve-static "1.14.1"
-    setprototypeof "1.1.1"
-    statuses "~1.5.0"
-    type-is "~1.6.18"
-    utils-merge "1.0.1"
-    vary "~1.1.2"
-
-extend-shallow@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
-  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
-  dependencies:
-    is-extendable "^0.1.0"
-
-extend-shallow@^3.0.0, extend-shallow@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
-  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
-  dependencies:
-    assign-symbols "^1.0.0"
-    is-extendable "^1.0.1"
-
-extend@^3.0.0, extend@^3.0.2, extend@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-
-external-editor@^3.0.3:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
-  integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
-  dependencies:
-    chardet "^0.7.0"
-    iconv-lite "^0.4.24"
-    tmp "^0.0.33"
-
-extglob@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
-  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
-  dependencies:
-    array-unique "^0.3.2"
-    define-property "^1.0.0"
-    expand-brackets "^2.1.4"
-    extend-shallow "^2.0.1"
-    fragment-cache "^0.2.1"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-extsprintf@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
-
-extsprintf@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
-  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
-
-fast-deep-equal@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
-  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
-
-fast-deep-equal@^3.1.1:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
-  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
-
-fast-diff@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.1.2.tgz#4b62c42b8e03de3f848460b639079920695d0154"
-  integrity sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==
-
-fast-diff@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
-  integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
-
-fast-glob@^3.1.1, fast-glob@^3.2.4:
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661"
-  integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==
-  dependencies:
-    "@nodelib/fs.stat" "^2.0.2"
-    "@nodelib/fs.walk" "^1.2.3"
-    glob-parent "^5.1.0"
-    merge2 "^1.3.0"
-    micromatch "^4.0.2"
-    picomatch "^2.2.1"
-
-fast-json-stable-stringify@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
-  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
-
-fast-json-stable-stringify@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
-  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
-
-fast-levenshtein@~2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
-
-fastparse@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9"
-  integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==
-
-fastq@^1.6.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz#bb9fb955a07130a918eb63c1f5161cc32a5d0858"
-  integrity sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==
-  dependencies:
-    reusify "^1.0.4"
-
-faye-websocket@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
-  integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=
-  dependencies:
-    websocket-driver ">=0.5.1"
-
-faye-websocket@~0.11.1:
-  version "0.11.3"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz#5c0e9a8968e8912c286639fde977a8b209f2508e"
-  integrity sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==
-  dependencies:
-    websocket-driver ">=0.5.1"
-
-fflate@^0.3.8:
-  version "0.3.11"
-  resolved "https://registry.yarnpkg.com/fflate/-/fflate-0.3.11.tgz#2c440d7180fdeb819e64898d8858af327b042a5d"
-  integrity sha512-Rr5QlUeGN1mbOHlaqcSYMKVpPbgLy0AWT/W0EHxA6NGI12yO1jpoui2zBBvU2G824ltM6Ut8BFgfHSBGfkmS0A==
-
-fflate@^0.4.8:
-  version "0.4.8"
-  resolved "https://registry.yarnpkg.com/fflate/-/fflate-0.4.8.tgz#f90b82aefbd8ac174213abb338bd7ef848f0f5ae"
-  integrity sha512-FJqqoDBR00Mdj9ppamLa/Y7vxm+PRmNWA67N846RvsoYVMKB4q3y/de5PA7gUmRMYK/8CMz2GDZQmCRN1wBcWA==
-
-figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
-  integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==
-
-figures@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
-  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
-  dependencies:
-    escape-string-regexp "^1.0.5"
-
-file-loader@4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-4.2.0.tgz#5fb124d2369d7075d70a9a5abecd12e60a95215e"
-  integrity sha512-+xZnaK5R8kBJrHK0/6HRlrKNamvVS5rjyuju+rnyxRGuwUJwpAMsVzUl5dz6rK8brkzjV6JpcFNjp6NqV0g1OQ==
-  dependencies:
-    loader-utils "^1.2.3"
-    schema-utils "^2.0.0"
-
-file-saver@1.3.8:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-1.3.8.tgz#e68a30c7cb044e2fb362b428469feb291c2e09d8"
-  integrity sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg==
-
-file-saver@^2.0.2:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-2.0.5.tgz#d61cfe2ce059f414d899e9dd6d4107ee25670c38"
-  integrity sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==
-
-file-uri-to-path@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
-  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
-
-fileset@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
-  integrity sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=
-  dependencies:
-    glob "^7.0.3"
-    minimatch "^3.0.3"
-
-fill-range@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
-  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
-    to-regex-range "^2.1.0"
-
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
-  dependencies:
-    to-regex-range "^5.0.1"
-
-finalhandler@1.1.2, finalhandler@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
-  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
-  dependencies:
-    debug "2.6.9"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    on-finished "~2.3.0"
-    parseurl "~1.3.3"
-    statuses "~1.5.0"
-    unpipe "~1.0.0"
-
-find-cache-dir@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.0.0.tgz#cd4b7dd97b7185b7e17dbfe2d6e4115ee3eeb8fc"
-  integrity sha512-t7ulV1fmbxh5G9l/492O1p5+EBbr3uwpt6odhFTMc+nWyhmbloe+ja9BZ8pIBtqFWhOmCWVjx+pTW4zDkFoclw==
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^3.0.0"
-    pkg-dir "^4.1.0"
-
-find-cache-dir@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
-  integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^2.0.0"
-    pkg-dir "^3.0.0"
-
-find-cache-dir@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880"
-  integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^3.0.2"
-    pkg-dir "^4.1.0"
-
-find-parent-dir@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54"
-  integrity sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ=
-
-find-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
-  dependencies:
-    locate-path "^3.0.0"
-
-find-up@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
-  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
-  dependencies:
-    locate-path "^5.0.0"
-    path-exists "^4.0.0"
-
-find-up@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
-  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
-  dependencies:
-    locate-path "^6.0.0"
-    path-exists "^4.0.0"
-
-find-versions@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-4.0.0.tgz#3c57e573bf97769b8cb8df16934b627915da4965"
-  integrity sha512-wgpWy002tA+wgmO27buH/9KzyEOQnKsG/R0yrcjPT9BOFm0zRBVQbZ95nRGXWMywS8YR5knRbpohio0bcJABxQ==
-  dependencies:
-    semver-regex "^3.1.2"
-
-flatted@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
-  integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
-
-flush-write-stream@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
-  integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==
-  dependencies:
-    inherits "^2.0.3"
-    readable-stream "^2.3.6"
-
-follow-redirects@^1.0.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43"
-  integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==
-
-for-in@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
-
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
-
-form-data@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
-  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.6"
-    mime-types "^2.1.12"
-
-forwarded@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
-  integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
-
-frac@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/frac/-/frac-1.1.2.tgz#3d74f7f6478c88a1b5020306d747dc6313c74d0b"
-  integrity sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==
-
-fragment-cache@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
-  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
-  dependencies:
-    map-cache "^0.2.2"
-
-fresh@0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
-  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
-
-from2@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
-  integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
-  dependencies:
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-
-fs-extra@^0.26.5:
-  version "0.26.7"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.26.7.tgz#9ae1fdd94897798edab76d0918cf42d0c3184fa9"
-  integrity sha1-muH92UiXeY7at20JGM9C0MMYT6k=
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^2.1.0"
-    klaw "^1.0.0"
-    path-is-absolute "^1.0.0"
-    rimraf "^2.2.8"
-
-fs-extra@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
-  integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
-fs-extra@^8.0.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
-  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
-  dependencies:
-    graceful-fs "^4.2.0"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
-fs-minipass@^1.2.5:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
-  integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
-  dependencies:
-    minipass "^2.6.0"
-
-fs-minipass@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
-  integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
-  dependencies:
-    minipass "^3.0.0"
-
-fs-promise@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/fs-promise/-/fs-promise-0.5.0.tgz#4347d6bf624655a7061a4319213c393276ad3ef3"
-  integrity sha1-Q0fWv2JGVacGGkMZITw5MnatPvM=
-  dependencies:
-    any-promise "^1.0.0"
-    fs-extra "^0.26.5"
-    mz "^2.3.1"
-    thenify-all "^1.6.0"
-
-fs-write-stream-atomic@^1.0.8:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
-  integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=
-  dependencies:
-    graceful-fs "^4.1.2"
-    iferr "^0.1.5"
-    imurmurhash "^0.1.4"
-    readable-stream "1 || 2"
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
-
-fsevents@^1.2.7:
-  version "1.2.13"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
-  integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==
-  dependencies:
-    bindings "^1.5.0"
-    nan "^2.12.1"
-
-fsevents@~2.3.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
-  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
-
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
-
-genfun@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537"
-  integrity sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==
-
-gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.2:
-  version "1.0.0-beta.2"
-  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
-  integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
-
-get-caller-file@^1.0.1, get-caller-file@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
-  integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
-
-get-caller-file@^2.0.0, get-caller-file@^2.0.1:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
-  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
-
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
-  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
-  dependencies:
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-
-get-stream@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
-  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
-
-get-stream@^4.0.0, get-stream@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
-  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
-  dependencies:
-    pump "^3.0.0"
-
-get-stream@^5.1.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
-  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
-  dependencies:
-    pump "^3.0.0"
-
-get-value@^2.0.3, get-value@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
-  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
-
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
-  dependencies:
-    assert-plus "^1.0.0"
-
-gl-preserve-state@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/gl-preserve-state/-/gl-preserve-state-1.0.0.tgz#4ef710d62873f1470ed015c6546c37dacddd4198"
-  integrity sha512-zQZ25l3haD4hvgJZ6C9+s0ebdkW9y+7U2qxvGu1uWOJh8a4RU+jURIKEQhf8elIlFpMH6CrAY2tH0mYrRjet3Q==
-
-glob-parent@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
-  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
-  dependencies:
-    is-glob "^3.1.0"
-    path-dirname "^1.0.0"
-
-glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@~5.1.0:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
-  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
-  dependencies:
-    is-glob "^4.0.1"
-
-glob@7.0.x:
-  version "7.0.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a"
-  integrity sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.2"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@7.1.4:
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
-  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
-  version "7.1.7"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
-  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-global-dirs@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
-  integrity sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=
-  dependencies:
-    ini "^1.3.4"
-
-global@4.3.2, global@~4.3.0:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f"
-  integrity sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=
-  dependencies:
-    min-document "^2.19.0"
-    process "~0.5.1"
-
-global@^4.3.0, global@^4.3.1, global@^4.3.2, global@^4.4.0, global@~4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406"
-  integrity sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==
-  dependencies:
-    min-document "^2.19.0"
-    process "^0.11.10"
-
-globals@^11.1.0:
-  version "11.12.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
-  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
-
-globby@^11.0.1:
-  version "11.0.3"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz#9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb"
-  integrity sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==
-  dependencies:
-    array-union "^2.1.0"
-    dir-glob "^3.0.1"
-    fast-glob "^3.1.1"
-    ignore "^5.1.4"
-    merge2 "^1.3.0"
-    slash "^3.0.0"
-
-globby@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
-  integrity sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=
-  dependencies:
-    array-union "^1.0.1"
-    arrify "^1.0.0"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-globby@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
-  integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
-  dependencies:
-    array-union "^1.0.1"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-got@^9.6.0:
-  version "9.6.0"
-  resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85"
-  integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==
-  dependencies:
-    "@sindresorhus/is" "^0.14.0"
-    "@szmarczak/http-timer" "^1.1.2"
-    cacheable-request "^6.0.0"
-    decompress-response "^3.3.0"
-    duplexer3 "^0.1.4"
-    get-stream "^4.1.0"
-    lowercase-keys "^1.0.1"
-    mimic-response "^1.0.1"
-    p-cancelable "^1.0.0"
-    to-readable-stream "^1.0.0"
-    url-parse-lax "^3.0.0"
-
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0:
-  version "4.2.6"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
-  integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
-
-grunt-karma@^0.12.2:
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/grunt-karma/-/grunt-karma-0.12.2.tgz#d52676ab94779e4b20052b5f3519eb32653dc566"
-  integrity sha512-houkUR8sks8uliJ5khwvV4Cf2vrxSPkvCt+w9uwOOHhDOCLZ9ZE4/MeDmC7GgSajGK+h/svpacbKFHyjNbCsng==
-  dependencies:
-    lodash "^3.10.1"
-
-gzip-size@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462"
-  integrity sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==
-  dependencies:
-    duplexer "^0.1.2"
-
-gzipper@^2.8.1:
-  version "2.10.4"
-  resolved "https://registry.yarnpkg.com/gzipper/-/gzipper-2.10.4.tgz#01746933b0655dcebfa5d668d1dcab007002c1bb"
-  integrity sha512-5I10NtGBdwwWDVAty+/y3EHVS3vyLldAoAtiF79hcAxC6W4x17f1dc13ua5c8HaXOP6eSf7Tq2zJzZKYJogBOQ==
-  dependencies:
-    commander "^3.0.0"
-    uuid "^3.3.3"
-
-hammerjs@^2.0.8:
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/hammerjs/-/hammerjs-2.0.8.tgz#04ef77862cff2bb79d30f7692095930222bf60f1"
-  integrity sha1-BO93hiz/K7edMPdpIJWTAiK/YPE=
-
-handle-thing@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
-  integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==
-
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
-
-har-validator@~5.1.3:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
-  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
-  dependencies:
-    ajv "^6.12.3"
-    har-schema "^2.0.0"
-
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
-  dependencies:
-    ansi-regex "^2.0.0"
-
-has-bigints@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
-  integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
-
-has-binary2@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
-  integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==
-  dependencies:
-    isarray "2.0.1"
-
-has-cors@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
-  integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
-
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
-
-has-flag@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
-  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
-
-has-symbols@^1.0.1, has-symbols@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
-  integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
-
-has-value@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
-  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
-  dependencies:
-    get-value "^2.0.3"
-    has-values "^0.1.4"
-    isobject "^2.0.0"
-
-has-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
-  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
-  dependencies:
-    get-value "^2.0.6"
-    has-values "^1.0.0"
-    isobject "^3.0.0"
-
-has-values@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
-  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
-
-has-values@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
-  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
-  dependencies:
-    is-number "^3.0.0"
-    kind-of "^4.0.0"
-
-has-yarn@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"
-  integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==
-
-has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
-
-hash-base@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"
-  integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==
-  dependencies:
-    inherits "^2.0.4"
-    readable-stream "^3.6.0"
-    safe-buffer "^5.2.0"
-
-hash.js@^1.0.0, hash.js@^1.0.3:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
-  integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
-  dependencies:
-    inherits "^2.0.3"
-    minimalistic-assert "^1.0.1"
-
-"hashish@>=0.0.2 <0.1":
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/hashish/-/hashish-0.0.4.tgz#6d60bc6ffaf711b6afd60e426d077988014e6554"
-  integrity sha1-bWC8b/r3Ebav1g5CbQd5iAFOZVQ=
-  dependencies:
-    traverse ">=0.2.4"
-
-hmac-drbg@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
-  integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
-  dependencies:
-    hash.js "^1.0.3"
-    minimalistic-assert "^1.0.0"
-    minimalistic-crypto-utils "^1.0.1"
-
-hosted-git-info@^2.1.4, hosted-git-info@^2.6.0, hosted-git-info@^2.7.1:
-  version "2.8.9"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
-  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
-
-hpack.js@^2.1.6:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
-  integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=
-  dependencies:
-    inherits "^2.0.1"
-    obuf "^1.0.0"
-    readable-stream "^2.0.1"
-    wbuf "^1.1.0"
-
-html-entities@^1.3.1:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.4.0.tgz#cfbd1b01d2afaf9adca1b10ae7dffab98c71d2dc"
-  integrity sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==
-
-html-escaper@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
-  integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
-
-html-tags@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140"
-  integrity sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==
-
-html2canvas@^1.0.0-alpha.12:
-  version "1.0.0-rc.7"
-  resolved "https://registry.yarnpkg.com/html2canvas/-/html2canvas-1.0.0-rc.7.tgz#70c159ce0e63954a91169531894d08ad5627ac98"
-  integrity sha512-yvPNZGejB2KOyKleZspjK/NruXVQuowu8NnV2HYG7gW7ytzl+umffbtUI62v2dCHQLDdsK6HIDtyJZ0W3neerA==
-  dependencies:
-    css-line-break "1.1.1"
-
-html2canvas@^1.0.0-rc.5:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/html2canvas/-/html2canvas-1.4.1.tgz#7cef1888311b5011d507794a066041b14669a543"
-  integrity sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==
-  dependencies:
-    css-line-break "^2.1.0"
-    text-segmentation "^1.0.3"
-
-html2pdf.js@^0.9.1:
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/html2pdf.js/-/html2pdf.js-0.9.3.tgz#e7fc6143f748ce253670eaae403987342b66b15c"
-  integrity sha512-M254g3Z+ZsjtQFDxJlU6E8Zgb8xOpCBQQM1lFPn4Lq+myAdWoYtMFnwlVo/eOI9R1cG75+YmMSDQofkugwOV/Q==
-  dependencies:
-    es6-promise "^4.2.5"
-    html2canvas "^1.0.0-alpha.12"
-    jspdf "1.4.1"
-
-http-cache-semantics@^3.8.1:
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
-  integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==
-
-http-cache-semantics@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
-  integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
-
-http-deceiver@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
-  integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=
-
-http-errors@1.7.2:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
-  integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.3"
-    setprototypeof "1.1.1"
-    statuses ">= 1.5.0 < 2"
-    toidentifier "1.0.0"
-
-http-errors@~1.6.2:
-  version "1.6.3"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
-  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.3"
-    setprototypeof "1.1.0"
-    statuses ">= 1.4.0 < 2"
-
-http-errors@~1.7.2:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
-  integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.4"
-    setprototypeof "1.1.1"
-    statuses ">= 1.5.0 < 2"
-    toidentifier "1.0.0"
-
-http-parser-js@>=0.5.1:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz#01d2709c79d41698bb01d4decc5e9da4e4a033d9"
-  integrity sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==
-
-http-proxy-agent@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
-  integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==
-  dependencies:
-    agent-base "4"
-    debug "3.1.0"
-
-http-proxy-middleware@0.19.1:
-  version "0.19.1"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
-  integrity sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==
-  dependencies:
-    http-proxy "^1.17.0"
-    is-glob "^4.0.0"
-    lodash "^4.17.11"
-    micromatch "^3.1.10"
-
-http-proxy@^1.13.0, http-proxy@^1.17.0:
-  version "1.18.1"
-  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
-  integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
-  dependencies:
-    eventemitter3 "^4.0.0"
-    follow-redirects "^1.0.0"
-    requires-port "^1.0.0"
-
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
-https-browserify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
-  integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
-
-https-proxy-agent@^2.2.1, https-proxy-agent@^2.2.3:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
-  integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
-  dependencies:
-    agent-base "^4.3.0"
-    debug "^3.1.0"
-
-humanize-ms@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
-  integrity sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=
-  dependencies:
-    ms "^2.0.0"
-
-husky@^4.2.3:
-  version "4.3.8"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-4.3.8.tgz#31144060be963fd6850e5cc8f019a1dfe194296d"
-  integrity sha512-LCqqsB0PzJQ/AlCgfrfzRe3e3+NvmefAdKQhRYpxS4u6clblBoDdzzvHi8fmxKRzvMxPY/1WZWzomPZww0Anow==
-  dependencies:
-    chalk "^4.0.0"
-    ci-info "^2.0.0"
-    compare-versions "^3.6.0"
-    cosmiconfig "^7.0.0"
-    find-versions "^4.0.0"
-    opencollective-postinstall "^2.0.2"
-    pkg-dir "^5.0.0"
-    please-upgrade-node "^3.2.0"
-    slash "^3.0.0"
-    which-pm-runs "^1.0.0"
-
-iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.13, iconv-lite@^0.4.24:
-  version "0.4.24"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
-  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3"
-
-iconv-lite@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01"
-  integrity sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3.0.0"
-
-ieee754@^1.1.13, ieee754@^1.1.4:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
-  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
-
-iferr@^0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
-  integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
-
-ignore-walk@^3.0.1:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.4.tgz#c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335"
-  integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==
-  dependencies:
-    minimatch "^3.0.4"
-
-ignore@^5.1.4:
-  version "5.1.8"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
-  integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
-
-image-size@~0.5.0:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
-  integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=
-
-immediate@~3.0.5:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
-  integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
-
-import-cwd@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
-  integrity sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=
-  dependencies:
-    import-from "^2.1.0"
-
-import-fresh@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
-  integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY=
-  dependencies:
-    caller-path "^2.0.0"
-    resolve-from "^3.0.0"
-
-import-fresh@^3.2.1:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
-  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
-  dependencies:
-    parent-module "^1.0.0"
-    resolve-from "^4.0.0"
-
-import-from@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1"
-  integrity sha1-M1238qev/VOqpHHUuAId7ja387E=
-  dependencies:
-    resolve-from "^3.0.0"
-
-import-lazy@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
-  integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=
-
-import-local@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
-  integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==
-  dependencies:
-    pkg-dir "^3.0.0"
-    resolve-cwd "^2.0.0"
-
-imurmurhash@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
-
-indent-string@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
-  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
-
-indexof@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
-  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
-
-individual@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/individual/-/individual-2.0.0.tgz#833b097dad23294e76117a98fb38e0d9ad61bb97"
-  integrity sha1-gzsJfa0jKU52EXqY+zjg2a1hu5c=
-
-infer-owner@^1.0.3, infer-owner@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
-  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-inherits@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
-  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
-
-inherits@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
-
-ini@1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
-
-ini@^1.3.4, ini@~1.3.0:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
-  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
-
-injection-js@^2.2.1:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/injection-js/-/injection-js-2.4.0.tgz#ebe8871b1a349f23294eaa751bbd8209a636e754"
-  integrity sha512-6jiJt0tCAo9zjHbcwLiPL+IuNe9SQ6a9g0PEzafThW3fOQi0mrmiJGBJvDD6tmhPh8cQHIQtCOrJuBfQME4kPA==
-  dependencies:
-    tslib "^2.0.0"
-
-inquirer@6.5.1:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.1.tgz#8bfb7a5ac02dac6ff641ac4c5ff17da112fcdb42"
-  integrity sha512-uxNHBeQhRXIoHWTSNYUFhQVrHYFThIt6IVo2fFmSe8aBwdR3/w6b58hJpiL/fMukFkvGzjg+hSxFtwvVmKZmXw==
-  dependencies:
-    ansi-escapes "^4.2.1"
-    chalk "^2.4.2"
-    cli-cursor "^3.1.0"
-    cli-width "^2.0.0"
-    external-editor "^3.0.3"
-    figures "^3.0.0"
-    lodash "^4.17.15"
-    mute-stream "0.0.8"
-    run-async "^2.2.0"
-    rxjs "^6.4.0"
-    string-width "^4.1.0"
-    strip-ansi "^5.1.0"
-    through "^2.3.6"
-
-internal-ip@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
-  integrity sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==
-  dependencies:
-    default-gateway "^4.2.0"
-    ipaddr.js "^1.9.0"
-
-invariant@^2.2.2:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
-  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
-  dependencies:
-    loose-envify "^1.0.0"
-
-inversify@^5.0.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/inversify/-/inversify-5.1.1.tgz#6fbd668c591337404e005a1946bfe0d802c08730"
-  integrity sha512-j8grHGDzv1v+8T1sAQ+3boTCntFPfvxLCkNcxB1J8qA0lUN+fAlSyYd+RXKvaPRL4AGyPxViutBEJHNXOyUdFQ==
-
-invert-kv@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
-  integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
-
-ip-regex@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
-  integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
-
-ip@1.1.5, ip@^1.1.0, ip@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
-  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
-
-ipaddr.js@1.9.1, ipaddr.js@^1.9.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
-  integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
-
-is-absolute-url@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698"
-  integrity sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==
-
-is-accessor-descriptor@^0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
-  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-accessor-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
-  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
-  dependencies:
-    kind-of "^6.0.0"
-
-is-arguments@^1.0.4:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.0.tgz#62353031dfbee07ceb34656a6bde59efecae8dd9"
-  integrity sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==
-  dependencies:
-    call-bind "^1.0.0"
-
-is-arrayish@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
-
-is-arrayish@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
-  integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
-
-is-bigint@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz#ffb381442503235ad245ea89e45b3dbff040ee5a"
-  integrity sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==
-
-is-binary-path@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
-  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
-  dependencies:
-    binary-extensions "^1.0.0"
-
-is-binary-path@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
-  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
-  dependencies:
-    binary-extensions "^2.0.0"
-
-is-boolean-object@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz#3c0878f035cb821228d350d2e1e36719716a3de8"
-  integrity sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==
-  dependencies:
-    call-bind "^1.0.2"
-
-is-buffer@^1.1.5:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-
-is-callable@^1.1.4, is-callable@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e"
-  integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==
-
-is-ci@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
-  integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
-  dependencies:
-    ci-info "^2.0.0"
-
-is-core-module@^2.2.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz#8e9fc8e15027b011418026e98f0e6f4d86305cc1"
-  integrity sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==
-  dependencies:
-    has "^1.0.3"
-
-is-data-descriptor@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
-  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-data-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
-  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
-  dependencies:
-    kind-of "^6.0.0"
-
-is-date-object@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz#550cfcc03afada05eea3dd30981c7b09551f73e5"
-  integrity sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==
-
-is-descriptor@^0.1.0:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
-  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
-  dependencies:
-    is-accessor-descriptor "^0.1.6"
-    is-data-descriptor "^0.1.4"
-    kind-of "^5.0.0"
-
-is-descriptor@^1.0.0, is-descriptor@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
-  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
-  dependencies:
-    is-accessor-descriptor "^1.0.0"
-    is-data-descriptor "^1.0.0"
-    kind-of "^6.0.2"
-
-is-directory@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
-  integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
-
-is-extendable@^0.1.0, is-extendable@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
-
-is-extendable@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
-  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
-  dependencies:
-    is-plain-object "^2.0.4"
-
-is-extglob@^2.1.0, is-extglob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
-
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
-  dependencies:
-    number-is-nan "^1.0.0"
-
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
-
-is-fullwidth-code-point@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
-  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
-
-is-function@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.2.tgz#4f097f30abf6efadac9833b17ca5dc03f8144e08"
-  integrity sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==
-
-is-glob@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
-  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
-  dependencies:
-    is-extglob "^2.1.0"
-
-is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
-  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
-  dependencies:
-    is-extglob "^2.1.1"
-
-is-installed-globally@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80"
-  integrity sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=
-  dependencies:
-    global-dirs "^0.1.0"
-    is-path-inside "^1.0.0"
-
-is-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
-  integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
-
-is-negative-zero@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
-  integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
-
-is-npm@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-3.0.0.tgz#ec9147bfb629c43f494cf67936a961edec7e8053"
-  integrity sha512-wsigDr1Kkschp2opC4G3yA6r9EgVA6NjRpWzIi9axXqeIaAATPRJc4uLujXe3Nd9uO8KoDyA4MD6aZSeXTADhA==
-
-is-number-object@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz#6edfaeed7950cff19afedce9fbfca9ee6dd289eb"
-  integrity sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==
-
-is-number@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-0.1.1.tgz#69a7af116963d47206ec9bd9b48a14216f1e3806"
-  integrity sha512-la5kPULwIgkSSaZj9w7/A1uHqOBAgOhDUKQ5CkfL8LZ4Si6r4+2D0hI6b4o60MW4Uj2yNJARWIZUDPxlvOYQcw==
-
-is-number@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
-  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
-is-obj@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
-  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
-
-is-path-cwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
-  integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
-
-is-path-cwd@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
-  integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==
-
-is-path-in-cwd@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
-  integrity sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==
-  dependencies:
-    is-path-inside "^1.0.0"
-
-is-path-in-cwd@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz#bfe2dca26c69f397265a4009963602935a053acb"
-  integrity sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==
-  dependencies:
-    is-path-inside "^2.1.0"
-
-is-path-inside@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
-  integrity sha1-jvW33lBDej/cprToZe96pVy0gDY=
-  dependencies:
-    path-is-inside "^1.0.1"
-
-is-path-inside@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz#7c9810587d659a40d27bcdb4d5616eab059494b2"
-  integrity sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==
-  dependencies:
-    path-is-inside "^1.0.2"
-
-is-plain-obj@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
-  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
-
-is-plain-object@^2.0.3, is-plain-object@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
-  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
-  dependencies:
-    isobject "^3.0.1"
-
-is-reference@^1.1.2:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.2.1.tgz#8b2dac0b371f4bc994fdeaba9eb542d03002d0b7"
-  integrity sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==
-  dependencies:
-    "@types/estree" "*"
-
-is-regex@^1.0.4, is-regex@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz#d029f9aff6448b93ebbe3f33dac71511fdcbef9f"
-  integrity sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==
-  dependencies:
-    call-bind "^1.0.2"
-    has-symbols "^1.0.2"
-
-is-stream@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
-
-is-string@^1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz#3fe5d5992fb0d93404f32584d4b0179a71b54a5f"
-  integrity sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==
-
-is-symbol@^1.0.2, is-symbol@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
-  integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
-  dependencies:
-    has-symbols "^1.0.2"
-
-is-typedarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
-
-is-what@^3.12.0:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/is-what/-/is-what-3.14.1.tgz#e1222f46ddda85dead0fd1c9df131760e77755c1"
-  integrity sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==
-
-is-windows@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
-  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
-
-is-wsl@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
-  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
-
-is-yarn-global@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232"
-  integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==
-
-isarray@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
-
-isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
-
-isarray@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
-  integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=
-
-isbinaryfile@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80"
-  integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==
-  dependencies:
-    buffer-alloc "^1.2.0"
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
-
-isobject@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
-  dependencies:
-    isarray "1.0.0"
-
-isobject@^3.0.0, isobject@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
-
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
-
-istanbul-api@^2.1.6:
-  version "2.1.7"
-  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-2.1.7.tgz#82786b79f3b93d481349c7aa1e2c2b4eeb48c8a8"
-  integrity sha512-LYTOa2UrYFyJ/aSczZi/6lBykVMjCCvUmT64gOe+jPZFy4w6FYfPGqFT2IiQ2BxVHHDOvCD7qrIXb0EOh4uGWw==
-  dependencies:
-    async "^2.6.2"
-    compare-versions "^3.4.0"
-    fileset "^2.0.3"
-    istanbul-lib-coverage "^2.0.5"
-    istanbul-lib-hook "^2.0.7"
-    istanbul-lib-instrument "^3.3.0"
-    istanbul-lib-report "^2.0.8"
-    istanbul-lib-source-maps "^3.0.6"
-    istanbul-reports "^2.2.5"
-    js-yaml "^3.13.1"
-    make-dir "^2.1.0"
-    minimatch "^3.0.4"
-    once "^1.4.0"
-
-istanbul-lib-coverage@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#675f0ab69503fad4b1d849f736baaca803344f49"
-  integrity sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==
-
-istanbul-lib-coverage@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec"
-  integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==
-
-istanbul-lib-hook@^2.0.7:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-2.0.7.tgz#c95695f383d4f8f60df1f04252a9550e15b5b133"
-  integrity sha512-vrRztU9VRRFDyC+aklfLoeXyNdTfga2EI3udDGn4cZ6fpSXpHLV9X6CHvfoMCPtggg8zvDDmC4b9xfu0z6/llA==
-  dependencies:
-    append-transform "^1.0.0"
-
-istanbul-lib-instrument@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz#a5f63d91f0bbc0c3e479ef4c5de027335ec6d630"
-  integrity sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==
-  dependencies:
-    "@babel/generator" "^7.4.0"
-    "@babel/parser" "^7.4.3"
-    "@babel/template" "^7.4.0"
-    "@babel/traverse" "^7.4.3"
-    "@babel/types" "^7.4.0"
-    istanbul-lib-coverage "^2.0.5"
-    semver "^6.0.0"
-
-istanbul-lib-instrument@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d"
-  integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==
-  dependencies:
-    "@babel/core" "^7.7.5"
-    "@istanbuljs/schema" "^0.1.2"
-    istanbul-lib-coverage "^3.0.0"
-    semver "^6.3.0"
-
-istanbul-lib-report@^2.0.8:
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz#5a8113cd746d43c4889eba36ab10e7d50c9b4f33"
-  integrity sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==
-  dependencies:
-    istanbul-lib-coverage "^2.0.5"
-    make-dir "^2.1.0"
-    supports-color "^6.1.0"
-
-istanbul-lib-source-maps@^3.0.6:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz#284997c48211752ec486253da97e3879defba8c8"
-  integrity sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==
-  dependencies:
-    debug "^4.1.1"
-    istanbul-lib-coverage "^2.0.5"
-    make-dir "^2.1.0"
-    rimraf "^2.6.3"
-    source-map "^0.6.1"
-
-istanbul-reports@^2.2.5:
-  version "2.2.7"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.7.tgz#5d939f6237d7b48393cc0959eab40cd4fd056931"
-  integrity sha512-uu1F/L1o5Y6LzPVSVZXNOoD/KXpJue9aeLRd0sM9uMXfZvzomB0WxVamWb5ue8kA2vVWEmW7EG+A5n3f1kqHKg==
-  dependencies:
-    html-escaper "^2.0.0"
-
-jasmine-core@^3.3:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.7.1.tgz#0401327f6249eac993d47bbfa18d4e8efacfb561"
-  integrity sha512-DH3oYDS/AUvvr22+xUBW62m1Xoy7tUlY1tsxKEJvl5JeJ7q8zd1K5bUwiOxdH+erj6l2vAMM3hV25Xs9/WrmuQ==
-
-jasmine-core@~2.8.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
-  integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=
-
-jasmine-core@~3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.4.0.tgz#2a74618e966026530c3518f03e9f845d26473ce3"
-  integrity sha512-HU/YxV4i6GcmiH4duATwAbJQMlE0MsDIR5XmSVxURxKHn3aGAdbY1/ZJFmVRbKtnLwIxxMJD7gYaPsypcbYimg==
-
-jasmine-spec-reporter@~4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz#1d632aec0341670ad324f92ba84b4b32b35e9e22"
-  integrity sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==
-  dependencies:
-    colors "1.1.2"
-
-jasmine@2.8.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.8.0.tgz#6b089c0a11576b1f16df11b80146d91d4e8b8a3e"
-  integrity sha1-awicChFXax8W3xG4AUbZHU6Lij4=
-  dependencies:
-    exit "^0.1.2"
-    glob "^7.0.6"
-    jasmine-core "~2.8.0"
-
-jasminewd2@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-2.2.0.tgz#e37cf0b17f199cce23bea71b2039395246b4ec4e"
-  integrity sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=
-
-jest-worker@24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.9.0.tgz#5dbfdb5b2d322e98567898238a9697bcce67b3e5"
-  integrity sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==
-  dependencies:
-    merge-stream "^2.0.0"
-    supports-color "^6.1.0"
-
-jest-worker@^26.0.0:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
-  integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
-  dependencies:
-    "@types/node" "*"
-    merge-stream "^2.0.0"
-    supports-color "^7.0.0"
-
-jquery@^3.4.1:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
-  integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
-
-"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
-  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
-
-js-yaml@^3.13.1:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
-  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
-
-jsdom@^8.1.0:
-  version "8.5.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-8.5.0.tgz#d4d8f5dbf2768635b62a62823b947cf7071ebc98"
-  integrity sha1-1Nj12/J2hjW2KmKCO5R89wcevJg=
-  dependencies:
-    abab "^1.0.0"
-    acorn "^2.4.0"
-    acorn-globals "^1.0.4"
-    array-equal "^1.0.0"
-    cssom ">= 0.3.0 < 0.4.0"
-    cssstyle ">= 0.2.34 < 0.3.0"
-    escodegen "^1.6.1"
-    iconv-lite "^0.4.13"
-    nwmatcher ">= 1.3.7 < 2.0.0"
-    parse5 "^1.5.1"
-    request "^2.55.0"
-    sax "^1.1.4"
-    symbol-tree ">= 3.1.0 < 4.0.0"
-    tough-cookie "^2.2.0"
-    webidl-conversions "^3.0.1"
-    whatwg-url "^2.0.1"
-    xml-name-validator ">= 2.0.1 < 3.0.0"
-
-jsesc@^2.5.1:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
-  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
-
-jsesc@~0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
-  integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
-
-json-buffer@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
-  integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=
-
-json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
-  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
-
-json-parse-even-better-errors@^2.3.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
-  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
-
-json-schema-traverse@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
-  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
-
-json-schema@0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
-
-json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
-
-json3@^3.3.2:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
-  integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==
-
-json5@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
-  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
-  dependencies:
-    minimist "^1.2.0"
-
-json5@^2.1.0, json5@^2.1.2:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
-  integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
-  dependencies:
-    minimist "^1.2.5"
-
-jsonfile@^2.1.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
-  integrity sha1-NzaitCi4e72gzIO1P6PWM6NcKug=
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
-jsonfile@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
-  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
-jsonparse@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
-  integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
-
-jspdf@1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jspdf/-/jspdf-1.4.1.tgz#8dbd437986346d65efe20ede5361927666b8e4ca"
-  integrity sha512-2vYVdrvrQUdKKPyWHw81t1jEYYAJ6uFJ/HtTcGbI4qXIQEdl18dLEuL2wTeSv2GzeQLSgUvEvwsXsszuHK+PTw==
-  dependencies:
-    canvg "^1.0"
-    cf-blob.js "0.0.1"
-    file-saver "1.3.8"
-    omggif "1.0.7"
-    stackblur "^1.0.0"
-
-jspdf@^2.3.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/jspdf/-/jspdf-2.5.1.tgz#00c85250abf5447a05f3b32ab9935ab4a56592cc"
-  integrity sha512-hXObxz7ZqoyhxET78+XR34Xu2qFGrJJ2I2bE5w4SM8eFaFEkW2xcGRVUss360fYelwRSid/jT078kbNvmoW0QA==
-  dependencies:
-    "@babel/runtime" "^7.14.0"
-    atob "^2.1.2"
-    btoa "^1.2.1"
-    fflate "^0.4.8"
-  optionalDependencies:
-    canvg "^3.0.6"
-    core-js "^3.6.0"
-    dompurify "^2.2.0"
-    html2canvas "^1.0.0-rc.5"
-
-jsplumb@2.11.2:
-  version "2.11.2"
-  resolved "https://registry.yarnpkg.com/jsplumb/-/jsplumb-2.11.2.tgz#f8de737ea4b2551ebd95ca4b57dc096c3833e7dd"
-  integrity sha512-GyZE8l2JeZ0haOzHhsgykD8k1j5st1v2nNWaNNMqmRmGU43iuP9iBDAXDxmGNPp1t+4W++sT1SkbI8754YMtIg==
-
-jsprim@^1.2.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
-  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.2.3"
-    verror "1.10.0"
-
-jszip@^3.1.3:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.6.0.tgz#839b72812e3f97819cc13ac4134ffced95dd6af9"
-  integrity sha512-jgnQoG9LKnWO3mnVNBnfhkh0QknICd1FGSrXcgrl67zioyJ4wgx25o9ZqwNtrROSflGBCGYnJfjrIyRIby1OoQ==
-  dependencies:
-    lie "~3.3.0"
-    pako "~1.0.2"
-    readable-stream "~2.3.6"
-    set-immediate-shim "~1.0.1"
-
-karma-chrome-launcher@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-3.0.0.tgz#5c3a7f877a304e90781c28fcd9a49e334a890f42"
-  integrity sha512-u/PnVgDOP97AUe/gJeABlC6Wa6aQ83MZsm0JgsJQ5bGQ9XcXON/7b2aRhl59A62Zom+q3PFveBkczc7E1RT7TA==
-  dependencies:
-    which "^1.2.1"
-
-karma-coverage-istanbul-reporter@~2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.1.1.tgz#37a775fbfbb3cbe98cebf19605c94c6277c3b88a"
-  integrity sha512-CH8lTi8+kKXGvrhy94+EkEMldLCiUA0xMOiL31vvli9qK0T+qcXJAwWBRVJWnVWxYkTmyWar8lPz63dxX6/z1A==
-  dependencies:
-    istanbul-api "^2.1.6"
-    minimatch "^3.0.4"
-
-karma-jasmine-html-reporter@^1.4.2:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.6.0.tgz#586e17025a1b4128e9fba55d5f1e8921bfc3bc1e"
-  integrity sha512-ELO9yf0cNqpzaNLsfFgXd/wxZVYkE2+ECUwhMHUD4PZ17kcsPsYsVyjquiRqyMn2jkd2sHt0IeMyAyq1MC23Fw==
-
-karma-jasmine@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-2.0.1.tgz#26e3e31f2faf272dd80ebb0e1898914cc3a19763"
-  integrity sha512-iuC0hmr9b+SNn1DaUD2QEYtUxkS1J+bSJSn7ejdEexs7P8EYvA1CWkEdrDQ+8jVH3AgWlCNwjYsT1chjcNW9lA==
-  dependencies:
-    jasmine-core "^3.3"
-
-karma-safaritechpreview-launcher@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/karma-safaritechpreview-launcher/-/karma-safaritechpreview-launcher-0.0.6.tgz#7a841105aeb7053940e33df850edcf220eed906a"
-  integrity sha512-2QMxAGXPQ37H3KoR9SCdh0OoktQZ5MyrxkvBiZ+VVOQfYVrcyOQXGrPea0/DKvf8qoQvrvP2FHcP/BxsuxuyHw==
-  dependencies:
-    fs-promise "^0.5.0"
-    marcosc-async "^3.0.4"
-
-karma-source-map-support@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz#58526ceccf7e8730e56effd97a4de8d712ac0d6b"
-  integrity sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==
-  dependencies:
-    source-map-support "^0.5.5"
-
-karma@^3.0.0:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-3.1.4.tgz#3890ca9722b10d1d14b726e1335931455788499e"
-  integrity sha512-31Vo8Qr5glN+dZEVIpnPCxEGleqE0EY6CtC2X9TagRV3rRQ3SNrvfhddICkJgUK3AgqpeKSZau03QumTGhGoSw==
-  dependencies:
-    bluebird "^3.3.0"
-    body-parser "^1.16.1"
-    chokidar "^2.0.3"
-    colors "^1.1.0"
-    combine-lists "^1.0.0"
-    connect "^3.6.0"
-    core-js "^2.2.0"
-    di "^0.0.1"
-    dom-serialize "^2.2.0"
-    expand-braces "^0.1.1"
-    flatted "^2.0.0"
-    glob "^7.1.1"
-    graceful-fs "^4.1.2"
-    http-proxy "^1.13.0"
-    isbinaryfile "^3.0.0"
-    lodash "^4.17.5"
-    log4js "^3.0.0"
-    mime "^2.3.1"
-    minimatch "^3.0.2"
-    optimist "^0.6.1"
-    qjobs "^1.1.4"
-    range-parser "^1.2.0"
-    rimraf "^2.6.0"
-    safe-buffer "^5.0.1"
-    socket.io "2.1.1"
-    source-map "^0.6.1"
-    tmp "0.0.33"
-    useragent "2.3.0"
-
-karma@~4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-4.2.0.tgz#27e88b310cde090d016980ff5444e3a239196fca"
-  integrity sha512-fmCuxN1rwJxTdZfOXK5LjlmS4Ana/OvzNMpkyLL/TLE8hmgSkpVpMYQ7RTVa8TNKRVQDZNl5W1oF5cfKfgIMlA==
-  dependencies:
-    bluebird "^3.3.0"
-    body-parser "^1.16.1"
-    braces "^3.0.2"
-    chokidar "^3.0.0"
-    colors "^1.1.0"
-    connect "^3.6.0"
-    core-js "^3.1.3"
-    di "^0.0.1"
-    dom-serialize "^2.2.0"
-    flatted "^2.0.0"
-    glob "^7.1.1"
-    graceful-fs "^4.1.2"
-    http-proxy "^1.13.0"
-    isbinaryfile "^3.0.0"
-    lodash "^4.17.11"
-    log4js "^4.0.0"
-    mime "^2.3.1"
-    minimatch "^3.0.2"
-    optimist "^0.6.1"
-    qjobs "^1.1.4"
-    range-parser "^1.2.0"
-    rimraf "^2.6.0"
-    safe-buffer "^5.0.1"
-    socket.io "2.1.1"
-    source-map "^0.6.1"
-    tmp "0.0.33"
-    useragent "2.3.0"
-
-keycharm@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/keycharm/-/keycharm-0.2.0.tgz#fa6ea2e43b90a68028843d27f2075d35a8c3e6f9"
-  integrity sha1-+m6i5DuQpoAohD0n8gddNajD5vk=
-
-keycloak-angular@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/keycloak-angular/-/keycloak-angular-6.1.0.tgz#41d7c29d57bffddfea75e3e44c27e7e666e57398"
-  integrity sha512-TT3h6nWIXRf3u3NcEC25KBvgnZufpHaOKNfUUvt9Jk4p6zrDiKXxSIS8y+B1hg0kUhVsxzjXgSVngry39jljYw==
-  dependencies:
-    keycloak-js "^4.8.3"
-    tslib "^1.9.0"
-
-keycloak-js@^4.8.3:
-  version "4.8.3"
-  resolved "https://registry.yarnpkg.com/keycloak-js/-/keycloak-js-4.8.3.tgz#e065f41d144d260afa8466b5b587a65d5f308d30"
-  integrity sha512-TXoZdoOYu2ScYs58L95/xSYjsTto9KRvZ+vt6mv4Dyf4pYhYZSgwMPnmi128qj/z8sm4mL1Z8nncR6XdWgNKMQ==
-
-keycode@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.2.0.tgz#3d0af56dc7b8b8e5cba8d0a97f107204eec22b04"
-  integrity sha1-PQr1bce4uOXLqNCpfxByBO7CKwQ=
-
-keyv@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
-  integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==
-  dependencies:
-    json-buffer "3.0.0"
-
-killable@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
-  integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
-
-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
-  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
-  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
-
-kind-of@^6.0.0, kind-of@^6.0.2:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
-  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
-
-klaw@^1.0.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
-  integrity sha1-QIhDO0azsbolnXh4XY6W9zugJDk=
-  optionalDependencies:
-    graceful-fs "^4.1.9"
-
-latest-version@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face"
-  integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==
-  dependencies:
-    package-json "^6.3.0"
-
-lcid@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
-  integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==
-  dependencies:
-    invert-kv "^2.0.0"
-
-less-loader@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-5.0.0.tgz#498dde3a6c6c4f887458ee9ed3f086a12ad1b466"
-  integrity sha512-bquCU89mO/yWLaUq0Clk7qCsKhsF/TZpJUzETRvJa9KSVEL9SO3ovCvdEHISBhrC81OwC8QSVX7E0bzElZj9cg==
-  dependencies:
-    clone "^2.1.1"
-    loader-utils "^1.1.0"
-    pify "^4.0.1"
-
-less-plugin-npm-import@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/less-plugin-npm-import/-/less-plugin-npm-import-2.1.0.tgz#823e6986c93318a98171ca858848b6bead55bf3e"
-  integrity sha1-gj5phskzGKmBccqFiEi2vq1Vvz4=
-  dependencies:
-    promise "~7.0.1"
-    resolve "~1.1.6"
-
-less@3.9.0:
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/less/-/less-3.9.0.tgz#b7511c43f37cf57dc87dffd9883ec121289b1474"
-  integrity sha512-31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w==
-  dependencies:
-    clone "^2.1.2"
-  optionalDependencies:
-    errno "^0.1.1"
-    graceful-fs "^4.1.2"
-    image-size "~0.5.0"
-    mime "^1.4.1"
-    mkdirp "^0.5.0"
-    promise "^7.1.1"
-    request "^2.83.0"
-    source-map "~0.6.0"
-
-less@^3.8.0:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/less/-/less-3.13.1.tgz#0ebc91d2a0e9c0c6735b83d496b0ab0583077909"
-  integrity sha512-SwA1aQXGUvp+P5XdZslUOhhLnClSLIjWvJhmd+Vgib5BFIr9lMNlQwmwUNOjXThF/A0x+MCYYPeWEfeWiLRnTw==
-  dependencies:
-    copy-anything "^2.0.1"
-    tslib "^1.10.0"
-  optionalDependencies:
-    errno "^0.1.1"
-    graceful-fs "^4.1.2"
-    image-size "~0.5.0"
-    make-dir "^2.1.0"
-    mime "^1.4.1"
-    native-request "^1.0.5"
-    source-map "~0.6.0"
-
-leven@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
-  integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
-
-levenary@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/levenary/-/levenary-1.1.1.tgz#842a9ee98d2075aa7faeedbe32679e9205f46f77"
-  integrity sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==
-  dependencies:
-    leven "^3.1.0"
-
-levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
-  dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-
-license-webpack-plugin@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.1.2.tgz#63f7c571537a450ec47dc98f5d5ffdbca7b3b14f"
-  integrity sha512-7poZHRla+ae0eEButlwMrPpkXyhNVBf2EHePYWT0jyLnI6311/OXJkTI2sOIRungRpQgU2oDMpro5bSFPT5F0A==
-  dependencies:
-    "@types/webpack-sources" "^0.1.5"
-    webpack-sources "^1.2.0"
-
-lie@~3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a"
-  integrity sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==
-  dependencies:
-    immediate "~3.0.5"
-
-lines-and-columns@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
-  integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
-
-loader-runner@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
-  integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
-
-loader-utils@1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
-  integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
-  dependencies:
-    big.js "^5.2.2"
-    emojis-list "^2.0.0"
-    json5 "^1.0.1"
-
-loader-utils@^1.0.0, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
-  integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
-  dependencies:
-    big.js "^5.2.2"
-    emojis-list "^3.0.0"
-    json5 "^1.0.1"
-
-loader-utils@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0"
-  integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==
-  dependencies:
-    big.js "^5.2.2"
-    emojis-list "^3.0.0"
-    json5 "^2.1.2"
-
-locate-path@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
-  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
-  dependencies:
-    p-locate "^3.0.0"
-    path-exists "^3.0.0"
-
-locate-path@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
-  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
-  dependencies:
-    p-locate "^4.1.0"
-
-locate-path@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
-  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
-  dependencies:
-    p-locate "^5.0.0"
-
-lodash.clonedeep@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
-  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
-
-lodash.isequal@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
-  integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
-
-lodash.toarray@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz#24c4bfcd6b2fba38bfd0594db1179d8e9b656561"
-  integrity sha1-JMS/zWsvuji/0FlNsRedjptlZWE=
-
-lodash@4.17.21, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.5, lodash@^4.5.0:
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
-  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
-
-lodash@^3.10.1:
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
-  integrity sha512-9mDDwqVIma6OZX79ZlDACZl8sBm0TEnkf99zV3iMA4GzkIT/9hiqP5mY0HoT1iNLCrKc/R1HByV+yJfRWVJryQ==
-
-log4js@^3.0.0:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/log4js/-/log4js-3.0.6.tgz#e6caced94967eeeb9ce399f9f8682a4b2b28c8ff"
-  integrity sha512-ezXZk6oPJCWL483zj64pNkMuY/NcRX5MPiB0zE6tjZM137aeusrOnW1ecxgF9cmwMWkBMhjteQxBPoZBh9FDxQ==
-  dependencies:
-    circular-json "^0.5.5"
-    date-format "^1.2.0"
-    debug "^3.1.0"
-    rfdc "^1.1.2"
-    streamroller "0.7.0"
-
-log4js@^4.0.0:
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/log4js/-/log4js-4.5.1.tgz#e543625e97d9e6f3e6e7c9fc196dd6ab2cae30b5"
-  integrity sha512-EEEgFcE9bLgaYUKuozyFfytQM2wDHtXn4tAN41pkaxpNjAykv11GVdeI4tHtmPWW4Xrgh9R/2d7XYghDVjbKKw==
-  dependencies:
-    date-format "^2.0.0"
-    debug "^4.1.1"
-    flatted "^2.0.0"
-    rfdc "^1.1.4"
-    streamroller "^1.0.6"
-
-loglevel@^1.6.8:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197"
-  integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==
-
-loose-envify@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
-  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
-  dependencies:
-    js-tokens "^3.0.0 || ^4.0.0"
-
-lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
-  integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
-
-lowercase-keys@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
-  integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
-
-lru-cache@4.1.x, lru-cache@^4.0.1:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
-  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
-  dependencies:
-    pseudomap "^1.0.2"
-    yallist "^2.1.2"
-
-lru-cache@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
-  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
-  dependencies:
-    yallist "^3.0.2"
-
-lru-cache@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
-  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
-  dependencies:
-    yallist "^4.0.0"
-
-m3u8-parser@4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/m3u8-parser/-/m3u8-parser-4.3.0.tgz#4b4e988f87b6d8b2401d209a1d17798285a9da04"
-  integrity sha512-bVbjuBMoVIgFL1vpXVIxjeaoB5TPDJRb0m5qiTdM738SGqv/LAmsnVVPlKjM4fulm/rr1XZsKM+owHm+zvqxYA==
-  dependencies:
-    global "^4.3.2"
-
-m3u8-parser@4.5.2:
-  version "4.5.2"
-  resolved "https://registry.yarnpkg.com/m3u8-parser/-/m3u8-parser-4.5.2.tgz#f7d48a60112466e528324624c4e66d52ed341a75"
-  integrity sha512-sN/lu3TiRxmG2RFjZxo5c0/7Dr4RrEztl43jXrWwj5gFZ7vfa2iIxGfiPx485dm5QCazaIcKk+vNkUso8Aq0Ag==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    "@videojs/vhs-utils" "^3.0.0"
-    global "^4.4.0"
-
-magic-string@0.25.3:
-  version "0.25.3"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.3.tgz#34b8d2a2c7fec9d9bdf9929a3fd81d271ef35be9"
-  integrity sha512-6QK0OpF/phMz0Q2AxILkX2mFhi7m+WMwTRg0LQKq/WBB0cDP4rYH3Wp4/d3OTXlrPLVJT/RFqj8tFeAR4nk8AA==
-  dependencies:
-    sourcemap-codec "^1.4.4"
-
-magic-string@^0.25.0, magic-string@^0.25.2:
-  version "0.25.7"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051"
-  integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==
-  dependencies:
-    sourcemap-codec "^1.4.4"
-
-make-dir@^1.0.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
-  integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
-  dependencies:
-    pify "^3.0.0"
-
-make-dir@^2.0.0, make-dir@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
-  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
-  dependencies:
-    pify "^4.0.1"
-    semver "^5.6.0"
-
-make-dir@^3.0.0, make-dir@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
-  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
-  dependencies:
-    semver "^6.0.0"
-
-make-error@^1.1.1:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
-  integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
-
-make-fetch-happen@^5.0.0:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz#aa8387104f2687edca01c8687ee45013d02d19bd"
-  integrity sha512-07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag==
-  dependencies:
-    agentkeepalive "^3.4.1"
-    cacache "^12.0.0"
-    http-cache-semantics "^3.8.1"
-    http-proxy-agent "^2.1.0"
-    https-proxy-agent "^2.2.3"
-    lru-cache "^5.1.1"
-    mississippi "^3.0.0"
-    node-fetch-npm "^2.0.2"
-    promise-retry "^1.1.1"
-    socks-proxy-agent "^4.0.0"
-    ssri "^6.0.0"
-
-mamacro@^0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
-  integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==
-
-map-age-cleaner@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
-  integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
-  dependencies:
-    p-defer "^1.0.0"
-
-map-cache@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
-  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
-
-map-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
-  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
-  dependencies:
-    object-visit "^1.0.0"
-
-marcosc-async@^3.0.4:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/marcosc-async/-/marcosc-async-3.0.5.tgz#41e6d56c656c811859d34b97a0a26093f71dc360"
-  integrity sha1-QebVbGVsgRhZ00uXoKJgk/cdw2A=
-
-material-icons@^0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/material-icons/-/material-icons-0.7.1.tgz#30e4f9217f9aa78056e5c2617b36a177ac6db8e4"
-  integrity sha512-MV4qSDR0clISvUQK9d8PyktN0IAr1l2SJw8yDejBu8Ev+Xhh+kgnmVxYGgp4nRyGr495LeCGx7Nv4L+ZoJ7tvQ==
-
-md5.js@^1.3.4:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
-  integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==
-  dependencies:
-    hash-base "^3.0.0"
-    inherits "^2.0.1"
-    safe-buffer "^5.1.2"
-
-media-typer@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
-  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
-
-mem@^4.0.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
-  integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==
-  dependencies:
-    map-age-cleaner "^0.1.1"
-    mimic-fn "^2.0.0"
-    p-is-promise "^2.0.0"
-
-memory-fs@^0.4.0, memory-fs@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
-  integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
-  dependencies:
-    errno "^0.1.3"
-    readable-stream "^2.0.1"
-
-memory-fs@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c"
-  integrity sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==
-  dependencies:
-    errno "^0.1.3"
-    readable-stream "^2.0.1"
-
-merge-descriptors@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
-  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
-
-merge-source-map@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646"
-  integrity sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==
-  dependencies:
-    source-map "^0.6.1"
-
-merge-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
-  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
-
-merge2@^1.3.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
-  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
-
-methods@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
-  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
-
-micromatch@^3.1.10, micromatch@^3.1.4:
-  version "3.1.10"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
-  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    braces "^2.3.1"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    extglob "^2.0.4"
-    fragment-cache "^0.2.1"
-    kind-of "^6.0.2"
-    nanomatch "^1.2.9"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.2"
-
-micromatch@^4.0.2:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
-  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
-  dependencies:
-    braces "^3.0.1"
-    picomatch "^2.2.3"
-
-miller-rabin@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
-  integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==
-  dependencies:
-    bn.js "^4.0.0"
-    brorand "^1.0.1"
-
-mime-db@1.47.0, "mime-db@>= 1.43.0 < 2":
-  version "1.47.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz#8cb313e59965d3c05cfbf898915a267af46a335c"
-  integrity sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==
-
-mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
-  version "2.1.30"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz#6e7be8b4c479825f85ed6326695db73f9305d62d"
-  integrity sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==
-  dependencies:
-    mime-db "1.47.0"
-
-mime@1.6.0, mime@^1.4.1:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
-  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
-
-mime@^2.3.1, mime@^2.4.4:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe"
-  integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==
-
-mimic-fn@^2.0.0, mimic-fn@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
-  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
-
-mimic-response@^1.0.0, mimic-response@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
-  integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
-
-min-document@^2.19.0:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685"
-  integrity sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=
-  dependencies:
-    dom-walk "^0.1.0"
-
-mini-css-extract-plugin@0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.8.0.tgz#81d41ec4fe58c713a96ad7c723cdb2d0bd4d70e1"
-  integrity sha512-MNpRGbNA52q6U92i0qbVpQNsgk7LExy41MdAlG84FeytfDOtRIf/mCHdEgG8rpTKOaNKiqUnZdlptF469hxqOw==
-  dependencies:
-    loader-utils "^1.1.0"
-    normalize-url "1.9.1"
-    schema-utils "^1.0.0"
-    webpack-sources "^1.1.0"
-
-minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
-  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
-
-minimalistic-crypto-utils@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
-  integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
-
-minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
-
-minimist@~0.0.1:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-  integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
-
-minipass-collect@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
-  integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-flush@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
-  integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-pipeline@^1.2.2:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
-  integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass@^2.3.5, minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
-  integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
-  dependencies:
-    safe-buffer "^5.1.2"
-    yallist "^3.0.0"
-
-minipass@^3.0.0, minipass@^3.1.1:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd"
-  integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==
-  dependencies:
-    yallist "^4.0.0"
-
-minizlib@^1.2.1:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
-  integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
-  dependencies:
-    minipass "^2.9.0"
-
-minizlib@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
-  integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
-  dependencies:
-    minipass "^3.0.0"
-    yallist "^4.0.0"
-
-mississippi@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
-  integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==
-  dependencies:
-    concat-stream "^1.5.0"
-    duplexify "^3.4.2"
-    end-of-stream "^1.1.0"
-    flush-write-stream "^1.0.0"
-    from2 "^2.1.0"
-    parallel-transform "^1.1.0"
-    pump "^3.0.0"
-    pumpify "^1.3.3"
-    stream-each "^1.1.0"
-    through2 "^2.0.0"
-
-mixin-deep@^1.2.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
-  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
-  dependencies:
-    for-in "^1.0.2"
-    is-extendable "^1.0.1"
-
-mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.5:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
-  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
-  dependencies:
-    minimist "^1.2.5"
-
-mkdirp@^1.0.3, mkdirp@^1.0.4, mkdirp@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-
-mock-require@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/mock-require/-/mock-require-3.0.3.tgz#ccd544d9eae81dd576b3f219f69ec867318a1946"
-  integrity sha512-lLzfLHcyc10MKQnNUCv7dMcoY/2Qxd6wJfbqCcVk3LDb8An4hF6ohk5AztrvgKhJCqj36uyzi/p5se+tvyD+Wg==
-  dependencies:
-    get-caller-file "^1.0.2"
-    normalize-path "^2.1.1"
-
-moment@2.24.0:
-  version "2.24.0"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
-  integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
-
-moment@>=2.13.0, moment@^2.10.2, moment@^2.24.0, moment@^2.29.1:
-  version "2.29.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
-  integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
-
-move-concurrently@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
-  integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=
-  dependencies:
-    aproba "^1.1.1"
-    copy-concurrently "^1.0.0"
-    fs-write-stream-atomic "^1.0.8"
-    mkdirp "^0.5.1"
-    rimraf "^2.5.4"
-    run-queue "^1.0.3"
-
-mpd-parser@0.15.4:
-  version "0.15.4"
-  resolved "https://registry.yarnpkg.com/mpd-parser/-/mpd-parser-0.15.4.tgz#e1b445d0dc2aab1389fde6420ca9cca7c999575d"
-  integrity sha512-YcOclxKc5gnT87UQYwRoPJpWOFvQORwN+bXYmTWCJ4U2pCSS7jjtPrIhoOLHFAyekj48CHTX4hjGBV/VSNsUsg==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    "@videojs/vhs-utils" "^3.0.0"
-    global "^4.4.0"
-    xmldom "^0.4.0"
-
-mpd-parser@0.8.1:
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/mpd-parser/-/mpd-parser-0.8.1.tgz#db299dbec337999fbbbace989d227c7b03dc8ea7"
-  integrity sha512-WBTJ1bKk8OLUIxBh6s1ju1e2yz/5CzhPbgi6P3F3kJHKhGy1Z+ElvEnuzEbtC/dnbRcJtMXazE3f93N5LLdp9Q==
-  dependencies:
-    global "^4.3.2"
-    url-toolkit "^2.1.1"
-
-mrmime@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-1.0.1.tgz#5f90c825fad4bdd41dc914eff5d1a8cfdaf24f27"
-  integrity sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-
-ms@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
-
-ms@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-ms@^2.0.0, ms@^2.1.1:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
-  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
-
-multicast-dns-service-types@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
-  integrity sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=
-
-multicast-dns@^6.0.1:
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229"
-  integrity sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==
-  dependencies:
-    dns-packet "^1.3.1"
-    thunky "^1.0.2"
-
-mustache@^3.0.2:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/mustache/-/mustache-3.2.1.tgz#89e78a9d207d78f2799b1e95764a25bf71a28322"
-  integrity sha512-RERvMFdLpaFfSRIEe632yDm5nsd0SDKn8hGmcUwswnyiE5mtdZLDybtHAz6hjJhawokF0hXvGLtx9mrQfm6FkA==
-
-mute-stream@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
-  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
-
-mux.js@5.1.3:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/mux.js/-/mux.js-5.1.3.tgz#1a59b8979a6780be5bcb63983c7e883c90cd615b"
-  integrity sha512-FhDcysLvAkO9H8ftBJ2sK1O4Rmz0AWnMS+2uqP7WjrnaAyE/ox11GEiZkRzrWIdp8at9R9qBHDqdURY3/h/xTg==
-
-mux.js@5.10.0:
-  version "5.10.0"
-  resolved "https://registry.yarnpkg.com/mux.js/-/mux.js-5.10.0.tgz#80fb30f9233c7902cac5cc8e1ae5f19e91cf8477"
-  integrity sha512-kLzvYsHYBwNa+ckkmpxWV3eImwntJbrwd1KbN4WR0hLe+dK/KB82aCuC0fQzAI2hkjYszdlSGsAWFgYdiFBUuA==
-  dependencies:
-    "@babel/runtime" "^7.11.2"
-
-mux.js@^5.9.2:
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/mux.js/-/mux.js-5.11.0.tgz#3c2c1fbd9d30720af2a1b12c1f2a2840c63100f6"
-  integrity sha512-Q/iLfohHh5Pp6lW7EFtcxNuaCNJ3Ruywfy46pWLsY+yIxR1kXXImYY1wOhg8jLdBMs1kRaZqsiB4Zncsiw0a2Q==
-  dependencies:
-    "@babel/runtime" "^7.11.2"
-
-mz@^2.3.1:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
-  integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==
-  dependencies:
-    any-promise "^1.0.0"
-    object-assign "^4.0.1"
-    thenify-all "^1.0.0"
-
-nan@^2.12.1:
-  version "2.14.2"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
-  integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==
-
-nanomatch@^1.2.9:
-  version "1.2.13"
-  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
-  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    fragment-cache "^0.2.1"
-    is-windows "^1.0.2"
-    kind-of "^6.0.2"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-native-request@^1.0.5:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/native-request/-/native-request-1.0.8.tgz#8f66bf606e0f7ea27c0e5995eb2f5d03e33ae6fb"
-  integrity sha512-vU2JojJVelUGp6jRcLwToPoWGxSx23z/0iX+I77J3Ht17rf2INGjrhOoQnjVo60nQd8wVsgzKkPfRXBiVdD2ag==
-
-negotiator@0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
-  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
-
-neo-async@^2.5.0, neo-async@^2.6.1:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
-  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
-
-ng-circle-progress@1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/ng-circle-progress/-/ng-circle-progress-1.5.1.tgz#ea4ea89318754b929dc1550d5779e391d7c5c646"
-  integrity sha512-gJ0SdWc+TkXckfbhbvUY522yjya3qcc1a3lGvvVyLsUfSOgll8LQaZGDEko84d8dk8vYO83n0O5vP+e8bJTInQ==
-  dependencies:
-    tslib "^1.9.0"
-
-ng-packagr@^5.4.3:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-5.7.1.tgz#8e082e38e7b6089296bf0491f2e5b29122f8e08d"
-  integrity sha512-NDAUcMtLyZnF3bP6JtC3ANpIQRclRDPilF7C0DsjQuIz1q0V3mT7f1PwV0jnRWy8iRpSZmJZr6AGl736gloHtQ==
-  dependencies:
-    ajv "^6.10.2"
-    autoprefixer "^9.6.0"
-    browserslist "^4.0.0"
-    chalk "^2.3.1"
-    chokidar "^3.0.0"
-    clean-css "^4.1.11"
-    commander "^3.0.0"
-    fs-extra "^8.0.0"
-    glob "^7.1.2"
-    injection-js "^2.2.1"
-    less "^3.8.0"
-    less-plugin-npm-import "^2.1.0"
-    node-sass-tilde-importer "^1.0.0"
-    postcss "^7.0.0"
-    postcss-url "^8.0.0"
-    read-pkg-up "^5.0.0"
-    rimraf "^3.0.0"
-    rollup "1.25.2"
-    rollup-plugin-commonjs "^10.0.0"
-    rollup-plugin-json "^4.0.0"
-    rollup-plugin-node-resolve "^5.0.0"
-    rollup-plugin-sourcemaps "^0.4.2"
-    rxjs "^6.0.0"
-    sass "^1.17.3"
-    stylus "^0.54.5"
-    terser "^4.1.2"
-    update-notifier "^3.0.0"
-
-ng2-ace-editor@^0.3.9:
-  version "0.3.9"
-  resolved "https://registry.yarnpkg.com/ng2-ace-editor/-/ng2-ace-editor-0.3.9.tgz#5ae68712e9ca49591eda31df8fe02eca1c3634e1"
-  integrity sha512-e8Q4YCirlL/OEiekewmzupG+zV3prYsiYmQnRzQzd0wNgsPjOLOdb0it7cCbzFfIXKGyIIHKTW5584WxPr2LnQ==
-  dependencies:
-    ace-builds "^1.4.2"
-    brace "^0.11.1"
-
-ng2-charts@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/ng2-charts/-/ng2-charts-2.3.0.tgz#e4dd1f7fe12dc2635d5e8c4f101a8d4c4f433754"
-  integrity sha512-D5K7OqF0m5lOBYvNOsraoEo4OPHja9zfGNj+HWy2nUcP0LP2s+Y/QaQlkG/1rHlwXq9HPm8rLxzSutA0eLHxGQ==
-  dependencies:
-    "@types/chart.js" "^2.7.48"
-    lodash "^4.17.11"
-    tslib "^1.9.0"
-
-ng2-ckeditor@1.2.6:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/ng2-ckeditor/-/ng2-ckeditor-1.2.6.tgz#be5dc7872846e329f61d5b0d6ce084045044ab7f"
-  integrity sha512-/bw0ZzVBvHUrFrXFeP08XKSsIX67M85rTiZkcphn0kpripAj13JvX/l/SQ74Kfk5K226Y3c+rONDj6OtfZH0kA==
-  dependencies:
-    tslib "^1.9.0"
-
-ng2-pdf-viewer@6.4.1:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/ng2-pdf-viewer/-/ng2-pdf-viewer-6.4.1.tgz#c84e7e4c6db9d759ebc6969ec60b5fc0c3e7fe16"
-  integrity sha512-A8R9SGa2bu4n+mtagGX8DqBrVAbuROrEgcAOQwCdciYTLAq9EFGEB8TCQZpjvYVaFTNwjKWTMTjFQVEorjbLeQ==
-  dependencies:
-    "@types/pdfjs-dist" "~2.1.7"
-    pdfjs-dist "~2.5.207"
-    tslib "^1.10.0"
-
-ng2-search-filter@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/ng2-search-filter/-/ng2-search-filter-0.5.1.tgz#6d5f4e26bd2b2c8c8cc4aad658aabae6a33fb4af"
-  integrity sha512-noN8R+Gyxo5ZuboEOvq+u0zKio6pEf1IVYQTCZfAfXm6ONmzWu/M2xK0di9oVUprDbPBQXCGUuvD5i2GD+35HA==
-
-ngx-export-as@1.4.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/ngx-export-as/-/ngx-export-as-1.4.2.tgz#6fb20ae104225f4a1449c1eea9c1a9ccbdc32a50"
-  integrity sha512-oKYYaj385Hazvsva4hrxSqo5/tU1SIJsfQy6jsfjPCAWbVI6p/18z2CRcrhvqd0zH0aE/fD55s6etJ2OnMxkag==
-  dependencies:
-    html2pdf.js "^0.9.1"
-    rxjs "~6.3.3"
-    xlsx "^0.14.0"
-
-ngx-image-cropper@^3.0.3:
-  version "3.3.5"
-  resolved "https://registry.yarnpkg.com/ngx-image-cropper/-/ngx-image-cropper-3.3.5.tgz#39f636e3989c5c84241f5130d0124ded6631fbeb"
-  integrity sha512-0yRVKG5XAbVo3rOaj/iFDlekGsxEqXKU9iXFbjyvHvRT2DFs+AjwtyvINsHCWw+4ed9yA4Y+wLIUNqzA0bfxLw==
-  dependencies:
-    tslib "^1.9.0"
-
-ngx-pagination@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/ngx-pagination/-/ngx-pagination-5.1.0.tgz#b09ad72c20283b392fb9ea457ec2d4825e149358"
-  integrity sha512-GDI5GwmYIaeLu3hW3tgdIw/LXOzLj05PjVhtf2Ze63QsJ6zhZ7g5tg6S4EhhuUOdbMdXWyOng/uMVZwbYpi0Eg==
-
-ngx-quill@^7.1.2:
-  version "7.3.12"
-  resolved "https://registry.yarnpkg.com/ngx-quill/-/ngx-quill-7.3.12.tgz#3321f005f729507577dc9b130d9334ebddd67fdc"
-  integrity sha512-A49Q5KvBtzTRc+hmjzpvPkar1hOoaeGKEispeQ91yUaIB95fjzykx6SqWtcBmGFckNllCOIQV9iel9+RCnd+8Q==
-  dependencies:
-    tslib "^1.9.0"
-
-ngx-take-until-destroy@5.4.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/ngx-take-until-destroy/-/ngx-take-until-destroy-5.4.0.tgz#6c8606ee956584dc947e2eb609c48b8f98b09900"
-  integrity sha512-e+VfCrHbLybdKWoQ8prdhmVzWI6vTnedr/9cVGQTkfepMdLz5D++VDk+Wnbs7mru6S9C+kIpNWUlh2YMPl928Q==
-  dependencies:
-    tslib "^1.9.0"
-
-nice-try@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
-  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
-
-node-emoji@^1.8.1:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.10.0.tgz#8886abd25d9c7bb61802a658523d1f8d2a89b2da"
-  integrity sha512-Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw==
-  dependencies:
-    lodash.toarray "^4.4.0"
-
-node-ensure@^0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/node-ensure/-/node-ensure-0.0.0.tgz#ecae764150de99861ec5c810fd5d096b183932a7"
-  integrity sha1-7K52QVDemYYexcgQ/V0Jaxg5Mqc=
-
-node-fetch-npm@^2.0.2:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.4.tgz#6507d0e17a9ec0be3bec516958a497cec54bf5a4"
-  integrity sha512-iOuIQDWDyjhv9qSDrj9aq/klt6F9z1p2otB3AV7v3zBDcL/x+OfGsvGQZZCcMZbUf4Ujw1xGNQkjvGnVT22cKg==
-  dependencies:
-    encoding "^0.1.11"
-    json-parse-better-errors "^1.0.0"
-    safe-buffer "^5.1.1"
-
-node-forge@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
-  integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
-
-node-libs-browser@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425"
-  integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==
-  dependencies:
-    assert "^1.1.1"
-    browserify-zlib "^0.2.0"
-    buffer "^4.3.0"
-    console-browserify "^1.1.0"
-    constants-browserify "^1.0.0"
-    crypto-browserify "^3.11.0"
-    domain-browser "^1.1.1"
-    events "^3.0.0"
-    https-browserify "^1.0.0"
-    os-browserify "^0.3.0"
-    path-browserify "0.0.1"
-    process "^0.11.10"
-    punycode "^1.2.4"
-    querystring-es3 "^0.2.0"
-    readable-stream "^2.3.3"
-    stream-browserify "^2.0.1"
-    stream-http "^2.7.2"
-    string_decoder "^1.0.0"
-    timers-browserify "^2.0.4"
-    tty-browserify "0.0.0"
-    url "^0.11.0"
-    util "^0.11.0"
-    vm-browserify "^1.0.1"
-
-node-releases@^1.1.52, node-releases@^1.1.71:
-  version "1.1.71"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"
-  integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==
-
-node-sass-tilde-importer@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/node-sass-tilde-importer/-/node-sass-tilde-importer-1.0.2.tgz#1a15105c153f648323b4347693fdb0f331bad1ce"
-  integrity sha512-Swcmr38Y7uB78itQeBm3mThjxBy9/Ah/ykPIaURY/L6Nec9AyRoL/jJ7ECfMR+oZeCTVQNxVMu/aHU+TLRVbdg==
-  dependencies:
-    find-parent-dir "^0.3.0"
-
-normalize-package-data@^2.0.0, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
-  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
-  dependencies:
-    hosted-git-info "^2.1.4"
-    resolve "^1.10.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
-
-normalize-path@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
-  dependencies:
-    remove-trailing-separator "^1.0.1"
-
-normalize-path@^3.0.0, normalize-path@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
-  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
-
-normalize-range@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
-  integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
-
-normalize-url@1.9.1:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
-  integrity sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=
-  dependencies:
-    object-assign "^4.0.1"
-    prepend-http "^1.0.0"
-    query-string "^4.1.0"
-    sort-keys "^1.0.0"
-
-normalize-url@^4.1.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129"
-  integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==
-
-normalize.css@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-8.0.1.tgz#9b98a208738b9cc2634caacbc42d131c97487bf3"
-  integrity sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg==
-
-nosleep.js@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/nosleep.js/-/nosleep.js-0.7.0.tgz#cfd919c25523ca0d0f4a69fb3305c083adaee289"
-  integrity sha1-z9kZwlUjyg0PSmn7MwXAg62u4ok=
-
-npm-bundled@^1.0.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.2.tgz#944c78789bd739035b70baa2ca5cc32b8d860bc1"
-  integrity sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==
-  dependencies:
-    npm-normalize-package-bin "^1.0.1"
-
-npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
-  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
-
-npm-package-arg@6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.0.tgz#15ae1e2758a5027efb4c250554b85a737db7fcc1"
-  integrity sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==
-  dependencies:
-    hosted-git-info "^2.6.0"
-    osenv "^0.1.5"
-    semver "^5.5.0"
-    validate-npm-package-name "^3.0.0"
-
-npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.1.tgz#02168cb0a49a2b75bf988a28698de7b529df5cb7"
-  integrity sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==
-  dependencies:
-    hosted-git-info "^2.7.1"
-    osenv "^0.1.5"
-    semver "^5.6.0"
-    validate-npm-package-name "^3.0.0"
-
-npm-packlist@^1.1.12:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
-  integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
-  dependencies:
-    ignore-walk "^3.0.1"
-    npm-bundled "^1.0.1"
-    npm-normalize-package-bin "^1.0.1"
-
-npm-pick-manifest@3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-3.0.2.tgz#f4d9e5fd4be2153e5f4e5f9b7be8dc419a99abb7"
-  integrity sha512-wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw==
-  dependencies:
-    figgy-pudding "^3.5.1"
-    npm-package-arg "^6.0.0"
-    semver "^5.4.1"
-
-npm-pick-manifest@^2.2.3:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz#32111d2a9562638bb2c8f2bf27f7f3092c8fae40"
-  integrity sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==
-  dependencies:
-    figgy-pudding "^3.5.1"
-    npm-package-arg "^6.0.0"
-    semver "^5.4.1"
-
-npm-registry-fetch@^4.0.0:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-4.0.7.tgz#57951bf6541e0246b34c9f9a38ab73607c9449d7"
-  integrity sha512-cny9v0+Mq6Tjz+e0erFAB+RYJ/AVGzkjnISiobqP8OWj9c9FLoZZu8/SPSKJWE17F1tk4018wfjV+ZbIbqC7fQ==
-  dependencies:
-    JSONStream "^1.3.4"
-    bluebird "^3.5.1"
-    figgy-pudding "^3.4.1"
-    lru-cache "^5.1.1"
-    make-fetch-happen "^5.0.0"
-    npm-package-arg "^6.1.0"
-    safe-buffer "^5.2.0"
-
-npm-run-path@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
-  dependencies:
-    path-key "^2.0.0"
-
-num2fraction@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
-  integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
-
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
-
-"nwmatcher@>= 1.3.7 < 2.0.0":
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.4.tgz#2285631f34a95f0d0395cd900c96ed39b58f346e"
-  integrity sha512-3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ==
-
-oauth-sign@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
-
-object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
-
-object-component@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
-  integrity sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=
-
-object-copy@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
-  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
-  dependencies:
-    copy-descriptor "^0.1.0"
-    define-property "^0.2.5"
-    kind-of "^3.0.3"
-
-object-hash@^2.0.3:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.1.1.tgz#9447d0279b4fcf80cff3259bf66a1dc73afabe09"
-  integrity sha512-VOJmgmS+7wvXf8CjbQmimtCnEx3IAoLxI3fp2fbWehxrWBcAQFbk+vcwb6vzR0VZv/eNCJ/27j151ZTwqW/JeQ==
-
-object-inspect@^1.9.0:
-  version "1.10.3"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz#c2aa7d2d09f50c99375704f7a0adf24c5782d369"
-  integrity sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==
-
-object-is@^1.0.1:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac"
-  integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-
-object-keys@^1.0.12, object-keys@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
-  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
-
-object-sizeof@^1.6.0:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/object-sizeof/-/object-sizeof-1.6.1.tgz#35971f3fd2102bd8b51c67b0a53ed773ff77ab56"
-  integrity sha512-gNKGcRnDRXwEpAdwUY3Ef+aVZIrcQVXozSaVzHz6Pv4JxysH8vf5F+nIgsqW5T/YNwZNveh0mIW7PEH1O2MrDw==
-  dependencies:
-    buffer "^5.6.0"
-
-object-visit@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
-  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
-  dependencies:
-    isobject "^3.0.0"
-
-object.assign@^4.1.0, object.assign@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
-  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
-  dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-    has-symbols "^1.0.1"
-    object-keys "^1.1.1"
-
-object.getownpropertydescriptors@^2.0.3:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz#1bd63aeacf0d5d2d2f31b5e393b03a7c601a23f7"
-  integrity sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.2"
-
-object.pick@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
-  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
-  dependencies:
-    isobject "^3.0.1"
-
-obuf@^1.0.0, obuf@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
-  integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
-
-omggif@1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/omggif/-/omggif-1.0.7.tgz#59d2eecb0263de84635b3feb887c0c9973f1e49d"
-  integrity sha1-WdLuywJj3oRjWz/riHwMmXPx5J0=
-
-on-finished@~2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
-  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
-  dependencies:
-    ee-first "1.1.1"
-
-on-headers@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
-  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
-
-once@^1.3.0, once@^1.3.1, once@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
-  dependencies:
-    wrappy "1"
-
-onetime@^5.1.0:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
-  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
-  dependencies:
-    mimic-fn "^2.1.0"
-
-open@6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/open/-/open-6.4.0.tgz#5c13e96d0dc894686164f18965ecfe889ecfc8a9"
-  integrity sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==
-  dependencies:
-    is-wsl "^1.1.0"
-
-opencollective-postinstall@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259"
-  integrity sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==
-
-opener@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
-  integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
-
-opn@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
-  integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==
-  dependencies:
-    is-wsl "^1.1.0"
-
-optimist@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
-  integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
-  dependencies:
-    minimist "~0.0.1"
-    wordwrap "~0.0.2"
-
-optionator@^0.8.1:
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
-  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
-  dependencies:
-    deep-is "~0.1.3"
-    fast-levenshtein "~2.0.6"
-    levn "~0.3.0"
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-    word-wrap "~1.2.3"
-
-original@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
-  integrity sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==
-  dependencies:
-    url-parse "^1.4.3"
-
-os-browserify@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
-  integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
-
-os-homedir@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
-
-os-locale@^3.0.0, os-locale@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
-  integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
-  dependencies:
-    execa "^1.0.0"
-    lcid "^2.0.0"
-    mem "^4.0.0"
-
-os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
-
-osenv@^0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
-  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.0"
-
-p-cancelable@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
-  integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
-
-p-defer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
-  integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
-
-p-finally@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
-
-p-is-promise@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
-  integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
-
-p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
-  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
-  dependencies:
-    p-try "^2.0.0"
-
-p-limit@^3.0.1, p-limit@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
-  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
-  dependencies:
-    yocto-queue "^0.1.0"
-
-p-locate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
-  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
-  dependencies:
-    p-limit "^2.0.0"
-
-p-locate@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
-  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
-  dependencies:
-    p-limit "^2.2.0"
-
-p-locate@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
-  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
-  dependencies:
-    p-limit "^3.0.2"
-
-p-map@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
-  integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
-
-p-map@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
-  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
-  dependencies:
-    aggregate-error "^3.0.0"
-
-p-retry@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz#316b4c8893e2c8dc1cfa891f406c4b422bebf328"
-  integrity sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==
-  dependencies:
-    retry "^0.12.0"
-
-p-try@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
-  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
-
-package-json@^6.3.0:
-  version "6.5.0"
-  resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0"
-  integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==
-  dependencies:
-    got "^9.6.0"
-    registry-auth-token "^4.0.0"
-    registry-url "^5.0.0"
-    semver "^6.2.0"
-
-pacote@9.5.5:
-  version "9.5.5"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.5.5.tgz#63355a393614c3424e735820c3731e2cbbedaeeb"
-  integrity sha512-jAEP+Nqj4kyMWyNpfTU/Whx1jA7jEc5cCOlurm0/0oL+v8TAp1QSsK83N7bYe+2bEdFzMAtPG5TBebjzzGV0cA==
-  dependencies:
-    bluebird "^3.5.3"
-    cacache "^12.0.2"
-    figgy-pudding "^3.5.1"
-    get-stream "^4.1.0"
-    glob "^7.1.3"
-    infer-owner "^1.0.4"
-    lru-cache "^5.1.1"
-    make-fetch-happen "^5.0.0"
-    minimatch "^3.0.4"
-    minipass "^2.3.5"
-    mississippi "^3.0.0"
-    mkdirp "^0.5.1"
-    normalize-package-data "^2.4.0"
-    npm-package-arg "^6.1.0"
-    npm-packlist "^1.1.12"
-    npm-pick-manifest "^2.2.3"
-    npm-registry-fetch "^4.0.0"
-    osenv "^0.1.5"
-    promise-inflight "^1.0.1"
-    promise-retry "^1.1.1"
-    protoduck "^5.0.1"
-    rimraf "^2.6.2"
-    safe-buffer "^5.1.2"
-    semver "^5.6.0"
-    ssri "^6.0.1"
-    tar "^4.4.8"
-    unique-filename "^1.1.1"
-    which "^1.3.1"
-
-pako@~1.0.2, pako@~1.0.5:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
-  integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
-
-parallel-transform@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc"
-  integrity sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==
-  dependencies:
-    cyclist "^1.0.1"
-    inherits "^2.0.3"
-    readable-stream "^2.1.5"
-
-parchment@^1.1.2, parchment@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/parchment/-/parchment-1.1.4.tgz#aeded7ab938fe921d4c34bc339ce1168bc2ffde5"
-  integrity sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg==
-
-parent-module@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
-  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
-  dependencies:
-    callsites "^3.0.0"
-
-parse-asn1@^5.0.0, parse-asn1@^5.1.5:
-  version "5.1.6"
-  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4"
-  integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==
-  dependencies:
-    asn1.js "^5.2.0"
-    browserify-aes "^1.0.0"
-    evp_bytestokey "^1.0.0"
-    pbkdf2 "^3.0.3"
-    safe-buffer "^5.1.1"
-
-parse-headers@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.3.tgz#5e8e7512383d140ba02f0c7aa9f49b4399c92515"
-  integrity sha512-QhhZ+DCCit2Coi2vmAKbq5RGTRcQUOE2+REgv8vdyu7MnYx2eZztegqtTx99TZ86GTIwqiy3+4nQTWZ2tgmdCA==
-
-parse-json@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
-  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
-  dependencies:
-    error-ex "^1.3.1"
-    json-parse-better-errors "^1.0.1"
-
-parse-json@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
-  integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    error-ex "^1.3.1"
-    json-parse-even-better-errors "^2.3.0"
-    lines-and-columns "^1.1.6"
-
-parse5-html-rewriting-stream@5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-5.1.0.tgz#63f92c958764aea8cbe3aa68f2e5895c32068ab8"
-  integrity sha512-hZlaOTHJs4dpC5yFHnOSEMh26ErsqTsLzxKqkuRcUqtiu0kMsBQ9pkgANkECDyoBUhJ3+hvb2DPLsyqbtcS61Q==
-  dependencies:
-    parse5 "^5.1.0"
-    parse5-sax-parser "^5.1.0"
-
-parse5-sax-parser@^5.1.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/parse5-sax-parser/-/parse5-sax-parser-5.1.1.tgz#02834a9d08b23ea2d99584841c38be09d5247a15"
-  integrity sha512-9HIh6zd7bF1NJe95LPCUC311CekdOi55R+HWXNCsGY6053DWaMijVKOv1oPvdvPTvFicifZyimBVJ6/qvG039Q==
-  dependencies:
-    parse5 "^5.1.1"
-
-parse5@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
-  integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==
-
-parse5@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"
-  integrity sha1-m387DeMr543CQBsXVzzK8Pb1nZQ=
-
-parse5@^5.0.0, parse5@^5.1.0, parse5@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"
-  integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==
-
-parseqs@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
-  integrity sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=
-  dependencies:
-    better-assert "~1.0.0"
-
-parseuri@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a"
-  integrity sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=
-  dependencies:
-    better-assert "~1.0.0"
-
-parseurl@~1.3.2, parseurl@~1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
-  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
-
-pascalcase@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
-  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
-
-path-browserify@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"
-  integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==
-
-path-dirname@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
-
-path-exists@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
-
-path-exists@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
-  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
-
-path-is-inside@^1.0.1, path-is-inside@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
-  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
-
-path-key@^2.0.0, path-key@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
-
-path-parse@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
-
-path-to-regexp@0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
-  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
-
-path-type@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
-  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
-
-pbkdf2@^3.0.3:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075"
-  integrity sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==
-  dependencies:
-    create-hash "^1.1.2"
-    create-hmac "^1.1.4"
-    ripemd160 "^2.0.1"
-    safe-buffer "^5.0.1"
-    sha.js "^2.4.8"
-
-pdfjs-dist@2.1.266:
-  version "2.1.266"
-  resolved "https://registry.yarnpkg.com/pdfjs-dist/-/pdfjs-dist-2.1.266.tgz#cded02268b389559e807f410d2a729db62160026"
-  integrity sha512-Jy7o1wE3NezPxozexSbq4ltuLT0Z21ew/qrEiAEeUZzHxMHGk4DUV1D7RuCXg5vJDvHmjX1YssN+we9QfRRgXQ==
-  dependencies:
-    node-ensure "^0.0.0"
-    worker-loader "^2.0.0"
-
-pdfjs-dist@~2.5.207:
-  version "2.5.207"
-  resolved "https://registry.yarnpkg.com/pdfjs-dist/-/pdfjs-dist-2.5.207.tgz#b5e8c19627be64269cd3fb6df3eaaf45ddffe7b6"
-  integrity sha512-xGDUhnCYPfHy+unMXCLCJtlpZaaZ17Ew3WIL0tnSgKFUZXHAPD49GO9xScyszSsQMoutNDgRb+rfBXIaX/lJbw==
-
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
-
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d"
-  integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==
-
-pify@^2.0.0, pify@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
-
-pify@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
-
-pify@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
-  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
-
-pinkie-promise@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
-  dependencies:
-    pinkie "^2.0.0"
-
-pinkie@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
-
-pkcs7@^1.0.2, pkcs7@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/pkcs7/-/pkcs7-1.0.4.tgz#6090b9e71160dabf69209d719cbafa538b00a1cb"
-  integrity sha512-afRERtHn54AlwaF2/+LFszyAANTCggGilmcmILUzEjvs3XgFZT+xE6+QWQcAGmu4xajy+Xtj7acLOPdx5/eXWQ==
-  dependencies:
-    "@babel/runtime" "^7.5.5"
-
-pkg-dir@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
-  integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==
-  dependencies:
-    find-up "^3.0.0"
-
-pkg-dir@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
-  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
-  dependencies:
-    find-up "^4.0.0"
-
-pkg-dir@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-5.0.0.tgz#a02d6aebe6ba133a928f74aec20bafdfe6b8e760"
-  integrity sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==
-  dependencies:
-    find-up "^5.0.0"
-
-pkg-up@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5"
-  integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==
-  dependencies:
-    find-up "^3.0.0"
-
-please-upgrade-node@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942"
-  integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==
-  dependencies:
-    semver-compare "^1.0.0"
-
-portfinder@^1.0.26:
-  version "1.0.28"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
-  integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==
-  dependencies:
-    async "^2.6.2"
-    debug "^3.1.1"
-    mkdirp "^0.5.5"
-
-posix-character-classes@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
-  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
-
-postcss-functions@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-functions/-/postcss-functions-3.0.0.tgz#0e94d01444700a481de20de4d55fb2640564250e"
-  integrity sha1-DpTQFERwCkgd4g3k1V+yZAVkJQ4=
-  dependencies:
-    glob "^7.1.2"
-    object-assign "^4.1.1"
-    postcss "^6.0.9"
-    postcss-value-parser "^3.3.0"
-
-postcss-import@12.0.1:
-  version "12.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-12.0.1.tgz#cf8c7ab0b5ccab5649024536e565f841928b7153"
-  integrity sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==
-  dependencies:
-    postcss "^7.0.1"
-    postcss-value-parser "^3.2.3"
-    read-cache "^1.0.0"
-    resolve "^1.1.7"
-
-postcss-js@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-2.0.3.tgz#a96f0f23ff3d08cec7dc5b11bf11c5f8077cdab9"
-  integrity sha512-zS59pAk3deu6dVHyrGqmC3oDXBdNdajk4k1RyxeVXCrcEDBUBHoIhE4QTsmhxgzXxsaqFDAkUZfmMa5f/N/79w==
-  dependencies:
-    camelcase-css "^2.0.1"
-    postcss "^7.0.18"
-
-postcss-load-config@^2.0.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.2.tgz#c5ea504f2c4aef33c7359a34de3573772ad7502a"
-  integrity sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==
-  dependencies:
-    cosmiconfig "^5.0.0"
-    import-cwd "^2.0.0"
-
-postcss-loader@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-3.0.0.tgz#6b97943e47c72d845fa9e03f273773d4e8dd6c2d"
-  integrity sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==
-  dependencies:
-    loader-utils "^1.1.0"
-    postcss "^7.0.0"
-    postcss-load-config "^2.0.0"
-    schema-utils "^1.0.0"
-
-postcss-nested@^4.1.1:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-4.2.3.tgz#c6f255b0a720549776d220d00c4b70cd244136f6"
-  integrity sha512-rOv0W1HquRCamWy2kFl3QazJMMe1ku6rCFoAAH+9AcxdbpDeBr6k968MLWuLjvjMcGEip01ak09hKOEgpK9hvw==
-  dependencies:
-    postcss "^7.0.32"
-    postcss-selector-parser "^6.0.2"
-
-postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2:
-  version "6.0.6"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea"
-  integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==
-  dependencies:
-    cssesc "^3.0.0"
-    util-deprecate "^1.0.2"
-
-postcss-url@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-url/-/postcss-url-8.0.0.tgz#7b10059bd12929cdbb1971c60f61a0e5af86b4ca"
-  integrity sha512-E2cbOQ5aii2zNHh8F6fk1cxls7QVFZjLPSrqvmiza8OuXLzIpErij8BDS5Y3STPfJgpIMNCPEr8JlKQWEoozUw==
-  dependencies:
-    mime "^2.3.1"
-    minimatch "^3.0.4"
-    mkdirp "^0.5.0"
-    postcss "^7.0.2"
-    xxhashjs "^0.2.1"
-
-postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
-  integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
-
-postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
-  integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
-
-postcss@7.0.17:
-  version "7.0.17"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.17.tgz#4da1bdff5322d4a0acaab4d87f3e782436bad31f"
-  integrity sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==
-  dependencies:
-    chalk "^2.4.2"
-    source-map "^0.6.1"
-    supports-color "^6.1.0"
-
-postcss@7.0.32:
-  version "7.0.32"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d"
-  integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==
-  dependencies:
-    chalk "^2.4.2"
-    source-map "^0.6.1"
-    supports-color "^6.1.0"
-
-postcss@^6.0.9:
-  version "6.0.23"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
-  integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==
-  dependencies:
-    chalk "^2.4.1"
-    source-map "^0.6.1"
-    supports-color "^5.4.0"
-
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.11, postcss@^7.0.17, postcss@^7.0.18, postcss@^7.0.2, postcss@^7.0.32:
-  version "7.0.35"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24"
-  integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==
-  dependencies:
-    chalk "^2.4.2"
-    source-map "^0.6.1"
-    supports-color "^6.1.0"
-
-prelude-ls@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
-
-prepend-http@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
-  integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
-
-prepend-http@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
-  integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
-
-pretty-hrtime@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
-  integrity sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=
-
-printj@~1.1.0, printj@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222"
-  integrity sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==
-
-process-nextick-args@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
-  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
-
-process@^0.11.10:
-  version "0.11.10"
-  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
-  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
-
-process@~0.5.1:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf"
-  integrity sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=
-
-promise-inflight@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
-  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
-
-promise-retry@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d"
-  integrity sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=
-  dependencies:
-    err-code "^1.0.0"
-    retry "^0.10.0"
-
-promise@^7.1.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
-  integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
-  dependencies:
-    asap "~2.0.3"
-
-promise@~7.0.1:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/promise/-/promise-7.0.4.tgz#363e84a4c36c8356b890fed62c91ce85d02ed539"
-  integrity sha1-Nj6EpMNsg1a4kP7WLJHOhdAu1Tk=
-  dependencies:
-    asap "~2.0.3"
-
-protoduck@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.1.tgz#03c3659ca18007b69a50fd82a7ebcc516261151f"
-  integrity sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==
-  dependencies:
-    genfun "^5.0.0"
-
-protractor@~5.4.2:
-  version "5.4.4"
-  resolved "https://registry.yarnpkg.com/protractor/-/protractor-5.4.4.tgz#b241466aaf83b76bc2c58df67deb9a5cdfc61529"
-  integrity sha512-BaL4vePgu3Vfa/whvTUAlgaCAId4uNSGxIFSCXMgj7LMYENPWLp85h5RBi9pdpX/bWQ8SF6flP7afmi2TC4eHw==
-  dependencies:
-    "@types/q" "^0.0.32"
-    "@types/selenium-webdriver" "^3.0.0"
-    blocking-proxy "^1.0.0"
-    browserstack "^1.5.1"
-    chalk "^1.1.3"
-    glob "^7.0.3"
-    jasmine "2.8.0"
-    jasminewd2 "^2.1.0"
-    q "1.4.1"
-    saucelabs "^1.5.0"
-    selenium-webdriver "3.6.0"
-    source-map-support "~0.4.0"
-    webdriver-js-extender "2.1.0"
-    webdriver-manager "^12.0.6"
-    yargs "^12.0.5"
-
-proxy-addr@~2.0.5:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf"
-  integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==
-  dependencies:
-    forwarded "~0.1.2"
-    ipaddr.js "1.9.1"
-
-prr@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
-  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
-
-pseudomap@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
-  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
-
-psl@^1.1.28:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
-  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
-
-public-encrypt@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
-  integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==
-  dependencies:
-    bn.js "^4.1.0"
-    browserify-rsa "^4.0.0"
-    create-hash "^1.1.0"
-    parse-asn1 "^5.0.0"
-    randombytes "^2.0.1"
-    safe-buffer "^5.1.2"
-
-pump@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
-  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
-pump@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
-  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
-pumpify@^1.3.3:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
-  integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
-  dependencies:
-    duplexify "^3.6.0"
-    inherits "^2.0.3"
-    pump "^2.0.0"
-
-punycode@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
-
-punycode@^1.2.4:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
-
-punycode@^2.1.0, punycode@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-
-purgecss@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/purgecss/-/purgecss-2.3.0.tgz#5327587abf5795e6541517af8b190a6fb5488bb3"
-  integrity sha512-BE5CROfVGsx2XIhxGuZAT7rTH9lLeQx/6M0P7DTXQH4IUc3BBzs9JUzt4yzGf3JrH9enkeq6YJBe9CTtkm1WmQ==
-  dependencies:
-    commander "^5.0.0"
-    glob "^7.0.0"
-    postcss "7.0.32"
-    postcss-selector-parser "^6.0.2"
-
-q@1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
-  integrity sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=
-
-q@^1.4.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
-  integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
-
-qjobs@^1.1.4:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
-  integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==
-
-qs@6.7.0:
-  version "6.7.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
-  integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
-
-qs@~6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
-  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
-
-query-string@^4.1.0:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
-  integrity sha1-u7aTucqRXCMlFbIosaArYJBD2+s=
-  dependencies:
-    object-assign "^4.1.0"
-    strict-uri-encode "^1.0.0"
-
-querystring-es3@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
-  integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
-
-querystring@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
-  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
-
-querystringify@^2.1.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
-  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
-
-queue-microtask@^1.2.2:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
-  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
-
-quill-delta@^3.6.2:
-  version "3.6.3"
-  resolved "https://registry.yarnpkg.com/quill-delta/-/quill-delta-3.6.3.tgz#b19fd2b89412301c60e1ff213d8d860eac0f1032"
-  integrity sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg==
-  dependencies:
-    deep-equal "^1.0.1"
-    extend "^3.0.2"
-    fast-diff "1.1.2"
-
-quill-delta@^4.0.1:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/quill-delta/-/quill-delta-4.2.2.tgz#015397d046e0a3bed087cd8a51f98c11a1b8f351"
-  integrity sha512-qjbn82b/yJzOjstBgkhtBjN2TNK+ZHP/BgUQO+j6bRhWQQdmj2lH6hXG7+nwwLF41Xgn//7/83lxs9n2BkTtTg==
-  dependencies:
-    fast-diff "1.2.0"
-    lodash.clonedeep "^4.5.0"
-    lodash.isequal "^4.5.0"
-
-quill@^1.3.7:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/quill/-/quill-1.3.7.tgz#da5b2f3a2c470e932340cdbf3668c9f21f9286e8"
-  integrity sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==
-  dependencies:
-    clone "^2.1.1"
-    deep-equal "^1.0.1"
-    eventemitter3 "^2.0.3"
-    extend "^3.0.2"
-    parchment "^1.1.4"
-    quill-delta "^3.6.2"
-
-raf@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39"
-  integrity sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==
-  dependencies:
-    performance-now "^2.1.0"
-
-randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
-  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
-  dependencies:
-    safe-buffer "^5.1.0"
-
-randomfill@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
-  integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
-  dependencies:
-    randombytes "^2.0.5"
-    safe-buffer "^5.1.0"
-
-range-parser@^1.2.0, range-parser@^1.2.1, range-parser@~1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
-  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
-
-raw-body@2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
-  integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
-  dependencies:
-    bytes "3.1.0"
-    http-errors "1.7.2"
-    iconv-lite "0.4.24"
-    unpipe "1.0.0"
-
-raw-loader@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-3.1.0.tgz#5e9d399a5a222cc0de18f42c3bc5e49677532b3f"
-  integrity sha512-lzUVMuJ06HF4rYveaz9Tv0WRlUMxJ0Y1hgSkkgg+50iEdaI0TthyEDe08KIHb0XsF6rn8WYTqPCaGTZg3sX+qA==
-  dependencies:
-    loader-utils "^1.1.0"
-    schema-utils "^2.0.1"
-
-rc@^1.2.8:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
-  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
-  dependencies:
-    deep-extend "^0.6.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
-
-read-cache@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
-  integrity sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=
-  dependencies:
-    pify "^2.3.0"
-
-read-package-json@^2.0.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.1.2.tgz#6992b2b66c7177259feb8eaac73c3acd28b9222a"
-  integrity sha512-D1KmuLQr6ZSJS0tW8hf3WGpRlwszJOXZ3E8Yd/DNRaM5d+1wVRZdHlpGBLAuovjr28LbWvjpWkBHMxpRGGjzNA==
-  dependencies:
-    glob "^7.1.1"
-    json-parse-even-better-errors "^2.3.0"
-    normalize-package-data "^2.0.0"
-    npm-normalize-package-bin "^1.0.0"
-
-read-package-tree@5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.3.1.tgz#a32cb64c7f31eb8a6f31ef06f9cedf74068fe636"
-  integrity sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw==
-  dependencies:
-    read-package-json "^2.0.0"
-    readdir-scoped-modules "^1.0.0"
-    util-promisify "^2.1.0"
-
-read-pkg-up@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-5.0.0.tgz#b6a6741cb144ed3610554f40162aa07a6db621b8"
-  integrity sha512-XBQjqOBtTzyol2CpsQOw8LHV0XbDZVG7xMMjmXAJomlVY03WOBRmYgDJETlvcg0H63AJvPRwT7GFi5rvOzUOKg==
-  dependencies:
-    find-up "^3.0.0"
-    read-pkg "^5.0.0"
-
-read-pkg@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
-  integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
-  dependencies:
-    "@types/normalize-package-data" "^2.4.0"
-    normalize-package-data "^2.5.0"
-    parse-json "^5.0.0"
-    type-fest "^0.6.0"
-
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
-  version "2.3.7"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
-  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
-readable-stream@^3.0.6, readable-stream@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
-  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
-readdir-scoped-modules@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309"
-  integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==
-  dependencies:
-    debuglog "^1.0.1"
-    dezalgo "^1.0.0"
-    graceful-fs "^4.1.2"
-    once "^1.3.0"
-
-readdirp@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
-  integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
-  dependencies:
-    graceful-fs "^4.1.11"
-    micromatch "^3.1.10"
-    readable-stream "^2.0.2"
-
-readdirp@~3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"
-  integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==
-  dependencies:
-    picomatch "^2.2.1"
-
-reduce-css-calc@^2.1.6:
-  version "2.1.8"
-  resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-2.1.8.tgz#7ef8761a28d614980dc0c982f772c93f7a99de03"
-  integrity sha512-8liAVezDmUcH+tdzoEGrhfbGcP7nOV4NkGE3a74+qqvE7nt9i4sKLGBuZNOnpI4WiGksiNPklZxva80061QiPg==
-  dependencies:
-    css-unit-converter "^1.1.1"
-    postcss-value-parser "^3.3.0"
-
-reflect-metadata@^0.1.12, reflect-metadata@^0.1.2:
-  version "0.1.13"
-  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08"
-  integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==
-
-regenerate-unicode-properties@^8.2.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
-  integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==
-  dependencies:
-    regenerate "^1.4.0"
-
-regenerate@^1.4.0:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
-  integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
-
-regenerator-runtime@0.13.3:
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"
-  integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==
-
-regenerator-runtime@^0.13.4:
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
-  integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==
-
-regenerator-runtime@^0.13.7:
-  version "0.13.9"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
-  integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
-
-regenerator-transform@^0.14.2:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4"
-  integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==
-  dependencies:
-    "@babel/runtime" "^7.8.4"
-
-regex-not@^1.0.0, regex-not@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
-  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
-  dependencies:
-    extend-shallow "^3.0.2"
-    safe-regex "^1.1.0"
-
-regexp.prototype.flags@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26"
-  integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-
-regexpu-core@^4.7.1:
-  version "4.7.1"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"
-  integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==
-  dependencies:
-    regenerate "^1.4.0"
-    regenerate-unicode-properties "^8.2.0"
-    regjsgen "^0.5.1"
-    regjsparser "^0.6.4"
-    unicode-match-property-ecmascript "^1.0.4"
-    unicode-match-property-value-ecmascript "^1.2.0"
-
-registry-auth-token@^4.0.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250"
-  integrity sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==
-  dependencies:
-    rc "^1.2.8"
-
-registry-url@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009"
-  integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==
-  dependencies:
-    rc "^1.2.8"
-
-regjsgen@^0.5.1:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
-  integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==
-
-regjsparser@^0.6.4:
-  version "0.6.9"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.9.tgz#b489eef7c9a2ce43727627011429cf833a7183e6"
-  integrity sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==
-  dependencies:
-    jsesc "~0.5.0"
-
-remove-trailing-separator@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
-
-remove@^0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/remove/-/remove-0.1.5.tgz#095ffd827d65c9f41ad97d33e416a75811079955"
-  integrity sha1-CV/9gn1lyfQa2X0z5BanWBEHmVU=
-  dependencies:
-    seq ">= 0.3.5"
-
-repeat-element@^1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9"
-  integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==
-
-repeat-string@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-0.2.2.tgz#c7a8d3236068362059a7e4651fc6884e8b1fb4ae"
-  integrity sha512-yHeI3F9v20MY+8/5WAUgIWseMZwpLD+l9h5hGyzh6fQjhle2AwjjRDao1m5IozSDuVvMw09/mvE8AU1oDmZKpQ==
-
-repeat-string@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
-
-request@^2.55.0, request@^2.83.0, request@^2.87.0, request@^2.88.2:
-  version "2.88.2"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
-  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.3"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.5.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
-
-require-directory@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
-
-require-main-filename@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
-  integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
-
-require-main-filename@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
-  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
-
-requires-port@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
-
-resolve-cwd@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
-  integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=
-  dependencies:
-    resolve-from "^3.0.0"
-
-resolve-from@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
-  integrity sha1-six699nWiBvItuZTM17rywoYh0g=
-
-resolve-from@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
-  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
-
-resolve-url@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
-  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
-
-resolve@^1.1.7, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.11.1, resolve@^1.14.2, resolve@^1.3.2:
-  version "1.20.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
-  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
-  dependencies:
-    is-core-module "^2.2.0"
-    path-parse "^1.0.6"
-
-resolve@~1.1.6:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
-  integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
-
-responselike@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
-  integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=
-  dependencies:
-    lowercase-keys "^1.0.0"
-
-restore-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
-  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
-  dependencies:
-    onetime "^5.1.0"
-    signal-exit "^3.0.2"
-
-ret@~0.1.10:
-  version "0.1.15"
-  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
-  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
-
-retry@^0.10.0:
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
-  integrity sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=
-
-retry@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
-  integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=
-
-reusify@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
-  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
-
-rfdc@^1.1.2, rfdc@^1.1.4:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b"
-  integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==
-
-rgbcolor@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/rgbcolor/-/rgbcolor-1.0.1.tgz#d6505ecdb304a6595da26fa4b43307306775945d"
-  integrity sha1-1lBezbMEplldom+ktDMHMGd1lF0=
-
-rimraf@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.0.tgz#614176d4b3010b75e5c390eb0ee96f6dc0cebb9b"
-  integrity sha512-NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg==
-  dependencies:
-    glob "^7.1.3"
-
-rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.2, rimraf@^2.6.3:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
-  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
-  dependencies:
-    glob "^7.1.3"
-
-rimraf@^3.0.0, rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
-ripemd160@^2.0.0, ripemd160@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
-  integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
-  dependencies:
-    hash-base "^3.0.0"
-    inherits "^2.0.1"
-
-rollup-plugin-commonjs@^10.0.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-10.1.0.tgz#417af3b54503878e084d127adf4d1caf8beb86fb"
-  integrity sha512-jlXbjZSQg8EIeAAvepNwhJj++qJWNJw1Cl0YnOqKtP5Djx+fFGkp3WRh+W0ASCaFG5w1jhmzDxgu3SJuVxPF4Q==
-  dependencies:
-    estree-walker "^0.6.1"
-    is-reference "^1.1.2"
-    magic-string "^0.25.2"
-    resolve "^1.11.0"
-    rollup-pluginutils "^2.8.1"
-
-rollup-plugin-json@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-json/-/rollup-plugin-json-4.0.0.tgz#a18da0a4b30bf5ca1ee76ddb1422afbb84ae2b9e"
-  integrity sha512-hgb8N7Cgfw5SZAkb3jf0QXii6QX/FOkiIq2M7BAQIEydjHvTyxXHQiIzZaTFgx1GK0cRCHOCBHIyEkkLdWKxow==
-  dependencies:
-    rollup-pluginutils "^2.5.0"
-
-rollup-plugin-node-resolve@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-5.2.0.tgz#730f93d10ed202473b1fb54a5997a7db8c6d8523"
-  integrity sha512-jUlyaDXts7TW2CqQ4GaO5VJ4PwwaV8VUGA7+km3n6k6xtOEacf61u0VXwN80phY/evMcaS+9eIeJ9MOyDxt5Zw==
-  dependencies:
-    "@types/resolve" "0.0.8"
-    builtin-modules "^3.1.0"
-    is-module "^1.0.0"
-    resolve "^1.11.1"
-    rollup-pluginutils "^2.8.1"
-
-rollup-plugin-replace@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-replace/-/rollup-plugin-replace-2.2.0.tgz#f41ae5372e11e7a217cde349c8b5d5fd115e70e3"
-  integrity sha512-/5bxtUPkDHyBJAKketb4NfaeZjL5yLZdeUihSfbF2PQMz+rSTEb8ARKoOl3UBT4m7/X+QOXJo3sLTcq+yMMYTA==
-  dependencies:
-    magic-string "^0.25.2"
-    rollup-pluginutils "^2.6.0"
-
-rollup-plugin-sourcemaps@^0.4.2:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.4.2.tgz#62125aa94087aadf7b83ef4dfaf629b473135e87"
-  integrity sha1-YhJaqUCHqt97g+9N+vYptHMTXoc=
-  dependencies:
-    rollup-pluginutils "^2.0.1"
-    source-map-resolve "^0.5.0"
-
-rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.5.0, rollup-pluginutils@^2.6.0, rollup-pluginutils@^2.8.1:
-  version "2.8.2"
-  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"
-  integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==
-  dependencies:
-    estree-walker "^0.6.1"
-
-rollup@1.25.2:
-  version "1.25.2"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.25.2.tgz#739f508bd8f7ece52bb6c1fcda83466af82b7f6d"
-  integrity sha512-+7z6Wab/L45QCPcfpuTZKwKiB0tynj05s/+s2U3F2Bi7rOLPr9UcjUwO7/xpjlPNXA/hwnth6jBExFRGyf3tMg==
-  dependencies:
-    "@types/estree" "*"
-    "@types/node" "*"
-    acorn "^7.1.0"
-
-run-async@^2.2.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
-  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
-
-run-parallel@^1.1.9:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
-  integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
-  dependencies:
-    queue-microtask "^1.2.2"
-
-run-queue@^1.0.0, run-queue@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
-  integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=
-  dependencies:
-    aproba "^1.1.1"
-
-rust-result@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/rust-result/-/rust-result-1.0.0.tgz#34c75b2e6dc39fe5875e5bdec85b5e0f91536f72"
-  integrity sha1-NMdbLm3Dn+WHXlveyFteD5FTb3I=
-  dependencies:
-    individual "^2.0.0"
-
-rw@1:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
-  integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q=
-
-rxjs@6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
-  integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
-  dependencies:
-    tslib "^1.9.0"
-
-rxjs@^6.0.0, rxjs@^6.4.0:
-  version "6.6.7"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
-  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
-  dependencies:
-    tslib "^1.9.0"
-
-rxjs@~6.3.3:
-  version "6.3.3"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55"
-  integrity sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==
-  dependencies:
-    tslib "^1.9.0"
-
-rxjs@~6.5.2:
-  version "6.5.5"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz#c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec"
-  integrity sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==
-  dependencies:
-    tslib "^1.9.0"
-
-safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
-safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
-safe-json-parse@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-4.0.0.tgz#7c0f578cfccd12d33a71c0e05413e2eca171eaac"
-  integrity sha1-fA9XjPzNEtM6ccDgVBPi7KFx6qw=
-  dependencies:
-    rust-result "^1.0.0"
-
-safe-regex@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
-  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
-  dependencies:
-    ret "~0.1.10"
-
-"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@^2.1.2, safer-buffer@~2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-
-sass-loader@7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.2.0.tgz#e34115239309d15b2527cb62b5dfefb62a96ff7f"
-  integrity sha512-h8yUWaWtsbuIiOCgR9fd9c2lRXZ2uG+h8Dzg/AGNj+Hg/3TO8+BBAW9mEP+mh8ei+qBKqSJ0F1FLlYjNBc61OA==
-  dependencies:
-    clone-deep "^4.0.1"
-    loader-utils "^1.0.1"
-    neo-async "^2.5.0"
-    pify "^4.0.1"
-    semver "^5.5.0"
-
-sass@1.22.9:
-  version "1.22.9"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.22.9.tgz#41a2ed6038027f58be2bd5041293452a29c2cb84"
-  integrity sha512-FzU1X2V8DlnqabrL4u7OBwD2vcOzNMongEJEx3xMEhWY/v26FFR3aG0hyeu2T965sfR0E9ufJwmG+Qjz78vFPQ==
-  dependencies:
-    chokidar ">=2.0.0 <4.0.0"
-
-sass@^1.17.3:
-  version "1.32.13"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.13.tgz#8d29c849e625a415bce71609c7cf95e15f74ed00"
-  integrity sha512-dEgI9nShraqP7cXQH+lEXVf73WOPCse0QlFzSD8k+1TcOxCMwVXfQlr0jtoluZysQOyJGnfr21dLvYKDJq8HkA==
-  dependencies:
-    chokidar ">=3.0.0 <4.0.0"
-
-saucelabs@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/saucelabs/-/saucelabs-1.5.0.tgz#9405a73c360d449b232839919a86c396d379fd9d"
-  integrity sha512-jlX3FGdWvYf4Q3LFfFWS1QvPg3IGCGWxIc8QBFdPTbpTJnt/v17FHXYVAn7C8sHf1yUXo2c7yIM0isDryfYtHQ==
-  dependencies:
-    https-proxy-agent "^2.2.1"
-
-sax@0.5.x:
-  version "0.5.8"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
-  integrity sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=
-
-sax@>=0.6.0, sax@^1.1.4, sax@~1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
-  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
-
-schema-utils@^0.4.0:
-  version "0.4.7"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
-  integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
-  dependencies:
-    ajv "^6.1.0"
-    ajv-keywords "^3.1.0"
-
-schema-utils@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
-  integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==
-  dependencies:
-    ajv "^6.1.0"
-    ajv-errors "^1.0.0"
-    ajv-keywords "^3.1.0"
-
-schema-utils@^2.0.0, schema-utils@^2.0.1, schema-utils@^2.6.1, schema-utils@^2.6.6, schema-utils@^2.7.0:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
-  integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==
-  dependencies:
-    "@types/json-schema" "^7.0.5"
-    ajv "^6.12.4"
-    ajv-keywords "^3.5.2"
-
-select-hose@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
-  integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
-
-selenium-webdriver@3.6.0, selenium-webdriver@^3.0.1:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-3.6.0.tgz#2ba87a1662c020b8988c981ae62cb2a01298eafc"
-  integrity sha512-WH7Aldse+2P5bbFBO4Gle/nuQOdVwpHMTL6raL3uuBj/vPG07k6uzt3aiahu352ONBr5xXh0hDlM3LhtXPOC4Q==
-  dependencies:
-    jszip "^3.1.3"
-    rimraf "^2.5.4"
-    tmp "0.0.30"
-    xml2js "^0.4.17"
-
-selfsigned@^1.10.7:
-  version "1.10.11"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.11.tgz#24929cd906fe0f44b6d01fb23999a739537acbe9"
-  integrity sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA==
-  dependencies:
-    node-forge "^0.10.0"
-
-semver-compare@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
-  integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
-
-semver-diff@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"
-  integrity sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=
-  dependencies:
-    semver "^5.0.3"
-
-semver-dsl@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/semver-dsl/-/semver-dsl-1.0.1.tgz#d3678de5555e8a61f629eed025366ae5f27340a0"
-  integrity sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=
-  dependencies:
-    semver "^5.3.0"
-
-semver-intersect@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/semver-intersect/-/semver-intersect-1.4.0.tgz#bdd9c06bedcdd2fedb8cd352c3c43ee8c61321f3"
-  integrity sha512-d8fvGg5ycKAq0+I6nfWeCx6ffaWJCsBYU0H2Rq56+/zFePYfT8mXkB3tWBSjR5BerkHNZ5eTPIk1/LBYas35xQ==
-  dependencies:
-    semver "^5.0.0"
-
-semver-regex@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.2.tgz#34b4c0d361eef262e07199dbef316d0f2ab11807"
-  integrity sha512-bXWyL6EAKOJa81XG1OZ/Yyuq+oT0b2YLlxx7c+mrdYPaPbnj6WgVULXhinMIeZGufuUBu/eVRqXEhiv4imfwxA==
-
-"semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.0.3, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-
-semver@6.3.0, semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-
-semver@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
-  integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
-
-send@0.17.1:
-  version "0.17.1"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
-  integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==
-  dependencies:
-    debug "2.6.9"
-    depd "~1.1.2"
-    destroy "~1.0.4"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    fresh "0.5.2"
-    http-errors "~1.7.2"
-    mime "1.6.0"
-    ms "2.1.1"
-    on-finished "~2.3.0"
-    range-parser "~1.2.1"
-    statuses "~1.5.0"
-
-"seq@>= 0.3.5":
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/seq/-/seq-0.3.5.tgz#ae02af3a424793d8ccbf212d69174e0c54dffe38"
-  integrity sha1-rgKvOkJHk9jMvyEtaRdODFTf/jg=
-  dependencies:
-    chainsaw ">=0.0.7 <0.1"
-    hashish ">=0.0.2 <0.1"
-
-serialize-javascript@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-3.1.0.tgz#8bf3a9170712664ef2561b44b691eafe399214ea"
-  integrity sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==
-  dependencies:
-    randombytes "^2.1.0"
-
-serialize-javascript@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
-  integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==
-  dependencies:
-    randombytes "^2.1.0"
-
-serve-index@^1.9.1:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
-  integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
-  dependencies:
-    accepts "~1.3.4"
-    batch "0.6.1"
-    debug "2.6.9"
-    escape-html "~1.0.3"
-    http-errors "~1.6.2"
-    mime-types "~2.1.17"
-    parseurl "~1.3.2"
-
-serve-static@1.14.1:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
-  integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
-  dependencies:
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    parseurl "~1.3.3"
-    send "0.17.1"
-
-set-blocking@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
-
-set-immediate-shim@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
-  integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
-
-set-value@^2.0.0, set-value@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
-  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.3"
-    split-string "^3.0.1"
-
-setimmediate@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
-
-setprototypeof@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
-  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
-
-setprototypeof@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
-  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
-
-sha.js@^2.4.0, sha.js@^2.4.8:
-  version "2.4.11"
-  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
-  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
-  dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
-shallow-clone@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
-  integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==
-  dependencies:
-    kind-of "^6.0.2"
-
-shebang-command@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
-  dependencies:
-    shebang-regex "^1.0.0"
-
-shebang-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
-
-shepherd.js@^7.1.0:
-  version "7.2.1"
-  resolved "https://registry.yarnpkg.com/shepherd.js/-/shepherd.js-7.2.1.tgz#9973fae7cb595c0c74ae16df5431089f72221680"
-  integrity sha512-IJP2cTv3F7BYjsiN6J+J36s0lKbbBd01p2vKQe2o6EutyVkJd6/Tsr5r+ndMgZ7/aJT7rEb6YkvNWqBfAkcX+A==
-  dependencies:
-    "@popperjs/core" "^2.4.0"
-    deepmerge "^4.2.2"
-    smoothscroll-polyfill "^0.4.4"
-
-signal-exit@^3.0.0, signal-exit@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
-  integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
-
-simple-swizzle@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
-  integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=
-  dependencies:
-    is-arrayish "^0.3.1"
-
-sirv@^1.0.7:
-  version "1.0.19"
-  resolved "https://registry.yarnpkg.com/sirv/-/sirv-1.0.19.tgz#1d73979b38c7fe91fcba49c85280daa9c2363b49"
-  integrity sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ==
-  dependencies:
-    "@polka/url" "^1.0.0-next.20"
-    mrmime "^1.0.0"
-    totalist "^1.0.0"
-
-slash@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
-  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
-
-smart-buffer@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.1.0.tgz#91605c25d91652f4661ea69ccf45f1b331ca21ba"
-  integrity sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==
-
-smoothscroll-polyfill@^0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/smoothscroll-polyfill/-/smoothscroll-polyfill-0.4.4.tgz#3a259131dc6930e6ca80003e1cb03b603b69abf8"
-  integrity sha512-TK5ZA9U5RqCwMpfoMq/l1mrH0JAR7y7KRvOBx0n2869aLxch+gT9GhN3yUfjiw+d/DiF1mKo14+hd62JyMmoBg==
-
-snapdragon-node@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
-  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
-  dependencies:
-    define-property "^1.0.0"
-    isobject "^3.0.0"
-    snapdragon-util "^3.0.1"
-
-snapdragon-util@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
-  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
-  dependencies:
-    kind-of "^3.2.0"
-
-snapdragon@^0.8.1:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
-  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
-  dependencies:
-    base "^0.11.1"
-    debug "^2.2.0"
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    map-cache "^0.2.2"
-    source-map "^0.5.6"
-    source-map-resolve "^0.5.0"
-    use "^3.1.0"
-
-socket.io-adapter@~1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9"
-  integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==
-
-socket.io-client@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.1.1.tgz#dcb38103436ab4578ddb026638ae2f21b623671f"
-  integrity sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==
-  dependencies:
-    backo2 "1.0.2"
-    base64-arraybuffer "0.1.5"
-    component-bind "1.0.0"
-    component-emitter "1.2.1"
-    debug "~3.1.0"
-    engine.io-client "~3.2.0"
-    has-binary2 "~1.0.2"
-    has-cors "1.1.0"
-    indexof "0.0.1"
-    object-component "0.0.3"
-    parseqs "0.0.5"
-    parseuri "0.0.5"
-    socket.io-parser "~3.2.0"
-    to-array "0.1.4"
-
-socket.io-parser@~3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.2.0.tgz#e7c6228b6aa1f814e6148aea325b51aa9499e077"
-  integrity sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==
-  dependencies:
-    component-emitter "1.2.1"
-    debug "~3.1.0"
-    isarray "2.0.1"
-
-socket.io@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.1.1.tgz#a069c5feabee3e6b214a75b40ce0652e1cfb9980"
-  integrity sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==
-  dependencies:
-    debug "~3.1.0"
-    engine.io "~3.2.0"
-    has-binary2 "~1.0.2"
-    socket.io-adapter "~1.1.0"
-    socket.io-client "2.1.1"
-    socket.io-parser "~3.2.0"
-
-sockjs-client@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.4.0.tgz#c9f2568e19c8fd8173b4997ea3420e0bb306c7d5"
-  integrity sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==
-  dependencies:
-    debug "^3.2.5"
-    eventsource "^1.0.7"
-    faye-websocket "~0.11.1"
-    inherits "^2.0.3"
-    json3 "^3.3.2"
-    url-parse "^1.4.3"
-
-sockjs@0.3.20:
-  version "0.3.20"
-  resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.20.tgz#b26a283ec562ef8b2687b44033a4eeceac75d855"
-  integrity sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==
-  dependencies:
-    faye-websocket "^0.10.0"
-    uuid "^3.4.0"
-    websocket-driver "0.6.5"
-
-socks-proxy-agent@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz#3c8991f3145b2799e70e11bd5fbc8b1963116386"
-  integrity sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==
-  dependencies:
-    agent-base "~4.2.1"
-    socks "~2.3.2"
-
-socks@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.3.3.tgz#01129f0a5d534d2b897712ed8aceab7ee65d78e3"
-  integrity sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==
-  dependencies:
-    ip "1.1.5"
-    smart-buffer "^4.1.0"
-
-sort-keys@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
-  integrity sha1-RBttTTRnmPG05J6JIK37oOVD+a0=
-  dependencies:
-    is-plain-obj "^1.0.0"
-
-source-list-map@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
-  integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
-
-source-list-map@~0.1.7:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
-  integrity sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=
-
-source-map-loader@0.2.4:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-0.2.4.tgz#c18b0dc6e23bf66f6792437557c569a11e072271"
-  integrity sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==
-  dependencies:
-    async "^2.5.0"
-    loader-utils "^1.1.0"
-
-source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
-  integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
-  dependencies:
-    atob "^2.1.2"
-    decode-uri-component "^0.2.0"
-    resolve-url "^0.2.1"
-    source-map-url "^0.4.0"
-    urix "^0.1.0"
-
-source-map-support@0.5.13:
-  version "0.5.13"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
-  integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map-support@^0.5.5, source-map-support@^0.5.6, source-map-support@~0.5.12:
-  version "0.5.19"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
-  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map-support@~0.4.0:
-  version "0.4.18"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
-  integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==
-  dependencies:
-    source-map "^0.5.6"
-
-source-map-url@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
-  integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
-
-source-map@0.1.x:
-  version "0.1.43"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
-  integrity sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=
-  dependencies:
-    amdefine ">=0.0.4"
-
-source-map@0.7.3, source-map@^0.7.3:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
-  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
-
-source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
-
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-
-source-map@~0.4.1:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
-  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
-  dependencies:
-    amdefine ">=0.0.4"
-
-sourcemap-codec@^1.4.4:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
-  integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
-
-spdx-correct@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
-  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
-  dependencies:
-    spdx-expression-parse "^3.0.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-exceptions@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
-  integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
-
-spdx-expression-parse@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
-  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
-  dependencies:
-    spdx-exceptions "^2.1.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-license-ids@^3.0.0:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65"
-  integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==
-
-spdy-transport@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31"
-  integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==
-  dependencies:
-    debug "^4.1.0"
-    detect-node "^2.0.4"
-    hpack.js "^2.1.6"
-    obuf "^1.1.2"
-    readable-stream "^3.0.6"
-    wbuf "^1.7.3"
-
-spdy@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b"
-  integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==
-  dependencies:
-    debug "^4.1.0"
-    handle-thing "^2.0.0"
-    http-deceiver "^1.2.7"
-    select-hose "^2.0.0"
-    spdy-transport "^3.0.0"
-
-speed-measure-webpack-plugin@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz#69840a5cdc08b4638697dac7db037f595d7f36a0"
-  integrity sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==
-  dependencies:
-    chalk "^2.0.1"
-
-split-string@^3.0.1, split-string@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
-  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
-  dependencies:
-    extend-shallow "^3.0.0"
-
-sprintf-js@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
-  integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
-
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
-
-ssf@~0.10.2:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/ssf/-/ssf-0.10.3.tgz#8eae1fc29c90a552e7921208f81892d6f77acb2b"
-  integrity sha512-pRuUdW0WwyB2doSqqjWyzwCD6PkfxpHAHdZp39K3dp/Hq7f+xfMwNAWIi16DyrRg4gg9c/RvLYkJTSawTPTm1w==
-  dependencies:
-    frac "~1.1.2"
-
-ssf@~0.11.2:
-  version "0.11.2"
-  resolved "https://registry.yarnpkg.com/ssf/-/ssf-0.11.2.tgz#0b99698b237548d088fc43cdf2b70c1a7512c06c"
-  integrity sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==
-  dependencies:
-    frac "~1.1.2"
-
-sshpk@^1.7.0:
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
-  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    bcrypt-pbkdf "^1.0.0"
-    dashdash "^1.12.0"
-    ecc-jsbn "~0.1.1"
-    getpass "^0.1.1"
-    jsbn "~0.1.0"
-    safer-buffer "^2.0.2"
-    tweetnacl "~0.14.0"
-
-ssri@^6.0.0, ssri@^6.0.1:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5"
-  integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==
-  dependencies:
-    figgy-pudding "^3.5.1"
-
-ssri@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
-  integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
-  dependencies:
-    minipass "^3.1.1"
-
-stackblur-canvas@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/stackblur-canvas/-/stackblur-canvas-1.4.1.tgz#849aa6f94b272ff26f6471fa4130ed1f7e47955b"
-  integrity sha1-hJqm+UsnL/JvZHH6QTDtH35HlVs=
-
-stackblur-canvas@^2.0.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/stackblur-canvas/-/stackblur-canvas-2.5.0.tgz#aa87bbed1560fdcd3138fff344fc6a1c413ebac4"
-  integrity sha512-EeNzTVfj+1In7aSLPKDD03F/ly4RxEuF/EX0YcOG0cKoPXs+SLZxDawQbexQDBzwROs4VKLWTOaZQlZkGBFEIQ==
-
-stackblur@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/stackblur/-/stackblur-1.0.0.tgz#b407a7e05c93b08d66883bb808d7cba3a503f12f"
-  integrity sha1-tAen4FyTsI1miDu4CNfLo6UD8S8=
-
-static-extend@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
-  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
-  dependencies:
-    define-property "^0.2.5"
-    object-copy "^0.1.0"
-
-"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
-  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
-
-stream-browserify@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
-  integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==
-  dependencies:
-    inherits "~2.0.1"
-    readable-stream "^2.0.2"
-
-stream-each@^1.1.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
-  integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==
-  dependencies:
-    end-of-stream "^1.1.0"
-    stream-shift "^1.0.0"
-
-stream-http@^2.7.2:
-  version "2.8.3"
-  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
-  integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==
-  dependencies:
-    builtin-status-codes "^3.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.3.6"
-    to-arraybuffer "^1.0.0"
-    xtend "^4.0.0"
-
-stream-shift@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
-  integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
-
-streamroller@0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-0.7.0.tgz#a1d1b7cf83d39afb0d63049a5acbf93493bdf64b"
-  integrity sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==
-  dependencies:
-    date-format "^1.2.0"
-    debug "^3.1.0"
-    mkdirp "^0.5.1"
-    readable-stream "^2.3.0"
-
-streamroller@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-1.0.6.tgz#8167d8496ed9f19f05ee4b158d9611321b8cacd9"
-  integrity sha512-3QC47Mhv3/aZNFpDDVO44qQb9gwB9QggMEE0sQmkTAwBVYdBRWISdsywlkfm5II1Q5y/pmrHflti/IgmIzdDBg==
-  dependencies:
-    async "^2.6.2"
-    date-format "^2.0.0"
-    debug "^3.2.6"
-    fs-extra "^7.0.1"
-    lodash "^4.17.14"
-
-strict-uri-encode@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
-  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
-
-string-width@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
-string-width@^2.0.0, string-width@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
-
-string-width@^3.0.0, string-width@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
-  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
-  dependencies:
-    emoji-regex "^7.0.1"
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^5.1.0"
-
-string-width@^4.1.0:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"
-  integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.0"
-
-string.prototype.trimend@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
-  integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-
-string.prototype.trimstart@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
-  integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-
-string_decoder@^1.0.0, string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
-  dependencies:
-    safe-buffer "~5.1.0"
-
-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
-  dependencies:
-    ansi-regex "^2.0.0"
-
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
-  dependencies:
-    ansi-regex "^3.0.0"
-
-strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
-  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
-  dependencies:
-    ansi-regex "^4.1.0"
-
-strip-ansi@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
-  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
-  dependencies:
-    ansi-regex "^5.0.0"
-
-strip-bom@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
-
-strip-eof@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
-
-strip-json-comments@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
-
-style-loader@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.0.0.tgz#1d5296f9165e8e2c85d24eee0b7caf9ec8ca1f82"
-  integrity sha512-B0dOCFwv7/eY31a5PCieNwMgMhVGFe9w+rh7s/Bx8kfFkrth9zfTZquoYvdw8URgiqxObQKcpW51Ugz1HjfdZw==
-  dependencies:
-    loader-utils "^1.2.3"
-    schema-utils "^2.0.1"
-
-stylus-loader@3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-3.0.2.tgz#27a706420b05a38e038e7cacb153578d450513c6"
-  integrity sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==
-  dependencies:
-    loader-utils "^1.0.2"
-    lodash.clonedeep "^4.5.0"
-    when "~3.6.x"
-
-stylus@0.54.5:
-  version "0.54.5"
-  resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.5.tgz#42b9560931ca7090ce8515a798ba9e6aa3d6dc79"
-  integrity sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=
-  dependencies:
-    css-parse "1.7.x"
-    debug "*"
-    glob "7.0.x"
-    mkdirp "0.5.x"
-    sax "0.5.x"
-    source-map "0.1.x"
-
-stylus@^0.54.5:
-  version "0.54.8"
-  resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.8.tgz#3da3e65966bc567a7b044bfe0eece653e099d147"
-  integrity sha512-vr54Or4BZ7pJafo2mpf0ZcwA74rpuYCZbxrHBsH8kbcXOwSfvBFwsRfpGO5OD5fhG5HDCFW737PKaawI7OqEAg==
-  dependencies:
-    css-parse "~2.0.0"
-    debug "~3.1.0"
-    glob "^7.1.6"
-    mkdirp "~1.0.4"
-    safer-buffer "^2.1.2"
-    sax "~1.2.4"
-    semver "^6.3.0"
-    source-map "^0.7.3"
-
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
-
-supports-color@^5.3.0, supports-color@^5.4.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
-  dependencies:
-    has-flag "^3.0.0"
-
-supports-color@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
-  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
-  dependencies:
-    has-flag "^3.0.0"
-
-supports-color@^7.0.0, supports-color@^7.1.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
-  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
-  dependencies:
-    has-flag "^4.0.0"
-
-svg-pathdata@^6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/svg-pathdata/-/svg-pathdata-6.0.3.tgz#80b0e0283b652ccbafb69ad4f8f73e8d3fbf2cac"
-  integrity sha512-qsjeeq5YjBZ5eMdFuUa4ZosMLxgr5RZ+F+Y1OrDhuOCEInRMA3x74XdBtggJcj9kOeInz0WE+LgCPDkZFlBYJw==
-
-symbol-observable@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
-  integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
-
-"symbol-tree@>= 3.1.0 < 4.0.0":
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
-  integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
-
-tailwindcss@^1.1.4:
-  version "1.9.6"
-  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-1.9.6.tgz#0c5089911d24e1e98e592a31bfdb3d8f34ecf1a0"
-  integrity sha512-nY8WYM/RLPqGsPEGEV2z63riyQPcHYZUJpAwdyBzVpxQHOHqHE+F/fvbCeXhdF1+TA5l72vSkZrtYCB9hRcwkQ==
-  dependencies:
-    "@fullhuman/postcss-purgecss" "^2.1.2"
-    autoprefixer "^9.4.5"
-    browserslist "^4.12.0"
-    bytes "^3.0.0"
-    chalk "^3.0.0 || ^4.0.0"
-    color "^3.1.2"
-    detective "^5.2.0"
-    fs-extra "^8.0.0"
-    html-tags "^3.1.0"
-    lodash "^4.17.20"
-    node-emoji "^1.8.1"
-    normalize.css "^8.0.1"
-    object-hash "^2.0.3"
-    postcss "^7.0.11"
-    postcss-functions "^3.0.0"
-    postcss-js "^2.0.0"
-    postcss-nested "^4.1.1"
-    postcss-selector-parser "^6.0.0"
-    postcss-value-parser "^4.1.0"
-    pretty-hrtime "^1.0.3"
-    reduce-css-calc "^2.1.6"
-    resolve "^1.14.2"
-
-tapable@^1.0.0, tapable@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
-  integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
-
-tar@^4.4.8:
-  version "4.4.13"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
-  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
-  dependencies:
-    chownr "^1.1.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.8.6"
-    minizlib "^1.2.1"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.2"
-    yallist "^3.0.3"
-
-tar@^6.0.2:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz#d1724e9bcc04b977b18d5c573b333a2207229a83"
-  integrity sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==
-  dependencies:
-    chownr "^2.0.0"
-    fs-minipass "^2.0.0"
-    minipass "^3.0.0"
-    minizlib "^2.1.1"
-    mkdirp "^1.0.3"
-    yallist "^4.0.0"
-
-term-size@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69"
-  integrity sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=
-  dependencies:
-    execa "^0.7.0"
-
-terser-webpack-plugin@3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-3.0.3.tgz#23bda2687b197f878a743373b9411d917adc2e45"
-  integrity sha512-bZFnotuIKq5Rqzrs+qIwFzGdKdffV9epG5vDSEbYzvKAhPeR5RbbrQysfPgbIIMhNAQtZD2hGwBfSKUXjXZZZw==
-  dependencies:
-    cacache "^15.0.4"
-    find-cache-dir "^3.3.1"
-    jest-worker "^26.0.0"
-    p-limit "^2.3.0"
-    schema-utils "^2.6.6"
-    serialize-javascript "^3.1.0"
-    source-map "^0.6.1"
-    terser "^4.6.13"
-    webpack-sources "^1.4.3"
-
-terser-webpack-plugin@^1.4.1:
-  version "1.4.5"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz#a217aefaea330e734ffacb6120ec1fa312d6040b"
-  integrity sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==
-  dependencies:
-    cacache "^12.0.2"
-    find-cache-dir "^2.1.0"
-    is-wsl "^1.1.0"
-    schema-utils "^1.0.0"
-    serialize-javascript "^4.0.0"
-    source-map "^0.6.1"
-    terser "^4.1.2"
-    webpack-sources "^1.4.0"
-    worker-farm "^1.7.0"
-
-terser@4.6.3:
-  version "4.6.3"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.3.tgz#e33aa42461ced5238d352d2df2a67f21921f8d87"
-  integrity sha512-Lw+ieAXmY69d09IIc/yqeBqXpEQIpDGZqT34ui1QWXIUpR2RjbqEkT8X7Lgex19hslSqcWM5iMN2kM11eMsESQ==
-  dependencies:
-    commander "^2.20.0"
-    source-map "~0.6.1"
-    source-map-support "~0.5.12"
-
-terser@^4.1.2, terser@^4.6.13:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
-  integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
-  dependencies:
-    commander "^2.20.0"
-    source-map "~0.6.1"
-    source-map-support "~0.5.12"
-
-text-segmentation@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/text-segmentation/-/text-segmentation-1.0.3.tgz#52a388159efffe746b24a63ba311b6ac9f2d7943"
-  integrity sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==
-  dependencies:
-    utrie "^1.0.2"
-
-thenify-all@^1.0.0, thenify-all@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
-  integrity sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=
-  dependencies:
-    thenify ">= 3.1.0 < 4"
-
-"thenify@>= 3.1.0 < 4":
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f"
-  integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==
-  dependencies:
-    any-promise "^1.0.0"
-
-three@0.93.0:
-  version "0.93.0"
-  resolved "https://registry.yarnpkg.com/three/-/three-0.93.0.tgz#3fd6c367ef4554abbb6e16ad69936283e895c123"
-  integrity sha1-P9bDZ+9FVKu7bhataZNig+iVwSM=
-
-three@^0.113.2:
-  version "0.113.2"
-  resolved "https://registry.yarnpkg.com/three/-/three-0.113.2.tgz#04791d491fe4359330f9dbe7b767db18bfb35d67"
-  integrity sha512-x3vrKW41/UtbWbWduWKGlfIc043SvHWr3YltehYq+UGb9YglQ2oztNGvl2eut05JtNSmP11Mh3t6Xak5/0e+Fg==
-
-through2@^2.0.0:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
-  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
-  dependencies:
-    readable-stream "~2.3.6"
-    xtend "~4.0.1"
-
-"through@>=2.2.7 <3", through@X.X.X, through@^2.3.6:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
-
-thunky@^1.0.2:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
-  integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==
-
-timers-browserify@^2.0.4:
-  version "2.0.12"
-  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz#44a45c11fbf407f34f97bccd1577c652361b00ee"
-  integrity sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==
-  dependencies:
-    setimmediate "^1.0.4"
-
-timsort@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
-  integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=
-
-tmp@0.0.30:
-  version "0.0.30"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.30.tgz#72419d4a8be7d6ce75148fd8b324e593a711c2ed"
-  integrity sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=
-  dependencies:
-    os-tmpdir "~1.0.1"
-
-tmp@0.0.33, tmp@0.0.x, tmp@^0.0.33:
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
-  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
-  dependencies:
-    os-tmpdir "~1.0.2"
-
-to-array@0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
-  integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA=
-
-to-arraybuffer@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
-  integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
-
-to-fast-properties@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
-  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
-
-to-object-path@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
-  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
-  dependencies:
-    kind-of "^3.0.2"
-
-to-readable-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771"
-  integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==
-
-to-regex-range@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
-  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
-  dependencies:
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
-
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
-
-to-regex@^3.0.1, to-regex@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
-  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
-  dependencies:
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    regex-not "^1.0.2"
-    safe-regex "^1.1.0"
-
-toidentifier@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
-  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
-
-topojson-client@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/topojson-client/-/topojson-client-3.1.0.tgz#22e8b1ed08a2b922feeb4af6f53b6ef09a467b99"
-  integrity sha512-605uxS6bcYxGXw9qi62XyrV6Q3xwbndjachmNxu8HWTtVPxZfEJN9fd/SZS1Q54Sn2y0TMyMxFj/cJINqGHrKw==
-  dependencies:
-    commander "2"
-
-totalist@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/totalist/-/totalist-1.1.0.tgz#a4d65a3e546517701e3e5c37a47a70ac97fe56df"
-  integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==
-
-tough-cookie@^2.2.0, tough-cookie@~2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
-  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
-  dependencies:
-    psl "^1.1.28"
-    punycode "^2.1.1"
-
-tr46@~0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-  integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
-
-traverse@>=0.2.4:
-  version "0.6.6"
-  resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137"
-  integrity sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=
-
-"traverse@>=0.3.0 <0.4":
-  version "0.3.9"
-  resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9"
-  integrity sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=
-
-tree-kill@1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
-  integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
-
-ts-node@~8.3.0:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.3.0.tgz#e4059618411371924a1fb5f3b125915f324efb57"
-  integrity sha512-dyNS/RqyVTDcmNM4NIBAeDMpsAdaQ+ojdf0GOLqE6nwJOgzEkdRNzJywhDfwnuvB10oa6NLVG1rUJQCpRN7qoQ==
-  dependencies:
-    arg "^4.1.0"
-    diff "^4.0.1"
-    make-error "^1.1.1"
-    source-map-support "^0.5.6"
-    yn "^3.0.0"
-
-tsickle@^0.36.0:
-  version "0.36.0"
-  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.36.0.tgz#d6f47cdd14d009f3fea4e8516cd46c1393f3aa02"
-  integrity sha512-lrEMU5e+efx5DXtrRSGsxgkCOVRw4WeVaOkQ2pMIxCZDY5rISagVyP4yi7t6M396POFSbMHgQMT/vz0HmfxWVA==
-  dependencies:
-    minimist "^1.2.0"
-    mkdirp "^0.5.1"
-    source-map "^0.7.3"
-
-tslib@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
-  integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
-
-tslib@1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"
-  integrity sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ==
-
-tslib@^1.10.0, tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
-  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
-
-tslib@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c"
-  integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==
-
-tslint-angular@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/tslint-angular/-/tslint-angular-3.0.3.tgz#872d4fe36497d20582dbe4b8ed3338ff0c922c30"
-  integrity sha512-5xD1gLE89lBExfSbMslDw/ZfOZM0t0CJsoJa4svsgF7tlwVS3IpXjzNcNRN0RZqDBj+cdTlbeel6GpZ3PqpPiw==
-
-tslint-config-airbnb@^5.11.1:
-  version "5.11.2"
-  resolved "https://registry.yarnpkg.com/tslint-config-airbnb/-/tslint-config-airbnb-5.11.2.tgz#2f3d239fa3923be8e7a4372217a7ed552671528f"
-  integrity sha512-mUpHPTeeCFx8XARGG/kzYP4dPSOgoCqNiYbGHh09qTH8q+Y1ghsOgaeZKYYQT7IyxMos523z/QBaiv2zKNBcow==
-  dependencies:
-    tslint-consistent-codestyle "^1.14.1"
-    tslint-eslint-rules "^5.4.0"
-    tslint-microsoft-contrib "~5.2.1"
-
-tslint-consistent-codestyle@^1.14.1:
-  version "1.16.0"
-  resolved "https://registry.yarnpkg.com/tslint-consistent-codestyle/-/tslint-consistent-codestyle-1.16.0.tgz#52348ea899a7e025b37cc6545751c6a566a19077"
-  integrity sha512-ebR/xHyMEuU36hGNOgCfjGBNYxBPixf0yU1Yoo6s3BrpBRFccjPOmIVaVvQsWAUAMdmfzHOCihVkcaMfimqvHw==
-  dependencies:
-    "@fimbul/bifrost" "^0.21.0"
-    tslib "^1.7.1"
-    tsutils "^2.29.0"
-
-tslint-eslint-rules@^5.4.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/tslint-eslint-rules/-/tslint-eslint-rules-5.4.0.tgz#e488cc9181bf193fe5cd7bfca213a7695f1737b5"
-  integrity sha512-WlSXE+J2vY/VPgIcqQuijMQiel+UtmXS+4nvK4ZzlDiqBfXse8FAvkNnTcYhnQyOTW5KFM+uRRGXxYhFpuBc6w==
-  dependencies:
-    doctrine "0.7.2"
-    tslib "1.9.0"
-    tsutils "^3.0.0"
-
-tslint-microsoft-contrib@~5.2.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/tslint-microsoft-contrib/-/tslint-microsoft-contrib-5.2.1.tgz#a6286839f800e2591d041ea2800c77487844ad81"
-  integrity sha512-PDYjvpo0gN9IfMULwKk0KpVOPMhU6cNoT9VwCOLeDl/QS8v8W2yspRpFFuUS7/c5EIH/n8ApMi8TxJAz1tfFUA==
-  dependencies:
-    tsutils "^2.27.2 <2.29.0"
-
-tslint@~5.18.0:
-  version "5.18.0"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.18.0.tgz#f61a6ddcf372344ac5e41708095bbf043a147ac6"
-  integrity sha512-Q3kXkuDEijQ37nXZZLKErssQVnwCV/+23gFEMROi8IlbaBG6tXqLPQJ5Wjcyt/yHPKBC+hD5SzuGaMora+ZS6w==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    builtin-modules "^1.1.1"
-    chalk "^2.3.0"
-    commander "^2.12.1"
-    diff "^3.2.0"
-    glob "^7.1.1"
-    js-yaml "^3.13.1"
-    minimatch "^3.0.4"
-    mkdirp "^0.5.1"
-    resolve "^1.3.2"
-    semver "^5.3.0"
-    tslib "^1.8.0"
-    tsutils "^2.29.0"
-
-tsml@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/tsml/-/tsml-1.0.1.tgz#89f8218b9d9e257f47d7f6b56d01c5a4d2c68fc3"
-  integrity sha1-ifghi52eJX9H1/a1bQHFpNLGj8M=
-
-"tsutils@^2.27.2 <2.29.0":
-  version "2.28.0"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.28.0.tgz#6bd71e160828f9d019b6f4e844742228f85169a1"
-  integrity sha512-bh5nAtW0tuhvOJnx1GLRn5ScraRLICGyJV5wJhtRWOLsxW70Kk5tZtpK3O/hW6LDnqKS9mlUMPZj9fEMJ0gxqA==
-  dependencies:
-    tslib "^1.8.1"
-
-tsutils@^2.29.0:
-  version "2.29.0"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
-  integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==
-  dependencies:
-    tslib "^1.8.1"
-
-tsutils@^3.0.0, tsutils@^3.5.0:
-  version "3.21.0"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
-  integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
-  dependencies:
-    tslib "^1.8.1"
-
-tty-browserify@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
-  integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
-
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
-  dependencies:
-    safe-buffer "^5.0.1"
-
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
-
-type-check@~0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
-  dependencies:
-    prelude-ls "~1.1.2"
-
-type-fest@^0.21.3:
-  version "0.21.3"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
-  integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
-
-type-fest@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1"
-  integrity sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==
-
-type-fest@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
-  integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
-
-type-is@~1.6.17, type-is@~1.6.18:
-  version "1.6.18"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
-  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
-  dependencies:
-    media-typer "0.3.0"
-    mime-types "~2.1.24"
-
-typedarray@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
-
-typeface-roboto@0.0.75:
-  version "0.0.75"
-  resolved "https://registry.yarnpkg.com/typeface-roboto/-/typeface-roboto-0.0.75.tgz#98d5ba35ec234bbc7172374c8297277099cc712b"
-  integrity sha512-VrR/IiH00Z1tFP4vDGfwZ1esNqTiDMchBEXYY9kilT6wRGgFoCAlgkEUMHb1E3mB0FsfZhv756IF0+R+SFPfdg==
-
-typescript-tslint-plugin@^0.5.4:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/typescript-tslint-plugin/-/typescript-tslint-plugin-0.5.5.tgz#673875c43640251f1ab3d63745d7d49726ff961c"
-  integrity sha512-tR5igNQP+6FhxaPJYRlUBVsEl0n5cSuXRbg7L1y80mL4B1jUHb8uiIcbQBJ9zWyypJEdFYFUccpXxvMwZR8+AA==
-  dependencies:
-    minimatch "^3.0.4"
-    mock-require "^3.0.3"
-    vscode-languageserver "^5.2.1"
-
-typescript@3.5.3, typescript@~3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977"
-  integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==
-
-ultron@~1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
-  integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==
-
-unbox-primitive@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
-  integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==
-  dependencies:
-    function-bind "^1.1.1"
-    has-bigints "^1.0.1"
-    has-symbols "^1.0.2"
-    which-boxed-primitive "^1.0.2"
-
-unicode-canonical-property-names-ecmascript@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
-  integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==
-
-unicode-match-property-ecmascript@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
-  integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==
-  dependencies:
-    unicode-canonical-property-names-ecmascript "^1.0.4"
-    unicode-property-aliases-ecmascript "^1.0.4"
-
-unicode-match-property-value-ecmascript@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531"
-  integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==
-
-unicode-property-aliases-ecmascript@^1.0.4:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4"
-  integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==
-
-union-value@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
-  integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
-  dependencies:
-    arr-union "^3.1.0"
-    get-value "^2.0.6"
-    is-extendable "^0.1.1"
-    set-value "^2.0.1"
-
-unique-filename@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
-  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
-  dependencies:
-    unique-slug "^2.0.0"
-
-unique-slug@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
-  integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
-  dependencies:
-    imurmurhash "^0.1.4"
-
-unique-string@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a"
-  integrity sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=
-  dependencies:
-    crypto-random-string "^1.0.0"
-
-universal-analytics@^0.4.20:
-  version "0.4.23"
-  resolved "https://registry.yarnpkg.com/universal-analytics/-/universal-analytics-0.4.23.tgz#d915e676850c25c4156762471bdd7cf2eaaca8ac"
-  integrity sha512-lgMIH7XBI6OgYn1woDEmxhGdj8yDefMKg7GkWdeATAlQZFrMrNyxSkpDzY57iY0/6fdlzTbBV03OawvvzG+q7A==
-  dependencies:
-    debug "^4.1.1"
-    request "^2.88.2"
-    uuid "^3.0.0"
-
-universalify@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
-  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
-
-unpipe@1.0.0, unpipe@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
-  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
-
-unset-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
-  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
-  dependencies:
-    has-value "^0.3.1"
-    isobject "^3.0.0"
-
-upath@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
-  integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
-
-update-notifier@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-3.0.1.tgz#78ecb68b915e2fd1be9f767f6e298ce87b736250"
-  integrity sha512-grrmrB6Zb8DUiyDIaeRTBCkgISYUgETNe7NglEbVsrLWXeESnlCSP50WfRSj/GmzMPl6Uchj24S/p80nP/ZQrQ==
-  dependencies:
-    boxen "^3.0.0"
-    chalk "^2.0.1"
-    configstore "^4.0.0"
-    has-yarn "^2.1.0"
-    import-lazy "^2.1.0"
-    is-ci "^2.0.0"
-    is-installed-globally "^0.1.0"
-    is-npm "^3.0.0"
-    is-yarn-global "^0.3.0"
-    latest-version "^5.0.0"
-    semver-diff "^2.0.0"
-    xdg-basedir "^3.0.0"
-
-uri-js@^4.2.2:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
-  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
-  dependencies:
-    punycode "^2.1.0"
-
-urix@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
-  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
-
-url-parse-lax@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
-  integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=
-  dependencies:
-    prepend-http "^2.0.0"
-
-url-parse@^1.4.3:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.1.tgz#d5fa9890af8a5e1f274a2c98376510f6425f6e3b"
-  integrity sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==
-  dependencies:
-    querystringify "^2.1.1"
-    requires-port "^1.0.0"
-
-url-toolkit@^2.1.1, url-toolkit@^2.1.3, url-toolkit@^2.2.1:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/url-toolkit/-/url-toolkit-2.2.2.tgz#51ef27b56d3187185f9ecf4a8ac7e8f55203c89d"
-  integrity sha512-l25w6Sy+Iy3/IbogunxhWwljPaDnqpiKvrQRoLBm6DfISco7NyRIS7Zf6+Oxhy1T8kHxWdwLND7ZZba6NjXMug==
-
-url@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
-  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
-  dependencies:
-    punycode "1.3.2"
-    querystring "0.2.0"
-
-use@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
-  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
-
-useragent@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.3.0.tgz#217f943ad540cb2128658ab23fc960f6a88c9972"
-  integrity sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==
-  dependencies:
-    lru-cache "4.1.x"
-    tmp "0.0.x"
-
-util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
-
-util-promisify@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/util-promisify/-/util-promisify-2.1.0.tgz#3c2236476c4d32c5ff3c47002add7c13b9a82a53"
-  integrity sha1-PCI2R2xNMsX/PEcAKt18E7moKlM=
-  dependencies:
-    object.getownpropertydescriptors "^2.0.3"
-
-util@0.10.3:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
-  integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
-  dependencies:
-    inherits "2.0.1"
-
-util@^0.11.0:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61"
-  integrity sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==
-  dependencies:
-    inherits "2.0.3"
-
-utils-merge@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
-  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
-
-utrie@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/utrie/-/utrie-1.0.2.tgz#d42fe44de9bc0119c25de7f564a6ed1b2c87a645"
-  integrity sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==
-  dependencies:
-    base64-arraybuffer "^1.0.2"
-
-uuid@^3.0.0, uuid@^3.3.2, uuid@^3.3.3, uuid@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
-  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
-
-uuid@^8.3.2:
-  version "8.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
-  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
-
-validate-npm-package-license@^3.0.1:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
-  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
-  dependencies:
-    spdx-correct "^3.0.0"
-    spdx-expression-parse "^3.0.0"
-
-validate-npm-package-name@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
-  integrity sha1-X6kS2B630MdK/BQN5zF/DKffQ34=
-  dependencies:
-    builtins "^1.0.3"
-
-vary@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
-  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
-
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
-  dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
-
-video.js@7.6.0:
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/video.js/-/video.js-7.6.0.tgz#556c151004e27d340be3a732a14bf7c1aaf7e8b4"
-  integrity sha512-A0HSKzAmcYkd1xyExqUlM6n8bkghcX54iCvW08bPvvl3UHt8d8zijuylfIWu8vo1Z8fYyk9HPOFs1i3Cldr/cw==
-  dependencies:
-    "@babel/runtime" "^7.4.5"
-    "@videojs/http-streaming" "1.10.3"
-    global "4.3.2"
-    keycode "^2.2.0"
-    safe-json-parse "4.0.0"
-    tsml "1.0.1"
-    videojs-font "3.2.0"
-    videojs-vtt.js "^0.14.1"
-    xhr "2.4.0"
-
-"video.js@^5.6.0 || ^6.2.8 || ^7.0.2", "video.js@^6 || ^7", "video.js@^6.8.0 || ^7.0.0", video.js@^7.5.5:
-  version "7.11.8"
-  resolved "https://registry.yarnpkg.com/video.js/-/video.js-7.11.8.tgz#1fa27c56f30a436b06b44f21560f223e264aec51"
-  integrity sha512-iQmNYB+pdgu8b45Za1AKSa5J7uDyHIqfJy+picw4voKfjErXK/BEvs+A3f99Ck7SCZU4cmMmX/s17AwaaNs+1w==
-  dependencies:
-    "@babel/runtime" "^7.9.2"
-    "@videojs/http-streaming" "2.6.4"
-    "@videojs/xhr" "2.5.1"
-    global "4.3.2"
-    keycode "^2.2.0"
-    remove "^0.1.5"
-    rollup-plugin-replace "^2.2.0"
-    safe-json-parse "4.0.0"
-    videojs-font "3.2.0"
-    videojs-vtt.js "^0.15.2"
-
-videojs-contrib-quality-levels@^2.0.9:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/videojs-contrib-quality-levels/-/videojs-contrib-quality-levels-2.1.0.tgz#046e9e21ed01043f512b83a1916001d552457083"
-  integrity sha512-dqGQGbL9AFhucxki7Zh0c3kIhH0PAPcHEh6jUdRyaFCVeOuqnJrOYs/3wNtsokDdBdRf2Du2annpu4Z2XaSZRg==
-  dependencies:
-    global "^4.3.2"
-    video.js "^6 || ^7"
-
-videojs-font@3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/videojs-font/-/videojs-font-3.2.0.tgz#212c9d3f4e4ec3fa7345167d64316add35e92232"
-  integrity sha512-g8vHMKK2/JGorSfqAZQUmYYNnXmfec4MLhwtEFS+mMs2IDY398GLysy6BH6K+aS1KMNu/xWZ8Sue/X/mdQPliA==
-
-videojs-hls-quality-selector@^1.0.5:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/videojs-hls-quality-selector/-/videojs-hls-quality-selector-1.1.4.tgz#281b78c6653137b08c544e806aa9c91b71d16989"
-  integrity sha512-wWAjlLQui02gp//t9KHGd3XnbYO7wdOptskh3ZYCrbl/5Lbkveqb9yBVjH4e0zIQBPvGdWPMcOeDukf8iuYeBw==
-  dependencies:
-    global "^4.3.2"
-    karma-safaritechpreview-launcher "0.0.6"
-    video.js "^7.5.5"
-    videojs-contrib-quality-levels "^2.0.9"
-
-videojs-vr@1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/videojs-vr/-/videojs-vr-1.5.0.tgz#507953228c626847a732ce651a6efede9f643dc1"
-  integrity sha512-S3/pnk0xP7tGuRX/qe9x4DDppyGGrOGho1IEaBuSyOBnxb1n75Qq+OT4Y7vf9YQp416/wfO6chml1tA5MhMhnw==
-  dependencies:
-    global "^4.3.2"
-    three "0.93.0"
-    video.js "^6 || ^7"
-    webvr-polyfill "0.10.6"
-
-videojs-vtt.js@^0.14.1:
-  version "0.14.1"
-  resolved "https://registry.yarnpkg.com/videojs-vtt.js/-/videojs-vtt.js-0.14.1.tgz#da583eb1fc9c81c826a9432b706040e8dea49911"
-  integrity sha512-YxOiywx6N9t3J5nqsE5WN2Sw4CSqVe3zV+AZm2T4syOc2buNJaD6ZoexSdeszx2sHLU/RRo2r4BJAXFDQ7Qo2Q==
-  dependencies:
-    global "^4.3.1"
-
-videojs-vtt.js@^0.15.2:
-  version "0.15.3"
-  resolved "https://registry.yarnpkg.com/videojs-vtt.js/-/videojs-vtt.js-0.15.3.tgz#84260393b79487fcf195d9372f812d7fab83a993"
-  integrity sha512-5FvVsICuMRx6Hd7H/Y9s9GDeEtYcXQWzGMS+sl4UX3t/zoHp3y+isSfIPRochnTH7h+Bh1ILyC639xy9Z6kPag==
-  dependencies:
-    global "^4.3.1"
-
-videojs-youtube@^2.6.0:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/videojs-youtube/-/videojs-youtube-2.6.1.tgz#3f7cce15229509ea6d54582e28793df530254860"
-  integrity sha512-qvwrkgXixbX8xzdkBa7o5r9KUITRISAy4bbyrpBgub3m0mhwz6WLXDIwJZ6/w4Z/JijWjLQqlg8W1jYhCEgHZw==
-  dependencies:
-    video.js "^5.6.0 || ^6.2.8 || ^7.0.2"
-
-vis-data@^6.1.1:
-  version "6.6.1"
-  resolved "https://registry.yarnpkg.com/vis-data/-/vis-data-6.6.1.tgz#2aa52e46c305ad46bb7abe6e7634e2eecd743b15"
-  integrity sha512-xmujDB2Dzf8T04rGFJ9OP4OA6zRVrz8R9hb0CVKryBrZRCljCga9JjSfgctA8S7wdZu7otDtUIwX4ZOgfV/57w==
-
-vis-network@^5.2.4:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/vis-network/-/vis-network-5.4.1.tgz#e0e33d23775e834f4cfd961bd7b92bf11df097c6"
-  integrity sha512-hUJlFWoCmLup6IxoXCr//OO2ZCkC8jrXEkkHLG1DhBgB54Y3K33+e5q4tc436inMlGzfqqaKTIToNbOGr8Szww==
-  dependencies:
-    "@egjs/hammerjs" "^2.0.15"
-    component-emitter "^1.3.0"
-    keycharm "^0.2.0"
-    moment "^2.24.0"
-    timsort "^0.3.0"
-    vis-data "^6.1.1"
-    vis-util "^1.1.6"
-
-vis-util@^1.1.6:
-  version "1.1.10"
-  resolved "https://registry.yarnpkg.com/vis-util/-/vis-util-1.1.10.tgz#1c0ebb17ad5139959122dcd12aae54a4e173846a"
-  integrity sha512-8hGSxsFi2ogYYweClQyITzWnirWgQ8p0i9M4d3OXMuUO8vjXrf+2zHOYI9OZbtUduxAWuMEePnS9BXDtPJmJ7Q==
-  dependencies:
-    moment "2.24.0"
-    vis-uuid "1.1.3"
-
-vis-util@^5.0.2:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/vis-util/-/vis-util-5.0.3.tgz#6a9d67c6ed92f2bfa67e50c20166bb5f59ac07bf"
-  integrity sha512-Wf9STUcFrDzK4/Zr7B6epW2Kvm3ORNWF+WiwEz2dpf5RdWkLUXFSbLcuB88n1W6tCdFwVN+v3V4/Xmn9PeL39g==
-
-vis-uuid@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/vis-uuid/-/vis-uuid-1.1.3.tgz#2f53ff35e9e026b0ec93bc433ce685c40c2f784c"
-  integrity sha512-2B6XdY1bkzbUh+TugmnAaFa61KO9R5pzBzIuFIm8a9FrkbxIdSmQXV+FbfkL8QunkQV/bT0JDLQ2puqCS2+0Og==
-
-vm-browserify@^1.0.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
-  integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
-
-void-elements@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
-  integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
-
-vscode-jsonrpc@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz#a7bf74ef3254d0a0c272fab15c82128e378b3be9"
-  integrity sha512-perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg==
-
-vscode-languageserver-protocol@3.14.1:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz#b8aab6afae2849c84a8983d39a1cf742417afe2f"
-  integrity sha512-IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g==
-  dependencies:
-    vscode-jsonrpc "^4.0.0"
-    vscode-languageserver-types "3.14.0"
-
-vscode-languageserver-types@3.14.0:
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz#d3b5952246d30e5241592b6dde8280e03942e743"
-  integrity sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==
-
-vscode-languageserver@^5.2.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.2.1.tgz#0d2feddd33f92aadf5da32450df498d52f6f14eb"
-  integrity sha512-GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A==
-  dependencies:
-    vscode-languageserver-protocol "3.14.1"
-    vscode-uri "^1.0.6"
-
-vscode-uri@^1.0.6:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.8.tgz#9769aaececae4026fb6e22359cb38946580ded59"
-  integrity sha512-obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ==
-
-watchpack-chokidar2@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz#38500072ee6ece66f3769936950ea1771be1c957"
-  integrity sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==
-  dependencies:
-    chokidar "^2.1.8"
-
-watchpack@^1.6.0:
-  version "1.7.5"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453"
-  integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==
-  dependencies:
-    graceful-fs "^4.1.2"
-    neo-async "^2.5.0"
-  optionalDependencies:
-    chokidar "^3.4.1"
-    watchpack-chokidar2 "^2.0.1"
-
-wbuf@^1.1.0, wbuf@^1.7.3:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
-  integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==
-  dependencies:
-    minimalistic-assert "^1.0.0"
-
-webdriver-js-extender@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/webdriver-js-extender/-/webdriver-js-extender-2.1.0.tgz#57d7a93c00db4cc8d556e4d3db4b5db0a80c3bb7"
-  integrity sha512-lcUKrjbBfCK6MNsh7xaY2UAUmZwe+/ib03AjVOpFobX4O7+83BUveSrLfU0Qsyb1DaKJdQRbuU+kM9aZ6QUhiQ==
-  dependencies:
-    "@types/selenium-webdriver" "^3.0.0"
-    selenium-webdriver "^3.0.1"
-
-webdriver-manager@^12.0.6:
-  version "12.1.8"
-  resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.8.tgz#5e70e73eaaf53a0767d5745270addafbc5905fd4"
-  integrity sha512-qJR36SXG2VwKugPcdwhaqcLQOD7r8P2Xiv9sfNbfZrKBnX243iAkOueX1yAmeNgIKhJ3YAT/F2gq6IiEZzahsg==
-  dependencies:
-    adm-zip "^0.4.9"
-    chalk "^1.1.1"
-    del "^2.2.0"
-    glob "^7.0.3"
-    ini "^1.3.4"
-    minimist "^1.2.0"
-    q "^1.4.1"
-    request "^2.87.0"
-    rimraf "^2.5.2"
-    semver "^5.3.0"
-    xml2js "^0.4.17"
-
-webidl-conversions@^3.0.0, webidl-conversions@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-  integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
-
-webpack-bundle-analyzer@^4.4.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.5.0.tgz#1b0eea2947e73528754a6f9af3e91b2b6e0f79d5"
-  integrity sha512-GUMZlM3SKwS8Z+CKeIFx7CVoHn3dXFcUAjT/dcZQQmfSZGvitPfMob2ipjai7ovFFqPvTqkEZ/leL4O0YOdAYQ==
-  dependencies:
-    acorn "^8.0.4"
-    acorn-walk "^8.0.0"
-    chalk "^4.1.0"
-    commander "^7.2.0"
-    gzip-size "^6.0.0"
-    lodash "^4.17.20"
-    opener "^1.5.2"
-    sirv "^1.0.7"
-    ws "^7.3.1"
-
-webpack-core@^0.6.8:
-  version "0.6.9"
-  resolved "https://registry.yarnpkg.com/webpack-core/-/webpack-core-0.6.9.tgz#fc571588c8558da77be9efb6debdc5a3b172bdc2"
-  integrity sha1-/FcViMhVjad76e+23r3Fo7FyvcI=
-  dependencies:
-    source-list-map "~0.1.7"
-    source-map "~0.4.1"
-
-webpack-dev-middleware@3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz#0019c3db716e3fa5cecbf64f2ab88a74bab331f3"
-  integrity sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==
-  dependencies:
-    memory-fs "^0.4.1"
-    mime "^2.4.4"
-    mkdirp "^0.5.1"
-    range-parser "^1.2.1"
-    webpack-log "^2.0.0"
-
-webpack-dev-middleware@^3.7.2:
-  version "3.7.3"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz#0639372b143262e2b84ab95d3b91a7597061c2c5"
-  integrity sha512-djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ==
-  dependencies:
-    memory-fs "^0.4.1"
-    mime "^2.4.4"
-    mkdirp "^0.5.1"
-    range-parser "^1.2.1"
-    webpack-log "^2.0.0"
-
-webpack-dev-server@3.11.0:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz#8f154a3bce1bcfd1cc618ef4e703278855e7ff8c"
-  integrity sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg==
-  dependencies:
-    ansi-html "0.0.7"
-    bonjour "^3.5.0"
-    chokidar "^2.1.8"
-    compression "^1.7.4"
-    connect-history-api-fallback "^1.6.0"
-    debug "^4.1.1"
-    del "^4.1.1"
-    express "^4.17.1"
-    html-entities "^1.3.1"
-    http-proxy-middleware "0.19.1"
-    import-local "^2.0.0"
-    internal-ip "^4.3.0"
-    ip "^1.1.5"
-    is-absolute-url "^3.0.3"
-    killable "^1.0.1"
-    loglevel "^1.6.8"
-    opn "^5.5.0"
-    p-retry "^3.0.1"
-    portfinder "^1.0.26"
-    schema-utils "^1.0.0"
-    selfsigned "^1.10.7"
-    semver "^6.3.0"
-    serve-index "^1.9.1"
-    sockjs "0.3.20"
-    sockjs-client "1.4.0"
-    spdy "^4.0.2"
-    strip-ansi "^3.0.1"
-    supports-color "^6.1.0"
-    url "^0.11.0"
-    webpack-dev-middleware "^3.7.2"
-    webpack-log "^2.0.0"
-    ws "^6.2.1"
-    yargs "^13.3.2"
-
-webpack-log@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f"
-  integrity sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==
-  dependencies:
-    ansi-colors "^3.0.0"
-    uuid "^3.3.2"
-
-webpack-merge@4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.1.tgz#5e923cf802ea2ace4fd5af1d3247368a633489b4"
-  integrity sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==
-  dependencies:
-    lodash "^4.17.5"
-
-webpack-sources@1.4.3, webpack-sources@^1.1.0, webpack-sources@^1.2.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
-  integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==
-  dependencies:
-    source-list-map "^2.0.0"
-    source-map "~0.6.1"
-
-webpack-subresource-integrity@1.1.0-rc.6:
-  version "1.1.0-rc.6"
-  resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.1.0-rc.6.tgz#37f6f1264e1eb378e41465a98da80fad76ab8886"
-  integrity sha512-Az7y8xTniNhaA0620AV1KPwWOqawurVVDzQSpPAeR5RwNbL91GoBSJAAo9cfd+GiFHwsS5bbHepBw1e6Hzxy4w==
-  dependencies:
-    webpack-core "^0.6.8"
-
-webpack@4.39.2:
-  version "4.39.2"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.39.2.tgz#c9aa5c1776d7c309d1b3911764f0288c8c2816aa"
-  integrity sha512-AKgTfz3xPSsEibH00JfZ9sHXGUwIQ6eZ9tLN8+VLzachk1Cw2LVmy+4R7ZiwTa9cZZ15tzySjeMui/UnSCAZhA==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-module-context" "1.8.5"
-    "@webassemblyjs/wasm-edit" "1.8.5"
-    "@webassemblyjs/wasm-parser" "1.8.5"
-    acorn "^6.2.1"
-    ajv "^6.10.2"
-    ajv-keywords "^3.4.1"
-    chrome-trace-event "^1.0.2"
-    enhanced-resolve "^4.1.0"
-    eslint-scope "^4.0.3"
-    json-parse-better-errors "^1.0.2"
-    loader-runner "^2.4.0"
-    loader-utils "^1.2.3"
-    memory-fs "^0.4.1"
-    micromatch "^3.1.10"
-    mkdirp "^0.5.1"
-    neo-async "^2.6.1"
-    node-libs-browser "^2.2.1"
-    schema-utils "^1.0.0"
-    tapable "^1.1.3"
-    terser-webpack-plugin "^1.4.1"
-    watchpack "^1.6.0"
-    webpack-sources "^1.4.1"
-
-websocket-driver@0.6.5:
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz#5cb2556ceb85f4373c6d8238aa691c8454e13a36"
-  integrity sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=
-  dependencies:
-    websocket-extensions ">=0.1.1"
-
-websocket-driver@>=0.5.1:
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"
-  integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==
-  dependencies:
-    http-parser-js ">=0.5.1"
-    safe-buffer ">=5.1.0"
-    websocket-extensions ">=0.1.1"
-
-websocket-extensions@>=0.1.1:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
-  integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
-
-webvr-polyfill-dpdb@^1.0.7:
-  version "1.0.18"
-  resolved "https://registry.yarnpkg.com/webvr-polyfill-dpdb/-/webvr-polyfill-dpdb-1.0.18.tgz#258484ce06b057bf18898acc911bd173847bce11"
-  integrity sha512-O0S1ZGEWyPvyZEkS2VbyV7mtir/NM9MNK3EuhbHPoJ8EHTky2pTXehjIl+IiDPr+Lldgx129QGt3NGly7rwRPw==
-
-webvr-polyfill@0.10.6:
-  version "0.10.6"
-  resolved "https://registry.yarnpkg.com/webvr-polyfill/-/webvr-polyfill-0.10.6.tgz#c1c5f5e3801784bc131a05aacfa2169872ce0b1c"
-  integrity sha512-H+2LI+rHMguGaUAg+1QuiIQ+1Y1wTSkkUXjQfF/GFD2wUL0AdiN8+uPGxnE7bHMBIG7NswN6kgkZhgy4WpwTlw==
-  dependencies:
-    cardboard-vr-display "1.0.13"
-
-whatwg-url@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-2.0.1.tgz#5396b2043f020ee6f704d9c45ea8519e724de659"
-  integrity sha1-U5ayBD8CDub3BNnEXqhRnnJN5lk=
-  dependencies:
-    tr46 "~0.0.3"
-    webidl-conversions "^3.0.0"
-
-when@~3.6.x:
-  version "3.6.4"
-  resolved "https://registry.yarnpkg.com/when/-/when-3.6.4.tgz#473b517ec159e2b85005497a13983f095412e34e"
-  integrity sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=
-
-which-boxed-primitive@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
-  integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
-  dependencies:
-    is-bigint "^1.0.1"
-    is-boolean-object "^1.1.0"
-    is-number-object "^1.0.4"
-    is-string "^1.0.5"
-    is-symbol "^1.0.3"
-
-which-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
-
-which-pm-runs@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb"
-  integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=
-
-which@^1.2.1, which@^1.2.9, which@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
-  dependencies:
-    isexe "^2.0.0"
-
-widest-line@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.1.tgz#7438764730ec7ef4381ce4df82fb98a53142a3fc"
-  integrity sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==
-  dependencies:
-    string-width "^2.1.1"
-
-wmf@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wmf/-/wmf-1.0.2.tgz#7d19d621071a08c2bdc6b7e688a9c435298cc2da"
-  integrity sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==
-
-word-wrap@~1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
-
-word@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/word/-/word-0.3.0.tgz#8542157e4f8e849f4a363a288992d47612db9961"
-  integrity sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==
-
-wordwrap@~0.0.2:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
-  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
-
-worker-farm@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"
-  integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==
-  dependencies:
-    errno "~0.1.7"
-
-worker-loader@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/worker-loader/-/worker-loader-2.0.0.tgz#45fda3ef76aca815771a89107399ee4119b430ac"
-  integrity sha512-tnvNp4K3KQOpfRnD20m8xltE3eWh89Ye+5oj7wXEEHKac1P4oZ6p9oTj8/8ExqoSBnk9nu5Pr4nKfQ1hn2APJw==
-  dependencies:
-    loader-utils "^1.0.0"
-    schema-utils "^0.4.0"
-
-worker-plugin@3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/worker-plugin/-/worker-plugin-3.2.0.tgz#ddae9f161b76fcbaacf8f54ecd037844584e43e7"
-  integrity sha512-W5nRkw7+HlbsEt3qRP6MczwDDISjiRj2GYt9+bpe8A2La00TmJdwzG5bpdMXhRt1qcWmwAvl1TiKaHRa+XDS9Q==
-  dependencies:
-    loader-utils "^1.1.0"
-
-wrap-ansi@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
-  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
-  dependencies:
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-
-wrap-ansi@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
-  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
-  dependencies:
-    ansi-styles "^3.2.0"
-    string-width "^3.0.0"
-    strip-ansi "^5.0.0"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-
-write-file-atomic@^2.0.0:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481"
-  integrity sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==
-  dependencies:
-    graceful-fs "^4.1.11"
-    imurmurhash "^0.1.4"
-    signal-exit "^3.0.2"
-
-ws@^6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
-  integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
-  dependencies:
-    async-limiter "~1.0.0"
-
-ws@^7.3.1:
-  version "7.5.8"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.8.tgz#ac2729881ab9e7cbaf8787fe3469a48c5c7f636a"
-  integrity sha512-ri1Id1WinAX5Jqn9HejiGb8crfRio0Qgu8+MtL36rlTA6RLsMdWt1Az/19A2Qij6uSHUMphEFaTKa4WG+UNHNw==
-
-ws@~3.3.1:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
-  integrity sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==
-  dependencies:
-    async-limiter "~1.0.0"
-    safe-buffer "~5.1.0"
-    ultron "~1.1.0"
-
-xdg-basedir@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
-  integrity sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=
-
-xhr@2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/xhr/-/xhr-2.4.0.tgz#e16e66a45f869861eeefab416d5eff722dc40993"
-  integrity sha1-4W5mpF+GmGHu76tBbV7/ci3ECZM=
-  dependencies:
-    global "~4.3.0"
-    is-function "^1.0.1"
-    parse-headers "^2.0.0"
-    xtend "^4.0.0"
-
-xlsx@^0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/xlsx/-/xlsx-0.14.5.tgz#3637e914d791bdca7382816e173f7d725ed0e0d2"
-  integrity sha512-s/5f4/mjeWREmIWZ+HtDfh/rnz51ar+dZ4LWKZU3u9VBx2zLdSIWTdXgoa52/pnZ9Oe/Vu1W1qzcKzLVe+lq4w==
-  dependencies:
-    adler-32 "~1.2.0"
-    cfb "^1.1.2"
-    codepage "~1.14.0"
-    commander "~2.17.1"
-    crc-32 "~1.2.0"
-    exit-on-epipe "~1.0.1"
-    ssf "~0.10.2"
-
-xlsx@^0.16.1:
-  version "0.16.9"
-  resolved "https://registry.yarnpkg.com/xlsx/-/xlsx-0.16.9.tgz#dacd5bb46bda6dd3743940c9c3dc1e2171826256"
-  integrity sha512-gxi1I3EasYvgCX1vN9pGyq920Ron4NO8PNfhuoA3Hpq6Y8f0ECXiy4OLrK4QZBnj1jx3QD+8Fq5YZ/3mPZ5iXw==
-  dependencies:
-    adler-32 "~1.2.0"
-    cfb "^1.1.4"
-    codepage "~1.14.0"
-    commander "~2.17.1"
-    crc-32 "~1.2.0"
-    exit-on-epipe "~1.0.1"
-    fflate "^0.3.8"
-    ssf "~0.11.2"
-    wmf "~1.0.1"
-    word "~0.3.0"
-
-"xml-name-validator@>= 2.0.1 < 3.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635"
-  integrity sha1-TYuPHszTQZqjYgYb7O9RXh5VljU=
-
-xml2js@^0.4.17:
-  version "0.4.23"
-  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66"
-  integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==
-  dependencies:
-    sax ">=0.6.0"
-    xmlbuilder "~11.0.0"
-
-xmlbuilder@~11.0.0:
-  version "11.0.1"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
-  integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
-
-xmldom@^0.1.22:
-  version "0.1.31"
-  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff"
-  integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==
-
-xmldom@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.4.0.tgz#8771e482a333af44587e30ce026f0998c23f3830"
-  integrity sha512-2E93k08T30Ugs+34HBSTQLVtpi6mCddaY8uO+pMNk1pqSjV5vElzn4mmh6KLxN3hki8rNcHSYzILoh3TEWORvA==
-
-xmlhttprequest-ssl@~1.5.4:
-  version "1.5.5"
-  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
-  integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=
-
-xtend@^4.0.0, xtend@^4.0.2, xtend@~4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
-  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
-
-xxhashjs@^0.2.1:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/xxhashjs/-/xxhashjs-0.2.2.tgz#8a6251567621a1c46a5ae204da0249c7f8caa9d8"
-  integrity sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==
-  dependencies:
-    cuint "^0.2.2"
-
-"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
-  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
-
-yallist@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
-  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
-
-yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
-  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
-
-yallist@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
-  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
-
-yaml@^1.10.0:
-  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
-  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
-
-yargs-parser@^11.1.1:
-  version "11.1.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
-  integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
-yargs-parser@^13.0.0, yargs-parser@^13.1.2:
-  version "13.1.2"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
-  integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
-yargs@13.1.0:
-  version "13.1.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.1.0.tgz#b2729ce4bfc0c584939719514099d8a916ad2301"
-  integrity sha512-1UhJbXfzHiPqkfXNHYhiz79qM/kZqjTE8yGlEjZa85Q+3+OwcV6NRkV7XOV1W2Eom2bzILeUn55pQYffjVOLAg==
-  dependencies:
-    cliui "^4.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^2.0.1"
-    os-locale "^3.1.0"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^3.0.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^13.0.0"
-
-yargs@^12.0.5:
-  version "12.0.5"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
-  integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
-  dependencies:
-    cliui "^4.0.0"
-    decamelize "^1.2.0"
-    find-up "^3.0.0"
-    get-caller-file "^1.0.1"
-    os-locale "^3.0.0"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^2.0.0"
-    which-module "^2.0.0"
-    y18n "^3.2.1 || ^4.0.0"
-    yargs-parser "^11.1.1"
-
-yargs@^13.3.2:
-  version "13.3.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
-  integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
-  dependencies:
-    cliui "^5.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^3.0.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^13.1.2"
-
-yeast@0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
-  integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
-
-yn@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
-  integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
-
-yocto-queue@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
-  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
-
-zone.js@~0.10.1:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.10.3.tgz#3e5e4da03c607c9dcd92e37dd35687a14a140c16"
-  integrity sha512-LXVLVEq0NNOqK/fLJo3d0kfzd4sxwn2/h67/02pjCjfKDxgx1i9QqpvtHD8CrBnSSwMw5+dy11O7FRX5mkO7Cg==

From 8d03e0cff07928ad2122bf1e0a30ff6702f78190 Mon Sep 17 00:00:00 2001
From: Amit Sengar <aAmitSengar@users.noreply.github.com>
Date: Fri, 28 Apr 2023 15:05:27 +0530
Subject: [PATCH 082/887] Delete yarn.lock

---
 yarn.lock | 11731 ----------------------------------------------------
 1 file changed, 11731 deletions(-)
 delete mode 100644 yarn.lock

diff --git a/yarn.lock b/yarn.lock
deleted file mode 100644
index d7908f3c3..000000000
--- a/yarn.lock
+++ /dev/null
@@ -1,11731 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@angular-devkit/architect@0.802.2":
-  version "0.802.2"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.802.2.tgz#f2305052e731b68d0fcb98958426f62ce97b441e"
-  integrity sha512-bMMo8BejHi3+n4xqewgcfat5+OYDmQQCLxWQ2W+qr7/u08vmTQTix3Q/wClp0nxgN0Zc9/1gSPaeudHLAlEizg==
-  dependencies:
-    "@angular-devkit/core" "8.2.2"
-    rxjs "6.4.0"
-
-"@angular-devkit/architect@0.803.29":
-  version "0.803.29"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.803.29.tgz#0399969087ac77876b8e429cb26eebd20596607b"
-  integrity sha512-yHBud/fZHTelX24yjQg5lefZrfIebruoFTGeOwF0JdX8+KiHcTIxS4LOnUTYriasfHarcHRFXBAV/bRm+wv5ow==
-  dependencies:
-    "@angular-devkit/core" "8.3.29"
-    rxjs "6.4.0"
-
-"@angular-devkit/build-angular@^0.803.23":
-  version "0.803.29"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.803.29.tgz#4cc2ecb7c4ca48389f05d1e05d4708f82c8c7767"
-  integrity sha512-XAgfP1gi0rEJ3oVt+8ipvS5RfPNbeK5r2n8Ll2H3xkKjU0p1PN8+S6/0XVBtmMfeQ06SJWEAKFcAYqrxXhVTzw==
-  dependencies:
-    "@angular-devkit/architect" "0.803.29"
-    "@angular-devkit/build-optimizer" "0.803.29"
-    "@angular-devkit/build-webpack" "0.803.29"
-    "@angular-devkit/core" "8.3.29"
-    "@babel/core" "7.8.7"
-    "@babel/preset-env" "7.8.7"
-    "@ngtools/webpack" "8.3.29"
-    ajv "6.12.3"
-    autoprefixer "9.6.1"
-    browserslist "4.10.0"
-    cacache "12.0.2"
-    caniuse-lite "1.0.30001035"
-    circular-dependency-plugin "5.2.0"
-    clean-css "4.2.1"
-    copy-webpack-plugin "6.0.3"
-    core-js "3.6.4"
-    coverage-istanbul-loader "2.0.3"
-    file-loader "4.2.0"
-    find-cache-dir "3.0.0"
-    glob "7.1.4"
-    jest-worker "24.9.0"
-    karma-source-map-support "1.4.0"
-    less "3.9.0"
-    less-loader "5.0.0"
-    license-webpack-plugin "2.1.2"
-    loader-utils "1.2.3"
-    mini-css-extract-plugin "0.8.0"
-    minimatch "3.0.4"
-    open "6.4.0"
-    parse5 "4.0.0"
-    postcss "7.0.17"
-    postcss-import "12.0.1"
-    postcss-loader "3.0.0"
-    raw-loader "3.1.0"
-    regenerator-runtime "0.13.3"
-    rxjs "6.4.0"
-    sass "1.22.9"
-    sass-loader "7.2.0"
-    semver "6.3.0"
-    source-map "0.7.3"
-    source-map-loader "0.2.4"
-    source-map-support "0.5.13"
-    speed-measure-webpack-plugin "1.3.1"
-    style-loader "1.0.0"
-    stylus "0.54.5"
-    stylus-loader "3.0.2"
-    terser "4.6.3"
-    terser-webpack-plugin "3.0.3"
-    tree-kill "1.2.2"
-    webpack "4.39.2"
-    webpack-dev-middleware "3.7.2"
-    webpack-dev-server "3.11.0"
-    webpack-merge "4.2.1"
-    webpack-sources "1.4.3"
-    webpack-subresource-integrity "1.1.0-rc.6"
-    worker-plugin "3.2.0"
-
-"@angular-devkit/build-ng-packagr@~0.802.1":
-  version "0.802.2"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-ng-packagr/-/build-ng-packagr-0.802.2.tgz#8b83936667a955b91cc865f936b27428065000cc"
-  integrity sha512-6lY95tiW+KooPMWB3P4r54TUe5pSZgkv/6mphrUcxqwvN/jKOV4MkpoFxJsu7zNuiFPHU8K5URCWFsQPbiObPg==
-  dependencies:
-    "@angular-devkit/architect" "0.802.2"
-    rxjs "6.4.0"
-
-"@angular-devkit/build-optimizer@0.803.29":
-  version "0.803.29"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.803.29.tgz#91c033e6ab3313d338ec9c3d4c40d64ce1b324bc"
-  integrity sha512-E/MXtKc3oaP7UvQm0g4ayfH8ImEoQnRWseKD4jjYG6TbTIqfIyHCZRcKIr3svY28hzASbro5IZI6SugG+llvFw==
-  dependencies:
-    loader-utils "1.2.3"
-    source-map "0.7.3"
-    tslib "1.10.0"
-    typescript "3.5.3"
-    webpack-sources "1.4.3"
-
-"@angular-devkit/build-webpack@0.803.29":
-  version "0.803.29"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.803.29.tgz#ceaee658f0b71a0fee4f10b574b49e192d333a7c"
-  integrity sha512-3dJ3iEGU6AFT8VFTe72T9uNLobfd18Sq5Hz22UCCYji9K3ZyVc/bn5uXVVX+/Yj91MFtXuhOjLj7Z+XDeNy+OQ==
-  dependencies:
-    "@angular-devkit/architect" "0.803.29"
-    "@angular-devkit/core" "8.3.29"
-    rxjs "6.4.0"
-
-"@angular-devkit/core@8.2.2":
-  version "8.2.2"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-8.2.2.tgz#f7239b6fca785c5a85fbe7684f807b8fa41311d4"
-  integrity sha512-qA1lK/OQhNptCxoEGbTryn6yeFS1F/e/EiUTwgU/j4DkBwPyYGE8iqWBd/cgI9AVqQaRSLLhVWXtDPxoNL0TKg==
-  dependencies:
-    ajv "6.10.2"
-    fast-json-stable-stringify "2.0.0"
-    magic-string "0.25.3"
-    rxjs "6.4.0"
-    source-map "0.7.3"
-
-"@angular-devkit/core@8.3.29":
-  version "8.3.29"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-8.3.29.tgz#3477edd6458653f83e6d78684b100c1bef81382f"
-  integrity sha512-4jdja9QPwR6XG14ZSunyyOWT3nE2WtZC5IMDIBZADxujXvhzOU0n4oWpy6/JVHLUAxYNNgzLz+/LQORRWndcPg==
-  dependencies:
-    ajv "6.12.3"
-    fast-json-stable-stringify "2.0.0"
-    magic-string "0.25.3"
-    rxjs "6.4.0"
-    source-map "0.7.3"
-
-"@angular-devkit/schematics@8.3.29":
-  version "8.3.29"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-8.3.29.tgz#b3ba658b90fb3226a80ff12977be7dd583e99c49"
-  integrity sha512-AFJ9EK0XbcNlO5Dm9vr0OlBo1Nw6AaFXPR+DmHGBdcDDHxqEmYYLWfT+JU/8U2YFIdgrtlwvdtf6UQ3V2jdz1g==
-  dependencies:
-    "@angular-devkit/core" "8.3.29"
-    rxjs "6.4.0"
-
-"@angular/animations@~8.2.1":
-  version "8.2.14"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.2.14.tgz#76736b21e56165e6ca4925fb69605bdcc56aba7d"
-  integrity sha512-3Vc9TnNpKdtvKIXcWDFINSsnwgEMiDmLzjceWg1iYKwpeZGQahUXPoesLwQazBMmxJzQiA4HOMj0TTXKZ+Jzkg==
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/cdk@~8.1.2":
-  version "8.1.4"
-  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-8.1.4.tgz#69066053fe4cbd80cee2bb7fa238f1c9abb963fc"
-  integrity sha512-U0tjhAZM4qqUHGGKIKFZZ9d8929s2U/HO0FdoT/eX+oHPOA6mm3bBep7myrSzlkP9V7O1JJfYdhEgijXhYxprQ==
-  dependencies:
-    tslib "^1.7.1"
-  optionalDependencies:
-    parse5 "^5.0.0"
-
-"@angular/cli@^8.3.26":
-  version "8.3.29"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-8.3.29.tgz#481eb04a8240932adfb19049a5fb524f85453037"
-  integrity sha512-pW+iU0eKHIae+A1b9W5g8DKefMQcehZ+drGKs4Hryh8G+XGFS00BIWkmh6c1mydWTEhdsFlhdjD/rXCem7MAQQ==
-  dependencies:
-    "@angular-devkit/architect" "0.803.29"
-    "@angular-devkit/core" "8.3.29"
-    "@angular-devkit/schematics" "8.3.29"
-    "@schematics/angular" "8.3.29"
-    "@schematics/update" "0.803.29"
-    "@yarnpkg/lockfile" "1.1.0"
-    ansi-colors "4.1.1"
-    debug "^4.1.1"
-    ini "1.3.5"
-    inquirer "6.5.1"
-    npm-package-arg "6.1.0"
-    npm-pick-manifest "3.0.2"
-    open "6.4.0"
-    pacote "9.5.5"
-    read-package-tree "5.3.1"
-    rimraf "3.0.0"
-    semver "6.3.0"
-    symbol-observable "1.2.0"
-    universal-analytics "^0.4.20"
-    uuid "^3.3.2"
-
-"@angular/common@~8.2.1":
-  version "8.2.14"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.2.14.tgz#027e52b2951c14082d6e3af1a4ffa1356220e439"
-  integrity sha512-Qmt+aX2quUW54kaNT7QH7WGXnFxr/cC2C6sf5SW5SdkZfDQSiz8IaItvieZfXVQUbBOQKFRJ7TlSkt0jI/yjvw==
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/compiler-cli@~8.2.1":
-  version "8.2.14"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.2.14.tgz#1997bec04a6b9d022954e5747505fe8906994594"
-  integrity sha512-XDrTyrlIZM+0NquVT+Kbg5bn48AaWFT+B3bAT288PENrTdkuxuF9AhjFRZj8jnMdmaE4O2rioEkXBtl6z3zptA==
-  dependencies:
-    canonical-path "1.0.0"
-    chokidar "^2.1.1"
-    convert-source-map "^1.5.1"
-    dependency-graph "^0.7.2"
-    magic-string "^0.25.0"
-    minimist "^1.2.0"
-    reflect-metadata "^0.1.2"
-    source-map "^0.6.1"
-    tslib "^1.9.0"
-    yargs "13.1.0"
-
-"@angular/compiler@~8.2.1":
-  version "8.2.14"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.2.14.tgz#46db7a9d1c17f236126518ff26480c160d5a6183"
-  integrity sha512-ABZO4E7eeFA1QyJ2trDezxeQM5ZFa1dXw1Mpl/+1vuXDKNjJgNyWYwKp/NwRkLmrsuV0yv4UDCDe4kJOGbPKnw==
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/core@~8.2.1":
-  version "8.2.14"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.2.14.tgz#35566f5b19480369229477e7e0e0fde740bd5204"
-  integrity sha512-zeePkigi+hPh3rN7yoNENG/YUBUsIvUXdxx+AZq+QPaFeKEA2FBSrKn36ojHFrdJUjKzl0lPMEiGC2b6a6bo6g==
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/forms@~8.2.1":
-  version "8.2.14"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-8.2.14.tgz#7d357c346a3884881beb044c50ec4a09d3d7ee8e"
-  integrity sha512-zhyKL3CFIqcyHJ/TQF/h1OZztK611a6rxuPHCrt/5Sn1SuBTJJQ1pPTkOYIDy6IrCrtyANc8qB6P17Mao71DNQ==
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/language-service@~8.2.1":
-  version "8.2.14"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-8.2.14.tgz#e18b27a6841577ce489ad31540150da5a444ca37"
-  integrity sha512-7EhN9JJbAJcH2xCa+rIOmekjiEuB0qwPdHuD5qn/wwMfRzMZo+Db4hHbR9KHrLH6H82PTwYKye/LLpDaZqoHOA==
-
-"@angular/material-moment-adapter@^9.2.4":
-  version "9.2.4"
-  resolved "https://registry.yarnpkg.com/@angular/material-moment-adapter/-/material-moment-adapter-9.2.4.tgz#4d3cfcd5c2b8914bcca4e70a46cf7ec127c14b40"
-  integrity sha512-V5xkL+YUec3nDGRaJB72mJTUtdUvGaG9WCQEdr45viDWFGjQaEpS6msuScBLp0PwsN8Wt0n69eZg0ULgxPBa5g==
-
-"@angular/material@~8.1.2":
-  version "8.1.4"
-  resolved "https://registry.yarnpkg.com/@angular/material/-/material-8.1.4.tgz#8bda747bb023af8ccce2c2d3e9e8dc25f05b3605"
-  integrity sha512-HV1qU63MaOtAc+cWg21Y2ygQKdEDjsGQ/3d3qym9sfR0xU2vvY7OG6gH48BfPeU63oMYxQkhxfoGP8wWMXSU1w==
-  dependencies:
-    tslib "^1.7.1"
-
-"@angular/platform-browser-dynamic@~8.2.1":
-  version "8.2.14"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.2.14.tgz#4439a79fe10ec45170e6940a28835e9ff0918950"
-  integrity sha512-mO2JPR5kLU/A3AQngy9+R/Q5gaF9csMStBQjwsCRI0wNtlItOIGL6+wTYpiTuh/ux+WVN1F2sLcEYU4Zf1ud9A==
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/platform-browser@~8.2.1":
-  version "8.2.14"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.2.14.tgz#31f082e8ba977f9b89964d721c38cbc32ce0e433"
-  integrity sha512-MtJptptyKzsE37JZ2VB/tI4cvMrdAH+cT9pMBYZd66YSZfKjIj5s+AZo7z8ncoskQSB1o3HMfDjSK7QXGx1mLQ==
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/pwa@^0.803.14":
-  version "0.803.29"
-  resolved "https://registry.yarnpkg.com/@angular/pwa/-/pwa-0.803.29.tgz#3421745973793acf0c921fb85a16cf5417948be6"
-  integrity sha512-DR8qRfgkR3Dj8HKUnnW+17/f/uCPe7J8l8PC9VSC69Jqzc9XSsKZNfgrL3svaflIeU9+2YQ+5x5mJOL1f2m/Cg==
-  dependencies:
-    "@angular-devkit/core" "8.3.29"
-    "@angular-devkit/schematics" "8.3.29"
-    "@schematics/angular" "8.3.29"
-    parse5-html-rewriting-stream "5.1.0"
-
-"@angular/router@~8.2.1":
-  version "8.2.14"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.2.14.tgz#5f9f9707710983c2143aead79dcd2da520ae3eb8"
-  integrity sha512-DHA2BhODqV7F0g6ZKgFaZgbsqzHHWRcfWchCOrOVKu2rYiKUTwwHVLBgZAhrpNeinq2pWanVYSIhMr7wy+LfEA==
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/service-worker@~8.2.1":
-  version "8.2.14"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-8.2.14.tgz#fbea3899863cfa09196ce69fa470b163f25666ad"
-  integrity sha512-Xv1ES5bXDRxPJ5uyRqeKw6mGKaJVzKK0oFcR0mr4OSdyLXGZ+x6fC2S/QcLy4ugpb64fyEksrnHhHjeMVzGh2Q==
-  dependencies:
-    tslib "^1.9.0"
-
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"
-  integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==
-  dependencies:
-    "@babel/highlight" "^7.12.13"
-
-"@babel/compat-data@^7.13.15", "@babel/compat-data@^7.14.0", "@babel/compat-data@^7.8.6":
-  version "7.14.0"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.0.tgz#a901128bce2ad02565df95e6ecbf195cf9465919"
-  integrity sha512-vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q==
-
-"@babel/core@7.8.7":
-  version "7.8.7"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.7.tgz#b69017d221ccdeb203145ae9da269d72cf102f3b"
-  integrity sha512-rBlqF3Yko9cynC5CCFy6+K/w2N+Sq/ff2BPy+Krp7rHlABIr5epbA7OxVeKoMHB39LZOp1UY5SuLjy6uWi35yA==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.8.7"
-    "@babel/helpers" "^7.8.4"
-    "@babel/parser" "^7.8.7"
-    "@babel/template" "^7.8.6"
-    "@babel/traverse" "^7.8.6"
-    "@babel/types" "^7.8.7"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.1"
-    json5 "^2.1.0"
-    lodash "^4.17.13"
-    resolve "^1.3.2"
-    semver "^5.4.1"
-    source-map "^0.5.0"
-
-"@babel/core@^7.7.5":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.2.tgz#54e45334ffc0172048e5c93ded36461d3ad4c417"
-  integrity sha512-OgC1mON+l4U4B4wiohJlQNUU3H73mpTyYY3j/c8U9dr9UagGGSm+WFpzjy/YLdoyjiG++c1kIDgxCo/mLwQJeQ==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.14.2"
-    "@babel/helper-compilation-targets" "^7.13.16"
-    "@babel/helper-module-transforms" "^7.14.2"
-    "@babel/helpers" "^7.14.0"
-    "@babel/parser" "^7.14.2"
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.14.2"
-    "@babel/types" "^7.14.2"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.2"
-    json5 "^2.1.2"
-    semver "^6.3.0"
-    source-map "^0.5.0"
-
-"@babel/generator@^7.14.2", "@babel/generator@^7.4.0", "@babel/generator@^7.8.7":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.2.tgz#d5773e8b557d421fd6ce0d5efa5fd7fc22567c30"
-  integrity sha512-OnADYbKrffDVai5qcpkMxQ7caomHOoEwjkouqnN2QhydAjowFAZcsdecFIRUBdb+ZcruwYE4ythYmF1UBZU5xQ==
-  dependencies:
-    "@babel/types" "^7.14.2"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
-
-"@babel/helper-annotate-as-pure@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz#0f58e86dfc4bb3b1fcd7db806570e177d439b6ab"
-  integrity sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw==
-  dependencies:
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz#6bc20361c88b0a74d05137a65cac8d3cbf6f61fc"
-  integrity sha512-CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA==
-  dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.12.13"
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-compilation-targets@^7.13.16", "@babel/helper-compilation-targets@^7.8.7":
-  version "7.13.16"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz#6e91dccf15e3f43e5556dffe32d860109887563c"
-  integrity sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA==
-  dependencies:
-    "@babel/compat-data" "^7.13.15"
-    "@babel/helper-validator-option" "^7.12.17"
-    browserslist "^4.14.5"
-    semver "^6.3.0"
-
-"@babel/helper-create-regexp-features-plugin@^7.12.13":
-  version "7.12.17"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz#a2ac87e9e319269ac655b8d4415e94d38d663cb7"
-  integrity sha512-p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.12.13"
-    regexpu-core "^4.7.1"
-
-"@babel/helper-explode-assignable-expression@^7.12.13":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz#17b5c59ff473d9f956f40ef570cf3a76ca12657f"
-  integrity sha512-qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA==
-  dependencies:
-    "@babel/types" "^7.13.0"
-
-"@babel/helper-function-name@^7.12.13", "@babel/helper-function-name@^7.14.2":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.2.tgz#397688b590760b6ef7725b5f0860c82427ebaac2"
-  integrity sha512-NYZlkZRydxw+YT56IlhIcS8PAhb+FEUiOzuhFTfqDyPmzAhRge6ua0dQYT/Uh0t/EDHq05/i+e5M2d4XvjgarQ==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.12.13"
-    "@babel/template" "^7.12.13"
-    "@babel/types" "^7.14.2"
-
-"@babel/helper-get-function-arity@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583"
-  integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==
-  dependencies:
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-hoist-variables@^7.13.0":
-  version "7.13.16"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.16.tgz#1b1651249e94b51f8f0d33439843e33e39775b30"
-  integrity sha512-1eMtTrXtrwscjcAeO4BVK+vvkxaLJSPFz1w1KLawz6HLNi9bPFGBNwwDyVfiu1Tv/vRRFYfoGaKhmAQPGPn5Wg==
-  dependencies:
-    "@babel/traverse" "^7.13.15"
-    "@babel/types" "^7.13.16"
-
-"@babel/helper-member-expression-to-functions@^7.13.12":
-  version "7.13.12"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz#dfe368f26d426a07299d8d6513821768216e6d72"
-  integrity sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw==
-  dependencies:
-    "@babel/types" "^7.13.12"
-
-"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.13.12", "@babel/helper-module-imports@^7.8.3":
-  version "7.13.12"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz#c6a369a6f3621cb25da014078684da9196b61977"
-  integrity sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==
-  dependencies:
-    "@babel/types" "^7.13.12"
-
-"@babel/helper-module-transforms@^7.13.0", "@babel/helper-module-transforms@^7.14.0", "@babel/helper-module-transforms@^7.14.2":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.2.tgz#ac1cc30ee47b945e3e0c4db12fa0c5389509dfe5"
-  integrity sha512-OznJUda/soKXv0XhpvzGWDnml4Qnwp16GN+D/kZIdLsWoHj05kyu8Rm5kXmMef+rVJZ0+4pSGLkeixdqNUATDA==
-  dependencies:
-    "@babel/helper-module-imports" "^7.13.12"
-    "@babel/helper-replace-supers" "^7.13.12"
-    "@babel/helper-simple-access" "^7.13.12"
-    "@babel/helper-split-export-declaration" "^7.12.13"
-    "@babel/helper-validator-identifier" "^7.14.0"
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.14.2"
-    "@babel/types" "^7.14.2"
-
-"@babel/helper-optimise-call-expression@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea"
-  integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==
-  dependencies:
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af"
-  integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==
-
-"@babel/helper-remap-async-to-generator@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz#376a760d9f7b4b2077a9dd05aa9c3927cadb2209"
-  integrity sha512-pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.12.13"
-    "@babel/helper-wrap-function" "^7.13.0"
-    "@babel/types" "^7.13.0"
-
-"@babel/helper-replace-supers@^7.12.13", "@babel/helper-replace-supers@^7.13.12":
-  version "7.13.12"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz#6442f4c1ad912502481a564a7386de0c77ff3804"
-  integrity sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.13.12"
-    "@babel/helper-optimise-call-expression" "^7.12.13"
-    "@babel/traverse" "^7.13.0"
-    "@babel/types" "^7.13.12"
-
-"@babel/helper-simple-access@^7.13.12":
-  version "7.13.12"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz#dd6c538afb61819d205a012c31792a39c7a5eaf6"
-  integrity sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA==
-  dependencies:
-    "@babel/types" "^7.13.12"
-
-"@babel/helper-skip-transparent-expression-wrappers@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz#462dc63a7e435ade8468385c63d2b84cce4b3cbf"
-  integrity sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==
-  dependencies:
-    "@babel/types" "^7.12.1"
-
-"@babel/helper-split-export-declaration@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05"
-  integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==
-  dependencies:
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-validator-identifier@^7.12.11", "@babel/helper-validator-identifier@^7.14.0":
-  version "7.14.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz#d26cad8a47c65286b15df1547319a5d0bcf27288"
-  integrity sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==
-
-"@babel/helper-validator-option@^7.12.17":
-  version "7.12.17"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"
-  integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==
-
-"@babel/helper-wrap-function@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz#bdb5c66fda8526ec235ab894ad53a1235c79fcc4"
-  integrity sha512-1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA==
-  dependencies:
-    "@babel/helper-function-name" "^7.12.13"
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.13.0"
-    "@babel/types" "^7.13.0"
-
-"@babel/helpers@^7.14.0", "@babel/helpers@^7.8.4":
-  version "7.14.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.0.tgz#ea9b6be9478a13d6f961dbb5f36bf75e2f3b8f62"
-  integrity sha512-+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg==
-  dependencies:
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.14.0"
-    "@babel/types" "^7.14.0"
-
-"@babel/highlight@^7.12.13":
-  version "7.14.0"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz#3197e375711ef6bf834e67d0daec88e4f46113cf"
-  integrity sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.14.0"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
-
-"@babel/parser@^7.12.13", "@babel/parser@^7.14.2", "@babel/parser@^7.4.3", "@babel/parser@^7.8.7":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.2.tgz#0c1680aa44ad4605b16cbdcc5c341a61bde9c746"
-  integrity sha512-IoVDIHpsgE/fu7eXBeRWt8zLbDrSvD7H1gpomOkPpBoEN8KCruCqSDdqo8dddwQQrui30KSvQBaMUOJiuFu6QQ==
-
-"@babel/plugin-proposal-async-generator-functions@^7.8.3":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.2.tgz#3a2085abbf5d5f962d480dbc81347385ed62eb1e"
-  integrity sha512-b1AM4F6fwck4N8ItZ/AtC4FP/cqZqmKRQ4FaTDutwSYyjuhtvsGEMLK4N/ztV/ImP40BjIDyMgBQAeAMsQYVFQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/helper-remap-async-to-generator" "^7.13.0"
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
-
-"@babel/plugin-proposal-dynamic-import@^7.8.3":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.2.tgz#01ebabd7c381cff231fa43e302939a9de5be9d9f"
-  integrity sha512-oxVQZIWFh91vuNEMKltqNsKLFWkOIyJc95k2Gv9lWVyDfPUQGSSlbDEgWuJUU1afGE9WwlzpucMZ3yDRHIItkA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
-
-"@babel/plugin-proposal-json-strings@^7.8.3":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.2.tgz#830b4e2426a782e8b2878fbfe2cba85b70cbf98c"
-  integrity sha512-w2DtsfXBBJddJacXMBhElGEYqCZQqN99Se1qeYn8DVLB33owlrlLftIbMzn5nz1OITfDVknXF433tBrLEAOEjA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
-
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.2.tgz#425b11dc62fc26939a2ab42cbba680bdf5734546"
-  integrity sha512-ebR0zU9OvI2N4qiAC38KIAK75KItpIPTpAtd2r4OZmMFeKbKJpUFLYP2EuDut82+BmYi8sz42B+TfTptJ9iG5Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-
-"@babel/plugin-proposal-object-rest-spread@^7.8.3":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.2.tgz#e17d418f81cc103fedd4ce037e181c8056225abc"
-  integrity sha512-hBIQFxwZi8GIp934+nj5uV31mqclC1aYDhctDu5khTi9PCCUOczyy0b34W0oE9U/eJXiqQaKyVsmjeagOaSlbw==
-  dependencies:
-    "@babel/compat-data" "^7.14.0"
-    "@babel/helper-compilation-targets" "^7.13.16"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.14.2"
-
-"@babel/plugin-proposal-optional-catch-binding@^7.8.3":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.2.tgz#150d4e58e525b16a9a1431bd5326c4eed870d717"
-  integrity sha512-XtkJsmJtBaUbOxZsNk0Fvrv8eiqgneug0A6aqLFZ4TSkar2L5dSXWcnUKHgmjJt49pyB/6ZHvkr3dPgl9MOWRQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-
-"@babel/plugin-proposal-optional-chaining@^7.8.3":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.2.tgz#df8171a8b9c43ebf4c1dabe6311b432d83e1b34e"
-  integrity sha512-qQByMRPwMZJainfig10BoaDldx/+VDtNcrA7qdNaEOAj6VXud+gfrkA8j4CRAU5HjnWREXqIpSpH30qZX1xivA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
-
-"@babel/plugin-proposal-unicode-property-regex@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz#bebde51339be829c17aaaaced18641deb62b39ba"
-  integrity sha512-XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-syntax-async-generators@^7.8.0", "@babel/plugin-syntax-async-generators@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
-  integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-dynamic-import@^7.8.0", "@babel/plugin-syntax-dynamic-import@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
-  integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-json-strings@^7.8.0", "@babel/plugin-syntax-json-strings@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
-  integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
-  integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
-  integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-optional-catch-binding@^7.8.0", "@babel/plugin-syntax-optional-catch-binding@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
-  integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-optional-chaining@^7.8.0", "@babel/plugin-syntax-optional-chaining@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
-  integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-top-level-await@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178"
-  integrity sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-arrow-functions@^7.8.3":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz#10a59bebad52d637a027afa692e8d5ceff5e3dae"
-  integrity sha512-96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-
-"@babel/plugin-transform-async-to-generator@^7.8.3":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz#8e112bf6771b82bf1e974e5e26806c5c99aa516f"
-  integrity sha512-3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg==
-  dependencies:
-    "@babel/helper-module-imports" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/helper-remap-async-to-generator" "^7.13.0"
-
-"@babel/plugin-transform-block-scoped-functions@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz#a9bf1836f2a39b4eb6cf09967739de29ea4bf4c4"
-  integrity sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-block-scoping@^7.8.3":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.2.tgz#761cb12ab5a88d640ad4af4aa81f820e6b5fdf5c"
-  integrity sha512-neZZcP19NugZZqNwMTH+KoBjx5WyvESPSIOQb4JHpfd+zPfqcH65RMu5xJju5+6q/Y2VzYrleQTr+b6METyyxg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-
-"@babel/plugin-transform-classes@^7.8.6":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.2.tgz#3f1196c5709f064c252ad056207d87b7aeb2d03d"
-  integrity sha512-7oafAVcucHquA/VZCsXv/gmuiHeYd64UJyyTYU+MPfNu0KeNlxw06IeENBO8bJjXVbolu+j1MM5aKQtH1OMCNg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.12.13"
-    "@babel/helper-function-name" "^7.14.2"
-    "@babel/helper-optimise-call-expression" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/helper-replace-supers" "^7.13.12"
-    "@babel/helper-split-export-declaration" "^7.12.13"
-    globals "^11.1.0"
-
-"@babel/plugin-transform-computed-properties@^7.8.3":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz#845c6e8b9bb55376b1fa0b92ef0bdc8ea06644ed"
-  integrity sha512-RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-
-"@babel/plugin-transform-destructuring@^7.8.3":
-  version "7.13.17"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.17.tgz#678d96576638c19d5b36b332504d3fd6e06dea27"
-  integrity sha512-UAUqiLv+uRLO+xuBKKMEpC+t7YRNVRqBsWWq1yKXbBZBje/t3IXCiSinZhjn/DC3qzBfICeYd2EFGEbHsh5RLA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-
-"@babel/plugin-transform-dotall-regex@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz#3f1601cc29905bfcb67f53910f197aeafebb25ad"
-  integrity sha512-foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-duplicate-keys@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz#6f06b87a8b803fd928e54b81c258f0a0033904de"
-  integrity sha512-NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-exponentiation-operator@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz#4d52390b9a273e651e4aba6aee49ef40e80cd0a1"
-  integrity sha512-fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA==
-  dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-for-of@^7.8.6":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz#c799f881a8091ac26b54867a845c3e97d2696062"
-  integrity sha512-IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-
-"@babel/plugin-transform-function-name@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz#bb024452f9aaed861d374c8e7a24252ce3a50051"
-  integrity sha512-6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ==
-  dependencies:
-    "@babel/helper-function-name" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-literals@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz#2ca45bafe4a820197cf315794a4d26560fe4bdb9"
-  integrity sha512-FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-member-expression-literals@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz#5ffa66cd59b9e191314c9f1f803b938e8c081e40"
-  integrity sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-modules-amd@^7.8.3":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.2.tgz#6622806fe1a7c07a1388444222ef9535f2ca17b0"
-  integrity sha512-hPC6XBswt8P3G2D1tSV2HzdKvkqOpmbyoy+g73JG0qlF/qx2y3KaMmXb1fLrpmWGLZYA0ojCvaHdzFWjlmV+Pw==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.14.2"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    babel-plugin-dynamic-import-node "^2.3.3"
-
-"@babel/plugin-transform-modules-commonjs@^7.8.3":
-  version "7.14.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.0.tgz#52bc199cb581e0992edba0f0f80356467587f161"
-  integrity sha512-EX4QePlsTaRZQmw9BsoPeyh5OCtRGIhwfLquhxGp5e32w+dyL8htOcDwamlitmNFK6xBZYlygjdye9dbd9rUlQ==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.14.0"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/helper-simple-access" "^7.13.12"
-    babel-plugin-dynamic-import-node "^2.3.3"
-
-"@babel/plugin-transform-modules-systemjs@^7.8.3":
-  version "7.13.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz#6d066ee2bff3c7b3d60bf28dec169ad993831ae3"
-  integrity sha512-hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A==
-  dependencies:
-    "@babel/helper-hoist-variables" "^7.13.0"
-    "@babel/helper-module-transforms" "^7.13.0"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/helper-validator-identifier" "^7.12.11"
-    babel-plugin-dynamic-import-node "^2.3.3"
-
-"@babel/plugin-transform-modules-umd@^7.8.3":
-  version "7.14.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.0.tgz#2f8179d1bbc9263665ce4a65f305526b2ea8ac34"
-  integrity sha512-nPZdnWtXXeY7I87UZr9VlsWme3Y0cfFFE41Wbxz4bbaexAjNMInXPFUpRRUJ8NoMm0Cw+zxbqjdPmLhcjfazMw==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.14.0"
-    "@babel/helper-plugin-utils" "^7.13.0"
-
-"@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz#2213725a5f5bbbe364b50c3ba5998c9599c5c9d9"
-  integrity sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
-
-"@babel/plugin-transform-new-target@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz#e22d8c3af24b150dd528cbd6e685e799bf1c351c"
-  integrity sha512-/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-object-super@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz#b4416a2d63b8f7be314f3d349bd55a9c1b5171f7"
-  integrity sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-    "@babel/helper-replace-supers" "^7.12.13"
-
-"@babel/plugin-transform-parameters@^7.14.2", "@babel/plugin-transform-parameters@^7.8.7":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.2.tgz#e4290f72e0e9e831000d066427c4667098decc31"
-  integrity sha512-NxoVmA3APNCC1JdMXkdYXuQS+EMdqy0vIwyDHeKHiJKRxmp1qGSdb0JLEIoPRhkx6H/8Qi3RJ3uqOCYw8giy9A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-
-"@babel/plugin-transform-property-literals@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz#4e6a9e37864d8f1b3bc0e2dce7bf8857db8b1a81"
-  integrity sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-regenerator@^7.8.7":
-  version "7.13.15"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.13.15.tgz#e5eb28945bf8b6563e7f818945f966a8d2997f39"
-  integrity sha512-Bk9cOLSz8DiurcMETZ8E2YtIVJbFCPGW28DJWUakmyVWtQSm6Wsf0p4B4BfEr/eL2Nkhe/CICiUiMOCi1TPhuQ==
-  dependencies:
-    regenerator-transform "^0.14.2"
-
-"@babel/plugin-transform-reserved-words@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz#7d9988d4f06e0fe697ea1d9803188aa18b472695"
-  integrity sha512-xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-shorthand-properties@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz#db755732b70c539d504c6390d9ce90fe64aff7ad"
-  integrity sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-spread@^7.8.3":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz#84887710e273c1815ace7ae459f6f42a5d31d5fd"
-  integrity sha512-V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
-
-"@babel/plugin-transform-sticky-regex@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz#760ffd936face73f860ae646fb86ee82f3d06d1f"
-  integrity sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-template-literals@^7.8.3":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz#a36049127977ad94438dee7443598d1cefdf409d"
-  integrity sha512-d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-
-"@babel/plugin-transform-typeof-symbol@^7.8.4":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz#785dd67a1f2ea579d9c2be722de8c84cb85f5a7f"
-  integrity sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-unicode-regex@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz#b52521685804e155b1202e83fc188d34bb70f5ac"
-  integrity sha512-mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/preset-env@7.8.7":
-  version "7.8.7"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.8.7.tgz#1fc7d89c7f75d2d70c2b6768de6c2e049b3cb9db"
-  integrity sha512-BYftCVOdAYJk5ASsznKAUl53EMhfBbr8CJ1X+AJLfGPscQkwJFiaV/Wn9DPH/7fzm2v6iRYJKYHSqyynTGw0nw==
-  dependencies:
-    "@babel/compat-data" "^7.8.6"
-    "@babel/helper-compilation-targets" "^7.8.7"
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-proposal-async-generator-functions" "^7.8.3"
-    "@babel/plugin-proposal-dynamic-import" "^7.8.3"
-    "@babel/plugin-proposal-json-strings" "^7.8.3"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-proposal-object-rest-spread" "^7.8.3"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.8.3"
-    "@babel/plugin-proposal-optional-chaining" "^7.8.3"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.8.3"
-    "@babel/plugin-syntax-async-generators" "^7.8.0"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
-    "@babel/plugin-syntax-json-strings" "^7.8.0"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
-    "@babel/plugin-syntax-top-level-await" "^7.8.3"
-    "@babel/plugin-transform-arrow-functions" "^7.8.3"
-    "@babel/plugin-transform-async-to-generator" "^7.8.3"
-    "@babel/plugin-transform-block-scoped-functions" "^7.8.3"
-    "@babel/plugin-transform-block-scoping" "^7.8.3"
-    "@babel/plugin-transform-classes" "^7.8.6"
-    "@babel/plugin-transform-computed-properties" "^7.8.3"
-    "@babel/plugin-transform-destructuring" "^7.8.3"
-    "@babel/plugin-transform-dotall-regex" "^7.8.3"
-    "@babel/plugin-transform-duplicate-keys" "^7.8.3"
-    "@babel/plugin-transform-exponentiation-operator" "^7.8.3"
-    "@babel/plugin-transform-for-of" "^7.8.6"
-    "@babel/plugin-transform-function-name" "^7.8.3"
-    "@babel/plugin-transform-literals" "^7.8.3"
-    "@babel/plugin-transform-member-expression-literals" "^7.8.3"
-    "@babel/plugin-transform-modules-amd" "^7.8.3"
-    "@babel/plugin-transform-modules-commonjs" "^7.8.3"
-    "@babel/plugin-transform-modules-systemjs" "^7.8.3"
-    "@babel/plugin-transform-modules-umd" "^7.8.3"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3"
-    "@babel/plugin-transform-new-target" "^7.8.3"
-    "@babel/plugin-transform-object-super" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.8.7"
-    "@babel/plugin-transform-property-literals" "^7.8.3"
-    "@babel/plugin-transform-regenerator" "^7.8.7"
-    "@babel/plugin-transform-reserved-words" "^7.8.3"
-    "@babel/plugin-transform-shorthand-properties" "^7.8.3"
-    "@babel/plugin-transform-spread" "^7.8.3"
-    "@babel/plugin-transform-sticky-regex" "^7.8.3"
-    "@babel/plugin-transform-template-literals" "^7.8.3"
-    "@babel/plugin-transform-typeof-symbol" "^7.8.4"
-    "@babel/plugin-transform-unicode-regex" "^7.8.3"
-    "@babel/types" "^7.8.7"
-    browserslist "^4.8.5"
-    core-js-compat "^3.6.2"
-    invariant "^2.2.2"
-    levenary "^1.1.1"
-    semver "^5.5.0"
-
-"@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
-  version "7.14.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.0.tgz#46794bc20b612c5f75e62dd071e24dfd95f1cbe6"
-  integrity sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==
-  dependencies:
-    regenerator-runtime "^0.13.4"
-
-"@babel/runtime@^7.14.0":
-  version "7.18.3"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.3.tgz#c7b654b57f6f63cf7f8b418ac9ca04408c4579f4"
-  integrity sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug==
-  dependencies:
-    regenerator-runtime "^0.13.4"
-
-"@babel/template@^7.12.13", "@babel/template@^7.4.0", "@babel/template@^7.8.6":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327"
-  integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@babel/parser" "^7.12.13"
-    "@babel/types" "^7.12.13"
-
-"@babel/traverse@^7.13.0", "@babel/traverse@^7.13.15", "@babel/traverse@^7.14.0", "@babel/traverse@^7.14.2", "@babel/traverse@^7.4.3", "@babel/traverse@^7.8.6":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.2.tgz#9201a8d912723a831c2679c7ebbf2fe1416d765b"
-  integrity sha512-TsdRgvBFHMyHOOzcP9S6QU0QQtjxlRpEYOy3mcCO5RgmC305ki42aSAmfZEMSSYBla2oZ9BMqYlncBaKmD/7iA==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.14.2"
-    "@babel/helper-function-name" "^7.14.2"
-    "@babel/helper-split-export-declaration" "^7.12.13"
-    "@babel/parser" "^7.14.2"
-    "@babel/types" "^7.14.2"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.16", "@babel/types@^7.14.0", "@babel/types@^7.14.2", "@babel/types@^7.4.0", "@babel/types@^7.8.7":
-  version "7.14.2"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.2.tgz#4208ae003107ef8a057ea8333e56eb64d2f6a2c3"
-  integrity sha512-SdjAG/3DikRHpUOjxZgnkbR11xUlyDMUFJdvnIgZEE16mqmY0BINMmc4//JMJglEmn6i7sq6p+mGrFWyZ98EEw==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.14.0"
-    to-fast-properties "^2.0.0"
-
-"@egjs/hammerjs@^2.0.15":
-  version "2.0.17"
-  resolved "https://registry.yarnpkg.com/@egjs/hammerjs/-/hammerjs-2.0.17.tgz#5dc02af75a6a06e4c2db0202cae38c9263895124"
-  integrity sha512-XQsZgjm2EcVUiZQf11UBJQfmZeEmOW8DpI1gsFeln6w0ae0ii4dMQEQ0kjl6DspdWX1aGY1/loyXnP0JS06e/A==
-  dependencies:
-    "@types/hammerjs" "^2.0.36"
-
-"@fimbul/bifrost@^0.21.0":
-  version "0.21.0"
-  resolved "https://registry.yarnpkg.com/@fimbul/bifrost/-/bifrost-0.21.0.tgz#d0fafa25938fda475657a6a1e407a21bbe02c74e"
-  integrity sha512-ou8VU+nTmOW1jeg+FT+sn+an/M0Xb9G16RucrfhjXGWv1Q97kCoM5CG9Qj7GYOSdu7km72k7nY83Eyr53Bkakg==
-  dependencies:
-    "@fimbul/ymir" "^0.21.0"
-    get-caller-file "^2.0.0"
-    tslib "^1.8.1"
-    tsutils "^3.5.0"
-
-"@fimbul/ymir@^0.21.0":
-  version "0.21.0"
-  resolved "https://registry.yarnpkg.com/@fimbul/ymir/-/ymir-0.21.0.tgz#8525726787aceeafd4e199472c0d795160b5d4a1"
-  integrity sha512-T/y7WqPsm4n3zhT08EpB5sfdm2Kvw3gurAxr2Lr5dQeLi8ZsMlNT/Jby+ZmuuAAd1PnXYzKp+2SXgIkQIIMCUg==
-  dependencies:
-    inversify "^5.0.0"
-    reflect-metadata "^0.1.12"
-    tslib "^1.8.1"
-
-"@fullhuman/postcss-purgecss@^2.1.2":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@fullhuman/postcss-purgecss/-/postcss-purgecss-2.3.0.tgz#50a954757ec78696615d3e118e3fee2d9291882e"
-  integrity sha512-qnKm5dIOyPGJ70kPZ5jiz0I9foVOic0j+cOzNDoo8KoCf6HjicIZ99UfO2OmE7vCYSKAAepEwJtNzpiiZAh9xw==
-  dependencies:
-    postcss "7.0.32"
-    purgecss "^2.3.0"
-
-"@istanbuljs/schema@^0.1.2":
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
-  integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
-
-"@ngtools/webpack@8.3.29":
-  version "8.3.29"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-8.3.29.tgz#7b6984cdccd633dd687e9413a89a2d9e1360f76c"
-  integrity sha512-7uB7dlAHR7RmxcQCYidnWRR1tFRJq7CzI+MM3725ibAvi4HnM5viC/HnKRTK7V+3iS1C0l0u0Gyo/769NsUDTQ==
-  dependencies:
-    "@angular-devkit/core" "8.3.29"
-    enhanced-resolve "4.1.0"
-    rxjs "6.4.0"
-    tree-kill "1.2.2"
-    webpack-sources "1.4.3"
-
-"@nodelib/fs.scandir@2.1.4":
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69"
-  integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==
-  dependencies:
-    "@nodelib/fs.stat" "2.0.4"
-    run-parallel "^1.1.9"
-
-"@nodelib/fs.stat@2.0.4", "@nodelib/fs.stat@^2.0.2":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655"
-  integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==
-
-"@nodelib/fs.walk@^1.2.3":
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063"
-  integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==
-  dependencies:
-    "@nodelib/fs.scandir" "2.1.4"
-    fastq "^1.6.0"
-
-"@npmcli/move-file@^1.0.1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
-  integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==
-  dependencies:
-    mkdirp "^1.0.4"
-    rimraf "^3.0.2"
-
-"@polka/url@^1.0.0-next.20":
-  version "1.0.0-next.21"
-  resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1"
-  integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==
-
-"@popperjs/core@^2.4.0":
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.2.tgz#adea7b6953cbb34651766b0548468e743c6a2353"
-  integrity sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==
-
-"@project-sunbird/telemetry-sdk@0.0.26":
-  version "0.0.26"
-  resolved "https://registry.yarnpkg.com/@project-sunbird/telemetry-sdk/-/telemetry-sdk-0.0.26.tgz#15a7776e0d94da3c844161b1400612303756a830"
-  integrity sha512-8r8tf+YN+z8A4KHBmL8/wxDIKGkASDHMMxyhlI9/iWv83sueoN5qHB6QnqgtIRyEdFjt4Tum5u18/oB71Bb0PQ==
-  dependencies:
-    grunt-karma "^0.12.2"
-    karma "^3.0.0"
-
-"@schematics/angular@8.3.29":
-  version "8.3.29"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-8.3.29.tgz#da747539230dae16111c56422339c02dbb17681d"
-  integrity sha512-If+UhCsQzCgnQymiiF8dQRoic34+RgJ6rV0n4k7Tm4N2xNYJOG7ajjzKM7PIeafsF50FKnFP8dqaNGxCMyq5Ew==
-  dependencies:
-    "@angular-devkit/core" "8.3.29"
-    "@angular-devkit/schematics" "8.3.29"
-
-"@schematics/update@0.803.29":
-  version "0.803.29"
-  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.803.29.tgz#ad3c9bfe8c6d877a0ea692ae4760f0d72f3e0cc9"
-  integrity sha512-Syf6h6DYeu1WU9aLihMwIgVASpcHCxUYqhZyHfQABiK8NkdlZ+KAp4cOxihsZyDqIJNLWON+0/FLPAQF3BXh5Q==
-  dependencies:
-    "@angular-devkit/core" "8.3.29"
-    "@angular-devkit/schematics" "8.3.29"
-    "@yarnpkg/lockfile" "1.1.0"
-    ini "1.3.5"
-    pacote "9.5.5"
-    rxjs "6.4.0"
-    semver "6.3.0"
-    semver-intersect "1.4.0"
-
-"@sindresorhus/is@^0.14.0":
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
-  integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
-
-"@sunbird-cb/collection@^1.0.19":
-  version "1.0.19"
-  resolved "https://registry.yarnpkg.com/@sunbird-cb/collection/-/collection-1.0.19.tgz#ee857cf41667d90ab40086130b90033176e8d928"
-  integrity sha512-uo1L6JzKyc1WAOae3UonpAwgRotAMUbTxoDrP60iXnbiC5eBgK6yOleiGJ6szW51YfYte/Pc5rTUGuQ9ew+MRQ==
-  dependencies:
-    tslib "^1.9.0"
-
-"@sunbird-cb/design-system@0.0.1":
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/@sunbird-cb/design-system/-/design-system-0.0.1.tgz#66795a90e6a3fe3609cd574e694ad296fdc9a1a5"
-  integrity sha512-GYfnfpNfzZjnU5Ss+xfSdVbvyek97Yq8cDVsfT4+R0MgsIYnI4gqx7G0Qvx9caZYgb3eoE6wlsyb0K2aWyO+UQ==
-
-"@sunbird-cb/rain-dashboards@^0.2.8":
-  version "0.2.9"
-  resolved "https://registry.yarnpkg.com/@sunbird-cb/rain-dashboards/-/rain-dashboards-0.2.9.tgz#6fbcf82386e09475901137411ca5fee7d0c8c29f"
-  integrity sha512-4i3AL3r0MIS0cLTR2bW1sNJ9QdQY0Yyx2z3HIcqZlvWQdb6GE3vobYwtX1Tn1APy/2eUBlLKwO+BDF0QqQ50LA==
-  dependencies:
-    tslib "^1.9.0"
-
-"@sunbird-cb/resolver@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@sunbird-cb/resolver/-/resolver-1.0.0.tgz#30e5350cbd54af259cdb279ed79bdacad6fd2650"
-  integrity sha512-UJkXVT4LurSVcOg/M/mHdYagfsvLl9n1iLFnn8mzD7jwrjcGQorc2Cmrj1WBvKQuve7me3zMCcATD8UMCHv4Ug==
-  dependencies:
-    tslib "^1.9.0"
-
-"@sunbird-cb/utils@^1.0.12":
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/@sunbird-cb/utils/-/utils-1.0.12.tgz#a5c76678769bfd4858bce457a64946e7ebb55fd9"
-  integrity sha512-QkcVHXthZGDtaJWWQgYHXp8vaY/V/oCrR4xXNrKK0qeZJ5NlrwjqRiDoyVNziG37sNX0V/G0ejmqqTUSBG0Oew==
-  dependencies:
-    tslib "^1.9.0"
-
-"@szmarczak/http-timer@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
-  integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==
-  dependencies:
-    defer-to-connect "^1.0.1"
-
-"@types/chart.js@^2.7.48", "@types/chart.js@^2.7.56":
-  version "2.9.32"
-  resolved "https://registry.yarnpkg.com/@types/chart.js/-/chart.js-2.9.32.tgz#b17d9a8c41ad348183a2ce041ebdeef892998251"
-  integrity sha512-d45JiRQwEOlZiKwukjqmqpbqbYzUX2yrXdH9qVn6kXpPDsTYCo6YbfFOlnUaJ8S/DhJwbBJiLsMjKpW5oP8B2A==
-  dependencies:
-    moment "^2.10.2"
-
-"@types/d3-array@^1":
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/@types/d3-array/-/d3-array-1.2.8.tgz#b852381cb68e31e46bfa23ee70a383cbc6d62146"
-  integrity sha512-wWV0wT6oLUGprrOR5LMK7Dh8EBiondhnqINsvazv6UucYfTdb2oaFF4knlqzZV2RKB9ZC9G7G1Iojt8b/wolsw==
-
-"@types/d3-axis@^1":
-  version "1.0.14"
-  resolved "https://registry.yarnpkg.com/@types/d3-axis/-/d3-axis-1.0.14.tgz#4ff27eb94fab10efbda6c972e1fbb26ea696655b"
-  integrity sha512-wZAKX/dtFT5t5iuCaiU0QL0BWB19TE6h7C7kgfBVyoka7zidQWvf8E9zQTJ5bNPBQxd0+JmplNqwy1M8O8FOjA==
-  dependencies:
-    "@types/d3-selection" "^1"
-
-"@types/d3-brush@^1":
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/@types/d3-brush/-/d3-brush-1.1.4.tgz#0b5cc9c57476d0144b991228b44664e08494b7f3"
-  integrity sha512-2t8CgWaha9PsPdSZJ9m6Jl4awqf3DGIXek2e7gfheyfP2R0a/18MX+wuLHx+LyI1Ad7lxDsPWcswKD0XhQEjmg==
-  dependencies:
-    "@types/d3-selection" "^1"
-
-"@types/d3-chord@^1":
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/@types/d3-chord/-/d3-chord-1.0.10.tgz#4c14ca40f61b89a3c615d63f5a34fcc81390805c"
-  integrity sha512-U6YojfET6ITL1/bUJo+/Lh3pMV9XPAfOWwbshl3y3RlgAX9VO/Bxa13IMAylZIDY4VsA3Gkh29kZP1AcAeyoYA==
-
-"@types/d3-collection@*":
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/@types/d3-collection/-/d3-collection-1.0.10.tgz#bca161e336156968f267c077f7f2bfa8ff224e58"
-  integrity sha512-54Fdv8u5JbuXymtmXm2SYzi1x/Svt+jfWBU5junkhrCewL92VjqtCBDn97coBRVwVFmYNnVTNDyV8gQyPYfm+A==
-
-"@types/d3-color@^1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@types/d3-color/-/d3-color-1.4.1.tgz#0d9746c84dfef28807b2989eed4f37b2575e1f33"
-  integrity sha512-xkPLi+gbgUU9ED6QX4g6jqYL2KCB0/3AlM+ncMGqn49OgH0gFMY/ITGqPF8HwEiLzJaC+2L0I+gNwBgABv1Pvg==
-
-"@types/d3-contour@^1":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/@types/d3-contour/-/d3-contour-1.3.1.tgz#589dc3eec14168eea7e31edd1e3bbe246cc9d626"
-  integrity sha512-wWwsM/3NfKTRBdH00cSf+XlsaHlNTkvH66PgDedobyvKQZ4sJrXXpr16LXvDnAal4B67v8JGrWDgyx6dqqKLuQ==
-  dependencies:
-    "@types/d3-array" "^1"
-    "@types/geojson" "*"
-
-"@types/d3-dispatch@^1":
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/@types/d3-dispatch/-/d3-dispatch-1.0.9.tgz#c5a180f1e251de853b399cfbfbb6dd7f8bf842ae"
-  integrity sha512-zJ44YgjqALmyps+II7b1mZLhrtfV/FOxw9owT87mrweGWcg+WK5oiJX2M3SYJ0XUAExBduarysfgbR11YxzojQ==
-
-"@types/d3-drag@^1":
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/@types/d3-drag/-/d3-drag-1.2.5.tgz#0b1b852cb41577075aa625ae6149379ea6c34dfd"
-  integrity sha512-7NeTnfolst1Js3Vs7myctBkmJWu6DMI3k597AaHUX98saHjHWJ6vouT83UrpE+xfbSceHV+8A0JgxuwgqgmqWw==
-  dependencies:
-    "@types/d3-selection" "^1"
-
-"@types/d3-dsv@^1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@types/d3-dsv/-/d3-dsv-1.2.1.tgz#1524fee9f19d689c2f76aa0e24e230762bf96994"
-  integrity sha512-LLmJmjiqp/fTNEdij5bIwUJ6P6TVNk5hKM9/uk5RPO2YNgEu9XvKO0dJ7Iqd3psEdmZN1m7gB1bOsjr4HmO2BA==
-
-"@types/d3-ease@^1":
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/@types/d3-ease/-/d3-ease-1.0.10.tgz#09910e8558439b6038a7ed620650e510394ffa6d"
-  integrity sha512-fMFTCzd8DOwruE9zlu2O8ci5ct+U5jkGcDS+cH+HCidnJlDs0MZ+TuSVCFtEzh4E5MasItwy+HvgoFtxPHa5Cw==
-
-"@types/d3-fetch@^1":
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/@types/d3-fetch/-/d3-fetch-1.2.2.tgz#b93bfe248b8b761af82f4dac57959c989f67da3e"
-  integrity sha512-rtFs92GugtV/NpiJQd0WsmGLcg52tIL0uF0bKbbJg231pR9JEb6HT4AUwrtuLq3lOeKdLBhsjV14qb0pMmd0Aw==
-  dependencies:
-    "@types/d3-dsv" "^1"
-
-"@types/d3-force@^1":
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/@types/d3-force/-/d3-force-1.2.2.tgz#6337a146dbdf2781f5dde5bb491a646fd03d7bc4"
-  integrity sha512-TN7KO7sk0tJauedIt0q20RQRFo4V3v97pJKO/TDK40X3LaPM1aXRM2+zFF+nRMtseEiszg4KffudhjR8a3+4cg==
-
-"@types/d3-format@^1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@types/d3-format/-/d3-format-1.4.1.tgz#1e657a219e4b1e3931508a610d570bdec8ecdd9d"
-  integrity sha512-ss9G2snEKmp2In5Z3T0Jpqv8QaDBc2xHltBw83KjnV5B5w+Iwphbvq5ph/Xnu4d03fmmsdt+o1aWch379rxIbA==
-
-"@types/d3-geo@^1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@types/d3-geo/-/d3-geo-1.12.1.tgz#bec8692ffee9f60e18483af9008f92d4a8428118"
-  integrity sha512-8+gyGFyMCXIHtnMNKQDT++tZ4XYFXgiP5NK7mcv34aYXA16GQFiBBITjKzxghpO8QNVceOd9rUn1JY92WLNGQw==
-  dependencies:
-    "@types/geojson" "*"
-
-"@types/d3-hierarchy@^1":
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/@types/d3-hierarchy/-/d3-hierarchy-1.1.7.tgz#14a57b0539f8929015f8ad96490de50a16211040"
-  integrity sha512-fvht6DOYKzqmXjMb/+xfgkmrWM4SD7rMA/ZbM+gGwr9ZTuIDfky95J8CARtaJo/ExeWyS0xGVdL2gqno2zrQ0Q==
-
-"@types/d3-interpolate@^1":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@types/d3-interpolate/-/d3-interpolate-1.4.2.tgz#88902a205f682773a517612299a44699285eed7b"
-  integrity sha512-ylycts6llFf8yAEs1tXzx2loxxzDZHseuhPokrqKprTQSTcD3JbJI1omZP1rphsELZO3Q+of3ff0ZS7+O6yVzg==
-  dependencies:
-    "@types/d3-color" "^1"
-
-"@types/d3-path@^1":
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/@types/d3-path/-/d3-path-1.0.9.tgz#73526b150d14cd96e701597cbf346cfd1fd4a58c"
-  integrity sha512-NaIeSIBiFgSC6IGUBjZWcscUJEq7vpVu7KthHN8eieTV9d9MqkSOZLH4chq1PmcKy06PNe3axLeKmRIyxJ+PZQ==
-
-"@types/d3-polygon@^1":
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/@types/d3-polygon/-/d3-polygon-1.0.8.tgz#127ee83fccda5bf57384011da90f31367fea1530"
-  integrity sha512-1TOJPXCBJC9V3+K3tGbTqD/CsqLyv/YkTXAcwdsZzxqw5cvpdnCuDl42M4Dvi8XzMxZNCT9pL4ibrK2n4VmAcw==
-
-"@types/d3-quadtree@^1":
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/@types/d3-quadtree/-/d3-quadtree-1.0.8.tgz#980998eb20d5e1c1494089ad9a8466a0e98825a7"
-  integrity sha512-FuqYiexeSQZlc+IcGAVK8jSJKDFKHcSf/jx8rqJUUVx6rzv7ecQiXKyatrLHHh3W4CAvgNeVI23JKgk4+x2wFg==
-
-"@types/d3-random@^1":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@types/d3-random/-/d3-random-1.1.3.tgz#8f7fdc23f92d1561e0694eb49567e8ab50537a19"
-  integrity sha512-XXR+ZbFCoOd4peXSMYJzwk0/elP37WWAzS/DG+90eilzVbUSsgKhBcWqylGWe+lA2ubgr7afWAOBaBxRgMUrBQ==
-
-"@types/d3-scale-chromatic@^1":
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/@types/d3-scale-chromatic/-/d3-scale-chromatic-1.5.1.tgz#e2b7c3401e5c13809f831911eb820e444f4fc67a"
-  integrity sha512-7FtJYrmXTEWLykShjYhoGuDNR/Bda0+tstZMkFj4RRxUEryv16AGh3be21tqg84B6KfEwiZyEpBcTyPyU+GWjg==
-
-"@types/d3-scale@^2":
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/@types/d3-scale/-/d3-scale-2.2.4.tgz#ca0d4b84d2f88fe058480f81354d14041a667b96"
-  integrity sha512-wkQXT+IfgfAnKB5rtS1qMJg3FS32r1rVFHvqtiqk8pX8o5aQR3VwX1P7ErHjzNIicTlkWsaMiUTrYB+E75HFeA==
-  dependencies:
-    "@types/d3-time" "^1"
-
-"@types/d3-selection@^1":
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/@types/d3-selection/-/d3-selection-1.4.3.tgz#36928bbe64eb8e0bbcbaa01fb05c21ff6c71fa93"
-  integrity sha512-GjKQWVZO6Sa96HiKO6R93VBE8DUW+DDkFpIMf9vpY5S78qZTlRRSNUsHr/afDpF7TvLDV7VxrUFOWW7vdIlYkA==
-
-"@types/d3-shape@^1":
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/@types/d3-shape/-/d3-shape-1.3.5.tgz#c0164c1be1429473016f855871d487f806c4e968"
-  integrity sha512-aPEax03owTAKynoK8ZkmkZEDZvvT4Y5pWgii4Jp4oQt0gH45j6siDl9gNDVC5kl64XHN2goN9jbYoHK88tFAcA==
-  dependencies:
-    "@types/d3-path" "^1"
-
-"@types/d3-time-format@^2":
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/@types/d3-time-format/-/d3-time-format-2.3.1.tgz#87a30e4513b9d1d53b920327a361f87255bf3372"
-  integrity sha512-fck0Z9RGfIQn3GJIEKVrp15h9m6Vlg0d5XXeiE/6+CQiBmMDZxfR21XtjEPuDeg7gC3bBM0SdieA5XF3GW1wKA==
-
-"@types/d3-time@^1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@types/d3-time/-/d3-time-1.1.1.tgz#6cf3a4242c3bbac00440dfb8ba7884f16bedfcbf"
-  integrity sha512-ULX7LoqXTCYtM+tLYOaeAJK7IwCT+4Gxlm2MaH0ErKLi07R5lh8NHCAyWcDkCCmx1AfRcBEV6H9QE9R25uP7jw==
-
-"@types/d3-timer@^1":
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/@types/d3-timer/-/d3-timer-1.0.10.tgz#329c51c2c931f44ed0acff78b8c84571acf0ed21"
-  integrity sha512-ZnAbquVqy+4ZjdW0cY6URp+qF/AzTVNda2jYyOzpR2cPT35FTXl78s15Bomph9+ckOiI1TtkljnWkwbIGAb6rg==
-
-"@types/d3-transition@^1":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/@types/d3-transition/-/d3-transition-1.3.1.tgz#5d658eea2db17684daa04eda81d7db9824d3463f"
-  integrity sha512-U9CpMlTL/NlqdGXBlHYxTZwbmy/vN1cFv8TuAIFPX+xOW/1iChbeJBY2xmINhDQfkGJbgkH4IovafCwI1ZDrgg==
-  dependencies:
-    "@types/d3-selection" "^1"
-
-"@types/d3-voronoi@*":
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/@types/d3-voronoi/-/d3-voronoi-1.1.9.tgz#7bbc210818a3a5c5e0bafb051420df206617c9e5"
-  integrity sha512-DExNQkaHd1F3dFPvGA/Aw2NGyjMln6E9QzsiqOcBgnE+VInYnFBHBBySbZQts6z6xD+5jTfKCP7M4OqMyVjdwQ==
-
-"@types/d3-zoom@^1":
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/@types/d3-zoom/-/d3-zoom-1.8.2.tgz#187d33f9ffa59811ce93b2eacd32d92c1ef03f16"
-  integrity sha512-rU0LirorUxkLxEHSzkFs7pPC0KWsxRGc0sHrxEDR0/iQq+7/xpNkKuuOOwthlgvOtpOvtTLJ2JFOD6Kr0Si4Uw==
-  dependencies:
-    "@types/d3-interpolate" "^1"
-    "@types/d3-selection" "^1"
-
-"@types/d3@^5.7.2":
-  version "5.16.4"
-  resolved "https://registry.yarnpkg.com/@types/d3/-/d3-5.16.4.tgz#a7dc24a3dc1c19922eee72ba16144fd5bcea987a"
-  integrity sha512-2u0O9iP1MubFiQ+AhR1id4Egs+07BLtvRATG6IL2Gs9+KzdrfaxCKNq5hxEyw1kxwsqB/lCgr108XuHcKtb/5w==
-  dependencies:
-    "@types/d3-array" "^1"
-    "@types/d3-axis" "^1"
-    "@types/d3-brush" "^1"
-    "@types/d3-chord" "^1"
-    "@types/d3-collection" "*"
-    "@types/d3-color" "^1"
-    "@types/d3-contour" "^1"
-    "@types/d3-dispatch" "^1"
-    "@types/d3-drag" "^1"
-    "@types/d3-dsv" "^1"
-    "@types/d3-ease" "^1"
-    "@types/d3-fetch" "^1"
-    "@types/d3-force" "^1"
-    "@types/d3-format" "^1"
-    "@types/d3-geo" "^1"
-    "@types/d3-hierarchy" "^1"
-    "@types/d3-interpolate" "^1"
-    "@types/d3-path" "^1"
-    "@types/d3-polygon" "^1"
-    "@types/d3-quadtree" "^1"
-    "@types/d3-random" "^1"
-    "@types/d3-scale" "^2"
-    "@types/d3-scale-chromatic" "^1"
-    "@types/d3-selection" "^1"
-    "@types/d3-shape" "^1"
-    "@types/d3-time" "^1"
-    "@types/d3-time-format" "^2"
-    "@types/d3-timer" "^1"
-    "@types/d3-transition" "^1"
-    "@types/d3-voronoi" "*"
-    "@types/d3-zoom" "^1"
-
-"@types/estree@*":
-  version "0.0.47"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.47.tgz#d7a51db20f0650efec24cd04994f523d93172ed4"
-  integrity sha512-c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg==
-
-"@types/file-saver@^2.0.1":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@types/file-saver/-/file-saver-2.0.2.tgz#bd593ccfaee42ff94a5c1c83bf69ae9be83493b9"
-  integrity sha512-xbqnZmGrCEqi/KUzOkeUSe77p7APvLuyellGaAoeww3CHJ1AbjQWjPSCFtKIzZn8L7LpEax4NXnC+gfa6nM7IA==
-
-"@types/geojson@*":
-  version "7946.0.7"
-  resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.7.tgz#c8fa532b60a0042219cdf173ca21a975ef0666ad"
-  integrity sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ==
-
-"@types/glob@^7.1.1":
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183"
-  integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==
-  dependencies:
-    "@types/minimatch" "*"
-    "@types/node" "*"
-
-"@types/hammerjs@^2.0.36":
-  version "2.0.39"
-  resolved "https://registry.yarnpkg.com/@types/hammerjs/-/hammerjs-2.0.39.tgz#4be64bbacf3813c79c0dab895c6b0fdc7d5e513f"
-  integrity sha512-lYR2Y/tV2ujpk/WyUc7S0VLI0a9hrtVIN9EwnrNo5oSEJI2cK2/XrgwOQmXLL3eTulOESvh9qP6si9+DWM9cOA==
-
-"@types/jasmine@*":
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.7.2.tgz#f83ca1936f8cf5d3375506b481f52f8903c2df21"
-  integrity sha512-w5Zc9pSwxlr1ne+froeIceYbrh0a2Us+0kTaX6JA0N7nPh+yv1zN10LyDMKwnT0x2AbIDGlrD1cv6plVjfCcZw==
-
-"@types/jasmine@~3.4.0":
-  version "3.4.6"
-  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.4.6.tgz#afcb210af0fa751b85a96b2034eedada65390be1"
-  integrity sha512-hpQHs+lmZ0uuCrGyqypdI1Ho7jRFolOBT6OkNdZPFziLSSEKvWu+VxWU6bGdNEA/hoV4jV8pdDeNx8EWlmfNAw==
-
-"@types/jasminewd2@~2.0.6":
-  version "2.0.9"
-  resolved "https://registry.yarnpkg.com/@types/jasminewd2/-/jasminewd2-2.0.9.tgz#db3946314605deea9d5c7aea0b61d807089ba76d"
-  integrity sha512-Oz+Faunpe2SimFvkMYMXxpK89WXl7rZHG8abTOKcGndu4xOoSbUZ+jUdZ0LQpmDqPEGLBWXF/yZP1tlsplGhzw==
-  dependencies:
-    "@types/jasmine" "*"
-
-"@types/json-schema@^7.0.5":
-  version "7.0.7"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
-  integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==
-
-"@types/lodash@4.14.172":
-  version "4.14.172"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.172.tgz#aad774c28e7bfd7a67de25408e03ee5a8c3d028a"
-  integrity sha512-/BHF5HAx3em7/KkzVKm3LrsD6HZAXuXO1AJZQ3cRRBZj4oHZDviWPYu0aEplAqDFNHZPW6d3G7KN+ONcCCC7pw==
-
-"@types/minimatch@*":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz#f0ec25dbf2f0e4b18647313ac031134ca5b24b21"
-  integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA==
-
-"@types/mustache@^0.8.32":
-  version "0.8.32"
-  resolved "https://registry.yarnpkg.com/@types/mustache/-/mustache-0.8.32.tgz#7db3b81f2bf450bd38805f596d20eca97c4ed595"
-  integrity sha512-RTVWV485OOf4+nO2+feurk0chzHkSjkjALiejpHltyuMf/13fGymbbNNFrSKdSSUg1TIwzszXdWsVirxgqYiFA==
-
-"@types/node@*":
-  version "15.0.3"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.3.tgz#ee09fcaac513576474c327da5818d421b98db88a"
-  integrity sha512-/WbxFeBU+0F79z9RdEOXH4CsDga+ibi5M8uEYr91u3CkT/pdWcV8MCook+4wDPnZBexRdwWS+PiVZ2xJviAzcQ==
-
-"@types/node@^10.17.60":
-  version "10.17.60"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.60.tgz#35f3d6213daed95da7f0f73e75bcc6980e90597b"
-  integrity sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==
-
-"@types/normalize-package-data@^2.4.0":
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
-  integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
-
-"@types/parse-json@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
-  integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
-
-"@types/pdfjs-dist@^2.1.3":
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/@types/pdfjs-dist/-/pdfjs-dist-2.7.1.tgz#3f463b18849ef64e1879bf983ab36c40b3f26da0"
-  integrity sha512-5qfC+w0bL0IaPYR3Jg3IwdN1SB/xEPnofLvguML272PtA7T+oz6tftXwXjjfNfnw9wDCwx+5N0QfjPnNu5lGEw==
-
-"@types/pdfjs-dist@~2.1.7":
-  version "2.1.7"
-  resolved "https://registry.yarnpkg.com/@types/pdfjs-dist/-/pdfjs-dist-2.1.7.tgz#a92d94b9d699a93ab8a762839f7819dc04e96484"
-  integrity sha512-nQIwcPUhkAIyn7x9NS0lR/qxYfd5unRtfGkMjvpgF4Sh28IXftRymaNmFKTTdejDNY25NDGSIyjwj/BRwAPexg==
-
-"@types/q@^0.0.32":
-  version "0.0.32"
-  resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"
-  integrity sha1-vShOV8hPEyXacCur/IKlMoGQwMU=
-
-"@types/quill@^2.0.2":
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/@types/quill/-/quill-2.0.6.tgz#c52055eb2e4ff02d4134048576c5a9a47216c6c2"
-  integrity sha512-aWXfXBWfth7SgeZEObDZQcQ6p4pBrdafkryLlrQOrYU50tC0qde9AxHOe0WRF2rg0vul20j/GwUnHop6l+qYBQ==
-  dependencies:
-    parchment "^1.1.2"
-    quill-delta "^4.0.1"
-
-"@types/raf@^3.4.0":
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/@types/raf/-/raf-3.4.0.tgz#2b72cbd55405e071f1c4d29992638e022b20acc2"
-  integrity sha512-taW5/WYqo36N7V39oYyHP9Ipfd5pNFvGTIQsNGj86xV88YQ7GnI30/yMfKDF7Zgin0m3e+ikX88FvImnK4RjGw==
-
-"@types/resolve@0.0.8":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-0.0.8.tgz#f26074d238e02659e323ce1a13d041eee280e194"
-  integrity sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==
-  dependencies:
-    "@types/node" "*"
-
-"@types/selenium-webdriver@^3.0.0":
-  version "3.0.17"
-  resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.17.tgz#50bea0c3c2acc31c959c5b1e747798b3b3d06d4b"
-  integrity sha512-tGomyEuzSC1H28y2zlW6XPCaDaXFaD6soTdb4GNdmte2qfHtrKqhy0ZFs4r/1hpazCfEZqeTSRLvSasmEx89uw==
-
-"@types/source-list-map@*":
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
-  integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
-
-"@types/uuid@^8.3.3":
-  version "8.3.4"
-  resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc"
-  integrity sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==
-
-"@types/video.js@7.2.12":
-  version "7.2.12"
-  resolved "https://registry.yarnpkg.com/@types/video.js/-/video.js-7.2.12.tgz#574682abeda408526b3592f450c5be1045483311"
-  integrity sha512-JDCmwi1L8NA69/G7i8OG6ApO21rB7J6CXcDr339V0xO6ViPAZJIor611Ymh2IZkiur7Iow+HbLBHIgQTdvgj8g==
-
-"@types/vis@^4.21.19":
-  version "4.21.21"
-  resolved "https://registry.yarnpkg.com/@types/vis/-/vis-4.21.21.tgz#5c911c0d43603d103938ea128ee83ca72d9a9347"
-  integrity sha512-mDh/6zKCTViWOPeED2DnWFpACY7HkusEzSDfb6lsc7iEklowTeoMAMm/nyQQYOOWfF5ALfMbevrhs9CjdI7SUA==
-  dependencies:
-    moment ">=2.13.0"
-
-"@types/webpack-sources@^0.1.5":
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-0.1.8.tgz#078d75410435993ec8a0a2855e88706f3f751f81"
-  integrity sha512-JHB2/xZlXOjzjBB6fMOpH1eQAfsrpqVVIbneE0Rok16WXwFaznaI5vfg75U5WgGJm7V9W1c4xeRQDjX/zwvghA==
-  dependencies:
-    "@types/node" "*"
-    "@types/source-list-map" "*"
-    source-map "^0.6.1"
-
-"@types/zip.js@2.0.28":
-  version "2.0.28"
-  resolved "https://registry.yarnpkg.com/@types/zip.js/-/zip.js-2.0.28.tgz#78354682ef76e637b1f445846e4d892ca3dbf344"
-  integrity sha512-OtimzIMnPu5RYleY8Zzp7nBFQqaZYcg7WqZci2gHjoylhaIL1qSur+ABUuuQ9HMP9Eu0ER2mEyI6AkLWWDGXNg==
-
-"@videojs/http-streaming@1.10.3":
-  version "1.10.3"
-  resolved "https://registry.yarnpkg.com/@videojs/http-streaming/-/http-streaming-1.10.3.tgz#0c028443b9a3c96da85e5995748ed94280884584"
-  integrity sha512-fxXtwVrQBdhOFh6GymPAPCb4utCI01Zs5fdyZgtR6FSsaz/zGmnzfNS5GvNjBi/hZviMsbNPFaOTTFMMNLNA3A==
-  dependencies:
-    aes-decrypter "3.0.0"
-    global "^4.3.0"
-    m3u8-parser "4.3.0"
-    mpd-parser "0.8.1"
-    mux.js "5.1.3"
-    url-toolkit "^2.1.3"
-    video.js "^6.8.0 || ^7.0.0"
-
-"@videojs/http-streaming@2.6.4":
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/@videojs/http-streaming/-/http-streaming-2.6.4.tgz#a3d9eb62b02c6e48439f033675ec3a6f5f8cdb25"
-  integrity sha512-sFVE0MVXhawAkET8EgiUSMvDDv6u3uGidtO0BvNXG0/qKWlze/zEzhvLsyPU4HmLFRnffKeHK5RE2XpO5vHY8Q==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    "@videojs/vhs-utils" "^3.0.0"
-    aes-decrypter "3.1.2"
-    global "^4.4.0"
-    m3u8-parser "4.5.2"
-    mpd-parser "0.15.4"
-    mux.js "5.10.0"
-    video.js "^6 || ^7"
-
-"@videojs/vhs-utils@^3.0.0":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@videojs/vhs-utils/-/vhs-utils-3.0.1.tgz#6bd7b5309883dcbaccb0f766b08094bc2bde5dbc"
-  integrity sha512-kYHWcmzRyWfUXrrOZzRFzvt7XM+Sg+0vmsSbYONn2e/XeWD8+35K74+wZkW5/H9nYZDhYpZgeTKbLRUvxk+smA==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    global "^4.4.0"
-    url-toolkit "^2.2.1"
-
-"@videojs/xhr@2.5.1":
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/@videojs/xhr/-/xhr-2.5.1.tgz#26bc5a79dbb3b03bfb13742c6ce559f89e90719e"
-  integrity sha512-wV9nGESHseSK+S9ePEru2+OJZ1jq/ZbbzniGQ4weAmTIepuBMSYPx5zrxxQA0E786T5ykpO8ts+LayV+3/oI2w==
-  dependencies:
-    "@babel/runtime" "^7.5.5"
-    global "~4.4.0"
-    is-function "^1.0.1"
-
-"@webassemblyjs/ast@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359"
-  integrity sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==
-  dependencies:
-    "@webassemblyjs/helper-module-context" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/wast-parser" "1.8.5"
-
-"@webassemblyjs/floating-point-hex-parser@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721"
-  integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==
-
-"@webassemblyjs/helper-api-error@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7"
-  integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==
-
-"@webassemblyjs/helper-buffer@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204"
-  integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==
-
-"@webassemblyjs/helper-code-frame@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz#9a740ff48e3faa3022b1dff54423df9aa293c25e"
-  integrity sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==
-  dependencies:
-    "@webassemblyjs/wast-printer" "1.8.5"
-
-"@webassemblyjs/helper-fsm@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452"
-  integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==
-
-"@webassemblyjs/helper-module-context@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz#def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245"
-  integrity sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    mamacro "^0.0.3"
-
-"@webassemblyjs/helper-wasm-bytecode@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61"
-  integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==
-
-"@webassemblyjs/helper-wasm-section@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz#74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf"
-  integrity sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-buffer" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/wasm-gen" "1.8.5"
-
-"@webassemblyjs/ieee754@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz#712329dbef240f36bf57bd2f7b8fb9bf4154421e"
-  integrity sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==
-  dependencies:
-    "@xtuc/ieee754" "^1.2.0"
-
-"@webassemblyjs/leb128@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10"
-  integrity sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==
-  dependencies:
-    "@xtuc/long" "4.2.2"
-
-"@webassemblyjs/utf8@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc"
-  integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==
-
-"@webassemblyjs/wasm-edit@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz#962da12aa5acc1c131c81c4232991c82ce56e01a"
-  integrity sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-buffer" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/helper-wasm-section" "1.8.5"
-    "@webassemblyjs/wasm-gen" "1.8.5"
-    "@webassemblyjs/wasm-opt" "1.8.5"
-    "@webassemblyjs/wasm-parser" "1.8.5"
-    "@webassemblyjs/wast-printer" "1.8.5"
-
-"@webassemblyjs/wasm-gen@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz#54840766c2c1002eb64ed1abe720aded714f98bc"
-  integrity sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/ieee754" "1.8.5"
-    "@webassemblyjs/leb128" "1.8.5"
-    "@webassemblyjs/utf8" "1.8.5"
-
-"@webassemblyjs/wasm-opt@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz#b24d9f6ba50394af1349f510afa8ffcb8a63d264"
-  integrity sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-buffer" "1.8.5"
-    "@webassemblyjs/wasm-gen" "1.8.5"
-    "@webassemblyjs/wasm-parser" "1.8.5"
-
-"@webassemblyjs/wasm-parser@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz#21576f0ec88b91427357b8536383668ef7c66b8d"
-  integrity sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-api-error" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/ieee754" "1.8.5"
-    "@webassemblyjs/leb128" "1.8.5"
-    "@webassemblyjs/utf8" "1.8.5"
-
-"@webassemblyjs/wast-parser@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz#e10eecd542d0e7bd394f6827c49f3df6d4eefb8c"
-  integrity sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/floating-point-hex-parser" "1.8.5"
-    "@webassemblyjs/helper-api-error" "1.8.5"
-    "@webassemblyjs/helper-code-frame" "1.8.5"
-    "@webassemblyjs/helper-fsm" "1.8.5"
-    "@xtuc/long" "4.2.2"
-
-"@webassemblyjs/wast-printer@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz#114bbc481fd10ca0e23b3560fa812748b0bae5bc"
-  integrity sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/wast-parser" "1.8.5"
-    "@xtuc/long" "4.2.2"
-
-"@xtuc/ieee754@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
-  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
-
-"@xtuc/long@4.2.2":
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
-  integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
-
-"@yarnpkg/lockfile@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
-  integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
-
-JSONStream@^1.3.4:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
-  integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==
-  dependencies:
-    jsonparse "^1.2.0"
-    through ">=2.2.7 <3"
-
-abab@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
-  integrity sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4=
-
-accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
-  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
-  dependencies:
-    mime-types "~2.1.24"
-    negotiator "0.6.2"
-
-ace-builds@^1.4.2:
-  version "1.4.12"
-  resolved "https://registry.yarnpkg.com/ace-builds/-/ace-builds-1.4.12.tgz#888efa386e36f4345f40b5233fcc4fe4c588fae7"
-  integrity sha512-G+chJctFPiiLGvs3+/Mly3apXTcfgE45dT5yp12BcWZ1kUs+gm0qd3/fv4gsz6fVag4mM0moHVpjHDIgph6Psg==
-
-acorn-globals@^1.0.4:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-1.0.9.tgz#55bb5e98691507b74579d0513413217c380c54cf"
-  integrity sha1-VbtemGkVB7dFedBRNBMhfDgMVM8=
-  dependencies:
-    acorn "^2.1.0"
-
-acorn-node@^1.6.1:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.8.2.tgz#114c95d64539e53dede23de8b9d96df7c7ae2af8"
-  integrity sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==
-  dependencies:
-    acorn "^7.0.0"
-    acorn-walk "^7.0.0"
-    xtend "^4.0.2"
-
-acorn-walk@^7.0.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
-  integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
-
-acorn-walk@^8.0.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
-  integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
-
-acorn@^2.1.0, acorn@^2.4.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-2.7.0.tgz#ab6e7d9d886aaca8b085bc3312b79a198433f0e7"
-  integrity sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=
-
-acorn@^6.2.1:
-  version "6.4.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
-  integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
-
-acorn@^7.0.0, acorn@^7.1.0:
-  version "7.4.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
-  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
-
-acorn@^8.0.4:
-  version "8.7.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
-  integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
-
-adler-32@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/adler-32/-/adler-32-1.2.0.tgz#6a3e6bf0a63900ba15652808cb15c6813d1a5f25"
-  integrity sha1-aj5r8KY5ALoVZSgIyxXGgT0aXyU=
-  dependencies:
-    exit-on-epipe "~1.0.1"
-    printj "~1.1.0"
-
-adm-zip@^0.4.9:
-  version "0.4.16"
-  resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.16.tgz#cf4c508fdffab02c269cbc7f471a875f05570365"
-  integrity sha512-TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg==
-
-aes-decrypter@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/aes-decrypter/-/aes-decrypter-3.0.0.tgz#7848a1c145b9fdbf57ae3e2b5b1bc7cf0644a8fb"
-  integrity sha1-eEihwUW5/b9Xrj4rWxvHzwZEqPs=
-  dependencies:
-    commander "^2.9.0"
-    global "^4.3.2"
-    pkcs7 "^1.0.2"
-
-aes-decrypter@3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/aes-decrypter/-/aes-decrypter-3.1.2.tgz#3545546f8e9f6b878640339a242efe221ba7a7cb"
-  integrity sha512-42nRwfQuPRj9R1zqZBdoxnaAmnIFyDi0MNyTVhjdFOd8fifXKKRfwIHIZ6AMn1or4x5WONzjwRTbTWcsIQ0O4A==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    "@videojs/vhs-utils" "^3.0.0"
-    global "^4.4.0"
-    pkcs7 "^1.0.4"
-
-after@0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
-  integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
-
-agent-base@4, agent-base@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
-  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
-  dependencies:
-    es6-promisify "^5.0.0"
-
-agent-base@~4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
-  integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
-  dependencies:
-    es6-promisify "^5.0.0"
-
-agentkeepalive@^3.4.1:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.5.2.tgz#a113924dd3fa24a0bc3b78108c450c2abee00f67"
-  integrity sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==
-  dependencies:
-    humanize-ms "^1.2.1"
-
-aggregate-error@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
-  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
-  dependencies:
-    clean-stack "^2.0.0"
-    indent-string "^4.0.0"
-
-ajv-errors@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
-  integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
-
-ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
-  integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
-
-ajv@6.10.2:
-  version "6.10.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52"
-  integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==
-  dependencies:
-    fast-deep-equal "^2.0.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-ajv@6.12.3:
-  version "6.12.3"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.3.tgz#18c5af38a111ddeb4f2697bd78d68abc1cabd706"
-  integrity sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4:
-  version "6.12.6"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
-  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-amdefine@>=0.0.4:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
-  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
-
-angular-cli-alias@^1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/angular-cli-alias/-/angular-cli-alias-1.0.9.tgz#7b82d72d394cc42b81bd00e7b37013aae264d1b1"
-  integrity sha512-0RHDqEUfL1WoUG6uO74U+AGradG9bYaH2nf9/9CvM7ckoAb5P1XS8fMQYmVn8dOAfmVChj3x9XwxFVwT829rhw==
-
-ansi-align@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb"
-  integrity sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==
-  dependencies:
-    string-width "^3.0.0"
-
-ansi-colors@4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
-  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
-
-ansi-colors@^3.0.0:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
-  integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
-
-ansi-escapes@^4.2.1:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
-  integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
-  dependencies:
-    type-fest "^0.21.3"
-
-ansi-html@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
-  integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4=
-
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
-
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
-
-ansi-regex@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
-  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
-
-ansi-regex@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
-  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
-
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
-
-ansi-styles@^3.2.0, ansi-styles@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
-  dependencies:
-    color-convert "^1.9.0"
-
-ansi-styles@^4.1.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
-  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
-  dependencies:
-    color-convert "^2.0.1"
-
-any-promise@^1.0.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
-  integrity sha1-q8av7tzqUugJzcA3au0845Y10X8=
-
-anymatch@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
-  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
-  dependencies:
-    micromatch "^3.1.4"
-    normalize-path "^2.1.1"
-
-anymatch@~3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
-  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
-  dependencies:
-    normalize-path "^3.0.0"
-    picomatch "^2.0.4"
-
-app-root-path@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.2.1.tgz#d0df4a682ee408273583d43f6f79e9892624bc9a"
-  integrity sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==
-
-append-transform@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-1.0.0.tgz#046a52ae582a228bd72f58acfbe2967c678759ab"
-  integrity sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==
-  dependencies:
-    default-require-extensions "^2.0.0"
-
-aproba@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
-
-arg@^4.1.0:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
-  integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
-
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
-
-aria-query@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-3.0.0.tgz#65b3fcc1ca1155a8c9ae64d6eee297f15d5133cc"
-  integrity sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=
-  dependencies:
-    ast-types-flow "0.0.7"
-    commander "^2.11.0"
-
-arr-diff@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
-  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
-
-arr-flatten@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
-  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
-
-arr-union@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
-  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
-
-array-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
-  integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=
-
-array-flatten@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
-  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
-
-array-flatten@^2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
-  integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
-
-array-slice@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
-  integrity sha512-rlVfZW/1Ph2SNySXwR9QYkChp8EkOEiTMO5Vwx60usw04i4nWemkm9RXmQqgkQFaLHsqLuADvjp6IfgL9l2M8Q==
-
-array-union@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
-  dependencies:
-    array-uniq "^1.0.1"
-
-array-union@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
-  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
-
-array-uniq@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
-
-array-unique@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
-  integrity sha512-G2n5bG5fSUCpnsXz4+8FUkYsGPkNfLn9YvS66U5qbTIXI2Ynnlo4Bi42bWv+omKUCqz+ejzfClwne0alJWJPhg==
-
-array-unique@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
-  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
-
-arraybuffer.slice@~0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
-  integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
-
-arrify@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
-
-asap@^2.0.0, asap@~2.0.3:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
-  integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
-
-asn1.js@^5.2.0:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07"
-  integrity sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==
-  dependencies:
-    bn.js "^4.0.0"
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-    safer-buffer "^2.1.0"
-
-asn1@~0.2.3:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
-  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
-  dependencies:
-    safer-buffer "~2.1.0"
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
-
-assert@^1.1.1:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
-  integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==
-  dependencies:
-    object-assign "^4.1.1"
-    util "0.10.3"
-
-assign-symbols@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
-  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
-
-ast-types-flow@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
-  integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0=
-
-async-each@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
-  integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
-
-async-limiter@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
-  integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
-
-async@^2.5.0, async@^2.6.2:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
-  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
-  dependencies:
-    lodash "^4.17.14"
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
-
-atob@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
-  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
-
-autoprefixer@9.6.1:
-  version "9.6.1"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.1.tgz#51967a02d2d2300bb01866c1611ec8348d355a47"
-  integrity sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==
-  dependencies:
-    browserslist "^4.6.3"
-    caniuse-lite "^1.0.30000980"
-    chalk "^2.4.2"
-    normalize-range "^0.1.2"
-    num2fraction "^1.2.2"
-    postcss "^7.0.17"
-    postcss-value-parser "^4.0.0"
-
-autoprefixer@^9.4.5, autoprefixer@^9.6.0:
-  version "9.8.6"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f"
-  integrity sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==
-  dependencies:
-    browserslist "^4.12.0"
-    caniuse-lite "^1.0.30001109"
-    colorette "^1.2.1"
-    normalize-range "^0.1.2"
-    num2fraction "^1.2.2"
-    postcss "^7.0.32"
-    postcss-value-parser "^4.1.0"
-
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
-
-aws4@^1.8.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
-  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
-
-axobject-query@2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.0.2.tgz#ea187abe5b9002b377f925d8bf7d1c561adf38f9"
-  integrity sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==
-  dependencies:
-    ast-types-flow "0.0.7"
-
-babel-plugin-dynamic-import-node@^2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
-  integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==
-  dependencies:
-    object.assign "^4.1.0"
-
-backo2@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
-  integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
-
-balanced-match@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
-  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
-
-base64-arraybuffer@0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
-  integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg=
-
-base64-arraybuffer@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.2.0.tgz#4b944fac0191aa5907afe2d8c999ccc57ce80f45"
-  integrity sha512-7emyCsu1/xiBXgQZrscw/8KPRT44I4Yq9Pe6EGs3aPRTsWuggML1/1DTuZUuIaJPIm1FTDUVXl4x/yW8s0kQDQ==
-
-base64-arraybuffer@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz#1c37589a7c4b0746e34bd1feb951da2df01c1bdc"
-  integrity sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==
-
-base64-js@^1.0.2, base64-js@^1.3.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
-  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
-
-base64id@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz#47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"
-  integrity sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=
-
-base@^0.11.1:
-  version "0.11.2"
-  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
-  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
-  dependencies:
-    cache-base "^1.0.1"
-    class-utils "^0.3.5"
-    component-emitter "^1.2.1"
-    define-property "^1.0.0"
-    isobject "^3.0.1"
-    mixin-deep "^1.2.0"
-    pascalcase "^0.1.1"
-
-batch@0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
-  integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
-
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
-  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
-  dependencies:
-    tweetnacl "^0.14.3"
-
-better-assert@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
-  integrity sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=
-  dependencies:
-    callsite "1.0.0"
-
-big.js@^5.2.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
-  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
-
-binary-extensions@^1.0.0:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
-  integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
-
-binary-extensions@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
-  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
-
-bindings@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
-  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
-  dependencies:
-    file-uri-to-path "1.0.0"
-
-blob@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
-  integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==
-
-blocking-proxy@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/blocking-proxy/-/blocking-proxy-1.0.1.tgz#81d6fd1fe13a4c0d6957df7f91b75e98dac40cb2"
-  integrity sha512-KE8NFMZr3mN2E0HcvCgRtX7DjhiIQrwle+nSVJVC/yqFb9+xznHl2ZcoBp2L9qzkI4t4cBFJ1efXF8Dwi132RA==
-  dependencies:
-    minimist "^1.2.0"
-
-bluebird@^3.3.0, bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3.5.5:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
-  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
-
-bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9:
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
-  integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
-
-bn.js@^5.0.0, bn.js@^5.1.1:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002"
-  integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==
-
-body-parser@1.19.0, body-parser@^1.16.1:
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
-  integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
-  dependencies:
-    bytes "3.1.0"
-    content-type "~1.0.4"
-    debug "2.6.9"
-    depd "~1.1.2"
-    http-errors "1.7.2"
-    iconv-lite "0.4.24"
-    on-finished "~2.3.0"
-    qs "6.7.0"
-    raw-body "2.4.0"
-    type-is "~1.6.17"
-
-bonjour@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
-  integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU=
-  dependencies:
-    array-flatten "^2.1.0"
-    deep-equal "^1.0.1"
-    dns-equal "^1.0.0"
-    dns-txt "^2.0.2"
-    multicast-dns "^6.0.1"
-    multicast-dns-service-types "^1.1.0"
-
-boxen@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/boxen/-/boxen-3.2.0.tgz#fbdff0de93636ab4450886b6ff45b92d098f45eb"
-  integrity sha512-cU4J/+NodM3IHdSL2yN8bqYqnmlBTidDR4RC7nJs61ZmtGz8VZzM3HLQX0zY5mrSmPtR3xWwsq2jOUQqFZN8+A==
-  dependencies:
-    ansi-align "^3.0.0"
-    camelcase "^5.3.1"
-    chalk "^2.4.2"
-    cli-boxes "^2.2.0"
-    string-width "^3.0.0"
-    term-size "^1.2.0"
-    type-fest "^0.3.0"
-    widest-line "^2.0.0"
-
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-brace@^0.11.1:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/brace/-/brace-0.11.1.tgz#4896fcc9d544eef45f4bb7660db320d3b379fe58"
-  integrity sha1-SJb8ydVE7vRfS7dmDbMg07N5/lg=
-
-braces@^0.1.2:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-0.1.5.tgz#c085711085291d8b75fdd74eab0f8597280711e6"
-  integrity sha512-EIMHIv2UXHWFY2xubUGKz+hq9hNkENj4Pjvr7h58cmJgpkK2yMlKA8I484f7MSttkzVAy/lL7X9xDaILd6avzA==
-  dependencies:
-    expand-range "^0.1.0"
-
-braces@^2.3.1, braces@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
-  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
-  dependencies:
-    arr-flatten "^1.1.0"
-    array-unique "^0.3.2"
-    extend-shallow "^2.0.1"
-    fill-range "^4.0.0"
-    isobject "^3.0.1"
-    repeat-element "^1.1.2"
-    snapdragon "^0.8.1"
-    snapdragon-node "^2.0.1"
-    split-string "^3.0.2"
-    to-regex "^3.0.1"
-
-braces@^3.0.1, braces@^3.0.2, braces@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
-  dependencies:
-    fill-range "^7.0.1"
-
-brorand@^1.0.1, brorand@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
-  integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
-
-browserify-aes@^1.0.0, browserify-aes@^1.0.4:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
-  integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
-  dependencies:
-    buffer-xor "^1.0.3"
-    cipher-base "^1.0.0"
-    create-hash "^1.1.0"
-    evp_bytestokey "^1.0.3"
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
-browserify-cipher@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
-  integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==
-  dependencies:
-    browserify-aes "^1.0.4"
-    browserify-des "^1.0.0"
-    evp_bytestokey "^1.0.0"
-
-browserify-des@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
-  integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==
-  dependencies:
-    cipher-base "^1.0.1"
-    des.js "^1.0.0"
-    inherits "^2.0.1"
-    safe-buffer "^5.1.2"
-
-browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d"
-  integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==
-  dependencies:
-    bn.js "^5.0.0"
-    randombytes "^2.0.1"
-
-browserify-sign@^4.0.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3"
-  integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==
-  dependencies:
-    bn.js "^5.1.1"
-    browserify-rsa "^4.0.1"
-    create-hash "^1.2.0"
-    create-hmac "^1.1.7"
-    elliptic "^6.5.3"
-    inherits "^2.0.4"
-    parse-asn1 "^5.1.5"
-    readable-stream "^3.6.0"
-    safe-buffer "^5.2.0"
-
-browserify-zlib@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
-  integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
-  dependencies:
-    pako "~1.0.5"
-
-browserslist@4.10.0:
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.10.0.tgz#f179737913eaf0d2b98e4926ac1ca6a15cbcc6a9"
-  integrity sha512-TpfK0TDgv71dzuTsEAlQiHeWQ/tiPqgNZVdv046fvNtBZrjbv2O3TsWCDU0AWGJJKCF/KsjNdLzR9hXOsh/CfA==
-  dependencies:
-    caniuse-lite "^1.0.30001035"
-    electron-to-chromium "^1.3.378"
-    node-releases "^1.1.52"
-    pkg-up "^3.1.0"
-
-browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.6.3, browserslist@^4.8.5:
-  version "4.16.6"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
-  integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
-  dependencies:
-    caniuse-lite "^1.0.30001219"
-    colorette "^1.2.2"
-    electron-to-chromium "^1.3.723"
-    escalade "^3.1.1"
-    node-releases "^1.1.71"
-
-browserstack@^1.5.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/browserstack/-/browserstack-1.6.1.tgz#e051f9733ec3b507659f395c7a4765a1b1e358b3"
-  integrity sha512-GxtFjpIaKdbAyzHfFDKixKO8IBT7wR3NjbzrGc78nNs/Ciys9wU3/nBtsqsWv5nDSrdI5tz0peKuzCPuNXNUiw==
-  dependencies:
-    https-proxy-agent "^2.2.1"
-
-btoa@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/btoa/-/btoa-1.2.1.tgz#01a9909f8b2c93f6bf680ba26131eb30f7fa3d73"
-  integrity sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==
-
-buffer-alloc-unsafe@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
-  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
-
-buffer-alloc@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
-  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
-  dependencies:
-    buffer-alloc-unsafe "^1.1.0"
-    buffer-fill "^1.0.0"
-
-buffer-fill@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
-  integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
-
-buffer-from@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
-  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
-
-buffer-indexof@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
-  integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==
-
-buffer-xor@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
-  integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
-
-buffer@^4.3.0:
-  version "4.9.2"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8"
-  integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==
-  dependencies:
-    base64-js "^1.0.2"
-    ieee754 "^1.1.4"
-    isarray "^1.0.0"
-
-buffer@^5.6.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
-  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
-  dependencies:
-    base64-js "^1.3.1"
-    ieee754 "^1.1.13"
-
-builtin-modules@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
-  integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
-
-builtin-modules@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.2.0.tgz#45d5db99e7ee5e6bc4f362e008bf917ab5049887"
-  integrity sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==
-
-builtin-status-codes@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
-  integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
-
-builtins@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
-  integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og=
-
-bytes@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
-  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
-
-bytes@3.1.0, bytes@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
-  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
-
-cacache@12.0.2:
-  version "12.0.2"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.2.tgz#8db03205e36089a3df6954c66ce92541441ac46c"
-  integrity sha512-ifKgxH2CKhJEg6tNdAwziu6Q33EvuG26tYcda6PT3WKisZcYDXsnEdnRv67Po3yCzFfaSoMjGZzJyD2c3DT1dg==
-  dependencies:
-    bluebird "^3.5.5"
-    chownr "^1.1.1"
-    figgy-pudding "^3.5.1"
-    glob "^7.1.4"
-    graceful-fs "^4.1.15"
-    infer-owner "^1.0.3"
-    lru-cache "^5.1.1"
-    mississippi "^3.0.0"
-    mkdirp "^0.5.1"
-    move-concurrently "^1.0.1"
-    promise-inflight "^1.0.1"
-    rimraf "^2.6.3"
-    ssri "^6.0.1"
-    unique-filename "^1.1.1"
-    y18n "^4.0.0"
-
-cacache@^12.0.0, cacache@^12.0.2:
-  version "12.0.4"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c"
-  integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==
-  dependencies:
-    bluebird "^3.5.5"
-    chownr "^1.1.1"
-    figgy-pudding "^3.5.1"
-    glob "^7.1.4"
-    graceful-fs "^4.1.15"
-    infer-owner "^1.0.3"
-    lru-cache "^5.1.1"
-    mississippi "^3.0.0"
-    mkdirp "^0.5.1"
-    move-concurrently "^1.0.1"
-    promise-inflight "^1.0.1"
-    rimraf "^2.6.3"
-    ssri "^6.0.1"
-    unique-filename "^1.1.1"
-    y18n "^4.0.0"
-
-cacache@^15.0.4:
-  version "15.0.6"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.6.tgz#65a8c580fda15b59150fb76bf3f3a8e45d583099"
-  integrity sha512-g1WYDMct/jzW+JdWEyjaX2zoBkZ6ZT9VpOyp2I/VMtDsNLffNat3kqPFfi1eDRSK9/SuKGyORDHcQMcPF8sQ/w==
-  dependencies:
-    "@npmcli/move-file" "^1.0.1"
-    chownr "^2.0.0"
-    fs-minipass "^2.0.0"
-    glob "^7.1.4"
-    infer-owner "^1.0.4"
-    lru-cache "^6.0.0"
-    minipass "^3.1.1"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.2"
-    mkdirp "^1.0.3"
-    p-map "^4.0.0"
-    promise-inflight "^1.0.1"
-    rimraf "^3.0.2"
-    ssri "^8.0.1"
-    tar "^6.0.2"
-    unique-filename "^1.1.1"
-
-cache-base@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
-  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
-  dependencies:
-    collection-visit "^1.0.0"
-    component-emitter "^1.2.1"
-    get-value "^2.0.6"
-    has-value "^1.0.0"
-    isobject "^3.0.1"
-    set-value "^2.0.0"
-    to-object-path "^0.3.0"
-    union-value "^1.0.0"
-    unset-value "^1.0.0"
-
-cacheable-request@^6.0.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912"
-  integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==
-  dependencies:
-    clone-response "^1.0.2"
-    get-stream "^5.1.0"
-    http-cache-semantics "^4.0.0"
-    keyv "^3.0.0"
-    lowercase-keys "^2.0.0"
-    normalize-url "^4.1.0"
-    responselike "^1.0.2"
-
-call-bind@^1.0.0, call-bind@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
-  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
-  dependencies:
-    function-bind "^1.1.1"
-    get-intrinsic "^1.0.2"
-
-caller-callsite@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
-  integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=
-  dependencies:
-    callsites "^2.0.0"
-
-caller-path@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
-  integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=
-  dependencies:
-    caller-callsite "^2.0.0"
-
-callsite@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
-  integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA=
-
-callsites@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
-  integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
-
-callsites@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
-  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
-
-camelcase-css@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5"
-  integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==
-
-camelcase@^5.0.0, camelcase@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
-  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
-
-caniuse-lite@1.0.30001035:
-  version "1.0.30001035"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz#2bb53b8aa4716b2ed08e088d4dc816a5fe089a1e"
-  integrity sha512-C1ZxgkuA4/bUEdMbU5WrGY4+UhMFFiXrgNAfxiMIqWgFTWfv/xsZCS2xEHT2LMq7xAZfuAnu6mcqyDl0ZR6wLQ==
-
-caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001219:
-  version "1.0.30001228"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz#bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa"
-  integrity sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==
-
-canonical-path@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-1.0.0.tgz#fcb470c23958def85081856be7a86e904f180d1d"
-  integrity sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==
-
-canvg@^1.0:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/canvg/-/canvg-1.5.3.tgz#aad17915f33368bf8eb80b25d129e3ae922ddc5f"
-  integrity sha512-7Gn2IuQzvUQWPIuZuFHrzsTM0gkPz2RRT9OcbdmA03jeKk8kltrD8gqUzNX15ghY/4PV5bbe5lmD6yDLDY6Ybg==
-  dependencies:
-    jsdom "^8.1.0"
-    rgbcolor "^1.0.1"
-    stackblur-canvas "^1.4.1"
-    xmldom "^0.1.22"
-
-canvg@^3.0.6:
-  version "3.0.10"
-  resolved "https://registry.yarnpkg.com/canvg/-/canvg-3.0.10.tgz#8e52a2d088b6ffa23ac78970b2a9eebfae0ef4b3"
-  integrity sha512-qwR2FRNO9NlzTeKIPIKpnTY6fqwuYSequ8Ru8c0YkYU7U0oW+hLUvWadLvAu1Rl72OMNiFhoLu4f8eUjQ7l/+Q==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    "@types/raf" "^3.4.0"
-    core-js "^3.8.3"
-    raf "^3.4.1"
-    regenerator-runtime "^0.13.7"
-    rgbcolor "^1.0.1"
-    stackblur-canvas "^2.0.0"
-    svg-pathdata "^6.0.3"
-
-cardboard-vr-display@1.0.13:
-  version "1.0.13"
-  resolved "https://registry.yarnpkg.com/cardboard-vr-display/-/cardboard-vr-display-1.0.13.tgz#e192a220b2970002cfb5cc0f1b480ff5fd6748b6"
-  integrity sha512-/ovHu4nHfo3oaw2v20v7ErvDUmIBPih/e/6VG83XUUFs5vPQaGSM8hihqKClOlwy3Fz+52L0FrhcGSH3o+yn6w==
-  dependencies:
-    gl-preserve-state "^1.0.0"
-    nosleep.js "^0.7.0"
-    webvr-polyfill-dpdb "^1.0.7"
-
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
-
-cf-blob.js@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/cf-blob.js/-/cf-blob.js-0.0.1.tgz#f5ab7e12e798caf08ccf828c69aba0f063d83f99"
-  integrity sha1-9at+EueYyvCMz4KMaaug8GPYP5k=
-
-cfb@^1.1.2, cfb@^1.1.4:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/cfb/-/cfb-1.2.0.tgz#6a4d0872b525ed60349e1ef51fb4b0bf73eca9a8"
-  integrity sha512-sXMvHsKCICVR3Naq+J556K+ExBo9n50iKl6LGarlnvuA2035uMlGA/qVrc0wQtow5P1vJEw9UyrKLCbtIKz+TQ==
-  dependencies:
-    adler-32 "~1.2.0"
-    crc-32 "~1.2.0"
-    printj "~1.1.2"
-
-"chainsaw@>=0.0.7 <0.1":
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/chainsaw/-/chainsaw-0.0.9.tgz#11a05102d1c4c785b6d0415d336d5a3a1612913e"
-  integrity sha1-EaBRAtHEx4W20EFdM21aOhYSkT4=
-  dependencies:
-    traverse ">=0.3.0 <0.4"
-
-chalk@^1.1.1, chalk@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1, chalk@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-"chalk@^3.0.0 || ^4.0.0", chalk@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad"
-  integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
-chalk@^4.1.0:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
-  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
-chardet@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
-  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
-
-chart.js@^2.8.0:
-  version "2.9.4"
-  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.9.4.tgz#0827f9563faffb2dc5c06562f8eb10337d5b9684"
-  integrity sha512-B07aAzxcrikjAPyV+01j7BmOpxtQETxTSlQ26BEYJ+3iUkbNKaOJ/nDbT6JjyqYxseM0ON12COHYdU2cTIjC7A==
-  dependencies:
-    chartjs-color "^2.1.0"
-    moment "^2.10.2"
-
-chartjs-color-string@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz#1df096621c0e70720a64f4135ea171d051402f71"
-  integrity sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A==
-  dependencies:
-    color-name "^1.0.0"
-
-chartjs-color@^2.1.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.4.1.tgz#6118bba202fe1ea79dd7f7c0f9da93467296c3b0"
-  integrity sha512-haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w==
-  dependencies:
-    chartjs-color-string "^0.6.0"
-    color-convert "^1.9.3"
-
-"chokidar@>=2.0.0 <4.0.0", "chokidar@>=3.0.0 <4.0.0", chokidar@^3.0.0, chokidar@^3.4.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a"
-  integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==
-  dependencies:
-    anymatch "~3.1.1"
-    braces "~3.0.2"
-    glob-parent "~5.1.0"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.5.0"
-  optionalDependencies:
-    fsevents "~2.3.1"
-
-chokidar@^2.0.3, chokidar@^2.1.1, chokidar@^2.1.8:
-  version "2.1.8"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
-  integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
-  dependencies:
-    anymatch "^2.0.0"
-    async-each "^1.0.1"
-    braces "^2.3.2"
-    glob-parent "^3.1.0"
-    inherits "^2.0.3"
-    is-binary-path "^1.0.0"
-    is-glob "^4.0.0"
-    normalize-path "^3.0.0"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.2.1"
-    upath "^1.1.1"
-  optionalDependencies:
-    fsevents "^1.2.7"
-
-chownr@^1.1.1:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
-  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
-
-chownr@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
-  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
-
-chrome-trace-event@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
-  integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
-
-ci-info@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
-  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
-
-cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
-  integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==
-  dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
-circular-dependency-plugin@5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-5.2.0.tgz#e09dbc2dd3e2928442403e2d45b41cea06bc0a93"
-  integrity sha512-7p4Kn/gffhQaavNfyDFg7LS5S/UT1JAjyGd4UqR2+jzoYF02eDkj0Ec3+48TsIa4zghjLY87nQHIh/ecK9qLdw==
-
-circular-json@^0.5.5:
-  version "0.5.9"
-  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.5.9.tgz#932763ae88f4f7dead7a0d09c8a51a4743a53b1d"
-  integrity sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==
-
-class-utils@^0.3.5:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
-  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
-  dependencies:
-    arr-union "^3.1.0"
-    define-property "^0.2.5"
-    isobject "^3.0.0"
-    static-extend "^0.1.1"
-
-clean-css@4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz#2d411ef76b8569b6d0c84068dabe85b0aa5e5c17"
-  integrity sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==
-  dependencies:
-    source-map "~0.6.0"
-
-clean-css@^4.1.11:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78"
-  integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==
-  dependencies:
-    source-map "~0.6.0"
-
-clean-stack@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
-  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
-
-cli-boxes@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f"
-  integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==
-
-cli-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
-  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
-  dependencies:
-    restore-cursor "^3.1.0"
-
-cli-width@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
-  integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==
-
-cliui@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
-  integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==
-  dependencies:
-    string-width "^2.1.1"
-    strip-ansi "^4.0.0"
-    wrap-ansi "^2.0.0"
-
-cliui@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
-  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
-  dependencies:
-    string-width "^3.1.0"
-    strip-ansi "^5.2.0"
-    wrap-ansi "^5.1.0"
-
-clone-deep@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
-  integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
-  dependencies:
-    is-plain-object "^2.0.4"
-    kind-of "^6.0.2"
-    shallow-clone "^3.0.0"
-
-clone-response@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
-  integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
-  dependencies:
-    mimic-response "^1.0.0"
-
-clone@^2.1.1, clone@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
-  integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
-
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
-
-codelyzer@^5.1.0:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-5.2.2.tgz#d0530a455784e6bea0b6d7e97166c73c30a5347f"
-  integrity sha512-jB4FZ1Sx7kZhvZVdf+N2BaKTdrrNZOL0Bj10RRfrhHrb3zEvXjJvvq298JPMJAiyiCS/v4zs1QlGU0ip7xGqeA==
-  dependencies:
-    app-root-path "^2.2.1"
-    aria-query "^3.0.0"
-    axobject-query "2.0.2"
-    css-selector-tokenizer "^0.7.1"
-    cssauron "^1.4.0"
-    damerau-levenshtein "^1.0.4"
-    semver-dsl "^1.0.1"
-    source-map "^0.5.7"
-    sprintf-js "^1.1.2"
-
-codepage@~1.14.0:
-  version "1.14.0"
-  resolved "https://registry.yarnpkg.com/codepage/-/codepage-1.14.0.tgz#8cbe25481323559d7d307571b0fff91e7a1d2f99"
-  integrity sha1-jL4lSBMjVZ19MHVxsP/5HnodL5k=
-  dependencies:
-    commander "~2.14.1"
-    exit-on-epipe "~1.0.1"
-
-collection-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
-  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
-  dependencies:
-    map-visit "^1.0.0"
-    object-visit "^1.0.0"
-
-color-convert@^1.9.0, color-convert@^1.9.1, color-convert@^1.9.3:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
-  dependencies:
-    color-name "1.1.3"
-
-color-convert@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
-  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
-  dependencies:
-    color-name "~1.1.4"
-
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
-
-color-name@^1.0.0, color-name@~1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
-  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-
-color-string@^1.5.4:
-  version "1.5.5"
-  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.5.tgz#65474a8f0e7439625f3d27a6a19d89fc45223014"
-  integrity sha512-jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg==
-  dependencies:
-    color-name "^1.0.0"
-    simple-swizzle "^0.2.2"
-
-color@^3.1.2:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/color/-/color-3.1.3.tgz#ca67fb4e7b97d611dcde39eceed422067d91596e"
-  integrity sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ==
-  dependencies:
-    color-convert "^1.9.1"
-    color-string "^1.5.4"
-
-colorette@^1.2.1, colorette@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
-  integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
-
-colors@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
-  integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM=
-
-colors@^1.1.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
-  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
-
-combine-lists@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/combine-lists/-/combine-lists-1.0.1.tgz#458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"
-  integrity sha512-4Mi0V7N48B9KzC8Zl/U7wiWuxMFEHf44N3/PSoAvWDu8IOPrddNo1y1tC/kXbP7IvVMhgCFMMNzgKb0pWoin9w==
-  dependencies:
-    lodash "^4.5.0"
-
-combined-stream@^1.0.6, combined-stream@~1.0.6:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
-  dependencies:
-    delayed-stream "~1.0.0"
-
-commander@2, commander@^2.11.0, commander@^2.12.1, commander@^2.20.0, commander@^2.9.0:
-  version "2.20.3"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
-  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
-
-commander@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-3.0.2.tgz#6837c3fb677ad9933d1cfba42dd14d5117d6b39e"
-  integrity sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==
-
-commander@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
-  integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
-
-commander@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
-  integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
-
-commander@~2.14.1:
-  version "2.14.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa"
-  integrity sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw==
-
-commander@~2.17.1:
-  version "2.17.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
-  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
-
-commondir@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
-
-compare-versions@^3.4.0, compare-versions@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62"
-  integrity sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==
-
-component-bind@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
-  integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=
-
-component-emitter@1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
-  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
-
-component-emitter@^1.2.1, component-emitter@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
-  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
-
-component-inherit@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
-  integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=
-
-compressible@~2.0.16:
-  version "2.0.18"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
-  integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==
-  dependencies:
-    mime-db ">= 1.43.0 < 2"
-
-compression@^1.7.4:
-  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
-  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
-  dependencies:
-    accepts "~1.3.5"
-    bytes "3.0.0"
-    compressible "~2.0.16"
-    debug "2.6.9"
-    on-headers "~1.0.2"
-    safe-buffer "5.1.2"
-    vary "~1.1.2"
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
-
-concat-stream@^1.5.0:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
-  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
-  dependencies:
-    buffer-from "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^2.2.2"
-    typedarray "^0.0.6"
-
-configstore@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/configstore/-/configstore-4.0.0.tgz#5933311e95d3687efb592c528b922d9262d227e7"
-  integrity sha512-CmquAXFBocrzaSM8mtGPMM/HiWmyIpr4CcJl/rgY2uCObZ/S7cKU0silxslqJejl+t/T9HS8E0PUNQD81JGUEQ==
-  dependencies:
-    dot-prop "^4.1.0"
-    graceful-fs "^4.1.2"
-    make-dir "^1.0.0"
-    unique-string "^1.0.0"
-    write-file-atomic "^2.0.0"
-    xdg-basedir "^3.0.0"
-
-connect-history-api-fallback@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
-  integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
-
-connect@^3.6.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8"
-  integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==
-  dependencies:
-    debug "2.6.9"
-    finalhandler "1.1.2"
-    parseurl "~1.3.3"
-    utils-merge "1.0.1"
-
-console-browserify@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
-  integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
-
-constants-browserify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
-  integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
-
-content-disposition@0.5.3:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
-  integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
-  dependencies:
-    safe-buffer "5.1.2"
-
-content-type@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
-  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
-
-convert-source-map@^1.5.1, convert-source-map@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
-  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
-  dependencies:
-    safe-buffer "~5.1.1"
-
-cookie-signature@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
-  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
-
-cookie@0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
-  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
-
-cookie@0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
-  integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
-
-copy-anything@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/copy-anything/-/copy-anything-2.0.3.tgz#842407ba02466b0df844819bbe3baebbe5d45d87"
-  integrity sha512-GK6QUtisv4fNS+XcI7shX0Gx9ORg7QqIznyfho79JTnX1XhLiyZHfftvGiziqzRiEi/Bjhgpi+D2o7HxJFPnDQ==
-  dependencies:
-    is-what "^3.12.0"
-
-copy-concurrently@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
-  integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==
-  dependencies:
-    aproba "^1.1.1"
-    fs-write-stream-atomic "^1.0.8"
-    iferr "^0.1.5"
-    mkdirp "^0.5.1"
-    rimraf "^2.5.4"
-    run-queue "^1.0.0"
-
-copy-descriptor@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
-  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
-
-copy-webpack-plugin@6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-6.0.3.tgz#2b3d2bfc6861b96432a65f0149720adbd902040b"
-  integrity sha512-q5m6Vz4elsuyVEIUXr7wJdIdePWTubsqVbEMvf1WQnHGv0Q+9yPRu7MtYFPt+GBOXRav9lvIINifTQ1vSCs+eA==
-  dependencies:
-    cacache "^15.0.4"
-    fast-glob "^3.2.4"
-    find-cache-dir "^3.3.1"
-    glob-parent "^5.1.1"
-    globby "^11.0.1"
-    loader-utils "^2.0.0"
-    normalize-path "^3.0.0"
-    p-limit "^3.0.1"
-    schema-utils "^2.7.0"
-    serialize-javascript "^4.0.0"
-    webpack-sources "^1.4.3"
-
-core-js-compat@^3.6.2:
-  version "3.12.1"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.12.1.tgz#2c302c4708505fa7072b0adb5156d26f7801a18b"
-  integrity sha512-i6h5qODpw6EsHAoIdQhKoZdWn+dGBF3dSS8m5tif36RlWvW3A6+yu2S16QHUo3CrkzrnEskMAt9f8FxmY9fhWQ==
-  dependencies:
-    browserslist "^4.16.6"
-    semver "7.0.0"
-
-core-js@3.6.4:
-  version "3.6.4"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.4.tgz#440a83536b458114b9cb2ac1580ba377dc470647"
-  integrity sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==
-
-core-js@^2.2.0:
-  version "2.6.12"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
-  integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
-
-core-js@^3.1.3:
-  version "3.12.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.12.1.tgz#6b5af4ff55616c08a44d386f1f510917ff204112"
-  integrity sha512-Ne9DKPHTObRuB09Dru5AjwKjY4cJHVGu+y5f7coGn1E9Grkc3p2iBwE9AI/nJzsE29mQF7oq+mhYYRqOMFN1Bw==
-
-core-js@^3.6.0, core-js@^3.8.3:
-  version "3.23.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.23.1.tgz#9f9a9255115f62c512db56d567f636da32ca0b78"
-  integrity sha512-wfMYHWi1WQjpgZNC9kAlN4ut04TM9fUTdi7CqIoTVM7yaiOUQTklOzfb+oWH3r9edQcT3F887swuVmxrV+CC8w==
-
-core-util-is@1.0.2, core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
-
-cosmiconfig@^5.0.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a"
-  integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==
-  dependencies:
-    import-fresh "^2.0.0"
-    is-directory "^0.3.1"
-    js-yaml "^3.13.1"
-    parse-json "^4.0.0"
-
-cosmiconfig@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3"
-  integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==
-  dependencies:
-    "@types/parse-json" "^4.0.0"
-    import-fresh "^3.2.1"
-    parse-json "^5.0.0"
-    path-type "^4.0.0"
-    yaml "^1.10.0"
-
-coverage-istanbul-loader@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/coverage-istanbul-loader/-/coverage-istanbul-loader-2.0.3.tgz#87d42f03fa0fd3fa8743ec76945d9d67f105722a"
-  integrity sha512-LiGRvyIuzVYs3M1ZYK1tF0HekjH0DJ8zFdUwAZq378EJzqOgToyb1690dp3TAUlP6Y+82uu42LRjuROVeJ54CA==
-  dependencies:
-    convert-source-map "^1.7.0"
-    istanbul-lib-instrument "^4.0.0"
-    loader-utils "^1.2.3"
-    merge-source-map "^1.1.0"
-    schema-utils "^2.6.1"
-
-crc-32@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz#cb2db6e29b88508e32d9dd0ec1693e7b41a18208"
-  integrity sha512-1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA==
-  dependencies:
-    exit-on-epipe "~1.0.1"
-    printj "~1.1.0"
-
-create-ecdh@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e"
-  integrity sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==
-  dependencies:
-    bn.js "^4.1.0"
-    elliptic "^6.5.3"
-
-create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
-  integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
-  dependencies:
-    cipher-base "^1.0.1"
-    inherits "^2.0.1"
-    md5.js "^1.3.4"
-    ripemd160 "^2.0.1"
-    sha.js "^2.4.0"
-
-create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
-  integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
-  dependencies:
-    cipher-base "^1.0.3"
-    create-hash "^1.1.0"
-    inherits "^2.0.1"
-    ripemd160 "^2.0.0"
-    safe-buffer "^5.0.1"
-    sha.js "^2.4.8"
-
-cross-spawn@^5.0.1:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
-  integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
-  dependencies:
-    lru-cache "^4.0.1"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
-cross-spawn@^6.0.0:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
-  dependencies:
-    nice-try "^1.0.4"
-    path-key "^2.0.1"
-    semver "^5.5.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
-crypto-browserify@^3.11.0:
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
-  integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
-  dependencies:
-    browserify-cipher "^1.0.0"
-    browserify-sign "^4.0.0"
-    create-ecdh "^4.0.0"
-    create-hash "^1.1.0"
-    create-hmac "^1.1.0"
-    diffie-hellman "^5.0.0"
-    inherits "^2.0.1"
-    pbkdf2 "^3.0.3"
-    public-encrypt "^4.0.0"
-    randombytes "^2.0.0"
-    randomfill "^1.0.3"
-
-crypto-random-string@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
-  integrity sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=
-
-css-line-break@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/css-line-break/-/css-line-break-1.1.1.tgz#d5e9bdd297840099eb0503c7310fd34927a026ef"
-  integrity sha512-1feNVaM4Fyzdj4mKPIQNL2n70MmuYzAXZ1aytlROFX1JsOo070OsugwGjj7nl6jnDJWHDM8zRZswkmeYVWZJQA==
-  dependencies:
-    base64-arraybuffer "^0.2.0"
-
-css-line-break@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/css-line-break/-/css-line-break-2.1.0.tgz#bfef660dfa6f5397ea54116bb3cb4873edbc4fa0"
-  integrity sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==
-  dependencies:
-    utrie "^1.0.2"
-
-css-parse@1.7.x:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-1.7.0.tgz#321f6cf73782a6ff751111390fc05e2c657d8c9b"
-  integrity sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=
-
-css-parse@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-2.0.0.tgz#a468ee667c16d81ccf05c58c38d2a97c780dbfd4"
-  integrity sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=
-  dependencies:
-    css "^2.0.0"
-
-css-selector-tokenizer@^0.7.1:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.3.tgz#735f26186e67c749aaf275783405cf0661fae8f1"
-  integrity sha512-jWQv3oCEL5kMErj4wRnK/OPoBi0D+P1FR2cDCKYPaMeD2eW3/mttav8HT4hT1CKopiJI/psEULjkClhvJo4Lvg==
-  dependencies:
-    cssesc "^3.0.0"
-    fastparse "^1.1.2"
-
-css-unit-converter@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.2.tgz#4c77f5a1954e6dbff60695ecb214e3270436ab21"
-  integrity sha512-IiJwMC8rdZE0+xiEZHeru6YoONC4rfPMqGm2W85jMIbkFvv5nFTwJVFHam2eFrN6txmoUYFAFXiv8ICVeTO0MA==
-
-css@^2.0.0:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929"
-  integrity sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==
-  dependencies:
-    inherits "^2.0.3"
-    source-map "^0.6.1"
-    source-map-resolve "^0.5.2"
-    urix "^0.1.0"
-
-cssauron@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/cssauron/-/cssauron-1.4.0.tgz#a6602dff7e04a8306dc0db9a551e92e8b5662ad8"
-  integrity sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=
-  dependencies:
-    through X.X.X
-
-cssesc@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
-  integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
-
-cssom@0.3.x, "cssom@>= 0.3.0 < 0.4.0":
-  version "0.3.8"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
-  integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
-
-"cssstyle@>= 0.2.34 < 0.3.0":
-  version "0.2.37"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.2.37.tgz#541097234cb2513c83ceed3acddc27ff27987d54"
-  integrity sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=
-  dependencies:
-    cssom "0.3.x"
-
-cuint@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/cuint/-/cuint-0.2.2.tgz#408086d409550c2631155619e9fa7bcadc3b991b"
-  integrity sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=
-
-custom-event@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425"
-  integrity sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=
-
-cyclist@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
-  integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
-
-d3-array@1, d3-array@^1.1.1, d3-array@^1.2.0:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.4.tgz#635ce4d5eea759f6f605863dbcfc30edc737f71f"
-  integrity sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw==
-
-d3-axis@1:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/d3-axis/-/d3-axis-1.0.12.tgz#cdf20ba210cfbb43795af33756886fb3638daac9"
-  integrity sha512-ejINPfPSNdGFKEOAtnBtdkpr24c4d4jsei6Lg98mxf424ivoDP2956/5HDpIAtmHo85lqT4pruy+zEgvRUBqaQ==
-
-d3-brush@1:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.1.6.tgz#b0a22c7372cabec128bdddf9bddc058592f89e9b"
-  integrity sha512-7RW+w7HfMCPyZLifTz/UnJmI5kdkXtpCbombUSs8xniAyo0vIbrDzDwUJB6eJOgl9u5DQOt2TQlYumxzD1SvYA==
-  dependencies:
-    d3-dispatch "1"
-    d3-drag "1"
-    d3-interpolate "1"
-    d3-selection "1"
-    d3-transition "1"
-
-d3-chord@1:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/d3-chord/-/d3-chord-1.0.6.tgz#309157e3f2db2c752f0280fedd35f2067ccbb15f"
-  integrity sha512-JXA2Dro1Fxw9rJe33Uv+Ckr5IrAa74TlfDEhE/jfLOaXegMQFQTAgAw9WnZL8+HxVBRXaRGCkrNU7pJeylRIuA==
-  dependencies:
-    d3-array "1"
-    d3-path "1"
-
-d3-collection@1:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.7.tgz#349bd2aa9977db071091c13144d5e4f16b5b310e"
-  integrity sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A==
-
-d3-color@1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.1.tgz#c52002bf8846ada4424d55d97982fef26eb3bc8a"
-  integrity sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q==
-
-d3-contour@1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/d3-contour/-/d3-contour-1.3.2.tgz#652aacd500d2264cb3423cee10db69f6f59bead3"
-  integrity sha512-hoPp4K/rJCu0ladiH6zmJUEz6+u3lgR+GSm/QdM2BBvDraU39Vr7YdDCicJcxP1z8i9B/2dJLgDC1NcvlF8WCg==
-  dependencies:
-    d3-array "^1.1.1"
-
-d3-dispatch@1:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-1.0.6.tgz#00d37bcee4dd8cd97729dd893a0ac29caaba5d58"
-  integrity sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA==
-
-d3-drag@1:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-1.2.5.tgz#2537f451acd39d31406677b7dc77c82f7d988f70"
-  integrity sha512-rD1ohlkKQwMZYkQlYVCrSFxsWPzI97+W+PaEIBNTMxRuxz9RF0Hi5nJWHGVJ3Om9d2fRTe1yOBINJyy/ahV95w==
-  dependencies:
-    d3-dispatch "1"
-    d3-selection "1"
-
-d3-dsv@1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-1.2.0.tgz#9d5f75c3a5f8abd611f74d3f5847b0d4338b885c"
-  integrity sha512-9yVlqvZcSOMhCYzniHE7EVUws7Fa1zgw+/EAV2BxJoG3ME19V6BQFBwI855XQDsxyOuG7NibqRMTtiF/Qup46g==
-  dependencies:
-    commander "2"
-    iconv-lite "0.4"
-    rw "1"
-
-d3-ease@1:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.7.tgz#9a834890ef8b8ae8c558b2fe55bd57f5993b85e2"
-  integrity sha512-lx14ZPYkhNx0s/2HX5sLFUI3mbasHjSSpwO/KaaNACweVwxUruKyWVcb293wMv1RqTPZyZ8kSZ2NogUZNcLOFQ==
-
-d3-fetch@1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/d3-fetch/-/d3-fetch-1.2.0.tgz#15ce2ecfc41b092b1db50abd2c552c2316cf7fc7"
-  integrity sha512-yC78NBVcd2zFAyR/HnUiBS7Lf6inSCoWcSxFfw8FYL7ydiqe80SazNwoffcqOfs95XaLo7yebsmQqDKSsXUtvA==
-  dependencies:
-    d3-dsv "1"
-
-d3-force@1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/d3-force/-/d3-force-1.2.1.tgz#fd29a5d1ff181c9e7f0669e4bd72bdb0e914ec0b"
-  integrity sha512-HHvehyaiUlVo5CxBJ0yF/xny4xoaxFxDnBXNvNcfW9adORGZfyNF1dj6DGLKyk4Yh3brP/1h3rnDzdIAwL08zg==
-  dependencies:
-    d3-collection "1"
-    d3-dispatch "1"
-    d3-quadtree "1"
-    d3-timer "1"
-
-d3-format@1:
-  version "1.4.5"
-  resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.4.5.tgz#374f2ba1320e3717eb74a9356c67daee17a7edb4"
-  integrity sha512-J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ==
-
-d3-geo@1:
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.12.1.tgz#7fc2ab7414b72e59fbcbd603e80d9adc029b035f"
-  integrity sha512-XG4d1c/UJSEX9NfU02KwBL6BYPj8YKHxgBEw5om2ZnTRSbIcego6dhHwcxuSR3clxh0EpE38os1DVPOmnYtTPg==
-  dependencies:
-    d3-array "1"
-
-d3-hierarchy@1:
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-1.1.9.tgz#2f6bee24caaea43f8dc37545fa01628559647a83"
-  integrity sha512-j8tPxlqh1srJHAtxfvOUwKNYJkQuBFdM1+JAUfq6xqH5eAqf93L7oG1NVqDa4CpFZNvnNKtCYEUC8KY9yEn9lQ==
-
-d3-interpolate@1:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.4.0.tgz#526e79e2d80daa383f9e0c1c1c7dcc0f0583e987"
-  integrity sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==
-  dependencies:
-    d3-color "1"
-
-d3-path@1:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-1.0.9.tgz#48c050bb1fe8c262493a8caf5524e3e9591701cf"
-  integrity sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg==
-
-d3-polygon@1:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/d3-polygon/-/d3-polygon-1.0.6.tgz#0bf8cb8180a6dc107f518ddf7975e12abbfbd38e"
-  integrity sha512-k+RF7WvI08PC8reEoXa/w2nSg5AUMTi+peBD9cmFc+0ixHfbs4QmxxkarVal1IkVkgxVuk9JSHhJURHiyHKAuQ==
-
-d3-quadtree@1:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-1.0.7.tgz#ca8b84df7bb53763fe3c2f24bd435137f4e53135"
-  integrity sha512-RKPAeXnkC59IDGD0Wu5mANy0Q2V28L+fNe65pOCXVdVuTJS3WPKaJlFHer32Rbh9gIo9qMuJXio8ra4+YmIymA==
-
-d3-random@1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/d3-random/-/d3-random-1.1.2.tgz#2833be7c124360bf9e2d3fd4f33847cfe6cab291"
-  integrity sha512-6AK5BNpIFqP+cx/sreKzNjWbwZQCSUatxq+pPRmFIQaWuoD+NrbVWw7YWpHiXpCQ/NanKdtGDuB+VQcZDaEmYQ==
-
-d3-scale-chromatic@1:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/d3-scale-chromatic/-/d3-scale-chromatic-1.5.0.tgz#54e333fc78212f439b14641fb55801dd81135a98"
-  integrity sha512-ACcL46DYImpRFMBcpk9HhtIyC7bTBR4fNOPxwVSl0LfulDAwyiHyPOTqcDG1+t5d4P9W7t/2NAuWu59aKko/cg==
-  dependencies:
-    d3-color "1"
-    d3-interpolate "1"
-
-d3-scale@2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-2.2.2.tgz#4e880e0b2745acaaddd3ede26a9e908a9e17b81f"
-  integrity sha512-LbeEvGgIb8UMcAa0EATLNX0lelKWGYDQiPdHj+gLblGVhGLyNbaCn3EvrJf0A3Y/uOOU5aD6MTh5ZFCdEwGiCw==
-  dependencies:
-    d3-array "^1.2.0"
-    d3-collection "1"
-    d3-format "1"
-    d3-interpolate "1"
-    d3-time "1"
-    d3-time-format "2"
-
-d3-selection@1, d3-selection@^1.1.0:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.2.tgz#dcaa49522c0dbf32d6c1858afc26b6094555bc5c"
-  integrity sha512-SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg==
-
-d3-shape@1:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.3.7.tgz#df63801be07bc986bc54f63789b4fe502992b5d7"
-  integrity sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==
-  dependencies:
-    d3-path "1"
-
-d3-time-format@2:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.3.0.tgz#107bdc028667788a8924ba040faf1fbccd5a7850"
-  integrity sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==
-  dependencies:
-    d3-time "1"
-
-d3-time@1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.1.0.tgz#b1e19d307dae9c900b7e5b25ffc5dcc249a8a0f1"
-  integrity sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA==
-
-d3-timer@1:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.10.tgz#dfe76b8a91748831b13b6d9c793ffbd508dd9de5"
-  integrity sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw==
-
-d3-transition@1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.3.2.tgz#a98ef2151be8d8600543434c1ca80140ae23b398"
-  integrity sha512-sc0gRU4PFqZ47lPVHloMn9tlPcv8jxgOQg+0zjhfZXMQuvppjG6YuwdMBE0TuqCZjeJkLecku/l9R0JPcRhaDA==
-  dependencies:
-    d3-color "1"
-    d3-dispatch "1"
-    d3-ease "1"
-    d3-interpolate "1"
-    d3-selection "^1.1.0"
-    d3-timer "1"
-
-d3-voronoi@1:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/d3-voronoi/-/d3-voronoi-1.1.4.tgz#dd3c78d7653d2bb359284ae478645d95944c8297"
-  integrity sha512-dArJ32hchFsrQ8uMiTBLq256MpnZjeuBtdHpaDlYuQyjU0CVzCJl/BVW+SkszaAeH95D/8gxqAhgx0ouAWAfRg==
-
-d3-zoom@1:
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-1.8.3.tgz#b6a3dbe738c7763121cd05b8a7795ffe17f4fc0a"
-  integrity sha512-VoLXTK4wvy1a0JpH2Il+F2CiOhVu7VRXWF5M/LroMIh3/zBAC3WAt7QoIvPibOavVo20hN6/37vwAsdBejLyKQ==
-  dependencies:
-    d3-dispatch "1"
-    d3-drag "1"
-    d3-interpolate "1"
-    d3-selection "1"
-    d3-transition "1"
-
-d3@^5.9.7:
-  version "5.16.0"
-  resolved "https://registry.yarnpkg.com/d3/-/d3-5.16.0.tgz#9c5e8d3b56403c79d4ed42fbd62f6113f199c877"
-  integrity sha512-4PL5hHaHwX4m7Zr1UapXW23apo6pexCgdetdJ5kTmADpG/7T9Gkxw0M0tf/pjoB63ezCCm0u5UaFYy2aMt0Mcw==
-  dependencies:
-    d3-array "1"
-    d3-axis "1"
-    d3-brush "1"
-    d3-chord "1"
-    d3-collection "1"
-    d3-color "1"
-    d3-contour "1"
-    d3-dispatch "1"
-    d3-drag "1"
-    d3-dsv "1"
-    d3-ease "1"
-    d3-fetch "1"
-    d3-force "1"
-    d3-format "1"
-    d3-geo "1"
-    d3-hierarchy "1"
-    d3-interpolate "1"
-    d3-path "1"
-    d3-polygon "1"
-    d3-quadtree "1"
-    d3-random "1"
-    d3-scale "2"
-    d3-scale-chromatic "1"
-    d3-selection "1"
-    d3-shape "1"
-    d3-time "1"
-    d3-time-format "2"
-    d3-timer "1"
-    d3-transition "1"
-    d3-voronoi "1"
-    d3-zoom "1"
-
-damerau-levenshtein@^1.0.4:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz#64368003512a1a6992593741a09a9d31a836f55d"
-  integrity sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==
-
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
-  dependencies:
-    assert-plus "^1.0.0"
-
-date-format@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/date-format/-/date-format-1.2.0.tgz#615e828e233dd1ab9bb9ae0950e0ceccfa6ecad8"
-  integrity sha512-lAJqBmFzCLcDJdI9cEnJ7loSkLTh1PbIgZUndlzvYbf6NyFEr5n9rQhOwr6CIGwZqyQ3sYeQQiP9NOVQmgmRMA==
-
-date-format@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/date-format/-/date-format-2.1.0.tgz#31d5b5ea211cf5fd764cd38baf9d033df7e125cf"
-  integrity sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==
-
-debug@*, debug@^4.1.0, debug@^4.1.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
-  integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
-  dependencies:
-    ms "2.1.2"
-
-debug@2.6.9, debug@^2.2.0, debug@^2.3.3:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
-  dependencies:
-    ms "2.0.0"
-
-debug@3.1.0, debug@~3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
-  dependencies:
-    ms "2.0.0"
-
-debug@^3.1.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
-  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
-  dependencies:
-    ms "^2.1.1"
-
-debuglog@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
-  integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
-
-decamelize@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
-
-decode-uri-component@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
-
-decompress-response@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
-  integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=
-  dependencies:
-    mimic-response "^1.0.0"
-
-deep-equal@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a"
-  integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==
-  dependencies:
-    is-arguments "^1.0.4"
-    is-date-object "^1.0.1"
-    is-regex "^1.0.4"
-    object-is "^1.0.1"
-    object-keys "^1.1.1"
-    regexp.prototype.flags "^1.2.0"
-
-deep-extend@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
-  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
-
-deep-is@~0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
-  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
-
-deepmerge@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
-  integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
-
-default-gateway@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"
-  integrity sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==
-  dependencies:
-    execa "^1.0.0"
-    ip-regex "^2.1.0"
-
-default-require-extensions@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-2.0.0.tgz#f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7"
-  integrity sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=
-  dependencies:
-    strip-bom "^3.0.0"
-
-defer-to-connect@^1.0.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
-  integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
-
-define-properties@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
-  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
-  dependencies:
-    object-keys "^1.0.12"
-
-define-property@^0.2.5:
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
-  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
-  dependencies:
-    is-descriptor "^0.1.0"
-
-define-property@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
-  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
-  dependencies:
-    is-descriptor "^1.0.0"
-
-define-property@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
-  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
-  dependencies:
-    is-descriptor "^1.0.2"
-    isobject "^3.0.1"
-
-defined@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
-  integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=
-
-del@^2.2.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
-  integrity sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=
-  dependencies:
-    globby "^5.0.0"
-    is-path-cwd "^1.0.0"
-    is-path-in-cwd "^1.0.0"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    rimraf "^2.2.8"
-
-del@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4"
-  integrity sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==
-  dependencies:
-    "@types/glob" "^7.1.1"
-    globby "^6.1.0"
-    is-path-cwd "^2.0.0"
-    is-path-in-cwd "^2.0.0"
-    p-map "^2.0.0"
-    pify "^4.0.1"
-    rimraf "^2.6.3"
-
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
-
-depd@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
-
-dependency-graph@^0.7.2:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-0.7.2.tgz#91db9de6eb72699209d88aea4c1fd5221cac1c49"
-  integrity sha512-KqtH4/EZdtdfWX0p6MGP9jljvxSY6msy/pRUD4jgNwVpv3v1QmNLlsB3LDSSUg79BRVSn7jI1QPRtArGABovAQ==
-
-des.js@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
-  integrity sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==
-  dependencies:
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-
-destroy@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
-  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
-
-detect-node@^2.0.4:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.5.tgz#9d270aa7eaa5af0b72c4c9d9b814e7f4ce738b79"
-  integrity sha512-qi86tE6hRcFHy8jI1m2VG+LaPUR1LhqDa5G8tVjuUXmOrpuAgqsA1pN0+ldgr3aKUH+QLI9hCY/OcRYisERejw==
-
-detective@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/detective/-/detective-5.2.0.tgz#feb2a77e85b904ecdea459ad897cc90a99bd2a7b"
-  integrity sha512-6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg==
-  dependencies:
-    acorn-node "^1.6.1"
-    defined "^1.0.0"
-    minimist "^1.1.1"
-
-dezalgo@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
-  integrity sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=
-  dependencies:
-    asap "^2.0.0"
-    wrappy "1"
-
-di@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
-  integrity sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=
-
-diff@^3.2.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
-  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
-
-diff@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
-  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
-
-diffie-hellman@^5.0.0:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
-  integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
-  dependencies:
-    bn.js "^4.1.0"
-    miller-rabin "^4.0.0"
-    randombytes "^2.0.0"
-
-dir-glob@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
-  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
-  dependencies:
-    path-type "^4.0.0"
-
-dns-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
-  integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
-
-dns-packet@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
-  integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==
-  dependencies:
-    ip "^1.1.0"
-    safe-buffer "^5.0.1"
-
-dns-txt@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6"
-  integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=
-  dependencies:
-    buffer-indexof "^1.0.0"
-
-doctrine@0.7.2:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-0.7.2.tgz#7cb860359ba3be90e040b26b729ce4bfa654c523"
-  integrity sha1-fLhgNZujvpDgQLJrcpzkv6ZUxSM=
-  dependencies:
-    esutils "^1.1.6"
-    isarray "0.0.1"
-
-dom-serialize@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b"
-  integrity sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=
-  dependencies:
-    custom-event "~1.0.0"
-    ent "~2.2.0"
-    extend "^3.0.0"
-    void-elements "^2.0.0"
-
-dom-to-image@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/dom-to-image/-/dom-to-image-2.6.0.tgz#8a503608088c87b1c22f9034ae032e1898955867"
-  integrity sha1-ilA2CAiMh7HCL5A0rgMuGJiVWGc=
-
-dom-walk@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84"
-  integrity sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==
-
-domain-browser@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
-  integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
-
-dompurify@^2.2.0:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.8.tgz#224fe9ae57d7ebd9a1ae1ac18c1c1ca3f532226f"
-  integrity sha512-eVhaWoVibIzqdGYjwsBWodIQIaXFSB+cKDf4cfxLMsK0xiud6SE+/WCVx/Xw/UwQsa4cS3T2eITcdtmTg2UKcw==
-
-dot-prop@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.1.tgz#45884194a71fc2cda71cbb4bceb3a4dd2f433ba4"
-  integrity sha512-l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ==
-  dependencies:
-    is-obj "^1.0.0"
-
-duplexer3@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
-  integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
-
-duplexer@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
-  integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
-
-duplexify@^3.4.2, duplexify@^3.6.0:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
-  integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
-  dependencies:
-    end-of-stream "^1.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-    stream-shift "^1.0.0"
-
-ecc-jsbn@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
-  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
-  dependencies:
-    jsbn "~0.1.0"
-    safer-buffer "^2.1.0"
-
-ee-first@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
-
-electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.723:
-  version "1.3.727"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.727.tgz#857e310ca00f0b75da4e1db6ff0e073cc4a91ddf"
-  integrity sha512-Mfz4FIB4FSvEwBpDfdipRIrwd6uo8gUDoRDF4QEYb4h4tSuI3ov594OrjU6on042UlFHouIJpClDODGkPcBSbg==
-
-elliptic@^6.5.3:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
-  integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
-  dependencies:
-    bn.js "^4.11.9"
-    brorand "^1.1.0"
-    hash.js "^1.0.0"
-    hmac-drbg "^1.0.1"
-    inherits "^2.0.4"
-    minimalistic-assert "^1.0.1"
-    minimalistic-crypto-utils "^1.0.1"
-
-emoji-regex@^7.0.1:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
-  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
-
-emoji-regex@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
-  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
-
-emojis-list@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
-  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
-
-emojis-list@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
-  integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
-
-encodeurl@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
-
-encoding@^0.1.11:
-  version "0.1.13"
-  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
-  integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
-  dependencies:
-    iconv-lite "^0.6.2"
-
-end-of-stream@^1.0.0, end-of-stream@^1.1.0:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
-  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
-  dependencies:
-    once "^1.4.0"
-
-engine.io-client@~3.2.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.2.1.tgz#6f54c0475de487158a1a7c77d10178708b6add36"
-  integrity sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==
-  dependencies:
-    component-emitter "1.2.1"
-    component-inherit "0.0.3"
-    debug "~3.1.0"
-    engine.io-parser "~2.1.1"
-    has-cors "1.1.0"
-    indexof "0.0.1"
-    parseqs "0.0.5"
-    parseuri "0.0.5"
-    ws "~3.3.1"
-    xmlhttprequest-ssl "~1.5.4"
-    yeast "0.1.2"
-
-engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.3.tgz#757ab970fbf2dfb32c7b74b033216d5739ef79a6"
-  integrity sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==
-  dependencies:
-    after "0.8.2"
-    arraybuffer.slice "~0.0.7"
-    base64-arraybuffer "0.1.5"
-    blob "0.0.5"
-    has-binary2 "~1.0.2"
-
-engine.io@~3.2.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.2.1.tgz#b60281c35484a70ee0351ea0ebff83ec8c9522a2"
-  integrity sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==
-  dependencies:
-    accepts "~1.3.4"
-    base64id "1.0.0"
-    cookie "0.3.1"
-    debug "~3.1.0"
-    engine.io-parser "~2.1.0"
-    ws "~3.3.1"
-
-enhanced-resolve@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
-  integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==
-  dependencies:
-    graceful-fs "^4.1.2"
-    memory-fs "^0.4.0"
-    tapable "^1.0.0"
-
-enhanced-resolve@^4.1.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec"
-  integrity sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==
-  dependencies:
-    graceful-fs "^4.1.2"
-    memory-fs "^0.5.0"
-    tapable "^1.0.0"
-
-ent@~2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
-  integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0=
-
-err-code@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960"
-  integrity sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=
-
-errno@^0.1.1, errno@^0.1.3, errno@~0.1.7:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f"
-  integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==
-  dependencies:
-    prr "~1.0.1"
-
-error-ex@^1.3.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
-  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
-  dependencies:
-    is-arrayish "^0.2.1"
-
-es-abstract@^1.18.0-next.2:
-  version "1.18.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0.tgz#ab80b359eecb7ede4c298000390bc5ac3ec7b5a4"
-  integrity sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==
-  dependencies:
-    call-bind "^1.0.2"
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    get-intrinsic "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.2"
-    is-callable "^1.2.3"
-    is-negative-zero "^2.0.1"
-    is-regex "^1.1.2"
-    is-string "^1.0.5"
-    object-inspect "^1.9.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.2"
-    string.prototype.trimend "^1.0.4"
-    string.prototype.trimstart "^1.0.4"
-    unbox-primitive "^1.0.0"
-
-es-to-primitive@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
-  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
-  dependencies:
-    is-callable "^1.1.4"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.2"
-
-es6-promise@^4.0.3, es6-promise@^4.2.5:
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
-  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
-
-es6-promisify@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
-  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
-  dependencies:
-    es6-promise "^4.0.3"
-
-escalade@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
-  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
-
-escape-html@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
-  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
-
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-
-escodegen@^1.6.1:
-  version "1.14.3"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503"
-  integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==
-  dependencies:
-    esprima "^4.0.1"
-    estraverse "^4.2.0"
-    esutils "^2.0.2"
-    optionator "^0.8.1"
-  optionalDependencies:
-    source-map "~0.6.1"
-
-eslint-scope@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
-  integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==
-  dependencies:
-    esrecurse "^4.1.0"
-    estraverse "^4.1.1"
-
-esprima@^4.0.0, esprima@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
-esrecurse@^4.1.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
-  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
-  dependencies:
-    estraverse "^5.2.0"
-
-estraverse@^4.1.1, estraverse@^4.2.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
-  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
-
-estraverse@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
-  integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
-
-estree-walker@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362"
-  integrity sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==
-
-esutils@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-1.1.6.tgz#c01ccaa9ae4b897c6d0c3e210ae52f3c7a844375"
-  integrity sha1-wBzKqa5LiXxtDD4hCuUvPHqEQ3U=
-
-esutils@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
-  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
-
-etag@~1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
-  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
-
-eventemitter3@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-2.0.3.tgz#b5e1079b59fb5e1ba2771c0a993be060a58c99ba"
-  integrity sha1-teEHm1n7XhuidxwKmTvgYKWMmbo=
-
-eventemitter3@^4.0.0:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
-  integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
-
-events@^3.0.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
-  integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
-
-eventsource@^1.0.7:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.0.tgz#00e8ca7c92109e94b0ddf32dac677d841028cfaf"
-  integrity sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==
-  dependencies:
-    original "^1.0.0"
-
-evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
-  integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==
-  dependencies:
-    md5.js "^1.3.4"
-    safe-buffer "^5.1.1"
-
-execa@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
-  integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=
-  dependencies:
-    cross-spawn "^5.0.1"
-    get-stream "^3.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
-execa@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
-  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
-  dependencies:
-    cross-spawn "^6.0.0"
-    get-stream "^4.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
-exit-on-epipe@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz#0bdd92e87d5285d267daa8171d0eb06159689692"
-  integrity sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw==
-
-exit@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
-  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
-
-expand-braces@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/expand-braces/-/expand-braces-0.1.2.tgz#488b1d1d2451cb3d3a6b192cfc030f44c5855fea"
-  integrity sha512-zOOsEnAhvIxxd0esCNbYG2xerGf46niZ1egS43eV7Fu4t7VIScgPXMcMabCLaPrqkzwvwo6zZipDiX3t0ILF2w==
-  dependencies:
-    array-slice "^0.2.3"
-    array-unique "^0.2.1"
-    braces "^0.1.2"
-
-expand-brackets@^2.1.4:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
-  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
-  dependencies:
-    debug "^2.3.3"
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    posix-character-classes "^0.1.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-expand-range@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-0.1.1.tgz#4cb8eda0993ca56fa4f41fc42f3cbb4ccadff044"
-  integrity sha512-busOHJ0t7t5UcutcyNDqmaDX+1cb0XlqsAUgTlmplVv0rIqBaMcBSZRLlkDm0nxtl8O3o/EvRRrdQ/WnyPERLQ==
-  dependencies:
-    is-number "^0.1.1"
-    repeat-string "^0.2.2"
-
-express@^4.17.1:
-  version "4.17.1"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
-  integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
-  dependencies:
-    accepts "~1.3.7"
-    array-flatten "1.1.1"
-    body-parser "1.19.0"
-    content-disposition "0.5.3"
-    content-type "~1.0.4"
-    cookie "0.4.0"
-    cookie-signature "1.0.6"
-    debug "2.6.9"
-    depd "~1.1.2"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    finalhandler "~1.1.2"
-    fresh "0.5.2"
-    merge-descriptors "1.0.1"
-    methods "~1.1.2"
-    on-finished "~2.3.0"
-    parseurl "~1.3.3"
-    path-to-regexp "0.1.7"
-    proxy-addr "~2.0.5"
-    qs "6.7.0"
-    range-parser "~1.2.1"
-    safe-buffer "5.1.2"
-    send "0.17.1"
-    serve-static "1.14.1"
-    setprototypeof "1.1.1"
-    statuses "~1.5.0"
-    type-is "~1.6.18"
-    utils-merge "1.0.1"
-    vary "~1.1.2"
-
-extend-shallow@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
-  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
-  dependencies:
-    is-extendable "^0.1.0"
-
-extend-shallow@^3.0.0, extend-shallow@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
-  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
-  dependencies:
-    assign-symbols "^1.0.0"
-    is-extendable "^1.0.1"
-
-extend@^3.0.0, extend@^3.0.2, extend@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-
-external-editor@^3.0.3:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
-  integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
-  dependencies:
-    chardet "^0.7.0"
-    iconv-lite "^0.4.24"
-    tmp "^0.0.33"
-
-extglob@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
-  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
-  dependencies:
-    array-unique "^0.3.2"
-    define-property "^1.0.0"
-    expand-brackets "^2.1.4"
-    extend-shallow "^2.0.1"
-    fragment-cache "^0.2.1"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-extsprintf@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
-
-extsprintf@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
-  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
-
-fast-deep-equal@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
-  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
-
-fast-deep-equal@^3.1.1:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
-  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
-
-fast-diff@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.1.2.tgz#4b62c42b8e03de3f848460b639079920695d0154"
-  integrity sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==
-
-fast-diff@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
-  integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
-
-fast-glob@^3.1.1, fast-glob@^3.2.4:
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661"
-  integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==
-  dependencies:
-    "@nodelib/fs.stat" "^2.0.2"
-    "@nodelib/fs.walk" "^1.2.3"
-    glob-parent "^5.1.0"
-    merge2 "^1.3.0"
-    micromatch "^4.0.2"
-    picomatch "^2.2.1"
-
-fast-json-stable-stringify@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
-  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
-
-fast-json-stable-stringify@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
-  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
-
-fast-levenshtein@~2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
-
-fastparse@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9"
-  integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==
-
-fastq@^1.6.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz#bb9fb955a07130a918eb63c1f5161cc32a5d0858"
-  integrity sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==
-  dependencies:
-    reusify "^1.0.4"
-
-faye-websocket@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
-  integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=
-  dependencies:
-    websocket-driver ">=0.5.1"
-
-faye-websocket@~0.11.1:
-  version "0.11.3"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz#5c0e9a8968e8912c286639fde977a8b209f2508e"
-  integrity sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==
-  dependencies:
-    websocket-driver ">=0.5.1"
-
-fflate@^0.3.8:
-  version "0.3.11"
-  resolved "https://registry.yarnpkg.com/fflate/-/fflate-0.3.11.tgz#2c440d7180fdeb819e64898d8858af327b042a5d"
-  integrity sha512-Rr5QlUeGN1mbOHlaqcSYMKVpPbgLy0AWT/W0EHxA6NGI12yO1jpoui2zBBvU2G824ltM6Ut8BFgfHSBGfkmS0A==
-
-fflate@^0.4.8:
-  version "0.4.8"
-  resolved "https://registry.yarnpkg.com/fflate/-/fflate-0.4.8.tgz#f90b82aefbd8ac174213abb338bd7ef848f0f5ae"
-  integrity sha512-FJqqoDBR00Mdj9ppamLa/Y7vxm+PRmNWA67N846RvsoYVMKB4q3y/de5PA7gUmRMYK/8CMz2GDZQmCRN1wBcWA==
-
-figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
-  integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==
-
-figures@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
-  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
-  dependencies:
-    escape-string-regexp "^1.0.5"
-
-file-loader@4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-4.2.0.tgz#5fb124d2369d7075d70a9a5abecd12e60a95215e"
-  integrity sha512-+xZnaK5R8kBJrHK0/6HRlrKNamvVS5rjyuju+rnyxRGuwUJwpAMsVzUl5dz6rK8brkzjV6JpcFNjp6NqV0g1OQ==
-  dependencies:
-    loader-utils "^1.2.3"
-    schema-utils "^2.0.0"
-
-file-saver@1.3.8:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-1.3.8.tgz#e68a30c7cb044e2fb362b428469feb291c2e09d8"
-  integrity sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg==
-
-file-saver@^2.0.2:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-2.0.5.tgz#d61cfe2ce059f414d899e9dd6d4107ee25670c38"
-  integrity sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==
-
-file-uri-to-path@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
-  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
-
-fileset@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
-  integrity sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=
-  dependencies:
-    glob "^7.0.3"
-    minimatch "^3.0.3"
-
-fill-range@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
-  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
-    to-regex-range "^2.1.0"
-
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
-  dependencies:
-    to-regex-range "^5.0.1"
-
-finalhandler@1.1.2, finalhandler@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
-  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
-  dependencies:
-    debug "2.6.9"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    on-finished "~2.3.0"
-    parseurl "~1.3.3"
-    statuses "~1.5.0"
-    unpipe "~1.0.0"
-
-find-cache-dir@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.0.0.tgz#cd4b7dd97b7185b7e17dbfe2d6e4115ee3eeb8fc"
-  integrity sha512-t7ulV1fmbxh5G9l/492O1p5+EBbr3uwpt6odhFTMc+nWyhmbloe+ja9BZ8pIBtqFWhOmCWVjx+pTW4zDkFoclw==
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^3.0.0"
-    pkg-dir "^4.1.0"
-
-find-cache-dir@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
-  integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^2.0.0"
-    pkg-dir "^3.0.0"
-
-find-cache-dir@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880"
-  integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^3.0.2"
-    pkg-dir "^4.1.0"
-
-find-parent-dir@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54"
-  integrity sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ=
-
-find-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
-  dependencies:
-    locate-path "^3.0.0"
-
-find-up@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
-  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
-  dependencies:
-    locate-path "^5.0.0"
-    path-exists "^4.0.0"
-
-find-up@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
-  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
-  dependencies:
-    locate-path "^6.0.0"
-    path-exists "^4.0.0"
-
-find-versions@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-4.0.0.tgz#3c57e573bf97769b8cb8df16934b627915da4965"
-  integrity sha512-wgpWy002tA+wgmO27buH/9KzyEOQnKsG/R0yrcjPT9BOFm0zRBVQbZ95nRGXWMywS8YR5knRbpohio0bcJABxQ==
-  dependencies:
-    semver-regex "^3.1.2"
-
-flatted@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
-  integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
-
-flush-write-stream@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
-  integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==
-  dependencies:
-    inherits "^2.0.3"
-    readable-stream "^2.3.6"
-
-follow-redirects@^1.0.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43"
-  integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==
-
-for-in@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
-
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
-
-form-data@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
-  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.6"
-    mime-types "^2.1.12"
-
-forwarded@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
-  integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
-
-frac@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/frac/-/frac-1.1.2.tgz#3d74f7f6478c88a1b5020306d747dc6313c74d0b"
-  integrity sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==
-
-fragment-cache@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
-  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
-  dependencies:
-    map-cache "^0.2.2"
-
-fresh@0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
-  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
-
-from2@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
-  integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
-  dependencies:
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-
-fs-extra@^0.26.5:
-  version "0.26.7"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.26.7.tgz#9ae1fdd94897798edab76d0918cf42d0c3184fa9"
-  integrity sha1-muH92UiXeY7at20JGM9C0MMYT6k=
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^2.1.0"
-    klaw "^1.0.0"
-    path-is-absolute "^1.0.0"
-    rimraf "^2.2.8"
-
-fs-extra@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
-  integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
-fs-extra@^8.0.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
-  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
-  dependencies:
-    graceful-fs "^4.2.0"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
-fs-minipass@^1.2.5:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
-  integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
-  dependencies:
-    minipass "^2.6.0"
-
-fs-minipass@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
-  integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
-  dependencies:
-    minipass "^3.0.0"
-
-fs-promise@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/fs-promise/-/fs-promise-0.5.0.tgz#4347d6bf624655a7061a4319213c393276ad3ef3"
-  integrity sha1-Q0fWv2JGVacGGkMZITw5MnatPvM=
-  dependencies:
-    any-promise "^1.0.0"
-    fs-extra "^0.26.5"
-    mz "^2.3.1"
-    thenify-all "^1.6.0"
-
-fs-write-stream-atomic@^1.0.8:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
-  integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=
-  dependencies:
-    graceful-fs "^4.1.2"
-    iferr "^0.1.5"
-    imurmurhash "^0.1.4"
-    readable-stream "1 || 2"
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
-
-fsevents@^1.2.7:
-  version "1.2.13"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
-  integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==
-  dependencies:
-    bindings "^1.5.0"
-    nan "^2.12.1"
-
-fsevents@~2.3.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
-  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
-
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
-
-genfun@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537"
-  integrity sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==
-
-gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.2:
-  version "1.0.0-beta.2"
-  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
-  integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
-
-get-caller-file@^1.0.1, get-caller-file@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
-  integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
-
-get-caller-file@^2.0.0, get-caller-file@^2.0.1:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
-  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
-
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
-  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
-  dependencies:
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-
-get-stream@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
-  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
-
-get-stream@^4.0.0, get-stream@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
-  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
-  dependencies:
-    pump "^3.0.0"
-
-get-stream@^5.1.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
-  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
-  dependencies:
-    pump "^3.0.0"
-
-get-value@^2.0.3, get-value@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
-  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
-
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
-  dependencies:
-    assert-plus "^1.0.0"
-
-gl-preserve-state@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/gl-preserve-state/-/gl-preserve-state-1.0.0.tgz#4ef710d62873f1470ed015c6546c37dacddd4198"
-  integrity sha512-zQZ25l3haD4hvgJZ6C9+s0ebdkW9y+7U2qxvGu1uWOJh8a4RU+jURIKEQhf8elIlFpMH6CrAY2tH0mYrRjet3Q==
-
-glob-parent@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
-  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
-  dependencies:
-    is-glob "^3.1.0"
-    path-dirname "^1.0.0"
-
-glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@~5.1.0:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
-  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
-  dependencies:
-    is-glob "^4.0.1"
-
-glob@7.0.x:
-  version "7.0.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a"
-  integrity sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.2"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@7.1.4:
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
-  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
-  version "7.1.7"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
-  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-global-dirs@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
-  integrity sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=
-  dependencies:
-    ini "^1.3.4"
-
-global@4.3.2, global@~4.3.0:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f"
-  integrity sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=
-  dependencies:
-    min-document "^2.19.0"
-    process "~0.5.1"
-
-global@^4.3.0, global@^4.3.1, global@^4.3.2, global@^4.4.0, global@~4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406"
-  integrity sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==
-  dependencies:
-    min-document "^2.19.0"
-    process "^0.11.10"
-
-globals@^11.1.0:
-  version "11.12.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
-  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
-
-globby@^11.0.1:
-  version "11.0.3"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz#9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb"
-  integrity sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==
-  dependencies:
-    array-union "^2.1.0"
-    dir-glob "^3.0.1"
-    fast-glob "^3.1.1"
-    ignore "^5.1.4"
-    merge2 "^1.3.0"
-    slash "^3.0.0"
-
-globby@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
-  integrity sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=
-  dependencies:
-    array-union "^1.0.1"
-    arrify "^1.0.0"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-globby@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
-  integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
-  dependencies:
-    array-union "^1.0.1"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-got@^9.6.0:
-  version "9.6.0"
-  resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85"
-  integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==
-  dependencies:
-    "@sindresorhus/is" "^0.14.0"
-    "@szmarczak/http-timer" "^1.1.2"
-    cacheable-request "^6.0.0"
-    decompress-response "^3.3.0"
-    duplexer3 "^0.1.4"
-    get-stream "^4.1.0"
-    lowercase-keys "^1.0.1"
-    mimic-response "^1.0.1"
-    p-cancelable "^1.0.0"
-    to-readable-stream "^1.0.0"
-    url-parse-lax "^3.0.0"
-
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0:
-  version "4.2.6"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
-  integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
-
-grunt-karma@^0.12.2:
-  version "0.12.2"
-  resolved "https://registry.yarnpkg.com/grunt-karma/-/grunt-karma-0.12.2.tgz#d52676ab94779e4b20052b5f3519eb32653dc566"
-  integrity sha512-houkUR8sks8uliJ5khwvV4Cf2vrxSPkvCt+w9uwOOHhDOCLZ9ZE4/MeDmC7GgSajGK+h/svpacbKFHyjNbCsng==
-  dependencies:
-    lodash "^3.10.1"
-
-gzip-size@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462"
-  integrity sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==
-  dependencies:
-    duplexer "^0.1.2"
-
-gzipper@^2.8.1:
-  version "2.10.4"
-  resolved "https://registry.yarnpkg.com/gzipper/-/gzipper-2.10.4.tgz#01746933b0655dcebfa5d668d1dcab007002c1bb"
-  integrity sha512-5I10NtGBdwwWDVAty+/y3EHVS3vyLldAoAtiF79hcAxC6W4x17f1dc13ua5c8HaXOP6eSf7Tq2zJzZKYJogBOQ==
-  dependencies:
-    commander "^3.0.0"
-    uuid "^3.3.3"
-
-hammerjs@^2.0.8:
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/hammerjs/-/hammerjs-2.0.8.tgz#04ef77862cff2bb79d30f7692095930222bf60f1"
-  integrity sha1-BO93hiz/K7edMPdpIJWTAiK/YPE=
-
-handle-thing@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
-  integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==
-
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
-
-har-validator@~5.1.3:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
-  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
-  dependencies:
-    ajv "^6.12.3"
-    har-schema "^2.0.0"
-
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
-  dependencies:
-    ansi-regex "^2.0.0"
-
-has-bigints@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
-  integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
-
-has-binary2@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
-  integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==
-  dependencies:
-    isarray "2.0.1"
-
-has-cors@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
-  integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
-
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
-
-has-flag@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
-  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
-
-has-symbols@^1.0.1, has-symbols@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
-  integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
-
-has-value@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
-  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
-  dependencies:
-    get-value "^2.0.3"
-    has-values "^0.1.4"
-    isobject "^2.0.0"
-
-has-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
-  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
-  dependencies:
-    get-value "^2.0.6"
-    has-values "^1.0.0"
-    isobject "^3.0.0"
-
-has-values@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
-  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
-
-has-values@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
-  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
-  dependencies:
-    is-number "^3.0.0"
-    kind-of "^4.0.0"
-
-has-yarn@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"
-  integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==
-
-has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
-
-hash-base@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"
-  integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==
-  dependencies:
-    inherits "^2.0.4"
-    readable-stream "^3.6.0"
-    safe-buffer "^5.2.0"
-
-hash.js@^1.0.0, hash.js@^1.0.3:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
-  integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
-  dependencies:
-    inherits "^2.0.3"
-    minimalistic-assert "^1.0.1"
-
-"hashish@>=0.0.2 <0.1":
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/hashish/-/hashish-0.0.4.tgz#6d60bc6ffaf711b6afd60e426d077988014e6554"
-  integrity sha1-bWC8b/r3Ebav1g5CbQd5iAFOZVQ=
-  dependencies:
-    traverse ">=0.2.4"
-
-hmac-drbg@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
-  integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
-  dependencies:
-    hash.js "^1.0.3"
-    minimalistic-assert "^1.0.0"
-    minimalistic-crypto-utils "^1.0.1"
-
-hosted-git-info@^2.1.4, hosted-git-info@^2.6.0, hosted-git-info@^2.7.1:
-  version "2.8.9"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
-  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
-
-hpack.js@^2.1.6:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
-  integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=
-  dependencies:
-    inherits "^2.0.1"
-    obuf "^1.0.0"
-    readable-stream "^2.0.1"
-    wbuf "^1.1.0"
-
-html-entities@^1.3.1:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.4.0.tgz#cfbd1b01d2afaf9adca1b10ae7dffab98c71d2dc"
-  integrity sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==
-
-html-escaper@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
-  integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
-
-html-tags@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140"
-  integrity sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==
-
-html2canvas@^1.0.0-alpha.12:
-  version "1.0.0-rc.7"
-  resolved "https://registry.yarnpkg.com/html2canvas/-/html2canvas-1.0.0-rc.7.tgz#70c159ce0e63954a91169531894d08ad5627ac98"
-  integrity sha512-yvPNZGejB2KOyKleZspjK/NruXVQuowu8NnV2HYG7gW7ytzl+umffbtUI62v2dCHQLDdsK6HIDtyJZ0W3neerA==
-  dependencies:
-    css-line-break "1.1.1"
-
-html2canvas@^1.0.0-rc.5:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/html2canvas/-/html2canvas-1.4.1.tgz#7cef1888311b5011d507794a066041b14669a543"
-  integrity sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==
-  dependencies:
-    css-line-break "^2.1.0"
-    text-segmentation "^1.0.3"
-
-html2pdf.js@^0.9.1:
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/html2pdf.js/-/html2pdf.js-0.9.3.tgz#e7fc6143f748ce253670eaae403987342b66b15c"
-  integrity sha512-M254g3Z+ZsjtQFDxJlU6E8Zgb8xOpCBQQM1lFPn4Lq+myAdWoYtMFnwlVo/eOI9R1cG75+YmMSDQofkugwOV/Q==
-  dependencies:
-    es6-promise "^4.2.5"
-    html2canvas "^1.0.0-alpha.12"
-    jspdf "1.4.1"
-
-http-cache-semantics@^3.8.1:
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
-  integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==
-
-http-cache-semantics@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
-  integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
-
-http-deceiver@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
-  integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=
-
-http-errors@1.7.2:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
-  integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.3"
-    setprototypeof "1.1.1"
-    statuses ">= 1.5.0 < 2"
-    toidentifier "1.0.0"
-
-http-errors@~1.6.2:
-  version "1.6.3"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
-  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.3"
-    setprototypeof "1.1.0"
-    statuses ">= 1.4.0 < 2"
-
-http-errors@~1.7.2:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
-  integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.4"
-    setprototypeof "1.1.1"
-    statuses ">= 1.5.0 < 2"
-    toidentifier "1.0.0"
-
-http-parser-js@>=0.5.1:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz#01d2709c79d41698bb01d4decc5e9da4e4a033d9"
-  integrity sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==
-
-http-proxy-agent@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
-  integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==
-  dependencies:
-    agent-base "4"
-    debug "3.1.0"
-
-http-proxy-middleware@0.19.1:
-  version "0.19.1"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
-  integrity sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==
-  dependencies:
-    http-proxy "^1.17.0"
-    is-glob "^4.0.0"
-    lodash "^4.17.11"
-    micromatch "^3.1.10"
-
-http-proxy@^1.13.0, http-proxy@^1.17.0:
-  version "1.18.1"
-  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
-  integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
-  dependencies:
-    eventemitter3 "^4.0.0"
-    follow-redirects "^1.0.0"
-    requires-port "^1.0.0"
-
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
-https-browserify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
-  integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
-
-https-proxy-agent@^2.2.1, https-proxy-agent@^2.2.3:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
-  integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
-  dependencies:
-    agent-base "^4.3.0"
-    debug "^3.1.0"
-
-humanize-ms@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
-  integrity sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=
-  dependencies:
-    ms "^2.0.0"
-
-husky@^4.2.3:
-  version "4.3.8"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-4.3.8.tgz#31144060be963fd6850e5cc8f019a1dfe194296d"
-  integrity sha512-LCqqsB0PzJQ/AlCgfrfzRe3e3+NvmefAdKQhRYpxS4u6clblBoDdzzvHi8fmxKRzvMxPY/1WZWzomPZww0Anow==
-  dependencies:
-    chalk "^4.0.0"
-    ci-info "^2.0.0"
-    compare-versions "^3.6.0"
-    cosmiconfig "^7.0.0"
-    find-versions "^4.0.0"
-    opencollective-postinstall "^2.0.2"
-    pkg-dir "^5.0.0"
-    please-upgrade-node "^3.2.0"
-    slash "^3.0.0"
-    which-pm-runs "^1.0.0"
-
-iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.13, iconv-lite@^0.4.24:
-  version "0.4.24"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
-  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3"
-
-iconv-lite@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01"
-  integrity sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3.0.0"
-
-ieee754@^1.1.13, ieee754@^1.1.4:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
-  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
-
-iferr@^0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
-  integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
-
-ignore-walk@^3.0.1:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.4.tgz#c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335"
-  integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==
-  dependencies:
-    minimatch "^3.0.4"
-
-ignore@^5.1.4:
-  version "5.1.8"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
-  integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
-
-image-size@~0.5.0:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
-  integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=
-
-immediate@~3.0.5:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
-  integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
-
-import-cwd@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
-  integrity sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=
-  dependencies:
-    import-from "^2.1.0"
-
-import-fresh@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
-  integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY=
-  dependencies:
-    caller-path "^2.0.0"
-    resolve-from "^3.0.0"
-
-import-fresh@^3.2.1:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
-  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
-  dependencies:
-    parent-module "^1.0.0"
-    resolve-from "^4.0.0"
-
-import-from@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1"
-  integrity sha1-M1238qev/VOqpHHUuAId7ja387E=
-  dependencies:
-    resolve-from "^3.0.0"
-
-import-lazy@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
-  integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=
-
-import-local@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
-  integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==
-  dependencies:
-    pkg-dir "^3.0.0"
-    resolve-cwd "^2.0.0"
-
-imurmurhash@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
-
-indent-string@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
-  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
-
-indexof@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
-  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
-
-individual@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/individual/-/individual-2.0.0.tgz#833b097dad23294e76117a98fb38e0d9ad61bb97"
-  integrity sha1-gzsJfa0jKU52EXqY+zjg2a1hu5c=
-
-infer-owner@^1.0.3, infer-owner@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
-  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
-inherits@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
-  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
-
-inherits@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
-
-ini@1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
-
-ini@^1.3.4, ini@~1.3.0:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
-  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
-
-injection-js@^2.2.1:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/injection-js/-/injection-js-2.4.0.tgz#ebe8871b1a349f23294eaa751bbd8209a636e754"
-  integrity sha512-6jiJt0tCAo9zjHbcwLiPL+IuNe9SQ6a9g0PEzafThW3fOQi0mrmiJGBJvDD6tmhPh8cQHIQtCOrJuBfQME4kPA==
-  dependencies:
-    tslib "^2.0.0"
-
-inquirer@6.5.1:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.1.tgz#8bfb7a5ac02dac6ff641ac4c5ff17da112fcdb42"
-  integrity sha512-uxNHBeQhRXIoHWTSNYUFhQVrHYFThIt6IVo2fFmSe8aBwdR3/w6b58hJpiL/fMukFkvGzjg+hSxFtwvVmKZmXw==
-  dependencies:
-    ansi-escapes "^4.2.1"
-    chalk "^2.4.2"
-    cli-cursor "^3.1.0"
-    cli-width "^2.0.0"
-    external-editor "^3.0.3"
-    figures "^3.0.0"
-    lodash "^4.17.15"
-    mute-stream "0.0.8"
-    run-async "^2.2.0"
-    rxjs "^6.4.0"
-    string-width "^4.1.0"
-    strip-ansi "^5.1.0"
-    through "^2.3.6"
-
-internal-ip@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
-  integrity sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==
-  dependencies:
-    default-gateway "^4.2.0"
-    ipaddr.js "^1.9.0"
-
-invariant@^2.2.2:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
-  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
-  dependencies:
-    loose-envify "^1.0.0"
-
-inversify@^5.0.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/inversify/-/inversify-5.1.1.tgz#6fbd668c591337404e005a1946bfe0d802c08730"
-  integrity sha512-j8grHGDzv1v+8T1sAQ+3boTCntFPfvxLCkNcxB1J8qA0lUN+fAlSyYd+RXKvaPRL4AGyPxViutBEJHNXOyUdFQ==
-
-invert-kv@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
-  integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
-
-ip-regex@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
-  integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
-
-ip@1.1.5, ip@^1.1.0, ip@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
-  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
-
-ipaddr.js@1.9.1, ipaddr.js@^1.9.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
-  integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
-
-is-absolute-url@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698"
-  integrity sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==
-
-is-accessor-descriptor@^0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
-  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-accessor-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
-  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
-  dependencies:
-    kind-of "^6.0.0"
-
-is-arguments@^1.0.4:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.0.tgz#62353031dfbee07ceb34656a6bde59efecae8dd9"
-  integrity sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==
-  dependencies:
-    call-bind "^1.0.0"
-
-is-arrayish@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
-
-is-arrayish@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
-  integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
-
-is-bigint@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz#ffb381442503235ad245ea89e45b3dbff040ee5a"
-  integrity sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==
-
-is-binary-path@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
-  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
-  dependencies:
-    binary-extensions "^1.0.0"
-
-is-binary-path@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
-  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
-  dependencies:
-    binary-extensions "^2.0.0"
-
-is-boolean-object@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz#3c0878f035cb821228d350d2e1e36719716a3de8"
-  integrity sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==
-  dependencies:
-    call-bind "^1.0.2"
-
-is-buffer@^1.1.5:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-
-is-callable@^1.1.4, is-callable@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e"
-  integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==
-
-is-ci@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
-  integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
-  dependencies:
-    ci-info "^2.0.0"
-
-is-core-module@^2.2.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz#8e9fc8e15027b011418026e98f0e6f4d86305cc1"
-  integrity sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==
-  dependencies:
-    has "^1.0.3"
-
-is-data-descriptor@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
-  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-data-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
-  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
-  dependencies:
-    kind-of "^6.0.0"
-
-is-date-object@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz#550cfcc03afada05eea3dd30981c7b09551f73e5"
-  integrity sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==
-
-is-descriptor@^0.1.0:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
-  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
-  dependencies:
-    is-accessor-descriptor "^0.1.6"
-    is-data-descriptor "^0.1.4"
-    kind-of "^5.0.0"
-
-is-descriptor@^1.0.0, is-descriptor@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
-  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
-  dependencies:
-    is-accessor-descriptor "^1.0.0"
-    is-data-descriptor "^1.0.0"
-    kind-of "^6.0.2"
-
-is-directory@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
-  integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
-
-is-extendable@^0.1.0, is-extendable@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
-
-is-extendable@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
-  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
-  dependencies:
-    is-plain-object "^2.0.4"
-
-is-extglob@^2.1.0, is-extglob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
-
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
-  dependencies:
-    number-is-nan "^1.0.0"
-
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
-
-is-fullwidth-code-point@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
-  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
-
-is-function@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.2.tgz#4f097f30abf6efadac9833b17ca5dc03f8144e08"
-  integrity sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==
-
-is-glob@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
-  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
-  dependencies:
-    is-extglob "^2.1.0"
-
-is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
-  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
-  dependencies:
-    is-extglob "^2.1.1"
-
-is-installed-globally@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80"
-  integrity sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=
-  dependencies:
-    global-dirs "^0.1.0"
-    is-path-inside "^1.0.0"
-
-is-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
-  integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
-
-is-negative-zero@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
-  integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
-
-is-npm@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-3.0.0.tgz#ec9147bfb629c43f494cf67936a961edec7e8053"
-  integrity sha512-wsigDr1Kkschp2opC4G3yA6r9EgVA6NjRpWzIi9axXqeIaAATPRJc4uLujXe3Nd9uO8KoDyA4MD6aZSeXTADhA==
-
-is-number-object@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz#6edfaeed7950cff19afedce9fbfca9ee6dd289eb"
-  integrity sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==
-
-is-number@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-0.1.1.tgz#69a7af116963d47206ec9bd9b48a14216f1e3806"
-  integrity sha512-la5kPULwIgkSSaZj9w7/A1uHqOBAgOhDUKQ5CkfL8LZ4Si6r4+2D0hI6b4o60MW4Uj2yNJARWIZUDPxlvOYQcw==
-
-is-number@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
-  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
-is-obj@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
-  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
-
-is-path-cwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
-  integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
-
-is-path-cwd@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
-  integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==
-
-is-path-in-cwd@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
-  integrity sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==
-  dependencies:
-    is-path-inside "^1.0.0"
-
-is-path-in-cwd@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz#bfe2dca26c69f397265a4009963602935a053acb"
-  integrity sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==
-  dependencies:
-    is-path-inside "^2.1.0"
-
-is-path-inside@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
-  integrity sha1-jvW33lBDej/cprToZe96pVy0gDY=
-  dependencies:
-    path-is-inside "^1.0.1"
-
-is-path-inside@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz#7c9810587d659a40d27bcdb4d5616eab059494b2"
-  integrity sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==
-  dependencies:
-    path-is-inside "^1.0.2"
-
-is-plain-obj@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
-  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
-
-is-plain-object@^2.0.3, is-plain-object@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
-  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
-  dependencies:
-    isobject "^3.0.1"
-
-is-reference@^1.1.2:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.2.1.tgz#8b2dac0b371f4bc994fdeaba9eb542d03002d0b7"
-  integrity sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==
-  dependencies:
-    "@types/estree" "*"
-
-is-regex@^1.0.4, is-regex@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz#d029f9aff6448b93ebbe3f33dac71511fdcbef9f"
-  integrity sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==
-  dependencies:
-    call-bind "^1.0.2"
-    has-symbols "^1.0.2"
-
-is-stream@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
-
-is-string@^1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz#3fe5d5992fb0d93404f32584d4b0179a71b54a5f"
-  integrity sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==
-
-is-symbol@^1.0.2, is-symbol@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
-  integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
-  dependencies:
-    has-symbols "^1.0.2"
-
-is-typedarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
-
-is-what@^3.12.0:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/is-what/-/is-what-3.14.1.tgz#e1222f46ddda85dead0fd1c9df131760e77755c1"
-  integrity sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==
-
-is-windows@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
-  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
-
-is-wsl@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
-  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
-
-is-yarn-global@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232"
-  integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==
-
-isarray@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
-
-isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
-
-isarray@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
-  integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=
-
-isbinaryfile@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80"
-  integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==
-  dependencies:
-    buffer-alloc "^1.2.0"
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
-
-isobject@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
-  dependencies:
-    isarray "1.0.0"
-
-isobject@^3.0.0, isobject@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
-
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
-
-istanbul-api@^2.1.6:
-  version "2.1.7"
-  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-2.1.7.tgz#82786b79f3b93d481349c7aa1e2c2b4eeb48c8a8"
-  integrity sha512-LYTOa2UrYFyJ/aSczZi/6lBykVMjCCvUmT64gOe+jPZFy4w6FYfPGqFT2IiQ2BxVHHDOvCD7qrIXb0EOh4uGWw==
-  dependencies:
-    async "^2.6.2"
-    compare-versions "^3.4.0"
-    fileset "^2.0.3"
-    istanbul-lib-coverage "^2.0.5"
-    istanbul-lib-hook "^2.0.7"
-    istanbul-lib-instrument "^3.3.0"
-    istanbul-lib-report "^2.0.8"
-    istanbul-lib-source-maps "^3.0.6"
-    istanbul-reports "^2.2.5"
-    js-yaml "^3.13.1"
-    make-dir "^2.1.0"
-    minimatch "^3.0.4"
-    once "^1.4.0"
-
-istanbul-lib-coverage@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#675f0ab69503fad4b1d849f736baaca803344f49"
-  integrity sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==
-
-istanbul-lib-coverage@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec"
-  integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==
-
-istanbul-lib-hook@^2.0.7:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-2.0.7.tgz#c95695f383d4f8f60df1f04252a9550e15b5b133"
-  integrity sha512-vrRztU9VRRFDyC+aklfLoeXyNdTfga2EI3udDGn4cZ6fpSXpHLV9X6CHvfoMCPtggg8zvDDmC4b9xfu0z6/llA==
-  dependencies:
-    append-transform "^1.0.0"
-
-istanbul-lib-instrument@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz#a5f63d91f0bbc0c3e479ef4c5de027335ec6d630"
-  integrity sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==
-  dependencies:
-    "@babel/generator" "^7.4.0"
-    "@babel/parser" "^7.4.3"
-    "@babel/template" "^7.4.0"
-    "@babel/traverse" "^7.4.3"
-    "@babel/types" "^7.4.0"
-    istanbul-lib-coverage "^2.0.5"
-    semver "^6.0.0"
-
-istanbul-lib-instrument@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d"
-  integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==
-  dependencies:
-    "@babel/core" "^7.7.5"
-    "@istanbuljs/schema" "^0.1.2"
-    istanbul-lib-coverage "^3.0.0"
-    semver "^6.3.0"
-
-istanbul-lib-report@^2.0.8:
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz#5a8113cd746d43c4889eba36ab10e7d50c9b4f33"
-  integrity sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==
-  dependencies:
-    istanbul-lib-coverage "^2.0.5"
-    make-dir "^2.1.0"
-    supports-color "^6.1.0"
-
-istanbul-lib-source-maps@^3.0.6:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz#284997c48211752ec486253da97e3879defba8c8"
-  integrity sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==
-  dependencies:
-    debug "^4.1.1"
-    istanbul-lib-coverage "^2.0.5"
-    make-dir "^2.1.0"
-    rimraf "^2.6.3"
-    source-map "^0.6.1"
-
-istanbul-reports@^2.2.5:
-  version "2.2.7"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.7.tgz#5d939f6237d7b48393cc0959eab40cd4fd056931"
-  integrity sha512-uu1F/L1o5Y6LzPVSVZXNOoD/KXpJue9aeLRd0sM9uMXfZvzomB0WxVamWb5ue8kA2vVWEmW7EG+A5n3f1kqHKg==
-  dependencies:
-    html-escaper "^2.0.0"
-
-jasmine-core@^3.3:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.7.1.tgz#0401327f6249eac993d47bbfa18d4e8efacfb561"
-  integrity sha512-DH3oYDS/AUvvr22+xUBW62m1Xoy7tUlY1tsxKEJvl5JeJ7q8zd1K5bUwiOxdH+erj6l2vAMM3hV25Xs9/WrmuQ==
-
-jasmine-core@~2.8.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
-  integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=
-
-jasmine-core@~3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.4.0.tgz#2a74618e966026530c3518f03e9f845d26473ce3"
-  integrity sha512-HU/YxV4i6GcmiH4duATwAbJQMlE0MsDIR5XmSVxURxKHn3aGAdbY1/ZJFmVRbKtnLwIxxMJD7gYaPsypcbYimg==
-
-jasmine-spec-reporter@~4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz#1d632aec0341670ad324f92ba84b4b32b35e9e22"
-  integrity sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==
-  dependencies:
-    colors "1.1.2"
-
-jasmine@2.8.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.8.0.tgz#6b089c0a11576b1f16df11b80146d91d4e8b8a3e"
-  integrity sha1-awicChFXax8W3xG4AUbZHU6Lij4=
-  dependencies:
-    exit "^0.1.2"
-    glob "^7.0.6"
-    jasmine-core "~2.8.0"
-
-jasminewd2@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-2.2.0.tgz#e37cf0b17f199cce23bea71b2039395246b4ec4e"
-  integrity sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=
-
-jest-worker@24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.9.0.tgz#5dbfdb5b2d322e98567898238a9697bcce67b3e5"
-  integrity sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==
-  dependencies:
-    merge-stream "^2.0.0"
-    supports-color "^6.1.0"
-
-jest-worker@^26.0.0:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
-  integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
-  dependencies:
-    "@types/node" "*"
-    merge-stream "^2.0.0"
-    supports-color "^7.0.0"
-
-jquery@^3.4.1:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
-  integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
-
-"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
-  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
-
-js-yaml@^3.13.1:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
-  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
-
-jsdom@^8.1.0:
-  version "8.5.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-8.5.0.tgz#d4d8f5dbf2768635b62a62823b947cf7071ebc98"
-  integrity sha1-1Nj12/J2hjW2KmKCO5R89wcevJg=
-  dependencies:
-    abab "^1.0.0"
-    acorn "^2.4.0"
-    acorn-globals "^1.0.4"
-    array-equal "^1.0.0"
-    cssom ">= 0.3.0 < 0.4.0"
-    cssstyle ">= 0.2.34 < 0.3.0"
-    escodegen "^1.6.1"
-    iconv-lite "^0.4.13"
-    nwmatcher ">= 1.3.7 < 2.0.0"
-    parse5 "^1.5.1"
-    request "^2.55.0"
-    sax "^1.1.4"
-    symbol-tree ">= 3.1.0 < 4.0.0"
-    tough-cookie "^2.2.0"
-    webidl-conversions "^3.0.1"
-    whatwg-url "^2.0.1"
-    xml-name-validator ">= 2.0.1 < 3.0.0"
-
-jsesc@^2.5.1:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
-  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
-
-jsesc@~0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
-  integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
-
-json-buffer@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
-  integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=
-
-json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
-  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
-
-json-parse-even-better-errors@^2.3.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
-  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
-
-json-schema-traverse@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
-  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
-
-json-schema@0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
-
-json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
-
-json3@^3.3.2:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
-  integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==
-
-json5@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
-  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
-  dependencies:
-    minimist "^1.2.0"
-
-json5@^2.1.0, json5@^2.1.2:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
-  integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
-  dependencies:
-    minimist "^1.2.5"
-
-jsonfile@^2.1.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
-  integrity sha1-NzaitCi4e72gzIO1P6PWM6NcKug=
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
-jsonfile@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
-  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
-jsonparse@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
-  integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
-
-jspdf@1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jspdf/-/jspdf-1.4.1.tgz#8dbd437986346d65efe20ede5361927666b8e4ca"
-  integrity sha512-2vYVdrvrQUdKKPyWHw81t1jEYYAJ6uFJ/HtTcGbI4qXIQEdl18dLEuL2wTeSv2GzeQLSgUvEvwsXsszuHK+PTw==
-  dependencies:
-    canvg "^1.0"
-    cf-blob.js "0.0.1"
-    file-saver "1.3.8"
-    omggif "1.0.7"
-    stackblur "^1.0.0"
-
-jspdf@^2.3.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/jspdf/-/jspdf-2.5.1.tgz#00c85250abf5447a05f3b32ab9935ab4a56592cc"
-  integrity sha512-hXObxz7ZqoyhxET78+XR34Xu2qFGrJJ2I2bE5w4SM8eFaFEkW2xcGRVUss360fYelwRSid/jT078kbNvmoW0QA==
-  dependencies:
-    "@babel/runtime" "^7.14.0"
-    atob "^2.1.2"
-    btoa "^1.2.1"
-    fflate "^0.4.8"
-  optionalDependencies:
-    canvg "^3.0.6"
-    core-js "^3.6.0"
-    dompurify "^2.2.0"
-    html2canvas "^1.0.0-rc.5"
-
-jsplumb@2.11.2:
-  version "2.11.2"
-  resolved "https://registry.yarnpkg.com/jsplumb/-/jsplumb-2.11.2.tgz#f8de737ea4b2551ebd95ca4b57dc096c3833e7dd"
-  integrity sha512-GyZE8l2JeZ0haOzHhsgykD8k1j5st1v2nNWaNNMqmRmGU43iuP9iBDAXDxmGNPp1t+4W++sT1SkbI8754YMtIg==
-
-jsprim@^1.2.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
-  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.2.3"
-    verror "1.10.0"
-
-jszip@^3.1.3:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.6.0.tgz#839b72812e3f97819cc13ac4134ffced95dd6af9"
-  integrity sha512-jgnQoG9LKnWO3mnVNBnfhkh0QknICd1FGSrXcgrl67zioyJ4wgx25o9ZqwNtrROSflGBCGYnJfjrIyRIby1OoQ==
-  dependencies:
-    lie "~3.3.0"
-    pako "~1.0.2"
-    readable-stream "~2.3.6"
-    set-immediate-shim "~1.0.1"
-
-karma-chrome-launcher@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-3.0.0.tgz#5c3a7f877a304e90781c28fcd9a49e334a890f42"
-  integrity sha512-u/PnVgDOP97AUe/gJeABlC6Wa6aQ83MZsm0JgsJQ5bGQ9XcXON/7b2aRhl59A62Zom+q3PFveBkczc7E1RT7TA==
-  dependencies:
-    which "^1.2.1"
-
-karma-coverage-istanbul-reporter@~2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.1.1.tgz#37a775fbfbb3cbe98cebf19605c94c6277c3b88a"
-  integrity sha512-CH8lTi8+kKXGvrhy94+EkEMldLCiUA0xMOiL31vvli9qK0T+qcXJAwWBRVJWnVWxYkTmyWar8lPz63dxX6/z1A==
-  dependencies:
-    istanbul-api "^2.1.6"
-    minimatch "^3.0.4"
-
-karma-jasmine-html-reporter@^1.4.2:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.6.0.tgz#586e17025a1b4128e9fba55d5f1e8921bfc3bc1e"
-  integrity sha512-ELO9yf0cNqpzaNLsfFgXd/wxZVYkE2+ECUwhMHUD4PZ17kcsPsYsVyjquiRqyMn2jkd2sHt0IeMyAyq1MC23Fw==
-
-karma-jasmine@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-2.0.1.tgz#26e3e31f2faf272dd80ebb0e1898914cc3a19763"
-  integrity sha512-iuC0hmr9b+SNn1DaUD2QEYtUxkS1J+bSJSn7ejdEexs7P8EYvA1CWkEdrDQ+8jVH3AgWlCNwjYsT1chjcNW9lA==
-  dependencies:
-    jasmine-core "^3.3"
-
-karma-safaritechpreview-launcher@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/karma-safaritechpreview-launcher/-/karma-safaritechpreview-launcher-0.0.6.tgz#7a841105aeb7053940e33df850edcf220eed906a"
-  integrity sha512-2QMxAGXPQ37H3KoR9SCdh0OoktQZ5MyrxkvBiZ+VVOQfYVrcyOQXGrPea0/DKvf8qoQvrvP2FHcP/BxsuxuyHw==
-  dependencies:
-    fs-promise "^0.5.0"
-    marcosc-async "^3.0.4"
-
-karma-source-map-support@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz#58526ceccf7e8730e56effd97a4de8d712ac0d6b"
-  integrity sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==
-  dependencies:
-    source-map-support "^0.5.5"
-
-karma@^3.0.0:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-3.1.4.tgz#3890ca9722b10d1d14b726e1335931455788499e"
-  integrity sha512-31Vo8Qr5glN+dZEVIpnPCxEGleqE0EY6CtC2X9TagRV3rRQ3SNrvfhddICkJgUK3AgqpeKSZau03QumTGhGoSw==
-  dependencies:
-    bluebird "^3.3.0"
-    body-parser "^1.16.1"
-    chokidar "^2.0.3"
-    colors "^1.1.0"
-    combine-lists "^1.0.0"
-    connect "^3.6.0"
-    core-js "^2.2.0"
-    di "^0.0.1"
-    dom-serialize "^2.2.0"
-    expand-braces "^0.1.1"
-    flatted "^2.0.0"
-    glob "^7.1.1"
-    graceful-fs "^4.1.2"
-    http-proxy "^1.13.0"
-    isbinaryfile "^3.0.0"
-    lodash "^4.17.5"
-    log4js "^3.0.0"
-    mime "^2.3.1"
-    minimatch "^3.0.2"
-    optimist "^0.6.1"
-    qjobs "^1.1.4"
-    range-parser "^1.2.0"
-    rimraf "^2.6.0"
-    safe-buffer "^5.0.1"
-    socket.io "2.1.1"
-    source-map "^0.6.1"
-    tmp "0.0.33"
-    useragent "2.3.0"
-
-karma@~4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-4.2.0.tgz#27e88b310cde090d016980ff5444e3a239196fca"
-  integrity sha512-fmCuxN1rwJxTdZfOXK5LjlmS4Ana/OvzNMpkyLL/TLE8hmgSkpVpMYQ7RTVa8TNKRVQDZNl5W1oF5cfKfgIMlA==
-  dependencies:
-    bluebird "^3.3.0"
-    body-parser "^1.16.1"
-    braces "^3.0.2"
-    chokidar "^3.0.0"
-    colors "^1.1.0"
-    connect "^3.6.0"
-    core-js "^3.1.3"
-    di "^0.0.1"
-    dom-serialize "^2.2.0"
-    flatted "^2.0.0"
-    glob "^7.1.1"
-    graceful-fs "^4.1.2"
-    http-proxy "^1.13.0"
-    isbinaryfile "^3.0.0"
-    lodash "^4.17.11"
-    log4js "^4.0.0"
-    mime "^2.3.1"
-    minimatch "^3.0.2"
-    optimist "^0.6.1"
-    qjobs "^1.1.4"
-    range-parser "^1.2.0"
-    rimraf "^2.6.0"
-    safe-buffer "^5.0.1"
-    socket.io "2.1.1"
-    source-map "^0.6.1"
-    tmp "0.0.33"
-    useragent "2.3.0"
-
-keycharm@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/keycharm/-/keycharm-0.2.0.tgz#fa6ea2e43b90a68028843d27f2075d35a8c3e6f9"
-  integrity sha1-+m6i5DuQpoAohD0n8gddNajD5vk=
-
-keycloak-angular@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/keycloak-angular/-/keycloak-angular-6.1.0.tgz#41d7c29d57bffddfea75e3e44c27e7e666e57398"
-  integrity sha512-TT3h6nWIXRf3u3NcEC25KBvgnZufpHaOKNfUUvt9Jk4p6zrDiKXxSIS8y+B1hg0kUhVsxzjXgSVngry39jljYw==
-  dependencies:
-    keycloak-js "^4.8.3"
-    tslib "^1.9.0"
-
-keycloak-js@^4.8.3:
-  version "4.8.3"
-  resolved "https://registry.yarnpkg.com/keycloak-js/-/keycloak-js-4.8.3.tgz#e065f41d144d260afa8466b5b587a65d5f308d30"
-  integrity sha512-TXoZdoOYu2ScYs58L95/xSYjsTto9KRvZ+vt6mv4Dyf4pYhYZSgwMPnmi128qj/z8sm4mL1Z8nncR6XdWgNKMQ==
-
-keycode@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.2.0.tgz#3d0af56dc7b8b8e5cba8d0a97f107204eec22b04"
-  integrity sha1-PQr1bce4uOXLqNCpfxByBO7CKwQ=
-
-keyv@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
-  integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==
-  dependencies:
-    json-buffer "3.0.0"
-
-killable@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
-  integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
-
-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
-  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
-  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
-
-kind-of@^6.0.0, kind-of@^6.0.2:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
-  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
-
-klaw@^1.0.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
-  integrity sha1-QIhDO0azsbolnXh4XY6W9zugJDk=
-  optionalDependencies:
-    graceful-fs "^4.1.9"
-
-latest-version@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face"
-  integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==
-  dependencies:
-    package-json "^6.3.0"
-
-lcid@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
-  integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==
-  dependencies:
-    invert-kv "^2.0.0"
-
-less-loader@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-5.0.0.tgz#498dde3a6c6c4f887458ee9ed3f086a12ad1b466"
-  integrity sha512-bquCU89mO/yWLaUq0Clk7qCsKhsF/TZpJUzETRvJa9KSVEL9SO3ovCvdEHISBhrC81OwC8QSVX7E0bzElZj9cg==
-  dependencies:
-    clone "^2.1.1"
-    loader-utils "^1.1.0"
-    pify "^4.0.1"
-
-less-plugin-npm-import@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/less-plugin-npm-import/-/less-plugin-npm-import-2.1.0.tgz#823e6986c93318a98171ca858848b6bead55bf3e"
-  integrity sha1-gj5phskzGKmBccqFiEi2vq1Vvz4=
-  dependencies:
-    promise "~7.0.1"
-    resolve "~1.1.6"
-
-less@3.9.0:
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/less/-/less-3.9.0.tgz#b7511c43f37cf57dc87dffd9883ec121289b1474"
-  integrity sha512-31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w==
-  dependencies:
-    clone "^2.1.2"
-  optionalDependencies:
-    errno "^0.1.1"
-    graceful-fs "^4.1.2"
-    image-size "~0.5.0"
-    mime "^1.4.1"
-    mkdirp "^0.5.0"
-    promise "^7.1.1"
-    request "^2.83.0"
-    source-map "~0.6.0"
-
-less@^3.8.0:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/less/-/less-3.13.1.tgz#0ebc91d2a0e9c0c6735b83d496b0ab0583077909"
-  integrity sha512-SwA1aQXGUvp+P5XdZslUOhhLnClSLIjWvJhmd+Vgib5BFIr9lMNlQwmwUNOjXThF/A0x+MCYYPeWEfeWiLRnTw==
-  dependencies:
-    copy-anything "^2.0.1"
-    tslib "^1.10.0"
-  optionalDependencies:
-    errno "^0.1.1"
-    graceful-fs "^4.1.2"
-    image-size "~0.5.0"
-    make-dir "^2.1.0"
-    mime "^1.4.1"
-    native-request "^1.0.5"
-    source-map "~0.6.0"
-
-leven@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
-  integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
-
-levenary@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/levenary/-/levenary-1.1.1.tgz#842a9ee98d2075aa7faeedbe32679e9205f46f77"
-  integrity sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==
-  dependencies:
-    leven "^3.1.0"
-
-levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
-  dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-
-license-webpack-plugin@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.1.2.tgz#63f7c571537a450ec47dc98f5d5ffdbca7b3b14f"
-  integrity sha512-7poZHRla+ae0eEButlwMrPpkXyhNVBf2EHePYWT0jyLnI6311/OXJkTI2sOIRungRpQgU2oDMpro5bSFPT5F0A==
-  dependencies:
-    "@types/webpack-sources" "^0.1.5"
-    webpack-sources "^1.2.0"
-
-lie@~3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a"
-  integrity sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==
-  dependencies:
-    immediate "~3.0.5"
-
-lines-and-columns@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
-  integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
-
-loader-runner@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
-  integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
-
-loader-utils@1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
-  integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
-  dependencies:
-    big.js "^5.2.2"
-    emojis-list "^2.0.0"
-    json5 "^1.0.1"
-
-loader-utils@^1.0.0, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
-  integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
-  dependencies:
-    big.js "^5.2.2"
-    emojis-list "^3.0.0"
-    json5 "^1.0.1"
-
-loader-utils@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0"
-  integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==
-  dependencies:
-    big.js "^5.2.2"
-    emojis-list "^3.0.0"
-    json5 "^2.1.2"
-
-locate-path@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
-  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
-  dependencies:
-    p-locate "^3.0.0"
-    path-exists "^3.0.0"
-
-locate-path@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
-  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
-  dependencies:
-    p-locate "^4.1.0"
-
-locate-path@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
-  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
-  dependencies:
-    p-locate "^5.0.0"
-
-lodash.clonedeep@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
-  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
-
-lodash.isequal@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
-  integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
-
-lodash.toarray@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz#24c4bfcd6b2fba38bfd0594db1179d8e9b656561"
-  integrity sha1-JMS/zWsvuji/0FlNsRedjptlZWE=
-
-lodash@4.17.21, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.5, lodash@^4.5.0:
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
-  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
-
-lodash@^3.10.1:
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
-  integrity sha512-9mDDwqVIma6OZX79ZlDACZl8sBm0TEnkf99zV3iMA4GzkIT/9hiqP5mY0HoT1iNLCrKc/R1HByV+yJfRWVJryQ==
-
-log4js@^3.0.0:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/log4js/-/log4js-3.0.6.tgz#e6caced94967eeeb9ce399f9f8682a4b2b28c8ff"
-  integrity sha512-ezXZk6oPJCWL483zj64pNkMuY/NcRX5MPiB0zE6tjZM137aeusrOnW1ecxgF9cmwMWkBMhjteQxBPoZBh9FDxQ==
-  dependencies:
-    circular-json "^0.5.5"
-    date-format "^1.2.0"
-    debug "^3.1.0"
-    rfdc "^1.1.2"
-    streamroller "0.7.0"
-
-log4js@^4.0.0:
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/log4js/-/log4js-4.5.1.tgz#e543625e97d9e6f3e6e7c9fc196dd6ab2cae30b5"
-  integrity sha512-EEEgFcE9bLgaYUKuozyFfytQM2wDHtXn4tAN41pkaxpNjAykv11GVdeI4tHtmPWW4Xrgh9R/2d7XYghDVjbKKw==
-  dependencies:
-    date-format "^2.0.0"
-    debug "^4.1.1"
-    flatted "^2.0.0"
-    rfdc "^1.1.4"
-    streamroller "^1.0.6"
-
-loglevel@^1.6.8:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197"
-  integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==
-
-loose-envify@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
-  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
-  dependencies:
-    js-tokens "^3.0.0 || ^4.0.0"
-
-lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
-  integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
-
-lowercase-keys@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
-  integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
-
-lru-cache@4.1.x, lru-cache@^4.0.1:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
-  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
-  dependencies:
-    pseudomap "^1.0.2"
-    yallist "^2.1.2"
-
-lru-cache@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
-  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
-  dependencies:
-    yallist "^3.0.2"
-
-lru-cache@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
-  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
-  dependencies:
-    yallist "^4.0.0"
-
-m3u8-parser@4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/m3u8-parser/-/m3u8-parser-4.3.0.tgz#4b4e988f87b6d8b2401d209a1d17798285a9da04"
-  integrity sha512-bVbjuBMoVIgFL1vpXVIxjeaoB5TPDJRb0m5qiTdM738SGqv/LAmsnVVPlKjM4fulm/rr1XZsKM+owHm+zvqxYA==
-  dependencies:
-    global "^4.3.2"
-
-m3u8-parser@4.5.2:
-  version "4.5.2"
-  resolved "https://registry.yarnpkg.com/m3u8-parser/-/m3u8-parser-4.5.2.tgz#f7d48a60112466e528324624c4e66d52ed341a75"
-  integrity sha512-sN/lu3TiRxmG2RFjZxo5c0/7Dr4RrEztl43jXrWwj5gFZ7vfa2iIxGfiPx485dm5QCazaIcKk+vNkUso8Aq0Ag==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    "@videojs/vhs-utils" "^3.0.0"
-    global "^4.4.0"
-
-magic-string@0.25.3:
-  version "0.25.3"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.3.tgz#34b8d2a2c7fec9d9bdf9929a3fd81d271ef35be9"
-  integrity sha512-6QK0OpF/phMz0Q2AxILkX2mFhi7m+WMwTRg0LQKq/WBB0cDP4rYH3Wp4/d3OTXlrPLVJT/RFqj8tFeAR4nk8AA==
-  dependencies:
-    sourcemap-codec "^1.4.4"
-
-magic-string@^0.25.0, magic-string@^0.25.2:
-  version "0.25.7"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051"
-  integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==
-  dependencies:
-    sourcemap-codec "^1.4.4"
-
-make-dir@^1.0.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
-  integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
-  dependencies:
-    pify "^3.0.0"
-
-make-dir@^2.0.0, make-dir@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
-  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
-  dependencies:
-    pify "^4.0.1"
-    semver "^5.6.0"
-
-make-dir@^3.0.0, make-dir@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
-  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
-  dependencies:
-    semver "^6.0.0"
-
-make-error@^1.1.1:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
-  integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
-
-make-fetch-happen@^5.0.0:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz#aa8387104f2687edca01c8687ee45013d02d19bd"
-  integrity sha512-07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag==
-  dependencies:
-    agentkeepalive "^3.4.1"
-    cacache "^12.0.0"
-    http-cache-semantics "^3.8.1"
-    http-proxy-agent "^2.1.0"
-    https-proxy-agent "^2.2.3"
-    lru-cache "^5.1.1"
-    mississippi "^3.0.0"
-    node-fetch-npm "^2.0.2"
-    promise-retry "^1.1.1"
-    socks-proxy-agent "^4.0.0"
-    ssri "^6.0.0"
-
-mamacro@^0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
-  integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==
-
-map-age-cleaner@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
-  integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
-  dependencies:
-    p-defer "^1.0.0"
-
-map-cache@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
-  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
-
-map-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
-  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
-  dependencies:
-    object-visit "^1.0.0"
-
-marcosc-async@^3.0.4:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/marcosc-async/-/marcosc-async-3.0.5.tgz#41e6d56c656c811859d34b97a0a26093f71dc360"
-  integrity sha1-QebVbGVsgRhZ00uXoKJgk/cdw2A=
-
-material-icons@^0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/material-icons/-/material-icons-0.7.1.tgz#30e4f9217f9aa78056e5c2617b36a177ac6db8e4"
-  integrity sha512-MV4qSDR0clISvUQK9d8PyktN0IAr1l2SJw8yDejBu8Ev+Xhh+kgnmVxYGgp4nRyGr495LeCGx7Nv4L+ZoJ7tvQ==
-
-md5.js@^1.3.4:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
-  integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==
-  dependencies:
-    hash-base "^3.0.0"
-    inherits "^2.0.1"
-    safe-buffer "^5.1.2"
-
-media-typer@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
-  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
-
-mem@^4.0.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
-  integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==
-  dependencies:
-    map-age-cleaner "^0.1.1"
-    mimic-fn "^2.0.0"
-    p-is-promise "^2.0.0"
-
-memory-fs@^0.4.0, memory-fs@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
-  integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
-  dependencies:
-    errno "^0.1.3"
-    readable-stream "^2.0.1"
-
-memory-fs@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c"
-  integrity sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==
-  dependencies:
-    errno "^0.1.3"
-    readable-stream "^2.0.1"
-
-merge-descriptors@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
-  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
-
-merge-source-map@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646"
-  integrity sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==
-  dependencies:
-    source-map "^0.6.1"
-
-merge-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
-  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
-
-merge2@^1.3.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
-  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
-
-methods@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
-  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
-
-micromatch@^3.1.10, micromatch@^3.1.4:
-  version "3.1.10"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
-  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    braces "^2.3.1"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    extglob "^2.0.4"
-    fragment-cache "^0.2.1"
-    kind-of "^6.0.2"
-    nanomatch "^1.2.9"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.2"
-
-micromatch@^4.0.2:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
-  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
-  dependencies:
-    braces "^3.0.1"
-    picomatch "^2.2.3"
-
-miller-rabin@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
-  integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==
-  dependencies:
-    bn.js "^4.0.0"
-    brorand "^1.0.1"
-
-mime-db@1.47.0, "mime-db@>= 1.43.0 < 2":
-  version "1.47.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz#8cb313e59965d3c05cfbf898915a267af46a335c"
-  integrity sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==
-
-mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
-  version "2.1.30"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz#6e7be8b4c479825f85ed6326695db73f9305d62d"
-  integrity sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==
-  dependencies:
-    mime-db "1.47.0"
-
-mime@1.6.0, mime@^1.4.1:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
-  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
-
-mime@^2.3.1, mime@^2.4.4:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe"
-  integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==
-
-mimic-fn@^2.0.0, mimic-fn@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
-  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
-
-mimic-response@^1.0.0, mimic-response@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
-  integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
-
-min-document@^2.19.0:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685"
-  integrity sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=
-  dependencies:
-    dom-walk "^0.1.0"
-
-mini-css-extract-plugin@0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.8.0.tgz#81d41ec4fe58c713a96ad7c723cdb2d0bd4d70e1"
-  integrity sha512-MNpRGbNA52q6U92i0qbVpQNsgk7LExy41MdAlG84FeytfDOtRIf/mCHdEgG8rpTKOaNKiqUnZdlptF469hxqOw==
-  dependencies:
-    loader-utils "^1.1.0"
-    normalize-url "1.9.1"
-    schema-utils "^1.0.0"
-    webpack-sources "^1.1.0"
-
-minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
-  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
-
-minimalistic-crypto-utils@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
-  integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
-
-minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
-
-minimist@~0.0.1:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-  integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
-
-minipass-collect@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
-  integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-flush@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
-  integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-pipeline@^1.2.2:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
-  integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass@^2.3.5, minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
-  integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
-  dependencies:
-    safe-buffer "^5.1.2"
-    yallist "^3.0.0"
-
-minipass@^3.0.0, minipass@^3.1.1:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd"
-  integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==
-  dependencies:
-    yallist "^4.0.0"
-
-minizlib@^1.2.1:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
-  integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
-  dependencies:
-    minipass "^2.9.0"
-
-minizlib@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
-  integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
-  dependencies:
-    minipass "^3.0.0"
-    yallist "^4.0.0"
-
-mississippi@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
-  integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==
-  dependencies:
-    concat-stream "^1.5.0"
-    duplexify "^3.4.2"
-    end-of-stream "^1.1.0"
-    flush-write-stream "^1.0.0"
-    from2 "^2.1.0"
-    parallel-transform "^1.1.0"
-    pump "^3.0.0"
-    pumpify "^1.3.3"
-    stream-each "^1.1.0"
-    through2 "^2.0.0"
-
-mixin-deep@^1.2.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
-  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
-  dependencies:
-    for-in "^1.0.2"
-    is-extendable "^1.0.1"
-
-mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.5:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
-  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
-  dependencies:
-    minimist "^1.2.5"
-
-mkdirp@^1.0.3, mkdirp@^1.0.4, mkdirp@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-
-mock-require@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/mock-require/-/mock-require-3.0.3.tgz#ccd544d9eae81dd576b3f219f69ec867318a1946"
-  integrity sha512-lLzfLHcyc10MKQnNUCv7dMcoY/2Qxd6wJfbqCcVk3LDb8An4hF6ohk5AztrvgKhJCqj36uyzi/p5se+tvyD+Wg==
-  dependencies:
-    get-caller-file "^1.0.2"
-    normalize-path "^2.1.1"
-
-moment@2.24.0:
-  version "2.24.0"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
-  integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
-
-moment@>=2.13.0, moment@^2.10.2, moment@^2.24.0, moment@^2.29.1:
-  version "2.29.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
-  integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
-
-move-concurrently@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
-  integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=
-  dependencies:
-    aproba "^1.1.1"
-    copy-concurrently "^1.0.0"
-    fs-write-stream-atomic "^1.0.8"
-    mkdirp "^0.5.1"
-    rimraf "^2.5.4"
-    run-queue "^1.0.3"
-
-mpd-parser@0.15.4:
-  version "0.15.4"
-  resolved "https://registry.yarnpkg.com/mpd-parser/-/mpd-parser-0.15.4.tgz#e1b445d0dc2aab1389fde6420ca9cca7c999575d"
-  integrity sha512-YcOclxKc5gnT87UQYwRoPJpWOFvQORwN+bXYmTWCJ4U2pCSS7jjtPrIhoOLHFAyekj48CHTX4hjGBV/VSNsUsg==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    "@videojs/vhs-utils" "^3.0.0"
-    global "^4.4.0"
-    xmldom "^0.4.0"
-
-mpd-parser@0.8.1:
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/mpd-parser/-/mpd-parser-0.8.1.tgz#db299dbec337999fbbbace989d227c7b03dc8ea7"
-  integrity sha512-WBTJ1bKk8OLUIxBh6s1ju1e2yz/5CzhPbgi6P3F3kJHKhGy1Z+ElvEnuzEbtC/dnbRcJtMXazE3f93N5LLdp9Q==
-  dependencies:
-    global "^4.3.2"
-    url-toolkit "^2.1.1"
-
-mrmime@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-1.0.1.tgz#5f90c825fad4bdd41dc914eff5d1a8cfdaf24f27"
-  integrity sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-
-ms@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
-
-ms@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
-ms@^2.0.0, ms@^2.1.1:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
-  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
-
-multicast-dns-service-types@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
-  integrity sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=
-
-multicast-dns@^6.0.1:
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229"
-  integrity sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==
-  dependencies:
-    dns-packet "^1.3.1"
-    thunky "^1.0.2"
-
-mustache@^3.0.2:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/mustache/-/mustache-3.2.1.tgz#89e78a9d207d78f2799b1e95764a25bf71a28322"
-  integrity sha512-RERvMFdLpaFfSRIEe632yDm5nsd0SDKn8hGmcUwswnyiE5mtdZLDybtHAz6hjJhawokF0hXvGLtx9mrQfm6FkA==
-
-mute-stream@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
-  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
-
-mux.js@5.1.3:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/mux.js/-/mux.js-5.1.3.tgz#1a59b8979a6780be5bcb63983c7e883c90cd615b"
-  integrity sha512-FhDcysLvAkO9H8ftBJ2sK1O4Rmz0AWnMS+2uqP7WjrnaAyE/ox11GEiZkRzrWIdp8at9R9qBHDqdURY3/h/xTg==
-
-mux.js@5.10.0:
-  version "5.10.0"
-  resolved "https://registry.yarnpkg.com/mux.js/-/mux.js-5.10.0.tgz#80fb30f9233c7902cac5cc8e1ae5f19e91cf8477"
-  integrity sha512-kLzvYsHYBwNa+ckkmpxWV3eImwntJbrwd1KbN4WR0hLe+dK/KB82aCuC0fQzAI2hkjYszdlSGsAWFgYdiFBUuA==
-  dependencies:
-    "@babel/runtime" "^7.11.2"
-
-mux.js@^5.9.2:
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/mux.js/-/mux.js-5.11.0.tgz#3c2c1fbd9d30720af2a1b12c1f2a2840c63100f6"
-  integrity sha512-Q/iLfohHh5Pp6lW7EFtcxNuaCNJ3Ruywfy46pWLsY+yIxR1kXXImYY1wOhg8jLdBMs1kRaZqsiB4Zncsiw0a2Q==
-  dependencies:
-    "@babel/runtime" "^7.11.2"
-
-mz@^2.3.1:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
-  integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==
-  dependencies:
-    any-promise "^1.0.0"
-    object-assign "^4.0.1"
-    thenify-all "^1.0.0"
-
-nan@^2.12.1:
-  version "2.14.2"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
-  integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==
-
-nanomatch@^1.2.9:
-  version "1.2.13"
-  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
-  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    fragment-cache "^0.2.1"
-    is-windows "^1.0.2"
-    kind-of "^6.0.2"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-native-request@^1.0.5:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/native-request/-/native-request-1.0.8.tgz#8f66bf606e0f7ea27c0e5995eb2f5d03e33ae6fb"
-  integrity sha512-vU2JojJVelUGp6jRcLwToPoWGxSx23z/0iX+I77J3Ht17rf2INGjrhOoQnjVo60nQd8wVsgzKkPfRXBiVdD2ag==
-
-negotiator@0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
-  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
-
-neo-async@^2.5.0, neo-async@^2.6.1:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
-  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
-
-ng-circle-progress@1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/ng-circle-progress/-/ng-circle-progress-1.5.1.tgz#ea4ea89318754b929dc1550d5779e391d7c5c646"
-  integrity sha512-gJ0SdWc+TkXckfbhbvUY522yjya3qcc1a3lGvvVyLsUfSOgll8LQaZGDEko84d8dk8vYO83n0O5vP+e8bJTInQ==
-  dependencies:
-    tslib "^1.9.0"
-
-ng-packagr@^5.4.3:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-5.7.1.tgz#8e082e38e7b6089296bf0491f2e5b29122f8e08d"
-  integrity sha512-NDAUcMtLyZnF3bP6JtC3ANpIQRclRDPilF7C0DsjQuIz1q0V3mT7f1PwV0jnRWy8iRpSZmJZr6AGl736gloHtQ==
-  dependencies:
-    ajv "^6.10.2"
-    autoprefixer "^9.6.0"
-    browserslist "^4.0.0"
-    chalk "^2.3.1"
-    chokidar "^3.0.0"
-    clean-css "^4.1.11"
-    commander "^3.0.0"
-    fs-extra "^8.0.0"
-    glob "^7.1.2"
-    injection-js "^2.2.1"
-    less "^3.8.0"
-    less-plugin-npm-import "^2.1.0"
-    node-sass-tilde-importer "^1.0.0"
-    postcss "^7.0.0"
-    postcss-url "^8.0.0"
-    read-pkg-up "^5.0.0"
-    rimraf "^3.0.0"
-    rollup "1.25.2"
-    rollup-plugin-commonjs "^10.0.0"
-    rollup-plugin-json "^4.0.0"
-    rollup-plugin-node-resolve "^5.0.0"
-    rollup-plugin-sourcemaps "^0.4.2"
-    rxjs "^6.0.0"
-    sass "^1.17.3"
-    stylus "^0.54.5"
-    terser "^4.1.2"
-    update-notifier "^3.0.0"
-
-ng2-ace-editor@^0.3.9:
-  version "0.3.9"
-  resolved "https://registry.yarnpkg.com/ng2-ace-editor/-/ng2-ace-editor-0.3.9.tgz#5ae68712e9ca49591eda31df8fe02eca1c3634e1"
-  integrity sha512-e8Q4YCirlL/OEiekewmzupG+zV3prYsiYmQnRzQzd0wNgsPjOLOdb0it7cCbzFfIXKGyIIHKTW5584WxPr2LnQ==
-  dependencies:
-    ace-builds "^1.4.2"
-    brace "^0.11.1"
-
-ng2-charts@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/ng2-charts/-/ng2-charts-2.3.0.tgz#e4dd1f7fe12dc2635d5e8c4f101a8d4c4f433754"
-  integrity sha512-D5K7OqF0m5lOBYvNOsraoEo4OPHja9zfGNj+HWy2nUcP0LP2s+Y/QaQlkG/1rHlwXq9HPm8rLxzSutA0eLHxGQ==
-  dependencies:
-    "@types/chart.js" "^2.7.48"
-    lodash "^4.17.11"
-    tslib "^1.9.0"
-
-ng2-ckeditor@1.2.6:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/ng2-ckeditor/-/ng2-ckeditor-1.2.6.tgz#be5dc7872846e329f61d5b0d6ce084045044ab7f"
-  integrity sha512-/bw0ZzVBvHUrFrXFeP08XKSsIX67M85rTiZkcphn0kpripAj13JvX/l/SQ74Kfk5K226Y3c+rONDj6OtfZH0kA==
-  dependencies:
-    tslib "^1.9.0"
-
-ng2-pdf-viewer@6.4.1:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/ng2-pdf-viewer/-/ng2-pdf-viewer-6.4.1.tgz#c84e7e4c6db9d759ebc6969ec60b5fc0c3e7fe16"
-  integrity sha512-A8R9SGa2bu4n+mtagGX8DqBrVAbuROrEgcAOQwCdciYTLAq9EFGEB8TCQZpjvYVaFTNwjKWTMTjFQVEorjbLeQ==
-  dependencies:
-    "@types/pdfjs-dist" "~2.1.7"
-    pdfjs-dist "~2.5.207"
-    tslib "^1.10.0"
-
-ng2-search-filter@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/ng2-search-filter/-/ng2-search-filter-0.5.1.tgz#6d5f4e26bd2b2c8c8cc4aad658aabae6a33fb4af"
-  integrity sha512-noN8R+Gyxo5ZuboEOvq+u0zKio6pEf1IVYQTCZfAfXm6ONmzWu/M2xK0di9oVUprDbPBQXCGUuvD5i2GD+35HA==
-
-ngx-export-as@1.4.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/ngx-export-as/-/ngx-export-as-1.4.2.tgz#6fb20ae104225f4a1449c1eea9c1a9ccbdc32a50"
-  integrity sha512-oKYYaj385Hazvsva4hrxSqo5/tU1SIJsfQy6jsfjPCAWbVI6p/18z2CRcrhvqd0zH0aE/fD55s6etJ2OnMxkag==
-  dependencies:
-    html2pdf.js "^0.9.1"
-    rxjs "~6.3.3"
-    xlsx "^0.14.0"
-
-ngx-image-cropper@^3.0.3:
-  version "3.3.5"
-  resolved "https://registry.yarnpkg.com/ngx-image-cropper/-/ngx-image-cropper-3.3.5.tgz#39f636e3989c5c84241f5130d0124ded6631fbeb"
-  integrity sha512-0yRVKG5XAbVo3rOaj/iFDlekGsxEqXKU9iXFbjyvHvRT2DFs+AjwtyvINsHCWw+4ed9yA4Y+wLIUNqzA0bfxLw==
-  dependencies:
-    tslib "^1.9.0"
-
-ngx-pagination@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/ngx-pagination/-/ngx-pagination-5.1.0.tgz#b09ad72c20283b392fb9ea457ec2d4825e149358"
-  integrity sha512-GDI5GwmYIaeLu3hW3tgdIw/LXOzLj05PjVhtf2Ze63QsJ6zhZ7g5tg6S4EhhuUOdbMdXWyOng/uMVZwbYpi0Eg==
-
-ngx-quill@^7.1.2:
-  version "7.3.12"
-  resolved "https://registry.yarnpkg.com/ngx-quill/-/ngx-quill-7.3.12.tgz#3321f005f729507577dc9b130d9334ebddd67fdc"
-  integrity sha512-A49Q5KvBtzTRc+hmjzpvPkar1hOoaeGKEispeQ91yUaIB95fjzykx6SqWtcBmGFckNllCOIQV9iel9+RCnd+8Q==
-  dependencies:
-    tslib "^1.9.0"
-
-ngx-take-until-destroy@5.4.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/ngx-take-until-destroy/-/ngx-take-until-destroy-5.4.0.tgz#6c8606ee956584dc947e2eb609c48b8f98b09900"
-  integrity sha512-e+VfCrHbLybdKWoQ8prdhmVzWI6vTnedr/9cVGQTkfepMdLz5D++VDk+Wnbs7mru6S9C+kIpNWUlh2YMPl928Q==
-  dependencies:
-    tslib "^1.9.0"
-
-nice-try@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
-  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
-
-node-emoji@^1.8.1:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.10.0.tgz#8886abd25d9c7bb61802a658523d1f8d2a89b2da"
-  integrity sha512-Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw==
-  dependencies:
-    lodash.toarray "^4.4.0"
-
-node-ensure@^0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/node-ensure/-/node-ensure-0.0.0.tgz#ecae764150de99861ec5c810fd5d096b183932a7"
-  integrity sha1-7K52QVDemYYexcgQ/V0Jaxg5Mqc=
-
-node-fetch-npm@^2.0.2:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.4.tgz#6507d0e17a9ec0be3bec516958a497cec54bf5a4"
-  integrity sha512-iOuIQDWDyjhv9qSDrj9aq/klt6F9z1p2otB3AV7v3zBDcL/x+OfGsvGQZZCcMZbUf4Ujw1xGNQkjvGnVT22cKg==
-  dependencies:
-    encoding "^0.1.11"
-    json-parse-better-errors "^1.0.0"
-    safe-buffer "^5.1.1"
-
-node-forge@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
-  integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
-
-node-libs-browser@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425"
-  integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==
-  dependencies:
-    assert "^1.1.1"
-    browserify-zlib "^0.2.0"
-    buffer "^4.3.0"
-    console-browserify "^1.1.0"
-    constants-browserify "^1.0.0"
-    crypto-browserify "^3.11.0"
-    domain-browser "^1.1.1"
-    events "^3.0.0"
-    https-browserify "^1.0.0"
-    os-browserify "^0.3.0"
-    path-browserify "0.0.1"
-    process "^0.11.10"
-    punycode "^1.2.4"
-    querystring-es3 "^0.2.0"
-    readable-stream "^2.3.3"
-    stream-browserify "^2.0.1"
-    stream-http "^2.7.2"
-    string_decoder "^1.0.0"
-    timers-browserify "^2.0.4"
-    tty-browserify "0.0.0"
-    url "^0.11.0"
-    util "^0.11.0"
-    vm-browserify "^1.0.1"
-
-node-releases@^1.1.52, node-releases@^1.1.71:
-  version "1.1.71"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"
-  integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==
-
-node-sass-tilde-importer@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/node-sass-tilde-importer/-/node-sass-tilde-importer-1.0.2.tgz#1a15105c153f648323b4347693fdb0f331bad1ce"
-  integrity sha512-Swcmr38Y7uB78itQeBm3mThjxBy9/Ah/ykPIaURY/L6Nec9AyRoL/jJ7ECfMR+oZeCTVQNxVMu/aHU+TLRVbdg==
-  dependencies:
-    find-parent-dir "^0.3.0"
-
-normalize-package-data@^2.0.0, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
-  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
-  dependencies:
-    hosted-git-info "^2.1.4"
-    resolve "^1.10.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
-
-normalize-path@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
-  dependencies:
-    remove-trailing-separator "^1.0.1"
-
-normalize-path@^3.0.0, normalize-path@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
-  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
-
-normalize-range@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
-  integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
-
-normalize-url@1.9.1:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
-  integrity sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=
-  dependencies:
-    object-assign "^4.0.1"
-    prepend-http "^1.0.0"
-    query-string "^4.1.0"
-    sort-keys "^1.0.0"
-
-normalize-url@^4.1.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129"
-  integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==
-
-normalize.css@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-8.0.1.tgz#9b98a208738b9cc2634caacbc42d131c97487bf3"
-  integrity sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg==
-
-nosleep.js@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/nosleep.js/-/nosleep.js-0.7.0.tgz#cfd919c25523ca0d0f4a69fb3305c083adaee289"
-  integrity sha1-z9kZwlUjyg0PSmn7MwXAg62u4ok=
-
-npm-bundled@^1.0.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.2.tgz#944c78789bd739035b70baa2ca5cc32b8d860bc1"
-  integrity sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==
-  dependencies:
-    npm-normalize-package-bin "^1.0.1"
-
-npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
-  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
-
-npm-package-arg@6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.0.tgz#15ae1e2758a5027efb4c250554b85a737db7fcc1"
-  integrity sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==
-  dependencies:
-    hosted-git-info "^2.6.0"
-    osenv "^0.1.5"
-    semver "^5.5.0"
-    validate-npm-package-name "^3.0.0"
-
-npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.1.tgz#02168cb0a49a2b75bf988a28698de7b529df5cb7"
-  integrity sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==
-  dependencies:
-    hosted-git-info "^2.7.1"
-    osenv "^0.1.5"
-    semver "^5.6.0"
-    validate-npm-package-name "^3.0.0"
-
-npm-packlist@^1.1.12:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
-  integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
-  dependencies:
-    ignore-walk "^3.0.1"
-    npm-bundled "^1.0.1"
-    npm-normalize-package-bin "^1.0.1"
-
-npm-pick-manifest@3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-3.0.2.tgz#f4d9e5fd4be2153e5f4e5f9b7be8dc419a99abb7"
-  integrity sha512-wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw==
-  dependencies:
-    figgy-pudding "^3.5.1"
-    npm-package-arg "^6.0.0"
-    semver "^5.4.1"
-
-npm-pick-manifest@^2.2.3:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz#32111d2a9562638bb2c8f2bf27f7f3092c8fae40"
-  integrity sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==
-  dependencies:
-    figgy-pudding "^3.5.1"
-    npm-package-arg "^6.0.0"
-    semver "^5.4.1"
-
-npm-registry-fetch@^4.0.0:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-4.0.7.tgz#57951bf6541e0246b34c9f9a38ab73607c9449d7"
-  integrity sha512-cny9v0+Mq6Tjz+e0erFAB+RYJ/AVGzkjnISiobqP8OWj9c9FLoZZu8/SPSKJWE17F1tk4018wfjV+ZbIbqC7fQ==
-  dependencies:
-    JSONStream "^1.3.4"
-    bluebird "^3.5.1"
-    figgy-pudding "^3.4.1"
-    lru-cache "^5.1.1"
-    make-fetch-happen "^5.0.0"
-    npm-package-arg "^6.1.0"
-    safe-buffer "^5.2.0"
-
-npm-run-path@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
-  dependencies:
-    path-key "^2.0.0"
-
-num2fraction@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
-  integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
-
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
-
-"nwmatcher@>= 1.3.7 < 2.0.0":
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.4.tgz#2285631f34a95f0d0395cd900c96ed39b58f346e"
-  integrity sha512-3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ==
-
-oauth-sign@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
-
-object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
-
-object-component@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
-  integrity sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=
-
-object-copy@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
-  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
-  dependencies:
-    copy-descriptor "^0.1.0"
-    define-property "^0.2.5"
-    kind-of "^3.0.3"
-
-object-hash@^2.0.3:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.1.1.tgz#9447d0279b4fcf80cff3259bf66a1dc73afabe09"
-  integrity sha512-VOJmgmS+7wvXf8CjbQmimtCnEx3IAoLxI3fp2fbWehxrWBcAQFbk+vcwb6vzR0VZv/eNCJ/27j151ZTwqW/JeQ==
-
-object-inspect@^1.9.0:
-  version "1.10.3"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz#c2aa7d2d09f50c99375704f7a0adf24c5782d369"
-  integrity sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==
-
-object-is@^1.0.1:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac"
-  integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-
-object-keys@^1.0.12, object-keys@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
-  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
-
-object-sizeof@^1.6.0:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/object-sizeof/-/object-sizeof-1.6.1.tgz#35971f3fd2102bd8b51c67b0a53ed773ff77ab56"
-  integrity sha512-gNKGcRnDRXwEpAdwUY3Ef+aVZIrcQVXozSaVzHz6Pv4JxysH8vf5F+nIgsqW5T/YNwZNveh0mIW7PEH1O2MrDw==
-  dependencies:
-    buffer "^5.6.0"
-
-object-visit@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
-  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
-  dependencies:
-    isobject "^3.0.0"
-
-object.assign@^4.1.0, object.assign@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
-  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
-  dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-    has-symbols "^1.0.1"
-    object-keys "^1.1.1"
-
-object.getownpropertydescriptors@^2.0.3:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz#1bd63aeacf0d5d2d2f31b5e393b03a7c601a23f7"
-  integrity sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.2"
-
-object.pick@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
-  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
-  dependencies:
-    isobject "^3.0.1"
-
-obuf@^1.0.0, obuf@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
-  integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
-
-omggif@1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/omggif/-/omggif-1.0.7.tgz#59d2eecb0263de84635b3feb887c0c9973f1e49d"
-  integrity sha1-WdLuywJj3oRjWz/riHwMmXPx5J0=
-
-on-finished@~2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
-  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
-  dependencies:
-    ee-first "1.1.1"
-
-on-headers@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
-  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
-
-once@^1.3.0, once@^1.3.1, once@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
-  dependencies:
-    wrappy "1"
-
-onetime@^5.1.0:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
-  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
-  dependencies:
-    mimic-fn "^2.1.0"
-
-open@6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/open/-/open-6.4.0.tgz#5c13e96d0dc894686164f18965ecfe889ecfc8a9"
-  integrity sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==
-  dependencies:
-    is-wsl "^1.1.0"
-
-opencollective-postinstall@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259"
-  integrity sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==
-
-opener@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
-  integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
-
-opn@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
-  integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==
-  dependencies:
-    is-wsl "^1.1.0"
-
-optimist@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
-  integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
-  dependencies:
-    minimist "~0.0.1"
-    wordwrap "~0.0.2"
-
-optionator@^0.8.1:
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
-  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
-  dependencies:
-    deep-is "~0.1.3"
-    fast-levenshtein "~2.0.6"
-    levn "~0.3.0"
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-    word-wrap "~1.2.3"
-
-original@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
-  integrity sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==
-  dependencies:
-    url-parse "^1.4.3"
-
-os-browserify@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
-  integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
-
-os-homedir@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
-
-os-locale@^3.0.0, os-locale@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
-  integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
-  dependencies:
-    execa "^1.0.0"
-    lcid "^2.0.0"
-    mem "^4.0.0"
-
-os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
-
-osenv@^0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
-  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.0"
-
-p-cancelable@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
-  integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
-
-p-defer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
-  integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
-
-p-finally@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
-
-p-is-promise@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
-  integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
-
-p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
-  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
-  dependencies:
-    p-try "^2.0.0"
-
-p-limit@^3.0.1, p-limit@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
-  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
-  dependencies:
-    yocto-queue "^0.1.0"
-
-p-locate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
-  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
-  dependencies:
-    p-limit "^2.0.0"
-
-p-locate@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
-  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
-  dependencies:
-    p-limit "^2.2.0"
-
-p-locate@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
-  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
-  dependencies:
-    p-limit "^3.0.2"
-
-p-map@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
-  integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
-
-p-map@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
-  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
-  dependencies:
-    aggregate-error "^3.0.0"
-
-p-retry@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz#316b4c8893e2c8dc1cfa891f406c4b422bebf328"
-  integrity sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==
-  dependencies:
-    retry "^0.12.0"
-
-p-try@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
-  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
-
-package-json@^6.3.0:
-  version "6.5.0"
-  resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0"
-  integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==
-  dependencies:
-    got "^9.6.0"
-    registry-auth-token "^4.0.0"
-    registry-url "^5.0.0"
-    semver "^6.2.0"
-
-pacote@9.5.5:
-  version "9.5.5"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.5.5.tgz#63355a393614c3424e735820c3731e2cbbedaeeb"
-  integrity sha512-jAEP+Nqj4kyMWyNpfTU/Whx1jA7jEc5cCOlurm0/0oL+v8TAp1QSsK83N7bYe+2bEdFzMAtPG5TBebjzzGV0cA==
-  dependencies:
-    bluebird "^3.5.3"
-    cacache "^12.0.2"
-    figgy-pudding "^3.5.1"
-    get-stream "^4.1.0"
-    glob "^7.1.3"
-    infer-owner "^1.0.4"
-    lru-cache "^5.1.1"
-    make-fetch-happen "^5.0.0"
-    minimatch "^3.0.4"
-    minipass "^2.3.5"
-    mississippi "^3.0.0"
-    mkdirp "^0.5.1"
-    normalize-package-data "^2.4.0"
-    npm-package-arg "^6.1.0"
-    npm-packlist "^1.1.12"
-    npm-pick-manifest "^2.2.3"
-    npm-registry-fetch "^4.0.0"
-    osenv "^0.1.5"
-    promise-inflight "^1.0.1"
-    promise-retry "^1.1.1"
-    protoduck "^5.0.1"
-    rimraf "^2.6.2"
-    safe-buffer "^5.1.2"
-    semver "^5.6.0"
-    ssri "^6.0.1"
-    tar "^4.4.8"
-    unique-filename "^1.1.1"
-    which "^1.3.1"
-
-pako@~1.0.2, pako@~1.0.5:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
-  integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
-
-parallel-transform@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc"
-  integrity sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==
-  dependencies:
-    cyclist "^1.0.1"
-    inherits "^2.0.3"
-    readable-stream "^2.1.5"
-
-parchment@^1.1.2, parchment@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/parchment/-/parchment-1.1.4.tgz#aeded7ab938fe921d4c34bc339ce1168bc2ffde5"
-  integrity sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg==
-
-parent-module@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
-  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
-  dependencies:
-    callsites "^3.0.0"
-
-parse-asn1@^5.0.0, parse-asn1@^5.1.5:
-  version "5.1.6"
-  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4"
-  integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==
-  dependencies:
-    asn1.js "^5.2.0"
-    browserify-aes "^1.0.0"
-    evp_bytestokey "^1.0.0"
-    pbkdf2 "^3.0.3"
-    safe-buffer "^5.1.1"
-
-parse-headers@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.3.tgz#5e8e7512383d140ba02f0c7aa9f49b4399c92515"
-  integrity sha512-QhhZ+DCCit2Coi2vmAKbq5RGTRcQUOE2+REgv8vdyu7MnYx2eZztegqtTx99TZ86GTIwqiy3+4nQTWZ2tgmdCA==
-
-parse-json@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
-  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
-  dependencies:
-    error-ex "^1.3.1"
-    json-parse-better-errors "^1.0.1"
-
-parse-json@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
-  integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    error-ex "^1.3.1"
-    json-parse-even-better-errors "^2.3.0"
-    lines-and-columns "^1.1.6"
-
-parse5-html-rewriting-stream@5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-5.1.0.tgz#63f92c958764aea8cbe3aa68f2e5895c32068ab8"
-  integrity sha512-hZlaOTHJs4dpC5yFHnOSEMh26ErsqTsLzxKqkuRcUqtiu0kMsBQ9pkgANkECDyoBUhJ3+hvb2DPLsyqbtcS61Q==
-  dependencies:
-    parse5 "^5.1.0"
-    parse5-sax-parser "^5.1.0"
-
-parse5-sax-parser@^5.1.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/parse5-sax-parser/-/parse5-sax-parser-5.1.1.tgz#02834a9d08b23ea2d99584841c38be09d5247a15"
-  integrity sha512-9HIh6zd7bF1NJe95LPCUC311CekdOi55R+HWXNCsGY6053DWaMijVKOv1oPvdvPTvFicifZyimBVJ6/qvG039Q==
-  dependencies:
-    parse5 "^5.1.1"
-
-parse5@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
-  integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==
-
-parse5@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"
-  integrity sha1-m387DeMr543CQBsXVzzK8Pb1nZQ=
-
-parse5@^5.0.0, parse5@^5.1.0, parse5@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"
-  integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==
-
-parseqs@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
-  integrity sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=
-  dependencies:
-    better-assert "~1.0.0"
-
-parseuri@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a"
-  integrity sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=
-  dependencies:
-    better-assert "~1.0.0"
-
-parseurl@~1.3.2, parseurl@~1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
-  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
-
-pascalcase@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
-  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
-
-path-browserify@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"
-  integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==
-
-path-dirname@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
-
-path-exists@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
-
-path-exists@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
-  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
-
-path-is-inside@^1.0.1, path-is-inside@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
-  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
-
-path-key@^2.0.0, path-key@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
-
-path-parse@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
-
-path-to-regexp@0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
-  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
-
-path-type@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
-  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
-
-pbkdf2@^3.0.3:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075"
-  integrity sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==
-  dependencies:
-    create-hash "^1.1.2"
-    create-hmac "^1.1.4"
-    ripemd160 "^2.0.1"
-    safe-buffer "^5.0.1"
-    sha.js "^2.4.8"
-
-pdfjs-dist@2.1.266:
-  version "2.1.266"
-  resolved "https://registry.yarnpkg.com/pdfjs-dist/-/pdfjs-dist-2.1.266.tgz#cded02268b389559e807f410d2a729db62160026"
-  integrity sha512-Jy7o1wE3NezPxozexSbq4ltuLT0Z21ew/qrEiAEeUZzHxMHGk4DUV1D7RuCXg5vJDvHmjX1YssN+we9QfRRgXQ==
-  dependencies:
-    node-ensure "^0.0.0"
-    worker-loader "^2.0.0"
-
-pdfjs-dist@~2.5.207:
-  version "2.5.207"
-  resolved "https://registry.yarnpkg.com/pdfjs-dist/-/pdfjs-dist-2.5.207.tgz#b5e8c19627be64269cd3fb6df3eaaf45ddffe7b6"
-  integrity sha512-xGDUhnCYPfHy+unMXCLCJtlpZaaZ17Ew3WIL0tnSgKFUZXHAPD49GO9xScyszSsQMoutNDgRb+rfBXIaX/lJbw==
-
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
-
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d"
-  integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==
-
-pify@^2.0.0, pify@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
-
-pify@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
-
-pify@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
-  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
-
-pinkie-promise@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
-  dependencies:
-    pinkie "^2.0.0"
-
-pinkie@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
-
-pkcs7@^1.0.2, pkcs7@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/pkcs7/-/pkcs7-1.0.4.tgz#6090b9e71160dabf69209d719cbafa538b00a1cb"
-  integrity sha512-afRERtHn54AlwaF2/+LFszyAANTCggGilmcmILUzEjvs3XgFZT+xE6+QWQcAGmu4xajy+Xtj7acLOPdx5/eXWQ==
-  dependencies:
-    "@babel/runtime" "^7.5.5"
-
-pkg-dir@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
-  integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==
-  dependencies:
-    find-up "^3.0.0"
-
-pkg-dir@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
-  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
-  dependencies:
-    find-up "^4.0.0"
-
-pkg-dir@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-5.0.0.tgz#a02d6aebe6ba133a928f74aec20bafdfe6b8e760"
-  integrity sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==
-  dependencies:
-    find-up "^5.0.0"
-
-pkg-up@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5"
-  integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==
-  dependencies:
-    find-up "^3.0.0"
-
-please-upgrade-node@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942"
-  integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==
-  dependencies:
-    semver-compare "^1.0.0"
-
-portfinder@^1.0.26:
-  version "1.0.28"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
-  integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==
-  dependencies:
-    async "^2.6.2"
-    debug "^3.1.1"
-    mkdirp "^0.5.5"
-
-posix-character-classes@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
-  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
-
-postcss-functions@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-functions/-/postcss-functions-3.0.0.tgz#0e94d01444700a481de20de4d55fb2640564250e"
-  integrity sha1-DpTQFERwCkgd4g3k1V+yZAVkJQ4=
-  dependencies:
-    glob "^7.1.2"
-    object-assign "^4.1.1"
-    postcss "^6.0.9"
-    postcss-value-parser "^3.3.0"
-
-postcss-import@12.0.1:
-  version "12.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-12.0.1.tgz#cf8c7ab0b5ccab5649024536e565f841928b7153"
-  integrity sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==
-  dependencies:
-    postcss "^7.0.1"
-    postcss-value-parser "^3.2.3"
-    read-cache "^1.0.0"
-    resolve "^1.1.7"
-
-postcss-js@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-2.0.3.tgz#a96f0f23ff3d08cec7dc5b11bf11c5f8077cdab9"
-  integrity sha512-zS59pAk3deu6dVHyrGqmC3oDXBdNdajk4k1RyxeVXCrcEDBUBHoIhE4QTsmhxgzXxsaqFDAkUZfmMa5f/N/79w==
-  dependencies:
-    camelcase-css "^2.0.1"
-    postcss "^7.0.18"
-
-postcss-load-config@^2.0.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.2.tgz#c5ea504f2c4aef33c7359a34de3573772ad7502a"
-  integrity sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==
-  dependencies:
-    cosmiconfig "^5.0.0"
-    import-cwd "^2.0.0"
-
-postcss-loader@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-3.0.0.tgz#6b97943e47c72d845fa9e03f273773d4e8dd6c2d"
-  integrity sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==
-  dependencies:
-    loader-utils "^1.1.0"
-    postcss "^7.0.0"
-    postcss-load-config "^2.0.0"
-    schema-utils "^1.0.0"
-
-postcss-nested@^4.1.1:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-4.2.3.tgz#c6f255b0a720549776d220d00c4b70cd244136f6"
-  integrity sha512-rOv0W1HquRCamWy2kFl3QazJMMe1ku6rCFoAAH+9AcxdbpDeBr6k968MLWuLjvjMcGEip01ak09hKOEgpK9hvw==
-  dependencies:
-    postcss "^7.0.32"
-    postcss-selector-parser "^6.0.2"
-
-postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2:
-  version "6.0.6"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea"
-  integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==
-  dependencies:
-    cssesc "^3.0.0"
-    util-deprecate "^1.0.2"
-
-postcss-url@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-url/-/postcss-url-8.0.0.tgz#7b10059bd12929cdbb1971c60f61a0e5af86b4ca"
-  integrity sha512-E2cbOQ5aii2zNHh8F6fk1cxls7QVFZjLPSrqvmiza8OuXLzIpErij8BDS5Y3STPfJgpIMNCPEr8JlKQWEoozUw==
-  dependencies:
-    mime "^2.3.1"
-    minimatch "^3.0.4"
-    mkdirp "^0.5.0"
-    postcss "^7.0.2"
-    xxhashjs "^0.2.1"
-
-postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
-  integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
-
-postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
-  integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
-
-postcss@7.0.17:
-  version "7.0.17"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.17.tgz#4da1bdff5322d4a0acaab4d87f3e782436bad31f"
-  integrity sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==
-  dependencies:
-    chalk "^2.4.2"
-    source-map "^0.6.1"
-    supports-color "^6.1.0"
-
-postcss@7.0.32:
-  version "7.0.32"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d"
-  integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==
-  dependencies:
-    chalk "^2.4.2"
-    source-map "^0.6.1"
-    supports-color "^6.1.0"
-
-postcss@^6.0.9:
-  version "6.0.23"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
-  integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==
-  dependencies:
-    chalk "^2.4.1"
-    source-map "^0.6.1"
-    supports-color "^5.4.0"
-
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.11, postcss@^7.0.17, postcss@^7.0.18, postcss@^7.0.2, postcss@^7.0.32:
-  version "7.0.35"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24"
-  integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==
-  dependencies:
-    chalk "^2.4.2"
-    source-map "^0.6.1"
-    supports-color "^6.1.0"
-
-prelude-ls@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
-
-prepend-http@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
-  integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
-
-prepend-http@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
-  integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
-
-pretty-hrtime@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
-  integrity sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=
-
-printj@~1.1.0, printj@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222"
-  integrity sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==
-
-process-nextick-args@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
-  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
-
-process@^0.11.10:
-  version "0.11.10"
-  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
-  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
-
-process@~0.5.1:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf"
-  integrity sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=
-
-promise-inflight@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
-  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
-
-promise-retry@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d"
-  integrity sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=
-  dependencies:
-    err-code "^1.0.0"
-    retry "^0.10.0"
-
-promise@^7.1.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
-  integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
-  dependencies:
-    asap "~2.0.3"
-
-promise@~7.0.1:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/promise/-/promise-7.0.4.tgz#363e84a4c36c8356b890fed62c91ce85d02ed539"
-  integrity sha1-Nj6EpMNsg1a4kP7WLJHOhdAu1Tk=
-  dependencies:
-    asap "~2.0.3"
-
-protoduck@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.1.tgz#03c3659ca18007b69a50fd82a7ebcc516261151f"
-  integrity sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==
-  dependencies:
-    genfun "^5.0.0"
-
-protractor@~5.4.2:
-  version "5.4.4"
-  resolved "https://registry.yarnpkg.com/protractor/-/protractor-5.4.4.tgz#b241466aaf83b76bc2c58df67deb9a5cdfc61529"
-  integrity sha512-BaL4vePgu3Vfa/whvTUAlgaCAId4uNSGxIFSCXMgj7LMYENPWLp85h5RBi9pdpX/bWQ8SF6flP7afmi2TC4eHw==
-  dependencies:
-    "@types/q" "^0.0.32"
-    "@types/selenium-webdriver" "^3.0.0"
-    blocking-proxy "^1.0.0"
-    browserstack "^1.5.1"
-    chalk "^1.1.3"
-    glob "^7.0.3"
-    jasmine "2.8.0"
-    jasminewd2 "^2.1.0"
-    q "1.4.1"
-    saucelabs "^1.5.0"
-    selenium-webdriver "3.6.0"
-    source-map-support "~0.4.0"
-    webdriver-js-extender "2.1.0"
-    webdriver-manager "^12.0.6"
-    yargs "^12.0.5"
-
-proxy-addr@~2.0.5:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf"
-  integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==
-  dependencies:
-    forwarded "~0.1.2"
-    ipaddr.js "1.9.1"
-
-prr@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
-  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
-
-pseudomap@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
-  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
-
-psl@^1.1.28:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
-  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
-
-public-encrypt@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
-  integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==
-  dependencies:
-    bn.js "^4.1.0"
-    browserify-rsa "^4.0.0"
-    create-hash "^1.1.0"
-    parse-asn1 "^5.0.0"
-    randombytes "^2.0.1"
-    safe-buffer "^5.1.2"
-
-pump@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
-  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
-pump@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
-  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
-pumpify@^1.3.3:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
-  integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
-  dependencies:
-    duplexify "^3.6.0"
-    inherits "^2.0.3"
-    pump "^2.0.0"
-
-punycode@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
-
-punycode@^1.2.4:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
-
-punycode@^2.1.0, punycode@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-
-purgecss@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/purgecss/-/purgecss-2.3.0.tgz#5327587abf5795e6541517af8b190a6fb5488bb3"
-  integrity sha512-BE5CROfVGsx2XIhxGuZAT7rTH9lLeQx/6M0P7DTXQH4IUc3BBzs9JUzt4yzGf3JrH9enkeq6YJBe9CTtkm1WmQ==
-  dependencies:
-    commander "^5.0.0"
-    glob "^7.0.0"
-    postcss "7.0.32"
-    postcss-selector-parser "^6.0.2"
-
-q@1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
-  integrity sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=
-
-q@^1.4.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
-  integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
-
-qjobs@^1.1.4:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
-  integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==
-
-qs@6.7.0:
-  version "6.7.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
-  integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
-
-qs@~6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
-  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
-
-query-string@^4.1.0:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
-  integrity sha1-u7aTucqRXCMlFbIosaArYJBD2+s=
-  dependencies:
-    object-assign "^4.1.0"
-    strict-uri-encode "^1.0.0"
-
-querystring-es3@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
-  integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
-
-querystring@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
-  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
-
-querystringify@^2.1.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
-  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
-
-queue-microtask@^1.2.2:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
-  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
-
-quill-delta@^3.6.2:
-  version "3.6.3"
-  resolved "https://registry.yarnpkg.com/quill-delta/-/quill-delta-3.6.3.tgz#b19fd2b89412301c60e1ff213d8d860eac0f1032"
-  integrity sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg==
-  dependencies:
-    deep-equal "^1.0.1"
-    extend "^3.0.2"
-    fast-diff "1.1.2"
-
-quill-delta@^4.0.1:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/quill-delta/-/quill-delta-4.2.2.tgz#015397d046e0a3bed087cd8a51f98c11a1b8f351"
-  integrity sha512-qjbn82b/yJzOjstBgkhtBjN2TNK+ZHP/BgUQO+j6bRhWQQdmj2lH6hXG7+nwwLF41Xgn//7/83lxs9n2BkTtTg==
-  dependencies:
-    fast-diff "1.2.0"
-    lodash.clonedeep "^4.5.0"
-    lodash.isequal "^4.5.0"
-
-quill@^1.3.7:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/quill/-/quill-1.3.7.tgz#da5b2f3a2c470e932340cdbf3668c9f21f9286e8"
-  integrity sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==
-  dependencies:
-    clone "^2.1.1"
-    deep-equal "^1.0.1"
-    eventemitter3 "^2.0.3"
-    extend "^3.0.2"
-    parchment "^1.1.4"
-    quill-delta "^3.6.2"
-
-raf@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39"
-  integrity sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==
-  dependencies:
-    performance-now "^2.1.0"
-
-randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
-  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
-  dependencies:
-    safe-buffer "^5.1.0"
-
-randomfill@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
-  integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
-  dependencies:
-    randombytes "^2.0.5"
-    safe-buffer "^5.1.0"
-
-range-parser@^1.2.0, range-parser@^1.2.1, range-parser@~1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
-  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
-
-raw-body@2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
-  integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
-  dependencies:
-    bytes "3.1.0"
-    http-errors "1.7.2"
-    iconv-lite "0.4.24"
-    unpipe "1.0.0"
-
-raw-loader@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-3.1.0.tgz#5e9d399a5a222cc0de18f42c3bc5e49677532b3f"
-  integrity sha512-lzUVMuJ06HF4rYveaz9Tv0WRlUMxJ0Y1hgSkkgg+50iEdaI0TthyEDe08KIHb0XsF6rn8WYTqPCaGTZg3sX+qA==
-  dependencies:
-    loader-utils "^1.1.0"
-    schema-utils "^2.0.1"
-
-rc@^1.2.8:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
-  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
-  dependencies:
-    deep-extend "^0.6.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
-
-read-cache@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
-  integrity sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=
-  dependencies:
-    pify "^2.3.0"
-
-read-package-json@^2.0.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.1.2.tgz#6992b2b66c7177259feb8eaac73c3acd28b9222a"
-  integrity sha512-D1KmuLQr6ZSJS0tW8hf3WGpRlwszJOXZ3E8Yd/DNRaM5d+1wVRZdHlpGBLAuovjr28LbWvjpWkBHMxpRGGjzNA==
-  dependencies:
-    glob "^7.1.1"
-    json-parse-even-better-errors "^2.3.0"
-    normalize-package-data "^2.0.0"
-    npm-normalize-package-bin "^1.0.0"
-
-read-package-tree@5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.3.1.tgz#a32cb64c7f31eb8a6f31ef06f9cedf74068fe636"
-  integrity sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw==
-  dependencies:
-    read-package-json "^2.0.0"
-    readdir-scoped-modules "^1.0.0"
-    util-promisify "^2.1.0"
-
-read-pkg-up@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-5.0.0.tgz#b6a6741cb144ed3610554f40162aa07a6db621b8"
-  integrity sha512-XBQjqOBtTzyol2CpsQOw8LHV0XbDZVG7xMMjmXAJomlVY03WOBRmYgDJETlvcg0H63AJvPRwT7GFi5rvOzUOKg==
-  dependencies:
-    find-up "^3.0.0"
-    read-pkg "^5.0.0"
-
-read-pkg@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
-  integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
-  dependencies:
-    "@types/normalize-package-data" "^2.4.0"
-    normalize-package-data "^2.5.0"
-    parse-json "^5.0.0"
-    type-fest "^0.6.0"
-
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
-  version "2.3.7"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
-  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
-readable-stream@^3.0.6, readable-stream@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
-  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
-readdir-scoped-modules@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309"
-  integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==
-  dependencies:
-    debuglog "^1.0.1"
-    dezalgo "^1.0.0"
-    graceful-fs "^4.1.2"
-    once "^1.3.0"
-
-readdirp@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
-  integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
-  dependencies:
-    graceful-fs "^4.1.11"
-    micromatch "^3.1.10"
-    readable-stream "^2.0.2"
-
-readdirp@~3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"
-  integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==
-  dependencies:
-    picomatch "^2.2.1"
-
-reduce-css-calc@^2.1.6:
-  version "2.1.8"
-  resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-2.1.8.tgz#7ef8761a28d614980dc0c982f772c93f7a99de03"
-  integrity sha512-8liAVezDmUcH+tdzoEGrhfbGcP7nOV4NkGE3a74+qqvE7nt9i4sKLGBuZNOnpI4WiGksiNPklZxva80061QiPg==
-  dependencies:
-    css-unit-converter "^1.1.1"
-    postcss-value-parser "^3.3.0"
-
-reflect-metadata@^0.1.12, reflect-metadata@^0.1.2:
-  version "0.1.13"
-  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08"
-  integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==
-
-regenerate-unicode-properties@^8.2.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
-  integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==
-  dependencies:
-    regenerate "^1.4.0"
-
-regenerate@^1.4.0:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
-  integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
-
-regenerator-runtime@0.13.3:
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"
-  integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==
-
-regenerator-runtime@^0.13.4:
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
-  integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==
-
-regenerator-runtime@^0.13.7:
-  version "0.13.9"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
-  integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
-
-regenerator-transform@^0.14.2:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4"
-  integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==
-  dependencies:
-    "@babel/runtime" "^7.8.4"
-
-regex-not@^1.0.0, regex-not@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
-  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
-  dependencies:
-    extend-shallow "^3.0.2"
-    safe-regex "^1.1.0"
-
-regexp.prototype.flags@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26"
-  integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-
-regexpu-core@^4.7.1:
-  version "4.7.1"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"
-  integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==
-  dependencies:
-    regenerate "^1.4.0"
-    regenerate-unicode-properties "^8.2.0"
-    regjsgen "^0.5.1"
-    regjsparser "^0.6.4"
-    unicode-match-property-ecmascript "^1.0.4"
-    unicode-match-property-value-ecmascript "^1.2.0"
-
-registry-auth-token@^4.0.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250"
-  integrity sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==
-  dependencies:
-    rc "^1.2.8"
-
-registry-url@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009"
-  integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==
-  dependencies:
-    rc "^1.2.8"
-
-regjsgen@^0.5.1:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
-  integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==
-
-regjsparser@^0.6.4:
-  version "0.6.9"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.9.tgz#b489eef7c9a2ce43727627011429cf833a7183e6"
-  integrity sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==
-  dependencies:
-    jsesc "~0.5.0"
-
-remove-trailing-separator@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
-
-remove@^0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/remove/-/remove-0.1.5.tgz#095ffd827d65c9f41ad97d33e416a75811079955"
-  integrity sha1-CV/9gn1lyfQa2X0z5BanWBEHmVU=
-  dependencies:
-    seq ">= 0.3.5"
-
-repeat-element@^1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9"
-  integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==
-
-repeat-string@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-0.2.2.tgz#c7a8d3236068362059a7e4651fc6884e8b1fb4ae"
-  integrity sha512-yHeI3F9v20MY+8/5WAUgIWseMZwpLD+l9h5hGyzh6fQjhle2AwjjRDao1m5IozSDuVvMw09/mvE8AU1oDmZKpQ==
-
-repeat-string@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
-
-request@^2.55.0, request@^2.83.0, request@^2.87.0, request@^2.88.2:
-  version "2.88.2"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
-  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.3"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.5.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
-
-require-directory@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
-
-require-main-filename@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
-  integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
-
-require-main-filename@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
-  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
-
-requires-port@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
-
-resolve-cwd@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
-  integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=
-  dependencies:
-    resolve-from "^3.0.0"
-
-resolve-from@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
-  integrity sha1-six699nWiBvItuZTM17rywoYh0g=
-
-resolve-from@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
-  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
-
-resolve-url@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
-  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
-
-resolve@^1.1.7, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.11.1, resolve@^1.14.2, resolve@^1.3.2:
-  version "1.20.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
-  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
-  dependencies:
-    is-core-module "^2.2.0"
-    path-parse "^1.0.6"
-
-resolve@~1.1.6:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
-  integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
-
-responselike@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
-  integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=
-  dependencies:
-    lowercase-keys "^1.0.0"
-
-restore-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
-  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
-  dependencies:
-    onetime "^5.1.0"
-    signal-exit "^3.0.2"
-
-ret@~0.1.10:
-  version "0.1.15"
-  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
-  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
-
-retry@^0.10.0:
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
-  integrity sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=
-
-retry@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
-  integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=
-
-reusify@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
-  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
-
-rfdc@^1.1.2, rfdc@^1.1.4:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b"
-  integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==
-
-rgbcolor@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/rgbcolor/-/rgbcolor-1.0.1.tgz#d6505ecdb304a6595da26fa4b43307306775945d"
-  integrity sha1-1lBezbMEplldom+ktDMHMGd1lF0=
-
-rimraf@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.0.tgz#614176d4b3010b75e5c390eb0ee96f6dc0cebb9b"
-  integrity sha512-NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg==
-  dependencies:
-    glob "^7.1.3"
-
-rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.2, rimraf@^2.6.3:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
-  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
-  dependencies:
-    glob "^7.1.3"
-
-rimraf@^3.0.0, rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
-ripemd160@^2.0.0, ripemd160@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
-  integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
-  dependencies:
-    hash-base "^3.0.0"
-    inherits "^2.0.1"
-
-rollup-plugin-commonjs@^10.0.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-10.1.0.tgz#417af3b54503878e084d127adf4d1caf8beb86fb"
-  integrity sha512-jlXbjZSQg8EIeAAvepNwhJj++qJWNJw1Cl0YnOqKtP5Djx+fFGkp3WRh+W0ASCaFG5w1jhmzDxgu3SJuVxPF4Q==
-  dependencies:
-    estree-walker "^0.6.1"
-    is-reference "^1.1.2"
-    magic-string "^0.25.2"
-    resolve "^1.11.0"
-    rollup-pluginutils "^2.8.1"
-
-rollup-plugin-json@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-json/-/rollup-plugin-json-4.0.0.tgz#a18da0a4b30bf5ca1ee76ddb1422afbb84ae2b9e"
-  integrity sha512-hgb8N7Cgfw5SZAkb3jf0QXii6QX/FOkiIq2M7BAQIEydjHvTyxXHQiIzZaTFgx1GK0cRCHOCBHIyEkkLdWKxow==
-  dependencies:
-    rollup-pluginutils "^2.5.0"
-
-rollup-plugin-node-resolve@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-5.2.0.tgz#730f93d10ed202473b1fb54a5997a7db8c6d8523"
-  integrity sha512-jUlyaDXts7TW2CqQ4GaO5VJ4PwwaV8VUGA7+km3n6k6xtOEacf61u0VXwN80phY/evMcaS+9eIeJ9MOyDxt5Zw==
-  dependencies:
-    "@types/resolve" "0.0.8"
-    builtin-modules "^3.1.0"
-    is-module "^1.0.0"
-    resolve "^1.11.1"
-    rollup-pluginutils "^2.8.1"
-
-rollup-plugin-replace@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-replace/-/rollup-plugin-replace-2.2.0.tgz#f41ae5372e11e7a217cde349c8b5d5fd115e70e3"
-  integrity sha512-/5bxtUPkDHyBJAKketb4NfaeZjL5yLZdeUihSfbF2PQMz+rSTEb8ARKoOl3UBT4m7/X+QOXJo3sLTcq+yMMYTA==
-  dependencies:
-    magic-string "^0.25.2"
-    rollup-pluginutils "^2.6.0"
-
-rollup-plugin-sourcemaps@^0.4.2:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.4.2.tgz#62125aa94087aadf7b83ef4dfaf629b473135e87"
-  integrity sha1-YhJaqUCHqt97g+9N+vYptHMTXoc=
-  dependencies:
-    rollup-pluginutils "^2.0.1"
-    source-map-resolve "^0.5.0"
-
-rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.5.0, rollup-pluginutils@^2.6.0, rollup-pluginutils@^2.8.1:
-  version "2.8.2"
-  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"
-  integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==
-  dependencies:
-    estree-walker "^0.6.1"
-
-rollup@1.25.2:
-  version "1.25.2"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.25.2.tgz#739f508bd8f7ece52bb6c1fcda83466af82b7f6d"
-  integrity sha512-+7z6Wab/L45QCPcfpuTZKwKiB0tynj05s/+s2U3F2Bi7rOLPr9UcjUwO7/xpjlPNXA/hwnth6jBExFRGyf3tMg==
-  dependencies:
-    "@types/estree" "*"
-    "@types/node" "*"
-    acorn "^7.1.0"
-
-run-async@^2.2.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
-  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
-
-run-parallel@^1.1.9:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
-  integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
-  dependencies:
-    queue-microtask "^1.2.2"
-
-run-queue@^1.0.0, run-queue@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
-  integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=
-  dependencies:
-    aproba "^1.1.1"
-
-rust-result@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/rust-result/-/rust-result-1.0.0.tgz#34c75b2e6dc39fe5875e5bdec85b5e0f91536f72"
-  integrity sha1-NMdbLm3Dn+WHXlveyFteD5FTb3I=
-  dependencies:
-    individual "^2.0.0"
-
-rw@1:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
-  integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q=
-
-rxjs@6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
-  integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
-  dependencies:
-    tslib "^1.9.0"
-
-rxjs@^6.0.0, rxjs@^6.4.0:
-  version "6.6.7"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
-  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
-  dependencies:
-    tslib "^1.9.0"
-
-rxjs@~6.3.3:
-  version "6.3.3"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55"
-  integrity sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==
-  dependencies:
-    tslib "^1.9.0"
-
-rxjs@~6.5.2:
-  version "6.5.5"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz#c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec"
-  integrity sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==
-  dependencies:
-    tslib "^1.9.0"
-
-safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
-safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
-safe-json-parse@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-4.0.0.tgz#7c0f578cfccd12d33a71c0e05413e2eca171eaac"
-  integrity sha1-fA9XjPzNEtM6ccDgVBPi7KFx6qw=
-  dependencies:
-    rust-result "^1.0.0"
-
-safe-regex@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
-  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
-  dependencies:
-    ret "~0.1.10"
-
-"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@^2.1.2, safer-buffer@~2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-
-sass-loader@7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.2.0.tgz#e34115239309d15b2527cb62b5dfefb62a96ff7f"
-  integrity sha512-h8yUWaWtsbuIiOCgR9fd9c2lRXZ2uG+h8Dzg/AGNj+Hg/3TO8+BBAW9mEP+mh8ei+qBKqSJ0F1FLlYjNBc61OA==
-  dependencies:
-    clone-deep "^4.0.1"
-    loader-utils "^1.0.1"
-    neo-async "^2.5.0"
-    pify "^4.0.1"
-    semver "^5.5.0"
-
-sass@1.22.9:
-  version "1.22.9"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.22.9.tgz#41a2ed6038027f58be2bd5041293452a29c2cb84"
-  integrity sha512-FzU1X2V8DlnqabrL4u7OBwD2vcOzNMongEJEx3xMEhWY/v26FFR3aG0hyeu2T965sfR0E9ufJwmG+Qjz78vFPQ==
-  dependencies:
-    chokidar ">=2.0.0 <4.0.0"
-
-sass@^1.17.3:
-  version "1.32.13"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.13.tgz#8d29c849e625a415bce71609c7cf95e15f74ed00"
-  integrity sha512-dEgI9nShraqP7cXQH+lEXVf73WOPCse0QlFzSD8k+1TcOxCMwVXfQlr0jtoluZysQOyJGnfr21dLvYKDJq8HkA==
-  dependencies:
-    chokidar ">=3.0.0 <4.0.0"
-
-saucelabs@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/saucelabs/-/saucelabs-1.5.0.tgz#9405a73c360d449b232839919a86c396d379fd9d"
-  integrity sha512-jlX3FGdWvYf4Q3LFfFWS1QvPg3IGCGWxIc8QBFdPTbpTJnt/v17FHXYVAn7C8sHf1yUXo2c7yIM0isDryfYtHQ==
-  dependencies:
-    https-proxy-agent "^2.2.1"
-
-sax@0.5.x:
-  version "0.5.8"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
-  integrity sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=
-
-sax@>=0.6.0, sax@^1.1.4, sax@~1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
-  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
-
-schema-utils@^0.4.0:
-  version "0.4.7"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
-  integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
-  dependencies:
-    ajv "^6.1.0"
-    ajv-keywords "^3.1.0"
-
-schema-utils@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
-  integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==
-  dependencies:
-    ajv "^6.1.0"
-    ajv-errors "^1.0.0"
-    ajv-keywords "^3.1.0"
-
-schema-utils@^2.0.0, schema-utils@^2.0.1, schema-utils@^2.6.1, schema-utils@^2.6.6, schema-utils@^2.7.0:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
-  integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==
-  dependencies:
-    "@types/json-schema" "^7.0.5"
-    ajv "^6.12.4"
-    ajv-keywords "^3.5.2"
-
-select-hose@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
-  integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
-
-selenium-webdriver@3.6.0, selenium-webdriver@^3.0.1:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-3.6.0.tgz#2ba87a1662c020b8988c981ae62cb2a01298eafc"
-  integrity sha512-WH7Aldse+2P5bbFBO4Gle/nuQOdVwpHMTL6raL3uuBj/vPG07k6uzt3aiahu352ONBr5xXh0hDlM3LhtXPOC4Q==
-  dependencies:
-    jszip "^3.1.3"
-    rimraf "^2.5.4"
-    tmp "0.0.30"
-    xml2js "^0.4.17"
-
-selfsigned@^1.10.7:
-  version "1.10.11"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.11.tgz#24929cd906fe0f44b6d01fb23999a739537acbe9"
-  integrity sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA==
-  dependencies:
-    node-forge "^0.10.0"
-
-semver-compare@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
-  integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
-
-semver-diff@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"
-  integrity sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=
-  dependencies:
-    semver "^5.0.3"
-
-semver-dsl@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/semver-dsl/-/semver-dsl-1.0.1.tgz#d3678de5555e8a61f629eed025366ae5f27340a0"
-  integrity sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=
-  dependencies:
-    semver "^5.3.0"
-
-semver-intersect@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/semver-intersect/-/semver-intersect-1.4.0.tgz#bdd9c06bedcdd2fedb8cd352c3c43ee8c61321f3"
-  integrity sha512-d8fvGg5ycKAq0+I6nfWeCx6ffaWJCsBYU0H2Rq56+/zFePYfT8mXkB3tWBSjR5BerkHNZ5eTPIk1/LBYas35xQ==
-  dependencies:
-    semver "^5.0.0"
-
-semver-regex@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.2.tgz#34b4c0d361eef262e07199dbef316d0f2ab11807"
-  integrity sha512-bXWyL6EAKOJa81XG1OZ/Yyuq+oT0b2YLlxx7c+mrdYPaPbnj6WgVULXhinMIeZGufuUBu/eVRqXEhiv4imfwxA==
-
-"semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.0.3, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-
-semver@6.3.0, semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-
-semver@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
-  integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
-
-send@0.17.1:
-  version "0.17.1"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
-  integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==
-  dependencies:
-    debug "2.6.9"
-    depd "~1.1.2"
-    destroy "~1.0.4"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    fresh "0.5.2"
-    http-errors "~1.7.2"
-    mime "1.6.0"
-    ms "2.1.1"
-    on-finished "~2.3.0"
-    range-parser "~1.2.1"
-    statuses "~1.5.0"
-
-"seq@>= 0.3.5":
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/seq/-/seq-0.3.5.tgz#ae02af3a424793d8ccbf212d69174e0c54dffe38"
-  integrity sha1-rgKvOkJHk9jMvyEtaRdODFTf/jg=
-  dependencies:
-    chainsaw ">=0.0.7 <0.1"
-    hashish ">=0.0.2 <0.1"
-
-serialize-javascript@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-3.1.0.tgz#8bf3a9170712664ef2561b44b691eafe399214ea"
-  integrity sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==
-  dependencies:
-    randombytes "^2.1.0"
-
-serialize-javascript@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
-  integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==
-  dependencies:
-    randombytes "^2.1.0"
-
-serve-index@^1.9.1:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
-  integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
-  dependencies:
-    accepts "~1.3.4"
-    batch "0.6.1"
-    debug "2.6.9"
-    escape-html "~1.0.3"
-    http-errors "~1.6.2"
-    mime-types "~2.1.17"
-    parseurl "~1.3.2"
-
-serve-static@1.14.1:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
-  integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
-  dependencies:
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    parseurl "~1.3.3"
-    send "0.17.1"
-
-set-blocking@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
-
-set-immediate-shim@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
-  integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
-
-set-value@^2.0.0, set-value@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
-  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.3"
-    split-string "^3.0.1"
-
-setimmediate@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
-
-setprototypeof@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
-  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
-
-setprototypeof@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
-  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
-
-sha.js@^2.4.0, sha.js@^2.4.8:
-  version "2.4.11"
-  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
-  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
-  dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
-shallow-clone@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
-  integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==
-  dependencies:
-    kind-of "^6.0.2"
-
-shebang-command@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
-  dependencies:
-    shebang-regex "^1.0.0"
-
-shebang-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
-
-shepherd.js@^7.1.0:
-  version "7.2.1"
-  resolved "https://registry.yarnpkg.com/shepherd.js/-/shepherd.js-7.2.1.tgz#9973fae7cb595c0c74ae16df5431089f72221680"
-  integrity sha512-IJP2cTv3F7BYjsiN6J+J36s0lKbbBd01p2vKQe2o6EutyVkJd6/Tsr5r+ndMgZ7/aJT7rEb6YkvNWqBfAkcX+A==
-  dependencies:
-    "@popperjs/core" "^2.4.0"
-    deepmerge "^4.2.2"
-    smoothscroll-polyfill "^0.4.4"
-
-signal-exit@^3.0.0, signal-exit@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
-  integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
-
-simple-swizzle@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
-  integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=
-  dependencies:
-    is-arrayish "^0.3.1"
-
-sirv@^1.0.7:
-  version "1.0.19"
-  resolved "https://registry.yarnpkg.com/sirv/-/sirv-1.0.19.tgz#1d73979b38c7fe91fcba49c85280daa9c2363b49"
-  integrity sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ==
-  dependencies:
-    "@polka/url" "^1.0.0-next.20"
-    mrmime "^1.0.0"
-    totalist "^1.0.0"
-
-slash@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
-  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
-
-smart-buffer@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.1.0.tgz#91605c25d91652f4661ea69ccf45f1b331ca21ba"
-  integrity sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==
-
-smoothscroll-polyfill@^0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/smoothscroll-polyfill/-/smoothscroll-polyfill-0.4.4.tgz#3a259131dc6930e6ca80003e1cb03b603b69abf8"
-  integrity sha512-TK5ZA9U5RqCwMpfoMq/l1mrH0JAR7y7KRvOBx0n2869aLxch+gT9GhN3yUfjiw+d/DiF1mKo14+hd62JyMmoBg==
-
-snapdragon-node@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
-  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
-  dependencies:
-    define-property "^1.0.0"
-    isobject "^3.0.0"
-    snapdragon-util "^3.0.1"
-
-snapdragon-util@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
-  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
-  dependencies:
-    kind-of "^3.2.0"
-
-snapdragon@^0.8.1:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
-  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
-  dependencies:
-    base "^0.11.1"
-    debug "^2.2.0"
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    map-cache "^0.2.2"
-    source-map "^0.5.6"
-    source-map-resolve "^0.5.0"
-    use "^3.1.0"
-
-socket.io-adapter@~1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9"
-  integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==
-
-socket.io-client@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.1.1.tgz#dcb38103436ab4578ddb026638ae2f21b623671f"
-  integrity sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==
-  dependencies:
-    backo2 "1.0.2"
-    base64-arraybuffer "0.1.5"
-    component-bind "1.0.0"
-    component-emitter "1.2.1"
-    debug "~3.1.0"
-    engine.io-client "~3.2.0"
-    has-binary2 "~1.0.2"
-    has-cors "1.1.0"
-    indexof "0.0.1"
-    object-component "0.0.3"
-    parseqs "0.0.5"
-    parseuri "0.0.5"
-    socket.io-parser "~3.2.0"
-    to-array "0.1.4"
-
-socket.io-parser@~3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.2.0.tgz#e7c6228b6aa1f814e6148aea325b51aa9499e077"
-  integrity sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==
-  dependencies:
-    component-emitter "1.2.1"
-    debug "~3.1.0"
-    isarray "2.0.1"
-
-socket.io@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.1.1.tgz#a069c5feabee3e6b214a75b40ce0652e1cfb9980"
-  integrity sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==
-  dependencies:
-    debug "~3.1.0"
-    engine.io "~3.2.0"
-    has-binary2 "~1.0.2"
-    socket.io-adapter "~1.1.0"
-    socket.io-client "2.1.1"
-    socket.io-parser "~3.2.0"
-
-sockjs-client@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.4.0.tgz#c9f2568e19c8fd8173b4997ea3420e0bb306c7d5"
-  integrity sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==
-  dependencies:
-    debug "^3.2.5"
-    eventsource "^1.0.7"
-    faye-websocket "~0.11.1"
-    inherits "^2.0.3"
-    json3 "^3.3.2"
-    url-parse "^1.4.3"
-
-sockjs@0.3.20:
-  version "0.3.20"
-  resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.20.tgz#b26a283ec562ef8b2687b44033a4eeceac75d855"
-  integrity sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==
-  dependencies:
-    faye-websocket "^0.10.0"
-    uuid "^3.4.0"
-    websocket-driver "0.6.5"
-
-socks-proxy-agent@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz#3c8991f3145b2799e70e11bd5fbc8b1963116386"
-  integrity sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==
-  dependencies:
-    agent-base "~4.2.1"
-    socks "~2.3.2"
-
-socks@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.3.3.tgz#01129f0a5d534d2b897712ed8aceab7ee65d78e3"
-  integrity sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==
-  dependencies:
-    ip "1.1.5"
-    smart-buffer "^4.1.0"
-
-sort-keys@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
-  integrity sha1-RBttTTRnmPG05J6JIK37oOVD+a0=
-  dependencies:
-    is-plain-obj "^1.0.0"
-
-source-list-map@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
-  integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
-
-source-list-map@~0.1.7:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
-  integrity sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=
-
-source-map-loader@0.2.4:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-0.2.4.tgz#c18b0dc6e23bf66f6792437557c569a11e072271"
-  integrity sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==
-  dependencies:
-    async "^2.5.0"
-    loader-utils "^1.1.0"
-
-source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
-  integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
-  dependencies:
-    atob "^2.1.2"
-    decode-uri-component "^0.2.0"
-    resolve-url "^0.2.1"
-    source-map-url "^0.4.0"
-    urix "^0.1.0"
-
-source-map-support@0.5.13:
-  version "0.5.13"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
-  integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map-support@^0.5.5, source-map-support@^0.5.6, source-map-support@~0.5.12:
-  version "0.5.19"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
-  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map-support@~0.4.0:
-  version "0.4.18"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
-  integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==
-  dependencies:
-    source-map "^0.5.6"
-
-source-map-url@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
-  integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
-
-source-map@0.1.x:
-  version "0.1.43"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
-  integrity sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=
-  dependencies:
-    amdefine ">=0.0.4"
-
-source-map@0.7.3, source-map@^0.7.3:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
-  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
-
-source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
-
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-
-source-map@~0.4.1:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
-  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
-  dependencies:
-    amdefine ">=0.0.4"
-
-sourcemap-codec@^1.4.4:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
-  integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
-
-spdx-correct@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
-  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
-  dependencies:
-    spdx-expression-parse "^3.0.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-exceptions@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
-  integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
-
-spdx-expression-parse@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
-  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
-  dependencies:
-    spdx-exceptions "^2.1.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-license-ids@^3.0.0:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65"
-  integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==
-
-spdy-transport@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31"
-  integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==
-  dependencies:
-    debug "^4.1.0"
-    detect-node "^2.0.4"
-    hpack.js "^2.1.6"
-    obuf "^1.1.2"
-    readable-stream "^3.0.6"
-    wbuf "^1.7.3"
-
-spdy@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b"
-  integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==
-  dependencies:
-    debug "^4.1.0"
-    handle-thing "^2.0.0"
-    http-deceiver "^1.2.7"
-    select-hose "^2.0.0"
-    spdy-transport "^3.0.0"
-
-speed-measure-webpack-plugin@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz#69840a5cdc08b4638697dac7db037f595d7f36a0"
-  integrity sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==
-  dependencies:
-    chalk "^2.0.1"
-
-split-string@^3.0.1, split-string@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
-  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
-  dependencies:
-    extend-shallow "^3.0.0"
-
-sprintf-js@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
-  integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
-
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
-
-ssf@~0.10.2:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/ssf/-/ssf-0.10.3.tgz#8eae1fc29c90a552e7921208f81892d6f77acb2b"
-  integrity sha512-pRuUdW0WwyB2doSqqjWyzwCD6PkfxpHAHdZp39K3dp/Hq7f+xfMwNAWIi16DyrRg4gg9c/RvLYkJTSawTPTm1w==
-  dependencies:
-    frac "~1.1.2"
-
-ssf@~0.11.2:
-  version "0.11.2"
-  resolved "https://registry.yarnpkg.com/ssf/-/ssf-0.11.2.tgz#0b99698b237548d088fc43cdf2b70c1a7512c06c"
-  integrity sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==
-  dependencies:
-    frac "~1.1.2"
-
-sshpk@^1.7.0:
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
-  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    bcrypt-pbkdf "^1.0.0"
-    dashdash "^1.12.0"
-    ecc-jsbn "~0.1.1"
-    getpass "^0.1.1"
-    jsbn "~0.1.0"
-    safer-buffer "^2.0.2"
-    tweetnacl "~0.14.0"
-
-ssri@^6.0.0, ssri@^6.0.1:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5"
-  integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==
-  dependencies:
-    figgy-pudding "^3.5.1"
-
-ssri@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
-  integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
-  dependencies:
-    minipass "^3.1.1"
-
-stackblur-canvas@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/stackblur-canvas/-/stackblur-canvas-1.4.1.tgz#849aa6f94b272ff26f6471fa4130ed1f7e47955b"
-  integrity sha1-hJqm+UsnL/JvZHH6QTDtH35HlVs=
-
-stackblur-canvas@^2.0.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/stackblur-canvas/-/stackblur-canvas-2.5.0.tgz#aa87bbed1560fdcd3138fff344fc6a1c413ebac4"
-  integrity sha512-EeNzTVfj+1In7aSLPKDD03F/ly4RxEuF/EX0YcOG0cKoPXs+SLZxDawQbexQDBzwROs4VKLWTOaZQlZkGBFEIQ==
-
-stackblur@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/stackblur/-/stackblur-1.0.0.tgz#b407a7e05c93b08d66883bb808d7cba3a503f12f"
-  integrity sha1-tAen4FyTsI1miDu4CNfLo6UD8S8=
-
-static-extend@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
-  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
-  dependencies:
-    define-property "^0.2.5"
-    object-copy "^0.1.0"
-
-"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
-  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
-
-stream-browserify@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
-  integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==
-  dependencies:
-    inherits "~2.0.1"
-    readable-stream "^2.0.2"
-
-stream-each@^1.1.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
-  integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==
-  dependencies:
-    end-of-stream "^1.1.0"
-    stream-shift "^1.0.0"
-
-stream-http@^2.7.2:
-  version "2.8.3"
-  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
-  integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==
-  dependencies:
-    builtin-status-codes "^3.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.3.6"
-    to-arraybuffer "^1.0.0"
-    xtend "^4.0.0"
-
-stream-shift@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
-  integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
-
-streamroller@0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-0.7.0.tgz#a1d1b7cf83d39afb0d63049a5acbf93493bdf64b"
-  integrity sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==
-  dependencies:
-    date-format "^1.2.0"
-    debug "^3.1.0"
-    mkdirp "^0.5.1"
-    readable-stream "^2.3.0"
-
-streamroller@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-1.0.6.tgz#8167d8496ed9f19f05ee4b158d9611321b8cacd9"
-  integrity sha512-3QC47Mhv3/aZNFpDDVO44qQb9gwB9QggMEE0sQmkTAwBVYdBRWISdsywlkfm5II1Q5y/pmrHflti/IgmIzdDBg==
-  dependencies:
-    async "^2.6.2"
-    date-format "^2.0.0"
-    debug "^3.2.6"
-    fs-extra "^7.0.1"
-    lodash "^4.17.14"
-
-strict-uri-encode@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
-  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
-
-string-width@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
-string-width@^2.0.0, string-width@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
-
-string-width@^3.0.0, string-width@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
-  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
-  dependencies:
-    emoji-regex "^7.0.1"
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^5.1.0"
-
-string-width@^4.1.0:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"
-  integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.0"
-
-string.prototype.trimend@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
-  integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-
-string.prototype.trimstart@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
-  integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-
-string_decoder@^1.0.0, string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
-  dependencies:
-    safe-buffer "~5.1.0"
-
-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
-  dependencies:
-    ansi-regex "^2.0.0"
-
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
-  dependencies:
-    ansi-regex "^3.0.0"
-
-strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
-  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
-  dependencies:
-    ansi-regex "^4.1.0"
-
-strip-ansi@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
-  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
-  dependencies:
-    ansi-regex "^5.0.0"
-
-strip-bom@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
-
-strip-eof@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
-
-strip-json-comments@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
-
-style-loader@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.0.0.tgz#1d5296f9165e8e2c85d24eee0b7caf9ec8ca1f82"
-  integrity sha512-B0dOCFwv7/eY31a5PCieNwMgMhVGFe9w+rh7s/Bx8kfFkrth9zfTZquoYvdw8URgiqxObQKcpW51Ugz1HjfdZw==
-  dependencies:
-    loader-utils "^1.2.3"
-    schema-utils "^2.0.1"
-
-stylus-loader@3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-3.0.2.tgz#27a706420b05a38e038e7cacb153578d450513c6"
-  integrity sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==
-  dependencies:
-    loader-utils "^1.0.2"
-    lodash.clonedeep "^4.5.0"
-    when "~3.6.x"
-
-stylus@0.54.5:
-  version "0.54.5"
-  resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.5.tgz#42b9560931ca7090ce8515a798ba9e6aa3d6dc79"
-  integrity sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=
-  dependencies:
-    css-parse "1.7.x"
-    debug "*"
-    glob "7.0.x"
-    mkdirp "0.5.x"
-    sax "0.5.x"
-    source-map "0.1.x"
-
-stylus@^0.54.5:
-  version "0.54.8"
-  resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.8.tgz#3da3e65966bc567a7b044bfe0eece653e099d147"
-  integrity sha512-vr54Or4BZ7pJafo2mpf0ZcwA74rpuYCZbxrHBsH8kbcXOwSfvBFwsRfpGO5OD5fhG5HDCFW737PKaawI7OqEAg==
-  dependencies:
-    css-parse "~2.0.0"
-    debug "~3.1.0"
-    glob "^7.1.6"
-    mkdirp "~1.0.4"
-    safer-buffer "^2.1.2"
-    sax "~1.2.4"
-    semver "^6.3.0"
-    source-map "^0.7.3"
-
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
-
-supports-color@^5.3.0, supports-color@^5.4.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
-  dependencies:
-    has-flag "^3.0.0"
-
-supports-color@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
-  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
-  dependencies:
-    has-flag "^3.0.0"
-
-supports-color@^7.0.0, supports-color@^7.1.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
-  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
-  dependencies:
-    has-flag "^4.0.0"
-
-svg-pathdata@^6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/svg-pathdata/-/svg-pathdata-6.0.3.tgz#80b0e0283b652ccbafb69ad4f8f73e8d3fbf2cac"
-  integrity sha512-qsjeeq5YjBZ5eMdFuUa4ZosMLxgr5RZ+F+Y1OrDhuOCEInRMA3x74XdBtggJcj9kOeInz0WE+LgCPDkZFlBYJw==
-
-symbol-observable@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
-  integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
-
-"symbol-tree@>= 3.1.0 < 4.0.0":
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
-  integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
-
-tailwindcss@^1.1.4:
-  version "1.9.6"
-  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-1.9.6.tgz#0c5089911d24e1e98e592a31bfdb3d8f34ecf1a0"
-  integrity sha512-nY8WYM/RLPqGsPEGEV2z63riyQPcHYZUJpAwdyBzVpxQHOHqHE+F/fvbCeXhdF1+TA5l72vSkZrtYCB9hRcwkQ==
-  dependencies:
-    "@fullhuman/postcss-purgecss" "^2.1.2"
-    autoprefixer "^9.4.5"
-    browserslist "^4.12.0"
-    bytes "^3.0.0"
-    chalk "^3.0.0 || ^4.0.0"
-    color "^3.1.2"
-    detective "^5.2.0"
-    fs-extra "^8.0.0"
-    html-tags "^3.1.0"
-    lodash "^4.17.20"
-    node-emoji "^1.8.1"
-    normalize.css "^8.0.1"
-    object-hash "^2.0.3"
-    postcss "^7.0.11"
-    postcss-functions "^3.0.0"
-    postcss-js "^2.0.0"
-    postcss-nested "^4.1.1"
-    postcss-selector-parser "^6.0.0"
-    postcss-value-parser "^4.1.0"
-    pretty-hrtime "^1.0.3"
-    reduce-css-calc "^2.1.6"
-    resolve "^1.14.2"
-
-tapable@^1.0.0, tapable@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
-  integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
-
-tar@^4.4.8:
-  version "4.4.13"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
-  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
-  dependencies:
-    chownr "^1.1.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.8.6"
-    minizlib "^1.2.1"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.2"
-    yallist "^3.0.3"
-
-tar@^6.0.2:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz#d1724e9bcc04b977b18d5c573b333a2207229a83"
-  integrity sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==
-  dependencies:
-    chownr "^2.0.0"
-    fs-minipass "^2.0.0"
-    minipass "^3.0.0"
-    minizlib "^2.1.1"
-    mkdirp "^1.0.3"
-    yallist "^4.0.0"
-
-term-size@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69"
-  integrity sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=
-  dependencies:
-    execa "^0.7.0"
-
-terser-webpack-plugin@3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-3.0.3.tgz#23bda2687b197f878a743373b9411d917adc2e45"
-  integrity sha512-bZFnotuIKq5Rqzrs+qIwFzGdKdffV9epG5vDSEbYzvKAhPeR5RbbrQysfPgbIIMhNAQtZD2hGwBfSKUXjXZZZw==
-  dependencies:
-    cacache "^15.0.4"
-    find-cache-dir "^3.3.1"
-    jest-worker "^26.0.0"
-    p-limit "^2.3.0"
-    schema-utils "^2.6.6"
-    serialize-javascript "^3.1.0"
-    source-map "^0.6.1"
-    terser "^4.6.13"
-    webpack-sources "^1.4.3"
-
-terser-webpack-plugin@^1.4.1:
-  version "1.4.5"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz#a217aefaea330e734ffacb6120ec1fa312d6040b"
-  integrity sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==
-  dependencies:
-    cacache "^12.0.2"
-    find-cache-dir "^2.1.0"
-    is-wsl "^1.1.0"
-    schema-utils "^1.0.0"
-    serialize-javascript "^4.0.0"
-    source-map "^0.6.1"
-    terser "^4.1.2"
-    webpack-sources "^1.4.0"
-    worker-farm "^1.7.0"
-
-terser@4.6.3:
-  version "4.6.3"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.3.tgz#e33aa42461ced5238d352d2df2a67f21921f8d87"
-  integrity sha512-Lw+ieAXmY69d09IIc/yqeBqXpEQIpDGZqT34ui1QWXIUpR2RjbqEkT8X7Lgex19hslSqcWM5iMN2kM11eMsESQ==
-  dependencies:
-    commander "^2.20.0"
-    source-map "~0.6.1"
-    source-map-support "~0.5.12"
-
-terser@^4.1.2, terser@^4.6.13:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
-  integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
-  dependencies:
-    commander "^2.20.0"
-    source-map "~0.6.1"
-    source-map-support "~0.5.12"
-
-text-segmentation@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/text-segmentation/-/text-segmentation-1.0.3.tgz#52a388159efffe746b24a63ba311b6ac9f2d7943"
-  integrity sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==
-  dependencies:
-    utrie "^1.0.2"
-
-thenify-all@^1.0.0, thenify-all@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
-  integrity sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=
-  dependencies:
-    thenify ">= 3.1.0 < 4"
-
-"thenify@>= 3.1.0 < 4":
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f"
-  integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==
-  dependencies:
-    any-promise "^1.0.0"
-
-three@0.93.0:
-  version "0.93.0"
-  resolved "https://registry.yarnpkg.com/three/-/three-0.93.0.tgz#3fd6c367ef4554abbb6e16ad69936283e895c123"
-  integrity sha1-P9bDZ+9FVKu7bhataZNig+iVwSM=
-
-three@^0.113.2:
-  version "0.113.2"
-  resolved "https://registry.yarnpkg.com/three/-/three-0.113.2.tgz#04791d491fe4359330f9dbe7b767db18bfb35d67"
-  integrity sha512-x3vrKW41/UtbWbWduWKGlfIc043SvHWr3YltehYq+UGb9YglQ2oztNGvl2eut05JtNSmP11Mh3t6Xak5/0e+Fg==
-
-through2@^2.0.0:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
-  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
-  dependencies:
-    readable-stream "~2.3.6"
-    xtend "~4.0.1"
-
-"through@>=2.2.7 <3", through@X.X.X, through@^2.3.6:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
-
-thunky@^1.0.2:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
-  integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==
-
-timers-browserify@^2.0.4:
-  version "2.0.12"
-  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz#44a45c11fbf407f34f97bccd1577c652361b00ee"
-  integrity sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==
-  dependencies:
-    setimmediate "^1.0.4"
-
-timsort@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
-  integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=
-
-tmp@0.0.30:
-  version "0.0.30"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.30.tgz#72419d4a8be7d6ce75148fd8b324e593a711c2ed"
-  integrity sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=
-  dependencies:
-    os-tmpdir "~1.0.1"
-
-tmp@0.0.33, tmp@0.0.x, tmp@^0.0.33:
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
-  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
-  dependencies:
-    os-tmpdir "~1.0.2"
-
-to-array@0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
-  integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA=
-
-to-arraybuffer@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
-  integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
-
-to-fast-properties@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
-  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
-
-to-object-path@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
-  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
-  dependencies:
-    kind-of "^3.0.2"
-
-to-readable-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771"
-  integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==
-
-to-regex-range@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
-  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
-  dependencies:
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
-
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
-
-to-regex@^3.0.1, to-regex@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
-  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
-  dependencies:
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    regex-not "^1.0.2"
-    safe-regex "^1.1.0"
-
-toidentifier@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
-  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
-
-topojson-client@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/topojson-client/-/topojson-client-3.1.0.tgz#22e8b1ed08a2b922feeb4af6f53b6ef09a467b99"
-  integrity sha512-605uxS6bcYxGXw9qi62XyrV6Q3xwbndjachmNxu8HWTtVPxZfEJN9fd/SZS1Q54Sn2y0TMyMxFj/cJINqGHrKw==
-  dependencies:
-    commander "2"
-
-totalist@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/totalist/-/totalist-1.1.0.tgz#a4d65a3e546517701e3e5c37a47a70ac97fe56df"
-  integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==
-
-tough-cookie@^2.2.0, tough-cookie@~2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
-  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
-  dependencies:
-    psl "^1.1.28"
-    punycode "^2.1.1"
-
-tr46@~0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-  integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
-
-traverse@>=0.2.4:
-  version "0.6.6"
-  resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137"
-  integrity sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=
-
-"traverse@>=0.3.0 <0.4":
-  version "0.3.9"
-  resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9"
-  integrity sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=
-
-tree-kill@1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
-  integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
-
-ts-node@~8.3.0:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.3.0.tgz#e4059618411371924a1fb5f3b125915f324efb57"
-  integrity sha512-dyNS/RqyVTDcmNM4NIBAeDMpsAdaQ+ojdf0GOLqE6nwJOgzEkdRNzJywhDfwnuvB10oa6NLVG1rUJQCpRN7qoQ==
-  dependencies:
-    arg "^4.1.0"
-    diff "^4.0.1"
-    make-error "^1.1.1"
-    source-map-support "^0.5.6"
-    yn "^3.0.0"
-
-tsickle@^0.36.0:
-  version "0.36.0"
-  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.36.0.tgz#d6f47cdd14d009f3fea4e8516cd46c1393f3aa02"
-  integrity sha512-lrEMU5e+efx5DXtrRSGsxgkCOVRw4WeVaOkQ2pMIxCZDY5rISagVyP4yi7t6M396POFSbMHgQMT/vz0HmfxWVA==
-  dependencies:
-    minimist "^1.2.0"
-    mkdirp "^0.5.1"
-    source-map "^0.7.3"
-
-tslib@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
-  integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
-
-tslib@1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"
-  integrity sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ==
-
-tslib@^1.10.0, tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
-  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
-
-tslib@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c"
-  integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==
-
-tslint-angular@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/tslint-angular/-/tslint-angular-3.0.3.tgz#872d4fe36497d20582dbe4b8ed3338ff0c922c30"
-  integrity sha512-5xD1gLE89lBExfSbMslDw/ZfOZM0t0CJsoJa4svsgF7tlwVS3IpXjzNcNRN0RZqDBj+cdTlbeel6GpZ3PqpPiw==
-
-tslint-config-airbnb@^5.11.1:
-  version "5.11.2"
-  resolved "https://registry.yarnpkg.com/tslint-config-airbnb/-/tslint-config-airbnb-5.11.2.tgz#2f3d239fa3923be8e7a4372217a7ed552671528f"
-  integrity sha512-mUpHPTeeCFx8XARGG/kzYP4dPSOgoCqNiYbGHh09qTH8q+Y1ghsOgaeZKYYQT7IyxMos523z/QBaiv2zKNBcow==
-  dependencies:
-    tslint-consistent-codestyle "^1.14.1"
-    tslint-eslint-rules "^5.4.0"
-    tslint-microsoft-contrib "~5.2.1"
-
-tslint-consistent-codestyle@^1.14.1:
-  version "1.16.0"
-  resolved "https://registry.yarnpkg.com/tslint-consistent-codestyle/-/tslint-consistent-codestyle-1.16.0.tgz#52348ea899a7e025b37cc6545751c6a566a19077"
-  integrity sha512-ebR/xHyMEuU36hGNOgCfjGBNYxBPixf0yU1Yoo6s3BrpBRFccjPOmIVaVvQsWAUAMdmfzHOCihVkcaMfimqvHw==
-  dependencies:
-    "@fimbul/bifrost" "^0.21.0"
-    tslib "^1.7.1"
-    tsutils "^2.29.0"
-
-tslint-eslint-rules@^5.4.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/tslint-eslint-rules/-/tslint-eslint-rules-5.4.0.tgz#e488cc9181bf193fe5cd7bfca213a7695f1737b5"
-  integrity sha512-WlSXE+J2vY/VPgIcqQuijMQiel+UtmXS+4nvK4ZzlDiqBfXse8FAvkNnTcYhnQyOTW5KFM+uRRGXxYhFpuBc6w==
-  dependencies:
-    doctrine "0.7.2"
-    tslib "1.9.0"
-    tsutils "^3.0.0"
-
-tslint-microsoft-contrib@~5.2.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/tslint-microsoft-contrib/-/tslint-microsoft-contrib-5.2.1.tgz#a6286839f800e2591d041ea2800c77487844ad81"
-  integrity sha512-PDYjvpo0gN9IfMULwKk0KpVOPMhU6cNoT9VwCOLeDl/QS8v8W2yspRpFFuUS7/c5EIH/n8ApMi8TxJAz1tfFUA==
-  dependencies:
-    tsutils "^2.27.2 <2.29.0"
-
-tslint@~5.18.0:
-  version "5.18.0"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.18.0.tgz#f61a6ddcf372344ac5e41708095bbf043a147ac6"
-  integrity sha512-Q3kXkuDEijQ37nXZZLKErssQVnwCV/+23gFEMROi8IlbaBG6tXqLPQJ5Wjcyt/yHPKBC+hD5SzuGaMora+ZS6w==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    builtin-modules "^1.1.1"
-    chalk "^2.3.0"
-    commander "^2.12.1"
-    diff "^3.2.0"
-    glob "^7.1.1"
-    js-yaml "^3.13.1"
-    minimatch "^3.0.4"
-    mkdirp "^0.5.1"
-    resolve "^1.3.2"
-    semver "^5.3.0"
-    tslib "^1.8.0"
-    tsutils "^2.29.0"
-
-tsml@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/tsml/-/tsml-1.0.1.tgz#89f8218b9d9e257f47d7f6b56d01c5a4d2c68fc3"
-  integrity sha1-ifghi52eJX9H1/a1bQHFpNLGj8M=
-
-"tsutils@^2.27.2 <2.29.0":
-  version "2.28.0"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.28.0.tgz#6bd71e160828f9d019b6f4e844742228f85169a1"
-  integrity sha512-bh5nAtW0tuhvOJnx1GLRn5ScraRLICGyJV5wJhtRWOLsxW70Kk5tZtpK3O/hW6LDnqKS9mlUMPZj9fEMJ0gxqA==
-  dependencies:
-    tslib "^1.8.1"
-
-tsutils@^2.29.0:
-  version "2.29.0"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
-  integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==
-  dependencies:
-    tslib "^1.8.1"
-
-tsutils@^3.0.0, tsutils@^3.5.0:
-  version "3.21.0"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
-  integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
-  dependencies:
-    tslib "^1.8.1"
-
-tty-browserify@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
-  integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
-
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
-  dependencies:
-    safe-buffer "^5.0.1"
-
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
-
-type-check@~0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
-  dependencies:
-    prelude-ls "~1.1.2"
-
-type-fest@^0.21.3:
-  version "0.21.3"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
-  integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
-
-type-fest@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1"
-  integrity sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==
-
-type-fest@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
-  integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
-
-type-is@~1.6.17, type-is@~1.6.18:
-  version "1.6.18"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
-  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
-  dependencies:
-    media-typer "0.3.0"
-    mime-types "~2.1.24"
-
-typedarray@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
-
-typeface-roboto@0.0.75:
-  version "0.0.75"
-  resolved "https://registry.yarnpkg.com/typeface-roboto/-/typeface-roboto-0.0.75.tgz#98d5ba35ec234bbc7172374c8297277099cc712b"
-  integrity sha512-VrR/IiH00Z1tFP4vDGfwZ1esNqTiDMchBEXYY9kilT6wRGgFoCAlgkEUMHb1E3mB0FsfZhv756IF0+R+SFPfdg==
-
-typescript-tslint-plugin@^0.5.4:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/typescript-tslint-plugin/-/typescript-tslint-plugin-0.5.5.tgz#673875c43640251f1ab3d63745d7d49726ff961c"
-  integrity sha512-tR5igNQP+6FhxaPJYRlUBVsEl0n5cSuXRbg7L1y80mL4B1jUHb8uiIcbQBJ9zWyypJEdFYFUccpXxvMwZR8+AA==
-  dependencies:
-    minimatch "^3.0.4"
-    mock-require "^3.0.3"
-    vscode-languageserver "^5.2.1"
-
-typescript@3.5.3, typescript@~3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977"
-  integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==
-
-ultron@~1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
-  integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==
-
-unbox-primitive@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
-  integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==
-  dependencies:
-    function-bind "^1.1.1"
-    has-bigints "^1.0.1"
-    has-symbols "^1.0.2"
-    which-boxed-primitive "^1.0.2"
-
-unicode-canonical-property-names-ecmascript@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
-  integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==
-
-unicode-match-property-ecmascript@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
-  integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==
-  dependencies:
-    unicode-canonical-property-names-ecmascript "^1.0.4"
-    unicode-property-aliases-ecmascript "^1.0.4"
-
-unicode-match-property-value-ecmascript@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531"
-  integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==
-
-unicode-property-aliases-ecmascript@^1.0.4:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4"
-  integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==
-
-union-value@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
-  integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
-  dependencies:
-    arr-union "^3.1.0"
-    get-value "^2.0.6"
-    is-extendable "^0.1.1"
-    set-value "^2.0.1"
-
-unique-filename@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
-  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
-  dependencies:
-    unique-slug "^2.0.0"
-
-unique-slug@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
-  integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
-  dependencies:
-    imurmurhash "^0.1.4"
-
-unique-string@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a"
-  integrity sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=
-  dependencies:
-    crypto-random-string "^1.0.0"
-
-universal-analytics@^0.4.20:
-  version "0.4.23"
-  resolved "https://registry.yarnpkg.com/universal-analytics/-/universal-analytics-0.4.23.tgz#d915e676850c25c4156762471bdd7cf2eaaca8ac"
-  integrity sha512-lgMIH7XBI6OgYn1woDEmxhGdj8yDefMKg7GkWdeATAlQZFrMrNyxSkpDzY57iY0/6fdlzTbBV03OawvvzG+q7A==
-  dependencies:
-    debug "^4.1.1"
-    request "^2.88.2"
-    uuid "^3.0.0"
-
-universalify@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
-  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
-
-unpipe@1.0.0, unpipe@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
-  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
-
-unset-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
-  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
-  dependencies:
-    has-value "^0.3.1"
-    isobject "^3.0.0"
-
-upath@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
-  integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
-
-update-notifier@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-3.0.1.tgz#78ecb68b915e2fd1be9f767f6e298ce87b736250"
-  integrity sha512-grrmrB6Zb8DUiyDIaeRTBCkgISYUgETNe7NglEbVsrLWXeESnlCSP50WfRSj/GmzMPl6Uchj24S/p80nP/ZQrQ==
-  dependencies:
-    boxen "^3.0.0"
-    chalk "^2.0.1"
-    configstore "^4.0.0"
-    has-yarn "^2.1.0"
-    import-lazy "^2.1.0"
-    is-ci "^2.0.0"
-    is-installed-globally "^0.1.0"
-    is-npm "^3.0.0"
-    is-yarn-global "^0.3.0"
-    latest-version "^5.0.0"
-    semver-diff "^2.0.0"
-    xdg-basedir "^3.0.0"
-
-uri-js@^4.2.2:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
-  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
-  dependencies:
-    punycode "^2.1.0"
-
-urix@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
-  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
-
-url-parse-lax@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
-  integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=
-  dependencies:
-    prepend-http "^2.0.0"
-
-url-parse@^1.4.3:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.1.tgz#d5fa9890af8a5e1f274a2c98376510f6425f6e3b"
-  integrity sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==
-  dependencies:
-    querystringify "^2.1.1"
-    requires-port "^1.0.0"
-
-url-toolkit@^2.1.1, url-toolkit@^2.1.3, url-toolkit@^2.2.1:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/url-toolkit/-/url-toolkit-2.2.2.tgz#51ef27b56d3187185f9ecf4a8ac7e8f55203c89d"
-  integrity sha512-l25w6Sy+Iy3/IbogunxhWwljPaDnqpiKvrQRoLBm6DfISco7NyRIS7Zf6+Oxhy1T8kHxWdwLND7ZZba6NjXMug==
-
-url@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
-  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
-  dependencies:
-    punycode "1.3.2"
-    querystring "0.2.0"
-
-use@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
-  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
-
-useragent@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.3.0.tgz#217f943ad540cb2128658ab23fc960f6a88c9972"
-  integrity sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==
-  dependencies:
-    lru-cache "4.1.x"
-    tmp "0.0.x"
-
-util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
-
-util-promisify@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/util-promisify/-/util-promisify-2.1.0.tgz#3c2236476c4d32c5ff3c47002add7c13b9a82a53"
-  integrity sha1-PCI2R2xNMsX/PEcAKt18E7moKlM=
-  dependencies:
-    object.getownpropertydescriptors "^2.0.3"
-
-util@0.10.3:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
-  integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
-  dependencies:
-    inherits "2.0.1"
-
-util@^0.11.0:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61"
-  integrity sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==
-  dependencies:
-    inherits "2.0.3"
-
-utils-merge@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
-  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
-
-utrie@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/utrie/-/utrie-1.0.2.tgz#d42fe44de9bc0119c25de7f564a6ed1b2c87a645"
-  integrity sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==
-  dependencies:
-    base64-arraybuffer "^1.0.2"
-
-uuid@^3.0.0, uuid@^3.3.2, uuid@^3.3.3, uuid@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
-  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
-
-uuid@^8.3.2:
-  version "8.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
-  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
-
-validate-npm-package-license@^3.0.1:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
-  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
-  dependencies:
-    spdx-correct "^3.0.0"
-    spdx-expression-parse "^3.0.0"
-
-validate-npm-package-name@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
-  integrity sha1-X6kS2B630MdK/BQN5zF/DKffQ34=
-  dependencies:
-    builtins "^1.0.3"
-
-vary@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
-  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
-
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
-  dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
-
-video.js@7.6.0:
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/video.js/-/video.js-7.6.0.tgz#556c151004e27d340be3a732a14bf7c1aaf7e8b4"
-  integrity sha512-A0HSKzAmcYkd1xyExqUlM6n8bkghcX54iCvW08bPvvl3UHt8d8zijuylfIWu8vo1Z8fYyk9HPOFs1i3Cldr/cw==
-  dependencies:
-    "@babel/runtime" "^7.4.5"
-    "@videojs/http-streaming" "1.10.3"
-    global "4.3.2"
-    keycode "^2.2.0"
-    safe-json-parse "4.0.0"
-    tsml "1.0.1"
-    videojs-font "3.2.0"
-    videojs-vtt.js "^0.14.1"
-    xhr "2.4.0"
-
-"video.js@^5.6.0 || ^6.2.8 || ^7.0.2", "video.js@^6 || ^7", "video.js@^6.8.0 || ^7.0.0", video.js@^7.5.5:
-  version "7.11.8"
-  resolved "https://registry.yarnpkg.com/video.js/-/video.js-7.11.8.tgz#1fa27c56f30a436b06b44f21560f223e264aec51"
-  integrity sha512-iQmNYB+pdgu8b45Za1AKSa5J7uDyHIqfJy+picw4voKfjErXK/BEvs+A3f99Ck7SCZU4cmMmX/s17AwaaNs+1w==
-  dependencies:
-    "@babel/runtime" "^7.9.2"
-    "@videojs/http-streaming" "2.6.4"
-    "@videojs/xhr" "2.5.1"
-    global "4.3.2"
-    keycode "^2.2.0"
-    remove "^0.1.5"
-    rollup-plugin-replace "^2.2.0"
-    safe-json-parse "4.0.0"
-    videojs-font "3.2.0"
-    videojs-vtt.js "^0.15.2"
-
-videojs-contrib-quality-levels@^2.0.9:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/videojs-contrib-quality-levels/-/videojs-contrib-quality-levels-2.1.0.tgz#046e9e21ed01043f512b83a1916001d552457083"
-  integrity sha512-dqGQGbL9AFhucxki7Zh0c3kIhH0PAPcHEh6jUdRyaFCVeOuqnJrOYs/3wNtsokDdBdRf2Du2annpu4Z2XaSZRg==
-  dependencies:
-    global "^4.3.2"
-    video.js "^6 || ^7"
-
-videojs-font@3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/videojs-font/-/videojs-font-3.2.0.tgz#212c9d3f4e4ec3fa7345167d64316add35e92232"
-  integrity sha512-g8vHMKK2/JGorSfqAZQUmYYNnXmfec4MLhwtEFS+mMs2IDY398GLysy6BH6K+aS1KMNu/xWZ8Sue/X/mdQPliA==
-
-videojs-hls-quality-selector@^1.0.5:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/videojs-hls-quality-selector/-/videojs-hls-quality-selector-1.1.4.tgz#281b78c6653137b08c544e806aa9c91b71d16989"
-  integrity sha512-wWAjlLQui02gp//t9KHGd3XnbYO7wdOptskh3ZYCrbl/5Lbkveqb9yBVjH4e0zIQBPvGdWPMcOeDukf8iuYeBw==
-  dependencies:
-    global "^4.3.2"
-    karma-safaritechpreview-launcher "0.0.6"
-    video.js "^7.5.5"
-    videojs-contrib-quality-levels "^2.0.9"
-
-videojs-vr@1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/videojs-vr/-/videojs-vr-1.5.0.tgz#507953228c626847a732ce651a6efede9f643dc1"
-  integrity sha512-S3/pnk0xP7tGuRX/qe9x4DDppyGGrOGho1IEaBuSyOBnxb1n75Qq+OT4Y7vf9YQp416/wfO6chml1tA5MhMhnw==
-  dependencies:
-    global "^4.3.2"
-    three "0.93.0"
-    video.js "^6 || ^7"
-    webvr-polyfill "0.10.6"
-
-videojs-vtt.js@^0.14.1:
-  version "0.14.1"
-  resolved "https://registry.yarnpkg.com/videojs-vtt.js/-/videojs-vtt.js-0.14.1.tgz#da583eb1fc9c81c826a9432b706040e8dea49911"
-  integrity sha512-YxOiywx6N9t3J5nqsE5WN2Sw4CSqVe3zV+AZm2T4syOc2buNJaD6ZoexSdeszx2sHLU/RRo2r4BJAXFDQ7Qo2Q==
-  dependencies:
-    global "^4.3.1"
-
-videojs-vtt.js@^0.15.2:
-  version "0.15.3"
-  resolved "https://registry.yarnpkg.com/videojs-vtt.js/-/videojs-vtt.js-0.15.3.tgz#84260393b79487fcf195d9372f812d7fab83a993"
-  integrity sha512-5FvVsICuMRx6Hd7H/Y9s9GDeEtYcXQWzGMS+sl4UX3t/zoHp3y+isSfIPRochnTH7h+Bh1ILyC639xy9Z6kPag==
-  dependencies:
-    global "^4.3.1"
-
-videojs-youtube@^2.6.0:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/videojs-youtube/-/videojs-youtube-2.6.1.tgz#3f7cce15229509ea6d54582e28793df530254860"
-  integrity sha512-qvwrkgXixbX8xzdkBa7o5r9KUITRISAy4bbyrpBgub3m0mhwz6WLXDIwJZ6/w4Z/JijWjLQqlg8W1jYhCEgHZw==
-  dependencies:
-    video.js "^5.6.0 || ^6.2.8 || ^7.0.2"
-
-vis-data@^6.1.1:
-  version "6.6.1"
-  resolved "https://registry.yarnpkg.com/vis-data/-/vis-data-6.6.1.tgz#2aa52e46c305ad46bb7abe6e7634e2eecd743b15"
-  integrity sha512-xmujDB2Dzf8T04rGFJ9OP4OA6zRVrz8R9hb0CVKryBrZRCljCga9JjSfgctA8S7wdZu7otDtUIwX4ZOgfV/57w==
-
-vis-network@^5.2.4:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/vis-network/-/vis-network-5.4.1.tgz#e0e33d23775e834f4cfd961bd7b92bf11df097c6"
-  integrity sha512-hUJlFWoCmLup6IxoXCr//OO2ZCkC8jrXEkkHLG1DhBgB54Y3K33+e5q4tc436inMlGzfqqaKTIToNbOGr8Szww==
-  dependencies:
-    "@egjs/hammerjs" "^2.0.15"
-    component-emitter "^1.3.0"
-    keycharm "^0.2.0"
-    moment "^2.24.0"
-    timsort "^0.3.0"
-    vis-data "^6.1.1"
-    vis-util "^1.1.6"
-
-vis-util@^1.1.6:
-  version "1.1.10"
-  resolved "https://registry.yarnpkg.com/vis-util/-/vis-util-1.1.10.tgz#1c0ebb17ad5139959122dcd12aae54a4e173846a"
-  integrity sha512-8hGSxsFi2ogYYweClQyITzWnirWgQ8p0i9M4d3OXMuUO8vjXrf+2zHOYI9OZbtUduxAWuMEePnS9BXDtPJmJ7Q==
-  dependencies:
-    moment "2.24.0"
-    vis-uuid "1.1.3"
-
-vis-util@^5.0.2:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/vis-util/-/vis-util-5.0.3.tgz#6a9d67c6ed92f2bfa67e50c20166bb5f59ac07bf"
-  integrity sha512-Wf9STUcFrDzK4/Zr7B6epW2Kvm3ORNWF+WiwEz2dpf5RdWkLUXFSbLcuB88n1W6tCdFwVN+v3V4/Xmn9PeL39g==
-
-vis-uuid@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/vis-uuid/-/vis-uuid-1.1.3.tgz#2f53ff35e9e026b0ec93bc433ce685c40c2f784c"
-  integrity sha512-2B6XdY1bkzbUh+TugmnAaFa61KO9R5pzBzIuFIm8a9FrkbxIdSmQXV+FbfkL8QunkQV/bT0JDLQ2puqCS2+0Og==
-
-vm-browserify@^1.0.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
-  integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
-
-void-elements@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
-  integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
-
-vscode-jsonrpc@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz#a7bf74ef3254d0a0c272fab15c82128e378b3be9"
-  integrity sha512-perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg==
-
-vscode-languageserver-protocol@3.14.1:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz#b8aab6afae2849c84a8983d39a1cf742417afe2f"
-  integrity sha512-IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g==
-  dependencies:
-    vscode-jsonrpc "^4.0.0"
-    vscode-languageserver-types "3.14.0"
-
-vscode-languageserver-types@3.14.0:
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz#d3b5952246d30e5241592b6dde8280e03942e743"
-  integrity sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==
-
-vscode-languageserver@^5.2.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.2.1.tgz#0d2feddd33f92aadf5da32450df498d52f6f14eb"
-  integrity sha512-GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A==
-  dependencies:
-    vscode-languageserver-protocol "3.14.1"
-    vscode-uri "^1.0.6"
-
-vscode-uri@^1.0.6:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.8.tgz#9769aaececae4026fb6e22359cb38946580ded59"
-  integrity sha512-obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ==
-
-watchpack-chokidar2@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz#38500072ee6ece66f3769936950ea1771be1c957"
-  integrity sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==
-  dependencies:
-    chokidar "^2.1.8"
-
-watchpack@^1.6.0:
-  version "1.7.5"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453"
-  integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==
-  dependencies:
-    graceful-fs "^4.1.2"
-    neo-async "^2.5.0"
-  optionalDependencies:
-    chokidar "^3.4.1"
-    watchpack-chokidar2 "^2.0.1"
-
-wbuf@^1.1.0, wbuf@^1.7.3:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
-  integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==
-  dependencies:
-    minimalistic-assert "^1.0.0"
-
-webdriver-js-extender@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/webdriver-js-extender/-/webdriver-js-extender-2.1.0.tgz#57d7a93c00db4cc8d556e4d3db4b5db0a80c3bb7"
-  integrity sha512-lcUKrjbBfCK6MNsh7xaY2UAUmZwe+/ib03AjVOpFobX4O7+83BUveSrLfU0Qsyb1DaKJdQRbuU+kM9aZ6QUhiQ==
-  dependencies:
-    "@types/selenium-webdriver" "^3.0.0"
-    selenium-webdriver "^3.0.1"
-
-webdriver-manager@^12.0.6:
-  version "12.1.8"
-  resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.8.tgz#5e70e73eaaf53a0767d5745270addafbc5905fd4"
-  integrity sha512-qJR36SXG2VwKugPcdwhaqcLQOD7r8P2Xiv9sfNbfZrKBnX243iAkOueX1yAmeNgIKhJ3YAT/F2gq6IiEZzahsg==
-  dependencies:
-    adm-zip "^0.4.9"
-    chalk "^1.1.1"
-    del "^2.2.0"
-    glob "^7.0.3"
-    ini "^1.3.4"
-    minimist "^1.2.0"
-    q "^1.4.1"
-    request "^2.87.0"
-    rimraf "^2.5.2"
-    semver "^5.3.0"
-    xml2js "^0.4.17"
-
-webidl-conversions@^3.0.0, webidl-conversions@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-  integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
-
-webpack-bundle-analyzer@^4.4.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.5.0.tgz#1b0eea2947e73528754a6f9af3e91b2b6e0f79d5"
-  integrity sha512-GUMZlM3SKwS8Z+CKeIFx7CVoHn3dXFcUAjT/dcZQQmfSZGvitPfMob2ipjai7ovFFqPvTqkEZ/leL4O0YOdAYQ==
-  dependencies:
-    acorn "^8.0.4"
-    acorn-walk "^8.0.0"
-    chalk "^4.1.0"
-    commander "^7.2.0"
-    gzip-size "^6.0.0"
-    lodash "^4.17.20"
-    opener "^1.5.2"
-    sirv "^1.0.7"
-    ws "^7.3.1"
-
-webpack-core@^0.6.8:
-  version "0.6.9"
-  resolved "https://registry.yarnpkg.com/webpack-core/-/webpack-core-0.6.9.tgz#fc571588c8558da77be9efb6debdc5a3b172bdc2"
-  integrity sha1-/FcViMhVjad76e+23r3Fo7FyvcI=
-  dependencies:
-    source-list-map "~0.1.7"
-    source-map "~0.4.1"
-
-webpack-dev-middleware@3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz#0019c3db716e3fa5cecbf64f2ab88a74bab331f3"
-  integrity sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==
-  dependencies:
-    memory-fs "^0.4.1"
-    mime "^2.4.4"
-    mkdirp "^0.5.1"
-    range-parser "^1.2.1"
-    webpack-log "^2.0.0"
-
-webpack-dev-middleware@^3.7.2:
-  version "3.7.3"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz#0639372b143262e2b84ab95d3b91a7597061c2c5"
-  integrity sha512-djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ==
-  dependencies:
-    memory-fs "^0.4.1"
-    mime "^2.4.4"
-    mkdirp "^0.5.1"
-    range-parser "^1.2.1"
-    webpack-log "^2.0.0"
-
-webpack-dev-server@3.11.0:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz#8f154a3bce1bcfd1cc618ef4e703278855e7ff8c"
-  integrity sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg==
-  dependencies:
-    ansi-html "0.0.7"
-    bonjour "^3.5.0"
-    chokidar "^2.1.8"
-    compression "^1.7.4"
-    connect-history-api-fallback "^1.6.0"
-    debug "^4.1.1"
-    del "^4.1.1"
-    express "^4.17.1"
-    html-entities "^1.3.1"
-    http-proxy-middleware "0.19.1"
-    import-local "^2.0.0"
-    internal-ip "^4.3.0"
-    ip "^1.1.5"
-    is-absolute-url "^3.0.3"
-    killable "^1.0.1"
-    loglevel "^1.6.8"
-    opn "^5.5.0"
-    p-retry "^3.0.1"
-    portfinder "^1.0.26"
-    schema-utils "^1.0.0"
-    selfsigned "^1.10.7"
-    semver "^6.3.0"
-    serve-index "^1.9.1"
-    sockjs "0.3.20"
-    sockjs-client "1.4.0"
-    spdy "^4.0.2"
-    strip-ansi "^3.0.1"
-    supports-color "^6.1.0"
-    url "^0.11.0"
-    webpack-dev-middleware "^3.7.2"
-    webpack-log "^2.0.0"
-    ws "^6.2.1"
-    yargs "^13.3.2"
-
-webpack-log@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f"
-  integrity sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==
-  dependencies:
-    ansi-colors "^3.0.0"
-    uuid "^3.3.2"
-
-webpack-merge@4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.1.tgz#5e923cf802ea2ace4fd5af1d3247368a633489b4"
-  integrity sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==
-  dependencies:
-    lodash "^4.17.5"
-
-webpack-sources@1.4.3, webpack-sources@^1.1.0, webpack-sources@^1.2.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
-  integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==
-  dependencies:
-    source-list-map "^2.0.0"
-    source-map "~0.6.1"
-
-webpack-subresource-integrity@1.1.0-rc.6:
-  version "1.1.0-rc.6"
-  resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.1.0-rc.6.tgz#37f6f1264e1eb378e41465a98da80fad76ab8886"
-  integrity sha512-Az7y8xTniNhaA0620AV1KPwWOqawurVVDzQSpPAeR5RwNbL91GoBSJAAo9cfd+GiFHwsS5bbHepBw1e6Hzxy4w==
-  dependencies:
-    webpack-core "^0.6.8"
-
-webpack@4.39.2:
-  version "4.39.2"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.39.2.tgz#c9aa5c1776d7c309d1b3911764f0288c8c2816aa"
-  integrity sha512-AKgTfz3xPSsEibH00JfZ9sHXGUwIQ6eZ9tLN8+VLzachk1Cw2LVmy+4R7ZiwTa9cZZ15tzySjeMui/UnSCAZhA==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-module-context" "1.8.5"
-    "@webassemblyjs/wasm-edit" "1.8.5"
-    "@webassemblyjs/wasm-parser" "1.8.5"
-    acorn "^6.2.1"
-    ajv "^6.10.2"
-    ajv-keywords "^3.4.1"
-    chrome-trace-event "^1.0.2"
-    enhanced-resolve "^4.1.0"
-    eslint-scope "^4.0.3"
-    json-parse-better-errors "^1.0.2"
-    loader-runner "^2.4.0"
-    loader-utils "^1.2.3"
-    memory-fs "^0.4.1"
-    micromatch "^3.1.10"
-    mkdirp "^0.5.1"
-    neo-async "^2.6.1"
-    node-libs-browser "^2.2.1"
-    schema-utils "^1.0.0"
-    tapable "^1.1.3"
-    terser-webpack-plugin "^1.4.1"
-    watchpack "^1.6.0"
-    webpack-sources "^1.4.1"
-
-websocket-driver@0.6.5:
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz#5cb2556ceb85f4373c6d8238aa691c8454e13a36"
-  integrity sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=
-  dependencies:
-    websocket-extensions ">=0.1.1"
-
-websocket-driver@>=0.5.1:
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"
-  integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==
-  dependencies:
-    http-parser-js ">=0.5.1"
-    safe-buffer ">=5.1.0"
-    websocket-extensions ">=0.1.1"
-
-websocket-extensions@>=0.1.1:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
-  integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
-
-webvr-polyfill-dpdb@^1.0.7:
-  version "1.0.18"
-  resolved "https://registry.yarnpkg.com/webvr-polyfill-dpdb/-/webvr-polyfill-dpdb-1.0.18.tgz#258484ce06b057bf18898acc911bd173847bce11"
-  integrity sha512-O0S1ZGEWyPvyZEkS2VbyV7mtir/NM9MNK3EuhbHPoJ8EHTky2pTXehjIl+IiDPr+Lldgx129QGt3NGly7rwRPw==
-
-webvr-polyfill@0.10.6:
-  version "0.10.6"
-  resolved "https://registry.yarnpkg.com/webvr-polyfill/-/webvr-polyfill-0.10.6.tgz#c1c5f5e3801784bc131a05aacfa2169872ce0b1c"
-  integrity sha512-H+2LI+rHMguGaUAg+1QuiIQ+1Y1wTSkkUXjQfF/GFD2wUL0AdiN8+uPGxnE7bHMBIG7NswN6kgkZhgy4WpwTlw==
-  dependencies:
-    cardboard-vr-display "1.0.13"
-
-whatwg-url@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-2.0.1.tgz#5396b2043f020ee6f704d9c45ea8519e724de659"
-  integrity sha1-U5ayBD8CDub3BNnEXqhRnnJN5lk=
-  dependencies:
-    tr46 "~0.0.3"
-    webidl-conversions "^3.0.0"
-
-when@~3.6.x:
-  version "3.6.4"
-  resolved "https://registry.yarnpkg.com/when/-/when-3.6.4.tgz#473b517ec159e2b85005497a13983f095412e34e"
-  integrity sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=
-
-which-boxed-primitive@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
-  integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
-  dependencies:
-    is-bigint "^1.0.1"
-    is-boolean-object "^1.1.0"
-    is-number-object "^1.0.4"
-    is-string "^1.0.5"
-    is-symbol "^1.0.3"
-
-which-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
-
-which-pm-runs@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb"
-  integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=
-
-which@^1.2.1, which@^1.2.9, which@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
-  dependencies:
-    isexe "^2.0.0"
-
-widest-line@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.1.tgz#7438764730ec7ef4381ce4df82fb98a53142a3fc"
-  integrity sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==
-  dependencies:
-    string-width "^2.1.1"
-
-wmf@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wmf/-/wmf-1.0.2.tgz#7d19d621071a08c2bdc6b7e688a9c435298cc2da"
-  integrity sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==
-
-word-wrap@~1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
-
-word@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/word/-/word-0.3.0.tgz#8542157e4f8e849f4a363a288992d47612db9961"
-  integrity sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==
-
-wordwrap@~0.0.2:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
-  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
-
-worker-farm@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"
-  integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==
-  dependencies:
-    errno "~0.1.7"
-
-worker-loader@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/worker-loader/-/worker-loader-2.0.0.tgz#45fda3ef76aca815771a89107399ee4119b430ac"
-  integrity sha512-tnvNp4K3KQOpfRnD20m8xltE3eWh89Ye+5oj7wXEEHKac1P4oZ6p9oTj8/8ExqoSBnk9nu5Pr4nKfQ1hn2APJw==
-  dependencies:
-    loader-utils "^1.0.0"
-    schema-utils "^0.4.0"
-
-worker-plugin@3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/worker-plugin/-/worker-plugin-3.2.0.tgz#ddae9f161b76fcbaacf8f54ecd037844584e43e7"
-  integrity sha512-W5nRkw7+HlbsEt3qRP6MczwDDISjiRj2GYt9+bpe8A2La00TmJdwzG5bpdMXhRt1qcWmwAvl1TiKaHRa+XDS9Q==
-  dependencies:
-    loader-utils "^1.1.0"
-
-wrap-ansi@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
-  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
-  dependencies:
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-
-wrap-ansi@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
-  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
-  dependencies:
-    ansi-styles "^3.2.0"
-    string-width "^3.0.0"
-    strip-ansi "^5.0.0"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-
-write-file-atomic@^2.0.0:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481"
-  integrity sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==
-  dependencies:
-    graceful-fs "^4.1.11"
-    imurmurhash "^0.1.4"
-    signal-exit "^3.0.2"
-
-ws@^6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
-  integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
-  dependencies:
-    async-limiter "~1.0.0"
-
-ws@^7.3.1:
-  version "7.5.8"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.8.tgz#ac2729881ab9e7cbaf8787fe3469a48c5c7f636a"
-  integrity sha512-ri1Id1WinAX5Jqn9HejiGb8crfRio0Qgu8+MtL36rlTA6RLsMdWt1Az/19A2Qij6uSHUMphEFaTKa4WG+UNHNw==
-
-ws@~3.3.1:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
-  integrity sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==
-  dependencies:
-    async-limiter "~1.0.0"
-    safe-buffer "~5.1.0"
-    ultron "~1.1.0"
-
-xdg-basedir@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
-  integrity sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=
-
-xhr@2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/xhr/-/xhr-2.4.0.tgz#e16e66a45f869861eeefab416d5eff722dc40993"
-  integrity sha1-4W5mpF+GmGHu76tBbV7/ci3ECZM=
-  dependencies:
-    global "~4.3.0"
-    is-function "^1.0.1"
-    parse-headers "^2.0.0"
-    xtend "^4.0.0"
-
-xlsx@^0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/xlsx/-/xlsx-0.14.5.tgz#3637e914d791bdca7382816e173f7d725ed0e0d2"
-  integrity sha512-s/5f4/mjeWREmIWZ+HtDfh/rnz51ar+dZ4LWKZU3u9VBx2zLdSIWTdXgoa52/pnZ9Oe/Vu1W1qzcKzLVe+lq4w==
-  dependencies:
-    adler-32 "~1.2.0"
-    cfb "^1.1.2"
-    codepage "~1.14.0"
-    commander "~2.17.1"
-    crc-32 "~1.2.0"
-    exit-on-epipe "~1.0.1"
-    ssf "~0.10.2"
-
-xlsx@^0.16.1:
-  version "0.16.9"
-  resolved "https://registry.yarnpkg.com/xlsx/-/xlsx-0.16.9.tgz#dacd5bb46bda6dd3743940c9c3dc1e2171826256"
-  integrity sha512-gxi1I3EasYvgCX1vN9pGyq920Ron4NO8PNfhuoA3Hpq6Y8f0ECXiy4OLrK4QZBnj1jx3QD+8Fq5YZ/3mPZ5iXw==
-  dependencies:
-    adler-32 "~1.2.0"
-    cfb "^1.1.4"
-    codepage "~1.14.0"
-    commander "~2.17.1"
-    crc-32 "~1.2.0"
-    exit-on-epipe "~1.0.1"
-    fflate "^0.3.8"
-    ssf "~0.11.2"
-    wmf "~1.0.1"
-    word "~0.3.0"
-
-"xml-name-validator@>= 2.0.1 < 3.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635"
-  integrity sha1-TYuPHszTQZqjYgYb7O9RXh5VljU=
-
-xml2js@^0.4.17:
-  version "0.4.23"
-  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66"
-  integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==
-  dependencies:
-    sax ">=0.6.0"
-    xmlbuilder "~11.0.0"
-
-xmlbuilder@~11.0.0:
-  version "11.0.1"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
-  integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
-
-xmldom@^0.1.22:
-  version "0.1.31"
-  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff"
-  integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==
-
-xmldom@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.4.0.tgz#8771e482a333af44587e30ce026f0998c23f3830"
-  integrity sha512-2E93k08T30Ugs+34HBSTQLVtpi6mCddaY8uO+pMNk1pqSjV5vElzn4mmh6KLxN3hki8rNcHSYzILoh3TEWORvA==
-
-xmlhttprequest-ssl@~1.5.4:
-  version "1.5.5"
-  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
-  integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=
-
-xtend@^4.0.0, xtend@^4.0.2, xtend@~4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
-  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
-
-xxhashjs@^0.2.1:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/xxhashjs/-/xxhashjs-0.2.2.tgz#8a6251567621a1c46a5ae204da0249c7f8caa9d8"
-  integrity sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==
-  dependencies:
-    cuint "^0.2.2"
-
-"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
-  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
-
-yallist@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
-  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
-
-yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
-  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
-
-yallist@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
-  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
-
-yaml@^1.10.0:
-  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
-  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
-
-yargs-parser@^11.1.1:
-  version "11.1.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
-  integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
-yargs-parser@^13.0.0, yargs-parser@^13.1.2:
-  version "13.1.2"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
-  integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
-yargs@13.1.0:
-  version "13.1.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.1.0.tgz#b2729ce4bfc0c584939719514099d8a916ad2301"
-  integrity sha512-1UhJbXfzHiPqkfXNHYhiz79qM/kZqjTE8yGlEjZa85Q+3+OwcV6NRkV7XOV1W2Eom2bzILeUn55pQYffjVOLAg==
-  dependencies:
-    cliui "^4.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^2.0.1"
-    os-locale "^3.1.0"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^3.0.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^13.0.0"
-
-yargs@^12.0.5:
-  version "12.0.5"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
-  integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
-  dependencies:
-    cliui "^4.0.0"
-    decamelize "^1.2.0"
-    find-up "^3.0.0"
-    get-caller-file "^1.0.1"
-    os-locale "^3.0.0"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^2.0.0"
-    which-module "^2.0.0"
-    y18n "^3.2.1 || ^4.0.0"
-    yargs-parser "^11.1.1"
-
-yargs@^13.3.2:
-  version "13.3.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
-  integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
-  dependencies:
-    cliui "^5.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^3.0.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^13.1.2"
-
-yeast@0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
-  integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
-
-yn@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
-  integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
-
-yocto-queue@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
-  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
-
-zone.js@~0.10.1:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.10.3.tgz#3e5e4da03c607c9dcd92e37dd35687a14a140c16"
-  integrity sha512-LXVLVEq0NNOqK/fLJo3d0kfzd4sxwn2/h67/02pjCjfKDxgx1i9QqpvtHD8CrBnSSwMw5+dy11O7FRX5mkO7Cg==

From ae9fc6cf9f1c115a3b8aadfd5d0e1aabeecb520a Mon Sep 17 00:00:00 2001
From: Amit Sengar <aAmitSengar@users.noreply.github.com>
Date: Fri, 28 Apr 2023 15:24:16 +0530
Subject: [PATCH 083/887] Update package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0e2703c4e..4922e890c 100644
--- a/package.json
+++ b/package.json
@@ -109,7 +109,7 @@
     "@types/lodash": "4.14.172",
     "@types/mustache": "^0.8.32",
     "@types/node": "^10.17.60",
-    "@types/pdfjs-dist": "^2.1.3",
+    "@types/pdfjs-dist": "2.1.3",
     "@types/quill": "^2.0.2",
     "@types/uuid": "^8.3.3",
     "@types/video.js": "7.2.12",

From 8394f47dd906de27ee255c2ce37d6bbbb6a72b5d Mon Sep 17 00:00:00 2001
From: Amit Sengar <aAmitSengar@users.noreply.github.com>
Date: Fri, 28 Apr 2023 15:33:36 +0530
Subject: [PATCH 084/887] Update package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4922e890c..39bf3e917 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "@project-sunbird/telemetry-sdk": "0.0.26",
     "@sunbird-cb/collection": "^1.0.22",
     "@sunbird-cb/design-system": "0.0.1",
-    "@sunbird-cb/rain-dashboards": "^0.4.10",
+    "@sunbird-cb/rain-dashboards": "^0.4.11",
     "@sunbird-cb/resolver": "^1.0.0",
     "@sunbird-cb/utils": "^1.0.12",
     "@types/file-saver": "^2.0.1",

From 7a091a5d535567759e2ab7710df5b0396cd8c5dd Mon Sep 17 00:00:00 2001
From: Amit Sengar <aAmitSengar@users.noreply.github.com>
Date: Fri, 28 Apr 2023 15:33:54 +0530
Subject: [PATCH 085/887] Update package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0e2703c4e..64061b9da 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "@project-sunbird/telemetry-sdk": "0.0.26",
     "@sunbird-cb/collection": "^1.0.22",
     "@sunbird-cb/design-system": "0.0.1",
-    "@sunbird-cb/rain-dashboards": "^0.4.10",
+    "@sunbird-cb/rain-dashboards": "^0.4.11",
     "@sunbird-cb/resolver": "^1.0.0",
     "@sunbird-cb/utils": "^1.0.12",
     "@types/file-saver": "^2.0.1",

From 6aae85892f5e88eed468c222c37e6d993c7437b4 Mon Sep 17 00:00:00 2001
From: dakshayini-krishnappa <dakshayini.krishnappa@tarento.com>
Date: Thu, 4 May 2023 16:55:21 +0530
Subject: [PATCH 086/887] package file updation done

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 64061b9da..3f9b1a67a 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "@project-sunbird/telemetry-sdk": "0.0.26",
     "@sunbird-cb/collection": "^1.0.22",
     "@sunbird-cb/design-system": "0.0.1",
-    "@sunbird-cb/rain-dashboards": "^0.4.11",
+    "@sunbird-cb/rain-dashboards": "^0.4.14",
     "@sunbird-cb/resolver": "^1.0.0",
     "@sunbird-cb/utils": "^1.0.12",
     "@types/file-saver": "^2.0.1",

From 5f7054439e68899980bc3d36f406ef604ef5d3ca Mon Sep 17 00:00:00 2001
From: Haritest <haridasksd@gmail.com>
Date: Wed, 10 May 2023 11:30:13 +0530
Subject: [PATCH 087/887] Update Jenkinsfile-sun email_notify disabled

---
 Jenkinsfile-sun | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile-sun b/Jenkinsfile-sun
index 9758d55dc..b15a9e515 100644
--- a/Jenkinsfile-sun
+++ b/Jenkinsfile-sun
@@ -52,6 +52,6 @@ node('build-slave') {
         throw err
     }
     finally {
-        email_notify()
+     //   email_notify()
     }
 }

From e3cdafd4e0a3b850611d10fdb46b0968f3613775 Mon Sep 17 00:00:00 2001
From: Haritest <haridasksd@gmail.com>
Date: Wed, 10 May 2023 12:18:03 +0530
Subject: [PATCH 088/887] Update package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3f9b1a67a..64061b9da 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "@project-sunbird/telemetry-sdk": "0.0.26",
     "@sunbird-cb/collection": "^1.0.22",
     "@sunbird-cb/design-system": "0.0.1",
-    "@sunbird-cb/rain-dashboards": "^0.4.14",
+    "@sunbird-cb/rain-dashboards": "^0.4.11",
     "@sunbird-cb/resolver": "^1.0.0",
     "@sunbird-cb/utils": "^1.0.12",
     "@types/file-saver": "^2.0.1",

From a219634a9e4c41e8ac064370b1b93b3970f3f326 Mon Sep 17 00:00:00 2001
From: Haritest <haridasksd@gmail.com>
Date: Wed, 10 May 2023 12:19:06 +0530
Subject: [PATCH 089/887] Update package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 64061b9da..3f9b1a67a 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "@project-sunbird/telemetry-sdk": "0.0.26",
     "@sunbird-cb/collection": "^1.0.22",
     "@sunbird-cb/design-system": "0.0.1",
-    "@sunbird-cb/rain-dashboards": "^0.4.11",
+    "@sunbird-cb/rain-dashboards": "^0.4.14",
     "@sunbird-cb/resolver": "^1.0.0",
     "@sunbird-cb/utils": "^1.0.12",
     "@types/file-saver": "^2.0.1",

From c177d0a12b224d04536ca852b873995d3d1f7a5f Mon Sep 17 00:00:00 2001
From: Haritest <haridasksd@gmail.com>
Date: Fri, 12 May 2023 16:04:09 +0530
Subject: [PATCH 090/887] Update package.json

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 3f9b1a67a..14474918c 100644
--- a/package.json
+++ b/package.json
@@ -134,6 +134,7 @@
     "tslint-config-airbnb": "^5.11.1",
     "typescript": "~3.5.3",
     "typescript-tslint-plugin": "^0.5.4",
+    "d3-funnel": "^2.1.1",
     "webpack-bundle-analyzer": "^4.4.0"
   }
 }

From ac681a25056460c18e9cc4218df965972625e8d3 Mon Sep 17 00:00:00 2001
From: root <root@DP.bayjqqohq5zuxcqmcfvaluc2uf.rx.internal.cloudapp.net>
Date: Fri, 12 May 2023 10:58:22 +0000
Subject: [PATCH 091/887] yarn.lock added

---
 yarn.lock | 11731 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 11731 insertions(+)
 create mode 100644 yarn.lock

diff --git a/yarn.lock b/yarn.lock
new file mode 100644
index 000000000..d7908f3c3
--- /dev/null
+++ b/yarn.lock
@@ -0,0 +1,11731 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@angular-devkit/architect@0.802.2":
+  version "0.802.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.802.2.tgz#f2305052e731b68d0fcb98958426f62ce97b441e"
+  integrity sha512-bMMo8BejHi3+n4xqewgcfat5+OYDmQQCLxWQ2W+qr7/u08vmTQTix3Q/wClp0nxgN0Zc9/1gSPaeudHLAlEizg==
+  dependencies:
+    "@angular-devkit/core" "8.2.2"
+    rxjs "6.4.0"
+
+"@angular-devkit/architect@0.803.29":
+  version "0.803.29"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.803.29.tgz#0399969087ac77876b8e429cb26eebd20596607b"
+  integrity sha512-yHBud/fZHTelX24yjQg5lefZrfIebruoFTGeOwF0JdX8+KiHcTIxS4LOnUTYriasfHarcHRFXBAV/bRm+wv5ow==
+  dependencies:
+    "@angular-devkit/core" "8.3.29"
+    rxjs "6.4.0"
+
+"@angular-devkit/build-angular@^0.803.23":
+  version "0.803.29"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.803.29.tgz#4cc2ecb7c4ca48389f05d1e05d4708f82c8c7767"
+  integrity sha512-XAgfP1gi0rEJ3oVt+8ipvS5RfPNbeK5r2n8Ll2H3xkKjU0p1PN8+S6/0XVBtmMfeQ06SJWEAKFcAYqrxXhVTzw==
+  dependencies:
+    "@angular-devkit/architect" "0.803.29"
+    "@angular-devkit/build-optimizer" "0.803.29"
+    "@angular-devkit/build-webpack" "0.803.29"
+    "@angular-devkit/core" "8.3.29"
+    "@babel/core" "7.8.7"
+    "@babel/preset-env" "7.8.7"
+    "@ngtools/webpack" "8.3.29"
+    ajv "6.12.3"
+    autoprefixer "9.6.1"
+    browserslist "4.10.0"
+    cacache "12.0.2"
+    caniuse-lite "1.0.30001035"
+    circular-dependency-plugin "5.2.0"
+    clean-css "4.2.1"
+    copy-webpack-plugin "6.0.3"
+    core-js "3.6.4"
+    coverage-istanbul-loader "2.0.3"
+    file-loader "4.2.0"
+    find-cache-dir "3.0.0"
+    glob "7.1.4"
+    jest-worker "24.9.0"
+    karma-source-map-support "1.4.0"
+    less "3.9.0"
+    less-loader "5.0.0"
+    license-webpack-plugin "2.1.2"
+    loader-utils "1.2.3"
+    mini-css-extract-plugin "0.8.0"
+    minimatch "3.0.4"
+    open "6.4.0"
+    parse5 "4.0.0"
+    postcss "7.0.17"
+    postcss-import "12.0.1"
+    postcss-loader "3.0.0"
+    raw-loader "3.1.0"
+    regenerator-runtime "0.13.3"
+    rxjs "6.4.0"
+    sass "1.22.9"
+    sass-loader "7.2.0"
+    semver "6.3.0"
+    source-map "0.7.3"
+    source-map-loader "0.2.4"
+    source-map-support "0.5.13"
+    speed-measure-webpack-plugin "1.3.1"
+    style-loader "1.0.0"
+    stylus "0.54.5"
+    stylus-loader "3.0.2"
+    terser "4.6.3"
+    terser-webpack-plugin "3.0.3"
+    tree-kill "1.2.2"
+    webpack "4.39.2"
+    webpack-dev-middleware "3.7.2"
+    webpack-dev-server "3.11.0"
+    webpack-merge "4.2.1"
+    webpack-sources "1.4.3"
+    webpack-subresource-integrity "1.1.0-rc.6"
+    worker-plugin "3.2.0"
+
+"@angular-devkit/build-ng-packagr@~0.802.1":
+  version "0.802.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-ng-packagr/-/build-ng-packagr-0.802.2.tgz#8b83936667a955b91cc865f936b27428065000cc"
+  integrity sha512-6lY95tiW+KooPMWB3P4r54TUe5pSZgkv/6mphrUcxqwvN/jKOV4MkpoFxJsu7zNuiFPHU8K5URCWFsQPbiObPg==
+  dependencies:
+    "@angular-devkit/architect" "0.802.2"
+    rxjs "6.4.0"
+
+"@angular-devkit/build-optimizer@0.803.29":
+  version "0.803.29"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.803.29.tgz#91c033e6ab3313d338ec9c3d4c40d64ce1b324bc"
+  integrity sha512-E/MXtKc3oaP7UvQm0g4ayfH8ImEoQnRWseKD4jjYG6TbTIqfIyHCZRcKIr3svY28hzASbro5IZI6SugG+llvFw==
+  dependencies:
+    loader-utils "1.2.3"
+    source-map "0.7.3"
+    tslib "1.10.0"
+    typescript "3.5.3"
+    webpack-sources "1.4.3"
+
+"@angular-devkit/build-webpack@0.803.29":
+  version "0.803.29"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.803.29.tgz#ceaee658f0b71a0fee4f10b574b49e192d333a7c"
+  integrity sha512-3dJ3iEGU6AFT8VFTe72T9uNLobfd18Sq5Hz22UCCYji9K3ZyVc/bn5uXVVX+/Yj91MFtXuhOjLj7Z+XDeNy+OQ==
+  dependencies:
+    "@angular-devkit/architect" "0.803.29"
+    "@angular-devkit/core" "8.3.29"
+    rxjs "6.4.0"
+
+"@angular-devkit/core@8.2.2":
+  version "8.2.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-8.2.2.tgz#f7239b6fca785c5a85fbe7684f807b8fa41311d4"
+  integrity sha512-qA1lK/OQhNptCxoEGbTryn6yeFS1F/e/EiUTwgU/j4DkBwPyYGE8iqWBd/cgI9AVqQaRSLLhVWXtDPxoNL0TKg==
+  dependencies:
+    ajv "6.10.2"
+    fast-json-stable-stringify "2.0.0"
+    magic-string "0.25.3"
+    rxjs "6.4.0"
+    source-map "0.7.3"
+
+"@angular-devkit/core@8.3.29":
+  version "8.3.29"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-8.3.29.tgz#3477edd6458653f83e6d78684b100c1bef81382f"
+  integrity sha512-4jdja9QPwR6XG14ZSunyyOWT3nE2WtZC5IMDIBZADxujXvhzOU0n4oWpy6/JVHLUAxYNNgzLz+/LQORRWndcPg==
+  dependencies:
+    ajv "6.12.3"
+    fast-json-stable-stringify "2.0.0"
+    magic-string "0.25.3"
+    rxjs "6.4.0"
+    source-map "0.7.3"
+
+"@angular-devkit/schematics@8.3.29":
+  version "8.3.29"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-8.3.29.tgz#b3ba658b90fb3226a80ff12977be7dd583e99c49"
+  integrity sha512-AFJ9EK0XbcNlO5Dm9vr0OlBo1Nw6AaFXPR+DmHGBdcDDHxqEmYYLWfT+JU/8U2YFIdgrtlwvdtf6UQ3V2jdz1g==
+  dependencies:
+    "@angular-devkit/core" "8.3.29"
+    rxjs "6.4.0"
+
+"@angular/animations@~8.2.1":
+  version "8.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.2.14.tgz#76736b21e56165e6ca4925fb69605bdcc56aba7d"
+  integrity sha512-3Vc9TnNpKdtvKIXcWDFINSsnwgEMiDmLzjceWg1iYKwpeZGQahUXPoesLwQazBMmxJzQiA4HOMj0TTXKZ+Jzkg==
+  dependencies:
+    tslib "^1.9.0"
+
+"@angular/cdk@~8.1.2":
+  version "8.1.4"
+  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-8.1.4.tgz#69066053fe4cbd80cee2bb7fa238f1c9abb963fc"
+  integrity sha512-U0tjhAZM4qqUHGGKIKFZZ9d8929s2U/HO0FdoT/eX+oHPOA6mm3bBep7myrSzlkP9V7O1JJfYdhEgijXhYxprQ==
+  dependencies:
+    tslib "^1.7.1"
+  optionalDependencies:
+    parse5 "^5.0.0"
+
+"@angular/cli@^8.3.26":
+  version "8.3.29"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-8.3.29.tgz#481eb04a8240932adfb19049a5fb524f85453037"
+  integrity sha512-pW+iU0eKHIae+A1b9W5g8DKefMQcehZ+drGKs4Hryh8G+XGFS00BIWkmh6c1mydWTEhdsFlhdjD/rXCem7MAQQ==
+  dependencies:
+    "@angular-devkit/architect" "0.803.29"
+    "@angular-devkit/core" "8.3.29"
+    "@angular-devkit/schematics" "8.3.29"
+    "@schematics/angular" "8.3.29"
+    "@schematics/update" "0.803.29"
+    "@yarnpkg/lockfile" "1.1.0"
+    ansi-colors "4.1.1"
+    debug "^4.1.1"
+    ini "1.3.5"
+    inquirer "6.5.1"
+    npm-package-arg "6.1.0"
+    npm-pick-manifest "3.0.2"
+    open "6.4.0"
+    pacote "9.5.5"
+    read-package-tree "5.3.1"
+    rimraf "3.0.0"
+    semver "6.3.0"
+    symbol-observable "1.2.0"
+    universal-analytics "^0.4.20"
+    uuid "^3.3.2"
+
+"@angular/common@~8.2.1":
+  version "8.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.2.14.tgz#027e52b2951c14082d6e3af1a4ffa1356220e439"
+  integrity sha512-Qmt+aX2quUW54kaNT7QH7WGXnFxr/cC2C6sf5SW5SdkZfDQSiz8IaItvieZfXVQUbBOQKFRJ7TlSkt0jI/yjvw==
+  dependencies:
+    tslib "^1.9.0"
+
+"@angular/compiler-cli@~8.2.1":
+  version "8.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.2.14.tgz#1997bec04a6b9d022954e5747505fe8906994594"
+  integrity sha512-XDrTyrlIZM+0NquVT+Kbg5bn48AaWFT+B3bAT288PENrTdkuxuF9AhjFRZj8jnMdmaE4O2rioEkXBtl6z3zptA==
+  dependencies:
+    canonical-path "1.0.0"
+    chokidar "^2.1.1"
+    convert-source-map "^1.5.1"
+    dependency-graph "^0.7.2"
+    magic-string "^0.25.0"
+    minimist "^1.2.0"
+    reflect-metadata "^0.1.2"
+    source-map "^0.6.1"
+    tslib "^1.9.0"
+    yargs "13.1.0"
+
+"@angular/compiler@~8.2.1":
+  version "8.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.2.14.tgz#46db7a9d1c17f236126518ff26480c160d5a6183"
+  integrity sha512-ABZO4E7eeFA1QyJ2trDezxeQM5ZFa1dXw1Mpl/+1vuXDKNjJgNyWYwKp/NwRkLmrsuV0yv4UDCDe4kJOGbPKnw==
+  dependencies:
+    tslib "^1.9.0"
+
+"@angular/core@~8.2.1":
+  version "8.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.2.14.tgz#35566f5b19480369229477e7e0e0fde740bd5204"
+  integrity sha512-zeePkigi+hPh3rN7yoNENG/YUBUsIvUXdxx+AZq+QPaFeKEA2FBSrKn36ojHFrdJUjKzl0lPMEiGC2b6a6bo6g==
+  dependencies:
+    tslib "^1.9.0"
+
+"@angular/forms@~8.2.1":
+  version "8.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-8.2.14.tgz#7d357c346a3884881beb044c50ec4a09d3d7ee8e"
+  integrity sha512-zhyKL3CFIqcyHJ/TQF/h1OZztK611a6rxuPHCrt/5Sn1SuBTJJQ1pPTkOYIDy6IrCrtyANc8qB6P17Mao71DNQ==
+  dependencies:
+    tslib "^1.9.0"
+
+"@angular/language-service@~8.2.1":
+  version "8.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-8.2.14.tgz#e18b27a6841577ce489ad31540150da5a444ca37"
+  integrity sha512-7EhN9JJbAJcH2xCa+rIOmekjiEuB0qwPdHuD5qn/wwMfRzMZo+Db4hHbR9KHrLH6H82PTwYKye/LLpDaZqoHOA==
+
+"@angular/material-moment-adapter@^9.2.4":
+  version "9.2.4"
+  resolved "https://registry.yarnpkg.com/@angular/material-moment-adapter/-/material-moment-adapter-9.2.4.tgz#4d3cfcd5c2b8914bcca4e70a46cf7ec127c14b40"
+  integrity sha512-V5xkL+YUec3nDGRaJB72mJTUtdUvGaG9WCQEdr45viDWFGjQaEpS6msuScBLp0PwsN8Wt0n69eZg0ULgxPBa5g==
+
+"@angular/material@~8.1.2":
+  version "8.1.4"
+  resolved "https://registry.yarnpkg.com/@angular/material/-/material-8.1.4.tgz#8bda747bb023af8ccce2c2d3e9e8dc25f05b3605"
+  integrity sha512-HV1qU63MaOtAc+cWg21Y2ygQKdEDjsGQ/3d3qym9sfR0xU2vvY7OG6gH48BfPeU63oMYxQkhxfoGP8wWMXSU1w==
+  dependencies:
+    tslib "^1.7.1"
+
+"@angular/platform-browser-dynamic@~8.2.1":
+  version "8.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.2.14.tgz#4439a79fe10ec45170e6940a28835e9ff0918950"
+  integrity sha512-mO2JPR5kLU/A3AQngy9+R/Q5gaF9csMStBQjwsCRI0wNtlItOIGL6+wTYpiTuh/ux+WVN1F2sLcEYU4Zf1ud9A==
+  dependencies:
+    tslib "^1.9.0"
+
+"@angular/platform-browser@~8.2.1":
+  version "8.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.2.14.tgz#31f082e8ba977f9b89964d721c38cbc32ce0e433"
+  integrity sha512-MtJptptyKzsE37JZ2VB/tI4cvMrdAH+cT9pMBYZd66YSZfKjIj5s+AZo7z8ncoskQSB1o3HMfDjSK7QXGx1mLQ==
+  dependencies:
+    tslib "^1.9.0"
+
+"@angular/pwa@^0.803.14":
+  version "0.803.29"
+  resolved "https://registry.yarnpkg.com/@angular/pwa/-/pwa-0.803.29.tgz#3421745973793acf0c921fb85a16cf5417948be6"
+  integrity sha512-DR8qRfgkR3Dj8HKUnnW+17/f/uCPe7J8l8PC9VSC69Jqzc9XSsKZNfgrL3svaflIeU9+2YQ+5x5mJOL1f2m/Cg==
+  dependencies:
+    "@angular-devkit/core" "8.3.29"
+    "@angular-devkit/schematics" "8.3.29"
+    "@schematics/angular" "8.3.29"
+    parse5-html-rewriting-stream "5.1.0"
+
+"@angular/router@~8.2.1":
+  version "8.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.2.14.tgz#5f9f9707710983c2143aead79dcd2da520ae3eb8"
+  integrity sha512-DHA2BhODqV7F0g6ZKgFaZgbsqzHHWRcfWchCOrOVKu2rYiKUTwwHVLBgZAhrpNeinq2pWanVYSIhMr7wy+LfEA==
+  dependencies:
+    tslib "^1.9.0"
+
+"@angular/service-worker@~8.2.1":
+  version "8.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-8.2.14.tgz#fbea3899863cfa09196ce69fa470b163f25666ad"
+  integrity sha512-Xv1ES5bXDRxPJ5uyRqeKw6mGKaJVzKK0oFcR0mr4OSdyLXGZ+x6fC2S/QcLy4ugpb64fyEksrnHhHjeMVzGh2Q==
+  dependencies:
+    tslib "^1.9.0"
+
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"
+  integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==
+  dependencies:
+    "@babel/highlight" "^7.12.13"
+
+"@babel/compat-data@^7.13.15", "@babel/compat-data@^7.14.0", "@babel/compat-data@^7.8.6":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.0.tgz#a901128bce2ad02565df95e6ecbf195cf9465919"
+  integrity sha512-vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q==
+
+"@babel/core@7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.7.tgz#b69017d221ccdeb203145ae9da269d72cf102f3b"
+  integrity sha512-rBlqF3Yko9cynC5CCFy6+K/w2N+Sq/ff2BPy+Krp7rHlABIr5epbA7OxVeKoMHB39LZOp1UY5SuLjy6uWi35yA==
+  dependencies:
+    "@babel/code-frame" "^7.8.3"
+    "@babel/generator" "^7.8.7"
+    "@babel/helpers" "^7.8.4"
+    "@babel/parser" "^7.8.7"
+    "@babel/template" "^7.8.6"
+    "@babel/traverse" "^7.8.6"
+    "@babel/types" "^7.8.7"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.1"
+    json5 "^2.1.0"
+    lodash "^4.17.13"
+    resolve "^1.3.2"
+    semver "^5.4.1"
+    source-map "^0.5.0"
+
+"@babel/core@^7.7.5":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.2.tgz#54e45334ffc0172048e5c93ded36461d3ad4c417"
+  integrity sha512-OgC1mON+l4U4B4wiohJlQNUU3H73mpTyYY3j/c8U9dr9UagGGSm+WFpzjy/YLdoyjiG++c1kIDgxCo/mLwQJeQ==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@babel/generator" "^7.14.2"
+    "@babel/helper-compilation-targets" "^7.13.16"
+    "@babel/helper-module-transforms" "^7.14.2"
+    "@babel/helpers" "^7.14.0"
+    "@babel/parser" "^7.14.2"
+    "@babel/template" "^7.12.13"
+    "@babel/traverse" "^7.14.2"
+    "@babel/types" "^7.14.2"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.1.2"
+    semver "^6.3.0"
+    source-map "^0.5.0"
+
+"@babel/generator@^7.14.2", "@babel/generator@^7.4.0", "@babel/generator@^7.8.7":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.2.tgz#d5773e8b557d421fd6ce0d5efa5fd7fc22567c30"
+  integrity sha512-OnADYbKrffDVai5qcpkMxQ7caomHOoEwjkouqnN2QhydAjowFAZcsdecFIRUBdb+ZcruwYE4ythYmF1UBZU5xQ==
+  dependencies:
+    "@babel/types" "^7.14.2"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
+
+"@babel/helper-annotate-as-pure@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz#0f58e86dfc4bb3b1fcd7db806570e177d439b6ab"
+  integrity sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw==
+  dependencies:
+    "@babel/types" "^7.12.13"
+
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz#6bc20361c88b0a74d05137a65cac8d3cbf6f61fc"
+  integrity sha512-CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA==
+  dependencies:
+    "@babel/helper-explode-assignable-expression" "^7.12.13"
+    "@babel/types" "^7.12.13"
+
+"@babel/helper-compilation-targets@^7.13.16", "@babel/helper-compilation-targets@^7.8.7":
+  version "7.13.16"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz#6e91dccf15e3f43e5556dffe32d860109887563c"
+  integrity sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA==
+  dependencies:
+    "@babel/compat-data" "^7.13.15"
+    "@babel/helper-validator-option" "^7.12.17"
+    browserslist "^4.14.5"
+    semver "^6.3.0"
+
+"@babel/helper-create-regexp-features-plugin@^7.12.13":
+  version "7.12.17"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz#a2ac87e9e319269ac655b8d4415e94d38d663cb7"
+  integrity sha512-p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.12.13"
+    regexpu-core "^4.7.1"
+
+"@babel/helper-explode-assignable-expression@^7.12.13":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz#17b5c59ff473d9f956f40ef570cf3a76ca12657f"
+  integrity sha512-qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA==
+  dependencies:
+    "@babel/types" "^7.13.0"
+
+"@babel/helper-function-name@^7.12.13", "@babel/helper-function-name@^7.14.2":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.2.tgz#397688b590760b6ef7725b5f0860c82427ebaac2"
+  integrity sha512-NYZlkZRydxw+YT56IlhIcS8PAhb+FEUiOzuhFTfqDyPmzAhRge6ua0dQYT/Uh0t/EDHq05/i+e5M2d4XvjgarQ==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.12.13"
+    "@babel/template" "^7.12.13"
+    "@babel/types" "^7.14.2"
+
+"@babel/helper-get-function-arity@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583"
+  integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==
+  dependencies:
+    "@babel/types" "^7.12.13"
+
+"@babel/helper-hoist-variables@^7.13.0":
+  version "7.13.16"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.16.tgz#1b1651249e94b51f8f0d33439843e33e39775b30"
+  integrity sha512-1eMtTrXtrwscjcAeO4BVK+vvkxaLJSPFz1w1KLawz6HLNi9bPFGBNwwDyVfiu1Tv/vRRFYfoGaKhmAQPGPn5Wg==
+  dependencies:
+    "@babel/traverse" "^7.13.15"
+    "@babel/types" "^7.13.16"
+
+"@babel/helper-member-expression-to-functions@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz#dfe368f26d426a07299d8d6513821768216e6d72"
+  integrity sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw==
+  dependencies:
+    "@babel/types" "^7.13.12"
+
+"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.13.12", "@babel/helper-module-imports@^7.8.3":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz#c6a369a6f3621cb25da014078684da9196b61977"
+  integrity sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==
+  dependencies:
+    "@babel/types" "^7.13.12"
+
+"@babel/helper-module-transforms@^7.13.0", "@babel/helper-module-transforms@^7.14.0", "@babel/helper-module-transforms@^7.14.2":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.2.tgz#ac1cc30ee47b945e3e0c4db12fa0c5389509dfe5"
+  integrity sha512-OznJUda/soKXv0XhpvzGWDnml4Qnwp16GN+D/kZIdLsWoHj05kyu8Rm5kXmMef+rVJZ0+4pSGLkeixdqNUATDA==
+  dependencies:
+    "@babel/helper-module-imports" "^7.13.12"
+    "@babel/helper-replace-supers" "^7.13.12"
+    "@babel/helper-simple-access" "^7.13.12"
+    "@babel/helper-split-export-declaration" "^7.12.13"
+    "@babel/helper-validator-identifier" "^7.14.0"
+    "@babel/template" "^7.12.13"
+    "@babel/traverse" "^7.14.2"
+    "@babel/types" "^7.14.2"
+
+"@babel/helper-optimise-call-expression@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea"
+  integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==
+  dependencies:
+    "@babel/types" "^7.12.13"
+
+"@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af"
+  integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==
+
+"@babel/helper-remap-async-to-generator@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz#376a760d9f7b4b2077a9dd05aa9c3927cadb2209"
+  integrity sha512-pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.12.13"
+    "@babel/helper-wrap-function" "^7.13.0"
+    "@babel/types" "^7.13.0"
+
+"@babel/helper-replace-supers@^7.12.13", "@babel/helper-replace-supers@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz#6442f4c1ad912502481a564a7386de0c77ff3804"
+  integrity sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.13.12"
+    "@babel/helper-optimise-call-expression" "^7.12.13"
+    "@babel/traverse" "^7.13.0"
+    "@babel/types" "^7.13.12"
+
+"@babel/helper-simple-access@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz#dd6c538afb61819d205a012c31792a39c7a5eaf6"
+  integrity sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA==
+  dependencies:
+    "@babel/types" "^7.13.12"
+
+"@babel/helper-skip-transparent-expression-wrappers@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz#462dc63a7e435ade8468385c63d2b84cce4b3cbf"
+  integrity sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==
+  dependencies:
+    "@babel/types" "^7.12.1"
+
+"@babel/helper-split-export-declaration@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05"
+  integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==
+  dependencies:
+    "@babel/types" "^7.12.13"
+
+"@babel/helper-validator-identifier@^7.12.11", "@babel/helper-validator-identifier@^7.14.0":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz#d26cad8a47c65286b15df1547319a5d0bcf27288"
+  integrity sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==
+
+"@babel/helper-validator-option@^7.12.17":
+  version "7.12.17"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"
+  integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==
+
+"@babel/helper-wrap-function@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz#bdb5c66fda8526ec235ab894ad53a1235c79fcc4"
+  integrity sha512-1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA==
+  dependencies:
+    "@babel/helper-function-name" "^7.12.13"
+    "@babel/template" "^7.12.13"
+    "@babel/traverse" "^7.13.0"
+    "@babel/types" "^7.13.0"
+
+"@babel/helpers@^7.14.0", "@babel/helpers@^7.8.4":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.0.tgz#ea9b6be9478a13d6f961dbb5f36bf75e2f3b8f62"
+  integrity sha512-+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg==
+  dependencies:
+    "@babel/template" "^7.12.13"
+    "@babel/traverse" "^7.14.0"
+    "@babel/types" "^7.14.0"
+
+"@babel/highlight@^7.12.13":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz#3197e375711ef6bf834e67d0daec88e4f46113cf"
+  integrity sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.14.0"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
+"@babel/parser@^7.12.13", "@babel/parser@^7.14.2", "@babel/parser@^7.4.3", "@babel/parser@^7.8.7":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.2.tgz#0c1680aa44ad4605b16cbdcc5c341a61bde9c746"
+  integrity sha512-IoVDIHpsgE/fu7eXBeRWt8zLbDrSvD7H1gpomOkPpBoEN8KCruCqSDdqo8dddwQQrui30KSvQBaMUOJiuFu6QQ==
+
+"@babel/plugin-proposal-async-generator-functions@^7.8.3":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.2.tgz#3a2085abbf5d5f962d480dbc81347385ed62eb1e"
+  integrity sha512-b1AM4F6fwck4N8ItZ/AtC4FP/cqZqmKRQ4FaTDutwSYyjuhtvsGEMLK4N/ztV/ImP40BjIDyMgBQAeAMsQYVFQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-remap-async-to-generator" "^7.13.0"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+
+"@babel/plugin-proposal-dynamic-import@^7.8.3":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.2.tgz#01ebabd7c381cff231fa43e302939a9de5be9d9f"
+  integrity sha512-oxVQZIWFh91vuNEMKltqNsKLFWkOIyJc95k2Gv9lWVyDfPUQGSSlbDEgWuJUU1afGE9WwlzpucMZ3yDRHIItkA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+
+"@babel/plugin-proposal-json-strings@^7.8.3":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.2.tgz#830b4e2426a782e8b2878fbfe2cba85b70cbf98c"
+  integrity sha512-w2DtsfXBBJddJacXMBhElGEYqCZQqN99Se1qeYn8DVLB33owlrlLftIbMzn5nz1OITfDVknXF433tBrLEAOEjA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.2.tgz#425b11dc62fc26939a2ab42cbba680bdf5734546"
+  integrity sha512-ebR0zU9OvI2N4qiAC38KIAK75KItpIPTpAtd2r4OZmMFeKbKJpUFLYP2EuDut82+BmYi8sz42B+TfTptJ9iG5Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+
+"@babel/plugin-proposal-object-rest-spread@^7.8.3":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.2.tgz#e17d418f81cc103fedd4ce037e181c8056225abc"
+  integrity sha512-hBIQFxwZi8GIp934+nj5uV31mqclC1aYDhctDu5khTi9PCCUOczyy0b34W0oE9U/eJXiqQaKyVsmjeagOaSlbw==
+  dependencies:
+    "@babel/compat-data" "^7.14.0"
+    "@babel/helper-compilation-targets" "^7.13.16"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.14.2"
+
+"@babel/plugin-proposal-optional-catch-binding@^7.8.3":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.2.tgz#150d4e58e525b16a9a1431bd5326c4eed870d717"
+  integrity sha512-XtkJsmJtBaUbOxZsNk0Fvrv8eiqgneug0A6aqLFZ4TSkar2L5dSXWcnUKHgmjJt49pyB/6ZHvkr3dPgl9MOWRQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+
+"@babel/plugin-proposal-optional-chaining@^7.8.3":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.2.tgz#df8171a8b9c43ebf4c1dabe6311b432d83e1b34e"
+  integrity sha512-qQByMRPwMZJainfig10BoaDldx/+VDtNcrA7qdNaEOAj6VXud+gfrkA8j4CRAU5HjnWREXqIpSpH30qZX1xivA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+
+"@babel/plugin-proposal-unicode-property-regex@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz#bebde51339be829c17aaaaced18641deb62b39ba"
+  integrity sha512-XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-syntax-async-generators@^7.8.0", "@babel/plugin-syntax-async-generators@^7.8.4":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
+  integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-dynamic-import@^7.8.0", "@babel/plugin-syntax-dynamic-import@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
+  integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-json-strings@^7.8.0", "@babel/plugin-syntax-json-strings@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
+  integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
+  integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
+  integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-optional-catch-binding@^7.8.0", "@babel/plugin-syntax-optional-catch-binding@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
+  integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-optional-chaining@^7.8.0", "@babel/plugin-syntax-optional-chaining@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
+  integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-top-level-await@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178"
+  integrity sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-arrow-functions@^7.8.3":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz#10a59bebad52d637a027afa692e8d5ceff5e3dae"
+  integrity sha512-96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+
+"@babel/plugin-transform-async-to-generator@^7.8.3":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz#8e112bf6771b82bf1e974e5e26806c5c99aa516f"
+  integrity sha512-3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg==
+  dependencies:
+    "@babel/helper-module-imports" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-remap-async-to-generator" "^7.13.0"
+
+"@babel/plugin-transform-block-scoped-functions@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz#a9bf1836f2a39b4eb6cf09967739de29ea4bf4c4"
+  integrity sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-block-scoping@^7.8.3":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.2.tgz#761cb12ab5a88d640ad4af4aa81f820e6b5fdf5c"
+  integrity sha512-neZZcP19NugZZqNwMTH+KoBjx5WyvESPSIOQb4JHpfd+zPfqcH65RMu5xJju5+6q/Y2VzYrleQTr+b6METyyxg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+
+"@babel/plugin-transform-classes@^7.8.6":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.2.tgz#3f1196c5709f064c252ad056207d87b7aeb2d03d"
+  integrity sha512-7oafAVcucHquA/VZCsXv/gmuiHeYd64UJyyTYU+MPfNu0KeNlxw06IeENBO8bJjXVbolu+j1MM5aKQtH1OMCNg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.12.13"
+    "@babel/helper-function-name" "^7.14.2"
+    "@babel/helper-optimise-call-expression" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-replace-supers" "^7.13.12"
+    "@babel/helper-split-export-declaration" "^7.12.13"
+    globals "^11.1.0"
+
+"@babel/plugin-transform-computed-properties@^7.8.3":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz#845c6e8b9bb55376b1fa0b92ef0bdc8ea06644ed"
+  integrity sha512-RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+
+"@babel/plugin-transform-destructuring@^7.8.3":
+  version "7.13.17"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.17.tgz#678d96576638c19d5b36b332504d3fd6e06dea27"
+  integrity sha512-UAUqiLv+uRLO+xuBKKMEpC+t7YRNVRqBsWWq1yKXbBZBje/t3IXCiSinZhjn/DC3qzBfICeYd2EFGEbHsh5RLA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+
+"@babel/plugin-transform-dotall-regex@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz#3f1601cc29905bfcb67f53910f197aeafebb25ad"
+  integrity sha512-foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-duplicate-keys@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz#6f06b87a8b803fd928e54b81c258f0a0033904de"
+  integrity sha512-NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-exponentiation-operator@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz#4d52390b9a273e651e4aba6aee49ef40e80cd0a1"
+  integrity sha512-fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA==
+  dependencies:
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-for-of@^7.8.6":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz#c799f881a8091ac26b54867a845c3e97d2696062"
+  integrity sha512-IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+
+"@babel/plugin-transform-function-name@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz#bb024452f9aaed861d374c8e7a24252ce3a50051"
+  integrity sha512-6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ==
+  dependencies:
+    "@babel/helper-function-name" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-literals@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz#2ca45bafe4a820197cf315794a4d26560fe4bdb9"
+  integrity sha512-FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-member-expression-literals@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz#5ffa66cd59b9e191314c9f1f803b938e8c081e40"
+  integrity sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-modules-amd@^7.8.3":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.2.tgz#6622806fe1a7c07a1388444222ef9535f2ca17b0"
+  integrity sha512-hPC6XBswt8P3G2D1tSV2HzdKvkqOpmbyoy+g73JG0qlF/qx2y3KaMmXb1fLrpmWGLZYA0ojCvaHdzFWjlmV+Pw==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.14.2"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
+"@babel/plugin-transform-modules-commonjs@^7.8.3":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.0.tgz#52bc199cb581e0992edba0f0f80356467587f161"
+  integrity sha512-EX4QePlsTaRZQmw9BsoPeyh5OCtRGIhwfLquhxGp5e32w+dyL8htOcDwamlitmNFK6xBZYlygjdye9dbd9rUlQ==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.14.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-simple-access" "^7.13.12"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
+"@babel/plugin-transform-modules-systemjs@^7.8.3":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz#6d066ee2bff3c7b3d60bf28dec169ad993831ae3"
+  integrity sha512-hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A==
+  dependencies:
+    "@babel/helper-hoist-variables" "^7.13.0"
+    "@babel/helper-module-transforms" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-validator-identifier" "^7.12.11"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
+"@babel/plugin-transform-modules-umd@^7.8.3":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.0.tgz#2f8179d1bbc9263665ce4a65f305526b2ea8ac34"
+  integrity sha512-nPZdnWtXXeY7I87UZr9VlsWme3Y0cfFFE41Wbxz4bbaexAjNMInXPFUpRRUJ8NoMm0Cw+zxbqjdPmLhcjfazMw==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.14.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+
+"@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz#2213725a5f5bbbe364b50c3ba5998c9599c5c9d9"
+  integrity sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
+
+"@babel/plugin-transform-new-target@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz#e22d8c3af24b150dd528cbd6e685e799bf1c351c"
+  integrity sha512-/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-object-super@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz#b4416a2d63b8f7be314f3d349bd55a9c1b5171f7"
+  integrity sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-replace-supers" "^7.12.13"
+
+"@babel/plugin-transform-parameters@^7.14.2", "@babel/plugin-transform-parameters@^7.8.7":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.2.tgz#e4290f72e0e9e831000d066427c4667098decc31"
+  integrity sha512-NxoVmA3APNCC1JdMXkdYXuQS+EMdqy0vIwyDHeKHiJKRxmp1qGSdb0JLEIoPRhkx6H/8Qi3RJ3uqOCYw8giy9A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+
+"@babel/plugin-transform-property-literals@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz#4e6a9e37864d8f1b3bc0e2dce7bf8857db8b1a81"
+  integrity sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-regenerator@^7.8.7":
+  version "7.13.15"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.13.15.tgz#e5eb28945bf8b6563e7f818945f966a8d2997f39"
+  integrity sha512-Bk9cOLSz8DiurcMETZ8E2YtIVJbFCPGW28DJWUakmyVWtQSm6Wsf0p4B4BfEr/eL2Nkhe/CICiUiMOCi1TPhuQ==
+  dependencies:
+    regenerator-transform "^0.14.2"
+
+"@babel/plugin-transform-reserved-words@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz#7d9988d4f06e0fe697ea1d9803188aa18b472695"
+  integrity sha512-xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-shorthand-properties@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz#db755732b70c539d504c6390d9ce90fe64aff7ad"
+  integrity sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-spread@^7.8.3":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz#84887710e273c1815ace7ae459f6f42a5d31d5fd"
+  integrity sha512-V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
+
+"@babel/plugin-transform-sticky-regex@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz#760ffd936face73f860ae646fb86ee82f3d06d1f"
+  integrity sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-template-literals@^7.8.3":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz#a36049127977ad94438dee7443598d1cefdf409d"
+  integrity sha512-d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+
+"@babel/plugin-transform-typeof-symbol@^7.8.4":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz#785dd67a1f2ea579d9c2be722de8c84cb85f5a7f"
+  integrity sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-transform-unicode-regex@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz#b52521685804e155b1202e83fc188d34bb70f5ac"
+  integrity sha512-mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/preset-env@7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.8.7.tgz#1fc7d89c7f75d2d70c2b6768de6c2e049b3cb9db"
+  integrity sha512-BYftCVOdAYJk5ASsznKAUl53EMhfBbr8CJ1X+AJLfGPscQkwJFiaV/Wn9DPH/7fzm2v6iRYJKYHSqyynTGw0nw==
+  dependencies:
+    "@babel/compat-data" "^7.8.6"
+    "@babel/helper-compilation-targets" "^7.8.7"
+    "@babel/helper-module-imports" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/plugin-proposal-async-generator-functions" "^7.8.3"
+    "@babel/plugin-proposal-dynamic-import" "^7.8.3"
+    "@babel/plugin-proposal-json-strings" "^7.8.3"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.8.3"
+    "@babel/plugin-proposal-object-rest-spread" "^7.8.3"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.8.3"
+    "@babel/plugin-proposal-optional-chaining" "^7.8.3"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.8.3"
+    "@babel/plugin-syntax-async-generators" "^7.8.0"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
+    "@babel/plugin-syntax-json-strings" "^7.8.0"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
+    "@babel/plugin-syntax-top-level-await" "^7.8.3"
+    "@babel/plugin-transform-arrow-functions" "^7.8.3"
+    "@babel/plugin-transform-async-to-generator" "^7.8.3"
+    "@babel/plugin-transform-block-scoped-functions" "^7.8.3"
+    "@babel/plugin-transform-block-scoping" "^7.8.3"
+    "@babel/plugin-transform-classes" "^7.8.6"
+    "@babel/plugin-transform-computed-properties" "^7.8.3"
+    "@babel/plugin-transform-destructuring" "^7.8.3"
+    "@babel/plugin-transform-dotall-regex" "^7.8.3"
+    "@babel/plugin-transform-duplicate-keys" "^7.8.3"
+    "@babel/plugin-transform-exponentiation-operator" "^7.8.3"
+    "@babel/plugin-transform-for-of" "^7.8.6"
+    "@babel/plugin-transform-function-name" "^7.8.3"
+    "@babel/plugin-transform-literals" "^7.8.3"
+    "@babel/plugin-transform-member-expression-literals" "^7.8.3"
+    "@babel/plugin-transform-modules-amd" "^7.8.3"
+    "@babel/plugin-transform-modules-commonjs" "^7.8.3"
+    "@babel/plugin-transform-modules-systemjs" "^7.8.3"
+    "@babel/plugin-transform-modules-umd" "^7.8.3"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3"
+    "@babel/plugin-transform-new-target" "^7.8.3"
+    "@babel/plugin-transform-object-super" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.8.7"
+    "@babel/plugin-transform-property-literals" "^7.8.3"
+    "@babel/plugin-transform-regenerator" "^7.8.7"
+    "@babel/plugin-transform-reserved-words" "^7.8.3"
+    "@babel/plugin-transform-shorthand-properties" "^7.8.3"
+    "@babel/plugin-transform-spread" "^7.8.3"
+    "@babel/plugin-transform-sticky-regex" "^7.8.3"
+    "@babel/plugin-transform-template-literals" "^7.8.3"
+    "@babel/plugin-transform-typeof-symbol" "^7.8.4"
+    "@babel/plugin-transform-unicode-regex" "^7.8.3"
+    "@babel/types" "^7.8.7"
+    browserslist "^4.8.5"
+    core-js-compat "^3.6.2"
+    invariant "^2.2.2"
+    levenary "^1.1.1"
+    semver "^5.5.0"
+
+"@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.0.tgz#46794bc20b612c5f75e62dd071e24dfd95f1cbe6"
+  integrity sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
+"@babel/runtime@^7.14.0":
+  version "7.18.3"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.3.tgz#c7b654b57f6f63cf7f8b418ac9ca04408c4579f4"
+  integrity sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
+"@babel/template@^7.12.13", "@babel/template@^7.4.0", "@babel/template@^7.8.6":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327"
+  integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@babel/parser" "^7.12.13"
+    "@babel/types" "^7.12.13"
+
+"@babel/traverse@^7.13.0", "@babel/traverse@^7.13.15", "@babel/traverse@^7.14.0", "@babel/traverse@^7.14.2", "@babel/traverse@^7.4.3", "@babel/traverse@^7.8.6":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.2.tgz#9201a8d912723a831c2679c7ebbf2fe1416d765b"
+  integrity sha512-TsdRgvBFHMyHOOzcP9S6QU0QQtjxlRpEYOy3mcCO5RgmC305ki42aSAmfZEMSSYBla2oZ9BMqYlncBaKmD/7iA==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@babel/generator" "^7.14.2"
+    "@babel/helper-function-name" "^7.14.2"
+    "@babel/helper-split-export-declaration" "^7.12.13"
+    "@babel/parser" "^7.14.2"
+    "@babel/types" "^7.14.2"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
+"@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.16", "@babel/types@^7.14.0", "@babel/types@^7.14.2", "@babel/types@^7.4.0", "@babel/types@^7.8.7":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.2.tgz#4208ae003107ef8a057ea8333e56eb64d2f6a2c3"
+  integrity sha512-SdjAG/3DikRHpUOjxZgnkbR11xUlyDMUFJdvnIgZEE16mqmY0BINMmc4//JMJglEmn6i7sq6p+mGrFWyZ98EEw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.14.0"
+    to-fast-properties "^2.0.0"
+
+"@egjs/hammerjs@^2.0.15":
+  version "2.0.17"
+  resolved "https://registry.yarnpkg.com/@egjs/hammerjs/-/hammerjs-2.0.17.tgz#5dc02af75a6a06e4c2db0202cae38c9263895124"
+  integrity sha512-XQsZgjm2EcVUiZQf11UBJQfmZeEmOW8DpI1gsFeln6w0ae0ii4dMQEQ0kjl6DspdWX1aGY1/loyXnP0JS06e/A==
+  dependencies:
+    "@types/hammerjs" "^2.0.36"
+
+"@fimbul/bifrost@^0.21.0":
+  version "0.21.0"
+  resolved "https://registry.yarnpkg.com/@fimbul/bifrost/-/bifrost-0.21.0.tgz#d0fafa25938fda475657a6a1e407a21bbe02c74e"
+  integrity sha512-ou8VU+nTmOW1jeg+FT+sn+an/M0Xb9G16RucrfhjXGWv1Q97kCoM5CG9Qj7GYOSdu7km72k7nY83Eyr53Bkakg==
+  dependencies:
+    "@fimbul/ymir" "^0.21.0"
+    get-caller-file "^2.0.0"
+    tslib "^1.8.1"
+    tsutils "^3.5.0"
+
+"@fimbul/ymir@^0.21.0":
+  version "0.21.0"
+  resolved "https://registry.yarnpkg.com/@fimbul/ymir/-/ymir-0.21.0.tgz#8525726787aceeafd4e199472c0d795160b5d4a1"
+  integrity sha512-T/y7WqPsm4n3zhT08EpB5sfdm2Kvw3gurAxr2Lr5dQeLi8ZsMlNT/Jby+ZmuuAAd1PnXYzKp+2SXgIkQIIMCUg==
+  dependencies:
+    inversify "^5.0.0"
+    reflect-metadata "^0.1.12"
+    tslib "^1.8.1"
+
+"@fullhuman/postcss-purgecss@^2.1.2":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@fullhuman/postcss-purgecss/-/postcss-purgecss-2.3.0.tgz#50a954757ec78696615d3e118e3fee2d9291882e"
+  integrity sha512-qnKm5dIOyPGJ70kPZ5jiz0I9foVOic0j+cOzNDoo8KoCf6HjicIZ99UfO2OmE7vCYSKAAepEwJtNzpiiZAh9xw==
+  dependencies:
+    postcss "7.0.32"
+    purgecss "^2.3.0"
+
+"@istanbuljs/schema@^0.1.2":
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
+  integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
+
+"@ngtools/webpack@8.3.29":
+  version "8.3.29"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-8.3.29.tgz#7b6984cdccd633dd687e9413a89a2d9e1360f76c"
+  integrity sha512-7uB7dlAHR7RmxcQCYidnWRR1tFRJq7CzI+MM3725ibAvi4HnM5viC/HnKRTK7V+3iS1C0l0u0Gyo/769NsUDTQ==
+  dependencies:
+    "@angular-devkit/core" "8.3.29"
+    enhanced-resolve "4.1.0"
+    rxjs "6.4.0"
+    tree-kill "1.2.2"
+    webpack-sources "1.4.3"
+
+"@nodelib/fs.scandir@2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69"
+  integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==
+  dependencies:
+    "@nodelib/fs.stat" "2.0.4"
+    run-parallel "^1.1.9"
+
+"@nodelib/fs.stat@2.0.4", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655"
+  integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==
+
+"@nodelib/fs.walk@^1.2.3":
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063"
+  integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==
+  dependencies:
+    "@nodelib/fs.scandir" "2.1.4"
+    fastq "^1.6.0"
+
+"@npmcli/move-file@^1.0.1":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
+  integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==
+  dependencies:
+    mkdirp "^1.0.4"
+    rimraf "^3.0.2"
+
+"@polka/url@^1.0.0-next.20":
+  version "1.0.0-next.21"
+  resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1"
+  integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==
+
+"@popperjs/core@^2.4.0":
+  version "2.9.2"
+  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.2.tgz#adea7b6953cbb34651766b0548468e743c6a2353"
+  integrity sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==
+
+"@project-sunbird/telemetry-sdk@0.0.26":
+  version "0.0.26"
+  resolved "https://registry.yarnpkg.com/@project-sunbird/telemetry-sdk/-/telemetry-sdk-0.0.26.tgz#15a7776e0d94da3c844161b1400612303756a830"
+  integrity sha512-8r8tf+YN+z8A4KHBmL8/wxDIKGkASDHMMxyhlI9/iWv83sueoN5qHB6QnqgtIRyEdFjt4Tum5u18/oB71Bb0PQ==
+  dependencies:
+    grunt-karma "^0.12.2"
+    karma "^3.0.0"
+
+"@schematics/angular@8.3.29":
+  version "8.3.29"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-8.3.29.tgz#da747539230dae16111c56422339c02dbb17681d"
+  integrity sha512-If+UhCsQzCgnQymiiF8dQRoic34+RgJ6rV0n4k7Tm4N2xNYJOG7ajjzKM7PIeafsF50FKnFP8dqaNGxCMyq5Ew==
+  dependencies:
+    "@angular-devkit/core" "8.3.29"
+    "@angular-devkit/schematics" "8.3.29"
+
+"@schematics/update@0.803.29":
+  version "0.803.29"
+  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.803.29.tgz#ad3c9bfe8c6d877a0ea692ae4760f0d72f3e0cc9"
+  integrity sha512-Syf6h6DYeu1WU9aLihMwIgVASpcHCxUYqhZyHfQABiK8NkdlZ+KAp4cOxihsZyDqIJNLWON+0/FLPAQF3BXh5Q==
+  dependencies:
+    "@angular-devkit/core" "8.3.29"
+    "@angular-devkit/schematics" "8.3.29"
+    "@yarnpkg/lockfile" "1.1.0"
+    ini "1.3.5"
+    pacote "9.5.5"
+    rxjs "6.4.0"
+    semver "6.3.0"
+    semver-intersect "1.4.0"
+
+"@sindresorhus/is@^0.14.0":
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
+  integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
+
+"@sunbird-cb/collection@^1.0.19":
+  version "1.0.19"
+  resolved "https://registry.yarnpkg.com/@sunbird-cb/collection/-/collection-1.0.19.tgz#ee857cf41667d90ab40086130b90033176e8d928"
+  integrity sha512-uo1L6JzKyc1WAOae3UonpAwgRotAMUbTxoDrP60iXnbiC5eBgK6yOleiGJ6szW51YfYte/Pc5rTUGuQ9ew+MRQ==
+  dependencies:
+    tslib "^1.9.0"
+
+"@sunbird-cb/design-system@0.0.1":
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/@sunbird-cb/design-system/-/design-system-0.0.1.tgz#66795a90e6a3fe3609cd574e694ad296fdc9a1a5"
+  integrity sha512-GYfnfpNfzZjnU5Ss+xfSdVbvyek97Yq8cDVsfT4+R0MgsIYnI4gqx7G0Qvx9caZYgb3eoE6wlsyb0K2aWyO+UQ==
+
+"@sunbird-cb/rain-dashboards@^0.2.8":
+  version "0.2.9"
+  resolved "https://registry.yarnpkg.com/@sunbird-cb/rain-dashboards/-/rain-dashboards-0.2.9.tgz#6fbcf82386e09475901137411ca5fee7d0c8c29f"
+  integrity sha512-4i3AL3r0MIS0cLTR2bW1sNJ9QdQY0Yyx2z3HIcqZlvWQdb6GE3vobYwtX1Tn1APy/2eUBlLKwO+BDF0QqQ50LA==
+  dependencies:
+    tslib "^1.9.0"
+
+"@sunbird-cb/resolver@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@sunbird-cb/resolver/-/resolver-1.0.0.tgz#30e5350cbd54af259cdb279ed79bdacad6fd2650"
+  integrity sha512-UJkXVT4LurSVcOg/M/mHdYagfsvLl9n1iLFnn8mzD7jwrjcGQorc2Cmrj1WBvKQuve7me3zMCcATD8UMCHv4Ug==
+  dependencies:
+    tslib "^1.9.0"
+
+"@sunbird-cb/utils@^1.0.12":
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/@sunbird-cb/utils/-/utils-1.0.12.tgz#a5c76678769bfd4858bce457a64946e7ebb55fd9"
+  integrity sha512-QkcVHXthZGDtaJWWQgYHXp8vaY/V/oCrR4xXNrKK0qeZJ5NlrwjqRiDoyVNziG37sNX0V/G0ejmqqTUSBG0Oew==
+  dependencies:
+    tslib "^1.9.0"
+
+"@szmarczak/http-timer@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
+  integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==
+  dependencies:
+    defer-to-connect "^1.0.1"
+
+"@types/chart.js@^2.7.48", "@types/chart.js@^2.7.56":
+  version "2.9.32"
+  resolved "https://registry.yarnpkg.com/@types/chart.js/-/chart.js-2.9.32.tgz#b17d9a8c41ad348183a2ce041ebdeef892998251"
+  integrity sha512-d45JiRQwEOlZiKwukjqmqpbqbYzUX2yrXdH9qVn6kXpPDsTYCo6YbfFOlnUaJ8S/DhJwbBJiLsMjKpW5oP8B2A==
+  dependencies:
+    moment "^2.10.2"
+
+"@types/d3-array@^1":
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/@types/d3-array/-/d3-array-1.2.8.tgz#b852381cb68e31e46bfa23ee70a383cbc6d62146"
+  integrity sha512-wWV0wT6oLUGprrOR5LMK7Dh8EBiondhnqINsvazv6UucYfTdb2oaFF4knlqzZV2RKB9ZC9G7G1Iojt8b/wolsw==
+
+"@types/d3-axis@^1":
+  version "1.0.14"
+  resolved "https://registry.yarnpkg.com/@types/d3-axis/-/d3-axis-1.0.14.tgz#4ff27eb94fab10efbda6c972e1fbb26ea696655b"
+  integrity sha512-wZAKX/dtFT5t5iuCaiU0QL0BWB19TE6h7C7kgfBVyoka7zidQWvf8E9zQTJ5bNPBQxd0+JmplNqwy1M8O8FOjA==
+  dependencies:
+    "@types/d3-selection" "^1"
+
+"@types/d3-brush@^1":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@types/d3-brush/-/d3-brush-1.1.4.tgz#0b5cc9c57476d0144b991228b44664e08494b7f3"
+  integrity sha512-2t8CgWaha9PsPdSZJ9m6Jl4awqf3DGIXek2e7gfheyfP2R0a/18MX+wuLHx+LyI1Ad7lxDsPWcswKD0XhQEjmg==
+  dependencies:
+    "@types/d3-selection" "^1"
+
+"@types/d3-chord@^1":
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/@types/d3-chord/-/d3-chord-1.0.10.tgz#4c14ca40f61b89a3c615d63f5a34fcc81390805c"
+  integrity sha512-U6YojfET6ITL1/bUJo+/Lh3pMV9XPAfOWwbshl3y3RlgAX9VO/Bxa13IMAylZIDY4VsA3Gkh29kZP1AcAeyoYA==
+
+"@types/d3-collection@*":
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/@types/d3-collection/-/d3-collection-1.0.10.tgz#bca161e336156968f267c077f7f2bfa8ff224e58"
+  integrity sha512-54Fdv8u5JbuXymtmXm2SYzi1x/Svt+jfWBU5junkhrCewL92VjqtCBDn97coBRVwVFmYNnVTNDyV8gQyPYfm+A==
+
+"@types/d3-color@^1":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@types/d3-color/-/d3-color-1.4.1.tgz#0d9746c84dfef28807b2989eed4f37b2575e1f33"
+  integrity sha512-xkPLi+gbgUU9ED6QX4g6jqYL2KCB0/3AlM+ncMGqn49OgH0gFMY/ITGqPF8HwEiLzJaC+2L0I+gNwBgABv1Pvg==
+
+"@types/d3-contour@^1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@types/d3-contour/-/d3-contour-1.3.1.tgz#589dc3eec14168eea7e31edd1e3bbe246cc9d626"
+  integrity sha512-wWwsM/3NfKTRBdH00cSf+XlsaHlNTkvH66PgDedobyvKQZ4sJrXXpr16LXvDnAal4B67v8JGrWDgyx6dqqKLuQ==
+  dependencies:
+    "@types/d3-array" "^1"
+    "@types/geojson" "*"
+
+"@types/d3-dispatch@^1":
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/@types/d3-dispatch/-/d3-dispatch-1.0.9.tgz#c5a180f1e251de853b399cfbfbb6dd7f8bf842ae"
+  integrity sha512-zJ44YgjqALmyps+II7b1mZLhrtfV/FOxw9owT87mrweGWcg+WK5oiJX2M3SYJ0XUAExBduarysfgbR11YxzojQ==
+
+"@types/d3-drag@^1":
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/@types/d3-drag/-/d3-drag-1.2.5.tgz#0b1b852cb41577075aa625ae6149379ea6c34dfd"
+  integrity sha512-7NeTnfolst1Js3Vs7myctBkmJWu6DMI3k597AaHUX98saHjHWJ6vouT83UrpE+xfbSceHV+8A0JgxuwgqgmqWw==
+  dependencies:
+    "@types/d3-selection" "^1"
+
+"@types/d3-dsv@^1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@types/d3-dsv/-/d3-dsv-1.2.1.tgz#1524fee9f19d689c2f76aa0e24e230762bf96994"
+  integrity sha512-LLmJmjiqp/fTNEdij5bIwUJ6P6TVNk5hKM9/uk5RPO2YNgEu9XvKO0dJ7Iqd3psEdmZN1m7gB1bOsjr4HmO2BA==
+
+"@types/d3-ease@^1":
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/@types/d3-ease/-/d3-ease-1.0.10.tgz#09910e8558439b6038a7ed620650e510394ffa6d"
+  integrity sha512-fMFTCzd8DOwruE9zlu2O8ci5ct+U5jkGcDS+cH+HCidnJlDs0MZ+TuSVCFtEzh4E5MasItwy+HvgoFtxPHa5Cw==
+
+"@types/d3-fetch@^1":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@types/d3-fetch/-/d3-fetch-1.2.2.tgz#b93bfe248b8b761af82f4dac57959c989f67da3e"
+  integrity sha512-rtFs92GugtV/NpiJQd0WsmGLcg52tIL0uF0bKbbJg231pR9JEb6HT4AUwrtuLq3lOeKdLBhsjV14qb0pMmd0Aw==
+  dependencies:
+    "@types/d3-dsv" "^1"
+
+"@types/d3-force@^1":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@types/d3-force/-/d3-force-1.2.2.tgz#6337a146dbdf2781f5dde5bb491a646fd03d7bc4"
+  integrity sha512-TN7KO7sk0tJauedIt0q20RQRFo4V3v97pJKO/TDK40X3LaPM1aXRM2+zFF+nRMtseEiszg4KffudhjR8a3+4cg==
+
+"@types/d3-format@^1":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@types/d3-format/-/d3-format-1.4.1.tgz#1e657a219e4b1e3931508a610d570bdec8ecdd9d"
+  integrity sha512-ss9G2snEKmp2In5Z3T0Jpqv8QaDBc2xHltBw83KjnV5B5w+Iwphbvq5ph/Xnu4d03fmmsdt+o1aWch379rxIbA==
+
+"@types/d3-geo@^1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@types/d3-geo/-/d3-geo-1.12.1.tgz#bec8692ffee9f60e18483af9008f92d4a8428118"
+  integrity sha512-8+gyGFyMCXIHtnMNKQDT++tZ4XYFXgiP5NK7mcv34aYXA16GQFiBBITjKzxghpO8QNVceOd9rUn1JY92WLNGQw==
+  dependencies:
+    "@types/geojson" "*"
+
+"@types/d3-hierarchy@^1":
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/@types/d3-hierarchy/-/d3-hierarchy-1.1.7.tgz#14a57b0539f8929015f8ad96490de50a16211040"
+  integrity sha512-fvht6DOYKzqmXjMb/+xfgkmrWM4SD7rMA/ZbM+gGwr9ZTuIDfky95J8CARtaJo/ExeWyS0xGVdL2gqno2zrQ0Q==
+
+"@types/d3-interpolate@^1":
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/@types/d3-interpolate/-/d3-interpolate-1.4.2.tgz#88902a205f682773a517612299a44699285eed7b"
+  integrity sha512-ylycts6llFf8yAEs1tXzx2loxxzDZHseuhPokrqKprTQSTcD3JbJI1omZP1rphsELZO3Q+of3ff0ZS7+O6yVzg==
+  dependencies:
+    "@types/d3-color" "^1"
+
+"@types/d3-path@^1":
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/@types/d3-path/-/d3-path-1.0.9.tgz#73526b150d14cd96e701597cbf346cfd1fd4a58c"
+  integrity sha512-NaIeSIBiFgSC6IGUBjZWcscUJEq7vpVu7KthHN8eieTV9d9MqkSOZLH4chq1PmcKy06PNe3axLeKmRIyxJ+PZQ==
+
+"@types/d3-polygon@^1":
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@types/d3-polygon/-/d3-polygon-1.0.8.tgz#127ee83fccda5bf57384011da90f31367fea1530"
+  integrity sha512-1TOJPXCBJC9V3+K3tGbTqD/CsqLyv/YkTXAcwdsZzxqw5cvpdnCuDl42M4Dvi8XzMxZNCT9pL4ibrK2n4VmAcw==
+
+"@types/d3-quadtree@^1":
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@types/d3-quadtree/-/d3-quadtree-1.0.8.tgz#980998eb20d5e1c1494089ad9a8466a0e98825a7"
+  integrity sha512-FuqYiexeSQZlc+IcGAVK8jSJKDFKHcSf/jx8rqJUUVx6rzv7ecQiXKyatrLHHh3W4CAvgNeVI23JKgk4+x2wFg==
+
+"@types/d3-random@^1":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@types/d3-random/-/d3-random-1.1.3.tgz#8f7fdc23f92d1561e0694eb49567e8ab50537a19"
+  integrity sha512-XXR+ZbFCoOd4peXSMYJzwk0/elP37WWAzS/DG+90eilzVbUSsgKhBcWqylGWe+lA2ubgr7afWAOBaBxRgMUrBQ==
+
+"@types/d3-scale-chromatic@^1":
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/@types/d3-scale-chromatic/-/d3-scale-chromatic-1.5.1.tgz#e2b7c3401e5c13809f831911eb820e444f4fc67a"
+  integrity sha512-7FtJYrmXTEWLykShjYhoGuDNR/Bda0+tstZMkFj4RRxUEryv16AGh3be21tqg84B6KfEwiZyEpBcTyPyU+GWjg==
+
+"@types/d3-scale@^2":
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/@types/d3-scale/-/d3-scale-2.2.4.tgz#ca0d4b84d2f88fe058480f81354d14041a667b96"
+  integrity sha512-wkQXT+IfgfAnKB5rtS1qMJg3FS32r1rVFHvqtiqk8pX8o5aQR3VwX1P7ErHjzNIicTlkWsaMiUTrYB+E75HFeA==
+  dependencies:
+    "@types/d3-time" "^1"
+
+"@types/d3-selection@^1":
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/@types/d3-selection/-/d3-selection-1.4.3.tgz#36928bbe64eb8e0bbcbaa01fb05c21ff6c71fa93"
+  integrity sha512-GjKQWVZO6Sa96HiKO6R93VBE8DUW+DDkFpIMf9vpY5S78qZTlRRSNUsHr/afDpF7TvLDV7VxrUFOWW7vdIlYkA==
+
+"@types/d3-shape@^1":
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/@types/d3-shape/-/d3-shape-1.3.5.tgz#c0164c1be1429473016f855871d487f806c4e968"
+  integrity sha512-aPEax03owTAKynoK8ZkmkZEDZvvT4Y5pWgii4Jp4oQt0gH45j6siDl9gNDVC5kl64XHN2goN9jbYoHK88tFAcA==
+  dependencies:
+    "@types/d3-path" "^1"
+
+"@types/d3-time-format@^2":
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/@types/d3-time-format/-/d3-time-format-2.3.1.tgz#87a30e4513b9d1d53b920327a361f87255bf3372"
+  integrity sha512-fck0Z9RGfIQn3GJIEKVrp15h9m6Vlg0d5XXeiE/6+CQiBmMDZxfR21XtjEPuDeg7gC3bBM0SdieA5XF3GW1wKA==
+
+"@types/d3-time@^1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@types/d3-time/-/d3-time-1.1.1.tgz#6cf3a4242c3bbac00440dfb8ba7884f16bedfcbf"
+  integrity sha512-ULX7LoqXTCYtM+tLYOaeAJK7IwCT+4Gxlm2MaH0ErKLi07R5lh8NHCAyWcDkCCmx1AfRcBEV6H9QE9R25uP7jw==
+
+"@types/d3-timer@^1":
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/@types/d3-timer/-/d3-timer-1.0.10.tgz#329c51c2c931f44ed0acff78b8c84571acf0ed21"
+  integrity sha512-ZnAbquVqy+4ZjdW0cY6URp+qF/AzTVNda2jYyOzpR2cPT35FTXl78s15Bomph9+ckOiI1TtkljnWkwbIGAb6rg==
+
+"@types/d3-transition@^1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@types/d3-transition/-/d3-transition-1.3.1.tgz#5d658eea2db17684daa04eda81d7db9824d3463f"
+  integrity sha512-U9CpMlTL/NlqdGXBlHYxTZwbmy/vN1cFv8TuAIFPX+xOW/1iChbeJBY2xmINhDQfkGJbgkH4IovafCwI1ZDrgg==
+  dependencies:
+    "@types/d3-selection" "^1"
+
+"@types/d3-voronoi@*":
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/@types/d3-voronoi/-/d3-voronoi-1.1.9.tgz#7bbc210818a3a5c5e0bafb051420df206617c9e5"
+  integrity sha512-DExNQkaHd1F3dFPvGA/Aw2NGyjMln6E9QzsiqOcBgnE+VInYnFBHBBySbZQts6z6xD+5jTfKCP7M4OqMyVjdwQ==
+
+"@types/d3-zoom@^1":
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/@types/d3-zoom/-/d3-zoom-1.8.2.tgz#187d33f9ffa59811ce93b2eacd32d92c1ef03f16"
+  integrity sha512-rU0LirorUxkLxEHSzkFs7pPC0KWsxRGc0sHrxEDR0/iQq+7/xpNkKuuOOwthlgvOtpOvtTLJ2JFOD6Kr0Si4Uw==
+  dependencies:
+    "@types/d3-interpolate" "^1"
+    "@types/d3-selection" "^1"
+
+"@types/d3@^5.7.2":
+  version "5.16.4"
+  resolved "https://registry.yarnpkg.com/@types/d3/-/d3-5.16.4.tgz#a7dc24a3dc1c19922eee72ba16144fd5bcea987a"
+  integrity sha512-2u0O9iP1MubFiQ+AhR1id4Egs+07BLtvRATG6IL2Gs9+KzdrfaxCKNq5hxEyw1kxwsqB/lCgr108XuHcKtb/5w==
+  dependencies:
+    "@types/d3-array" "^1"
+    "@types/d3-axis" "^1"
+    "@types/d3-brush" "^1"
+    "@types/d3-chord" "^1"
+    "@types/d3-collection" "*"
+    "@types/d3-color" "^1"
+    "@types/d3-contour" "^1"
+    "@types/d3-dispatch" "^1"
+    "@types/d3-drag" "^1"
+    "@types/d3-dsv" "^1"
+    "@types/d3-ease" "^1"
+    "@types/d3-fetch" "^1"
+    "@types/d3-force" "^1"
+    "@types/d3-format" "^1"
+    "@types/d3-geo" "^1"
+    "@types/d3-hierarchy" "^1"
+    "@types/d3-interpolate" "^1"
+    "@types/d3-path" "^1"
+    "@types/d3-polygon" "^1"
+    "@types/d3-quadtree" "^1"
+    "@types/d3-random" "^1"
+    "@types/d3-scale" "^2"
+    "@types/d3-scale-chromatic" "^1"
+    "@types/d3-selection" "^1"
+    "@types/d3-shape" "^1"
+    "@types/d3-time" "^1"
+    "@types/d3-time-format" "^2"
+    "@types/d3-timer" "^1"
+    "@types/d3-transition" "^1"
+    "@types/d3-voronoi" "*"
+    "@types/d3-zoom" "^1"
+
+"@types/estree@*":
+  version "0.0.47"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.47.tgz#d7a51db20f0650efec24cd04994f523d93172ed4"
+  integrity sha512-c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg==
+
+"@types/file-saver@^2.0.1":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@types/file-saver/-/file-saver-2.0.2.tgz#bd593ccfaee42ff94a5c1c83bf69ae9be83493b9"
+  integrity sha512-xbqnZmGrCEqi/KUzOkeUSe77p7APvLuyellGaAoeww3CHJ1AbjQWjPSCFtKIzZn8L7LpEax4NXnC+gfa6nM7IA==
+
+"@types/geojson@*":
+  version "7946.0.7"
+  resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.7.tgz#c8fa532b60a0042219cdf173ca21a975ef0666ad"
+  integrity sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ==
+
+"@types/glob@^7.1.1":
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183"
+  integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==
+  dependencies:
+    "@types/minimatch" "*"
+    "@types/node" "*"
+
+"@types/hammerjs@^2.0.36":
+  version "2.0.39"
+  resolved "https://registry.yarnpkg.com/@types/hammerjs/-/hammerjs-2.0.39.tgz#4be64bbacf3813c79c0dab895c6b0fdc7d5e513f"
+  integrity sha512-lYR2Y/tV2ujpk/WyUc7S0VLI0a9hrtVIN9EwnrNo5oSEJI2cK2/XrgwOQmXLL3eTulOESvh9qP6si9+DWM9cOA==
+
+"@types/jasmine@*":
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.7.2.tgz#f83ca1936f8cf5d3375506b481f52f8903c2df21"
+  integrity sha512-w5Zc9pSwxlr1ne+froeIceYbrh0a2Us+0kTaX6JA0N7nPh+yv1zN10LyDMKwnT0x2AbIDGlrD1cv6plVjfCcZw==
+
+"@types/jasmine@~3.4.0":
+  version "3.4.6"
+  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.4.6.tgz#afcb210af0fa751b85a96b2034eedada65390be1"
+  integrity sha512-hpQHs+lmZ0uuCrGyqypdI1Ho7jRFolOBT6OkNdZPFziLSSEKvWu+VxWU6bGdNEA/hoV4jV8pdDeNx8EWlmfNAw==
+
+"@types/jasminewd2@~2.0.6":
+  version "2.0.9"
+  resolved "https://registry.yarnpkg.com/@types/jasminewd2/-/jasminewd2-2.0.9.tgz#db3946314605deea9d5c7aea0b61d807089ba76d"
+  integrity sha512-Oz+Faunpe2SimFvkMYMXxpK89WXl7rZHG8abTOKcGndu4xOoSbUZ+jUdZ0LQpmDqPEGLBWXF/yZP1tlsplGhzw==
+  dependencies:
+    "@types/jasmine" "*"
+
+"@types/json-schema@^7.0.5":
+  version "7.0.7"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
+  integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==
+
+"@types/lodash@4.14.172":
+  version "4.14.172"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.172.tgz#aad774c28e7bfd7a67de25408e03ee5a8c3d028a"
+  integrity sha512-/BHF5HAx3em7/KkzVKm3LrsD6HZAXuXO1AJZQ3cRRBZj4oHZDviWPYu0aEplAqDFNHZPW6d3G7KN+ONcCCC7pw==
+
+"@types/minimatch@*":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz#f0ec25dbf2f0e4b18647313ac031134ca5b24b21"
+  integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA==
+
+"@types/mustache@^0.8.32":
+  version "0.8.32"
+  resolved "https://registry.yarnpkg.com/@types/mustache/-/mustache-0.8.32.tgz#7db3b81f2bf450bd38805f596d20eca97c4ed595"
+  integrity sha512-RTVWV485OOf4+nO2+feurk0chzHkSjkjALiejpHltyuMf/13fGymbbNNFrSKdSSUg1TIwzszXdWsVirxgqYiFA==
+
+"@types/node@*":
+  version "15.0.3"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.3.tgz#ee09fcaac513576474c327da5818d421b98db88a"
+  integrity sha512-/WbxFeBU+0F79z9RdEOXH4CsDga+ibi5M8uEYr91u3CkT/pdWcV8MCook+4wDPnZBexRdwWS+PiVZ2xJviAzcQ==
+
+"@types/node@^10.17.60":
+  version "10.17.60"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.60.tgz#35f3d6213daed95da7f0f73e75bcc6980e90597b"
+  integrity sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==
+
+"@types/normalize-package-data@^2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
+  integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
+
+"@types/parse-json@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
+  integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
+
+"@types/pdfjs-dist@^2.1.3":
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/@types/pdfjs-dist/-/pdfjs-dist-2.7.1.tgz#3f463b18849ef64e1879bf983ab36c40b3f26da0"
+  integrity sha512-5qfC+w0bL0IaPYR3Jg3IwdN1SB/xEPnofLvguML272PtA7T+oz6tftXwXjjfNfnw9wDCwx+5N0QfjPnNu5lGEw==
+
+"@types/pdfjs-dist@~2.1.7":
+  version "2.1.7"
+  resolved "https://registry.yarnpkg.com/@types/pdfjs-dist/-/pdfjs-dist-2.1.7.tgz#a92d94b9d699a93ab8a762839f7819dc04e96484"
+  integrity sha512-nQIwcPUhkAIyn7x9NS0lR/qxYfd5unRtfGkMjvpgF4Sh28IXftRymaNmFKTTdejDNY25NDGSIyjwj/BRwAPexg==
+
+"@types/q@^0.0.32":
+  version "0.0.32"
+  resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"
+  integrity sha1-vShOV8hPEyXacCur/IKlMoGQwMU=
+
+"@types/quill@^2.0.2":
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/@types/quill/-/quill-2.0.6.tgz#c52055eb2e4ff02d4134048576c5a9a47216c6c2"
+  integrity sha512-aWXfXBWfth7SgeZEObDZQcQ6p4pBrdafkryLlrQOrYU50tC0qde9AxHOe0WRF2rg0vul20j/GwUnHop6l+qYBQ==
+  dependencies:
+    parchment "^1.1.2"
+    quill-delta "^4.0.1"
+
+"@types/raf@^3.4.0":
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/@types/raf/-/raf-3.4.0.tgz#2b72cbd55405e071f1c4d29992638e022b20acc2"
+  integrity sha512-taW5/WYqo36N7V39oYyHP9Ipfd5pNFvGTIQsNGj86xV88YQ7GnI30/yMfKDF7Zgin0m3e+ikX88FvImnK4RjGw==
+
+"@types/resolve@0.0.8":
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-0.0.8.tgz#f26074d238e02659e323ce1a13d041eee280e194"
+  integrity sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==
+  dependencies:
+    "@types/node" "*"
+
+"@types/selenium-webdriver@^3.0.0":
+  version "3.0.17"
+  resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.17.tgz#50bea0c3c2acc31c959c5b1e747798b3b3d06d4b"
+  integrity sha512-tGomyEuzSC1H28y2zlW6XPCaDaXFaD6soTdb4GNdmte2qfHtrKqhy0ZFs4r/1hpazCfEZqeTSRLvSasmEx89uw==
+
+"@types/source-list-map@*":
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
+  integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
+
+"@types/uuid@^8.3.3":
+  version "8.3.4"
+  resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc"
+  integrity sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==
+
+"@types/video.js@7.2.12":
+  version "7.2.12"
+  resolved "https://registry.yarnpkg.com/@types/video.js/-/video.js-7.2.12.tgz#574682abeda408526b3592f450c5be1045483311"
+  integrity sha512-JDCmwi1L8NA69/G7i8OG6ApO21rB7J6CXcDr339V0xO6ViPAZJIor611Ymh2IZkiur7Iow+HbLBHIgQTdvgj8g==
+
+"@types/vis@^4.21.19":
+  version "4.21.21"
+  resolved "https://registry.yarnpkg.com/@types/vis/-/vis-4.21.21.tgz#5c911c0d43603d103938ea128ee83ca72d9a9347"
+  integrity sha512-mDh/6zKCTViWOPeED2DnWFpACY7HkusEzSDfb6lsc7iEklowTeoMAMm/nyQQYOOWfF5ALfMbevrhs9CjdI7SUA==
+  dependencies:
+    moment ">=2.13.0"
+
+"@types/webpack-sources@^0.1.5":
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-0.1.8.tgz#078d75410435993ec8a0a2855e88706f3f751f81"
+  integrity sha512-JHB2/xZlXOjzjBB6fMOpH1eQAfsrpqVVIbneE0Rok16WXwFaznaI5vfg75U5WgGJm7V9W1c4xeRQDjX/zwvghA==
+  dependencies:
+    "@types/node" "*"
+    "@types/source-list-map" "*"
+    source-map "^0.6.1"
+
+"@types/zip.js@2.0.28":
+  version "2.0.28"
+  resolved "https://registry.yarnpkg.com/@types/zip.js/-/zip.js-2.0.28.tgz#78354682ef76e637b1f445846e4d892ca3dbf344"
+  integrity sha512-OtimzIMnPu5RYleY8Zzp7nBFQqaZYcg7WqZci2gHjoylhaIL1qSur+ABUuuQ9HMP9Eu0ER2mEyI6AkLWWDGXNg==
+
+"@videojs/http-streaming@1.10.3":
+  version "1.10.3"
+  resolved "https://registry.yarnpkg.com/@videojs/http-streaming/-/http-streaming-1.10.3.tgz#0c028443b9a3c96da85e5995748ed94280884584"
+  integrity sha512-fxXtwVrQBdhOFh6GymPAPCb4utCI01Zs5fdyZgtR6FSsaz/zGmnzfNS5GvNjBi/hZviMsbNPFaOTTFMMNLNA3A==
+  dependencies:
+    aes-decrypter "3.0.0"
+    global "^4.3.0"
+    m3u8-parser "4.3.0"
+    mpd-parser "0.8.1"
+    mux.js "5.1.3"
+    url-toolkit "^2.1.3"
+    video.js "^6.8.0 || ^7.0.0"
+
+"@videojs/http-streaming@2.6.4":
+  version "2.6.4"
+  resolved "https://registry.yarnpkg.com/@videojs/http-streaming/-/http-streaming-2.6.4.tgz#a3d9eb62b02c6e48439f033675ec3a6f5f8cdb25"
+  integrity sha512-sFVE0MVXhawAkET8EgiUSMvDDv6u3uGidtO0BvNXG0/qKWlze/zEzhvLsyPU4HmLFRnffKeHK5RE2XpO5vHY8Q==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@videojs/vhs-utils" "^3.0.0"
+    aes-decrypter "3.1.2"
+    global "^4.4.0"
+    m3u8-parser "4.5.2"
+    mpd-parser "0.15.4"
+    mux.js "5.10.0"
+    video.js "^6 || ^7"
+
+"@videojs/vhs-utils@^3.0.0":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@videojs/vhs-utils/-/vhs-utils-3.0.1.tgz#6bd7b5309883dcbaccb0f766b08094bc2bde5dbc"
+  integrity sha512-kYHWcmzRyWfUXrrOZzRFzvt7XM+Sg+0vmsSbYONn2e/XeWD8+35K74+wZkW5/H9nYZDhYpZgeTKbLRUvxk+smA==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    global "^4.4.0"
+    url-toolkit "^2.2.1"
+
+"@videojs/xhr@2.5.1":
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/@videojs/xhr/-/xhr-2.5.1.tgz#26bc5a79dbb3b03bfb13742c6ce559f89e90719e"
+  integrity sha512-wV9nGESHseSK+S9ePEru2+OJZ1jq/ZbbzniGQ4weAmTIepuBMSYPx5zrxxQA0E786T5ykpO8ts+LayV+3/oI2w==
+  dependencies:
+    "@babel/runtime" "^7.5.5"
+    global "~4.4.0"
+    is-function "^1.0.1"
+
+"@webassemblyjs/ast@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359"
+  integrity sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==
+  dependencies:
+    "@webassemblyjs/helper-module-context" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/wast-parser" "1.8.5"
+
+"@webassemblyjs/floating-point-hex-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721"
+  integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==
+
+"@webassemblyjs/helper-api-error@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7"
+  integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==
+
+"@webassemblyjs/helper-buffer@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204"
+  integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==
+
+"@webassemblyjs/helper-code-frame@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz#9a740ff48e3faa3022b1dff54423df9aa293c25e"
+  integrity sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==
+  dependencies:
+    "@webassemblyjs/wast-printer" "1.8.5"
+
+"@webassemblyjs/helper-fsm@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452"
+  integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==
+
+"@webassemblyjs/helper-module-context@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz#def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245"
+  integrity sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    mamacro "^0.0.3"
+
+"@webassemblyjs/helper-wasm-bytecode@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61"
+  integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==
+
+"@webassemblyjs/helper-wasm-section@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz#74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf"
+  integrity sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+
+"@webassemblyjs/ieee754@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz#712329dbef240f36bf57bd2f7b8fb9bf4154421e"
+  integrity sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==
+  dependencies:
+    "@xtuc/ieee754" "^1.2.0"
+
+"@webassemblyjs/leb128@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10"
+  integrity sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==
+  dependencies:
+    "@xtuc/long" "4.2.2"
+
+"@webassemblyjs/utf8@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc"
+  integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==
+
+"@webassemblyjs/wasm-edit@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz#962da12aa5acc1c131c81c4232991c82ce56e01a"
+  integrity sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/helper-wasm-section" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+    "@webassemblyjs/wasm-opt" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+    "@webassemblyjs/wast-printer" "1.8.5"
+
+"@webassemblyjs/wasm-gen@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz#54840766c2c1002eb64ed1abe720aded714f98bc"
+  integrity sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/ieee754" "1.8.5"
+    "@webassemblyjs/leb128" "1.8.5"
+    "@webassemblyjs/utf8" "1.8.5"
+
+"@webassemblyjs/wasm-opt@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz#b24d9f6ba50394af1349f510afa8ffcb8a63d264"
+  integrity sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+
+"@webassemblyjs/wasm-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz#21576f0ec88b91427357b8536383668ef7c66b8d"
+  integrity sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-api-error" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/ieee754" "1.8.5"
+    "@webassemblyjs/leb128" "1.8.5"
+    "@webassemblyjs/utf8" "1.8.5"
+
+"@webassemblyjs/wast-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz#e10eecd542d0e7bd394f6827c49f3df6d4eefb8c"
+  integrity sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/floating-point-hex-parser" "1.8.5"
+    "@webassemblyjs/helper-api-error" "1.8.5"
+    "@webassemblyjs/helper-code-frame" "1.8.5"
+    "@webassemblyjs/helper-fsm" "1.8.5"
+    "@xtuc/long" "4.2.2"
+
+"@webassemblyjs/wast-printer@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz#114bbc481fd10ca0e23b3560fa812748b0bae5bc"
+  integrity sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/wast-parser" "1.8.5"
+    "@xtuc/long" "4.2.2"
+
+"@xtuc/ieee754@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
+  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
+
+"@xtuc/long@4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
+  integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
+
+"@yarnpkg/lockfile@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
+  integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
+
+JSONStream@^1.3.4:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
+  integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==
+  dependencies:
+    jsonparse "^1.2.0"
+    through ">=2.2.7 <3"
+
+abab@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
+  integrity sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4=
+
+accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
+  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
+  dependencies:
+    mime-types "~2.1.24"
+    negotiator "0.6.2"
+
+ace-builds@^1.4.2:
+  version "1.4.12"
+  resolved "https://registry.yarnpkg.com/ace-builds/-/ace-builds-1.4.12.tgz#888efa386e36f4345f40b5233fcc4fe4c588fae7"
+  integrity sha512-G+chJctFPiiLGvs3+/Mly3apXTcfgE45dT5yp12BcWZ1kUs+gm0qd3/fv4gsz6fVag4mM0moHVpjHDIgph6Psg==
+
+acorn-globals@^1.0.4:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-1.0.9.tgz#55bb5e98691507b74579d0513413217c380c54cf"
+  integrity sha1-VbtemGkVB7dFedBRNBMhfDgMVM8=
+  dependencies:
+    acorn "^2.1.0"
+
+acorn-node@^1.6.1:
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.8.2.tgz#114c95d64539e53dede23de8b9d96df7c7ae2af8"
+  integrity sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==
+  dependencies:
+    acorn "^7.0.0"
+    acorn-walk "^7.0.0"
+    xtend "^4.0.2"
+
+acorn-walk@^7.0.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
+  integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
+
+acorn-walk@^8.0.0:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
+  integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
+
+acorn@^2.1.0, acorn@^2.4.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-2.7.0.tgz#ab6e7d9d886aaca8b085bc3312b79a198433f0e7"
+  integrity sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=
+
+acorn@^6.2.1:
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
+  integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
+
+acorn@^7.0.0, acorn@^7.1.0:
+  version "7.4.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
+  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
+
+acorn@^8.0.4:
+  version "8.7.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
+  integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
+
+adler-32@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/adler-32/-/adler-32-1.2.0.tgz#6a3e6bf0a63900ba15652808cb15c6813d1a5f25"
+  integrity sha1-aj5r8KY5ALoVZSgIyxXGgT0aXyU=
+  dependencies:
+    exit-on-epipe "~1.0.1"
+    printj "~1.1.0"
+
+adm-zip@^0.4.9:
+  version "0.4.16"
+  resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.16.tgz#cf4c508fdffab02c269cbc7f471a875f05570365"
+  integrity sha512-TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg==
+
+aes-decrypter@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/aes-decrypter/-/aes-decrypter-3.0.0.tgz#7848a1c145b9fdbf57ae3e2b5b1bc7cf0644a8fb"
+  integrity sha1-eEihwUW5/b9Xrj4rWxvHzwZEqPs=
+  dependencies:
+    commander "^2.9.0"
+    global "^4.3.2"
+    pkcs7 "^1.0.2"
+
+aes-decrypter@3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/aes-decrypter/-/aes-decrypter-3.1.2.tgz#3545546f8e9f6b878640339a242efe221ba7a7cb"
+  integrity sha512-42nRwfQuPRj9R1zqZBdoxnaAmnIFyDi0MNyTVhjdFOd8fifXKKRfwIHIZ6AMn1or4x5WONzjwRTbTWcsIQ0O4A==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@videojs/vhs-utils" "^3.0.0"
+    global "^4.4.0"
+    pkcs7 "^1.0.4"
+
+after@0.8.2:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
+  integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
+
+agent-base@4, agent-base@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
+  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
+  dependencies:
+    es6-promisify "^5.0.0"
+
+agent-base@~4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
+  integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
+  dependencies:
+    es6-promisify "^5.0.0"
+
+agentkeepalive@^3.4.1:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.5.2.tgz#a113924dd3fa24a0bc3b78108c450c2abee00f67"
+  integrity sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==
+  dependencies:
+    humanize-ms "^1.2.1"
+
+aggregate-error@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
+  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
+  dependencies:
+    clean-stack "^2.0.0"
+    indent-string "^4.0.0"
+
+ajv-errors@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
+  integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
+
+ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
+  integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
+
+ajv@6.10.2:
+  version "6.10.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52"
+  integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==
+  dependencies:
+    fast-deep-equal "^2.0.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
+ajv@6.12.3:
+  version "6.12.3"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.3.tgz#18c5af38a111ddeb4f2697bd78d68abc1cabd706"
+  integrity sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
+ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4:
+  version "6.12.6"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
+amdefine@>=0.0.4:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
+
+angular-cli-alias@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/angular-cli-alias/-/angular-cli-alias-1.0.9.tgz#7b82d72d394cc42b81bd00e7b37013aae264d1b1"
+  integrity sha512-0RHDqEUfL1WoUG6uO74U+AGradG9bYaH2nf9/9CvM7ckoAb5P1XS8fMQYmVn8dOAfmVChj3x9XwxFVwT829rhw==
+
+ansi-align@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb"
+  integrity sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==
+  dependencies:
+    string-width "^3.0.0"
+
+ansi-colors@4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
+  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
+
+ansi-colors@^3.0.0:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
+  integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
+
+ansi-escapes@^4.2.1:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
+  integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
+  dependencies:
+    type-fest "^0.21.3"
+
+ansi-html@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
+  integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4=
+
+ansi-regex@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
+
+ansi-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
+
+ansi-regex@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
+  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
+
+ansi-regex@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
+  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+
+ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
+
+ansi-styles@^3.2.0, ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
+  dependencies:
+    color-convert "^1.9.0"
+
+ansi-styles@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+  dependencies:
+    color-convert "^2.0.1"
+
+any-promise@^1.0.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
+  integrity sha1-q8av7tzqUugJzcA3au0845Y10X8=
+
+anymatch@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
+  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
+  dependencies:
+    micromatch "^3.1.4"
+    normalize-path "^2.1.1"
+
+anymatch@~3.1.1:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
+  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
+app-root-path@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.2.1.tgz#d0df4a682ee408273583d43f6f79e9892624bc9a"
+  integrity sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==
+
+append-transform@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-1.0.0.tgz#046a52ae582a228bd72f58acfbe2967c678759ab"
+  integrity sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==
+  dependencies:
+    default-require-extensions "^2.0.0"
+
+aproba@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
+
+arg@^4.1.0:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
+  integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
+
+argparse@^1.0.7:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
+  dependencies:
+    sprintf-js "~1.0.2"
+
+aria-query@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-3.0.0.tgz#65b3fcc1ca1155a8c9ae64d6eee297f15d5133cc"
+  integrity sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=
+  dependencies:
+    ast-types-flow "0.0.7"
+    commander "^2.11.0"
+
+arr-diff@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
+
+arr-flatten@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
+
+arr-union@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
+
+array-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
+  integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=
+
+array-flatten@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
+
+array-flatten@^2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
+  integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
+
+array-slice@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
+  integrity sha512-rlVfZW/1Ph2SNySXwR9QYkChp8EkOEiTMO5Vwx60usw04i4nWemkm9RXmQqgkQFaLHsqLuADvjp6IfgL9l2M8Q==
+
+array-union@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
+  dependencies:
+    array-uniq "^1.0.1"
+
+array-union@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
+
+array-uniq@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
+
+array-unique@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
+  integrity sha512-G2n5bG5fSUCpnsXz4+8FUkYsGPkNfLn9YvS66U5qbTIXI2Ynnlo4Bi42bWv+omKUCqz+ejzfClwne0alJWJPhg==
+
+array-unique@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
+
+arraybuffer.slice@~0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
+  integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
+
+arrify@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
+
+asap@^2.0.0, asap@~2.0.3:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+  integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
+
+asn1.js@^5.2.0:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07"
+  integrity sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==
+  dependencies:
+    bn.js "^4.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+    safer-buffer "^2.1.0"
+
+asn1@~0.2.3:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
+  dependencies:
+    safer-buffer "~2.1.0"
+
+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
+
+assert@^1.1.1:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
+  integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==
+  dependencies:
+    object-assign "^4.1.1"
+    util "0.10.3"
+
+assign-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
+
+ast-types-flow@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
+  integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0=
+
+async-each@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
+  integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
+
+async-limiter@~1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
+  integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
+
+async@^2.5.0, async@^2.6.2:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
+  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
+  dependencies:
+    lodash "^4.17.14"
+
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+
+atob@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
+
+autoprefixer@9.6.1:
+  version "9.6.1"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.1.tgz#51967a02d2d2300bb01866c1611ec8348d355a47"
+  integrity sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==
+  dependencies:
+    browserslist "^4.6.3"
+    caniuse-lite "^1.0.30000980"
+    chalk "^2.4.2"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^7.0.17"
+    postcss-value-parser "^4.0.0"
+
+autoprefixer@^9.4.5, autoprefixer@^9.6.0:
+  version "9.8.6"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f"
+  integrity sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==
+  dependencies:
+    browserslist "^4.12.0"
+    caniuse-lite "^1.0.30001109"
+    colorette "^1.2.1"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^7.0.32"
+    postcss-value-parser "^4.1.0"
+
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
+
+aws4@^1.8.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
+  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
+
+axobject-query@2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.0.2.tgz#ea187abe5b9002b377f925d8bf7d1c561adf38f9"
+  integrity sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==
+  dependencies:
+    ast-types-flow "0.0.7"
+
+babel-plugin-dynamic-import-node@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
+  integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==
+  dependencies:
+    object.assign "^4.1.0"
+
+backo2@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
+  integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
+
+balanced-match@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
+
+base64-arraybuffer@0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
+  integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg=
+
+base64-arraybuffer@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.2.0.tgz#4b944fac0191aa5907afe2d8c999ccc57ce80f45"
+  integrity sha512-7emyCsu1/xiBXgQZrscw/8KPRT44I4Yq9Pe6EGs3aPRTsWuggML1/1DTuZUuIaJPIm1FTDUVXl4x/yW8s0kQDQ==
+
+base64-arraybuffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz#1c37589a7c4b0746e34bd1feb951da2df01c1bdc"
+  integrity sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==
+
+base64-js@^1.0.2, base64-js@^1.3.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
+
+base64id@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz#47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"
+  integrity sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=
+
+base@^0.11.1:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
+  dependencies:
+    cache-base "^1.0.1"
+    class-utils "^0.3.5"
+    component-emitter "^1.2.1"
+    define-property "^1.0.0"
+    isobject "^3.0.1"
+    mixin-deep "^1.2.0"
+    pascalcase "^0.1.1"
+
+batch@0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
+  integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
+
+bcrypt-pbkdf@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
+  dependencies:
+    tweetnacl "^0.14.3"
+
+better-assert@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
+  integrity sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=
+  dependencies:
+    callsite "1.0.0"
+
+big.js@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
+  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
+
+binary-extensions@^1.0.0:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
+  integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
+
+binary-extensions@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
+  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
+
+bindings@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
+  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
+  dependencies:
+    file-uri-to-path "1.0.0"
+
+blob@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
+  integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==
+
+blocking-proxy@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/blocking-proxy/-/blocking-proxy-1.0.1.tgz#81d6fd1fe13a4c0d6957df7f91b75e98dac40cb2"
+  integrity sha512-KE8NFMZr3mN2E0HcvCgRtX7DjhiIQrwle+nSVJVC/yqFb9+xznHl2ZcoBp2L9qzkI4t4cBFJ1efXF8Dwi132RA==
+  dependencies:
+    minimist "^1.2.0"
+
+bluebird@^3.3.0, bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3.5.5:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
+  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
+
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9:
+  version "4.12.0"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
+  integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
+
+bn.js@^5.0.0, bn.js@^5.1.1:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002"
+  integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==
+
+body-parser@1.19.0, body-parser@^1.16.1:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
+  integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
+  dependencies:
+    bytes "3.1.0"
+    content-type "~1.0.4"
+    debug "2.6.9"
+    depd "~1.1.2"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
+    on-finished "~2.3.0"
+    qs "6.7.0"
+    raw-body "2.4.0"
+    type-is "~1.6.17"
+
+bonjour@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
+  integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU=
+  dependencies:
+    array-flatten "^2.1.0"
+    deep-equal "^1.0.1"
+    dns-equal "^1.0.0"
+    dns-txt "^2.0.2"
+    multicast-dns "^6.0.1"
+    multicast-dns-service-types "^1.1.0"
+
+boxen@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/boxen/-/boxen-3.2.0.tgz#fbdff0de93636ab4450886b6ff45b92d098f45eb"
+  integrity sha512-cU4J/+NodM3IHdSL2yN8bqYqnmlBTidDR4RC7nJs61ZmtGz8VZzM3HLQX0zY5mrSmPtR3xWwsq2jOUQqFZN8+A==
+  dependencies:
+    ansi-align "^3.0.0"
+    camelcase "^5.3.1"
+    chalk "^2.4.2"
+    cli-boxes "^2.2.0"
+    string-width "^3.0.0"
+    term-size "^1.2.0"
+    type-fest "^0.3.0"
+    widest-line "^2.0.0"
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+brace@^0.11.1:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/brace/-/brace-0.11.1.tgz#4896fcc9d544eef45f4bb7660db320d3b379fe58"
+  integrity sha1-SJb8ydVE7vRfS7dmDbMg07N5/lg=
+
+braces@^0.1.2:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-0.1.5.tgz#c085711085291d8b75fdd74eab0f8597280711e6"
+  integrity sha512-EIMHIv2UXHWFY2xubUGKz+hq9hNkENj4Pjvr7h58cmJgpkK2yMlKA8I484f7MSttkzVAy/lL7X9xDaILd6avzA==
+  dependencies:
+    expand-range "^0.1.0"
+
+braces@^2.3.1, braces@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
+  dependencies:
+    arr-flatten "^1.1.0"
+    array-unique "^0.3.2"
+    extend-shallow "^2.0.1"
+    fill-range "^4.0.0"
+    isobject "^3.0.1"
+    repeat-element "^1.1.2"
+    snapdragon "^0.8.1"
+    snapdragon-node "^2.0.1"
+    split-string "^3.0.2"
+    to-regex "^3.0.1"
+
+braces@^3.0.1, braces@^3.0.2, braces@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
+brorand@^1.0.1, brorand@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
+  integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
+
+browserify-aes@^1.0.0, browserify-aes@^1.0.4:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
+  integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
+  dependencies:
+    buffer-xor "^1.0.3"
+    cipher-base "^1.0.0"
+    create-hash "^1.1.0"
+    evp_bytestokey "^1.0.3"
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+browserify-cipher@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
+  integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==
+  dependencies:
+    browserify-aes "^1.0.4"
+    browserify-des "^1.0.0"
+    evp_bytestokey "^1.0.0"
+
+browserify-des@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
+  integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==
+  dependencies:
+    cipher-base "^1.0.1"
+    des.js "^1.0.0"
+    inherits "^2.0.1"
+    safe-buffer "^5.1.2"
+
+browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d"
+  integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==
+  dependencies:
+    bn.js "^5.0.0"
+    randombytes "^2.0.1"
+
+browserify-sign@^4.0.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3"
+  integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==
+  dependencies:
+    bn.js "^5.1.1"
+    browserify-rsa "^4.0.1"
+    create-hash "^1.2.0"
+    create-hmac "^1.1.7"
+    elliptic "^6.5.3"
+    inherits "^2.0.4"
+    parse-asn1 "^5.1.5"
+    readable-stream "^3.6.0"
+    safe-buffer "^5.2.0"
+
+browserify-zlib@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
+  integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
+  dependencies:
+    pako "~1.0.5"
+
+browserslist@4.10.0:
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.10.0.tgz#f179737913eaf0d2b98e4926ac1ca6a15cbcc6a9"
+  integrity sha512-TpfK0TDgv71dzuTsEAlQiHeWQ/tiPqgNZVdv046fvNtBZrjbv2O3TsWCDU0AWGJJKCF/KsjNdLzR9hXOsh/CfA==
+  dependencies:
+    caniuse-lite "^1.0.30001035"
+    electron-to-chromium "^1.3.378"
+    node-releases "^1.1.52"
+    pkg-up "^3.1.0"
+
+browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.6.3, browserslist@^4.8.5:
+  version "4.16.6"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
+  integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
+  dependencies:
+    caniuse-lite "^1.0.30001219"
+    colorette "^1.2.2"
+    electron-to-chromium "^1.3.723"
+    escalade "^3.1.1"
+    node-releases "^1.1.71"
+
+browserstack@^1.5.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/browserstack/-/browserstack-1.6.1.tgz#e051f9733ec3b507659f395c7a4765a1b1e358b3"
+  integrity sha512-GxtFjpIaKdbAyzHfFDKixKO8IBT7wR3NjbzrGc78nNs/Ciys9wU3/nBtsqsWv5nDSrdI5tz0peKuzCPuNXNUiw==
+  dependencies:
+    https-proxy-agent "^2.2.1"
+
+btoa@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/btoa/-/btoa-1.2.1.tgz#01a9909f8b2c93f6bf680ba26131eb30f7fa3d73"
+  integrity sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==
+
+buffer-alloc-unsafe@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
+  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
+
+buffer-alloc@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
+  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
+  dependencies:
+    buffer-alloc-unsafe "^1.1.0"
+    buffer-fill "^1.0.0"
+
+buffer-fill@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
+  integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
+
+buffer-from@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
+
+buffer-indexof@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
+  integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==
+
+buffer-xor@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
+  integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
+
+buffer@^4.3.0:
+  version "4.9.2"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8"
+  integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==
+  dependencies:
+    base64-js "^1.0.2"
+    ieee754 "^1.1.4"
+    isarray "^1.0.0"
+
+buffer@^5.6.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
+  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.1.13"
+
+builtin-modules@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+  integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
+
+builtin-modules@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.2.0.tgz#45d5db99e7ee5e6bc4f362e008bf917ab5049887"
+  integrity sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==
+
+builtin-status-codes@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
+  integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
+
+builtins@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
+  integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og=
+
+bytes@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
+  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
+
+bytes@3.1.0, bytes@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
+  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
+
+cacache@12.0.2:
+  version "12.0.2"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.2.tgz#8db03205e36089a3df6954c66ce92541441ac46c"
+  integrity sha512-ifKgxH2CKhJEg6tNdAwziu6Q33EvuG26tYcda6PT3WKisZcYDXsnEdnRv67Po3yCzFfaSoMjGZzJyD2c3DT1dg==
+  dependencies:
+    bluebird "^3.5.5"
+    chownr "^1.1.1"
+    figgy-pudding "^3.5.1"
+    glob "^7.1.4"
+    graceful-fs "^4.1.15"
+    infer-owner "^1.0.3"
+    lru-cache "^5.1.1"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    move-concurrently "^1.0.1"
+    promise-inflight "^1.0.1"
+    rimraf "^2.6.3"
+    ssri "^6.0.1"
+    unique-filename "^1.1.1"
+    y18n "^4.0.0"
+
+cacache@^12.0.0, cacache@^12.0.2:
+  version "12.0.4"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c"
+  integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==
+  dependencies:
+    bluebird "^3.5.5"
+    chownr "^1.1.1"
+    figgy-pudding "^3.5.1"
+    glob "^7.1.4"
+    graceful-fs "^4.1.15"
+    infer-owner "^1.0.3"
+    lru-cache "^5.1.1"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    move-concurrently "^1.0.1"
+    promise-inflight "^1.0.1"
+    rimraf "^2.6.3"
+    ssri "^6.0.1"
+    unique-filename "^1.1.1"
+    y18n "^4.0.0"
+
+cacache@^15.0.4:
+  version "15.0.6"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.6.tgz#65a8c580fda15b59150fb76bf3f3a8e45d583099"
+  integrity sha512-g1WYDMct/jzW+JdWEyjaX2zoBkZ6ZT9VpOyp2I/VMtDsNLffNat3kqPFfi1eDRSK9/SuKGyORDHcQMcPF8sQ/w==
+  dependencies:
+    "@npmcli/move-file" "^1.0.1"
+    chownr "^2.0.0"
+    fs-minipass "^2.0.0"
+    glob "^7.1.4"
+    infer-owner "^1.0.4"
+    lru-cache "^6.0.0"
+    minipass "^3.1.1"
+    minipass-collect "^1.0.2"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.2"
+    mkdirp "^1.0.3"
+    p-map "^4.0.0"
+    promise-inflight "^1.0.1"
+    rimraf "^3.0.2"
+    ssri "^8.0.1"
+    tar "^6.0.2"
+    unique-filename "^1.1.1"
+
+cache-base@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
+  dependencies:
+    collection-visit "^1.0.0"
+    component-emitter "^1.2.1"
+    get-value "^2.0.6"
+    has-value "^1.0.0"
+    isobject "^3.0.1"
+    set-value "^2.0.0"
+    to-object-path "^0.3.0"
+    union-value "^1.0.0"
+    unset-value "^1.0.0"
+
+cacheable-request@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912"
+  integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==
+  dependencies:
+    clone-response "^1.0.2"
+    get-stream "^5.1.0"
+    http-cache-semantics "^4.0.0"
+    keyv "^3.0.0"
+    lowercase-keys "^2.0.0"
+    normalize-url "^4.1.0"
+    responselike "^1.0.2"
+
+call-bind@^1.0.0, call-bind@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
+  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
+  dependencies:
+    function-bind "^1.1.1"
+    get-intrinsic "^1.0.2"
+
+caller-callsite@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
+  integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=
+  dependencies:
+    callsites "^2.0.0"
+
+caller-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
+  integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=
+  dependencies:
+    caller-callsite "^2.0.0"
+
+callsite@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
+  integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA=
+
+callsites@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
+  integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
+
+callsites@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
+
+camelcase-css@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5"
+  integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==
+
+camelcase@^5.0.0, camelcase@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
+
+caniuse-lite@1.0.30001035:
+  version "1.0.30001035"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz#2bb53b8aa4716b2ed08e088d4dc816a5fe089a1e"
+  integrity sha512-C1ZxgkuA4/bUEdMbU5WrGY4+UhMFFiXrgNAfxiMIqWgFTWfv/xsZCS2xEHT2LMq7xAZfuAnu6mcqyDl0ZR6wLQ==
+
+caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001219:
+  version "1.0.30001228"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz#bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa"
+  integrity sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==
+
+canonical-path@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-1.0.0.tgz#fcb470c23958def85081856be7a86e904f180d1d"
+  integrity sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==
+
+canvg@^1.0:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/canvg/-/canvg-1.5.3.tgz#aad17915f33368bf8eb80b25d129e3ae922ddc5f"
+  integrity sha512-7Gn2IuQzvUQWPIuZuFHrzsTM0gkPz2RRT9OcbdmA03jeKk8kltrD8gqUzNX15ghY/4PV5bbe5lmD6yDLDY6Ybg==
+  dependencies:
+    jsdom "^8.1.0"
+    rgbcolor "^1.0.1"
+    stackblur-canvas "^1.4.1"
+    xmldom "^0.1.22"
+
+canvg@^3.0.6:
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/canvg/-/canvg-3.0.10.tgz#8e52a2d088b6ffa23ac78970b2a9eebfae0ef4b3"
+  integrity sha512-qwR2FRNO9NlzTeKIPIKpnTY6fqwuYSequ8Ru8c0YkYU7U0oW+hLUvWadLvAu1Rl72OMNiFhoLu4f8eUjQ7l/+Q==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@types/raf" "^3.4.0"
+    core-js "^3.8.3"
+    raf "^3.4.1"
+    regenerator-runtime "^0.13.7"
+    rgbcolor "^1.0.1"
+    stackblur-canvas "^2.0.0"
+    svg-pathdata "^6.0.3"
+
+cardboard-vr-display@1.0.13:
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/cardboard-vr-display/-/cardboard-vr-display-1.0.13.tgz#e192a220b2970002cfb5cc0f1b480ff5fd6748b6"
+  integrity sha512-/ovHu4nHfo3oaw2v20v7ErvDUmIBPih/e/6VG83XUUFs5vPQaGSM8hihqKClOlwy3Fz+52L0FrhcGSH3o+yn6w==
+  dependencies:
+    gl-preserve-state "^1.0.0"
+    nosleep.js "^0.7.0"
+    webvr-polyfill-dpdb "^1.0.7"
+
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
+
+cf-blob.js@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/cf-blob.js/-/cf-blob.js-0.0.1.tgz#f5ab7e12e798caf08ccf828c69aba0f063d83f99"
+  integrity sha1-9at+EueYyvCMz4KMaaug8GPYP5k=
+
+cfb@^1.1.2, cfb@^1.1.4:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/cfb/-/cfb-1.2.0.tgz#6a4d0872b525ed60349e1ef51fb4b0bf73eca9a8"
+  integrity sha512-sXMvHsKCICVR3Naq+J556K+ExBo9n50iKl6LGarlnvuA2035uMlGA/qVrc0wQtow5P1vJEw9UyrKLCbtIKz+TQ==
+  dependencies:
+    adler-32 "~1.2.0"
+    crc-32 "~1.2.0"
+    printj "~1.1.2"
+
+"chainsaw@>=0.0.7 <0.1":
+  version "0.0.9"
+  resolved "https://registry.yarnpkg.com/chainsaw/-/chainsaw-0.0.9.tgz#11a05102d1c4c785b6d0415d336d5a3a1612913e"
+  integrity sha1-EaBRAtHEx4W20EFdM21aOhYSkT4=
+  dependencies:
+    traverse ">=0.3.0 <0.4"
+
+chalk@^1.1.1, chalk@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
+  dependencies:
+    ansi-styles "^2.2.1"
+    escape-string-regexp "^1.0.2"
+    has-ansi "^2.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^2.0.0"
+
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1, chalk@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
+"chalk@^3.0.0 || ^4.0.0", chalk@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad"
+  integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+chalk@^4.1.0:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+chardet@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
+  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
+
+chart.js@^2.8.0:
+  version "2.9.4"
+  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.9.4.tgz#0827f9563faffb2dc5c06562f8eb10337d5b9684"
+  integrity sha512-B07aAzxcrikjAPyV+01j7BmOpxtQETxTSlQ26BEYJ+3iUkbNKaOJ/nDbT6JjyqYxseM0ON12COHYdU2cTIjC7A==
+  dependencies:
+    chartjs-color "^2.1.0"
+    moment "^2.10.2"
+
+chartjs-color-string@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz#1df096621c0e70720a64f4135ea171d051402f71"
+  integrity sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A==
+  dependencies:
+    color-name "^1.0.0"
+
+chartjs-color@^2.1.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.4.1.tgz#6118bba202fe1ea79dd7f7c0f9da93467296c3b0"
+  integrity sha512-haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w==
+  dependencies:
+    chartjs-color-string "^0.6.0"
+    color-convert "^1.9.3"
+
+"chokidar@>=2.0.0 <4.0.0", "chokidar@>=3.0.0 <4.0.0", chokidar@^3.0.0, chokidar@^3.4.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a"
+  integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==
+  dependencies:
+    anymatch "~3.1.1"
+    braces "~3.0.2"
+    glob-parent "~5.1.0"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.5.0"
+  optionalDependencies:
+    fsevents "~2.3.1"
+
+chokidar@^2.0.3, chokidar@^2.1.1, chokidar@^2.1.8:
+  version "2.1.8"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
+  integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
+  dependencies:
+    anymatch "^2.0.0"
+    async-each "^1.0.1"
+    braces "^2.3.2"
+    glob-parent "^3.1.0"
+    inherits "^2.0.3"
+    is-binary-path "^1.0.0"
+    is-glob "^4.0.0"
+    normalize-path "^3.0.0"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.2.1"
+    upath "^1.1.1"
+  optionalDependencies:
+    fsevents "^1.2.7"
+
+chownr@^1.1.1:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
+  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
+
+chownr@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
+  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
+
+chrome-trace-event@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
+  integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
+
+ci-info@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
+  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
+
+cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
+  integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+circular-dependency-plugin@5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-5.2.0.tgz#e09dbc2dd3e2928442403e2d45b41cea06bc0a93"
+  integrity sha512-7p4Kn/gffhQaavNfyDFg7LS5S/UT1JAjyGd4UqR2+jzoYF02eDkj0Ec3+48TsIa4zghjLY87nQHIh/ecK9qLdw==
+
+circular-json@^0.5.5:
+  version "0.5.9"
+  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.5.9.tgz#932763ae88f4f7dead7a0d09c8a51a4743a53b1d"
+  integrity sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==
+
+class-utils@^0.3.5:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
+  dependencies:
+    arr-union "^3.1.0"
+    define-property "^0.2.5"
+    isobject "^3.0.0"
+    static-extend "^0.1.1"
+
+clean-css@4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz#2d411ef76b8569b6d0c84068dabe85b0aa5e5c17"
+  integrity sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==
+  dependencies:
+    source-map "~0.6.0"
+
+clean-css@^4.1.11:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78"
+  integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==
+  dependencies:
+    source-map "~0.6.0"
+
+clean-stack@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
+  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
+
+cli-boxes@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f"
+  integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==
+
+cli-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
+  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
+  dependencies:
+    restore-cursor "^3.1.0"
+
+cli-width@^2.0.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
+  integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==
+
+cliui@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
+  integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==
+  dependencies:
+    string-width "^2.1.1"
+    strip-ansi "^4.0.0"
+    wrap-ansi "^2.0.0"
+
+cliui@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
+  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
+  dependencies:
+    string-width "^3.1.0"
+    strip-ansi "^5.2.0"
+    wrap-ansi "^5.1.0"
+
+clone-deep@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
+  integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
+  dependencies:
+    is-plain-object "^2.0.4"
+    kind-of "^6.0.2"
+    shallow-clone "^3.0.0"
+
+clone-response@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
+  integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
+  dependencies:
+    mimic-response "^1.0.0"
+
+clone@^2.1.1, clone@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
+  integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
+
+code-point-at@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
+
+codelyzer@^5.1.0:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-5.2.2.tgz#d0530a455784e6bea0b6d7e97166c73c30a5347f"
+  integrity sha512-jB4FZ1Sx7kZhvZVdf+N2BaKTdrrNZOL0Bj10RRfrhHrb3zEvXjJvvq298JPMJAiyiCS/v4zs1QlGU0ip7xGqeA==
+  dependencies:
+    app-root-path "^2.2.1"
+    aria-query "^3.0.0"
+    axobject-query "2.0.2"
+    css-selector-tokenizer "^0.7.1"
+    cssauron "^1.4.0"
+    damerau-levenshtein "^1.0.4"
+    semver-dsl "^1.0.1"
+    source-map "^0.5.7"
+    sprintf-js "^1.1.2"
+
+codepage@~1.14.0:
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/codepage/-/codepage-1.14.0.tgz#8cbe25481323559d7d307571b0fff91e7a1d2f99"
+  integrity sha1-jL4lSBMjVZ19MHVxsP/5HnodL5k=
+  dependencies:
+    commander "~2.14.1"
+    exit-on-epipe "~1.0.1"
+
+collection-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
+  dependencies:
+    map-visit "^1.0.0"
+    object-visit "^1.0.0"
+
+color-convert@^1.9.0, color-convert@^1.9.1, color-convert@^1.9.3:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
+  dependencies:
+    color-name "1.1.3"
+
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+
+color-name@^1.0.0, color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
+color-string@^1.5.4:
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.5.tgz#65474a8f0e7439625f3d27a6a19d89fc45223014"
+  integrity sha512-jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg==
+  dependencies:
+    color-name "^1.0.0"
+    simple-swizzle "^0.2.2"
+
+color@^3.1.2:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/color/-/color-3.1.3.tgz#ca67fb4e7b97d611dcde39eceed422067d91596e"
+  integrity sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ==
+  dependencies:
+    color-convert "^1.9.1"
+    color-string "^1.5.4"
+
+colorette@^1.2.1, colorette@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
+  integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
+
+colors@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
+  integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM=
+
+colors@^1.1.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
+  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
+
+combine-lists@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/combine-lists/-/combine-lists-1.0.1.tgz#458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"
+  integrity sha512-4Mi0V7N48B9KzC8Zl/U7wiWuxMFEHf44N3/PSoAvWDu8IOPrddNo1y1tC/kXbP7IvVMhgCFMMNzgKb0pWoin9w==
+  dependencies:
+    lodash "^4.5.0"
+
+combined-stream@^1.0.6, combined-stream@~1.0.6:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
+  dependencies:
+    delayed-stream "~1.0.0"
+
+commander@2, commander@^2.11.0, commander@^2.12.1, commander@^2.20.0, commander@^2.9.0:
+  version "2.20.3"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+
+commander@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-3.0.2.tgz#6837c3fb677ad9933d1cfba42dd14d5117d6b39e"
+  integrity sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==
+
+commander@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
+  integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
+
+commander@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
+  integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
+
+commander@~2.14.1:
+  version "2.14.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa"
+  integrity sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw==
+
+commander@~2.17.1:
+  version "2.17.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
+  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
+
+commondir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
+
+compare-versions@^3.4.0, compare-versions@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62"
+  integrity sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==
+
+component-bind@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
+  integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=
+
+component-emitter@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
+  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
+
+component-emitter@^1.2.1, component-emitter@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
+  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
+
+component-inherit@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
+  integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=
+
+compressible@~2.0.16:
+  version "2.0.18"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
+  integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==
+  dependencies:
+    mime-db ">= 1.43.0 < 2"
+
+compression@^1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
+  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
+  dependencies:
+    accepts "~1.3.5"
+    bytes "3.0.0"
+    compressible "~2.0.16"
+    debug "2.6.9"
+    on-headers "~1.0.2"
+    safe-buffer "5.1.2"
+    vary "~1.1.2"
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+
+concat-stream@^1.5.0:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
+  dependencies:
+    buffer-from "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
+
+configstore@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/configstore/-/configstore-4.0.0.tgz#5933311e95d3687efb592c528b922d9262d227e7"
+  integrity sha512-CmquAXFBocrzaSM8mtGPMM/HiWmyIpr4CcJl/rgY2uCObZ/S7cKU0silxslqJejl+t/T9HS8E0PUNQD81JGUEQ==
+  dependencies:
+    dot-prop "^4.1.0"
+    graceful-fs "^4.1.2"
+    make-dir "^1.0.0"
+    unique-string "^1.0.0"
+    write-file-atomic "^2.0.0"
+    xdg-basedir "^3.0.0"
+
+connect-history-api-fallback@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
+  integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
+
+connect@^3.6.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8"
+  integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==
+  dependencies:
+    debug "2.6.9"
+    finalhandler "1.1.2"
+    parseurl "~1.3.3"
+    utils-merge "1.0.1"
+
+console-browserify@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
+  integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
+
+constants-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
+  integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
+
+content-disposition@0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
+  integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
+  dependencies:
+    safe-buffer "5.1.2"
+
+content-type@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
+  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
+
+convert-source-map@^1.5.1, convert-source-map@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
+  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
+  dependencies:
+    safe-buffer "~5.1.1"
+
+cookie-signature@1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
+  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
+
+cookie@0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
+  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
+
+cookie@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
+  integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
+
+copy-anything@^2.0.1:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/copy-anything/-/copy-anything-2.0.3.tgz#842407ba02466b0df844819bbe3baebbe5d45d87"
+  integrity sha512-GK6QUtisv4fNS+XcI7shX0Gx9ORg7QqIznyfho79JTnX1XhLiyZHfftvGiziqzRiEi/Bjhgpi+D2o7HxJFPnDQ==
+  dependencies:
+    is-what "^3.12.0"
+
+copy-concurrently@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
+  integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==
+  dependencies:
+    aproba "^1.1.1"
+    fs-write-stream-atomic "^1.0.8"
+    iferr "^0.1.5"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.0"
+
+copy-descriptor@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
+
+copy-webpack-plugin@6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-6.0.3.tgz#2b3d2bfc6861b96432a65f0149720adbd902040b"
+  integrity sha512-q5m6Vz4elsuyVEIUXr7wJdIdePWTubsqVbEMvf1WQnHGv0Q+9yPRu7MtYFPt+GBOXRav9lvIINifTQ1vSCs+eA==
+  dependencies:
+    cacache "^15.0.4"
+    fast-glob "^3.2.4"
+    find-cache-dir "^3.3.1"
+    glob-parent "^5.1.1"
+    globby "^11.0.1"
+    loader-utils "^2.0.0"
+    normalize-path "^3.0.0"
+    p-limit "^3.0.1"
+    schema-utils "^2.7.0"
+    serialize-javascript "^4.0.0"
+    webpack-sources "^1.4.3"
+
+core-js-compat@^3.6.2:
+  version "3.12.1"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.12.1.tgz#2c302c4708505fa7072b0adb5156d26f7801a18b"
+  integrity sha512-i6h5qODpw6EsHAoIdQhKoZdWn+dGBF3dSS8m5tif36RlWvW3A6+yu2S16QHUo3CrkzrnEskMAt9f8FxmY9fhWQ==
+  dependencies:
+    browserslist "^4.16.6"
+    semver "7.0.0"
+
+core-js@3.6.4:
+  version "3.6.4"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.4.tgz#440a83536b458114b9cb2ac1580ba377dc470647"
+  integrity sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==
+
+core-js@^2.2.0:
+  version "2.6.12"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
+  integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
+
+core-js@^3.1.3:
+  version "3.12.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.12.1.tgz#6b5af4ff55616c08a44d386f1f510917ff204112"
+  integrity sha512-Ne9DKPHTObRuB09Dru5AjwKjY4cJHVGu+y5f7coGn1E9Grkc3p2iBwE9AI/nJzsE29mQF7oq+mhYYRqOMFN1Bw==
+
+core-js@^3.6.0, core-js@^3.8.3:
+  version "3.23.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.23.1.tgz#9f9a9255115f62c512db56d567f636da32ca0b78"
+  integrity sha512-wfMYHWi1WQjpgZNC9kAlN4ut04TM9fUTdi7CqIoTVM7yaiOUQTklOzfb+oWH3r9edQcT3F887swuVmxrV+CC8w==
+
+core-util-is@1.0.2, core-util-is@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+
+cosmiconfig@^5.0.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a"
+  integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==
+  dependencies:
+    import-fresh "^2.0.0"
+    is-directory "^0.3.1"
+    js-yaml "^3.13.1"
+    parse-json "^4.0.0"
+
+cosmiconfig@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3"
+  integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==
+  dependencies:
+    "@types/parse-json" "^4.0.0"
+    import-fresh "^3.2.1"
+    parse-json "^5.0.0"
+    path-type "^4.0.0"
+    yaml "^1.10.0"
+
+coverage-istanbul-loader@2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/coverage-istanbul-loader/-/coverage-istanbul-loader-2.0.3.tgz#87d42f03fa0fd3fa8743ec76945d9d67f105722a"
+  integrity sha512-LiGRvyIuzVYs3M1ZYK1tF0HekjH0DJ8zFdUwAZq378EJzqOgToyb1690dp3TAUlP6Y+82uu42LRjuROVeJ54CA==
+  dependencies:
+    convert-source-map "^1.7.0"
+    istanbul-lib-instrument "^4.0.0"
+    loader-utils "^1.2.3"
+    merge-source-map "^1.1.0"
+    schema-utils "^2.6.1"
+
+crc-32@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz#cb2db6e29b88508e32d9dd0ec1693e7b41a18208"
+  integrity sha512-1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA==
+  dependencies:
+    exit-on-epipe "~1.0.1"
+    printj "~1.1.0"
+
+create-ecdh@^4.0.0:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e"
+  integrity sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==
+  dependencies:
+    bn.js "^4.1.0"
+    elliptic "^6.5.3"
+
+create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
+  integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
+  dependencies:
+    cipher-base "^1.0.1"
+    inherits "^2.0.1"
+    md5.js "^1.3.4"
+    ripemd160 "^2.0.1"
+    sha.js "^2.4.0"
+
+create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
+  integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
+  dependencies:
+    cipher-base "^1.0.3"
+    create-hash "^1.1.0"
+    inherits "^2.0.1"
+    ripemd160 "^2.0.0"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
+
+cross-spawn@^5.0.1:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
+  integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
+  dependencies:
+    lru-cache "^4.0.1"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
+cross-spawn@^6.0.0:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+  dependencies:
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
+crypto-browserify@^3.11.0:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
+  integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
+  dependencies:
+    browserify-cipher "^1.0.0"
+    browserify-sign "^4.0.0"
+    create-ecdh "^4.0.0"
+    create-hash "^1.1.0"
+    create-hmac "^1.1.0"
+    diffie-hellman "^5.0.0"
+    inherits "^2.0.1"
+    pbkdf2 "^3.0.3"
+    public-encrypt "^4.0.0"
+    randombytes "^2.0.0"
+    randomfill "^1.0.3"
+
+crypto-random-string@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
+  integrity sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=
+
+css-line-break@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/css-line-break/-/css-line-break-1.1.1.tgz#d5e9bdd297840099eb0503c7310fd34927a026ef"
+  integrity sha512-1feNVaM4Fyzdj4mKPIQNL2n70MmuYzAXZ1aytlROFX1JsOo070OsugwGjj7nl6jnDJWHDM8zRZswkmeYVWZJQA==
+  dependencies:
+    base64-arraybuffer "^0.2.0"
+
+css-line-break@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/css-line-break/-/css-line-break-2.1.0.tgz#bfef660dfa6f5397ea54116bb3cb4873edbc4fa0"
+  integrity sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==
+  dependencies:
+    utrie "^1.0.2"
+
+css-parse@1.7.x:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-1.7.0.tgz#321f6cf73782a6ff751111390fc05e2c657d8c9b"
+  integrity sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=
+
+css-parse@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-2.0.0.tgz#a468ee667c16d81ccf05c58c38d2a97c780dbfd4"
+  integrity sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=
+  dependencies:
+    css "^2.0.0"
+
+css-selector-tokenizer@^0.7.1:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.3.tgz#735f26186e67c749aaf275783405cf0661fae8f1"
+  integrity sha512-jWQv3oCEL5kMErj4wRnK/OPoBi0D+P1FR2cDCKYPaMeD2eW3/mttav8HT4hT1CKopiJI/psEULjkClhvJo4Lvg==
+  dependencies:
+    cssesc "^3.0.0"
+    fastparse "^1.1.2"
+
+css-unit-converter@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.2.tgz#4c77f5a1954e6dbff60695ecb214e3270436ab21"
+  integrity sha512-IiJwMC8rdZE0+xiEZHeru6YoONC4rfPMqGm2W85jMIbkFvv5nFTwJVFHam2eFrN6txmoUYFAFXiv8ICVeTO0MA==
+
+css@^2.0.0:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929"
+  integrity sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==
+  dependencies:
+    inherits "^2.0.3"
+    source-map "^0.6.1"
+    source-map-resolve "^0.5.2"
+    urix "^0.1.0"
+
+cssauron@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/cssauron/-/cssauron-1.4.0.tgz#a6602dff7e04a8306dc0db9a551e92e8b5662ad8"
+  integrity sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=
+  dependencies:
+    through X.X.X
+
+cssesc@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
+  integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
+
+cssom@0.3.x, "cssom@>= 0.3.0 < 0.4.0":
+  version "0.3.8"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
+  integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
+
+"cssstyle@>= 0.2.34 < 0.3.0":
+  version "0.2.37"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.2.37.tgz#541097234cb2513c83ceed3acddc27ff27987d54"
+  integrity sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=
+  dependencies:
+    cssom "0.3.x"
+
+cuint@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/cuint/-/cuint-0.2.2.tgz#408086d409550c2631155619e9fa7bcadc3b991b"
+  integrity sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=
+
+custom-event@~1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425"
+  integrity sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=
+
+cyclist@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
+  integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
+
+d3-array@1, d3-array@^1.1.1, d3-array@^1.2.0:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.4.tgz#635ce4d5eea759f6f605863dbcfc30edc737f71f"
+  integrity sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw==
+
+d3-axis@1:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/d3-axis/-/d3-axis-1.0.12.tgz#cdf20ba210cfbb43795af33756886fb3638daac9"
+  integrity sha512-ejINPfPSNdGFKEOAtnBtdkpr24c4d4jsei6Lg98mxf424ivoDP2956/5HDpIAtmHo85lqT4pruy+zEgvRUBqaQ==
+
+d3-brush@1:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.1.6.tgz#b0a22c7372cabec128bdddf9bddc058592f89e9b"
+  integrity sha512-7RW+w7HfMCPyZLifTz/UnJmI5kdkXtpCbombUSs8xniAyo0vIbrDzDwUJB6eJOgl9u5DQOt2TQlYumxzD1SvYA==
+  dependencies:
+    d3-dispatch "1"
+    d3-drag "1"
+    d3-interpolate "1"
+    d3-selection "1"
+    d3-transition "1"
+
+d3-chord@1:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/d3-chord/-/d3-chord-1.0.6.tgz#309157e3f2db2c752f0280fedd35f2067ccbb15f"
+  integrity sha512-JXA2Dro1Fxw9rJe33Uv+Ckr5IrAa74TlfDEhE/jfLOaXegMQFQTAgAw9WnZL8+HxVBRXaRGCkrNU7pJeylRIuA==
+  dependencies:
+    d3-array "1"
+    d3-path "1"
+
+d3-collection@1:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.7.tgz#349bd2aa9977db071091c13144d5e4f16b5b310e"
+  integrity sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A==
+
+d3-color@1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.1.tgz#c52002bf8846ada4424d55d97982fef26eb3bc8a"
+  integrity sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q==
+
+d3-contour@1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/d3-contour/-/d3-contour-1.3.2.tgz#652aacd500d2264cb3423cee10db69f6f59bead3"
+  integrity sha512-hoPp4K/rJCu0ladiH6zmJUEz6+u3lgR+GSm/QdM2BBvDraU39Vr7YdDCicJcxP1z8i9B/2dJLgDC1NcvlF8WCg==
+  dependencies:
+    d3-array "^1.1.1"
+
+d3-dispatch@1:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-1.0.6.tgz#00d37bcee4dd8cd97729dd893a0ac29caaba5d58"
+  integrity sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA==
+
+d3-drag@1:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-1.2.5.tgz#2537f451acd39d31406677b7dc77c82f7d988f70"
+  integrity sha512-rD1ohlkKQwMZYkQlYVCrSFxsWPzI97+W+PaEIBNTMxRuxz9RF0Hi5nJWHGVJ3Om9d2fRTe1yOBINJyy/ahV95w==
+  dependencies:
+    d3-dispatch "1"
+    d3-selection "1"
+
+d3-dsv@1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-1.2.0.tgz#9d5f75c3a5f8abd611f74d3f5847b0d4338b885c"
+  integrity sha512-9yVlqvZcSOMhCYzniHE7EVUws7Fa1zgw+/EAV2BxJoG3ME19V6BQFBwI855XQDsxyOuG7NibqRMTtiF/Qup46g==
+  dependencies:
+    commander "2"
+    iconv-lite "0.4"
+    rw "1"
+
+d3-ease@1:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.7.tgz#9a834890ef8b8ae8c558b2fe55bd57f5993b85e2"
+  integrity sha512-lx14ZPYkhNx0s/2HX5sLFUI3mbasHjSSpwO/KaaNACweVwxUruKyWVcb293wMv1RqTPZyZ8kSZ2NogUZNcLOFQ==
+
+d3-fetch@1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/d3-fetch/-/d3-fetch-1.2.0.tgz#15ce2ecfc41b092b1db50abd2c552c2316cf7fc7"
+  integrity sha512-yC78NBVcd2zFAyR/HnUiBS7Lf6inSCoWcSxFfw8FYL7ydiqe80SazNwoffcqOfs95XaLo7yebsmQqDKSsXUtvA==
+  dependencies:
+    d3-dsv "1"
+
+d3-force@1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/d3-force/-/d3-force-1.2.1.tgz#fd29a5d1ff181c9e7f0669e4bd72bdb0e914ec0b"
+  integrity sha512-HHvehyaiUlVo5CxBJ0yF/xny4xoaxFxDnBXNvNcfW9adORGZfyNF1dj6DGLKyk4Yh3brP/1h3rnDzdIAwL08zg==
+  dependencies:
+    d3-collection "1"
+    d3-dispatch "1"
+    d3-quadtree "1"
+    d3-timer "1"
+
+d3-format@1:
+  version "1.4.5"
+  resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.4.5.tgz#374f2ba1320e3717eb74a9356c67daee17a7edb4"
+  integrity sha512-J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ==
+
+d3-geo@1:
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.12.1.tgz#7fc2ab7414b72e59fbcbd603e80d9adc029b035f"
+  integrity sha512-XG4d1c/UJSEX9NfU02KwBL6BYPj8YKHxgBEw5om2ZnTRSbIcego6dhHwcxuSR3clxh0EpE38os1DVPOmnYtTPg==
+  dependencies:
+    d3-array "1"
+
+d3-hierarchy@1:
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-1.1.9.tgz#2f6bee24caaea43f8dc37545fa01628559647a83"
+  integrity sha512-j8tPxlqh1srJHAtxfvOUwKNYJkQuBFdM1+JAUfq6xqH5eAqf93L7oG1NVqDa4CpFZNvnNKtCYEUC8KY9yEn9lQ==
+
+d3-interpolate@1:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.4.0.tgz#526e79e2d80daa383f9e0c1c1c7dcc0f0583e987"
+  integrity sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==
+  dependencies:
+    d3-color "1"
+
+d3-path@1:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-1.0.9.tgz#48c050bb1fe8c262493a8caf5524e3e9591701cf"
+  integrity sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg==
+
+d3-polygon@1:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/d3-polygon/-/d3-polygon-1.0.6.tgz#0bf8cb8180a6dc107f518ddf7975e12abbfbd38e"
+  integrity sha512-k+RF7WvI08PC8reEoXa/w2nSg5AUMTi+peBD9cmFc+0ixHfbs4QmxxkarVal1IkVkgxVuk9JSHhJURHiyHKAuQ==
+
+d3-quadtree@1:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-1.0.7.tgz#ca8b84df7bb53763fe3c2f24bd435137f4e53135"
+  integrity sha512-RKPAeXnkC59IDGD0Wu5mANy0Q2V28L+fNe65pOCXVdVuTJS3WPKaJlFHer32Rbh9gIo9qMuJXio8ra4+YmIymA==
+
+d3-random@1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/d3-random/-/d3-random-1.1.2.tgz#2833be7c124360bf9e2d3fd4f33847cfe6cab291"
+  integrity sha512-6AK5BNpIFqP+cx/sreKzNjWbwZQCSUatxq+pPRmFIQaWuoD+NrbVWw7YWpHiXpCQ/NanKdtGDuB+VQcZDaEmYQ==
+
+d3-scale-chromatic@1:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/d3-scale-chromatic/-/d3-scale-chromatic-1.5.0.tgz#54e333fc78212f439b14641fb55801dd81135a98"
+  integrity sha512-ACcL46DYImpRFMBcpk9HhtIyC7bTBR4fNOPxwVSl0LfulDAwyiHyPOTqcDG1+t5d4P9W7t/2NAuWu59aKko/cg==
+  dependencies:
+    d3-color "1"
+    d3-interpolate "1"
+
+d3-scale@2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-2.2.2.tgz#4e880e0b2745acaaddd3ede26a9e908a9e17b81f"
+  integrity sha512-LbeEvGgIb8UMcAa0EATLNX0lelKWGYDQiPdHj+gLblGVhGLyNbaCn3EvrJf0A3Y/uOOU5aD6MTh5ZFCdEwGiCw==
+  dependencies:
+    d3-array "^1.2.0"
+    d3-collection "1"
+    d3-format "1"
+    d3-interpolate "1"
+    d3-time "1"
+    d3-time-format "2"
+
+d3-selection@1, d3-selection@^1.1.0:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.2.tgz#dcaa49522c0dbf32d6c1858afc26b6094555bc5c"
+  integrity sha512-SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg==
+
+d3-shape@1:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.3.7.tgz#df63801be07bc986bc54f63789b4fe502992b5d7"
+  integrity sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==
+  dependencies:
+    d3-path "1"
+
+d3-time-format@2:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.3.0.tgz#107bdc028667788a8924ba040faf1fbccd5a7850"
+  integrity sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==
+  dependencies:
+    d3-time "1"
+
+d3-time@1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.1.0.tgz#b1e19d307dae9c900b7e5b25ffc5dcc249a8a0f1"
+  integrity sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA==
+
+d3-timer@1:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.10.tgz#dfe76b8a91748831b13b6d9c793ffbd508dd9de5"
+  integrity sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw==
+
+d3-transition@1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.3.2.tgz#a98ef2151be8d8600543434c1ca80140ae23b398"
+  integrity sha512-sc0gRU4PFqZ47lPVHloMn9tlPcv8jxgOQg+0zjhfZXMQuvppjG6YuwdMBE0TuqCZjeJkLecku/l9R0JPcRhaDA==
+  dependencies:
+    d3-color "1"
+    d3-dispatch "1"
+    d3-ease "1"
+    d3-interpolate "1"
+    d3-selection "^1.1.0"
+    d3-timer "1"
+
+d3-voronoi@1:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/d3-voronoi/-/d3-voronoi-1.1.4.tgz#dd3c78d7653d2bb359284ae478645d95944c8297"
+  integrity sha512-dArJ32hchFsrQ8uMiTBLq256MpnZjeuBtdHpaDlYuQyjU0CVzCJl/BVW+SkszaAeH95D/8gxqAhgx0ouAWAfRg==
+
+d3-zoom@1:
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-1.8.3.tgz#b6a3dbe738c7763121cd05b8a7795ffe17f4fc0a"
+  integrity sha512-VoLXTK4wvy1a0JpH2Il+F2CiOhVu7VRXWF5M/LroMIh3/zBAC3WAt7QoIvPibOavVo20hN6/37vwAsdBejLyKQ==
+  dependencies:
+    d3-dispatch "1"
+    d3-drag "1"
+    d3-interpolate "1"
+    d3-selection "1"
+    d3-transition "1"
+
+d3@^5.9.7:
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/d3/-/d3-5.16.0.tgz#9c5e8d3b56403c79d4ed42fbd62f6113f199c877"
+  integrity sha512-4PL5hHaHwX4m7Zr1UapXW23apo6pexCgdetdJ5kTmADpG/7T9Gkxw0M0tf/pjoB63ezCCm0u5UaFYy2aMt0Mcw==
+  dependencies:
+    d3-array "1"
+    d3-axis "1"
+    d3-brush "1"
+    d3-chord "1"
+    d3-collection "1"
+    d3-color "1"
+    d3-contour "1"
+    d3-dispatch "1"
+    d3-drag "1"
+    d3-dsv "1"
+    d3-ease "1"
+    d3-fetch "1"
+    d3-force "1"
+    d3-format "1"
+    d3-geo "1"
+    d3-hierarchy "1"
+    d3-interpolate "1"
+    d3-path "1"
+    d3-polygon "1"
+    d3-quadtree "1"
+    d3-random "1"
+    d3-scale "2"
+    d3-scale-chromatic "1"
+    d3-selection "1"
+    d3-shape "1"
+    d3-time "1"
+    d3-time-format "2"
+    d3-timer "1"
+    d3-transition "1"
+    d3-voronoi "1"
+    d3-zoom "1"
+
+damerau-levenshtein@^1.0.4:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz#64368003512a1a6992593741a09a9d31a836f55d"
+  integrity sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==
+
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
+  dependencies:
+    assert-plus "^1.0.0"
+
+date-format@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/date-format/-/date-format-1.2.0.tgz#615e828e233dd1ab9bb9ae0950e0ceccfa6ecad8"
+  integrity sha512-lAJqBmFzCLcDJdI9cEnJ7loSkLTh1PbIgZUndlzvYbf6NyFEr5n9rQhOwr6CIGwZqyQ3sYeQQiP9NOVQmgmRMA==
+
+date-format@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/date-format/-/date-format-2.1.0.tgz#31d5b5ea211cf5fd764cd38baf9d033df7e125cf"
+  integrity sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==
+
+debug@*, debug@^4.1.0, debug@^4.1.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
+  integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
+  dependencies:
+    ms "2.1.2"
+
+debug@2.6.9, debug@^2.2.0, debug@^2.3.3:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+  dependencies:
+    ms "2.0.0"
+
+debug@3.1.0, debug@~3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
+  dependencies:
+    ms "2.0.0"
+
+debug@^3.1.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
+  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
+  dependencies:
+    ms "^2.1.1"
+
+debuglog@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
+  integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
+
+decamelize@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
+
+decode-uri-component@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
+
+decompress-response@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
+  integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=
+  dependencies:
+    mimic-response "^1.0.0"
+
+deep-equal@^1.0.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a"
+  integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==
+  dependencies:
+    is-arguments "^1.0.4"
+    is-date-object "^1.0.1"
+    is-regex "^1.0.4"
+    object-is "^1.0.1"
+    object-keys "^1.1.1"
+    regexp.prototype.flags "^1.2.0"
+
+deep-extend@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
+
+deep-is@~0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
+
+deepmerge@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
+  integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
+
+default-gateway@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"
+  integrity sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==
+  dependencies:
+    execa "^1.0.0"
+    ip-regex "^2.1.0"
+
+default-require-extensions@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-2.0.0.tgz#f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7"
+  integrity sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=
+  dependencies:
+    strip-bom "^3.0.0"
+
+defer-to-connect@^1.0.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
+  integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
+
+define-properties@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
+  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
+  dependencies:
+    object-keys "^1.0.12"
+
+define-property@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
+  dependencies:
+    is-descriptor "^0.1.0"
+
+define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
+  dependencies:
+    is-descriptor "^1.0.0"
+
+define-property@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
+  dependencies:
+    is-descriptor "^1.0.2"
+    isobject "^3.0.1"
+
+defined@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
+  integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=
+
+del@^2.2.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
+  integrity sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=
+  dependencies:
+    globby "^5.0.0"
+    is-path-cwd "^1.0.0"
+    is-path-in-cwd "^1.0.0"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+    rimraf "^2.2.8"
+
+del@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4"
+  integrity sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==
+  dependencies:
+    "@types/glob" "^7.1.1"
+    globby "^6.1.0"
+    is-path-cwd "^2.0.0"
+    is-path-in-cwd "^2.0.0"
+    p-map "^2.0.0"
+    pify "^4.0.1"
+    rimraf "^2.6.3"
+
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
+
+depd@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
+
+dependency-graph@^0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-0.7.2.tgz#91db9de6eb72699209d88aea4c1fd5221cac1c49"
+  integrity sha512-KqtH4/EZdtdfWX0p6MGP9jljvxSY6msy/pRUD4jgNwVpv3v1QmNLlsB3LDSSUg79BRVSn7jI1QPRtArGABovAQ==
+
+des.js@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
+  integrity sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==
+  dependencies:
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+
+destroy@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
+
+detect-node@^2.0.4:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.5.tgz#9d270aa7eaa5af0b72c4c9d9b814e7f4ce738b79"
+  integrity sha512-qi86tE6hRcFHy8jI1m2VG+LaPUR1LhqDa5G8tVjuUXmOrpuAgqsA1pN0+ldgr3aKUH+QLI9hCY/OcRYisERejw==
+
+detective@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/detective/-/detective-5.2.0.tgz#feb2a77e85b904ecdea459ad897cc90a99bd2a7b"
+  integrity sha512-6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg==
+  dependencies:
+    acorn-node "^1.6.1"
+    defined "^1.0.0"
+    minimist "^1.1.1"
+
+dezalgo@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
+  integrity sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=
+  dependencies:
+    asap "^2.0.0"
+    wrappy "1"
+
+di@^0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
+  integrity sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=
+
+diff@^3.2.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
+  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
+
+diff@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
+  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
+
+diffie-hellman@^5.0.0:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
+  integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
+  dependencies:
+    bn.js "^4.1.0"
+    miller-rabin "^4.0.0"
+    randombytes "^2.0.0"
+
+dir-glob@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
+  dependencies:
+    path-type "^4.0.0"
+
+dns-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
+  integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
+
+dns-packet@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
+  integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==
+  dependencies:
+    ip "^1.1.0"
+    safe-buffer "^5.0.1"
+
+dns-txt@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6"
+  integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=
+  dependencies:
+    buffer-indexof "^1.0.0"
+
+doctrine@0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-0.7.2.tgz#7cb860359ba3be90e040b26b729ce4bfa654c523"
+  integrity sha1-fLhgNZujvpDgQLJrcpzkv6ZUxSM=
+  dependencies:
+    esutils "^1.1.6"
+    isarray "0.0.1"
+
+dom-serialize@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b"
+  integrity sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=
+  dependencies:
+    custom-event "~1.0.0"
+    ent "~2.2.0"
+    extend "^3.0.0"
+    void-elements "^2.0.0"
+
+dom-to-image@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/dom-to-image/-/dom-to-image-2.6.0.tgz#8a503608088c87b1c22f9034ae032e1898955867"
+  integrity sha1-ilA2CAiMh7HCL5A0rgMuGJiVWGc=
+
+dom-walk@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84"
+  integrity sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==
+
+domain-browser@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
+  integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
+
+dompurify@^2.2.0:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.8.tgz#224fe9ae57d7ebd9a1ae1ac18c1c1ca3f532226f"
+  integrity sha512-eVhaWoVibIzqdGYjwsBWodIQIaXFSB+cKDf4cfxLMsK0xiud6SE+/WCVx/Xw/UwQsa4cS3T2eITcdtmTg2UKcw==
+
+dot-prop@^4.1.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.1.tgz#45884194a71fc2cda71cbb4bceb3a4dd2f433ba4"
+  integrity sha512-l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ==
+  dependencies:
+    is-obj "^1.0.0"
+
+duplexer3@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
+  integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
+
+duplexer@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
+  integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
+
+duplexify@^3.4.2, duplexify@^3.6.0:
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
+  integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
+  dependencies:
+    end-of-stream "^1.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+    stream-shift "^1.0.0"
+
+ecc-jsbn@~0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
+  dependencies:
+    jsbn "~0.1.0"
+    safer-buffer "^2.1.0"
+
+ee-first@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
+
+electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.723:
+  version "1.3.727"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.727.tgz#857e310ca00f0b75da4e1db6ff0e073cc4a91ddf"
+  integrity sha512-Mfz4FIB4FSvEwBpDfdipRIrwd6uo8gUDoRDF4QEYb4h4tSuI3ov594OrjU6on042UlFHouIJpClDODGkPcBSbg==
+
+elliptic@^6.5.3:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
+  integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
+  dependencies:
+    bn.js "^4.11.9"
+    brorand "^1.1.0"
+    hash.js "^1.0.0"
+    hmac-drbg "^1.0.1"
+    inherits "^2.0.4"
+    minimalistic-assert "^1.0.1"
+    minimalistic-crypto-utils "^1.0.1"
+
+emoji-regex@^7.0.1:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
+  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
+
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
+emojis-list@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
+  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
+
+emojis-list@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
+  integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
+
+encodeurl@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
+  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
+
+encoding@^0.1.11:
+  version "0.1.13"
+  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
+  integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
+  dependencies:
+    iconv-lite "^0.6.2"
+
+end-of-stream@^1.0.0, end-of-stream@^1.1.0:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
+  dependencies:
+    once "^1.4.0"
+
+engine.io-client@~3.2.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.2.1.tgz#6f54c0475de487158a1a7c77d10178708b6add36"
+  integrity sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==
+  dependencies:
+    component-emitter "1.2.1"
+    component-inherit "0.0.3"
+    debug "~3.1.0"
+    engine.io-parser "~2.1.1"
+    has-cors "1.1.0"
+    indexof "0.0.1"
+    parseqs "0.0.5"
+    parseuri "0.0.5"
+    ws "~3.3.1"
+    xmlhttprequest-ssl "~1.5.4"
+    yeast "0.1.2"
+
+engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.3.tgz#757ab970fbf2dfb32c7b74b033216d5739ef79a6"
+  integrity sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==
+  dependencies:
+    after "0.8.2"
+    arraybuffer.slice "~0.0.7"
+    base64-arraybuffer "0.1.5"
+    blob "0.0.5"
+    has-binary2 "~1.0.2"
+
+engine.io@~3.2.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.2.1.tgz#b60281c35484a70ee0351ea0ebff83ec8c9522a2"
+  integrity sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==
+  dependencies:
+    accepts "~1.3.4"
+    base64id "1.0.0"
+    cookie "0.3.1"
+    debug "~3.1.0"
+    engine.io-parser "~2.1.0"
+    ws "~3.3.1"
+
+enhanced-resolve@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
+  integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==
+  dependencies:
+    graceful-fs "^4.1.2"
+    memory-fs "^0.4.0"
+    tapable "^1.0.0"
+
+enhanced-resolve@^4.1.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec"
+  integrity sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==
+  dependencies:
+    graceful-fs "^4.1.2"
+    memory-fs "^0.5.0"
+    tapable "^1.0.0"
+
+ent@~2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
+  integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0=
+
+err-code@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960"
+  integrity sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=
+
+errno@^0.1.1, errno@^0.1.3, errno@~0.1.7:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f"
+  integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==
+  dependencies:
+    prr "~1.0.1"
+
+error-ex@^1.3.1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
+  dependencies:
+    is-arrayish "^0.2.1"
+
+es-abstract@^1.18.0-next.2:
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0.tgz#ab80b359eecb7ede4c298000390bc5ac3ec7b5a4"
+  integrity sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==
+  dependencies:
+    call-bind "^1.0.2"
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    get-intrinsic "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.2"
+    is-callable "^1.2.3"
+    is-negative-zero "^2.0.1"
+    is-regex "^1.1.2"
+    is-string "^1.0.5"
+    object-inspect "^1.9.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.2"
+    string.prototype.trimend "^1.0.4"
+    string.prototype.trimstart "^1.0.4"
+    unbox-primitive "^1.0.0"
+
+es-to-primitive@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
+  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
+  dependencies:
+    is-callable "^1.1.4"
+    is-date-object "^1.0.1"
+    is-symbol "^1.0.2"
+
+es6-promise@^4.0.3, es6-promise@^4.2.5:
+  version "4.2.8"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
+  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
+
+es6-promisify@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
+  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
+  dependencies:
+    es6-promise "^4.0.3"
+
+escalade@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+
+escape-html@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
+
+escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+
+escodegen@^1.6.1:
+  version "1.14.3"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503"
+  integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==
+  dependencies:
+    esprima "^4.0.1"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
+eslint-scope@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
+  integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==
+  dependencies:
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
+
+esprima@^4.0.0, esprima@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
+
+esrecurse@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
+  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
+  dependencies:
+    estraverse "^5.2.0"
+
+estraverse@^4.1.1, estraverse@^4.2.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
+
+estraverse@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
+  integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
+
+estree-walker@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362"
+  integrity sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==
+
+esutils@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-1.1.6.tgz#c01ccaa9ae4b897c6d0c3e210ae52f3c7a844375"
+  integrity sha1-wBzKqa5LiXxtDD4hCuUvPHqEQ3U=
+
+esutils@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
+
+etag@~1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
+  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
+
+eventemitter3@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-2.0.3.tgz#b5e1079b59fb5e1ba2771c0a993be060a58c99ba"
+  integrity sha1-teEHm1n7XhuidxwKmTvgYKWMmbo=
+
+eventemitter3@^4.0.0:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
+  integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
+
+events@^3.0.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
+  integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
+
+eventsource@^1.0.7:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.0.tgz#00e8ca7c92109e94b0ddf32dac677d841028cfaf"
+  integrity sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==
+  dependencies:
+    original "^1.0.0"
+
+evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
+  integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==
+  dependencies:
+    md5.js "^1.3.4"
+    safe-buffer "^5.1.1"
+
+execa@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
+  integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=
+  dependencies:
+    cross-spawn "^5.0.1"
+    get-stream "^3.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
+execa@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
+  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
+  dependencies:
+    cross-spawn "^6.0.0"
+    get-stream "^4.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
+exit-on-epipe@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz#0bdd92e87d5285d267daa8171d0eb06159689692"
+  integrity sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw==
+
+exit@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
+  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
+
+expand-braces@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/expand-braces/-/expand-braces-0.1.2.tgz#488b1d1d2451cb3d3a6b192cfc030f44c5855fea"
+  integrity sha512-zOOsEnAhvIxxd0esCNbYG2xerGf46niZ1egS43eV7Fu4t7VIScgPXMcMabCLaPrqkzwvwo6zZipDiX3t0ILF2w==
+  dependencies:
+    array-slice "^0.2.3"
+    array-unique "^0.2.1"
+    braces "^0.1.2"
+
+expand-brackets@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
+  dependencies:
+    debug "^2.3.3"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    posix-character-classes "^0.1.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+expand-range@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-0.1.1.tgz#4cb8eda0993ca56fa4f41fc42f3cbb4ccadff044"
+  integrity sha512-busOHJ0t7t5UcutcyNDqmaDX+1cb0XlqsAUgTlmplVv0rIqBaMcBSZRLlkDm0nxtl8O3o/EvRRrdQ/WnyPERLQ==
+  dependencies:
+    is-number "^0.1.1"
+    repeat-string "^0.2.2"
+
+express@^4.17.1:
+  version "4.17.1"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
+  integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
+  dependencies:
+    accepts "~1.3.7"
+    array-flatten "1.1.1"
+    body-parser "1.19.0"
+    content-disposition "0.5.3"
+    content-type "~1.0.4"
+    cookie "0.4.0"
+    cookie-signature "1.0.6"
+    debug "2.6.9"
+    depd "~1.1.2"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    finalhandler "~1.1.2"
+    fresh "0.5.2"
+    merge-descriptors "1.0.1"
+    methods "~1.1.2"
+    on-finished "~2.3.0"
+    parseurl "~1.3.3"
+    path-to-regexp "0.1.7"
+    proxy-addr "~2.0.5"
+    qs "6.7.0"
+    range-parser "~1.2.1"
+    safe-buffer "5.1.2"
+    send "0.17.1"
+    serve-static "1.14.1"
+    setprototypeof "1.1.1"
+    statuses "~1.5.0"
+    type-is "~1.6.18"
+    utils-merge "1.0.1"
+    vary "~1.1.2"
+
+extend-shallow@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
+  dependencies:
+    is-extendable "^0.1.0"
+
+extend-shallow@^3.0.0, extend-shallow@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
+  dependencies:
+    assign-symbols "^1.0.0"
+    is-extendable "^1.0.1"
+
+extend@^3.0.0, extend@^3.0.2, extend@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
+external-editor@^3.0.3:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
+  integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
+  dependencies:
+    chardet "^0.7.0"
+    iconv-lite "^0.4.24"
+    tmp "^0.0.33"
+
+extglob@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
+  dependencies:
+    array-unique "^0.3.2"
+    define-property "^1.0.0"
+    expand-brackets "^2.1.4"
+    extend-shallow "^2.0.1"
+    fragment-cache "^0.2.1"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+extsprintf@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
+
+extsprintf@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
+
+fast-deep-equal@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
+  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
+
+fast-deep-equal@^3.1.1:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
+
+fast-diff@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.1.2.tgz#4b62c42b8e03de3f848460b639079920695d0154"
+  integrity sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==
+
+fast-diff@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
+  integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
+
+fast-glob@^3.1.1, fast-glob@^3.2.4:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661"
+  integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.0"
+    merge2 "^1.3.0"
+    micromatch "^4.0.2"
+    picomatch "^2.2.1"
+
+fast-json-stable-stringify@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
+
+fast-json-stable-stringify@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
+
+fast-levenshtein@~2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+
+fastparse@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9"
+  integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==
+
+fastq@^1.6.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz#bb9fb955a07130a918eb63c1f5161cc32a5d0858"
+  integrity sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==
+  dependencies:
+    reusify "^1.0.4"
+
+faye-websocket@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
+  integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=
+  dependencies:
+    websocket-driver ">=0.5.1"
+
+faye-websocket@~0.11.1:
+  version "0.11.3"
+  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz#5c0e9a8968e8912c286639fde977a8b209f2508e"
+  integrity sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==
+  dependencies:
+    websocket-driver ">=0.5.1"
+
+fflate@^0.3.8:
+  version "0.3.11"
+  resolved "https://registry.yarnpkg.com/fflate/-/fflate-0.3.11.tgz#2c440d7180fdeb819e64898d8858af327b042a5d"
+  integrity sha512-Rr5QlUeGN1mbOHlaqcSYMKVpPbgLy0AWT/W0EHxA6NGI12yO1jpoui2zBBvU2G824ltM6Ut8BFgfHSBGfkmS0A==
+
+fflate@^0.4.8:
+  version "0.4.8"
+  resolved "https://registry.yarnpkg.com/fflate/-/fflate-0.4.8.tgz#f90b82aefbd8ac174213abb338bd7ef848f0f5ae"
+  integrity sha512-FJqqoDBR00Mdj9ppamLa/Y7vxm+PRmNWA67N846RvsoYVMKB4q3y/de5PA7gUmRMYK/8CMz2GDZQmCRN1wBcWA==
+
+figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
+  integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==
+
+figures@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
+  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
+file-loader@4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-4.2.0.tgz#5fb124d2369d7075d70a9a5abecd12e60a95215e"
+  integrity sha512-+xZnaK5R8kBJrHK0/6HRlrKNamvVS5rjyuju+rnyxRGuwUJwpAMsVzUl5dz6rK8brkzjV6JpcFNjp6NqV0g1OQ==
+  dependencies:
+    loader-utils "^1.2.3"
+    schema-utils "^2.0.0"
+
+file-saver@1.3.8:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-1.3.8.tgz#e68a30c7cb044e2fb362b428469feb291c2e09d8"
+  integrity sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg==
+
+file-saver@^2.0.2:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-2.0.5.tgz#d61cfe2ce059f414d899e9dd6d4107ee25670c38"
+  integrity sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==
+
+file-uri-to-path@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
+  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
+
+fileset@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
+  integrity sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=
+  dependencies:
+    glob "^7.0.3"
+    minimatch "^3.0.3"
+
+fill-range@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+    to-regex-range "^2.1.0"
+
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
+finalhandler@1.1.2, finalhandler@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
+  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
+  dependencies:
+    debug "2.6.9"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    on-finished "~2.3.0"
+    parseurl "~1.3.3"
+    statuses "~1.5.0"
+    unpipe "~1.0.0"
+
+find-cache-dir@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.0.0.tgz#cd4b7dd97b7185b7e17dbfe2d6e4115ee3eeb8fc"
+  integrity sha512-t7ulV1fmbxh5G9l/492O1p5+EBbr3uwpt6odhFTMc+nWyhmbloe+ja9BZ8pIBtqFWhOmCWVjx+pTW4zDkFoclw==
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^3.0.0"
+    pkg-dir "^4.1.0"
+
+find-cache-dir@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
+  integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^2.0.0"
+    pkg-dir "^3.0.0"
+
+find-cache-dir@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880"
+  integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^3.0.2"
+    pkg-dir "^4.1.0"
+
+find-parent-dir@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54"
+  integrity sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ=
+
+find-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
+  dependencies:
+    locate-path "^3.0.0"
+
+find-up@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
+  dependencies:
+    locate-path "^5.0.0"
+    path-exists "^4.0.0"
+
+find-up@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+  dependencies:
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
+
+find-versions@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-4.0.0.tgz#3c57e573bf97769b8cb8df16934b627915da4965"
+  integrity sha512-wgpWy002tA+wgmO27buH/9KzyEOQnKsG/R0yrcjPT9BOFm0zRBVQbZ95nRGXWMywS8YR5knRbpohio0bcJABxQ==
+  dependencies:
+    semver-regex "^3.1.2"
+
+flatted@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
+  integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
+
+flush-write-stream@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
+  integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==
+  dependencies:
+    inherits "^2.0.3"
+    readable-stream "^2.3.6"
+
+follow-redirects@^1.0.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43"
+  integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==
+
+for-in@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
+
+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
+
+form-data@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.6"
+    mime-types "^2.1.12"
+
+forwarded@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
+  integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
+
+frac@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/frac/-/frac-1.1.2.tgz#3d74f7f6478c88a1b5020306d747dc6313c74d0b"
+  integrity sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==
+
+fragment-cache@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
+  dependencies:
+    map-cache "^0.2.2"
+
+fresh@0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
+  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
+
+from2@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
+  integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
+  dependencies:
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+
+fs-extra@^0.26.5:
+  version "0.26.7"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.26.7.tgz#9ae1fdd94897798edab76d0918cf42d0c3184fa9"
+  integrity sha1-muH92UiXeY7at20JGM9C0MMYT6k=
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^2.1.0"
+    klaw "^1.0.0"
+    path-is-absolute "^1.0.0"
+    rimraf "^2.2.8"
+
+fs-extra@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
+  integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+fs-extra@^8.0.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
+  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+fs-minipass@^1.2.5:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
+  integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
+  dependencies:
+    minipass "^2.6.0"
+
+fs-minipass@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
+  integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
+  dependencies:
+    minipass "^3.0.0"
+
+fs-promise@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/fs-promise/-/fs-promise-0.5.0.tgz#4347d6bf624655a7061a4319213c393276ad3ef3"
+  integrity sha1-Q0fWv2JGVacGGkMZITw5MnatPvM=
+  dependencies:
+    any-promise "^1.0.0"
+    fs-extra "^0.26.5"
+    mz "^2.3.1"
+    thenify-all "^1.6.0"
+
+fs-write-stream-atomic@^1.0.8:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
+  integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=
+  dependencies:
+    graceful-fs "^4.1.2"
+    iferr "^0.1.5"
+    imurmurhash "^0.1.4"
+    readable-stream "1 || 2"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+
+fsevents@^1.2.7:
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
+  integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==
+  dependencies:
+    bindings "^1.5.0"
+    nan "^2.12.1"
+
+fsevents@~2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
+
+function-bind@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+
+genfun@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537"
+  integrity sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==
+
+gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.2:
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
+  integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
+
+get-caller-file@^1.0.1, get-caller-file@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
+  integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
+
+get-caller-file@^2.0.0, get-caller-file@^2.0.1:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
+  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+
+get-stream@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
+  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
+
+get-stream@^4.0.0, get-stream@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
+  dependencies:
+    pump "^3.0.0"
+
+get-stream@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
+  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
+  dependencies:
+    pump "^3.0.0"
+
+get-value@^2.0.3, get-value@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
+
+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
+  dependencies:
+    assert-plus "^1.0.0"
+
+gl-preserve-state@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/gl-preserve-state/-/gl-preserve-state-1.0.0.tgz#4ef710d62873f1470ed015c6546c37dacddd4198"
+  integrity sha512-zQZ25l3haD4hvgJZ6C9+s0ebdkW9y+7U2qxvGu1uWOJh8a4RU+jURIKEQhf8elIlFpMH6CrAY2tH0mYrRjet3Q==
+
+glob-parent@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
+  dependencies:
+    is-glob "^3.1.0"
+    path-dirname "^1.0.0"
+
+glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@~5.1.0:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+  dependencies:
+    is-glob "^4.0.1"
+
+glob@7.0.x:
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a"
+  integrity sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.2"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@7.1.4:
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
+  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
+  version "7.1.7"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
+  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+global-dirs@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
+  integrity sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=
+  dependencies:
+    ini "^1.3.4"
+
+global@4.3.2, global@~4.3.0:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f"
+  integrity sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=
+  dependencies:
+    min-document "^2.19.0"
+    process "~0.5.1"
+
+global@^4.3.0, global@^4.3.1, global@^4.3.2, global@^4.4.0, global@~4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406"
+  integrity sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==
+  dependencies:
+    min-document "^2.19.0"
+    process "^0.11.10"
+
+globals@^11.1.0:
+  version "11.12.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
+  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
+
+globby@^11.0.1:
+  version "11.0.3"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz#9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb"
+  integrity sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==
+  dependencies:
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.1.1"
+    ignore "^5.1.4"
+    merge2 "^1.3.0"
+    slash "^3.0.0"
+
+globby@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
+  integrity sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=
+  dependencies:
+    array-union "^1.0.1"
+    arrify "^1.0.0"
+    glob "^7.0.3"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+globby@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
+  integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
+  dependencies:
+    array-union "^1.0.1"
+    glob "^7.0.3"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+got@^9.6.0:
+  version "9.6.0"
+  resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85"
+  integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==
+  dependencies:
+    "@sindresorhus/is" "^0.14.0"
+    "@szmarczak/http-timer" "^1.1.2"
+    cacheable-request "^6.0.0"
+    decompress-response "^3.3.0"
+    duplexer3 "^0.1.4"
+    get-stream "^4.1.0"
+    lowercase-keys "^1.0.1"
+    mimic-response "^1.0.1"
+    p-cancelable "^1.0.0"
+    to-readable-stream "^1.0.0"
+    url-parse-lax "^3.0.0"
+
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0:
+  version "4.2.6"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
+  integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
+
+grunt-karma@^0.12.2:
+  version "0.12.2"
+  resolved "https://registry.yarnpkg.com/grunt-karma/-/grunt-karma-0.12.2.tgz#d52676ab94779e4b20052b5f3519eb32653dc566"
+  integrity sha512-houkUR8sks8uliJ5khwvV4Cf2vrxSPkvCt+w9uwOOHhDOCLZ9ZE4/MeDmC7GgSajGK+h/svpacbKFHyjNbCsng==
+  dependencies:
+    lodash "^3.10.1"
+
+gzip-size@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462"
+  integrity sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==
+  dependencies:
+    duplexer "^0.1.2"
+
+gzipper@^2.8.1:
+  version "2.10.4"
+  resolved "https://registry.yarnpkg.com/gzipper/-/gzipper-2.10.4.tgz#01746933b0655dcebfa5d668d1dcab007002c1bb"
+  integrity sha512-5I10NtGBdwwWDVAty+/y3EHVS3vyLldAoAtiF79hcAxC6W4x17f1dc13ua5c8HaXOP6eSf7Tq2zJzZKYJogBOQ==
+  dependencies:
+    commander "^3.0.0"
+    uuid "^3.3.3"
+
+hammerjs@^2.0.8:
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/hammerjs/-/hammerjs-2.0.8.tgz#04ef77862cff2bb79d30f7692095930222bf60f1"
+  integrity sha1-BO93hiz/K7edMPdpIJWTAiK/YPE=
+
+handle-thing@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
+  integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==
+
+har-schema@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
+
+har-validator@~5.1.3:
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
+  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
+  dependencies:
+    ajv "^6.12.3"
+    har-schema "^2.0.0"
+
+has-ansi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
+  dependencies:
+    ansi-regex "^2.0.0"
+
+has-bigints@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
+  integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
+
+has-binary2@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
+  integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==
+  dependencies:
+    isarray "2.0.1"
+
+has-cors@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
+  integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
+
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
+has-symbols@^1.0.1, has-symbols@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
+  integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
+
+has-value@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
+  dependencies:
+    get-value "^2.0.3"
+    has-values "^0.1.4"
+    isobject "^2.0.0"
+
+has-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
+  dependencies:
+    get-value "^2.0.6"
+    has-values "^1.0.0"
+    isobject "^3.0.0"
+
+has-values@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
+
+has-values@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
+
+has-yarn@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"
+  integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==
+
+has@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+  dependencies:
+    function-bind "^1.1.1"
+
+hash-base@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"
+  integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==
+  dependencies:
+    inherits "^2.0.4"
+    readable-stream "^3.6.0"
+    safe-buffer "^5.2.0"
+
+hash.js@^1.0.0, hash.js@^1.0.3:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
+  integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
+  dependencies:
+    inherits "^2.0.3"
+    minimalistic-assert "^1.0.1"
+
+"hashish@>=0.0.2 <0.1":
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/hashish/-/hashish-0.0.4.tgz#6d60bc6ffaf711b6afd60e426d077988014e6554"
+  integrity sha1-bWC8b/r3Ebav1g5CbQd5iAFOZVQ=
+  dependencies:
+    traverse ">=0.2.4"
+
+hmac-drbg@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
+  integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
+  dependencies:
+    hash.js "^1.0.3"
+    minimalistic-assert "^1.0.0"
+    minimalistic-crypto-utils "^1.0.1"
+
+hosted-git-info@^2.1.4, hosted-git-info@^2.6.0, hosted-git-info@^2.7.1:
+  version "2.8.9"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
+  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
+
+hpack.js@^2.1.6:
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
+  integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=
+  dependencies:
+    inherits "^2.0.1"
+    obuf "^1.0.0"
+    readable-stream "^2.0.1"
+    wbuf "^1.1.0"
+
+html-entities@^1.3.1:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.4.0.tgz#cfbd1b01d2afaf9adca1b10ae7dffab98c71d2dc"
+  integrity sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==
+
+html-escaper@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
+  integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
+
+html-tags@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140"
+  integrity sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==
+
+html2canvas@^1.0.0-alpha.12:
+  version "1.0.0-rc.7"
+  resolved "https://registry.yarnpkg.com/html2canvas/-/html2canvas-1.0.0-rc.7.tgz#70c159ce0e63954a91169531894d08ad5627ac98"
+  integrity sha512-yvPNZGejB2KOyKleZspjK/NruXVQuowu8NnV2HYG7gW7ytzl+umffbtUI62v2dCHQLDdsK6HIDtyJZ0W3neerA==
+  dependencies:
+    css-line-break "1.1.1"
+
+html2canvas@^1.0.0-rc.5:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/html2canvas/-/html2canvas-1.4.1.tgz#7cef1888311b5011d507794a066041b14669a543"
+  integrity sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==
+  dependencies:
+    css-line-break "^2.1.0"
+    text-segmentation "^1.0.3"
+
+html2pdf.js@^0.9.1:
+  version "0.9.3"
+  resolved "https://registry.yarnpkg.com/html2pdf.js/-/html2pdf.js-0.9.3.tgz#e7fc6143f748ce253670eaae403987342b66b15c"
+  integrity sha512-M254g3Z+ZsjtQFDxJlU6E8Zgb8xOpCBQQM1lFPn4Lq+myAdWoYtMFnwlVo/eOI9R1cG75+YmMSDQofkugwOV/Q==
+  dependencies:
+    es6-promise "^4.2.5"
+    html2canvas "^1.0.0-alpha.12"
+    jspdf "1.4.1"
+
+http-cache-semantics@^3.8.1:
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
+  integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==
+
+http-cache-semantics@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
+  integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
+
+http-deceiver@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
+  integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=
+
+http-errors@1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
+  integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
+
+http-errors@~1.6.2:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
+  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.0"
+    statuses ">= 1.4.0 < 2"
+
+http-errors@~1.7.2:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
+  integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.4"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
+
+http-parser-js@>=0.5.1:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz#01d2709c79d41698bb01d4decc5e9da4e4a033d9"
+  integrity sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==
+
+http-proxy-agent@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
+  integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==
+  dependencies:
+    agent-base "4"
+    debug "3.1.0"
+
+http-proxy-middleware@0.19.1:
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
+  integrity sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==
+  dependencies:
+    http-proxy "^1.17.0"
+    is-glob "^4.0.0"
+    lodash "^4.17.11"
+    micromatch "^3.1.10"
+
+http-proxy@^1.13.0, http-proxy@^1.17.0:
+  version "1.18.1"
+  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
+  integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
+  dependencies:
+    eventemitter3 "^4.0.0"
+    follow-redirects "^1.0.0"
+    requires-port "^1.0.0"
+
+http-signature@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
+  dependencies:
+    assert-plus "^1.0.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
+https-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
+  integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
+
+https-proxy-agent@^2.2.1, https-proxy-agent@^2.2.3:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
+  integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
+  dependencies:
+    agent-base "^4.3.0"
+    debug "^3.1.0"
+
+humanize-ms@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
+  integrity sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=
+  dependencies:
+    ms "^2.0.0"
+
+husky@^4.2.3:
+  version "4.3.8"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-4.3.8.tgz#31144060be963fd6850e5cc8f019a1dfe194296d"
+  integrity sha512-LCqqsB0PzJQ/AlCgfrfzRe3e3+NvmefAdKQhRYpxS4u6clblBoDdzzvHi8fmxKRzvMxPY/1WZWzomPZww0Anow==
+  dependencies:
+    chalk "^4.0.0"
+    ci-info "^2.0.0"
+    compare-versions "^3.6.0"
+    cosmiconfig "^7.0.0"
+    find-versions "^4.0.0"
+    opencollective-postinstall "^2.0.2"
+    pkg-dir "^5.0.0"
+    please-upgrade-node "^3.2.0"
+    slash "^3.0.0"
+    which-pm-runs "^1.0.0"
+
+iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.13, iconv-lite@^0.4.24:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
+iconv-lite@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01"
+  integrity sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3.0.0"
+
+ieee754@^1.1.13, ieee754@^1.1.4:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
+
+iferr@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
+  integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
+
+ignore-walk@^3.0.1:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.4.tgz#c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335"
+  integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==
+  dependencies:
+    minimatch "^3.0.4"
+
+ignore@^5.1.4:
+  version "5.1.8"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
+  integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
+
+image-size@~0.5.0:
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
+  integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=
+
+immediate@~3.0.5:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
+  integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
+
+import-cwd@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
+  integrity sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=
+  dependencies:
+    import-from "^2.1.0"
+
+import-fresh@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
+  integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY=
+  dependencies:
+    caller-path "^2.0.0"
+    resolve-from "^3.0.0"
+
+import-fresh@^3.2.1:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
+  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
+  dependencies:
+    parent-module "^1.0.0"
+    resolve-from "^4.0.0"
+
+import-from@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1"
+  integrity sha1-M1238qev/VOqpHHUuAId7ja387E=
+  dependencies:
+    resolve-from "^3.0.0"
+
+import-lazy@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
+  integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=
+
+import-local@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
+  integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==
+  dependencies:
+    pkg-dir "^3.0.0"
+    resolve-cwd "^2.0.0"
+
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+
+indent-string@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
+  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
+
+indexof@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
+  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
+
+individual@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/individual/-/individual-2.0.0.tgz#833b097dad23294e76117a98fb38e0d9ad61bb97"
+  integrity sha1-gzsJfa0jKU52EXqY+zjg2a1hu5c=
+
+infer-owner@^1.0.3, infer-owner@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
+  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+inherits@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
+
+inherits@2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+
+ini@1.3.5:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+
+ini@^1.3.4, ini@~1.3.0:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
+
+injection-js@^2.2.1:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/injection-js/-/injection-js-2.4.0.tgz#ebe8871b1a349f23294eaa751bbd8209a636e754"
+  integrity sha512-6jiJt0tCAo9zjHbcwLiPL+IuNe9SQ6a9g0PEzafThW3fOQi0mrmiJGBJvDD6tmhPh8cQHIQtCOrJuBfQME4kPA==
+  dependencies:
+    tslib "^2.0.0"
+
+inquirer@6.5.1:
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.1.tgz#8bfb7a5ac02dac6ff641ac4c5ff17da112fcdb42"
+  integrity sha512-uxNHBeQhRXIoHWTSNYUFhQVrHYFThIt6IVo2fFmSe8aBwdR3/w6b58hJpiL/fMukFkvGzjg+hSxFtwvVmKZmXw==
+  dependencies:
+    ansi-escapes "^4.2.1"
+    chalk "^2.4.2"
+    cli-cursor "^3.1.0"
+    cli-width "^2.0.0"
+    external-editor "^3.0.3"
+    figures "^3.0.0"
+    lodash "^4.17.15"
+    mute-stream "0.0.8"
+    run-async "^2.2.0"
+    rxjs "^6.4.0"
+    string-width "^4.1.0"
+    strip-ansi "^5.1.0"
+    through "^2.3.6"
+
+internal-ip@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
+  integrity sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==
+  dependencies:
+    default-gateway "^4.2.0"
+    ipaddr.js "^1.9.0"
+
+invariant@^2.2.2:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
+  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
+  dependencies:
+    loose-envify "^1.0.0"
+
+inversify@^5.0.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/inversify/-/inversify-5.1.1.tgz#6fbd668c591337404e005a1946bfe0d802c08730"
+  integrity sha512-j8grHGDzv1v+8T1sAQ+3boTCntFPfvxLCkNcxB1J8qA0lUN+fAlSyYd+RXKvaPRL4AGyPxViutBEJHNXOyUdFQ==
+
+invert-kv@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
+  integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
+
+ip-regex@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
+  integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
+
+ip@1.1.5, ip@^1.1.0, ip@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
+  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
+
+ipaddr.js@1.9.1, ipaddr.js@^1.9.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
+  integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
+
+is-absolute-url@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698"
+  integrity sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==
+
+is-accessor-descriptor@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-accessor-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
+  dependencies:
+    kind-of "^6.0.0"
+
+is-arguments@^1.0.4:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.0.tgz#62353031dfbee07ceb34656a6bde59efecae8dd9"
+  integrity sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==
+  dependencies:
+    call-bind "^1.0.0"
+
+is-arrayish@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
+
+is-arrayish@^0.3.1:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
+  integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
+
+is-bigint@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz#ffb381442503235ad245ea89e45b3dbff040ee5a"
+  integrity sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==
+
+is-binary-path@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
+  dependencies:
+    binary-extensions "^1.0.0"
+
+is-binary-path@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
+  dependencies:
+    binary-extensions "^2.0.0"
+
+is-boolean-object@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz#3c0878f035cb821228d350d2e1e36719716a3de8"
+  integrity sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==
+  dependencies:
+    call-bind "^1.0.2"
+
+is-buffer@^1.1.5:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
+
+is-callable@^1.1.4, is-callable@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e"
+  integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==
+
+is-ci@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
+  integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
+  dependencies:
+    ci-info "^2.0.0"
+
+is-core-module@^2.2.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz#8e9fc8e15027b011418026e98f0e6f4d86305cc1"
+  integrity sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==
+  dependencies:
+    has "^1.0.3"
+
+is-data-descriptor@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-data-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
+  dependencies:
+    kind-of "^6.0.0"
+
+is-date-object@^1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz#550cfcc03afada05eea3dd30981c7b09551f73e5"
+  integrity sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==
+
+is-descriptor@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
+  dependencies:
+    is-accessor-descriptor "^0.1.6"
+    is-data-descriptor "^0.1.4"
+    kind-of "^5.0.0"
+
+is-descriptor@^1.0.0, is-descriptor@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
+  dependencies:
+    is-accessor-descriptor "^1.0.0"
+    is-data-descriptor "^1.0.0"
+    kind-of "^6.0.2"
+
+is-directory@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
+  integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
+
+is-extendable@^0.1.0, is-extendable@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
+
+is-extendable@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
+  dependencies:
+    is-plain-object "^2.0.4"
+
+is-extglob@^2.1.0, is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+
+is-fullwidth-code-point@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
+  dependencies:
+    number-is-nan "^1.0.0"
+
+is-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
+
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
+is-function@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.2.tgz#4f097f30abf6efadac9833b17ca5dc03f8144e08"
+  integrity sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==
+
+is-glob@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
+  dependencies:
+    is-extglob "^2.1.0"
+
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
+  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
+  dependencies:
+    is-extglob "^2.1.1"
+
+is-installed-globally@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80"
+  integrity sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=
+  dependencies:
+    global-dirs "^0.1.0"
+    is-path-inside "^1.0.0"
+
+is-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
+  integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
+
+is-negative-zero@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
+  integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
+
+is-npm@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-3.0.0.tgz#ec9147bfb629c43f494cf67936a961edec7e8053"
+  integrity sha512-wsigDr1Kkschp2opC4G3yA6r9EgVA6NjRpWzIi9axXqeIaAATPRJc4uLujXe3Nd9uO8KoDyA4MD6aZSeXTADhA==
+
+is-number-object@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz#6edfaeed7950cff19afedce9fbfca9ee6dd289eb"
+  integrity sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==
+
+is-number@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-0.1.1.tgz#69a7af116963d47206ec9bd9b48a14216f1e3806"
+  integrity sha512-la5kPULwIgkSSaZj9w7/A1uHqOBAgOhDUKQ5CkfL8LZ4Si6r4+2D0hI6b4o60MW4Uj2yNJARWIZUDPxlvOYQcw==
+
+is-number@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
+is-obj@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
+
+is-path-cwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
+  integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
+
+is-path-cwd@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
+  integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==
+
+is-path-in-cwd@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
+  integrity sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==
+  dependencies:
+    is-path-inside "^1.0.0"
+
+is-path-in-cwd@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz#bfe2dca26c69f397265a4009963602935a053acb"
+  integrity sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==
+  dependencies:
+    is-path-inside "^2.1.0"
+
+is-path-inside@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
+  integrity sha1-jvW33lBDej/cprToZe96pVy0gDY=
+  dependencies:
+    path-is-inside "^1.0.1"
+
+is-path-inside@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz#7c9810587d659a40d27bcdb4d5616eab059494b2"
+  integrity sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==
+  dependencies:
+    path-is-inside "^1.0.2"
+
+is-plain-obj@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
+
+is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
+  dependencies:
+    isobject "^3.0.1"
+
+is-reference@^1.1.2:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.2.1.tgz#8b2dac0b371f4bc994fdeaba9eb542d03002d0b7"
+  integrity sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==
+  dependencies:
+    "@types/estree" "*"
+
+is-regex@^1.0.4, is-regex@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz#d029f9aff6448b93ebbe3f33dac71511fdcbef9f"
+  integrity sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==
+  dependencies:
+    call-bind "^1.0.2"
+    has-symbols "^1.0.2"
+
+is-stream@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
+
+is-string@^1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz#3fe5d5992fb0d93404f32584d4b0179a71b54a5f"
+  integrity sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==
+
+is-symbol@^1.0.2, is-symbol@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
+  integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
+  dependencies:
+    has-symbols "^1.0.2"
+
+is-typedarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
+
+is-what@^3.12.0:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/is-what/-/is-what-3.14.1.tgz#e1222f46ddda85dead0fd1c9df131760e77755c1"
+  integrity sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==
+
+is-windows@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
+
+is-wsl@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
+  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
+
+is-yarn-global@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232"
+  integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==
+
+isarray@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
+
+isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+
+isarray@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
+  integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=
+
+isbinaryfile@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80"
+  integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==
+  dependencies:
+    buffer-alloc "^1.2.0"
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+
+isobject@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
+  dependencies:
+    isarray "1.0.0"
+
+isobject@^3.0.0, isobject@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
+
+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
+
+istanbul-api@^2.1.6:
+  version "2.1.7"
+  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-2.1.7.tgz#82786b79f3b93d481349c7aa1e2c2b4eeb48c8a8"
+  integrity sha512-LYTOa2UrYFyJ/aSczZi/6lBykVMjCCvUmT64gOe+jPZFy4w6FYfPGqFT2IiQ2BxVHHDOvCD7qrIXb0EOh4uGWw==
+  dependencies:
+    async "^2.6.2"
+    compare-versions "^3.4.0"
+    fileset "^2.0.3"
+    istanbul-lib-coverage "^2.0.5"
+    istanbul-lib-hook "^2.0.7"
+    istanbul-lib-instrument "^3.3.0"
+    istanbul-lib-report "^2.0.8"
+    istanbul-lib-source-maps "^3.0.6"
+    istanbul-reports "^2.2.5"
+    js-yaml "^3.13.1"
+    make-dir "^2.1.0"
+    minimatch "^3.0.4"
+    once "^1.4.0"
+
+istanbul-lib-coverage@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#675f0ab69503fad4b1d849f736baaca803344f49"
+  integrity sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==
+
+istanbul-lib-coverage@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec"
+  integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==
+
+istanbul-lib-hook@^2.0.7:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-2.0.7.tgz#c95695f383d4f8f60df1f04252a9550e15b5b133"
+  integrity sha512-vrRztU9VRRFDyC+aklfLoeXyNdTfga2EI3udDGn4cZ6fpSXpHLV9X6CHvfoMCPtggg8zvDDmC4b9xfu0z6/llA==
+  dependencies:
+    append-transform "^1.0.0"
+
+istanbul-lib-instrument@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz#a5f63d91f0bbc0c3e479ef4c5de027335ec6d630"
+  integrity sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==
+  dependencies:
+    "@babel/generator" "^7.4.0"
+    "@babel/parser" "^7.4.3"
+    "@babel/template" "^7.4.0"
+    "@babel/traverse" "^7.4.3"
+    "@babel/types" "^7.4.0"
+    istanbul-lib-coverage "^2.0.5"
+    semver "^6.0.0"
+
+istanbul-lib-instrument@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d"
+  integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==
+  dependencies:
+    "@babel/core" "^7.7.5"
+    "@istanbuljs/schema" "^0.1.2"
+    istanbul-lib-coverage "^3.0.0"
+    semver "^6.3.0"
+
+istanbul-lib-report@^2.0.8:
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz#5a8113cd746d43c4889eba36ab10e7d50c9b4f33"
+  integrity sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==
+  dependencies:
+    istanbul-lib-coverage "^2.0.5"
+    make-dir "^2.1.0"
+    supports-color "^6.1.0"
+
+istanbul-lib-source-maps@^3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz#284997c48211752ec486253da97e3879defba8c8"
+  integrity sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==
+  dependencies:
+    debug "^4.1.1"
+    istanbul-lib-coverage "^2.0.5"
+    make-dir "^2.1.0"
+    rimraf "^2.6.3"
+    source-map "^0.6.1"
+
+istanbul-reports@^2.2.5:
+  version "2.2.7"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.7.tgz#5d939f6237d7b48393cc0959eab40cd4fd056931"
+  integrity sha512-uu1F/L1o5Y6LzPVSVZXNOoD/KXpJue9aeLRd0sM9uMXfZvzomB0WxVamWb5ue8kA2vVWEmW7EG+A5n3f1kqHKg==
+  dependencies:
+    html-escaper "^2.0.0"
+
+jasmine-core@^3.3:
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.7.1.tgz#0401327f6249eac993d47bbfa18d4e8efacfb561"
+  integrity sha512-DH3oYDS/AUvvr22+xUBW62m1Xoy7tUlY1tsxKEJvl5JeJ7q8zd1K5bUwiOxdH+erj6l2vAMM3hV25Xs9/WrmuQ==
+
+jasmine-core@~2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
+  integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=
+
+jasmine-core@~3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.4.0.tgz#2a74618e966026530c3518f03e9f845d26473ce3"
+  integrity sha512-HU/YxV4i6GcmiH4duATwAbJQMlE0MsDIR5XmSVxURxKHn3aGAdbY1/ZJFmVRbKtnLwIxxMJD7gYaPsypcbYimg==
+
+jasmine-spec-reporter@~4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz#1d632aec0341670ad324f92ba84b4b32b35e9e22"
+  integrity sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==
+  dependencies:
+    colors "1.1.2"
+
+jasmine@2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.8.0.tgz#6b089c0a11576b1f16df11b80146d91d4e8b8a3e"
+  integrity sha1-awicChFXax8W3xG4AUbZHU6Lij4=
+  dependencies:
+    exit "^0.1.2"
+    glob "^7.0.6"
+    jasmine-core "~2.8.0"
+
+jasminewd2@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-2.2.0.tgz#e37cf0b17f199cce23bea71b2039395246b4ec4e"
+  integrity sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=
+
+jest-worker@24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.9.0.tgz#5dbfdb5b2d322e98567898238a9697bcce67b3e5"
+  integrity sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==
+  dependencies:
+    merge-stream "^2.0.0"
+    supports-color "^6.1.0"
+
+jest-worker@^26.0.0:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
+  integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
+  dependencies:
+    "@types/node" "*"
+    merge-stream "^2.0.0"
+    supports-color "^7.0.0"
+
+jquery@^3.4.1:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
+  integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
+
+"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
+
+js-yaml@^3.13.1:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
+
+jsdom@^8.1.0:
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-8.5.0.tgz#d4d8f5dbf2768635b62a62823b947cf7071ebc98"
+  integrity sha1-1Nj12/J2hjW2KmKCO5R89wcevJg=
+  dependencies:
+    abab "^1.0.0"
+    acorn "^2.4.0"
+    acorn-globals "^1.0.4"
+    array-equal "^1.0.0"
+    cssom ">= 0.3.0 < 0.4.0"
+    cssstyle ">= 0.2.34 < 0.3.0"
+    escodegen "^1.6.1"
+    iconv-lite "^0.4.13"
+    nwmatcher ">= 1.3.7 < 2.0.0"
+    parse5 "^1.5.1"
+    request "^2.55.0"
+    sax "^1.1.4"
+    symbol-tree ">= 3.1.0 < 4.0.0"
+    tough-cookie "^2.2.0"
+    webidl-conversions "^3.0.1"
+    whatwg-url "^2.0.1"
+    xml-name-validator ">= 2.0.1 < 3.0.0"
+
+jsesc@^2.5.1:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
+
+jsesc@~0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
+  integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
+
+json-buffer@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
+  integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=
+
+json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
+  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
+
+json-parse-even-better-errors@^2.3.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
+  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
+
+json-schema-traverse@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
+
+json-schema@0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
+
+json-stringify-safe@~5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
+
+json3@^3.3.2:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
+  integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==
+
+json5@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
+  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  dependencies:
+    minimist "^1.2.0"
+
+json5@^2.1.0, json5@^2.1.2:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
+  integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
+  dependencies:
+    minimist "^1.2.5"
+
+jsonfile@^2.1.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
+  integrity sha1-NzaitCi4e72gzIO1P6PWM6NcKug=
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+jsonfile@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+jsonparse@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
+  integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
+
+jspdf@1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jspdf/-/jspdf-1.4.1.tgz#8dbd437986346d65efe20ede5361927666b8e4ca"
+  integrity sha512-2vYVdrvrQUdKKPyWHw81t1jEYYAJ6uFJ/HtTcGbI4qXIQEdl18dLEuL2wTeSv2GzeQLSgUvEvwsXsszuHK+PTw==
+  dependencies:
+    canvg "^1.0"
+    cf-blob.js "0.0.1"
+    file-saver "1.3.8"
+    omggif "1.0.7"
+    stackblur "^1.0.0"
+
+jspdf@^2.3.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/jspdf/-/jspdf-2.5.1.tgz#00c85250abf5447a05f3b32ab9935ab4a56592cc"
+  integrity sha512-hXObxz7ZqoyhxET78+XR34Xu2qFGrJJ2I2bE5w4SM8eFaFEkW2xcGRVUss360fYelwRSid/jT078kbNvmoW0QA==
+  dependencies:
+    "@babel/runtime" "^7.14.0"
+    atob "^2.1.2"
+    btoa "^1.2.1"
+    fflate "^0.4.8"
+  optionalDependencies:
+    canvg "^3.0.6"
+    core-js "^3.6.0"
+    dompurify "^2.2.0"
+    html2canvas "^1.0.0-rc.5"
+
+jsplumb@2.11.2:
+  version "2.11.2"
+  resolved "https://registry.yarnpkg.com/jsplumb/-/jsplumb-2.11.2.tgz#f8de737ea4b2551ebd95ca4b57dc096c3833e7dd"
+  integrity sha512-GyZE8l2JeZ0haOzHhsgykD8k1j5st1v2nNWaNNMqmRmGU43iuP9iBDAXDxmGNPp1t+4W++sT1SkbI8754YMtIg==
+
+jsprim@^1.2.2:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.3.0"
+    json-schema "0.2.3"
+    verror "1.10.0"
+
+jszip@^3.1.3:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.6.0.tgz#839b72812e3f97819cc13ac4134ffced95dd6af9"
+  integrity sha512-jgnQoG9LKnWO3mnVNBnfhkh0QknICd1FGSrXcgrl67zioyJ4wgx25o9ZqwNtrROSflGBCGYnJfjrIyRIby1OoQ==
+  dependencies:
+    lie "~3.3.0"
+    pako "~1.0.2"
+    readable-stream "~2.3.6"
+    set-immediate-shim "~1.0.1"
+
+karma-chrome-launcher@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-3.0.0.tgz#5c3a7f877a304e90781c28fcd9a49e334a890f42"
+  integrity sha512-u/PnVgDOP97AUe/gJeABlC6Wa6aQ83MZsm0JgsJQ5bGQ9XcXON/7b2aRhl59A62Zom+q3PFveBkczc7E1RT7TA==
+  dependencies:
+    which "^1.2.1"
+
+karma-coverage-istanbul-reporter@~2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.1.1.tgz#37a775fbfbb3cbe98cebf19605c94c6277c3b88a"
+  integrity sha512-CH8lTi8+kKXGvrhy94+EkEMldLCiUA0xMOiL31vvli9qK0T+qcXJAwWBRVJWnVWxYkTmyWar8lPz63dxX6/z1A==
+  dependencies:
+    istanbul-api "^2.1.6"
+    minimatch "^3.0.4"
+
+karma-jasmine-html-reporter@^1.4.2:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.6.0.tgz#586e17025a1b4128e9fba55d5f1e8921bfc3bc1e"
+  integrity sha512-ELO9yf0cNqpzaNLsfFgXd/wxZVYkE2+ECUwhMHUD4PZ17kcsPsYsVyjquiRqyMn2jkd2sHt0IeMyAyq1MC23Fw==
+
+karma-jasmine@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-2.0.1.tgz#26e3e31f2faf272dd80ebb0e1898914cc3a19763"
+  integrity sha512-iuC0hmr9b+SNn1DaUD2QEYtUxkS1J+bSJSn7ejdEexs7P8EYvA1CWkEdrDQ+8jVH3AgWlCNwjYsT1chjcNW9lA==
+  dependencies:
+    jasmine-core "^3.3"
+
+karma-safaritechpreview-launcher@0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/karma-safaritechpreview-launcher/-/karma-safaritechpreview-launcher-0.0.6.tgz#7a841105aeb7053940e33df850edcf220eed906a"
+  integrity sha512-2QMxAGXPQ37H3KoR9SCdh0OoktQZ5MyrxkvBiZ+VVOQfYVrcyOQXGrPea0/DKvf8qoQvrvP2FHcP/BxsuxuyHw==
+  dependencies:
+    fs-promise "^0.5.0"
+    marcosc-async "^3.0.4"
+
+karma-source-map-support@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz#58526ceccf7e8730e56effd97a4de8d712ac0d6b"
+  integrity sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==
+  dependencies:
+    source-map-support "^0.5.5"
+
+karma@^3.0.0:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-3.1.4.tgz#3890ca9722b10d1d14b726e1335931455788499e"
+  integrity sha512-31Vo8Qr5glN+dZEVIpnPCxEGleqE0EY6CtC2X9TagRV3rRQ3SNrvfhddICkJgUK3AgqpeKSZau03QumTGhGoSw==
+  dependencies:
+    bluebird "^3.3.0"
+    body-parser "^1.16.1"
+    chokidar "^2.0.3"
+    colors "^1.1.0"
+    combine-lists "^1.0.0"
+    connect "^3.6.0"
+    core-js "^2.2.0"
+    di "^0.0.1"
+    dom-serialize "^2.2.0"
+    expand-braces "^0.1.1"
+    flatted "^2.0.0"
+    glob "^7.1.1"
+    graceful-fs "^4.1.2"
+    http-proxy "^1.13.0"
+    isbinaryfile "^3.0.0"
+    lodash "^4.17.5"
+    log4js "^3.0.0"
+    mime "^2.3.1"
+    minimatch "^3.0.2"
+    optimist "^0.6.1"
+    qjobs "^1.1.4"
+    range-parser "^1.2.0"
+    rimraf "^2.6.0"
+    safe-buffer "^5.0.1"
+    socket.io "2.1.1"
+    source-map "^0.6.1"
+    tmp "0.0.33"
+    useragent "2.3.0"
+
+karma@~4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-4.2.0.tgz#27e88b310cde090d016980ff5444e3a239196fca"
+  integrity sha512-fmCuxN1rwJxTdZfOXK5LjlmS4Ana/OvzNMpkyLL/TLE8hmgSkpVpMYQ7RTVa8TNKRVQDZNl5W1oF5cfKfgIMlA==
+  dependencies:
+    bluebird "^3.3.0"
+    body-parser "^1.16.1"
+    braces "^3.0.2"
+    chokidar "^3.0.0"
+    colors "^1.1.0"
+    connect "^3.6.0"
+    core-js "^3.1.3"
+    di "^0.0.1"
+    dom-serialize "^2.2.0"
+    flatted "^2.0.0"
+    glob "^7.1.1"
+    graceful-fs "^4.1.2"
+    http-proxy "^1.13.0"
+    isbinaryfile "^3.0.0"
+    lodash "^4.17.11"
+    log4js "^4.0.0"
+    mime "^2.3.1"
+    minimatch "^3.0.2"
+    optimist "^0.6.1"
+    qjobs "^1.1.4"
+    range-parser "^1.2.0"
+    rimraf "^2.6.0"
+    safe-buffer "^5.0.1"
+    socket.io "2.1.1"
+    source-map "^0.6.1"
+    tmp "0.0.33"
+    useragent "2.3.0"
+
+keycharm@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/keycharm/-/keycharm-0.2.0.tgz#fa6ea2e43b90a68028843d27f2075d35a8c3e6f9"
+  integrity sha1-+m6i5DuQpoAohD0n8gddNajD5vk=
+
+keycloak-angular@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/keycloak-angular/-/keycloak-angular-6.1.0.tgz#41d7c29d57bffddfea75e3e44c27e7e666e57398"
+  integrity sha512-TT3h6nWIXRf3u3NcEC25KBvgnZufpHaOKNfUUvt9Jk4p6zrDiKXxSIS8y+B1hg0kUhVsxzjXgSVngry39jljYw==
+  dependencies:
+    keycloak-js "^4.8.3"
+    tslib "^1.9.0"
+
+keycloak-js@^4.8.3:
+  version "4.8.3"
+  resolved "https://registry.yarnpkg.com/keycloak-js/-/keycloak-js-4.8.3.tgz#e065f41d144d260afa8466b5b587a65d5f308d30"
+  integrity sha512-TXoZdoOYu2ScYs58L95/xSYjsTto9KRvZ+vt6mv4Dyf4pYhYZSgwMPnmi128qj/z8sm4mL1Z8nncR6XdWgNKMQ==
+
+keycode@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.2.0.tgz#3d0af56dc7b8b8e5cba8d0a97f107204eec22b04"
+  integrity sha1-PQr1bce4uOXLqNCpfxByBO7CKwQ=
+
+keyv@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
+  integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==
+  dependencies:
+    json-buffer "3.0.0"
+
+killable@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
+  integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
+
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
+
+kind-of@^6.0.0, kind-of@^6.0.2:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
+
+klaw@^1.0.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
+  integrity sha1-QIhDO0azsbolnXh4XY6W9zugJDk=
+  optionalDependencies:
+    graceful-fs "^4.1.9"
+
+latest-version@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face"
+  integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==
+  dependencies:
+    package-json "^6.3.0"
+
+lcid@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
+  integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==
+  dependencies:
+    invert-kv "^2.0.0"
+
+less-loader@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-5.0.0.tgz#498dde3a6c6c4f887458ee9ed3f086a12ad1b466"
+  integrity sha512-bquCU89mO/yWLaUq0Clk7qCsKhsF/TZpJUzETRvJa9KSVEL9SO3ovCvdEHISBhrC81OwC8QSVX7E0bzElZj9cg==
+  dependencies:
+    clone "^2.1.1"
+    loader-utils "^1.1.0"
+    pify "^4.0.1"
+
+less-plugin-npm-import@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/less-plugin-npm-import/-/less-plugin-npm-import-2.1.0.tgz#823e6986c93318a98171ca858848b6bead55bf3e"
+  integrity sha1-gj5phskzGKmBccqFiEi2vq1Vvz4=
+  dependencies:
+    promise "~7.0.1"
+    resolve "~1.1.6"
+
+less@3.9.0:
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/less/-/less-3.9.0.tgz#b7511c43f37cf57dc87dffd9883ec121289b1474"
+  integrity sha512-31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w==
+  dependencies:
+    clone "^2.1.2"
+  optionalDependencies:
+    errno "^0.1.1"
+    graceful-fs "^4.1.2"
+    image-size "~0.5.0"
+    mime "^1.4.1"
+    mkdirp "^0.5.0"
+    promise "^7.1.1"
+    request "^2.83.0"
+    source-map "~0.6.0"
+
+less@^3.8.0:
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/less/-/less-3.13.1.tgz#0ebc91d2a0e9c0c6735b83d496b0ab0583077909"
+  integrity sha512-SwA1aQXGUvp+P5XdZslUOhhLnClSLIjWvJhmd+Vgib5BFIr9lMNlQwmwUNOjXThF/A0x+MCYYPeWEfeWiLRnTw==
+  dependencies:
+    copy-anything "^2.0.1"
+    tslib "^1.10.0"
+  optionalDependencies:
+    errno "^0.1.1"
+    graceful-fs "^4.1.2"
+    image-size "~0.5.0"
+    make-dir "^2.1.0"
+    mime "^1.4.1"
+    native-request "^1.0.5"
+    source-map "~0.6.0"
+
+leven@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
+  integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
+
+levenary@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/levenary/-/levenary-1.1.1.tgz#842a9ee98d2075aa7faeedbe32679e9205f46f77"
+  integrity sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==
+  dependencies:
+    leven "^3.1.0"
+
+levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
+license-webpack-plugin@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.1.2.tgz#63f7c571537a450ec47dc98f5d5ffdbca7b3b14f"
+  integrity sha512-7poZHRla+ae0eEButlwMrPpkXyhNVBf2EHePYWT0jyLnI6311/OXJkTI2sOIRungRpQgU2oDMpro5bSFPT5F0A==
+  dependencies:
+    "@types/webpack-sources" "^0.1.5"
+    webpack-sources "^1.2.0"
+
+lie@~3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a"
+  integrity sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==
+  dependencies:
+    immediate "~3.0.5"
+
+lines-and-columns@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
+  integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
+
+loader-runner@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
+  integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
+
+loader-utils@1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
+  integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^2.0.0"
+    json5 "^1.0.1"
+
+loader-utils@^1.0.0, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
+  integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^1.0.1"
+
+loader-utils@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0"
+  integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^2.1.2"
+
+locate-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
+  dependencies:
+    p-locate "^3.0.0"
+    path-exists "^3.0.0"
+
+locate-path@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
+  dependencies:
+    p-locate "^4.1.0"
+
+locate-path@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
+  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
+  dependencies:
+    p-locate "^5.0.0"
+
+lodash.clonedeep@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
+
+lodash.isequal@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
+  integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
+
+lodash.toarray@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz#24c4bfcd6b2fba38bfd0594db1179d8e9b656561"
+  integrity sha1-JMS/zWsvuji/0FlNsRedjptlZWE=
+
+lodash@4.17.21, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.5, lodash@^4.5.0:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
+
+lodash@^3.10.1:
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
+  integrity sha512-9mDDwqVIma6OZX79ZlDACZl8sBm0TEnkf99zV3iMA4GzkIT/9hiqP5mY0HoT1iNLCrKc/R1HByV+yJfRWVJryQ==
+
+log4js@^3.0.0:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/log4js/-/log4js-3.0.6.tgz#e6caced94967eeeb9ce399f9f8682a4b2b28c8ff"
+  integrity sha512-ezXZk6oPJCWL483zj64pNkMuY/NcRX5MPiB0zE6tjZM137aeusrOnW1ecxgF9cmwMWkBMhjteQxBPoZBh9FDxQ==
+  dependencies:
+    circular-json "^0.5.5"
+    date-format "^1.2.0"
+    debug "^3.1.0"
+    rfdc "^1.1.2"
+    streamroller "0.7.0"
+
+log4js@^4.0.0:
+  version "4.5.1"
+  resolved "https://registry.yarnpkg.com/log4js/-/log4js-4.5.1.tgz#e543625e97d9e6f3e6e7c9fc196dd6ab2cae30b5"
+  integrity sha512-EEEgFcE9bLgaYUKuozyFfytQM2wDHtXn4tAN41pkaxpNjAykv11GVdeI4tHtmPWW4Xrgh9R/2d7XYghDVjbKKw==
+  dependencies:
+    date-format "^2.0.0"
+    debug "^4.1.1"
+    flatted "^2.0.0"
+    rfdc "^1.1.4"
+    streamroller "^1.0.6"
+
+loglevel@^1.6.8:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197"
+  integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==
+
+loose-envify@^1.0.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
+  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
+  dependencies:
+    js-tokens "^3.0.0 || ^4.0.0"
+
+lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
+  integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
+
+lowercase-keys@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
+  integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
+
+lru-cache@4.1.x, lru-cache@^4.0.1:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
+  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
+  dependencies:
+    pseudomap "^1.0.2"
+    yallist "^2.1.2"
+
+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
+  dependencies:
+    yallist "^3.0.2"
+
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
+m3u8-parser@4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/m3u8-parser/-/m3u8-parser-4.3.0.tgz#4b4e988f87b6d8b2401d209a1d17798285a9da04"
+  integrity sha512-bVbjuBMoVIgFL1vpXVIxjeaoB5TPDJRb0m5qiTdM738SGqv/LAmsnVVPlKjM4fulm/rr1XZsKM+owHm+zvqxYA==
+  dependencies:
+    global "^4.3.2"
+
+m3u8-parser@4.5.2:
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/m3u8-parser/-/m3u8-parser-4.5.2.tgz#f7d48a60112466e528324624c4e66d52ed341a75"
+  integrity sha512-sN/lu3TiRxmG2RFjZxo5c0/7Dr4RrEztl43jXrWwj5gFZ7vfa2iIxGfiPx485dm5QCazaIcKk+vNkUso8Aq0Ag==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@videojs/vhs-utils" "^3.0.0"
+    global "^4.4.0"
+
+magic-string@0.25.3:
+  version "0.25.3"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.3.tgz#34b8d2a2c7fec9d9bdf9929a3fd81d271ef35be9"
+  integrity sha512-6QK0OpF/phMz0Q2AxILkX2mFhi7m+WMwTRg0LQKq/WBB0cDP4rYH3Wp4/d3OTXlrPLVJT/RFqj8tFeAR4nk8AA==
+  dependencies:
+    sourcemap-codec "^1.4.4"
+
+magic-string@^0.25.0, magic-string@^0.25.2:
+  version "0.25.7"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051"
+  integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==
+  dependencies:
+    sourcemap-codec "^1.4.4"
+
+make-dir@^1.0.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
+  integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
+  dependencies:
+    pify "^3.0.0"
+
+make-dir@^2.0.0, make-dir@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
+  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
+  dependencies:
+    pify "^4.0.1"
+    semver "^5.6.0"
+
+make-dir@^3.0.0, make-dir@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
+  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
+  dependencies:
+    semver "^6.0.0"
+
+make-error@^1.1.1:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
+  integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
+
+make-fetch-happen@^5.0.0:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz#aa8387104f2687edca01c8687ee45013d02d19bd"
+  integrity sha512-07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag==
+  dependencies:
+    agentkeepalive "^3.4.1"
+    cacache "^12.0.0"
+    http-cache-semantics "^3.8.1"
+    http-proxy-agent "^2.1.0"
+    https-proxy-agent "^2.2.3"
+    lru-cache "^5.1.1"
+    mississippi "^3.0.0"
+    node-fetch-npm "^2.0.2"
+    promise-retry "^1.1.1"
+    socks-proxy-agent "^4.0.0"
+    ssri "^6.0.0"
+
+mamacro@^0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
+  integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==
+
+map-age-cleaner@^0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
+  integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
+  dependencies:
+    p-defer "^1.0.0"
+
+map-cache@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
+
+map-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
+  dependencies:
+    object-visit "^1.0.0"
+
+marcosc-async@^3.0.4:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/marcosc-async/-/marcosc-async-3.0.5.tgz#41e6d56c656c811859d34b97a0a26093f71dc360"
+  integrity sha1-QebVbGVsgRhZ00uXoKJgk/cdw2A=
+
+material-icons@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/material-icons/-/material-icons-0.7.1.tgz#30e4f9217f9aa78056e5c2617b36a177ac6db8e4"
+  integrity sha512-MV4qSDR0clISvUQK9d8PyktN0IAr1l2SJw8yDejBu8Ev+Xhh+kgnmVxYGgp4nRyGr495LeCGx7Nv4L+ZoJ7tvQ==
+
+md5.js@^1.3.4:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
+  integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==
+  dependencies:
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
+    safe-buffer "^5.1.2"
+
+media-typer@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
+
+mem@^4.0.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
+  integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==
+  dependencies:
+    map-age-cleaner "^0.1.1"
+    mimic-fn "^2.0.0"
+    p-is-promise "^2.0.0"
+
+memory-fs@^0.4.0, memory-fs@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
+  integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
+  dependencies:
+    errno "^0.1.3"
+    readable-stream "^2.0.1"
+
+memory-fs@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c"
+  integrity sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==
+  dependencies:
+    errno "^0.1.3"
+    readable-stream "^2.0.1"
+
+merge-descriptors@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
+
+merge-source-map@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646"
+  integrity sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==
+  dependencies:
+    source-map "^0.6.1"
+
+merge-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
+  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
+
+merge2@^1.3.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
+  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
+
+methods@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
+  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
+
+micromatch@^3.1.10, micromatch@^3.1.4:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    braces "^2.3.1"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    extglob "^2.0.4"
+    fragment-cache "^0.2.1"
+    kind-of "^6.0.2"
+    nanomatch "^1.2.9"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.2"
+
+micromatch@^4.0.2:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
+  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
+  dependencies:
+    braces "^3.0.1"
+    picomatch "^2.2.3"
+
+miller-rabin@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
+  integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==
+  dependencies:
+    bn.js "^4.0.0"
+    brorand "^1.0.1"
+
+mime-db@1.47.0, "mime-db@>= 1.43.0 < 2":
+  version "1.47.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz#8cb313e59965d3c05cfbf898915a267af46a335c"
+  integrity sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==
+
+mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
+  version "2.1.30"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz#6e7be8b4c479825f85ed6326695db73f9305d62d"
+  integrity sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==
+  dependencies:
+    mime-db "1.47.0"
+
+mime@1.6.0, mime@^1.4.1:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
+
+mime@^2.3.1, mime@^2.4.4:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe"
+  integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==
+
+mimic-fn@^2.0.0, mimic-fn@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+
+mimic-response@^1.0.0, mimic-response@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
+  integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
+
+min-document@^2.19.0:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685"
+  integrity sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=
+  dependencies:
+    dom-walk "^0.1.0"
+
+mini-css-extract-plugin@0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.8.0.tgz#81d41ec4fe58c713a96ad7c723cdb2d0bd4d70e1"
+  integrity sha512-MNpRGbNA52q6U92i0qbVpQNsgk7LExy41MdAlG84FeytfDOtRIf/mCHdEgG8rpTKOaNKiqUnZdlptF469hxqOw==
+  dependencies:
+    loader-utils "^1.1.0"
+    normalize-url "1.9.1"
+    schema-utils "^1.0.0"
+    webpack-sources "^1.1.0"
+
+minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
+  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
+
+minimalistic-crypto-utils@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
+  integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
+
+minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+
+minimist@~0.0.1:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+  integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
+
+minipass-collect@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
+  integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass-flush@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
+  integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass-pipeline@^1.2.2:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
+  integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass@^2.3.5, minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
+  integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
+  dependencies:
+    safe-buffer "^5.1.2"
+    yallist "^3.0.0"
+
+minipass@^3.0.0, minipass@^3.1.1:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd"
+  integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==
+  dependencies:
+    yallist "^4.0.0"
+
+minizlib@^1.2.1:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
+  integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
+  dependencies:
+    minipass "^2.9.0"
+
+minizlib@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
+  integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
+  dependencies:
+    minipass "^3.0.0"
+    yallist "^4.0.0"
+
+mississippi@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
+  integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==
+  dependencies:
+    concat-stream "^1.5.0"
+    duplexify "^3.4.2"
+    end-of-stream "^1.1.0"
+    flush-write-stream "^1.0.0"
+    from2 "^2.1.0"
+    parallel-transform "^1.1.0"
+    pump "^3.0.0"
+    pumpify "^1.3.3"
+    stream-each "^1.1.0"
+    through2 "^2.0.0"
+
+mixin-deep@^1.2.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
+  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
+  dependencies:
+    for-in "^1.0.2"
+    is-extendable "^1.0.1"
+
+mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.5:
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
+  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
+  dependencies:
+    minimist "^1.2.5"
+
+mkdirp@^1.0.3, mkdirp@^1.0.4, mkdirp@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
+mock-require@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/mock-require/-/mock-require-3.0.3.tgz#ccd544d9eae81dd576b3f219f69ec867318a1946"
+  integrity sha512-lLzfLHcyc10MKQnNUCv7dMcoY/2Qxd6wJfbqCcVk3LDb8An4hF6ohk5AztrvgKhJCqj36uyzi/p5se+tvyD+Wg==
+  dependencies:
+    get-caller-file "^1.0.2"
+    normalize-path "^2.1.1"
+
+moment@2.24.0:
+  version "2.24.0"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
+  integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
+
+moment@>=2.13.0, moment@^2.10.2, moment@^2.24.0, moment@^2.29.1:
+  version "2.29.1"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
+  integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
+
+move-concurrently@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
+  integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=
+  dependencies:
+    aproba "^1.1.1"
+    copy-concurrently "^1.0.0"
+    fs-write-stream-atomic "^1.0.8"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.3"
+
+mpd-parser@0.15.4:
+  version "0.15.4"
+  resolved "https://registry.yarnpkg.com/mpd-parser/-/mpd-parser-0.15.4.tgz#e1b445d0dc2aab1389fde6420ca9cca7c999575d"
+  integrity sha512-YcOclxKc5gnT87UQYwRoPJpWOFvQORwN+bXYmTWCJ4U2pCSS7jjtPrIhoOLHFAyekj48CHTX4hjGBV/VSNsUsg==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@videojs/vhs-utils" "^3.0.0"
+    global "^4.4.0"
+    xmldom "^0.4.0"
+
+mpd-parser@0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/mpd-parser/-/mpd-parser-0.8.1.tgz#db299dbec337999fbbbace989d227c7b03dc8ea7"
+  integrity sha512-WBTJ1bKk8OLUIxBh6s1ju1e2yz/5CzhPbgi6P3F3kJHKhGy1Z+ElvEnuzEbtC/dnbRcJtMXazE3f93N5LLdp9Q==
+  dependencies:
+    global "^4.3.2"
+    url-toolkit "^2.1.1"
+
+mrmime@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-1.0.1.tgz#5f90c825fad4bdd41dc914eff5d1a8cfdaf24f27"
+  integrity sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+
+ms@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+
+ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
+ms@^2.0.0, ms@^2.1.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
+multicast-dns-service-types@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
+  integrity sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=
+
+multicast-dns@^6.0.1:
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229"
+  integrity sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==
+  dependencies:
+    dns-packet "^1.3.1"
+    thunky "^1.0.2"
+
+mustache@^3.0.2:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/mustache/-/mustache-3.2.1.tgz#89e78a9d207d78f2799b1e95764a25bf71a28322"
+  integrity sha512-RERvMFdLpaFfSRIEe632yDm5nsd0SDKn8hGmcUwswnyiE5mtdZLDybtHAz6hjJhawokF0hXvGLtx9mrQfm6FkA==
+
+mute-stream@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
+  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
+
+mux.js@5.1.3:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/mux.js/-/mux.js-5.1.3.tgz#1a59b8979a6780be5bcb63983c7e883c90cd615b"
+  integrity sha512-FhDcysLvAkO9H8ftBJ2sK1O4Rmz0AWnMS+2uqP7WjrnaAyE/ox11GEiZkRzrWIdp8at9R9qBHDqdURY3/h/xTg==
+
+mux.js@5.10.0:
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/mux.js/-/mux.js-5.10.0.tgz#80fb30f9233c7902cac5cc8e1ae5f19e91cf8477"
+  integrity sha512-kLzvYsHYBwNa+ckkmpxWV3eImwntJbrwd1KbN4WR0hLe+dK/KB82aCuC0fQzAI2hkjYszdlSGsAWFgYdiFBUuA==
+  dependencies:
+    "@babel/runtime" "^7.11.2"
+
+mux.js@^5.9.2:
+  version "5.11.0"
+  resolved "https://registry.yarnpkg.com/mux.js/-/mux.js-5.11.0.tgz#3c2c1fbd9d30720af2a1b12c1f2a2840c63100f6"
+  integrity sha512-Q/iLfohHh5Pp6lW7EFtcxNuaCNJ3Ruywfy46pWLsY+yIxR1kXXImYY1wOhg8jLdBMs1kRaZqsiB4Zncsiw0a2Q==
+  dependencies:
+    "@babel/runtime" "^7.11.2"
+
+mz@^2.3.1:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
+  integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==
+  dependencies:
+    any-promise "^1.0.0"
+    object-assign "^4.0.1"
+    thenify-all "^1.0.0"
+
+nan@^2.12.1:
+  version "2.14.2"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
+  integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==
+
+nanomatch@^1.2.9:
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    fragment-cache "^0.2.1"
+    is-windows "^1.0.2"
+    kind-of "^6.0.2"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+native-request@^1.0.5:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/native-request/-/native-request-1.0.8.tgz#8f66bf606e0f7ea27c0e5995eb2f5d03e33ae6fb"
+  integrity sha512-vU2JojJVelUGp6jRcLwToPoWGxSx23z/0iX+I77J3Ht17rf2INGjrhOoQnjVo60nQd8wVsgzKkPfRXBiVdD2ag==
+
+negotiator@0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
+  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
+
+neo-async@^2.5.0, neo-async@^2.6.1:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
+  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
+
+ng-circle-progress@1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/ng-circle-progress/-/ng-circle-progress-1.5.1.tgz#ea4ea89318754b929dc1550d5779e391d7c5c646"
+  integrity sha512-gJ0SdWc+TkXckfbhbvUY522yjya3qcc1a3lGvvVyLsUfSOgll8LQaZGDEko84d8dk8vYO83n0O5vP+e8bJTInQ==
+  dependencies:
+    tslib "^1.9.0"
+
+ng-packagr@^5.4.3:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-5.7.1.tgz#8e082e38e7b6089296bf0491f2e5b29122f8e08d"
+  integrity sha512-NDAUcMtLyZnF3bP6JtC3ANpIQRclRDPilF7C0DsjQuIz1q0V3mT7f1PwV0jnRWy8iRpSZmJZr6AGl736gloHtQ==
+  dependencies:
+    ajv "^6.10.2"
+    autoprefixer "^9.6.0"
+    browserslist "^4.0.0"
+    chalk "^2.3.1"
+    chokidar "^3.0.0"
+    clean-css "^4.1.11"
+    commander "^3.0.0"
+    fs-extra "^8.0.0"
+    glob "^7.1.2"
+    injection-js "^2.2.1"
+    less "^3.8.0"
+    less-plugin-npm-import "^2.1.0"
+    node-sass-tilde-importer "^1.0.0"
+    postcss "^7.0.0"
+    postcss-url "^8.0.0"
+    read-pkg-up "^5.0.0"
+    rimraf "^3.0.0"
+    rollup "1.25.2"
+    rollup-plugin-commonjs "^10.0.0"
+    rollup-plugin-json "^4.0.0"
+    rollup-plugin-node-resolve "^5.0.0"
+    rollup-plugin-sourcemaps "^0.4.2"
+    rxjs "^6.0.0"
+    sass "^1.17.3"
+    stylus "^0.54.5"
+    terser "^4.1.2"
+    update-notifier "^3.0.0"
+
+ng2-ace-editor@^0.3.9:
+  version "0.3.9"
+  resolved "https://registry.yarnpkg.com/ng2-ace-editor/-/ng2-ace-editor-0.3.9.tgz#5ae68712e9ca49591eda31df8fe02eca1c3634e1"
+  integrity sha512-e8Q4YCirlL/OEiekewmzupG+zV3prYsiYmQnRzQzd0wNgsPjOLOdb0it7cCbzFfIXKGyIIHKTW5584WxPr2LnQ==
+  dependencies:
+    ace-builds "^1.4.2"
+    brace "^0.11.1"
+
+ng2-charts@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/ng2-charts/-/ng2-charts-2.3.0.tgz#e4dd1f7fe12dc2635d5e8c4f101a8d4c4f433754"
+  integrity sha512-D5K7OqF0m5lOBYvNOsraoEo4OPHja9zfGNj+HWy2nUcP0LP2s+Y/QaQlkG/1rHlwXq9HPm8rLxzSutA0eLHxGQ==
+  dependencies:
+    "@types/chart.js" "^2.7.48"
+    lodash "^4.17.11"
+    tslib "^1.9.0"
+
+ng2-ckeditor@1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/ng2-ckeditor/-/ng2-ckeditor-1.2.6.tgz#be5dc7872846e329f61d5b0d6ce084045044ab7f"
+  integrity sha512-/bw0ZzVBvHUrFrXFeP08XKSsIX67M85rTiZkcphn0kpripAj13JvX/l/SQ74Kfk5K226Y3c+rONDj6OtfZH0kA==
+  dependencies:
+    tslib "^1.9.0"
+
+ng2-pdf-viewer@6.4.1:
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/ng2-pdf-viewer/-/ng2-pdf-viewer-6.4.1.tgz#c84e7e4c6db9d759ebc6969ec60b5fc0c3e7fe16"
+  integrity sha512-A8R9SGa2bu4n+mtagGX8DqBrVAbuROrEgcAOQwCdciYTLAq9EFGEB8TCQZpjvYVaFTNwjKWTMTjFQVEorjbLeQ==
+  dependencies:
+    "@types/pdfjs-dist" "~2.1.7"
+    pdfjs-dist "~2.5.207"
+    tslib "^1.10.0"
+
+ng2-search-filter@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/ng2-search-filter/-/ng2-search-filter-0.5.1.tgz#6d5f4e26bd2b2c8c8cc4aad658aabae6a33fb4af"
+  integrity sha512-noN8R+Gyxo5ZuboEOvq+u0zKio6pEf1IVYQTCZfAfXm6ONmzWu/M2xK0di9oVUprDbPBQXCGUuvD5i2GD+35HA==
+
+ngx-export-as@1.4.2:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/ngx-export-as/-/ngx-export-as-1.4.2.tgz#6fb20ae104225f4a1449c1eea9c1a9ccbdc32a50"
+  integrity sha512-oKYYaj385Hazvsva4hrxSqo5/tU1SIJsfQy6jsfjPCAWbVI6p/18z2CRcrhvqd0zH0aE/fD55s6etJ2OnMxkag==
+  dependencies:
+    html2pdf.js "^0.9.1"
+    rxjs "~6.3.3"
+    xlsx "^0.14.0"
+
+ngx-image-cropper@^3.0.3:
+  version "3.3.5"
+  resolved "https://registry.yarnpkg.com/ngx-image-cropper/-/ngx-image-cropper-3.3.5.tgz#39f636e3989c5c84241f5130d0124ded6631fbeb"
+  integrity sha512-0yRVKG5XAbVo3rOaj/iFDlekGsxEqXKU9iXFbjyvHvRT2DFs+AjwtyvINsHCWw+4ed9yA4Y+wLIUNqzA0bfxLw==
+  dependencies:
+    tslib "^1.9.0"
+
+ngx-pagination@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/ngx-pagination/-/ngx-pagination-5.1.0.tgz#b09ad72c20283b392fb9ea457ec2d4825e149358"
+  integrity sha512-GDI5GwmYIaeLu3hW3tgdIw/LXOzLj05PjVhtf2Ze63QsJ6zhZ7g5tg6S4EhhuUOdbMdXWyOng/uMVZwbYpi0Eg==
+
+ngx-quill@^7.1.2:
+  version "7.3.12"
+  resolved "https://registry.yarnpkg.com/ngx-quill/-/ngx-quill-7.3.12.tgz#3321f005f729507577dc9b130d9334ebddd67fdc"
+  integrity sha512-A49Q5KvBtzTRc+hmjzpvPkar1hOoaeGKEispeQ91yUaIB95fjzykx6SqWtcBmGFckNllCOIQV9iel9+RCnd+8Q==
+  dependencies:
+    tslib "^1.9.0"
+
+ngx-take-until-destroy@5.4.0:
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/ngx-take-until-destroy/-/ngx-take-until-destroy-5.4.0.tgz#6c8606ee956584dc947e2eb609c48b8f98b09900"
+  integrity sha512-e+VfCrHbLybdKWoQ8prdhmVzWI6vTnedr/9cVGQTkfepMdLz5D++VDk+Wnbs7mru6S9C+kIpNWUlh2YMPl928Q==
+  dependencies:
+    tslib "^1.9.0"
+
+nice-try@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
+
+node-emoji@^1.8.1:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.10.0.tgz#8886abd25d9c7bb61802a658523d1f8d2a89b2da"
+  integrity sha512-Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw==
+  dependencies:
+    lodash.toarray "^4.4.0"
+
+node-ensure@^0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/node-ensure/-/node-ensure-0.0.0.tgz#ecae764150de99861ec5c810fd5d096b183932a7"
+  integrity sha1-7K52QVDemYYexcgQ/V0Jaxg5Mqc=
+
+node-fetch-npm@^2.0.2:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.4.tgz#6507d0e17a9ec0be3bec516958a497cec54bf5a4"
+  integrity sha512-iOuIQDWDyjhv9qSDrj9aq/klt6F9z1p2otB3AV7v3zBDcL/x+OfGsvGQZZCcMZbUf4Ujw1xGNQkjvGnVT22cKg==
+  dependencies:
+    encoding "^0.1.11"
+    json-parse-better-errors "^1.0.0"
+    safe-buffer "^5.1.1"
+
+node-forge@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
+  integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
+
+node-libs-browser@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425"
+  integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==
+  dependencies:
+    assert "^1.1.1"
+    browserify-zlib "^0.2.0"
+    buffer "^4.3.0"
+    console-browserify "^1.1.0"
+    constants-browserify "^1.0.0"
+    crypto-browserify "^3.11.0"
+    domain-browser "^1.1.1"
+    events "^3.0.0"
+    https-browserify "^1.0.0"
+    os-browserify "^0.3.0"
+    path-browserify "0.0.1"
+    process "^0.11.10"
+    punycode "^1.2.4"
+    querystring-es3 "^0.2.0"
+    readable-stream "^2.3.3"
+    stream-browserify "^2.0.1"
+    stream-http "^2.7.2"
+    string_decoder "^1.0.0"
+    timers-browserify "^2.0.4"
+    tty-browserify "0.0.0"
+    url "^0.11.0"
+    util "^0.11.0"
+    vm-browserify "^1.0.1"
+
+node-releases@^1.1.52, node-releases@^1.1.71:
+  version "1.1.71"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"
+  integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==
+
+node-sass-tilde-importer@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/node-sass-tilde-importer/-/node-sass-tilde-importer-1.0.2.tgz#1a15105c153f648323b4347693fdb0f331bad1ce"
+  integrity sha512-Swcmr38Y7uB78itQeBm3mThjxBy9/Ah/ykPIaURY/L6Nec9AyRoL/jJ7ECfMR+oZeCTVQNxVMu/aHU+TLRVbdg==
+  dependencies:
+    find-parent-dir "^0.3.0"
+
+normalize-package-data@^2.0.0, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
+  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
+  dependencies:
+    hosted-git-info "^2.1.4"
+    resolve "^1.10.0"
+    semver "2 || 3 || 4 || 5"
+    validate-npm-package-license "^3.0.1"
+
+normalize-path@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
+  dependencies:
+    remove-trailing-separator "^1.0.1"
+
+normalize-path@^3.0.0, normalize-path@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
+normalize-range@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
+  integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
+
+normalize-url@1.9.1:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
+  integrity sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=
+  dependencies:
+    object-assign "^4.0.1"
+    prepend-http "^1.0.0"
+    query-string "^4.1.0"
+    sort-keys "^1.0.0"
+
+normalize-url@^4.1.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129"
+  integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==
+
+normalize.css@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-8.0.1.tgz#9b98a208738b9cc2634caacbc42d131c97487bf3"
+  integrity sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg==
+
+nosleep.js@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/nosleep.js/-/nosleep.js-0.7.0.tgz#cfd919c25523ca0d0f4a69fb3305c083adaee289"
+  integrity sha1-z9kZwlUjyg0PSmn7MwXAg62u4ok=
+
+npm-bundled@^1.0.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.2.tgz#944c78789bd739035b70baa2ca5cc32b8d860bc1"
+  integrity sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==
+  dependencies:
+    npm-normalize-package-bin "^1.0.1"
+
+npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
+  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
+
+npm-package-arg@6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.0.tgz#15ae1e2758a5027efb4c250554b85a737db7fcc1"
+  integrity sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==
+  dependencies:
+    hosted-git-info "^2.6.0"
+    osenv "^0.1.5"
+    semver "^5.5.0"
+    validate-npm-package-name "^3.0.0"
+
+npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.1.tgz#02168cb0a49a2b75bf988a28698de7b529df5cb7"
+  integrity sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==
+  dependencies:
+    hosted-git-info "^2.7.1"
+    osenv "^0.1.5"
+    semver "^5.6.0"
+    validate-npm-package-name "^3.0.0"
+
+npm-packlist@^1.1.12:
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
+  integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
+  dependencies:
+    ignore-walk "^3.0.1"
+    npm-bundled "^1.0.1"
+    npm-normalize-package-bin "^1.0.1"
+
+npm-pick-manifest@3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-3.0.2.tgz#f4d9e5fd4be2153e5f4e5f9b7be8dc419a99abb7"
+  integrity sha512-wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw==
+  dependencies:
+    figgy-pudding "^3.5.1"
+    npm-package-arg "^6.0.0"
+    semver "^5.4.1"
+
+npm-pick-manifest@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz#32111d2a9562638bb2c8f2bf27f7f3092c8fae40"
+  integrity sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==
+  dependencies:
+    figgy-pudding "^3.5.1"
+    npm-package-arg "^6.0.0"
+    semver "^5.4.1"
+
+npm-registry-fetch@^4.0.0:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-4.0.7.tgz#57951bf6541e0246b34c9f9a38ab73607c9449d7"
+  integrity sha512-cny9v0+Mq6Tjz+e0erFAB+RYJ/AVGzkjnISiobqP8OWj9c9FLoZZu8/SPSKJWE17F1tk4018wfjV+ZbIbqC7fQ==
+  dependencies:
+    JSONStream "^1.3.4"
+    bluebird "^3.5.1"
+    figgy-pudding "^3.4.1"
+    lru-cache "^5.1.1"
+    make-fetch-happen "^5.0.0"
+    npm-package-arg "^6.1.0"
+    safe-buffer "^5.2.0"
+
+npm-run-path@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
+  dependencies:
+    path-key "^2.0.0"
+
+num2fraction@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
+  integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
+
+number-is-nan@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
+
+"nwmatcher@>= 1.3.7 < 2.0.0":
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.4.tgz#2285631f34a95f0d0395cd900c96ed39b58f346e"
+  integrity sha512-3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ==
+
+oauth-sign@~0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
+
+object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
+
+object-component@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
+  integrity sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=
+
+object-copy@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
+  dependencies:
+    copy-descriptor "^0.1.0"
+    define-property "^0.2.5"
+    kind-of "^3.0.3"
+
+object-hash@^2.0.3:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.1.1.tgz#9447d0279b4fcf80cff3259bf66a1dc73afabe09"
+  integrity sha512-VOJmgmS+7wvXf8CjbQmimtCnEx3IAoLxI3fp2fbWehxrWBcAQFbk+vcwb6vzR0VZv/eNCJ/27j151ZTwqW/JeQ==
+
+object-inspect@^1.9.0:
+  version "1.10.3"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz#c2aa7d2d09f50c99375704f7a0adf24c5782d369"
+  integrity sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==
+
+object-is@^1.0.1:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac"
+  integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+
+object-keys@^1.0.12, object-keys@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
+
+object-sizeof@^1.6.0:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/object-sizeof/-/object-sizeof-1.6.1.tgz#35971f3fd2102bd8b51c67b0a53ed773ff77ab56"
+  integrity sha512-gNKGcRnDRXwEpAdwUY3Ef+aVZIrcQVXozSaVzHz6Pv4JxysH8vf5F+nIgsqW5T/YNwZNveh0mIW7PEH1O2MrDw==
+  dependencies:
+    buffer "^5.6.0"
+
+object-visit@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
+  dependencies:
+    isobject "^3.0.0"
+
+object.assign@^4.1.0, object.assign@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
+  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+    has-symbols "^1.0.1"
+    object-keys "^1.1.1"
+
+object.getownpropertydescriptors@^2.0.3:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz#1bd63aeacf0d5d2d2f31b5e393b03a7c601a23f7"
+  integrity sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.18.0-next.2"
+
+object.pick@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
+  dependencies:
+    isobject "^3.0.1"
+
+obuf@^1.0.0, obuf@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
+  integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
+
+omggif@1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/omggif/-/omggif-1.0.7.tgz#59d2eecb0263de84635b3feb887c0c9973f1e49d"
+  integrity sha1-WdLuywJj3oRjWz/riHwMmXPx5J0=
+
+on-finished@~2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
+  dependencies:
+    ee-first "1.1.1"
+
+on-headers@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
+  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
+
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  dependencies:
+    wrappy "1"
+
+onetime@^5.1.0:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
+  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
+  dependencies:
+    mimic-fn "^2.1.0"
+
+open@6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-6.4.0.tgz#5c13e96d0dc894686164f18965ecfe889ecfc8a9"
+  integrity sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==
+  dependencies:
+    is-wsl "^1.1.0"
+
+opencollective-postinstall@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259"
+  integrity sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==
+
+opener@^1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
+  integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
+
+opn@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
+  integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==
+  dependencies:
+    is-wsl "^1.1.0"
+
+optimist@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
+  integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
+  dependencies:
+    minimist "~0.0.1"
+    wordwrap "~0.0.2"
+
+optionator@^0.8.1:
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
+  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
+  dependencies:
+    deep-is "~0.1.3"
+    fast-levenshtein "~2.0.6"
+    levn "~0.3.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+    word-wrap "~1.2.3"
+
+original@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
+  integrity sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==
+  dependencies:
+    url-parse "^1.4.3"
+
+os-browserify@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
+  integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
+
+os-homedir@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
+
+os-locale@^3.0.0, os-locale@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
+  integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
+  dependencies:
+    execa "^1.0.0"
+    lcid "^2.0.0"
+    mem "^4.0.0"
+
+os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
+
+osenv@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.0"
+
+p-cancelable@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
+  integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
+
+p-defer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
+  integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
+
+p-finally@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
+
+p-is-promise@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
+  integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
+
+p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
+  dependencies:
+    p-try "^2.0.0"
+
+p-limit@^3.0.1, p-limit@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
+  dependencies:
+    yocto-queue "^0.1.0"
+
+p-locate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
+  dependencies:
+    p-limit "^2.0.0"
+
+p-locate@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
+  dependencies:
+    p-limit "^2.2.0"
+
+p-locate@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
+  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
+  dependencies:
+    p-limit "^3.0.2"
+
+p-map@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
+  integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
+
+p-map@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
+  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
+  dependencies:
+    aggregate-error "^3.0.0"
+
+p-retry@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz#316b4c8893e2c8dc1cfa891f406c4b422bebf328"
+  integrity sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==
+  dependencies:
+    retry "^0.12.0"
+
+p-try@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
+
+package-json@^6.3.0:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0"
+  integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==
+  dependencies:
+    got "^9.6.0"
+    registry-auth-token "^4.0.0"
+    registry-url "^5.0.0"
+    semver "^6.2.0"
+
+pacote@9.5.5:
+  version "9.5.5"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.5.5.tgz#63355a393614c3424e735820c3731e2cbbedaeeb"
+  integrity sha512-jAEP+Nqj4kyMWyNpfTU/Whx1jA7jEc5cCOlurm0/0oL+v8TAp1QSsK83N7bYe+2bEdFzMAtPG5TBebjzzGV0cA==
+  dependencies:
+    bluebird "^3.5.3"
+    cacache "^12.0.2"
+    figgy-pudding "^3.5.1"
+    get-stream "^4.1.0"
+    glob "^7.1.3"
+    infer-owner "^1.0.4"
+    lru-cache "^5.1.1"
+    make-fetch-happen "^5.0.0"
+    minimatch "^3.0.4"
+    minipass "^2.3.5"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    normalize-package-data "^2.4.0"
+    npm-package-arg "^6.1.0"
+    npm-packlist "^1.1.12"
+    npm-pick-manifest "^2.2.3"
+    npm-registry-fetch "^4.0.0"
+    osenv "^0.1.5"
+    promise-inflight "^1.0.1"
+    promise-retry "^1.1.1"
+    protoduck "^5.0.1"
+    rimraf "^2.6.2"
+    safe-buffer "^5.1.2"
+    semver "^5.6.0"
+    ssri "^6.0.1"
+    tar "^4.4.8"
+    unique-filename "^1.1.1"
+    which "^1.3.1"
+
+pako@~1.0.2, pako@~1.0.5:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
+  integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
+
+parallel-transform@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc"
+  integrity sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==
+  dependencies:
+    cyclist "^1.0.1"
+    inherits "^2.0.3"
+    readable-stream "^2.1.5"
+
+parchment@^1.1.2, parchment@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/parchment/-/parchment-1.1.4.tgz#aeded7ab938fe921d4c34bc339ce1168bc2ffde5"
+  integrity sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg==
+
+parent-module@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
+  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
+  dependencies:
+    callsites "^3.0.0"
+
+parse-asn1@^5.0.0, parse-asn1@^5.1.5:
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4"
+  integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==
+  dependencies:
+    asn1.js "^5.2.0"
+    browserify-aes "^1.0.0"
+    evp_bytestokey "^1.0.0"
+    pbkdf2 "^3.0.3"
+    safe-buffer "^5.1.1"
+
+parse-headers@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.3.tgz#5e8e7512383d140ba02f0c7aa9f49b4399c92515"
+  integrity sha512-QhhZ+DCCit2Coi2vmAKbq5RGTRcQUOE2+REgv8vdyu7MnYx2eZztegqtTx99TZ86GTIwqiy3+4nQTWZ2tgmdCA==
+
+parse-json@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
+  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
+  dependencies:
+    error-ex "^1.3.1"
+    json-parse-better-errors "^1.0.1"
+
+parse-json@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
+  integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    error-ex "^1.3.1"
+    json-parse-even-better-errors "^2.3.0"
+    lines-and-columns "^1.1.6"
+
+parse5-html-rewriting-stream@5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-5.1.0.tgz#63f92c958764aea8cbe3aa68f2e5895c32068ab8"
+  integrity sha512-hZlaOTHJs4dpC5yFHnOSEMh26ErsqTsLzxKqkuRcUqtiu0kMsBQ9pkgANkECDyoBUhJ3+hvb2DPLsyqbtcS61Q==
+  dependencies:
+    parse5 "^5.1.0"
+    parse5-sax-parser "^5.1.0"
+
+parse5-sax-parser@^5.1.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/parse5-sax-parser/-/parse5-sax-parser-5.1.1.tgz#02834a9d08b23ea2d99584841c38be09d5247a15"
+  integrity sha512-9HIh6zd7bF1NJe95LPCUC311CekdOi55R+HWXNCsGY6053DWaMijVKOv1oPvdvPTvFicifZyimBVJ6/qvG039Q==
+  dependencies:
+    parse5 "^5.1.1"
+
+parse5@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
+  integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==
+
+parse5@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"
+  integrity sha1-m387DeMr543CQBsXVzzK8Pb1nZQ=
+
+parse5@^5.0.0, parse5@^5.1.0, parse5@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"
+  integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==
+
+parseqs@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
+  integrity sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=
+  dependencies:
+    better-assert "~1.0.0"
+
+parseuri@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a"
+  integrity sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=
+  dependencies:
+    better-assert "~1.0.0"
+
+parseurl@~1.3.2, parseurl@~1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
+  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
+
+pascalcase@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
+
+path-browserify@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"
+  integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==
+
+path-dirname@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
+
+path-exists@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
+
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+
+path-is-inside@^1.0.1, path-is-inside@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
+
+path-key@^2.0.0, path-key@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
+
+path-parse@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+
+path-to-regexp@0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
+
+path-type@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
+  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
+
+pbkdf2@^3.0.3:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075"
+  integrity sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==
+  dependencies:
+    create-hash "^1.1.2"
+    create-hmac "^1.1.4"
+    ripemd160 "^2.0.1"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
+
+pdfjs-dist@2.1.266:
+  version "2.1.266"
+  resolved "https://registry.yarnpkg.com/pdfjs-dist/-/pdfjs-dist-2.1.266.tgz#cded02268b389559e807f410d2a729db62160026"
+  integrity sha512-Jy7o1wE3NezPxozexSbq4ltuLT0Z21ew/qrEiAEeUZzHxMHGk4DUV1D7RuCXg5vJDvHmjX1YssN+we9QfRRgXQ==
+  dependencies:
+    node-ensure "^0.0.0"
+    worker-loader "^2.0.0"
+
+pdfjs-dist@~2.5.207:
+  version "2.5.207"
+  resolved "https://registry.yarnpkg.com/pdfjs-dist/-/pdfjs-dist-2.5.207.tgz#b5e8c19627be64269cd3fb6df3eaaf45ddffe7b6"
+  integrity sha512-xGDUhnCYPfHy+unMXCLCJtlpZaaZ17Ew3WIL0tnSgKFUZXHAPD49GO9xScyszSsQMoutNDgRb+rfBXIaX/lJbw==
+
+performance-now@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
+
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d"
+  integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==
+
+pify@^2.0.0, pify@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
+
+pify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
+
+pify@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
+  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
+
+pinkie-promise@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
+  dependencies:
+    pinkie "^2.0.0"
+
+pinkie@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
+
+pkcs7@^1.0.2, pkcs7@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/pkcs7/-/pkcs7-1.0.4.tgz#6090b9e71160dabf69209d719cbafa538b00a1cb"
+  integrity sha512-afRERtHn54AlwaF2/+LFszyAANTCggGilmcmILUzEjvs3XgFZT+xE6+QWQcAGmu4xajy+Xtj7acLOPdx5/eXWQ==
+  dependencies:
+    "@babel/runtime" "^7.5.5"
+
+pkg-dir@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
+  integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==
+  dependencies:
+    find-up "^3.0.0"
+
+pkg-dir@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
+  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
+  dependencies:
+    find-up "^4.0.0"
+
+pkg-dir@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-5.0.0.tgz#a02d6aebe6ba133a928f74aec20bafdfe6b8e760"
+  integrity sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==
+  dependencies:
+    find-up "^5.0.0"
+
+pkg-up@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5"
+  integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==
+  dependencies:
+    find-up "^3.0.0"
+
+please-upgrade-node@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942"
+  integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==
+  dependencies:
+    semver-compare "^1.0.0"
+
+portfinder@^1.0.26:
+  version "1.0.28"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
+  integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==
+  dependencies:
+    async "^2.6.2"
+    debug "^3.1.1"
+    mkdirp "^0.5.5"
+
+posix-character-classes@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
+
+postcss-functions@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-functions/-/postcss-functions-3.0.0.tgz#0e94d01444700a481de20de4d55fb2640564250e"
+  integrity sha1-DpTQFERwCkgd4g3k1V+yZAVkJQ4=
+  dependencies:
+    glob "^7.1.2"
+    object-assign "^4.1.1"
+    postcss "^6.0.9"
+    postcss-value-parser "^3.3.0"
+
+postcss-import@12.0.1:
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-12.0.1.tgz#cf8c7ab0b5ccab5649024536e565f841928b7153"
+  integrity sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==
+  dependencies:
+    postcss "^7.0.1"
+    postcss-value-parser "^3.2.3"
+    read-cache "^1.0.0"
+    resolve "^1.1.7"
+
+postcss-js@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-2.0.3.tgz#a96f0f23ff3d08cec7dc5b11bf11c5f8077cdab9"
+  integrity sha512-zS59pAk3deu6dVHyrGqmC3oDXBdNdajk4k1RyxeVXCrcEDBUBHoIhE4QTsmhxgzXxsaqFDAkUZfmMa5f/N/79w==
+  dependencies:
+    camelcase-css "^2.0.1"
+    postcss "^7.0.18"
+
+postcss-load-config@^2.0.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.2.tgz#c5ea504f2c4aef33c7359a34de3573772ad7502a"
+  integrity sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==
+  dependencies:
+    cosmiconfig "^5.0.0"
+    import-cwd "^2.0.0"
+
+postcss-loader@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-3.0.0.tgz#6b97943e47c72d845fa9e03f273773d4e8dd6c2d"
+  integrity sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==
+  dependencies:
+    loader-utils "^1.1.0"
+    postcss "^7.0.0"
+    postcss-load-config "^2.0.0"
+    schema-utils "^1.0.0"
+
+postcss-nested@^4.1.1:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-4.2.3.tgz#c6f255b0a720549776d220d00c4b70cd244136f6"
+  integrity sha512-rOv0W1HquRCamWy2kFl3QazJMMe1ku6rCFoAAH+9AcxdbpDeBr6k968MLWuLjvjMcGEip01ak09hKOEgpK9hvw==
+  dependencies:
+    postcss "^7.0.32"
+    postcss-selector-parser "^6.0.2"
+
+postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2:
+  version "6.0.6"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea"
+  integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==
+  dependencies:
+    cssesc "^3.0.0"
+    util-deprecate "^1.0.2"
+
+postcss-url@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-url/-/postcss-url-8.0.0.tgz#7b10059bd12929cdbb1971c60f61a0e5af86b4ca"
+  integrity sha512-E2cbOQ5aii2zNHh8F6fk1cxls7QVFZjLPSrqvmiza8OuXLzIpErij8BDS5Y3STPfJgpIMNCPEr8JlKQWEoozUw==
+  dependencies:
+    mime "^2.3.1"
+    minimatch "^3.0.4"
+    mkdirp "^0.5.0"
+    postcss "^7.0.2"
+    xxhashjs "^0.2.1"
+
+postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
+  integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
+
+postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
+  integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
+
+postcss@7.0.17:
+  version "7.0.17"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.17.tgz#4da1bdff5322d4a0acaab4d87f3e782436bad31f"
+  integrity sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==
+  dependencies:
+    chalk "^2.4.2"
+    source-map "^0.6.1"
+    supports-color "^6.1.0"
+
+postcss@7.0.32:
+  version "7.0.32"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d"
+  integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==
+  dependencies:
+    chalk "^2.4.2"
+    source-map "^0.6.1"
+    supports-color "^6.1.0"
+
+postcss@^6.0.9:
+  version "6.0.23"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
+  integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==
+  dependencies:
+    chalk "^2.4.1"
+    source-map "^0.6.1"
+    supports-color "^5.4.0"
+
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.11, postcss@^7.0.17, postcss@^7.0.18, postcss@^7.0.2, postcss@^7.0.32:
+  version "7.0.35"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24"
+  integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==
+  dependencies:
+    chalk "^2.4.2"
+    source-map "^0.6.1"
+    supports-color "^6.1.0"
+
+prelude-ls@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
+
+prepend-http@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
+  integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
+
+prepend-http@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
+  integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
+
+pretty-hrtime@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
+  integrity sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=
+
+printj@~1.1.0, printj@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222"
+  integrity sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==
+
+process-nextick-args@~2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
+
+process@^0.11.10:
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
+
+process@~0.5.1:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf"
+  integrity sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=
+
+promise-inflight@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
+  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
+
+promise-retry@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d"
+  integrity sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=
+  dependencies:
+    err-code "^1.0.0"
+    retry "^0.10.0"
+
+promise@^7.1.1:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
+  integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
+  dependencies:
+    asap "~2.0.3"
+
+promise@~7.0.1:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-7.0.4.tgz#363e84a4c36c8356b890fed62c91ce85d02ed539"
+  integrity sha1-Nj6EpMNsg1a4kP7WLJHOhdAu1Tk=
+  dependencies:
+    asap "~2.0.3"
+
+protoduck@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.1.tgz#03c3659ca18007b69a50fd82a7ebcc516261151f"
+  integrity sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==
+  dependencies:
+    genfun "^5.0.0"
+
+protractor@~5.4.2:
+  version "5.4.4"
+  resolved "https://registry.yarnpkg.com/protractor/-/protractor-5.4.4.tgz#b241466aaf83b76bc2c58df67deb9a5cdfc61529"
+  integrity sha512-BaL4vePgu3Vfa/whvTUAlgaCAId4uNSGxIFSCXMgj7LMYENPWLp85h5RBi9pdpX/bWQ8SF6flP7afmi2TC4eHw==
+  dependencies:
+    "@types/q" "^0.0.32"
+    "@types/selenium-webdriver" "^3.0.0"
+    blocking-proxy "^1.0.0"
+    browserstack "^1.5.1"
+    chalk "^1.1.3"
+    glob "^7.0.3"
+    jasmine "2.8.0"
+    jasminewd2 "^2.1.0"
+    q "1.4.1"
+    saucelabs "^1.5.0"
+    selenium-webdriver "3.6.0"
+    source-map-support "~0.4.0"
+    webdriver-js-extender "2.1.0"
+    webdriver-manager "^12.0.6"
+    yargs "^12.0.5"
+
+proxy-addr@~2.0.5:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf"
+  integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==
+  dependencies:
+    forwarded "~0.1.2"
+    ipaddr.js "1.9.1"
+
+prr@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
+  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
+
+pseudomap@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
+
+psl@^1.1.28:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
+  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
+
+public-encrypt@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
+  integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==
+  dependencies:
+    bn.js "^4.1.0"
+    browserify-rsa "^4.0.0"
+    create-hash "^1.1.0"
+    parse-asn1 "^5.0.0"
+    randombytes "^2.0.1"
+    safe-buffer "^5.1.2"
+
+pump@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
+  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+pump@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+pumpify@^1.3.3:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
+  integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
+  dependencies:
+    duplexify "^3.6.0"
+    inherits "^2.0.3"
+    pump "^2.0.0"
+
+punycode@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
+
+punycode@^1.2.4:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
+
+punycode@^2.1.0, punycode@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+
+purgecss@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/purgecss/-/purgecss-2.3.0.tgz#5327587abf5795e6541517af8b190a6fb5488bb3"
+  integrity sha512-BE5CROfVGsx2XIhxGuZAT7rTH9lLeQx/6M0P7DTXQH4IUc3BBzs9JUzt4yzGf3JrH9enkeq6YJBe9CTtkm1WmQ==
+  dependencies:
+    commander "^5.0.0"
+    glob "^7.0.0"
+    postcss "7.0.32"
+    postcss-selector-parser "^6.0.2"
+
+q@1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
+  integrity sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=
+
+q@^1.4.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
+  integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
+
+qjobs@^1.1.4:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
+  integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==
+
+qs@6.7.0:
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
+  integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
+
+qs@~6.5.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
+
+query-string@^4.1.0:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
+  integrity sha1-u7aTucqRXCMlFbIosaArYJBD2+s=
+  dependencies:
+    object-assign "^4.1.0"
+    strict-uri-encode "^1.0.0"
+
+querystring-es3@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
+  integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
+
+querystring@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
+
+querystringify@^2.1.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
+  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
+
+queue-microtask@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
+  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
+
+quill-delta@^3.6.2:
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/quill-delta/-/quill-delta-3.6.3.tgz#b19fd2b89412301c60e1ff213d8d860eac0f1032"
+  integrity sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg==
+  dependencies:
+    deep-equal "^1.0.1"
+    extend "^3.0.2"
+    fast-diff "1.1.2"
+
+quill-delta@^4.0.1:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/quill-delta/-/quill-delta-4.2.2.tgz#015397d046e0a3bed087cd8a51f98c11a1b8f351"
+  integrity sha512-qjbn82b/yJzOjstBgkhtBjN2TNK+ZHP/BgUQO+j6bRhWQQdmj2lH6hXG7+nwwLF41Xgn//7/83lxs9n2BkTtTg==
+  dependencies:
+    fast-diff "1.2.0"
+    lodash.clonedeep "^4.5.0"
+    lodash.isequal "^4.5.0"
+
+quill@^1.3.7:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/quill/-/quill-1.3.7.tgz#da5b2f3a2c470e932340cdbf3668c9f21f9286e8"
+  integrity sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==
+  dependencies:
+    clone "^2.1.1"
+    deep-equal "^1.0.1"
+    eventemitter3 "^2.0.3"
+    extend "^3.0.2"
+    parchment "^1.1.4"
+    quill-delta "^3.6.2"
+
+raf@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39"
+  integrity sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==
+  dependencies:
+    performance-now "^2.1.0"
+
+randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
+  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
+  dependencies:
+    safe-buffer "^5.1.0"
+
+randomfill@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
+  integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
+  dependencies:
+    randombytes "^2.0.5"
+    safe-buffer "^5.1.0"
+
+range-parser@^1.2.0, range-parser@^1.2.1, range-parser@~1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
+  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
+
+raw-body@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
+  integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
+  dependencies:
+    bytes "3.1.0"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
+    unpipe "1.0.0"
+
+raw-loader@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-3.1.0.tgz#5e9d399a5a222cc0de18f42c3bc5e49677532b3f"
+  integrity sha512-lzUVMuJ06HF4rYveaz9Tv0WRlUMxJ0Y1hgSkkgg+50iEdaI0TthyEDe08KIHb0XsF6rn8WYTqPCaGTZg3sX+qA==
+  dependencies:
+    loader-utils "^1.1.0"
+    schema-utils "^2.0.1"
+
+rc@^1.2.8:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
+  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
+  dependencies:
+    deep-extend "^0.6.0"
+    ini "~1.3.0"
+    minimist "^1.2.0"
+    strip-json-comments "~2.0.1"
+
+read-cache@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
+  integrity sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=
+  dependencies:
+    pify "^2.3.0"
+
+read-package-json@^2.0.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.1.2.tgz#6992b2b66c7177259feb8eaac73c3acd28b9222a"
+  integrity sha512-D1KmuLQr6ZSJS0tW8hf3WGpRlwszJOXZ3E8Yd/DNRaM5d+1wVRZdHlpGBLAuovjr28LbWvjpWkBHMxpRGGjzNA==
+  dependencies:
+    glob "^7.1.1"
+    json-parse-even-better-errors "^2.3.0"
+    normalize-package-data "^2.0.0"
+    npm-normalize-package-bin "^1.0.0"
+
+read-package-tree@5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.3.1.tgz#a32cb64c7f31eb8a6f31ef06f9cedf74068fe636"
+  integrity sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw==
+  dependencies:
+    read-package-json "^2.0.0"
+    readdir-scoped-modules "^1.0.0"
+    util-promisify "^2.1.0"
+
+read-pkg-up@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-5.0.0.tgz#b6a6741cb144ed3610554f40162aa07a6db621b8"
+  integrity sha512-XBQjqOBtTzyol2CpsQOw8LHV0XbDZVG7xMMjmXAJomlVY03WOBRmYgDJETlvcg0H63AJvPRwT7GFi5rvOzUOKg==
+  dependencies:
+    find-up "^3.0.0"
+    read-pkg "^5.0.0"
+
+read-pkg@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
+  integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
+  dependencies:
+    "@types/normalize-package-data" "^2.4.0"
+    normalize-package-data "^2.5.0"
+    parse-json "^5.0.0"
+    type-fest "^0.6.0"
+
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+  version "2.3.7"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
+  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
+
+readable-stream@^3.0.6, readable-stream@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
+readdir-scoped-modules@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309"
+  integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==
+  dependencies:
+    debuglog "^1.0.1"
+    dezalgo "^1.0.0"
+    graceful-fs "^4.1.2"
+    once "^1.3.0"
+
+readdirp@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
+  integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
+  dependencies:
+    graceful-fs "^4.1.11"
+    micromatch "^3.1.10"
+    readable-stream "^2.0.2"
+
+readdirp@~3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"
+  integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==
+  dependencies:
+    picomatch "^2.2.1"
+
+reduce-css-calc@^2.1.6:
+  version "2.1.8"
+  resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-2.1.8.tgz#7ef8761a28d614980dc0c982f772c93f7a99de03"
+  integrity sha512-8liAVezDmUcH+tdzoEGrhfbGcP7nOV4NkGE3a74+qqvE7nt9i4sKLGBuZNOnpI4WiGksiNPklZxva80061QiPg==
+  dependencies:
+    css-unit-converter "^1.1.1"
+    postcss-value-parser "^3.3.0"
+
+reflect-metadata@^0.1.12, reflect-metadata@^0.1.2:
+  version "0.1.13"
+  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08"
+  integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==
+
+regenerate-unicode-properties@^8.2.0:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
+  integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==
+  dependencies:
+    regenerate "^1.4.0"
+
+regenerate@^1.4.0:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
+  integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
+
+regenerator-runtime@0.13.3:
+  version "0.13.3"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"
+  integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==
+
+regenerator-runtime@^0.13.4:
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
+  integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==
+
+regenerator-runtime@^0.13.7:
+  version "0.13.9"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
+  integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
+
+regenerator-transform@^0.14.2:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4"
+  integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==
+  dependencies:
+    "@babel/runtime" "^7.8.4"
+
+regex-not@^1.0.0, regex-not@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
+  dependencies:
+    extend-shallow "^3.0.2"
+    safe-regex "^1.1.0"
+
+regexp.prototype.flags@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26"
+  integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+
+regexpu-core@^4.7.1:
+  version "4.7.1"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"
+  integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==
+  dependencies:
+    regenerate "^1.4.0"
+    regenerate-unicode-properties "^8.2.0"
+    regjsgen "^0.5.1"
+    regjsparser "^0.6.4"
+    unicode-match-property-ecmascript "^1.0.4"
+    unicode-match-property-value-ecmascript "^1.2.0"
+
+registry-auth-token@^4.0.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250"
+  integrity sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==
+  dependencies:
+    rc "^1.2.8"
+
+registry-url@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009"
+  integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==
+  dependencies:
+    rc "^1.2.8"
+
+regjsgen@^0.5.1:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
+  integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==
+
+regjsparser@^0.6.4:
+  version "0.6.9"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.9.tgz#b489eef7c9a2ce43727627011429cf833a7183e6"
+  integrity sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==
+  dependencies:
+    jsesc "~0.5.0"
+
+remove-trailing-separator@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
+
+remove@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/remove/-/remove-0.1.5.tgz#095ffd827d65c9f41ad97d33e416a75811079955"
+  integrity sha1-CV/9gn1lyfQa2X0z5BanWBEHmVU=
+  dependencies:
+    seq ">= 0.3.5"
+
+repeat-element@^1.1.2:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9"
+  integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==
+
+repeat-string@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-0.2.2.tgz#c7a8d3236068362059a7e4651fc6884e8b1fb4ae"
+  integrity sha512-yHeI3F9v20MY+8/5WAUgIWseMZwpLD+l9h5hGyzh6fQjhle2AwjjRDao1m5IozSDuVvMw09/mvE8AU1oDmZKpQ==
+
+repeat-string@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
+
+request@^2.55.0, request@^2.83.0, request@^2.87.0, request@^2.88.2:
+  version "2.88.2"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
+  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.8.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
+    forever-agent "~0.6.1"
+    form-data "~2.3.2"
+    har-validator "~5.1.3"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
+    performance-now "^2.1.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.5.0"
+    tunnel-agent "^0.6.0"
+    uuid "^3.3.2"
+
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+
+require-main-filename@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+  integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
+
+require-main-filename@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
+  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
+
+requires-port@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
+
+resolve-cwd@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
+  integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=
+  dependencies:
+    resolve-from "^3.0.0"
+
+resolve-from@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
+  integrity sha1-six699nWiBvItuZTM17rywoYh0g=
+
+resolve-from@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
+
+resolve-url@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
+
+resolve@^1.1.7, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.11.1, resolve@^1.14.2, resolve@^1.3.2:
+  version "1.20.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
+  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
+  dependencies:
+    is-core-module "^2.2.0"
+    path-parse "^1.0.6"
+
+resolve@~1.1.6:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
+  integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
+
+responselike@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
+  integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=
+  dependencies:
+    lowercase-keys "^1.0.0"
+
+restore-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
+  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
+  dependencies:
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+
+ret@~0.1.10:
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
+
+retry@^0.10.0:
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
+  integrity sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=
+
+retry@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
+  integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=
+
+reusify@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
+
+rfdc@^1.1.2, rfdc@^1.1.4:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b"
+  integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==
+
+rgbcolor@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/rgbcolor/-/rgbcolor-1.0.1.tgz#d6505ecdb304a6595da26fa4b43307306775945d"
+  integrity sha1-1lBezbMEplldom+ktDMHMGd1lF0=
+
+rimraf@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.0.tgz#614176d4b3010b75e5c390eb0ee96f6dc0cebb9b"
+  integrity sha512-NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg==
+  dependencies:
+    glob "^7.1.3"
+
+rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.2, rimraf@^2.6.3:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
+  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
+  dependencies:
+    glob "^7.1.3"
+
+rimraf@^3.0.0, rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
+ripemd160@^2.0.0, ripemd160@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
+  integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
+  dependencies:
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
+
+rollup-plugin-commonjs@^10.0.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-10.1.0.tgz#417af3b54503878e084d127adf4d1caf8beb86fb"
+  integrity sha512-jlXbjZSQg8EIeAAvepNwhJj++qJWNJw1Cl0YnOqKtP5Djx+fFGkp3WRh+W0ASCaFG5w1jhmzDxgu3SJuVxPF4Q==
+  dependencies:
+    estree-walker "^0.6.1"
+    is-reference "^1.1.2"
+    magic-string "^0.25.2"
+    resolve "^1.11.0"
+    rollup-pluginutils "^2.8.1"
+
+rollup-plugin-json@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-json/-/rollup-plugin-json-4.0.0.tgz#a18da0a4b30bf5ca1ee76ddb1422afbb84ae2b9e"
+  integrity sha512-hgb8N7Cgfw5SZAkb3jf0QXii6QX/FOkiIq2M7BAQIEydjHvTyxXHQiIzZaTFgx1GK0cRCHOCBHIyEkkLdWKxow==
+  dependencies:
+    rollup-pluginutils "^2.5.0"
+
+rollup-plugin-node-resolve@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-5.2.0.tgz#730f93d10ed202473b1fb54a5997a7db8c6d8523"
+  integrity sha512-jUlyaDXts7TW2CqQ4GaO5VJ4PwwaV8VUGA7+km3n6k6xtOEacf61u0VXwN80phY/evMcaS+9eIeJ9MOyDxt5Zw==
+  dependencies:
+    "@types/resolve" "0.0.8"
+    builtin-modules "^3.1.0"
+    is-module "^1.0.0"
+    resolve "^1.11.1"
+    rollup-pluginutils "^2.8.1"
+
+rollup-plugin-replace@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-replace/-/rollup-plugin-replace-2.2.0.tgz#f41ae5372e11e7a217cde349c8b5d5fd115e70e3"
+  integrity sha512-/5bxtUPkDHyBJAKketb4NfaeZjL5yLZdeUihSfbF2PQMz+rSTEb8ARKoOl3UBT4m7/X+QOXJo3sLTcq+yMMYTA==
+  dependencies:
+    magic-string "^0.25.2"
+    rollup-pluginutils "^2.6.0"
+
+rollup-plugin-sourcemaps@^0.4.2:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.4.2.tgz#62125aa94087aadf7b83ef4dfaf629b473135e87"
+  integrity sha1-YhJaqUCHqt97g+9N+vYptHMTXoc=
+  dependencies:
+    rollup-pluginutils "^2.0.1"
+    source-map-resolve "^0.5.0"
+
+rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.5.0, rollup-pluginutils@^2.6.0, rollup-pluginutils@^2.8.1:
+  version "2.8.2"
+  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"
+  integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==
+  dependencies:
+    estree-walker "^0.6.1"
+
+rollup@1.25.2:
+  version "1.25.2"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.25.2.tgz#739f508bd8f7ece52bb6c1fcda83466af82b7f6d"
+  integrity sha512-+7z6Wab/L45QCPcfpuTZKwKiB0tynj05s/+s2U3F2Bi7rOLPr9UcjUwO7/xpjlPNXA/hwnth6jBExFRGyf3tMg==
+  dependencies:
+    "@types/estree" "*"
+    "@types/node" "*"
+    acorn "^7.1.0"
+
+run-async@^2.2.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
+  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
+
+run-parallel@^1.1.9:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
+  integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
+  dependencies:
+    queue-microtask "^1.2.2"
+
+run-queue@^1.0.0, run-queue@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
+  integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=
+  dependencies:
+    aproba "^1.1.1"
+
+rust-result@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/rust-result/-/rust-result-1.0.0.tgz#34c75b2e6dc39fe5875e5bdec85b5e0f91536f72"
+  integrity sha1-NMdbLm3Dn+WHXlveyFteD5FTb3I=
+  dependencies:
+    individual "^2.0.0"
+
+rw@1:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
+  integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q=
+
+rxjs@6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
+  integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
+  dependencies:
+    tslib "^1.9.0"
+
+rxjs@^6.0.0, rxjs@^6.4.0:
+  version "6.6.7"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
+  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
+  dependencies:
+    tslib "^1.9.0"
+
+rxjs@~6.3.3:
+  version "6.3.3"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55"
+  integrity sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==
+  dependencies:
+    tslib "^1.9.0"
+
+rxjs@~6.5.2:
+  version "6.5.5"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz#c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec"
+  integrity sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==
+  dependencies:
+    tslib "^1.9.0"
+
+safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
+safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+
+safe-json-parse@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-4.0.0.tgz#7c0f578cfccd12d33a71c0e05413e2eca171eaac"
+  integrity sha1-fA9XjPzNEtM6ccDgVBPi7KFx6qw=
+  dependencies:
+    rust-result "^1.0.0"
+
+safe-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
+  dependencies:
+    ret "~0.1.10"
+
+"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@^2.1.2, safer-buffer@~2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+
+sass-loader@7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.2.0.tgz#e34115239309d15b2527cb62b5dfefb62a96ff7f"
+  integrity sha512-h8yUWaWtsbuIiOCgR9fd9c2lRXZ2uG+h8Dzg/AGNj+Hg/3TO8+BBAW9mEP+mh8ei+qBKqSJ0F1FLlYjNBc61OA==
+  dependencies:
+    clone-deep "^4.0.1"
+    loader-utils "^1.0.1"
+    neo-async "^2.5.0"
+    pify "^4.0.1"
+    semver "^5.5.0"
+
+sass@1.22.9:
+  version "1.22.9"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.22.9.tgz#41a2ed6038027f58be2bd5041293452a29c2cb84"
+  integrity sha512-FzU1X2V8DlnqabrL4u7OBwD2vcOzNMongEJEx3xMEhWY/v26FFR3aG0hyeu2T965sfR0E9ufJwmG+Qjz78vFPQ==
+  dependencies:
+    chokidar ">=2.0.0 <4.0.0"
+
+sass@^1.17.3:
+  version "1.32.13"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.13.tgz#8d29c849e625a415bce71609c7cf95e15f74ed00"
+  integrity sha512-dEgI9nShraqP7cXQH+lEXVf73WOPCse0QlFzSD8k+1TcOxCMwVXfQlr0jtoluZysQOyJGnfr21dLvYKDJq8HkA==
+  dependencies:
+    chokidar ">=3.0.0 <4.0.0"
+
+saucelabs@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/saucelabs/-/saucelabs-1.5.0.tgz#9405a73c360d449b232839919a86c396d379fd9d"
+  integrity sha512-jlX3FGdWvYf4Q3LFfFWS1QvPg3IGCGWxIc8QBFdPTbpTJnt/v17FHXYVAn7C8sHf1yUXo2c7yIM0isDryfYtHQ==
+  dependencies:
+    https-proxy-agent "^2.2.1"
+
+sax@0.5.x:
+  version "0.5.8"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
+  integrity sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=
+
+sax@>=0.6.0, sax@^1.1.4, sax@~1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+
+schema-utils@^0.4.0:
+  version "0.4.7"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
+  integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
+  dependencies:
+    ajv "^6.1.0"
+    ajv-keywords "^3.1.0"
+
+schema-utils@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
+  integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==
+  dependencies:
+    ajv "^6.1.0"
+    ajv-errors "^1.0.0"
+    ajv-keywords "^3.1.0"
+
+schema-utils@^2.0.0, schema-utils@^2.0.1, schema-utils@^2.6.1, schema-utils@^2.6.6, schema-utils@^2.7.0:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
+  integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==
+  dependencies:
+    "@types/json-schema" "^7.0.5"
+    ajv "^6.12.4"
+    ajv-keywords "^3.5.2"
+
+select-hose@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
+  integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
+
+selenium-webdriver@3.6.0, selenium-webdriver@^3.0.1:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-3.6.0.tgz#2ba87a1662c020b8988c981ae62cb2a01298eafc"
+  integrity sha512-WH7Aldse+2P5bbFBO4Gle/nuQOdVwpHMTL6raL3uuBj/vPG07k6uzt3aiahu352ONBr5xXh0hDlM3LhtXPOC4Q==
+  dependencies:
+    jszip "^3.1.3"
+    rimraf "^2.5.4"
+    tmp "0.0.30"
+    xml2js "^0.4.17"
+
+selfsigned@^1.10.7:
+  version "1.10.11"
+  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.11.tgz#24929cd906fe0f44b6d01fb23999a739537acbe9"
+  integrity sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA==
+  dependencies:
+    node-forge "^0.10.0"
+
+semver-compare@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
+  integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
+
+semver-diff@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"
+  integrity sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=
+  dependencies:
+    semver "^5.0.3"
+
+semver-dsl@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/semver-dsl/-/semver-dsl-1.0.1.tgz#d3678de5555e8a61f629eed025366ae5f27340a0"
+  integrity sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=
+  dependencies:
+    semver "^5.3.0"
+
+semver-intersect@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/semver-intersect/-/semver-intersect-1.4.0.tgz#bdd9c06bedcdd2fedb8cd352c3c43ee8c61321f3"
+  integrity sha512-d8fvGg5ycKAq0+I6nfWeCx6ffaWJCsBYU0H2Rq56+/zFePYfT8mXkB3tWBSjR5BerkHNZ5eTPIk1/LBYas35xQ==
+  dependencies:
+    semver "^5.0.0"
+
+semver-regex@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.2.tgz#34b4c0d361eef262e07199dbef316d0f2ab11807"
+  integrity sha512-bXWyL6EAKOJa81XG1OZ/Yyuq+oT0b2YLlxx7c+mrdYPaPbnj6WgVULXhinMIeZGufuUBu/eVRqXEhiv4imfwxA==
+
+"semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.0.3, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+
+semver@6.3.0, semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+
+semver@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
+  integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
+
+send@0.17.1:
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
+  integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==
+  dependencies:
+    debug "2.6.9"
+    depd "~1.1.2"
+    destroy "~1.0.4"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    fresh "0.5.2"
+    http-errors "~1.7.2"
+    mime "1.6.0"
+    ms "2.1.1"
+    on-finished "~2.3.0"
+    range-parser "~1.2.1"
+    statuses "~1.5.0"
+
+"seq@>= 0.3.5":
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/seq/-/seq-0.3.5.tgz#ae02af3a424793d8ccbf212d69174e0c54dffe38"
+  integrity sha1-rgKvOkJHk9jMvyEtaRdODFTf/jg=
+  dependencies:
+    chainsaw ">=0.0.7 <0.1"
+    hashish ">=0.0.2 <0.1"
+
+serialize-javascript@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-3.1.0.tgz#8bf3a9170712664ef2561b44b691eafe399214ea"
+  integrity sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==
+  dependencies:
+    randombytes "^2.1.0"
+
+serialize-javascript@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
+  integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==
+  dependencies:
+    randombytes "^2.1.0"
+
+serve-index@^1.9.1:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
+  integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
+  dependencies:
+    accepts "~1.3.4"
+    batch "0.6.1"
+    debug "2.6.9"
+    escape-html "~1.0.3"
+    http-errors "~1.6.2"
+    mime-types "~2.1.17"
+    parseurl "~1.3.2"
+
+serve-static@1.14.1:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
+  integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
+  dependencies:
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    parseurl "~1.3.3"
+    send "0.17.1"
+
+set-blocking@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
+
+set-immediate-shim@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
+  integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
+
+set-value@^2.0.0, set-value@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
+  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.3"
+    split-string "^3.0.1"
+
+setimmediate@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
+
+setprototypeof@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
+  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
+
+setprototypeof@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
+  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
+
+sha.js@^2.4.0, sha.js@^2.4.8:
+  version "2.4.11"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
+  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+shallow-clone@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
+  integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==
+  dependencies:
+    kind-of "^6.0.2"
+
+shebang-command@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
+  dependencies:
+    shebang-regex "^1.0.0"
+
+shebang-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
+
+shepherd.js@^7.1.0:
+  version "7.2.1"
+  resolved "https://registry.yarnpkg.com/shepherd.js/-/shepherd.js-7.2.1.tgz#9973fae7cb595c0c74ae16df5431089f72221680"
+  integrity sha512-IJP2cTv3F7BYjsiN6J+J36s0lKbbBd01p2vKQe2o6EutyVkJd6/Tsr5r+ndMgZ7/aJT7rEb6YkvNWqBfAkcX+A==
+  dependencies:
+    "@popperjs/core" "^2.4.0"
+    deepmerge "^4.2.2"
+    smoothscroll-polyfill "^0.4.4"
+
+signal-exit@^3.0.0, signal-exit@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
+  integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
+
+simple-swizzle@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
+  integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=
+  dependencies:
+    is-arrayish "^0.3.1"
+
+sirv@^1.0.7:
+  version "1.0.19"
+  resolved "https://registry.yarnpkg.com/sirv/-/sirv-1.0.19.tgz#1d73979b38c7fe91fcba49c85280daa9c2363b49"
+  integrity sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ==
+  dependencies:
+    "@polka/url" "^1.0.0-next.20"
+    mrmime "^1.0.0"
+    totalist "^1.0.0"
+
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
+smart-buffer@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.1.0.tgz#91605c25d91652f4661ea69ccf45f1b331ca21ba"
+  integrity sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==
+
+smoothscroll-polyfill@^0.4.4:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/smoothscroll-polyfill/-/smoothscroll-polyfill-0.4.4.tgz#3a259131dc6930e6ca80003e1cb03b603b69abf8"
+  integrity sha512-TK5ZA9U5RqCwMpfoMq/l1mrH0JAR7y7KRvOBx0n2869aLxch+gT9GhN3yUfjiw+d/DiF1mKo14+hd62JyMmoBg==
+
+snapdragon-node@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
+  dependencies:
+    define-property "^1.0.0"
+    isobject "^3.0.0"
+    snapdragon-util "^3.0.1"
+
+snapdragon-util@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
+  dependencies:
+    kind-of "^3.2.0"
+
+snapdragon@^0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
+  dependencies:
+    base "^0.11.1"
+    debug "^2.2.0"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    map-cache "^0.2.2"
+    source-map "^0.5.6"
+    source-map-resolve "^0.5.0"
+    use "^3.1.0"
+
+socket.io-adapter@~1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9"
+  integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==
+
+socket.io-client@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.1.1.tgz#dcb38103436ab4578ddb026638ae2f21b623671f"
+  integrity sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==
+  dependencies:
+    backo2 "1.0.2"
+    base64-arraybuffer "0.1.5"
+    component-bind "1.0.0"
+    component-emitter "1.2.1"
+    debug "~3.1.0"
+    engine.io-client "~3.2.0"
+    has-binary2 "~1.0.2"
+    has-cors "1.1.0"
+    indexof "0.0.1"
+    object-component "0.0.3"
+    parseqs "0.0.5"
+    parseuri "0.0.5"
+    socket.io-parser "~3.2.0"
+    to-array "0.1.4"
+
+socket.io-parser@~3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.2.0.tgz#e7c6228b6aa1f814e6148aea325b51aa9499e077"
+  integrity sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==
+  dependencies:
+    component-emitter "1.2.1"
+    debug "~3.1.0"
+    isarray "2.0.1"
+
+socket.io@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.1.1.tgz#a069c5feabee3e6b214a75b40ce0652e1cfb9980"
+  integrity sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==
+  dependencies:
+    debug "~3.1.0"
+    engine.io "~3.2.0"
+    has-binary2 "~1.0.2"
+    socket.io-adapter "~1.1.0"
+    socket.io-client "2.1.1"
+    socket.io-parser "~3.2.0"
+
+sockjs-client@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.4.0.tgz#c9f2568e19c8fd8173b4997ea3420e0bb306c7d5"
+  integrity sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==
+  dependencies:
+    debug "^3.2.5"
+    eventsource "^1.0.7"
+    faye-websocket "~0.11.1"
+    inherits "^2.0.3"
+    json3 "^3.3.2"
+    url-parse "^1.4.3"
+
+sockjs@0.3.20:
+  version "0.3.20"
+  resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.20.tgz#b26a283ec562ef8b2687b44033a4eeceac75d855"
+  integrity sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==
+  dependencies:
+    faye-websocket "^0.10.0"
+    uuid "^3.4.0"
+    websocket-driver "0.6.5"
+
+socks-proxy-agent@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz#3c8991f3145b2799e70e11bd5fbc8b1963116386"
+  integrity sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==
+  dependencies:
+    agent-base "~4.2.1"
+    socks "~2.3.2"
+
+socks@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.3.3.tgz#01129f0a5d534d2b897712ed8aceab7ee65d78e3"
+  integrity sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==
+  dependencies:
+    ip "1.1.5"
+    smart-buffer "^4.1.0"
+
+sort-keys@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
+  integrity sha1-RBttTTRnmPG05J6JIK37oOVD+a0=
+  dependencies:
+    is-plain-obj "^1.0.0"
+
+source-list-map@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
+  integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
+
+source-list-map@~0.1.7:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
+  integrity sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=
+
+source-map-loader@0.2.4:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-0.2.4.tgz#c18b0dc6e23bf66f6792437557c569a11e072271"
+  integrity sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==
+  dependencies:
+    async "^2.5.0"
+    loader-utils "^1.1.0"
+
+source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
+  integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
+  dependencies:
+    atob "^2.1.2"
+    decode-uri-component "^0.2.0"
+    resolve-url "^0.2.1"
+    source-map-url "^0.4.0"
+    urix "^0.1.0"
+
+source-map-support@0.5.13:
+  version "0.5.13"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
+  integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
+source-map-support@^0.5.5, source-map-support@^0.5.6, source-map-support@~0.5.12:
+  version "0.5.19"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
+  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
+source-map-support@~0.4.0:
+  version "0.4.18"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
+  integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==
+  dependencies:
+    source-map "^0.5.6"
+
+source-map-url@^0.4.0:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
+  integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
+
+source-map@0.1.x:
+  version "0.1.43"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
+  integrity sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=
+  dependencies:
+    amdefine ">=0.0.4"
+
+source-map@0.7.3, source-map@^0.7.3:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
+  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
+
+source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
+
+source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
+source-map@~0.4.1:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
+  dependencies:
+    amdefine ">=0.0.4"
+
+sourcemap-codec@^1.4.4:
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
+  integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
+
+spdx-correct@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
+  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
+  dependencies:
+    spdx-expression-parse "^3.0.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-exceptions@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
+  integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
+
+spdx-expression-parse@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
+  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
+  dependencies:
+    spdx-exceptions "^2.1.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-license-ids@^3.0.0:
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65"
+  integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==
+
+spdy-transport@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31"
+  integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==
+  dependencies:
+    debug "^4.1.0"
+    detect-node "^2.0.4"
+    hpack.js "^2.1.6"
+    obuf "^1.1.2"
+    readable-stream "^3.0.6"
+    wbuf "^1.7.3"
+
+spdy@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b"
+  integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==
+  dependencies:
+    debug "^4.1.0"
+    handle-thing "^2.0.0"
+    http-deceiver "^1.2.7"
+    select-hose "^2.0.0"
+    spdy-transport "^3.0.0"
+
+speed-measure-webpack-plugin@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz#69840a5cdc08b4638697dac7db037f595d7f36a0"
+  integrity sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==
+  dependencies:
+    chalk "^2.0.1"
+
+split-string@^3.0.1, split-string@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
+  dependencies:
+    extend-shallow "^3.0.0"
+
+sprintf-js@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
+  integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
+
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
+
+ssf@~0.10.2:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/ssf/-/ssf-0.10.3.tgz#8eae1fc29c90a552e7921208f81892d6f77acb2b"
+  integrity sha512-pRuUdW0WwyB2doSqqjWyzwCD6PkfxpHAHdZp39K3dp/Hq7f+xfMwNAWIi16DyrRg4gg9c/RvLYkJTSawTPTm1w==
+  dependencies:
+    frac "~1.1.2"
+
+ssf@~0.11.2:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/ssf/-/ssf-0.11.2.tgz#0b99698b237548d088fc43cdf2b70c1a7512c06c"
+  integrity sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==
+  dependencies:
+    frac "~1.1.2"
+
+sshpk@^1.7.0:
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
+  integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    bcrypt-pbkdf "^1.0.0"
+    dashdash "^1.12.0"
+    ecc-jsbn "~0.1.1"
+    getpass "^0.1.1"
+    jsbn "~0.1.0"
+    safer-buffer "^2.0.2"
+    tweetnacl "~0.14.0"
+
+ssri@^6.0.0, ssri@^6.0.1:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5"
+  integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==
+  dependencies:
+    figgy-pudding "^3.5.1"
+
+ssri@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
+  integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
+  dependencies:
+    minipass "^3.1.1"
+
+stackblur-canvas@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/stackblur-canvas/-/stackblur-canvas-1.4.1.tgz#849aa6f94b272ff26f6471fa4130ed1f7e47955b"
+  integrity sha1-hJqm+UsnL/JvZHH6QTDtH35HlVs=
+
+stackblur-canvas@^2.0.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/stackblur-canvas/-/stackblur-canvas-2.5.0.tgz#aa87bbed1560fdcd3138fff344fc6a1c413ebac4"
+  integrity sha512-EeNzTVfj+1In7aSLPKDD03F/ly4RxEuF/EX0YcOG0cKoPXs+SLZxDawQbexQDBzwROs4VKLWTOaZQlZkGBFEIQ==
+
+stackblur@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/stackblur/-/stackblur-1.0.0.tgz#b407a7e05c93b08d66883bb808d7cba3a503f12f"
+  integrity sha1-tAen4FyTsI1miDu4CNfLo6UD8S8=
+
+static-extend@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
+  dependencies:
+    define-property "^0.2.5"
+    object-copy "^0.1.0"
+
+"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
+
+stream-browserify@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
+  integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==
+  dependencies:
+    inherits "~2.0.1"
+    readable-stream "^2.0.2"
+
+stream-each@^1.1.0:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
+  integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==
+  dependencies:
+    end-of-stream "^1.1.0"
+    stream-shift "^1.0.0"
+
+stream-http@^2.7.2:
+  version "2.8.3"
+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
+  integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==
+  dependencies:
+    builtin-status-codes "^3.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.3.6"
+    to-arraybuffer "^1.0.0"
+    xtend "^4.0.0"
+
+stream-shift@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
+  integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
+
+streamroller@0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-0.7.0.tgz#a1d1b7cf83d39afb0d63049a5acbf93493bdf64b"
+  integrity sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==
+  dependencies:
+    date-format "^1.2.0"
+    debug "^3.1.0"
+    mkdirp "^0.5.1"
+    readable-stream "^2.3.0"
+
+streamroller@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-1.0.6.tgz#8167d8496ed9f19f05ee4b158d9611321b8cacd9"
+  integrity sha512-3QC47Mhv3/aZNFpDDVO44qQb9gwB9QggMEE0sQmkTAwBVYdBRWISdsywlkfm5II1Q5y/pmrHflti/IgmIzdDBg==
+  dependencies:
+    async "^2.6.2"
+    date-format "^2.0.0"
+    debug "^3.2.6"
+    fs-extra "^7.0.1"
+    lodash "^4.17.14"
+
+strict-uri-encode@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
+  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
+
+string-width@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    strip-ansi "^3.0.0"
+
+string-width@^2.0.0, string-width@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^4.0.0"
+
+string-width@^3.0.0, string-width@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
+  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
+  dependencies:
+    emoji-regex "^7.0.1"
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^5.1.0"
+
+string-width@^4.1.0:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"
+  integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.0"
+
+string.prototype.trimend@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
+  integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+
+string.prototype.trimstart@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
+  integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+
+string_decoder@^1.0.0, string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  dependencies:
+    safe-buffer "~5.2.0"
+
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+  dependencies:
+    safe-buffer "~5.1.0"
+
+strip-ansi@^3.0.0, strip-ansi@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
+  dependencies:
+    ansi-regex "^2.0.0"
+
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
+  dependencies:
+    ansi-regex "^3.0.0"
+
+strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
+  dependencies:
+    ansi-regex "^4.1.0"
+
+strip-ansi@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
+  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+  dependencies:
+    ansi-regex "^5.0.0"
+
+strip-bom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
+
+strip-eof@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
+
+strip-json-comments@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
+
+style-loader@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.0.0.tgz#1d5296f9165e8e2c85d24eee0b7caf9ec8ca1f82"
+  integrity sha512-B0dOCFwv7/eY31a5PCieNwMgMhVGFe9w+rh7s/Bx8kfFkrth9zfTZquoYvdw8URgiqxObQKcpW51Ugz1HjfdZw==
+  dependencies:
+    loader-utils "^1.2.3"
+    schema-utils "^2.0.1"
+
+stylus-loader@3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-3.0.2.tgz#27a706420b05a38e038e7cacb153578d450513c6"
+  integrity sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==
+  dependencies:
+    loader-utils "^1.0.2"
+    lodash.clonedeep "^4.5.0"
+    when "~3.6.x"
+
+stylus@0.54.5:
+  version "0.54.5"
+  resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.5.tgz#42b9560931ca7090ce8515a798ba9e6aa3d6dc79"
+  integrity sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=
+  dependencies:
+    css-parse "1.7.x"
+    debug "*"
+    glob "7.0.x"
+    mkdirp "0.5.x"
+    sax "0.5.x"
+    source-map "0.1.x"
+
+stylus@^0.54.5:
+  version "0.54.8"
+  resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.8.tgz#3da3e65966bc567a7b044bfe0eece653e099d147"
+  integrity sha512-vr54Or4BZ7pJafo2mpf0ZcwA74rpuYCZbxrHBsH8kbcXOwSfvBFwsRfpGO5OD5fhG5HDCFW737PKaawI7OqEAg==
+  dependencies:
+    css-parse "~2.0.0"
+    debug "~3.1.0"
+    glob "^7.1.6"
+    mkdirp "~1.0.4"
+    safer-buffer "^2.1.2"
+    sax "~1.2.4"
+    semver "^6.3.0"
+    source-map "^0.7.3"
+
+supports-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
+
+supports-color@^5.3.0, supports-color@^5.4.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+  dependencies:
+    has-flag "^3.0.0"
+
+supports-color@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
+  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
+  dependencies:
+    has-flag "^3.0.0"
+
+supports-color@^7.0.0, supports-color@^7.1.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
+  dependencies:
+    has-flag "^4.0.0"
+
+svg-pathdata@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/svg-pathdata/-/svg-pathdata-6.0.3.tgz#80b0e0283b652ccbafb69ad4f8f73e8d3fbf2cac"
+  integrity sha512-qsjeeq5YjBZ5eMdFuUa4ZosMLxgr5RZ+F+Y1OrDhuOCEInRMA3x74XdBtggJcj9kOeInz0WE+LgCPDkZFlBYJw==
+
+symbol-observable@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
+  integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
+
+"symbol-tree@>= 3.1.0 < 4.0.0":
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
+  integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
+
+tailwindcss@^1.1.4:
+  version "1.9.6"
+  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-1.9.6.tgz#0c5089911d24e1e98e592a31bfdb3d8f34ecf1a0"
+  integrity sha512-nY8WYM/RLPqGsPEGEV2z63riyQPcHYZUJpAwdyBzVpxQHOHqHE+F/fvbCeXhdF1+TA5l72vSkZrtYCB9hRcwkQ==
+  dependencies:
+    "@fullhuman/postcss-purgecss" "^2.1.2"
+    autoprefixer "^9.4.5"
+    browserslist "^4.12.0"
+    bytes "^3.0.0"
+    chalk "^3.0.0 || ^4.0.0"
+    color "^3.1.2"
+    detective "^5.2.0"
+    fs-extra "^8.0.0"
+    html-tags "^3.1.0"
+    lodash "^4.17.20"
+    node-emoji "^1.8.1"
+    normalize.css "^8.0.1"
+    object-hash "^2.0.3"
+    postcss "^7.0.11"
+    postcss-functions "^3.0.0"
+    postcss-js "^2.0.0"
+    postcss-nested "^4.1.1"
+    postcss-selector-parser "^6.0.0"
+    postcss-value-parser "^4.1.0"
+    pretty-hrtime "^1.0.3"
+    reduce-css-calc "^2.1.6"
+    resolve "^1.14.2"
+
+tapable@^1.0.0, tapable@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
+  integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
+
+tar@^4.4.8:
+  version "4.4.13"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
+  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
+  dependencies:
+    chownr "^1.1.1"
+    fs-minipass "^1.2.5"
+    minipass "^2.8.6"
+    minizlib "^1.2.1"
+    mkdirp "^0.5.0"
+    safe-buffer "^5.1.2"
+    yallist "^3.0.3"
+
+tar@^6.0.2:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz#d1724e9bcc04b977b18d5c573b333a2207229a83"
+  integrity sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==
+  dependencies:
+    chownr "^2.0.0"
+    fs-minipass "^2.0.0"
+    minipass "^3.0.0"
+    minizlib "^2.1.1"
+    mkdirp "^1.0.3"
+    yallist "^4.0.0"
+
+term-size@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69"
+  integrity sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=
+  dependencies:
+    execa "^0.7.0"
+
+terser-webpack-plugin@3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-3.0.3.tgz#23bda2687b197f878a743373b9411d917adc2e45"
+  integrity sha512-bZFnotuIKq5Rqzrs+qIwFzGdKdffV9epG5vDSEbYzvKAhPeR5RbbrQysfPgbIIMhNAQtZD2hGwBfSKUXjXZZZw==
+  dependencies:
+    cacache "^15.0.4"
+    find-cache-dir "^3.3.1"
+    jest-worker "^26.0.0"
+    p-limit "^2.3.0"
+    schema-utils "^2.6.6"
+    serialize-javascript "^3.1.0"
+    source-map "^0.6.1"
+    terser "^4.6.13"
+    webpack-sources "^1.4.3"
+
+terser-webpack-plugin@^1.4.1:
+  version "1.4.5"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz#a217aefaea330e734ffacb6120ec1fa312d6040b"
+  integrity sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==
+  dependencies:
+    cacache "^12.0.2"
+    find-cache-dir "^2.1.0"
+    is-wsl "^1.1.0"
+    schema-utils "^1.0.0"
+    serialize-javascript "^4.0.0"
+    source-map "^0.6.1"
+    terser "^4.1.2"
+    webpack-sources "^1.4.0"
+    worker-farm "^1.7.0"
+
+terser@4.6.3:
+  version "4.6.3"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.3.tgz#e33aa42461ced5238d352d2df2a67f21921f8d87"
+  integrity sha512-Lw+ieAXmY69d09IIc/yqeBqXpEQIpDGZqT34ui1QWXIUpR2RjbqEkT8X7Lgex19hslSqcWM5iMN2kM11eMsESQ==
+  dependencies:
+    commander "^2.20.0"
+    source-map "~0.6.1"
+    source-map-support "~0.5.12"
+
+terser@^4.1.2, terser@^4.6.13:
+  version "4.8.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
+  integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
+  dependencies:
+    commander "^2.20.0"
+    source-map "~0.6.1"
+    source-map-support "~0.5.12"
+
+text-segmentation@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/text-segmentation/-/text-segmentation-1.0.3.tgz#52a388159efffe746b24a63ba311b6ac9f2d7943"
+  integrity sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==
+  dependencies:
+    utrie "^1.0.2"
+
+thenify-all@^1.0.0, thenify-all@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
+  integrity sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=
+  dependencies:
+    thenify ">= 3.1.0 < 4"
+
+"thenify@>= 3.1.0 < 4":
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f"
+  integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==
+  dependencies:
+    any-promise "^1.0.0"
+
+three@0.93.0:
+  version "0.93.0"
+  resolved "https://registry.yarnpkg.com/three/-/three-0.93.0.tgz#3fd6c367ef4554abbb6e16ad69936283e895c123"
+  integrity sha1-P9bDZ+9FVKu7bhataZNig+iVwSM=
+
+three@^0.113.2:
+  version "0.113.2"
+  resolved "https://registry.yarnpkg.com/three/-/three-0.113.2.tgz#04791d491fe4359330f9dbe7b767db18bfb35d67"
+  integrity sha512-x3vrKW41/UtbWbWduWKGlfIc043SvHWr3YltehYq+UGb9YglQ2oztNGvl2eut05JtNSmP11Mh3t6Xak5/0e+Fg==
+
+through2@^2.0.0:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
+  dependencies:
+    readable-stream "~2.3.6"
+    xtend "~4.0.1"
+
+"through@>=2.2.7 <3", through@X.X.X, through@^2.3.6:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
+
+thunky@^1.0.2:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
+  integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==
+
+timers-browserify@^2.0.4:
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz#44a45c11fbf407f34f97bccd1577c652361b00ee"
+  integrity sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==
+  dependencies:
+    setimmediate "^1.0.4"
+
+timsort@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
+  integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=
+
+tmp@0.0.30:
+  version "0.0.30"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.30.tgz#72419d4a8be7d6ce75148fd8b324e593a711c2ed"
+  integrity sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=
+  dependencies:
+    os-tmpdir "~1.0.1"
+
+tmp@0.0.33, tmp@0.0.x, tmp@^0.0.33:
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
+  dependencies:
+    os-tmpdir "~1.0.2"
+
+to-array@0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
+  integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA=
+
+to-arraybuffer@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
+  integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
+
+to-fast-properties@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
+
+to-object-path@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
+  dependencies:
+    kind-of "^3.0.2"
+
+to-readable-stream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771"
+  integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==
+
+to-regex-range@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
+  dependencies:
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
+to-regex@^3.0.1, to-regex@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
+  dependencies:
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    regex-not "^1.0.2"
+    safe-regex "^1.1.0"
+
+toidentifier@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
+  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
+
+topojson-client@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/topojson-client/-/topojson-client-3.1.0.tgz#22e8b1ed08a2b922feeb4af6f53b6ef09a467b99"
+  integrity sha512-605uxS6bcYxGXw9qi62XyrV6Q3xwbndjachmNxu8HWTtVPxZfEJN9fd/SZS1Q54Sn2y0TMyMxFj/cJINqGHrKw==
+  dependencies:
+    commander "2"
+
+totalist@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/totalist/-/totalist-1.1.0.tgz#a4d65a3e546517701e3e5c37a47a70ac97fe56df"
+  integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==
+
+tough-cookie@^2.2.0, tough-cookie@~2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
+  dependencies:
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
+tr46@~0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+  integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
+
+traverse@>=0.2.4:
+  version "0.6.6"
+  resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137"
+  integrity sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=
+
+"traverse@>=0.3.0 <0.4":
+  version "0.3.9"
+  resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9"
+  integrity sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=
+
+tree-kill@1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
+  integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
+
+ts-node@~8.3.0:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.3.0.tgz#e4059618411371924a1fb5f3b125915f324efb57"
+  integrity sha512-dyNS/RqyVTDcmNM4NIBAeDMpsAdaQ+ojdf0GOLqE6nwJOgzEkdRNzJywhDfwnuvB10oa6NLVG1rUJQCpRN7qoQ==
+  dependencies:
+    arg "^4.1.0"
+    diff "^4.0.1"
+    make-error "^1.1.1"
+    source-map-support "^0.5.6"
+    yn "^3.0.0"
+
+tsickle@^0.36.0:
+  version "0.36.0"
+  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.36.0.tgz#d6f47cdd14d009f3fea4e8516cd46c1393f3aa02"
+  integrity sha512-lrEMU5e+efx5DXtrRSGsxgkCOVRw4WeVaOkQ2pMIxCZDY5rISagVyP4yi7t6M396POFSbMHgQMT/vz0HmfxWVA==
+  dependencies:
+    minimist "^1.2.0"
+    mkdirp "^0.5.1"
+    source-map "^0.7.3"
+
+tslib@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
+  integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
+
+tslib@1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"
+  integrity sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ==
+
+tslib@^1.10.0, tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
+  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
+
+tslib@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c"
+  integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==
+
+tslint-angular@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/tslint-angular/-/tslint-angular-3.0.3.tgz#872d4fe36497d20582dbe4b8ed3338ff0c922c30"
+  integrity sha512-5xD1gLE89lBExfSbMslDw/ZfOZM0t0CJsoJa4svsgF7tlwVS3IpXjzNcNRN0RZqDBj+cdTlbeel6GpZ3PqpPiw==
+
+tslint-config-airbnb@^5.11.1:
+  version "5.11.2"
+  resolved "https://registry.yarnpkg.com/tslint-config-airbnb/-/tslint-config-airbnb-5.11.2.tgz#2f3d239fa3923be8e7a4372217a7ed552671528f"
+  integrity sha512-mUpHPTeeCFx8XARGG/kzYP4dPSOgoCqNiYbGHh09qTH8q+Y1ghsOgaeZKYYQT7IyxMos523z/QBaiv2zKNBcow==
+  dependencies:
+    tslint-consistent-codestyle "^1.14.1"
+    tslint-eslint-rules "^5.4.0"
+    tslint-microsoft-contrib "~5.2.1"
+
+tslint-consistent-codestyle@^1.14.1:
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/tslint-consistent-codestyle/-/tslint-consistent-codestyle-1.16.0.tgz#52348ea899a7e025b37cc6545751c6a566a19077"
+  integrity sha512-ebR/xHyMEuU36hGNOgCfjGBNYxBPixf0yU1Yoo6s3BrpBRFccjPOmIVaVvQsWAUAMdmfzHOCihVkcaMfimqvHw==
+  dependencies:
+    "@fimbul/bifrost" "^0.21.0"
+    tslib "^1.7.1"
+    tsutils "^2.29.0"
+
+tslint-eslint-rules@^5.4.0:
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/tslint-eslint-rules/-/tslint-eslint-rules-5.4.0.tgz#e488cc9181bf193fe5cd7bfca213a7695f1737b5"
+  integrity sha512-WlSXE+J2vY/VPgIcqQuijMQiel+UtmXS+4nvK4ZzlDiqBfXse8FAvkNnTcYhnQyOTW5KFM+uRRGXxYhFpuBc6w==
+  dependencies:
+    doctrine "0.7.2"
+    tslib "1.9.0"
+    tsutils "^3.0.0"
+
+tslint-microsoft-contrib@~5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/tslint-microsoft-contrib/-/tslint-microsoft-contrib-5.2.1.tgz#a6286839f800e2591d041ea2800c77487844ad81"
+  integrity sha512-PDYjvpo0gN9IfMULwKk0KpVOPMhU6cNoT9VwCOLeDl/QS8v8W2yspRpFFuUS7/c5EIH/n8ApMi8TxJAz1tfFUA==
+  dependencies:
+    tsutils "^2.27.2 <2.29.0"
+
+tslint@~5.18.0:
+  version "5.18.0"
+  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.18.0.tgz#f61a6ddcf372344ac5e41708095bbf043a147ac6"
+  integrity sha512-Q3kXkuDEijQ37nXZZLKErssQVnwCV/+23gFEMROi8IlbaBG6tXqLPQJ5Wjcyt/yHPKBC+hD5SzuGaMora+ZS6w==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    builtin-modules "^1.1.1"
+    chalk "^2.3.0"
+    commander "^2.12.1"
+    diff "^3.2.0"
+    glob "^7.1.1"
+    js-yaml "^3.13.1"
+    minimatch "^3.0.4"
+    mkdirp "^0.5.1"
+    resolve "^1.3.2"
+    semver "^5.3.0"
+    tslib "^1.8.0"
+    tsutils "^2.29.0"
+
+tsml@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/tsml/-/tsml-1.0.1.tgz#89f8218b9d9e257f47d7f6b56d01c5a4d2c68fc3"
+  integrity sha1-ifghi52eJX9H1/a1bQHFpNLGj8M=
+
+"tsutils@^2.27.2 <2.29.0":
+  version "2.28.0"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.28.0.tgz#6bd71e160828f9d019b6f4e844742228f85169a1"
+  integrity sha512-bh5nAtW0tuhvOJnx1GLRn5ScraRLICGyJV5wJhtRWOLsxW70Kk5tZtpK3O/hW6LDnqKS9mlUMPZj9fEMJ0gxqA==
+  dependencies:
+    tslib "^1.8.1"
+
+tsutils@^2.29.0:
+  version "2.29.0"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
+  integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==
+  dependencies:
+    tslib "^1.8.1"
+
+tsutils@^3.0.0, tsutils@^3.5.0:
+  version "3.21.0"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
+  integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
+  dependencies:
+    tslib "^1.8.1"
+
+tty-browserify@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
+  integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
+
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
+  dependencies:
+    safe-buffer "^5.0.1"
+
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
+
+type-check@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
+  dependencies:
+    prelude-ls "~1.1.2"
+
+type-fest@^0.21.3:
+  version "0.21.3"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
+  integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
+
+type-fest@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1"
+  integrity sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==
+
+type-fest@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
+  integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
+
+type-is@~1.6.17, type-is@~1.6.18:
+  version "1.6.18"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
+  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
+  dependencies:
+    media-typer "0.3.0"
+    mime-types "~2.1.24"
+
+typedarray@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
+
+typeface-roboto@0.0.75:
+  version "0.0.75"
+  resolved "https://registry.yarnpkg.com/typeface-roboto/-/typeface-roboto-0.0.75.tgz#98d5ba35ec234bbc7172374c8297277099cc712b"
+  integrity sha512-VrR/IiH00Z1tFP4vDGfwZ1esNqTiDMchBEXYY9kilT6wRGgFoCAlgkEUMHb1E3mB0FsfZhv756IF0+R+SFPfdg==
+
+typescript-tslint-plugin@^0.5.4:
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/typescript-tslint-plugin/-/typescript-tslint-plugin-0.5.5.tgz#673875c43640251f1ab3d63745d7d49726ff961c"
+  integrity sha512-tR5igNQP+6FhxaPJYRlUBVsEl0n5cSuXRbg7L1y80mL4B1jUHb8uiIcbQBJ9zWyypJEdFYFUccpXxvMwZR8+AA==
+  dependencies:
+    minimatch "^3.0.4"
+    mock-require "^3.0.3"
+    vscode-languageserver "^5.2.1"
+
+typescript@3.5.3, typescript@~3.5.3:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977"
+  integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==
+
+ultron@~1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
+  integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==
+
+unbox-primitive@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
+  integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==
+  dependencies:
+    function-bind "^1.1.1"
+    has-bigints "^1.0.1"
+    has-symbols "^1.0.2"
+    which-boxed-primitive "^1.0.2"
+
+unicode-canonical-property-names-ecmascript@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
+  integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==
+
+unicode-match-property-ecmascript@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
+  integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==
+  dependencies:
+    unicode-canonical-property-names-ecmascript "^1.0.4"
+    unicode-property-aliases-ecmascript "^1.0.4"
+
+unicode-match-property-value-ecmascript@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531"
+  integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==
+
+unicode-property-aliases-ecmascript@^1.0.4:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4"
+  integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==
+
+union-value@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
+  integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
+  dependencies:
+    arr-union "^3.1.0"
+    get-value "^2.0.6"
+    is-extendable "^0.1.1"
+    set-value "^2.0.1"
+
+unique-filename@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
+  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
+  dependencies:
+    unique-slug "^2.0.0"
+
+unique-slug@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
+  integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
+  dependencies:
+    imurmurhash "^0.1.4"
+
+unique-string@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a"
+  integrity sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=
+  dependencies:
+    crypto-random-string "^1.0.0"
+
+universal-analytics@^0.4.20:
+  version "0.4.23"
+  resolved "https://registry.yarnpkg.com/universal-analytics/-/universal-analytics-0.4.23.tgz#d915e676850c25c4156762471bdd7cf2eaaca8ac"
+  integrity sha512-lgMIH7XBI6OgYn1woDEmxhGdj8yDefMKg7GkWdeATAlQZFrMrNyxSkpDzY57iY0/6fdlzTbBV03OawvvzG+q7A==
+  dependencies:
+    debug "^4.1.1"
+    request "^2.88.2"
+    uuid "^3.0.0"
+
+universalify@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+
+unpipe@1.0.0, unpipe@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
+
+unset-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
+  dependencies:
+    has-value "^0.3.1"
+    isobject "^3.0.0"
+
+upath@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
+  integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
+
+update-notifier@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-3.0.1.tgz#78ecb68b915e2fd1be9f767f6e298ce87b736250"
+  integrity sha512-grrmrB6Zb8DUiyDIaeRTBCkgISYUgETNe7NglEbVsrLWXeESnlCSP50WfRSj/GmzMPl6Uchj24S/p80nP/ZQrQ==
+  dependencies:
+    boxen "^3.0.0"
+    chalk "^2.0.1"
+    configstore "^4.0.0"
+    has-yarn "^2.1.0"
+    import-lazy "^2.1.0"
+    is-ci "^2.0.0"
+    is-installed-globally "^0.1.0"
+    is-npm "^3.0.0"
+    is-yarn-global "^0.3.0"
+    latest-version "^5.0.0"
+    semver-diff "^2.0.0"
+    xdg-basedir "^3.0.0"
+
+uri-js@^4.2.2:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
+  dependencies:
+    punycode "^2.1.0"
+
+urix@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
+
+url-parse-lax@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
+  integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=
+  dependencies:
+    prepend-http "^2.0.0"
+
+url-parse@^1.4.3:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.1.tgz#d5fa9890af8a5e1f274a2c98376510f6425f6e3b"
+  integrity sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==
+  dependencies:
+    querystringify "^2.1.1"
+    requires-port "^1.0.0"
+
+url-toolkit@^2.1.1, url-toolkit@^2.1.3, url-toolkit@^2.2.1:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/url-toolkit/-/url-toolkit-2.2.2.tgz#51ef27b56d3187185f9ecf4a8ac7e8f55203c89d"
+  integrity sha512-l25w6Sy+Iy3/IbogunxhWwljPaDnqpiKvrQRoLBm6DfISco7NyRIS7Zf6+Oxhy1T8kHxWdwLND7ZZba6NjXMug==
+
+url@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
+  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
+  dependencies:
+    punycode "1.3.2"
+    querystring "0.2.0"
+
+use@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
+
+useragent@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.3.0.tgz#217f943ad540cb2128658ab23fc960f6a88c9972"
+  integrity sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==
+  dependencies:
+    lru-cache "4.1.x"
+    tmp "0.0.x"
+
+util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+
+util-promisify@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/util-promisify/-/util-promisify-2.1.0.tgz#3c2236476c4d32c5ff3c47002add7c13b9a82a53"
+  integrity sha1-PCI2R2xNMsX/PEcAKt18E7moKlM=
+  dependencies:
+    object.getownpropertydescriptors "^2.0.3"
+
+util@0.10.3:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+  integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
+  dependencies:
+    inherits "2.0.1"
+
+util@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61"
+  integrity sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==
+  dependencies:
+    inherits "2.0.3"
+
+utils-merge@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
+
+utrie@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/utrie/-/utrie-1.0.2.tgz#d42fe44de9bc0119c25de7f564a6ed1b2c87a645"
+  integrity sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==
+  dependencies:
+    base64-arraybuffer "^1.0.2"
+
+uuid@^3.0.0, uuid@^3.3.2, uuid@^3.3.3, uuid@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+
+uuid@^8.3.2:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
+
+validate-npm-package-license@^3.0.1:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
+  dependencies:
+    spdx-correct "^3.0.0"
+    spdx-expression-parse "^3.0.0"
+
+validate-npm-package-name@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
+  integrity sha1-X6kS2B630MdK/BQN5zF/DKffQ34=
+  dependencies:
+    builtins "^1.0.3"
+
+vary@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
+
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
+  dependencies:
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
+
+video.js@7.6.0:
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/video.js/-/video.js-7.6.0.tgz#556c151004e27d340be3a732a14bf7c1aaf7e8b4"
+  integrity sha512-A0HSKzAmcYkd1xyExqUlM6n8bkghcX54iCvW08bPvvl3UHt8d8zijuylfIWu8vo1Z8fYyk9HPOFs1i3Cldr/cw==
+  dependencies:
+    "@babel/runtime" "^7.4.5"
+    "@videojs/http-streaming" "1.10.3"
+    global "4.3.2"
+    keycode "^2.2.0"
+    safe-json-parse "4.0.0"
+    tsml "1.0.1"
+    videojs-font "3.2.0"
+    videojs-vtt.js "^0.14.1"
+    xhr "2.4.0"
+
+"video.js@^5.6.0 || ^6.2.8 || ^7.0.2", "video.js@^6 || ^7", "video.js@^6.8.0 || ^7.0.0", video.js@^7.5.5:
+  version "7.11.8"
+  resolved "https://registry.yarnpkg.com/video.js/-/video.js-7.11.8.tgz#1fa27c56f30a436b06b44f21560f223e264aec51"
+  integrity sha512-iQmNYB+pdgu8b45Za1AKSa5J7uDyHIqfJy+picw4voKfjErXK/BEvs+A3f99Ck7SCZU4cmMmX/s17AwaaNs+1w==
+  dependencies:
+    "@babel/runtime" "^7.9.2"
+    "@videojs/http-streaming" "2.6.4"
+    "@videojs/xhr" "2.5.1"
+    global "4.3.2"
+    keycode "^2.2.0"
+    remove "^0.1.5"
+    rollup-plugin-replace "^2.2.0"
+    safe-json-parse "4.0.0"
+    videojs-font "3.2.0"
+    videojs-vtt.js "^0.15.2"
+
+videojs-contrib-quality-levels@^2.0.9:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/videojs-contrib-quality-levels/-/videojs-contrib-quality-levels-2.1.0.tgz#046e9e21ed01043f512b83a1916001d552457083"
+  integrity sha512-dqGQGbL9AFhucxki7Zh0c3kIhH0PAPcHEh6jUdRyaFCVeOuqnJrOYs/3wNtsokDdBdRf2Du2annpu4Z2XaSZRg==
+  dependencies:
+    global "^4.3.2"
+    video.js "^6 || ^7"
+
+videojs-font@3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/videojs-font/-/videojs-font-3.2.0.tgz#212c9d3f4e4ec3fa7345167d64316add35e92232"
+  integrity sha512-g8vHMKK2/JGorSfqAZQUmYYNnXmfec4MLhwtEFS+mMs2IDY398GLysy6BH6K+aS1KMNu/xWZ8Sue/X/mdQPliA==
+
+videojs-hls-quality-selector@^1.0.5:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/videojs-hls-quality-selector/-/videojs-hls-quality-selector-1.1.4.tgz#281b78c6653137b08c544e806aa9c91b71d16989"
+  integrity sha512-wWAjlLQui02gp//t9KHGd3XnbYO7wdOptskh3ZYCrbl/5Lbkveqb9yBVjH4e0zIQBPvGdWPMcOeDukf8iuYeBw==
+  dependencies:
+    global "^4.3.2"
+    karma-safaritechpreview-launcher "0.0.6"
+    video.js "^7.5.5"
+    videojs-contrib-quality-levels "^2.0.9"
+
+videojs-vr@1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/videojs-vr/-/videojs-vr-1.5.0.tgz#507953228c626847a732ce651a6efede9f643dc1"
+  integrity sha512-S3/pnk0xP7tGuRX/qe9x4DDppyGGrOGho1IEaBuSyOBnxb1n75Qq+OT4Y7vf9YQp416/wfO6chml1tA5MhMhnw==
+  dependencies:
+    global "^4.3.2"
+    three "0.93.0"
+    video.js "^6 || ^7"
+    webvr-polyfill "0.10.6"
+
+videojs-vtt.js@^0.14.1:
+  version "0.14.1"
+  resolved "https://registry.yarnpkg.com/videojs-vtt.js/-/videojs-vtt.js-0.14.1.tgz#da583eb1fc9c81c826a9432b706040e8dea49911"
+  integrity sha512-YxOiywx6N9t3J5nqsE5WN2Sw4CSqVe3zV+AZm2T4syOc2buNJaD6ZoexSdeszx2sHLU/RRo2r4BJAXFDQ7Qo2Q==
+  dependencies:
+    global "^4.3.1"
+
+videojs-vtt.js@^0.15.2:
+  version "0.15.3"
+  resolved "https://registry.yarnpkg.com/videojs-vtt.js/-/videojs-vtt.js-0.15.3.tgz#84260393b79487fcf195d9372f812d7fab83a993"
+  integrity sha512-5FvVsICuMRx6Hd7H/Y9s9GDeEtYcXQWzGMS+sl4UX3t/zoHp3y+isSfIPRochnTH7h+Bh1ILyC639xy9Z6kPag==
+  dependencies:
+    global "^4.3.1"
+
+videojs-youtube@^2.6.0:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/videojs-youtube/-/videojs-youtube-2.6.1.tgz#3f7cce15229509ea6d54582e28793df530254860"
+  integrity sha512-qvwrkgXixbX8xzdkBa7o5r9KUITRISAy4bbyrpBgub3m0mhwz6WLXDIwJZ6/w4Z/JijWjLQqlg8W1jYhCEgHZw==
+  dependencies:
+    video.js "^5.6.0 || ^6.2.8 || ^7.0.2"
+
+vis-data@^6.1.1:
+  version "6.6.1"
+  resolved "https://registry.yarnpkg.com/vis-data/-/vis-data-6.6.1.tgz#2aa52e46c305ad46bb7abe6e7634e2eecd743b15"
+  integrity sha512-xmujDB2Dzf8T04rGFJ9OP4OA6zRVrz8R9hb0CVKryBrZRCljCga9JjSfgctA8S7wdZu7otDtUIwX4ZOgfV/57w==
+
+vis-network@^5.2.4:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/vis-network/-/vis-network-5.4.1.tgz#e0e33d23775e834f4cfd961bd7b92bf11df097c6"
+  integrity sha512-hUJlFWoCmLup6IxoXCr//OO2ZCkC8jrXEkkHLG1DhBgB54Y3K33+e5q4tc436inMlGzfqqaKTIToNbOGr8Szww==
+  dependencies:
+    "@egjs/hammerjs" "^2.0.15"
+    component-emitter "^1.3.0"
+    keycharm "^0.2.0"
+    moment "^2.24.0"
+    timsort "^0.3.0"
+    vis-data "^6.1.1"
+    vis-util "^1.1.6"
+
+vis-util@^1.1.6:
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/vis-util/-/vis-util-1.1.10.tgz#1c0ebb17ad5139959122dcd12aae54a4e173846a"
+  integrity sha512-8hGSxsFi2ogYYweClQyITzWnirWgQ8p0i9M4d3OXMuUO8vjXrf+2zHOYI9OZbtUduxAWuMEePnS9BXDtPJmJ7Q==
+  dependencies:
+    moment "2.24.0"
+    vis-uuid "1.1.3"
+
+vis-util@^5.0.2:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/vis-util/-/vis-util-5.0.3.tgz#6a9d67c6ed92f2bfa67e50c20166bb5f59ac07bf"
+  integrity sha512-Wf9STUcFrDzK4/Zr7B6epW2Kvm3ORNWF+WiwEz2dpf5RdWkLUXFSbLcuB88n1W6tCdFwVN+v3V4/Xmn9PeL39g==
+
+vis-uuid@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/vis-uuid/-/vis-uuid-1.1.3.tgz#2f53ff35e9e026b0ec93bc433ce685c40c2f784c"
+  integrity sha512-2B6XdY1bkzbUh+TugmnAaFa61KO9R5pzBzIuFIm8a9FrkbxIdSmQXV+FbfkL8QunkQV/bT0JDLQ2puqCS2+0Og==
+
+vm-browserify@^1.0.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
+  integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
+
+void-elements@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
+  integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
+
+vscode-jsonrpc@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz#a7bf74ef3254d0a0c272fab15c82128e378b3be9"
+  integrity sha512-perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg==
+
+vscode-languageserver-protocol@3.14.1:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz#b8aab6afae2849c84a8983d39a1cf742417afe2f"
+  integrity sha512-IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g==
+  dependencies:
+    vscode-jsonrpc "^4.0.0"
+    vscode-languageserver-types "3.14.0"
+
+vscode-languageserver-types@3.14.0:
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz#d3b5952246d30e5241592b6dde8280e03942e743"
+  integrity sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==
+
+vscode-languageserver@^5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.2.1.tgz#0d2feddd33f92aadf5da32450df498d52f6f14eb"
+  integrity sha512-GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A==
+  dependencies:
+    vscode-languageserver-protocol "3.14.1"
+    vscode-uri "^1.0.6"
+
+vscode-uri@^1.0.6:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.8.tgz#9769aaececae4026fb6e22359cb38946580ded59"
+  integrity sha512-obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ==
+
+watchpack-chokidar2@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz#38500072ee6ece66f3769936950ea1771be1c957"
+  integrity sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==
+  dependencies:
+    chokidar "^2.1.8"
+
+watchpack@^1.6.0:
+  version "1.7.5"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453"
+  integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==
+  dependencies:
+    graceful-fs "^4.1.2"
+    neo-async "^2.5.0"
+  optionalDependencies:
+    chokidar "^3.4.1"
+    watchpack-chokidar2 "^2.0.1"
+
+wbuf@^1.1.0, wbuf@^1.7.3:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
+  integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==
+  dependencies:
+    minimalistic-assert "^1.0.0"
+
+webdriver-js-extender@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/webdriver-js-extender/-/webdriver-js-extender-2.1.0.tgz#57d7a93c00db4cc8d556e4d3db4b5db0a80c3bb7"
+  integrity sha512-lcUKrjbBfCK6MNsh7xaY2UAUmZwe+/ib03AjVOpFobX4O7+83BUveSrLfU0Qsyb1DaKJdQRbuU+kM9aZ6QUhiQ==
+  dependencies:
+    "@types/selenium-webdriver" "^3.0.0"
+    selenium-webdriver "^3.0.1"
+
+webdriver-manager@^12.0.6:
+  version "12.1.8"
+  resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.8.tgz#5e70e73eaaf53a0767d5745270addafbc5905fd4"
+  integrity sha512-qJR36SXG2VwKugPcdwhaqcLQOD7r8P2Xiv9sfNbfZrKBnX243iAkOueX1yAmeNgIKhJ3YAT/F2gq6IiEZzahsg==
+  dependencies:
+    adm-zip "^0.4.9"
+    chalk "^1.1.1"
+    del "^2.2.0"
+    glob "^7.0.3"
+    ini "^1.3.4"
+    minimist "^1.2.0"
+    q "^1.4.1"
+    request "^2.87.0"
+    rimraf "^2.5.2"
+    semver "^5.3.0"
+    xml2js "^0.4.17"
+
+webidl-conversions@^3.0.0, webidl-conversions@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+  integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
+
+webpack-bundle-analyzer@^4.4.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.5.0.tgz#1b0eea2947e73528754a6f9af3e91b2b6e0f79d5"
+  integrity sha512-GUMZlM3SKwS8Z+CKeIFx7CVoHn3dXFcUAjT/dcZQQmfSZGvitPfMob2ipjai7ovFFqPvTqkEZ/leL4O0YOdAYQ==
+  dependencies:
+    acorn "^8.0.4"
+    acorn-walk "^8.0.0"
+    chalk "^4.1.0"
+    commander "^7.2.0"
+    gzip-size "^6.0.0"
+    lodash "^4.17.20"
+    opener "^1.5.2"
+    sirv "^1.0.7"
+    ws "^7.3.1"
+
+webpack-core@^0.6.8:
+  version "0.6.9"
+  resolved "https://registry.yarnpkg.com/webpack-core/-/webpack-core-0.6.9.tgz#fc571588c8558da77be9efb6debdc5a3b172bdc2"
+  integrity sha1-/FcViMhVjad76e+23r3Fo7FyvcI=
+  dependencies:
+    source-list-map "~0.1.7"
+    source-map "~0.4.1"
+
+webpack-dev-middleware@3.7.2:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz#0019c3db716e3fa5cecbf64f2ab88a74bab331f3"
+  integrity sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==
+  dependencies:
+    memory-fs "^0.4.1"
+    mime "^2.4.4"
+    mkdirp "^0.5.1"
+    range-parser "^1.2.1"
+    webpack-log "^2.0.0"
+
+webpack-dev-middleware@^3.7.2:
+  version "3.7.3"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz#0639372b143262e2b84ab95d3b91a7597061c2c5"
+  integrity sha512-djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ==
+  dependencies:
+    memory-fs "^0.4.1"
+    mime "^2.4.4"
+    mkdirp "^0.5.1"
+    range-parser "^1.2.1"
+    webpack-log "^2.0.0"
+
+webpack-dev-server@3.11.0:
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz#8f154a3bce1bcfd1cc618ef4e703278855e7ff8c"
+  integrity sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg==
+  dependencies:
+    ansi-html "0.0.7"
+    bonjour "^3.5.0"
+    chokidar "^2.1.8"
+    compression "^1.7.4"
+    connect-history-api-fallback "^1.6.0"
+    debug "^4.1.1"
+    del "^4.1.1"
+    express "^4.17.1"
+    html-entities "^1.3.1"
+    http-proxy-middleware "0.19.1"
+    import-local "^2.0.0"
+    internal-ip "^4.3.0"
+    ip "^1.1.5"
+    is-absolute-url "^3.0.3"
+    killable "^1.0.1"
+    loglevel "^1.6.8"
+    opn "^5.5.0"
+    p-retry "^3.0.1"
+    portfinder "^1.0.26"
+    schema-utils "^1.0.0"
+    selfsigned "^1.10.7"
+    semver "^6.3.0"
+    serve-index "^1.9.1"
+    sockjs "0.3.20"
+    sockjs-client "1.4.0"
+    spdy "^4.0.2"
+    strip-ansi "^3.0.1"
+    supports-color "^6.1.0"
+    url "^0.11.0"
+    webpack-dev-middleware "^3.7.2"
+    webpack-log "^2.0.0"
+    ws "^6.2.1"
+    yargs "^13.3.2"
+
+webpack-log@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f"
+  integrity sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==
+  dependencies:
+    ansi-colors "^3.0.0"
+    uuid "^3.3.2"
+
+webpack-merge@4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.1.tgz#5e923cf802ea2ace4fd5af1d3247368a633489b4"
+  integrity sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==
+  dependencies:
+    lodash "^4.17.5"
+
+webpack-sources@1.4.3, webpack-sources@^1.1.0, webpack-sources@^1.2.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
+  integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==
+  dependencies:
+    source-list-map "^2.0.0"
+    source-map "~0.6.1"
+
+webpack-subresource-integrity@1.1.0-rc.6:
+  version "1.1.0-rc.6"
+  resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.1.0-rc.6.tgz#37f6f1264e1eb378e41465a98da80fad76ab8886"
+  integrity sha512-Az7y8xTniNhaA0620AV1KPwWOqawurVVDzQSpPAeR5RwNbL91GoBSJAAo9cfd+GiFHwsS5bbHepBw1e6Hzxy4w==
+  dependencies:
+    webpack-core "^0.6.8"
+
+webpack@4.39.2:
+  version "4.39.2"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.39.2.tgz#c9aa5c1776d7c309d1b3911764f0288c8c2816aa"
+  integrity sha512-AKgTfz3xPSsEibH00JfZ9sHXGUwIQ6eZ9tLN8+VLzachk1Cw2LVmy+4R7ZiwTa9cZZ15tzySjeMui/UnSCAZhA==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-module-context" "1.8.5"
+    "@webassemblyjs/wasm-edit" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+    acorn "^6.2.1"
+    ajv "^6.10.2"
+    ajv-keywords "^3.4.1"
+    chrome-trace-event "^1.0.2"
+    enhanced-resolve "^4.1.0"
+    eslint-scope "^4.0.3"
+    json-parse-better-errors "^1.0.2"
+    loader-runner "^2.4.0"
+    loader-utils "^1.2.3"
+    memory-fs "^0.4.1"
+    micromatch "^3.1.10"
+    mkdirp "^0.5.1"
+    neo-async "^2.6.1"
+    node-libs-browser "^2.2.1"
+    schema-utils "^1.0.0"
+    tapable "^1.1.3"
+    terser-webpack-plugin "^1.4.1"
+    watchpack "^1.6.0"
+    webpack-sources "^1.4.1"
+
+websocket-driver@0.6.5:
+  version "0.6.5"
+  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz#5cb2556ceb85f4373c6d8238aa691c8454e13a36"
+  integrity sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=
+  dependencies:
+    websocket-extensions ">=0.1.1"
+
+websocket-driver@>=0.5.1:
+  version "0.7.4"
+  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"
+  integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==
+  dependencies:
+    http-parser-js ">=0.5.1"
+    safe-buffer ">=5.1.0"
+    websocket-extensions ">=0.1.1"
+
+websocket-extensions@>=0.1.1:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
+  integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
+
+webvr-polyfill-dpdb@^1.0.7:
+  version "1.0.18"
+  resolved "https://registry.yarnpkg.com/webvr-polyfill-dpdb/-/webvr-polyfill-dpdb-1.0.18.tgz#258484ce06b057bf18898acc911bd173847bce11"
+  integrity sha512-O0S1ZGEWyPvyZEkS2VbyV7mtir/NM9MNK3EuhbHPoJ8EHTky2pTXehjIl+IiDPr+Lldgx129QGt3NGly7rwRPw==
+
+webvr-polyfill@0.10.6:
+  version "0.10.6"
+  resolved "https://registry.yarnpkg.com/webvr-polyfill/-/webvr-polyfill-0.10.6.tgz#c1c5f5e3801784bc131a05aacfa2169872ce0b1c"
+  integrity sha512-H+2LI+rHMguGaUAg+1QuiIQ+1Y1wTSkkUXjQfF/GFD2wUL0AdiN8+uPGxnE7bHMBIG7NswN6kgkZhgy4WpwTlw==
+  dependencies:
+    cardboard-vr-display "1.0.13"
+
+whatwg-url@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-2.0.1.tgz#5396b2043f020ee6f704d9c45ea8519e724de659"
+  integrity sha1-U5ayBD8CDub3BNnEXqhRnnJN5lk=
+  dependencies:
+    tr46 "~0.0.3"
+    webidl-conversions "^3.0.0"
+
+when@~3.6.x:
+  version "3.6.4"
+  resolved "https://registry.yarnpkg.com/when/-/when-3.6.4.tgz#473b517ec159e2b85005497a13983f095412e34e"
+  integrity sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=
+
+which-boxed-primitive@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
+  integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
+  dependencies:
+    is-bigint "^1.0.1"
+    is-boolean-object "^1.1.0"
+    is-number-object "^1.0.4"
+    is-string "^1.0.5"
+    is-symbol "^1.0.3"
+
+which-module@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
+
+which-pm-runs@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb"
+  integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=
+
+which@^1.2.1, which@^1.2.9, which@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+  dependencies:
+    isexe "^2.0.0"
+
+widest-line@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.1.tgz#7438764730ec7ef4381ce4df82fb98a53142a3fc"
+  integrity sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==
+  dependencies:
+    string-width "^2.1.1"
+
+wmf@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wmf/-/wmf-1.0.2.tgz#7d19d621071a08c2bdc6b7e688a9c435298cc2da"
+  integrity sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==
+
+word-wrap@~1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
+  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+
+word@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/word/-/word-0.3.0.tgz#8542157e4f8e849f4a363a288992d47612db9961"
+  integrity sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==
+
+wordwrap@~0.0.2:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
+
+worker-farm@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"
+  integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==
+  dependencies:
+    errno "~0.1.7"
+
+worker-loader@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/worker-loader/-/worker-loader-2.0.0.tgz#45fda3ef76aca815771a89107399ee4119b430ac"
+  integrity sha512-tnvNp4K3KQOpfRnD20m8xltE3eWh89Ye+5oj7wXEEHKac1P4oZ6p9oTj8/8ExqoSBnk9nu5Pr4nKfQ1hn2APJw==
+  dependencies:
+    loader-utils "^1.0.0"
+    schema-utils "^0.4.0"
+
+worker-plugin@3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/worker-plugin/-/worker-plugin-3.2.0.tgz#ddae9f161b76fcbaacf8f54ecd037844584e43e7"
+  integrity sha512-W5nRkw7+HlbsEt3qRP6MczwDDISjiRj2GYt9+bpe8A2La00TmJdwzG5bpdMXhRt1qcWmwAvl1TiKaHRa+XDS9Q==
+  dependencies:
+    loader-utils "^1.1.0"
+
+wrap-ansi@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+
+wrap-ansi@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
+  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
+  dependencies:
+    ansi-styles "^3.2.0"
+    string-width "^3.0.0"
+    strip-ansi "^5.0.0"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+
+write-file-atomic@^2.0.0:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481"
+  integrity sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==
+  dependencies:
+    graceful-fs "^4.1.11"
+    imurmurhash "^0.1.4"
+    signal-exit "^3.0.2"
+
+ws@^6.2.1:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
+  integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
+  dependencies:
+    async-limiter "~1.0.0"
+
+ws@^7.3.1:
+  version "7.5.8"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.8.tgz#ac2729881ab9e7cbaf8787fe3469a48c5c7f636a"
+  integrity sha512-ri1Id1WinAX5Jqn9HejiGb8crfRio0Qgu8+MtL36rlTA6RLsMdWt1Az/19A2Qij6uSHUMphEFaTKa4WG+UNHNw==
+
+ws@~3.3.1:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
+  integrity sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==
+  dependencies:
+    async-limiter "~1.0.0"
+    safe-buffer "~5.1.0"
+    ultron "~1.1.0"
+
+xdg-basedir@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
+  integrity sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=
+
+xhr@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/xhr/-/xhr-2.4.0.tgz#e16e66a45f869861eeefab416d5eff722dc40993"
+  integrity sha1-4W5mpF+GmGHu76tBbV7/ci3ECZM=
+  dependencies:
+    global "~4.3.0"
+    is-function "^1.0.1"
+    parse-headers "^2.0.0"
+    xtend "^4.0.0"
+
+xlsx@^0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/xlsx/-/xlsx-0.14.5.tgz#3637e914d791bdca7382816e173f7d725ed0e0d2"
+  integrity sha512-s/5f4/mjeWREmIWZ+HtDfh/rnz51ar+dZ4LWKZU3u9VBx2zLdSIWTdXgoa52/pnZ9Oe/Vu1W1qzcKzLVe+lq4w==
+  dependencies:
+    adler-32 "~1.2.0"
+    cfb "^1.1.2"
+    codepage "~1.14.0"
+    commander "~2.17.1"
+    crc-32 "~1.2.0"
+    exit-on-epipe "~1.0.1"
+    ssf "~0.10.2"
+
+xlsx@^0.16.1:
+  version "0.16.9"
+  resolved "https://registry.yarnpkg.com/xlsx/-/xlsx-0.16.9.tgz#dacd5bb46bda6dd3743940c9c3dc1e2171826256"
+  integrity sha512-gxi1I3EasYvgCX1vN9pGyq920Ron4NO8PNfhuoA3Hpq6Y8f0ECXiy4OLrK4QZBnj1jx3QD+8Fq5YZ/3mPZ5iXw==
+  dependencies:
+    adler-32 "~1.2.0"
+    cfb "^1.1.4"
+    codepage "~1.14.0"
+    commander "~2.17.1"
+    crc-32 "~1.2.0"
+    exit-on-epipe "~1.0.1"
+    fflate "^0.3.8"
+    ssf "~0.11.2"
+    wmf "~1.0.1"
+    word "~0.3.0"
+
+"xml-name-validator@>= 2.0.1 < 3.0.0":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635"
+  integrity sha1-TYuPHszTQZqjYgYb7O9RXh5VljU=
+
+xml2js@^0.4.17:
+  version "0.4.23"
+  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66"
+  integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==
+  dependencies:
+    sax ">=0.6.0"
+    xmlbuilder "~11.0.0"
+
+xmlbuilder@~11.0.0:
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
+  integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
+
+xmldom@^0.1.22:
+  version "0.1.31"
+  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff"
+  integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==
+
+xmldom@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.4.0.tgz#8771e482a333af44587e30ce026f0998c23f3830"
+  integrity sha512-2E93k08T30Ugs+34HBSTQLVtpi6mCddaY8uO+pMNk1pqSjV5vElzn4mmh6KLxN3hki8rNcHSYzILoh3TEWORvA==
+
+xmlhttprequest-ssl@~1.5.4:
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
+  integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=
+
+xtend@^4.0.0, xtend@^4.0.2, xtend@~4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
+  integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
+
+xxhashjs@^0.2.1:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/xxhashjs/-/xxhashjs-0.2.2.tgz#8a6251567621a1c46a5ae204da0249c7f8caa9d8"
+  integrity sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==
+  dependencies:
+    cuint "^0.2.2"
+
+"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
+  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
+
+yallist@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
+
+yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
+
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+
+yaml@^1.10.0:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
+  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
+
+yargs-parser@^11.1.1:
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
+  integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
+yargs-parser@^13.0.0, yargs-parser@^13.1.2:
+  version "13.1.2"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
+  integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
+yargs@13.1.0:
+  version "13.1.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.1.0.tgz#b2729ce4bfc0c584939719514099d8a916ad2301"
+  integrity sha512-1UhJbXfzHiPqkfXNHYhiz79qM/kZqjTE8yGlEjZa85Q+3+OwcV6NRkV7XOV1W2Eom2bzILeUn55pQYffjVOLAg==
+  dependencies:
+    cliui "^4.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
+    os-locale "^3.1.0"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^3.0.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^13.0.0"
+
+yargs@^12.0.5:
+  version "12.0.5"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
+  integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
+  dependencies:
+    cliui "^4.0.0"
+    decamelize "^1.2.0"
+    find-up "^3.0.0"
+    get-caller-file "^1.0.1"
+    os-locale "^3.0.0"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1 || ^4.0.0"
+    yargs-parser "^11.1.1"
+
+yargs@^13.3.2:
+  version "13.3.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
+  integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
+  dependencies:
+    cliui "^5.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^3.0.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^13.1.2"
+
+yeast@0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
+  integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
+
+yn@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
+  integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
+
+yocto-queue@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
+
+zone.js@~0.10.1:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.10.3.tgz#3e5e4da03c607c9dcd92e37dd35687a14a140c16"
+  integrity sha512-LXVLVEq0NNOqK/fLJo3d0kfzd4sxwn2/h67/02pjCjfKDxgx1i9QqpvtHD8CrBnSSwMw5+dy11O7FRX5mkO7Cg==

From 60e5ccb21bfa95af6ec8918aca67584ee41d44de Mon Sep 17 00:00:00 2001
From: Saurav Verma <saurav.verma@tarento.com>
Date: Wed, 17 May 2023 17:49:48 +0530
Subject: [PATCH 092/887] Username changes for MDO

---
 .../access/routes/users/users.component.ts    |  8 ++---
 .../participants/participants.component.html  |  4 +--
 .../participants/participants.component.ts    |  2 --
 .../components/success/success.component.ts   |  1 -
 .../create-event/create-event.component.html  |  2 +-
 .../create-event/create-event.component.ts    |  3 +-
 .../admintable/admintable.component.ts        |  6 ++--
 .../lib/routes/home/models/mdoinfo.model.ts   |  2 --
 .../routes/users-view/users-view.component.ts | 10 +++----
 .../create-user/create-user.component.ts      |  4 +--
 .../routes/view-user/view-user.component.html |  4 +--
 .../components/officer/officer.component.ts   |  4 +--
 .../publish-popup/publish-popup.component.ts  |  2 +-
 .../user-autocomplete-card.component.html     |  4 +--
 src/app/routes/signup/signup.component.html   | 29 ++++---------------
 src/app/routes/signup/signup.component.ts     |  1 -
 src/app/services/init.service.ts              |  6 ++--
 17 files changed, 33 insertions(+), 59 deletions(-)

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
index 219048177..4a9056ba8 100644
--- 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
@@ -24,7 +24,7 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
   private defaultSideNavBarOpenedSubscription: any
 
   constructor(private usersSvc: UsersService, private router: Router, private route: ActivatedRoute,
-              private profileUtilSvc: ProfileV2UtillService) { }
+    private profileUtilSvc: ProfileV2UtillService) { }
   ngOnInit() {
     const url = this.router.url.split('/')
     this.role = url[url.length - 2]
@@ -60,7 +60,7 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
       this.data2 = res
       this.data = res.users.map((user: any) => {
         return {
-          fullName: `${user.first_name} ${user.last_name}`,
+          fullName: `${user.first_name}`,
           email: this.profileUtilSvc.emailTransform(user.email),
           position: user.department_name,
           role: this.role,
@@ -94,7 +94,7 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
         user => {
 
           return {
-            fullName: `${user.firstName} ${user.lastName}`,
+            fullName: `${user.firstName}`,
             email: this.profileUtilSvc.emailTransform(_.get(user, 'profileDetails.personalDetails.primaryEmail'))
               || this.profileUtilSvc.emailTransform(user.email),
             position: user.department_name,
@@ -188,7 +188,7 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
           // tslint:disable-next-line
           user => {
             return {
-              fullName: `${user.firstName} ${user.lastName}`,
+              fullName: `${user.firstName}`,
               email: this.profileUtilSvc.emailTransform(_.get(user, 'profileDetails.personalDetails.primaryEmail'))
                 || this.profileUtilSvc.emailTransform(user.email),
               position: user.department_name,
diff --git a/project/ws/app/src/lib/routes/events/components/participants/participants.component.html b/project/ws/app/src/lib/routes/events/components/participants/participants.component.html
index f8b484948..df5c5b1a6 100644
--- a/project/ws/app/src/lib/routes/events/components/participants/participants.component.html
+++ b/project/ws/app/src/lib/routes/events/components/participants/participants.component.html
@@ -11,7 +11,7 @@
             <mat-option *ngIf="isLoading" class="is-loading">Loading...</mat-option>
             <ng-container *ngIf="!isLoading">
                 <mat-option *ngFor="let user of participants" [value]="user.firstname">
-                    <span>{{user.firstname}} {{user.lastname}}</span>
+                    <span>{{user.firstname}} </span>
                 </mat-option>
             </ng-container>
         </mat-autocomplete>
@@ -34,7 +34,7 @@
             </ng-container>
             <ng-container matColumnDef="fullname">
                 <th mat-header-cell *matHeaderCellDef> Full name </th>
-                <td mat-cell *matCellDef="let element"> {{element.firstName}} {{element.lastName}} </td>
+                <td mat-cell *matCellDef="let element"> {{element.firstName}} </td>
             </ng-container>
             <ng-container matColumnDef="email">
                 <th mat-header-cell *matHeaderCellDef> Email </th>
diff --git a/project/ws/app/src/lib/routes/events/components/participants/participants.component.ts b/project/ws/app/src/lib/routes/events/components/participants/participants.component.ts
index 66d72bdab..d2511621f 100644
--- a/project/ws/app/src/lib/routes/events/components/participants/participants.component.ts
+++ b/project/ws/app/src/lib/routes/events/components/participants/participants.component.ts
@@ -12,7 +12,6 @@ import { ProfileV2UtillService } from '../../../home/services/home-utill.service
 
 export interface IParticipantElement {
     firstname: string,
-    lastname: string,
     email: number
 }
 
@@ -109,7 +108,6 @@ export class ParticipantsComponent implements OnInit {
                         const participantObj = {
                             email,
                             firstname: obj.firstName,
-                            lastname: obj.lastName,
                             id: obj.userId,
                         }
                         this.participants.push(participantObj)
diff --git a/project/ws/app/src/lib/routes/events/components/success/success.component.ts b/project/ws/app/src/lib/routes/events/components/success/success.component.ts
index d68ed2aca..e09560cc8 100644
--- a/project/ws/app/src/lib/routes/events/components/success/success.component.ts
+++ b/project/ws/app/src/lib/routes/events/components/success/success.component.ts
@@ -3,7 +3,6 @@ import { MatDialogRef } from '@angular/material/dialog'
 
 export interface IParticipantElement {
   firstname: string,
-  lastname: string,
   email: number
 }
 
diff --git a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.html b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.html
index c0e498194..9b5521fe3 100644
--- a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.html
+++ b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.html
@@ -355,7 +355,7 @@
                                                             <td>Type</td>
                                                         </tr>
                                                         <tr *ngFor="let row of participantsArr">
-                                                            <td>{{ row.firstname }} {{ row.lastname }}</td>
+                                                            <td>{{ row.firstname }} </td>
                                                             <td>{{ row.email }}</td>
                                                             <td>{{ row.type }}</td>
                                                         </tr>
diff --git a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
index 105f47a1f..14f5eb5c0 100644
--- a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
+++ b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
@@ -244,13 +244,12 @@ export class CreateEventComponent implements OnInit {
       const obj = responseObj.data[index]
       const setSelectedPresentersObj = {
         firstname: obj.firstName || obj.firstname,
-        lastname: obj.lastName || obj.lastname,
         email: this.profileUtilSvc.emailTransform(obj.profileDetails.personalDetails.primaryEmail),
         type: 'Karmayogi User',
       }
       const contactsObj = {
         id: obj.id,
-        name: `${obj.firstName || obj.firstname} ${obj.lastName || obj.lastname}`,
+        name: `${obj.firstName || obj.firstname} `,
       }
       this.presentersArr.push(contactsObj)
       this.participantsArr.push(setSelectedPresentersObj)
diff --git a/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.ts b/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.ts
index 2ba1d2cd6..8342b04a8 100644
--- a/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.ts
@@ -51,8 +51,8 @@ export class AdmintableComponent implements OnInit, OnChanges {
   }
 
   constructor(public dialog: MatDialog, private snackBar: MatSnackBar,
-              private mdoinfoSrvc: MdoInfoService, private router: Router,
-              private profileUtilSvc: ProfileV2UtillService) {
+    private mdoinfoSrvc: MdoInfoService, private router: Router,
+    private profileUtilSvc: ProfileV2UtillService) {
     this.dataSource = new MatTableDataSource<any>()
     this.dataSource.paginator = this.paginator
 
@@ -141,7 +141,7 @@ export class AdmintableComponent implements OnInit, OnChanges {
               }
               const obj = {
                 srnumber: index + 1,
-                fullname: `${user.firstName} ${user.lastName}`,
+                fullname: `${user.firstName}`,
                 email: this.profileUtilSvc.emailTransform(user.email),
                 position: pos,
                 id: user.id,
diff --git a/project/ws/app/src/lib/routes/home/models/mdoinfo.model.ts b/project/ws/app/src/lib/routes/home/models/mdoinfo.model.ts
index 17d4a4472..1637b181a 100644
--- a/project/ws/app/src/lib/routes/home/models/mdoinfo.model.ts
+++ b/project/ws/app/src/lib/routes/home/models/mdoinfo.model.ts
@@ -70,7 +70,6 @@ export namespace MDOinfo {
         rank: number,
         wid: string,
         firstName: string,
-        lastName: string,
         channel: string,
     }
 
@@ -95,7 +94,6 @@ export namespace MDOinfo {
         requestRecieved?: boolean,
         connectionEstablished?: boolean,
         firstName: string,
-        lastName: string,
         channel: string,
     }
 
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 92ee29b8c..89caef22f 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -138,7 +138,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
         // tslint:disable-next-line
         const org = { roles: _.get(_.first(_.filter(user.organisations, { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') }
         activeUsersData.push({
-          fullname: user ? `${user.firstName} ${user.lastName}` : null,
+          fullname: user ? `${user.firstName}` : null,
           email: user.personalDetails && user.personalDetails.primaryEmail ?
             this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
           role: org.roles || [],
@@ -161,9 +161,9 @@ export class UsersViewComponent implements OnInit, OnDestroy {
         // tslint:disable-next-line
         const org = { roles: _.get(_.first(_.filter(user.organisations, { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') || [] }
         inactiveUsersData.push({
-          fullname: user ? `${user.firstName} ${user.lastName}` : null,
+          fullname: user ? `${user.firstName} ` : null,
           email: user.personalDetails && user.personalDetails.primaryEmail ?
-          this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
+            this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
           role: org.roles || [],
           userId: user.id,
           active: !user.isDeleted,
@@ -182,9 +182,9 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
       _.filter(this.usersData.content, { isDeleted: false }).forEach((user: any) => {
         blockedUsersData.push({
-          fullname: user ? `${user.firstName} ${user.lastName}` : null,
+          fullname: user ? `${user.firstName}` : null,
           email: user.personalDetails && user.personalDetails.primaryEmail ?
-          this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
+            this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
           role: user.roles,
           userId: user.id,
           active: !user.isDeleted,
diff --git a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
index 48868cf18..0103cecd5 100644
--- a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
@@ -145,7 +145,6 @@ export class CreateUserComponent implements OnInit, OnDestroy {
     })
     this.createUserForm = new FormGroup({
       fname: new FormControl('', [Validators.required]),
-      lname: new FormControl('', [Validators.required]),
       email: new FormControl('', [Validators.required, Validators.email]),
       department: new FormControl(''),
       roles: new FormControl('', [Validators.required]),
@@ -181,7 +180,6 @@ export class CreateUserComponent implements OnInit, OnDestroy {
         email: form.value.email,
         userName: form.value.fname,
         firstName: form.value.fname,
-        lastName: form.value.lname,
         channel: this.departmentName ? this.departmentName : null,
       },
     }
@@ -199,7 +197,7 @@ export class CreateUserComponent implements OnInit, OnDestroy {
 
         this.usersSvc.addUserToDepartment(dreq).subscribe(dres => {
           if (dres) {
-            this.createUserForm.reset({ fname: '', lname: '', email: '', department: this.departmentName, roles: '' })
+            this.createUserForm.reset({ fname: '', email: '', department: this.departmentName, roles: '' })
             this.openSnackbar('User Created Successfully')
             this.disableCreateButton = false
             if (this.qpParam === 'MDOinfo') {
diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
index d607adfe6..d01757e86 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
@@ -46,11 +46,11 @@
                               <input type="text" [disabled]="true" [value]="basicInfo.middlename" class="appr-text-field">
                             </mat-grid-tile> -->
 
-                              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                              <!-- <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                                 <label class="appr-text-label">Last name</label>
                                 <input type="text" [disabled]="true" [value]="basicInfo.surname"
                                   class="appr-text-field">
-                              </mat-grid-tile>
+                              </mat-grid-tile> -->
 
                               <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                                 <label class="appr-text-label">Date of birth (dd-mm-yy)</label>
diff --git a/project/ws/app/src/lib/routes/workallocation-v2/components/officer/officer.component.ts b/project/ws/app/src/lib/routes/workallocation-v2/components/officer/officer.component.ts
index ed4905578..cac79ca00 100644
--- a/project/ws/app/src/lib/routes/workallocation-v2/components/officer/officer.component.ts
+++ b/project/ws/app/src/lib/routes/workallocation-v2/components/officer/officer.component.ts
@@ -75,7 +75,7 @@ export class OfficerComponent implements OnInit, OnDestroy {
           const usrObj = this.officerForm.get('user')!.value
           let usrName = ''
           if (_.get(usrObj, 'firstName')) {
-            usrName = `${_.get(usrObj, 'firstName')} ${_.get(usrObj, 'lastName')}`
+            usrName = `${_.get(usrObj, 'firstName')}`
           } else {
             usrName = `${_.get(usrObj, 'officerName')}`
           }
@@ -144,7 +144,7 @@ export class OfficerComponent implements OnInit, OnDestroy {
       const frmctr1 = this.officerForm.get('officerName') as FormControl
       // const fullName = _.get(event, 'option.value.userDetails.first_name') + ' ' + _.get(event, 'option.value.userDetails.last_name')
       // tslint:disable-next-line: prefer-template
-      const fullName = _.get(event, 'option.value.firstName') + ' ' + _.get(event, 'option.value.lastName')
+      const fullName = _.get(event, 'option.value.firstName')
       frmctr1.patchValue(fullName || '')
       this.watStore.setOfficerGroup(this.officerForm.value, false, true)
     }
diff --git a/project/ws/app/src/lib/routes/workallocation-v2/components/publish-popup/publish-popup.component.ts b/project/ws/app/src/lib/routes/workallocation-v2/components/publish-popup/publish-popup.component.ts
index a3a57396b..ee4a69098 100644
--- a/project/ws/app/src/lib/routes/workallocation-v2/components/publish-popup/publish-popup.component.ts
+++ b/project/ws/app/src/lib/routes/workallocation-v2/components/publish-popup/publish-popup.component.ts
@@ -55,7 +55,7 @@ export class PublishPopupComponent implements OnInit {
   }
 
   closeDialog() {
-    const username = `${this.userData.firstName} ${this.userData.lastName}`
+    const username = `${this.userData.firstName} `
     const org = []
     const createdforarray: any[] = []
     if (this.configSvc.userProfile) {
diff --git a/project/ws/app/src/lib/routes/workallocation-v2/components/user-autocomplete-card/user-autocomplete-card.component.html b/project/ws/app/src/lib/routes/workallocation-v2/components/user-autocomplete-card/user-autocomplete-card.component.html
index 072bb620f..ea0047664 100644
--- a/project/ws/app/src/lib/routes/workallocation-v2/components/user-autocomplete-card/user-autocomplete-card.component.html
+++ b/project/ws/app/src/lib/routes/workallocation-v2/components/user-autocomplete-card/user-autocomplete-card.component.html
@@ -1,11 +1,11 @@
 <div class="ws-mat-accent-border-bottom padding-m padding-left-s padding-bottom-xs" (click)="userClickHandler(user)">
   <div class="flex flex-start ">
-    <span class="letter-color1">{{user?.firstName.charAt(0)}}{{user?.lastName.charAt(0)}}</span>
+    <span class="letter-color1">{{user?.firstName.charAt(0)}}</span>
     <mat-icon class="groupicon ws-mat-accent-text ws-mat-accent-border">group</mat-icon>
   </div>
   <div class="margin-top-s">
     <p class="username mat-body-2 font-bold-i margin-bottom-xxs">{{user.firstName}}
-      {{user?.lastName ? user?.lastName : ''}}</p>
+    </p>
     <p class="useremail mat-body-2 margin-bottom-xxs">{{user?.profileDetails?.personalDetails.primaryEmail ||
       user.email}}</p>
     <p class="userpos mat-body-2 ws-mat-black60-text margin-bottom-xxs">
diff --git a/src/app/routes/signup/signup.component.html b/src/app/routes/signup/signup.component.html
index c1611b34d..b7dac63fb 100644
--- a/src/app/routes/signup/signup.component.html
+++ b/src/app/routes/signup/signup.component.html
@@ -7,10 +7,10 @@ <h2 class="mat-title" i18n="section heading create new goal">
       <mat-label>First Name</mat-label>
       <input type="text" matInput placeholder="First name" formControlName="fname">
     </mat-form-field>
-    <mat-form-field appearance="outline" class="w-full">
+    <!-- <mat-form-field appearance="outline" class="w-full">
       <mat-label>Last Name</mat-label>
       <input type="text" matInput placeholder="Last name" formControlName="lname">
-    </mat-form-field>
+    </mat-form-field> -->
     <!-- <mat-form-field appearance="outline" class="w-full">
       <mat-label>Mobile Number</mat-label>
       <input type="number" matInput placeholder="Mobile number" formControlName="mobile">
@@ -30,11 +30,7 @@ <h2 class="mat-title" i18n="section heading create new goal">
       <!-- <div *ngIf="uploadSaveData" class="pr-4 flex items-center justify-center">
             <mat-spinner [diameter]="30"></mat-spinner>
           </div> -->
-      <button mat-raised-button
-        color="primary"
-        type="submit" 
-        i18n 
-        [disabled]="uploadSaveData || !signupForm?.valid"
+      <button mat-raised-button color="primary" type="submit" i18n [disabled]="uploadSaveData || !signupForm?.valid"
         (click)="onSubmit(signupForm)">
 
         <ng-container i18n>Save Changes</ng-container>
@@ -47,19 +43,6 @@ <h2 class="mat-title" i18n="section heading create new goal">
   </form>
 </div>
 
-<input
-  type="hidden"
-  i18-value
-  i18-aria-value
-  aria-value="Signup successful"
-  value="Thanks for Signing up"
-  #toastSuccess
-/>
-<input
-  type="hidden"
-  i18-value
-  i18-aria-value
-  aria-value="unable to signup"
-  value="Error Signing up!"
-  #toastError
-/>
\ No newline at end of file
+<input type="hidden" i18-value i18-aria-value aria-value="Signup successful" value="Thanks for Signing up"
+  #toastSuccess />
+<input type="hidden" i18-value i18-aria-value aria-value="unable to signup" value="Error Signing up!" #toastError />
\ No newline at end of file
diff --git a/src/app/routes/signup/signup.component.ts b/src/app/routes/signup/signup.component.ts
index e3e1f2165..56420ac57 100644
--- a/src/app/routes/signup/signup.component.ts
+++ b/src/app/routes/signup/signup.component.ts
@@ -23,7 +23,6 @@ export class SignupComponent implements OnInit, OnDestroy {
   ) {
     this.signupForm = new FormGroup({
       fname: new FormControl('', [Validators.required]),
-      lname: new FormControl('', [Validators.required]),
       // mobile: new FormControl('', [Validators.required, Validators.minLength(10)]),
       email: new FormControl('', [Validators.required, Validators.email]),
       code: new FormControl('', [Validators.required]),
diff --git a/src/app/services/init.service.ts b/src/app/services/init.service.ts
index c6c655def..ee7457ad5 100644
--- a/src/app/services/init.service.ts
+++ b/src/app/services/init.service.ts
@@ -268,7 +268,7 @@ export class InitService {
             givenName: completeProdata.firstName,
             userId: completeProdata.userId,
             firstName: completeProdata.firstName,
-            lastName: completeProdata.lastName,
+            // lastName: completeProdata.lastName,
             userName: completeProdata.userName,
             // tslint:disable-next-line: max-line-length
             // userName: `${completeProdata.firstName ? completeProdata.firstName : ' '}${completeProdata.lastName ? completeProdata.lastName : ' '}`,
@@ -298,8 +298,8 @@ export class InitService {
             userId: _.get(profileV2, 'userId') || completeProdata.userId,
             email: _.get(profileV2, 'personalDetails.primaryEmail') || completeProdata.email,
             firstName: _.get(profileV2, 'personalDetails.firstname') || completeProdata.firstName,
-            surName: _.get(profileV2, 'personalDetails.surname') || completeProdata.lastName,
-            middleName: _.get(profileV2, 'personalDetails.middlename') || '',
+            // surName: _.get(profileV2, 'personalDetails.surname') || completeProdata.lastName,
+            // middleName: _.get(profileV2, 'personalDetails.middlename') || '',
             departmentName: _.get(profileV2, 'employmentDetails.departmentName') || completeProdata.channel,
             // tslint:disable-next-line: max-line-length
             // userName: `${_.get(profileV2, 'personalDetails.firstname') ? _.get(profileV2, 'personalDetails.firstname') : ''}${_.get(profileV2, 'personalDetails.surname') ? _.get(profileV2, 'personalDetails.surname') : ''}`,

From 7fe450df0decf3679857d41eb747ccbc5f4803bc Mon Sep 17 00:00:00 2001
From: Saurav Verma <saurav.verma@tarento.com>
Date: Thu, 18 May 2023 10:45:31 +0530
Subject: [PATCH 093/887] create user page

---
 .../create-user/create-user.component.html    | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html
index 468e5a059..38fa36fb7 100644
--- a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html
+++ b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html
@@ -44,26 +44,6 @@
                     </mat-error>
                   </mat-form-field>
 
-                  <label for="lname" class="margin-remove-bottom margin-top-xs form-label required"
-                    i18n="Last name label|Label which explains the user to enter last name" i18n-aria-label
-                    aria-label="Last name label">
-                    Last name
-                  </label>
-                  <mat-form-field appearance="outline" class="margin-top-xs">
-                    <input id="lname" matInput #lname formControlName="lname" i18n-placeholder placeholder="Type here"
-                      i18n-aria-label aria-label="Last name input" class="form-input" autocomplete="off"
-                      maxlength="150" />
-                    <mat-error [hidden]="false" i18n="Last name Error|Explains name is required" i18n-aria-label
-                      aria-label="Last name Error|Explains name is required "
-                      *ngIf="createUserForm?.controls['lname']?.touched && createUserForm?.controls['lname'].errors?.required">
-                      Last name is mandatory
-                    </mat-error>
-                    <mat-error [hidden]="false" *ngIf="createUserForm?.controls['lname'].errors?.pattern"
-                      i18n-aria-label
-                      aria-label="Last name Error|Name fields cannot contain numbers and special characters except ">
-                      Last name fields cannot contain numbers and special characters except '
-                    </mat-error>
-                  </mat-form-field>
 
                   <label for="email" class="margin-remove-bottom margin-top-xs form-label required"
                     i18n="Email label|Label which explains the user to enter email" i18n-aria-label

From a713b5d30b3cd80b5bfd828bc98927cd097d4fd5 Mon Sep 17 00:00:00 2001
From: Saurav Verma <saurav.verma@tarento.com>
Date: Thu, 18 May 2023 10:52:06 +0530
Subject: [PATCH 094/887] create user page

---
 .../create-workallocation.component.html                     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/workallocation/routes/create-workallocation/create-workallocation.component.html b/project/ws/app/src/lib/routes/workallocation/routes/create-workallocation/create-workallocation.component.html
index 78c070f90..3c3f2c07a 100644
--- a/project/ws/app/src/lib/routes/workallocation/routes/create-workallocation/create-workallocation.component.html
+++ b/project/ws/app/src/lib/routes/workallocation/routes/create-workallocation/create-workallocation.component.html
@@ -52,12 +52,11 @@
                                                             </div>
                                                             <div class="padding-m userdata">
                                                                 <p class="letter-color">
-                                                                    {{selectedUser.userDetails.first_name.charAt(0)}}{{selectedUser.userDetails.last_name.charAt(0)}}
+                                                                    {{selectedUser.userDetails.first_name.charAt(0)}}
                                                                 </p>
                                                                 <p class="username">
                                                                     {{selectedUser.userDetails.first_name}}
-                                                                    {{selectedUser.userDetails.last_name ?
-                                                                    selectedUser.userDetails.last_name : '' }}</p>
+                                                                </p>
                                                                 <p class="userpos">{{selectedUser.userDetails.position}}
                                                                     at {{selectedUser.userDetails.department_name}}</p>
                                                             </div>

From e61e99772493cc6968e7a573b12a34b634c40a5f Mon Sep 17 00:00:00 2001
From: Saurav Verma <saurav.verma@tarento.com>
Date: Thu, 18 May 2023 10:52:57 +0530
Subject: [PATCH 095/887] create user page

---
 .../update-workallocation/update-workallocation.component.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/workallocation/routes/update-workallocation/update-workallocation.component.html b/project/ws/app/src/lib/routes/workallocation/routes/update-workallocation/update-workallocation.component.html
index f93d4ba55..bc97a4401 100644
--- a/project/ws/app/src/lib/routes/workallocation/routes/update-workallocation/update-workallocation.component.html
+++ b/project/ws/app/src/lib/routes/workallocation/routes/update-workallocation/update-workallocation.component.html
@@ -55,7 +55,7 @@
                                                             <div class="padding-m userdata">
                                                                 <p class="letter-color"
                                                                     *ngIf="selectedUser.userDetails">
-                                                                    {{selectedUser.userDetails.first_name.charAt(0)}}{{selectedUser.userDetails.last_name.charAt(0)}}
+                                                                    {{selectedUser.userDetails.first_name.charAt(0)}}
                                                                 </p>
                                                                 <p class="letter-color"
                                                                     *ngIf="!selectedUser.userDetails">

From c0f7ce327deb259381679c86f2c74af1f804a3df Mon Sep 17 00:00:00 2001
From: dakshayini-krishnappa <dakshayini.krishnappa@tarento.com>
Date: Thu, 18 May 2023 17:15:46 +0530
Subject: [PATCH 096/887] hided dashboard from home page

---
 .../routes/home/routes/welcome/welcome.component.html    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/welcome/welcome.component.html b/project/ws/app/src/lib/routes/home/routes/welcome/welcome.component.html
index c56af6b76..6d8b495f1 100644
--- a/project/ws/app/src/lib/routes/home/routes/welcome/welcome.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/welcome/welcome.component.html
@@ -49,13 +49,16 @@
         </div>
       </div>
     </mat-card-content>
-    <a [routerLink]="['/app/my-dashboard']" (click)="dashboardClick()" class="flex rel-custom"
+    <!--disabling dashboard in MDO portal home page - Temp fix. Need to identify the dashboard to show in home page-->
+    <!-- <a [routerLink]="['/app/my-dashboard']" (click)="dashboardClick()" class="flex rel-custom"
       routerLinkActive="router-link-active">
       <span class="mat-subheading-2 ws-mat-default-text">Go to dashboard</span>
       <mat-icon class="ws-mat-default-text">arrow_forward</mat-icon>
-    </a>
+    </a> -->
   </mat-card>
-  <div class="bootstrap-rain margin-top-m" *ngIf="currentDashboard[0]">
+  <!--disabling dashboard in MDO portal home page - Temp fix. Need to identify the dashboard to show in home page-->
+  <!-- <div class="bootstrap-rain margin-top-m" *ngIf="currentDashboard[0]"> -->
+  <div class="bootstrap-rain margin-top-m" *ngIf="false">
     <div class="rain-lib-container relative">
       <lib-rain-dashboards [showFilters]="false" [showMessage]="false" [messageType]="currentDashboard[0].messageType"
         [message]="currentDashboard[0].message" [mapLayoutFilePath]="mapPath" (libDashboardId)="getDashboardId($event)"

From e03d9ecd5d6be13393c1d93802fee16c407c3a98 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Wed, 24 May 2023 14:13:02 +0530
Subject: [PATCH 097/887] Telemetry fixes

---
 .../lib/routes/home/home.rounting.module.ts   | 24 +++++++++----------
 .../routes/users-view/users-view.component.ts |  5 ++--
 .../lib/routes/users/users.routing.module.ts  |  2 +-
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/home.rounting.module.ts b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
index cec7fbe6c..0a6ee0297 100644
--- a/project/ws/app/src/lib/routes/home/home.rounting.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
@@ -37,7 +37,7 @@ const routes: Routes = [
         component: WelcomeComponent,
         data: {
           pageId: 'welcome',
-          module: 'home',
+          module: 'Home',
         },
       },
       {
@@ -49,7 +49,7 @@ const routes: Routes = [
         },
         data: {
           pageId: 'users',
-          module: 'home',
+          module: 'Home',
           pageType: 'feature',
           pageKey: 'users-view',
         },
@@ -64,7 +64,7 @@ const routes: Routes = [
         },
         data: {
           pageId: 'users',
-          module: 'home',
+          module: 'Home',
           pageType: 'feature',
           pageKey: 'users-view',
         },
@@ -74,7 +74,7 @@ const routes: Routes = [
         component: AboutComponent,
         data: {
           pageId: 'about',
-          module: 'home',
+          module: 'Home',
         },
       },
       {
@@ -82,7 +82,7 @@ const routes: Routes = [
         component: RolesAccessComponent,
         data: {
           pageId: 'roles-access',
-          module: 'home',
+          module: 'Home',
         },
         resolve: {
           usersList: UsersListResolve,
@@ -93,14 +93,14 @@ const routes: Routes = [
         component: ApprovalsComponent,
         data: {
           pageId: 'approvals',
-          module: 'home',
+          module: 'Home',
         },
       },
       {
         path: 'workallocation/:tab',
         data: {
           pageId: 'workallocation',
-          module: 'home',
+          module: 'Home',
         },
         component: WorkallocationComponent,
       },
@@ -109,7 +109,7 @@ const routes: Routes = [
         redirectTo: 'workallocation/draft', pathMatch: 'full',
         data: {
           pageId: 'workallocation',
-          module: 'home',
+          module: 'Home',
         },
         component: WorkallocationComponent,
       },
@@ -120,7 +120,7 @@ const routes: Routes = [
     component: MdoinfoComponent,
     data: {
       pageId: 'mdoinfo',
-      module: 'home',
+      module: 'Home',
     },
     resolve: {
       configService: ConfigResolveService,
@@ -131,7 +131,7 @@ const routes: Routes = [
         component: LeadershipComponent,
         data: {
           pageId: 'leadership',
-          module: 'home',
+          module: 'Home',
         },
         resolve: {
           configService: ConfigResolveService,
@@ -142,7 +142,7 @@ const routes: Routes = [
         component: StaffComponent,
         data: {
           pageId: 'staff',
-          module: 'home',
+          module: 'Home',
         },
         resolve: {
           configService: ConfigResolveService,
@@ -153,7 +153,7 @@ const routes: Routes = [
         component: BudgetComponent,
         data: {
           pageId: 'budget',
-          module: 'home',
+          module: 'Home',
         },
         resolve: {
           configService: ConfigResolveService,
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 92ee29b8c..aeb847bc0 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -163,7 +163,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
         inactiveUsersData.push({
           fullname: user ? `${user.firstName} ${user.lastName}` : null,
           email: user.personalDetails && user.personalDetails.primaryEmail ?
-          this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
+            this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
           role: org.roles || [],
           userId: user.id,
           active: !user.isDeleted,
@@ -184,7 +184,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
         blockedUsersData.push({
           fullname: user ? `${user.firstName} ${user.lastName}` : null,
           email: user.personalDetails && user.personalDetails.primaryEmail ?
-          this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
+            this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
           role: user.roles,
           userId: user.id,
           active: !user.isDeleted,
@@ -242,6 +242,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       {
         type: TelemetryEvents.EnumInteractTypes.CLICK,
         subType: TelemetryEvents.EnumInteractSubTypes.CREATE_BTN,
+        id: 'create-user-btn',
       },
       {}
     )
diff --git a/project/ws/app/src/lib/routes/users/users.routing.module.ts b/project/ws/app/src/lib/routes/users/users.routing.module.ts
index 7bd98861c..7702f5909 100644
--- a/project/ws/app/src/lib/routes/users/users.routing.module.ts
+++ b/project/ws/app/src/lib/routes/users/users.routing.module.ts
@@ -28,7 +28,7 @@ const routes: Routes = [
     component: CreateUserComponent,
     data: {
       pageId: 'create-user',
-      module: 'user',
+      module: 'Home',
     },
     resolve: {
       // department: DepartmentResolve,

From 615a2163a6ea604c2d9cf35a7923b6e8f50b2b75 Mon Sep 17 00:00:00 2001
From: Saurav Verma <saurav.verma@tarento.com>
Date: Thu, 25 May 2023 14:58:49 +0530
Subject: [PATCH 098/887] First label removed to Full

---
 .../approvals/routes/basic-info/basic-info.component.html     | 2 +-
 .../users/routes/create-user/create-user.component.html       | 4 ++--
 .../routes/users/routes/view-user/view-user.component.html    | 2 +-
 src/app/routes/signup/signup.component.html                   | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.html b/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.html
index 3c8faa251..b98840eb2 100644
--- a/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.html
+++ b/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.html
@@ -16,7 +16,7 @@
                     (error)="changeToGlobalSymbol($event)" />
                 </mat-grid-tile>
                 <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                  <label class="appr-text-label">First name</label>
+                  <label class="appr-text-label">Full name</label>
                   <input type="text" [disabled]="true" [value]="basicInfo.firstname" class="appr-text-field">
                 </mat-grid-tile>
 
diff --git a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html
index 38fa36fb7..bb688e5f2 100644
--- a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html
+++ b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html
@@ -26,7 +26,7 @@
                   <label for="fname" class="margin-remove-bottom form-label required"
                     i18n="First Name label|Label which explains the user to enter first name" i18n-aria-label
                     aria-label="First name label">
-                    First name
+                    Full name
                   </label>
                   <mat-form-field appearance="outline" class="margin-top-xs">
                     <input id="fname" matInput #fname formControlName="fname" i18n-placeholder placeholder="Type here"
@@ -35,7 +35,7 @@
                     <mat-error [hidden]="false" i18n="First name Error|Explains name is required" i18n-aria-label
                       aria-label="First name Error|Explains name is required "
                       *ngIf="createUserForm?.controls['fname']?.touched && createUserForm?.controls['fname'].errors?.required">
-                      First name is mandatory
+                      Full name is mandatory
                     </mat-error>
                     <mat-error [hidden]="false" *ngIf="createUserForm?.controls['fname'].errors?.pattern"
                       i18n-aria-label
diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
index d01757e86..bab09ca75 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
@@ -36,7 +36,7 @@
                                 <img [src]="basicInfo.photo" alt="User Avatar" (error)="changeToDefaultImg($event)">
                               </mat-grid-tile>
                               <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                                <label class="appr-text-label">First name</label>
+                                <label class="appr-text-label">Full name</label>
                                 <input type="text" [disabled]="true" [value]="basicInfo.firstname"
                                   class="appr-text-field">
                               </mat-grid-tile>
diff --git a/src/app/routes/signup/signup.component.html b/src/app/routes/signup/signup.component.html
index b7dac63fb..691d08cd6 100644
--- a/src/app/routes/signup/signup.component.html
+++ b/src/app/routes/signup/signup.component.html
@@ -4,8 +4,8 @@ <h2 class="mat-title" i18n="section heading create new goal">
   </h2>
   <form class="example-form" [formGroup]="signupForm">
     <mat-form-field appearance="outline" class="w-full">
-      <mat-label>First Name</mat-label>
-      <input type="text" matInput placeholder="First name" formControlName="fname">
+      <mat-label>Full Name</mat-label>
+      <input type="text" matInput placeholder="Full name" formControlName="fname">
     </mat-form-field>
     <!-- <mat-form-field appearance="outline" class="w-full">
       <mat-label>Last Name</mat-label>

From 981243581e8287f302476109ef25bfb5624f0672 Mon Sep 17 00:00:00 2001
From: Saurav Verma <saurav.verma@tarento.com>
Date: Thu, 25 May 2023 15:02:56 +0530
Subject: [PATCH 099/887] firstname replaced to fullname

---
 Jenkinsfile-sun                               | 57 -------------------
 .../access/routes/users/users.component.ts    |  2 +-
 .../admintable/admintable.component.ts        |  4 +-
 3 files changed, 3 insertions(+), 60 deletions(-)
 delete mode 100644 Jenkinsfile-sun

diff --git a/Jenkinsfile-sun b/Jenkinsfile-sun
deleted file mode 100644
index b15a9e515..000000000
--- a/Jenkinsfile-sun
+++ /dev/null
@@ -1,57 +0,0 @@
-@Library('deploy-conf') _
-node('build-slave') {
-    try {
-        String ANSI_GREEN = "\u001B[32m"
-        String ANSI_NORMAL = "\u001B[0m"
-        String ANSI_BOLD = "\u001B[1m"
-        String ANSI_RED = "\u001B[31m"
-        String ANSI_YELLOW = "\u001B[33m"
-
-        ansiColor('xterm') {
-                stage('Checkout') {
-                    if (!env.hub_org) {
-                        println(ANSI_BOLD + ANSI_RED + "Uh Oh! Please set a Jenkins environment variable named hub_org with value as registery/sunbidrded" + ANSI_NORMAL)
-                        error 'Please resolve the errors and rerun..'
-                    } else
-                        println(ANSI_BOLD + ANSI_GREEN + "Found environment variable named hub_org with value as: " + hub_org + ANSI_NORMAL)
-                }
-                
-                cleanWs()
-                checkout scm
-                commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
-                build_tag = sh(script: "echo " + params.github_release_tag.split('/')[-1] + "_" + commit_hash + "_" + env.BUILD_NUMBER, returnStdout: true).trim()
-                echo "build_tag: " + build_tag
-		
-		stage('assets-pull') {
-
-                dir("${env.WORKSPACE}/assets") {
-                checkout scm: [$class: 'GitSCM', branches: [[name: assets_repo_branch]], extensions: [[$class: 'CloneOption', depth: 1, noTags: true, reference: '', shallow: true]], userRemoteConfigs: [[credentialsId: asset_repo_credentials, url: assets_repo_url]]]
-                sh('cd MDO/client-assets && docker build -t assetsmdo . && docker run --name assetsmdo assetsmdo && docker cp assetsmdo:/usr/src/app/dist.zip . && docker rm -f assetsmdo && docker rmi -f assetsmdo && unzip dist.zip')
-                }
-                }
-		
-		stage('Build') {
-                env.NODE_ENV = "build"
-                print "Environment will be : ${env.NODE_ENV}"
-                sh('chmod 777 build.sh')
-                sh("bash -x build.sh ${build_tag} ${env.NODE_NAME} ${hub_org}")
-            }
-		  
-	      
-               stage('ArchiveArtifacts') {
-	       	   sh ("echo ${build_tag} > build_tag.txt")
-                   archiveArtifacts "metadata.json"		     
-                    archiveArtifacts "build_tag.txt" 
-                    currentBuild.description = "${build_tag}"
-                }
-            
-        }
-    }
-    catch (err) {
-        currentBuild.result = "FAILURE"
-        throw err
-    }
-    finally {
-     //   email_notify()
-    }
-}
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
index 4a9056ba8..a950a4e62 100644
--- 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
@@ -24,7 +24,7 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
   private defaultSideNavBarOpenedSubscription: any
 
   constructor(private usersSvc: UsersService, private router: Router, private route: ActivatedRoute,
-    private profileUtilSvc: ProfileV2UtillService) { }
+              private profileUtilSvc: ProfileV2UtillService) { }
   ngOnInit() {
     const url = this.router.url.split('/')
     this.role = url[url.length - 2]
diff --git a/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.ts b/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.ts
index 8342b04a8..dc0ee868b 100644
--- a/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.ts
@@ -51,8 +51,8 @@ export class AdmintableComponent implements OnInit, OnChanges {
   }
 
   constructor(public dialog: MatDialog, private snackBar: MatSnackBar,
-    private mdoinfoSrvc: MdoInfoService, private router: Router,
-    private profileUtilSvc: ProfileV2UtillService) {
+              private mdoinfoSrvc: MdoInfoService, private router: Router,
+              private profileUtilSvc: ProfileV2UtillService) {
     this.dataSource = new MatTableDataSource<any>()
     this.dataSource.paginator = this.paginator
 

From 52975b64891e4ed43baaa12acb3663052fd8223a Mon Sep 17 00:00:00 2001
From: Saurav Verma <saurav.verma@tarento.com>
Date: Fri, 26 May 2023 13:51:47 +0530
Subject: [PATCH 100/887] Username changes for MDO portal

---
 .../access/routes/users/users.component.ts      |  5 ++++-
 .../participants/participants.component.html    |  4 +++-
 .../participants/participants.component.ts      |  2 ++
 .../components/success/success.component.ts     |  1 +
 .../create-event/create-event.component.html    |  1 +
 .../create-event/create-event.component.ts      |  3 ++-
 .../admintable/admintable.component.ts          |  5 +++--
 .../src/lib/routes/home/models/mdoinfo.model.ts |  2 ++
 .../routes/approvals/approvals.component.ts     |  3 ++-
 .../routes/users-view/users-view.component.ts   |  3 +++
 .../create-user/create-user.component.html      | 17 +++++++++++++++++
 .../routes/create-user/create-user.component.ts |  3 +++
 .../components/officer/officer.component.ts     |  2 ++
 .../publish-popup/publish-popup.component.ts    |  3 ++-
 .../user-autocomplete-card.component.html       |  2 ++
 .../create-workallocation.component.html        |  2 ++
 .../update-workallocation.component.html        |  1 +
 src/app/routes/signup/signup.component.ts       |  1 +
 18 files changed, 53 insertions(+), 7 deletions(-)

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
index a950a4e62..bcbf98df1 100644
--- 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
@@ -24,7 +24,7 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
   private defaultSideNavBarOpenedSubscription: any
 
   constructor(private usersSvc: UsersService, private router: Router, private route: ActivatedRoute,
-              private profileUtilSvc: ProfileV2UtillService) { }
+    private profileUtilSvc: ProfileV2UtillService) { }
   ngOnInit() {
     const url = this.router.url.split('/')
     this.role = url[url.length - 2]
@@ -61,6 +61,7 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
       this.data = res.users.map((user: any) => {
         return {
           fullName: `${user.first_name}`,
+          // fullName: `${user.first_name} ${user.last_name}`,
           email: this.profileUtilSvc.emailTransform(user.email),
           position: user.department_name,
           role: this.role,
@@ -95,6 +96,7 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
 
           return {
             fullName: `${user.firstName}`,
+            // fullName: `${user.first_name} ${user.last_name}`,
             email: this.profileUtilSvc.emailTransform(_.get(user, 'profileDetails.personalDetails.primaryEmail'))
               || this.profileUtilSvc.emailTransform(user.email),
             position: user.department_name,
@@ -189,6 +191,7 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
           user => {
             return {
               fullName: `${user.firstName}`,
+              // fullName: `${user.firstName} ${user.lastName}`,
               email: this.profileUtilSvc.emailTransform(_.get(user, 'profileDetails.personalDetails.primaryEmail'))
                 || this.profileUtilSvc.emailTransform(user.email),
               position: user.department_name,
diff --git a/project/ws/app/src/lib/routes/events/components/participants/participants.component.html b/project/ws/app/src/lib/routes/events/components/participants/participants.component.html
index df5c5b1a6..101e73281 100644
--- a/project/ws/app/src/lib/routes/events/components/participants/participants.component.html
+++ b/project/ws/app/src/lib/routes/events/components/participants/participants.component.html
@@ -11,7 +11,8 @@
             <mat-option *ngIf="isLoading" class="is-loading">Loading...</mat-option>
             <ng-container *ngIf="!isLoading">
                 <mat-option *ngFor="let user of participants" [value]="user.firstname">
-                    <span>{{user.firstname}} </span>
+                    <span>{{user.firstname}}</span>
+                    <!-- <span>{{user.firstname}} {{user.lastname}}</span> -->
                 </mat-option>
             </ng-container>
         </mat-autocomplete>
@@ -35,6 +36,7 @@
             <ng-container matColumnDef="fullname">
                 <th mat-header-cell *matHeaderCellDef> Full name </th>
                 <td mat-cell *matCellDef="let element"> {{element.firstName}} </td>
+                <!-- <td mat-cell *matCellDef="let element"> {{element.firstName}} {{element.lastName}} </td> -->
             </ng-container>
             <ng-container matColumnDef="email">
                 <th mat-header-cell *matHeaderCellDef> Email </th>
diff --git a/project/ws/app/src/lib/routes/events/components/participants/participants.component.ts b/project/ws/app/src/lib/routes/events/components/participants/participants.component.ts
index d2511621f..be03fb35b 100644
--- a/project/ws/app/src/lib/routes/events/components/participants/participants.component.ts
+++ b/project/ws/app/src/lib/routes/events/components/participants/participants.component.ts
@@ -12,6 +12,7 @@ import { ProfileV2UtillService } from '../../../home/services/home-utill.service
 
 export interface IParticipantElement {
     firstname: string,
+    // lastname: string,
     email: number
 }
 
@@ -108,6 +109,7 @@ export class ParticipantsComponent implements OnInit {
                         const participantObj = {
                             email,
                             firstname: obj.firstName,
+                            // lastname: obj.lastName,
                             id: obj.userId,
                         }
                         this.participants.push(participantObj)
diff --git a/project/ws/app/src/lib/routes/events/components/success/success.component.ts b/project/ws/app/src/lib/routes/events/components/success/success.component.ts
index e09560cc8..2a040342c 100644
--- a/project/ws/app/src/lib/routes/events/components/success/success.component.ts
+++ b/project/ws/app/src/lib/routes/events/components/success/success.component.ts
@@ -3,6 +3,7 @@ import { MatDialogRef } from '@angular/material/dialog'
 
 export interface IParticipantElement {
   firstname: string,
+  // lastname: string,
   email: number
 }
 
diff --git a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.html b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.html
index 9b5521fe3..91fe1c5a9 100644
--- a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.html
+++ b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.html
@@ -356,6 +356,7 @@
                                                         </tr>
                                                         <tr *ngFor="let row of participantsArr">
                                                             <td>{{ row.firstname }} </td>
+                                                            <!-- <td>{{ row.firstname }} {{ row.lastname }}</td> -->
                                                             <td>{{ row.email }}</td>
                                                             <td>{{ row.type }}</td>
                                                         </tr>
diff --git a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
index 14f5eb5c0..5ace5af09 100644
--- a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
+++ b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
@@ -249,7 +249,8 @@ export class CreateEventComponent implements OnInit {
       }
       const contactsObj = {
         id: obj.id,
-        name: `${obj.firstName || obj.firstname} `,
+        name: `${obj.firstName || obj.firstname}`,
+        // name: `${obj.firstName || obj.firstname} ${obj.lastName || obj.lastname}`,
       }
       this.presentersArr.push(contactsObj)
       this.participantsArr.push(setSelectedPresentersObj)
diff --git a/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.ts b/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.ts
index dc0ee868b..3875e322a 100644
--- a/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.ts
@@ -51,8 +51,8 @@ export class AdmintableComponent implements OnInit, OnChanges {
   }
 
   constructor(public dialog: MatDialog, private snackBar: MatSnackBar,
-              private mdoinfoSrvc: MdoInfoService, private router: Router,
-              private profileUtilSvc: ProfileV2UtillService) {
+    private mdoinfoSrvc: MdoInfoService, private router: Router,
+    private profileUtilSvc: ProfileV2UtillService) {
     this.dataSource = new MatTableDataSource<any>()
     this.dataSource.paginator = this.paginator
 
@@ -142,6 +142,7 @@ export class AdmintableComponent implements OnInit, OnChanges {
               const obj = {
                 srnumber: index + 1,
                 fullname: `${user.firstName}`,
+                // fullname: `${user.firstName} ${user.lastName}`,
                 email: this.profileUtilSvc.emailTransform(user.email),
                 position: pos,
                 id: user.id,
diff --git a/project/ws/app/src/lib/routes/home/models/mdoinfo.model.ts b/project/ws/app/src/lib/routes/home/models/mdoinfo.model.ts
index 1637b181a..07afc6f9d 100644
--- a/project/ws/app/src/lib/routes/home/models/mdoinfo.model.ts
+++ b/project/ws/app/src/lib/routes/home/models/mdoinfo.model.ts
@@ -70,6 +70,7 @@ export namespace MDOinfo {
         rank: number,
         wid: string,
         firstName: string,
+        // lastName: string,
         channel: string,
     }
 
@@ -94,6 +95,7 @@ export namespace MDOinfo {
         requestRecieved?: boolean,
         connectionEstablished?: boolean,
         firstName: string,
+        //   lastName: string,
         channel: string,
     }
 
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
index 466a03378..d54c9df5e 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
@@ -146,7 +146,8 @@ export class ApprovalsComponent implements OnInit, OnDestroy {
           })
 
           this.data.push({
-            fullname: approval.userInfo ? `${approval.userInfo.first_name} ${approval.userInfo.last_name}` : '--',
+            fullname: approval.userInfo ? `${approval.userInfo.first_name}` : '--',
+            // fullname: approval.userInfo ? `${approval.userInfo.first_name} ${approval.userInfo.last_name}` : '--',
             requestedon: `${currentdate.getDate()}
           ${moment(currentdate.getMonth() + 1, 'MM').format('MMM')}
           ${currentdate.getFullYear()}
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 89caef22f..25ddf047c 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -139,6 +139,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
         const org = { roles: _.get(_.first(_.filter(user.organisations, { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') }
         activeUsersData.push({
           fullname: user ? `${user.firstName}` : null,
+          // fullname: user ? `${user.firstName} ${user.lastName}` : null,
           email: user.personalDetails && user.personalDetails.primaryEmail ?
             this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
           role: org.roles || [],
@@ -162,6 +163,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
         const org = { roles: _.get(_.first(_.filter(user.organisations, { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') || [] }
         inactiveUsersData.push({
           fullname: user ? `${user.firstName} ` : null,
+          // fullname: user ? `${user.firstName} ${user.lastName}` : null,
           email: user.personalDetails && user.personalDetails.primaryEmail ?
             this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
           role: org.roles || [],
@@ -183,6 +185,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       _.filter(this.usersData.content, { isDeleted: false }).forEach((user: any) => {
         blockedUsersData.push({
           fullname: user ? `${user.firstName}` : null,
+          // fullname: user ? `${user.firstName} ${user.lastName}` : null,
           email: user.personalDetails && user.personalDetails.primaryEmail ?
             this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
           role: user.roles,
diff --git a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html
index bb688e5f2..fb6e99884 100644
--- a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html
+++ b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html
@@ -44,6 +44,23 @@
                     </mat-error>
                   </mat-form-field>
 
+                  <!-- <label for="lname" class="margin-remove-bottom margin-top-xs form-label required"
+                    i18n="Last name label|Label which explains the user to enter last name" i18n-aria-label aria-label="Last name label">
+                    Last name
+                  </label>
+                  <mat-form-field appearance="outline" class="margin-top-xs">
+                    <input id="lname" matInput #lname formControlName="lname" i18n-placeholder placeholder="Type here" i18n-aria-label
+                      aria-label="Last name input" class="form-input" autocomplete="off" maxlength="150" />
+                    <mat-error [hidden]="false" i18n="Last name Error|Explains name is required" i18n-aria-label
+                      aria-label="Last name Error|Explains name is required "
+                      *ngIf="createUserForm?.controls['lname']?.touched && createUserForm?.controls['lname'].errors?.required">
+                      Last name is mandatory
+                    </mat-error>
+                    <mat-error [hidden]="false" *ngIf="createUserForm?.controls['lname'].errors?.pattern" i18n-aria-label
+                      aria-label="Last name Error|Name fields cannot contain numbers and special characters except ">
+                      Last name fields cannot contain numbers and special characters except '
+                    </mat-error>
+                  </mat-form-field> -->
 
                   <label for="email" class="margin-remove-bottom margin-top-xs form-label required"
                     i18n="Email label|Label which explains the user to enter email" i18n-aria-label
diff --git a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
index 0103cecd5..1fe48a9b6 100644
--- a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
@@ -145,6 +145,7 @@ export class CreateUserComponent implements OnInit, OnDestroy {
     })
     this.createUserForm = new FormGroup({
       fname: new FormControl('', [Validators.required]),
+      // lname: new FormControl('', [Validators.required]),
       email: new FormControl('', [Validators.required, Validators.email]),
       department: new FormControl(''),
       roles: new FormControl('', [Validators.required]),
@@ -180,6 +181,7 @@ export class CreateUserComponent implements OnInit, OnDestroy {
         email: form.value.email,
         userName: form.value.fname,
         firstName: form.value.fname,
+        // lastName: form.value.lname,
         channel: this.departmentName ? this.departmentName : null,
       },
     }
@@ -198,6 +200,7 @@ export class CreateUserComponent implements OnInit, OnDestroy {
         this.usersSvc.addUserToDepartment(dreq).subscribe(dres => {
           if (dres) {
             this.createUserForm.reset({ fname: '', email: '', department: this.departmentName, roles: '' })
+            // this.createUserForm.reset({ fname: '', lname: '', email: '', department: this.departmentName, roles: '' })
             this.openSnackbar('User Created Successfully')
             this.disableCreateButton = false
             if (this.qpParam === 'MDOinfo') {
diff --git a/project/ws/app/src/lib/routes/workallocation-v2/components/officer/officer.component.ts b/project/ws/app/src/lib/routes/workallocation-v2/components/officer/officer.component.ts
index cac79ca00..ae1af2d8d 100644
--- a/project/ws/app/src/lib/routes/workallocation-v2/components/officer/officer.component.ts
+++ b/project/ws/app/src/lib/routes/workallocation-v2/components/officer/officer.component.ts
@@ -145,6 +145,8 @@ export class OfficerComponent implements OnInit, OnDestroy {
       // const fullName = _.get(event, 'option.value.userDetails.first_name') + ' ' + _.get(event, 'option.value.userDetails.last_name')
       // tslint:disable-next-line: prefer-template
       const fullName = _.get(event, 'option.value.firstName')
+      // const fullName = _.get(event, 'option.value.firstName') + ' ' + _.get(event, 'option.value.lastName')
+      // const fullName = _.get(event, 'option.value.firstName') + ' ' + _.get(event, 'option.value.lastName')
       frmctr1.patchValue(fullName || '')
       this.watStore.setOfficerGroup(this.officerForm.value, false, true)
     }
diff --git a/project/ws/app/src/lib/routes/workallocation-v2/components/publish-popup/publish-popup.component.ts b/project/ws/app/src/lib/routes/workallocation-v2/components/publish-popup/publish-popup.component.ts
index ee4a69098..b7e3b4d0a 100644
--- a/project/ws/app/src/lib/routes/workallocation-v2/components/publish-popup/publish-popup.component.ts
+++ b/project/ws/app/src/lib/routes/workallocation-v2/components/publish-popup/publish-popup.component.ts
@@ -55,7 +55,8 @@ export class PublishPopupComponent implements OnInit {
   }
 
   closeDialog() {
-    const username = `${this.userData.firstName} `
+    const username = `${this.userData.firstName}`
+    // const username = `${this.userData.firstName} ${this.userData.lastName}`
     const org = []
     const createdforarray: any[] = []
     if (this.configSvc.userProfile) {
diff --git a/project/ws/app/src/lib/routes/workallocation-v2/components/user-autocomplete-card/user-autocomplete-card.component.html b/project/ws/app/src/lib/routes/workallocation-v2/components/user-autocomplete-card/user-autocomplete-card.component.html
index ea0047664..753876d9e 100644
--- a/project/ws/app/src/lib/routes/workallocation-v2/components/user-autocomplete-card/user-autocomplete-card.component.html
+++ b/project/ws/app/src/lib/routes/workallocation-v2/components/user-autocomplete-card/user-autocomplete-card.component.html
@@ -1,10 +1,12 @@
 <div class="ws-mat-accent-border-bottom padding-m padding-left-s padding-bottom-xs" (click)="userClickHandler(user)">
   <div class="flex flex-start ">
     <span class="letter-color1">{{user?.firstName.charAt(0)}}</span>
+    <!-- <span class="letter-color1">{{user?.firstName.charAt(0)}}{{user?.lastName.charAt(0)}}</span> -->
     <mat-icon class="groupicon ws-mat-accent-text ws-mat-accent-border">group</mat-icon>
   </div>
   <div class="margin-top-s">
     <p class="username mat-body-2 font-bold-i margin-bottom-xxs">{{user.firstName}}
+      <!-- {{user?.lastName ? user?.lastName : ''}}</p> -->
     </p>
     <p class="useremail mat-body-2 margin-bottom-xxs">{{user?.profileDetails?.personalDetails.primaryEmail ||
       user.email}}</p>
diff --git a/project/ws/app/src/lib/routes/workallocation/routes/create-workallocation/create-workallocation.component.html b/project/ws/app/src/lib/routes/workallocation/routes/create-workallocation/create-workallocation.component.html
index 3c3f2c07a..22935e249 100644
--- a/project/ws/app/src/lib/routes/workallocation/routes/create-workallocation/create-workallocation.component.html
+++ b/project/ws/app/src/lib/routes/workallocation/routes/create-workallocation/create-workallocation.component.html
@@ -56,6 +56,8 @@
                                                                 </p>
                                                                 <p class="username">
                                                                     {{selectedUser.userDetails.first_name}}
+                                                                    <!-- {{selectedUser.userDetails.last_name ?
+                                                                    selectedUser.userDetails.last_name : '' }} -->
                                                                 </p>
                                                                 <p class="userpos">{{selectedUser.userDetails.position}}
                                                                     at {{selectedUser.userDetails.department_name}}</p>
diff --git a/project/ws/app/src/lib/routes/workallocation/routes/update-workallocation/update-workallocation.component.html b/project/ws/app/src/lib/routes/workallocation/routes/update-workallocation/update-workallocation.component.html
index bc97a4401..74af9b082 100644
--- a/project/ws/app/src/lib/routes/workallocation/routes/update-workallocation/update-workallocation.component.html
+++ b/project/ws/app/src/lib/routes/workallocation/routes/update-workallocation/update-workallocation.component.html
@@ -56,6 +56,7 @@
                                                                 <p class="letter-color"
                                                                     *ngIf="selectedUser.userDetails">
                                                                     {{selectedUser.userDetails.first_name.charAt(0)}}
+                                                                    <!-- {{selectedUser.userDetails.first_name.charAt(0)}}{{selectedUser.userDetails.last_name.charAt(0)}} -->
                                                                 </p>
                                                                 <p class="letter-color"
                                                                     *ngIf="!selectedUser.userDetails">
diff --git a/src/app/routes/signup/signup.component.ts b/src/app/routes/signup/signup.component.ts
index 56420ac57..fe9d3d9cd 100644
--- a/src/app/routes/signup/signup.component.ts
+++ b/src/app/routes/signup/signup.component.ts
@@ -23,6 +23,7 @@ export class SignupComponent implements OnInit, OnDestroy {
   ) {
     this.signupForm = new FormGroup({
       fname: new FormControl('', [Validators.required]),
+      // lname: new FormControl('', [Validators.required]),
       // mobile: new FormControl('', [Validators.required, Validators.minLength(10)]),
       email: new FormControl('', [Validators.required, Validators.email]),
       code: new FormControl('', [Validators.required]),

From 7faa71064f029a4813aeb141d738e4af9f8067bb Mon Sep 17 00:00:00 2001
From: Saurav Verma <saurav.verma@tarento.com>
Date: Fri, 26 May 2023 14:15:58 +0530
Subject: [PATCH 101/887] MDO portal

---
 Jenkinsfile-sun | 57 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 Jenkinsfile-sun

diff --git a/Jenkinsfile-sun b/Jenkinsfile-sun
new file mode 100644
index 000000000..4720da642
--- /dev/null
+++ b/Jenkinsfile-sun
@@ -0,0 +1,57 @@
+@Library('deploy-conf') _
+node('build-slave') {
+    try {
+        String ANSI_GREEN = "\u001B[32m"
+        String ANSI_NORMAL = "\u001B[0m"
+        String ANSI_BOLD = "\u001B[1m"
+        String ANSI_RED = "\u001B[31m"
+        String ANSI_YELLOW = "\u001B[33m"
+
+        ansiColor('xterm') {
+                stage('Checkout') {
+                    if (!env.hub_org) {
+                        println(ANSI_BOLD + ANSI_RED + "Uh Oh! Please set a Jenkins environment variable named hub_org with value as registery/sunbidrded" + ANSI_NORMAL)
+                        error 'Please resolve the errors and rerun..'
+                    } else
+                        println(ANSI_BOLD + ANSI_GREEN + "Found environment variable named hub_org with value as: " + hub_org + ANSI_NORMAL)
+                }
+
+                cleanWs()
+                checkout scm
+                commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim()
+                build_tag = sh(script: "echo " + params.github_release_tag.split('/')[-1] + "_" + commit_hash + "_" + env.BUILD_NUMBER, returnStdout: true).trim()
+                echo "build_tag: " + build_tag
+
+		stage('assets-pull') {
+
+                dir("${env.WORKSPACE}/assets") {
+                checkout scm: [$class: 'GitSCM', branches: [[name: assets_repo_branch]], extensions: [[$class: 'CloneOption', depth: 1, noTags: true, reference: '', shallow: true]], userRemoteConfigs: [[credentialsId: asset_repo_credentials, url: assets_repo_url]]]
+                sh('cd MDO/client-assets && docker build -t assetsmdo . && docker run --name assetsmdo assetsmdo && docker cp assetsmdo:/usr/src/app/dist.zip . && docker rm -f assetsmdo && docker rmi -f assetsmdo && unzip dist.zip')
+                }
+                }
+
+		stage('Build') {
+                env.NODE_ENV = "build"
+                print "Environment will be : ${env.NODE_ENV}"
+                sh('chmod 777 build.sh')
+                sh("bash -x build.sh ${build_tag} ${env.NODE_NAME} ${hub_org}")
+            }
+
+
+               stage('ArchiveArtifacts') {
+	       	   sh ("echo ${build_tag} > build_tag.txt")
+                   archiveArtifacts "metadata.json"
+                    archiveArtifacts "build_tag.txt"
+                    currentBuild.description = "${build_tag}"
+                }
+
+        }
+    }
+    catch (err) {
+        currentBuild.result = "FAILURE"
+        throw err
+    }
+    finally {
+        // email_notify()
+    }
+}
\ No newline at end of file

From 1127b4eb13d907fd82d9122e4d8a5c122972165d Mon Sep 17 00:00:00 2001
From: Saurav Verma <saurav.verma@tarento.com>
Date: Fri, 26 May 2023 14:47:15 +0530
Subject: [PATCH 102/887] MDO portal

---
 package.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 14474918c..3c9a9c908 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "@project-sunbird/telemetry-sdk": "0.0.26",
     "@sunbird-cb/collection": "^1.0.22",
     "@sunbird-cb/design-system": "0.0.1",
-    "@sunbird-cb/rain-dashboards": "^0.4.14",
+    "@sunbird-cb/rain-dashboards": "^0.4.11",
     "@sunbird-cb/resolver": "^1.0.0",
     "@sunbird-cb/utils": "^1.0.12",
     "@types/file-saver": "^2.0.1",
@@ -134,7 +134,6 @@
     "tslint-config-airbnb": "^5.11.1",
     "typescript": "~3.5.3",
     "typescript-tslint-plugin": "^0.5.4",
-    "d3-funnel": "^2.1.1",
     "webpack-bundle-analyzer": "^4.4.0"
   }
-}
+}
\ No newline at end of file

From e4bcee5edc1d703a39133b1f1c233bb38f3a1232 Mon Sep 17 00:00:00 2001
From: Saurav Verma <saurav.verma@tarento.com>
Date: Fri, 26 May 2023 17:24:21 +0530
Subject: [PATCH 103/887] MDO portal

---
 package.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 3c9a9c908..14474918c 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "@project-sunbird/telemetry-sdk": "0.0.26",
     "@sunbird-cb/collection": "^1.0.22",
     "@sunbird-cb/design-system": "0.0.1",
-    "@sunbird-cb/rain-dashboards": "^0.4.11",
+    "@sunbird-cb/rain-dashboards": "^0.4.14",
     "@sunbird-cb/resolver": "^1.0.0",
     "@sunbird-cb/utils": "^1.0.12",
     "@types/file-saver": "^2.0.1",
@@ -134,6 +134,7 @@
     "tslint-config-airbnb": "^5.11.1",
     "typescript": "~3.5.3",
     "typescript-tslint-plugin": "^0.5.4",
+    "d3-funnel": "^2.1.1",
     "webpack-bundle-analyzer": "^4.4.0"
   }
-}
\ No newline at end of file
+}

From f58c57983fc47ae48df2b7171b59f9d4381c1c4c Mon Sep 17 00:00:00 2001
From: Saurav Verma <saurav.verma@tarento.com>
Date: Fri, 26 May 2023 17:37:21 +0530
Subject: [PATCH 104/887] sunbird collection library published to 1.0.24

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 14474918c..9f391a353 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@angular/router": "~8.2.1",
     "@angular/service-worker": "~8.2.1",
     "@project-sunbird/telemetry-sdk": "0.0.26",
-    "@sunbird-cb/collection": "^1.0.22",
+    "@sunbird-cb/collection": "^1.0.24",
     "@sunbird-cb/design-system": "0.0.1",
     "@sunbird-cb/rain-dashboards": "^0.4.14",
     "@sunbird-cb/resolver": "^1.0.0",

From 7494d785420bdf0ff08c3b4cf6ffa1134033d4ae Mon Sep 17 00:00:00 2001
From: Saurav Verma <saurav.verma@tarento.com>
Date: Thu, 8 Jun 2023 19:39:56 +0530
Subject: [PATCH 105/887] Last name removed for username change approval
 section

---
 .../approvals/routes/basic-info/basic-info.component.html     | 4 ++--
 .../routes/events/routes/view-event/view-event.component.html | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.html b/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.html
index b98840eb2..eb03b666a 100644
--- a/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.html
+++ b/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.html
@@ -25,10 +25,10 @@
                               <input type="text" [disabled]="true" [value]="basicInfo.middlename" class="appr-text-field">
                             </mat-grid-tile> -->
 
-                <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                <!-- <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                   <label class="appr-text-label">Last name</label>
                   <input type="text" [disabled]="true" [value]="basicInfo.surname" class="appr-text-field">
-                </mat-grid-tile>
+                </mat-grid-tile> -->
 
                 <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                   <label class="appr-text-label">Date of birth (dd-mm-yyyy)</label>
diff --git a/project/ws/app/src/lib/routes/events/routes/view-event/view-event.component.html b/project/ws/app/src/lib/routes/events/routes/view-event/view-event.component.html
index 3720c66a9..70162f0a2 100644
--- a/project/ws/app/src/lib/routes/events/routes/view-event/view-event.component.html
+++ b/project/ws/app/src/lib/routes/events/routes/view-event/view-event.component.html
@@ -43,11 +43,11 @@
                               <input type="text" [disabled]="true" [value]="basicInfo.middlename" class="appr-text-field">
                             </mat-grid-tile> -->
 
-                              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                              <!-- <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                                 <label class="appr-text-label">Last name</label>
                                 <input type="text" [disabled]="true" [value]="basicInfo.surname"
                                   class="appr-text-field">
-                              </mat-grid-tile>
+                              </mat-grid-tile> -->
 
                               <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                                 <label class="appr-text-label">Date of birth (dd-mm-yy)</label>

From c3cce92f09bd70de1bb62ba682d03478d41d1208 Mon Sep 17 00:00:00 2001
From: Saurav Verma <saurav.verma@tarento.com>
Date: Thu, 8 Jun 2023 19:41:35 +0530
Subject: [PATCH 106/887] Last name removed for username change approval
 section

---
 .../app/src/lib/routes/access/routes/users/users.component.ts | 2 +-
 .../routes/events/routes/view-event/view-event.component.html | 2 +-
 .../routes/home/components/admintable/admintable.component.ts | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

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
index bcbf98df1..03fd27593 100644
--- 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
@@ -24,7 +24,7 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
   private defaultSideNavBarOpenedSubscription: any
 
   constructor(private usersSvc: UsersService, private router: Router, private route: ActivatedRoute,
-    private profileUtilSvc: ProfileV2UtillService) { }
+              private profileUtilSvc: ProfileV2UtillService) { }
   ngOnInit() {
     const url = this.router.url.split('/')
     this.role = url[url.length - 2]
diff --git a/project/ws/app/src/lib/routes/events/routes/view-event/view-event.component.html b/project/ws/app/src/lib/routes/events/routes/view-event/view-event.component.html
index 70162f0a2..9ffe433bb 100644
--- a/project/ws/app/src/lib/routes/events/routes/view-event/view-event.component.html
+++ b/project/ws/app/src/lib/routes/events/routes/view-event/view-event.component.html
@@ -33,7 +33,7 @@
                                 <img [src]="basicInfo.photo" alt="User Avatar" (error)="changeToDefaultImg($event)">
                               </mat-grid-tile>
                               <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                                <label class="appr-text-label">First name</label>
+                                <label class="appr-text-label">Full name</label>
                                 <input type="text" [disabled]="true" [value]="basicInfo.firstname"
                                   class="appr-text-field">
                               </mat-grid-tile>
diff --git a/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.ts b/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.ts
index 3875e322a..1a7fe0cfa 100644
--- a/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.ts
@@ -51,8 +51,8 @@ export class AdmintableComponent implements OnInit, OnChanges {
   }
 
   constructor(public dialog: MatDialog, private snackBar: MatSnackBar,
-    private mdoinfoSrvc: MdoInfoService, private router: Router,
-    private profileUtilSvc: ProfileV2UtillService) {
+              private mdoinfoSrvc: MdoInfoService, private router: Router,
+              private profileUtilSvc: ProfileV2UtillService) {
     this.dataSource = new MatTableDataSource<any>()
     this.dataSource.paginator = this.paginator
 

From 393aa3448dc8cf6a54c1bcab829863a259d9ce36 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Fri, 9 Jun 2023 11:44:07 +0530
Subject: [PATCH 107/887] update sunbird-cb/utils to 1.0.13

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 14474918c..eb10fbb13 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "@sunbird-cb/design-system": "0.0.1",
     "@sunbird-cb/rain-dashboards": "^0.4.14",
     "@sunbird-cb/resolver": "^1.0.0",
-    "@sunbird-cb/utils": "^1.0.12",
+    "@sunbird-cb/utils": "^1.0.13",
     "@types/file-saver": "^2.0.1",
     "brace": "^0.11.1",
     "chart.js": "^2.8.0",

From 74fe3e88f14d165bd99cf8c93651e793e0deadcf Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Tue, 13 Jun 2023 10:23:57 +0530
Subject: [PATCH 108/887] Added blended program components & routing

---
 .../blended-approvals-routing.module.ts       | 48 +++++++++++
 .../blended-approvals.module.ts               | 28 +++++++
 .../batch-details.component.html              |  9 ++
 .../batch-details.component.scss              |  0
 .../batch-details.component.spec.ts           | 25 ++++++
 .../batch-details/batch-details.component.ts  | 15 ++++
 .../batch-list/batch-list.component.html      | 13 +++
 .../batch-list/batch-list.component.scss      |  0
 .../batch-list/batch-list.component.spec.ts   | 25 ++++++
 .../batch-list/batch-list.component.ts        | 20 +++++
 .../blended-home/blended-home.component.html  | 22 +++++
 .../blended-home/blended-home.component.scss  | 82 +++++++++++++++++++
 .../blended-home.component.spec.ts            | 25 ++++++
 .../blended-home/blended-home.component.ts    | 57 +++++++++++++
 .../ws/app/src/lib/routes/home/home.module.ts |  2 +
 .../lib/routes/home/home.rounting.module.ts   |  9 ++
 .../blended-approvals.component.html          | 12 +++
 .../blended-approvals.component.scss          |  0
 .../blended-approvals.component.ts            | 20 +++++
 project/ws/app/src/public-api.ts              |  1 +
 src/app/app-routing.module.ts                 | 12 +++
 .../routes/route-blended-approvals.module.ts  | 15 ++++
 22 files changed, 440 insertions(+)
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals-routing.module.ts
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.html
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.scss
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.ts
 create mode 100644 project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.html
 create mode 100644 project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.scss
 create mode 100644 project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
 create mode 100644 src/app/routes/route-blended-approvals.module.ts

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals-routing.module.ts b/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals-routing.module.ts
new file mode 100644
index 000000000..952e69d7b
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals-routing.module.ts
@@ -0,0 +1,48 @@
+import { NgModule } from '@angular/core'
+import { Routes, RouterModule } from '@angular/router'
+import { ConfigResolveService } from '../home/resolvers/config-resolve.service'
+import { BatchDetailsComponent } from './components/batch-details/batch-details.component'
+import { BatchListComponent } from './components/batch-list/batch-list.component'
+import { BlendedHomeComponent } from './components/blended-home/blended-home.component'
+
+const routes: Routes = [
+  {
+    path: '',
+    pathMatch: 'full',
+    redirectTo: 'list',
+  },
+  {
+    path: '',
+    component: BlendedHomeComponent,
+    resolve: {
+      configService: ConfigResolveService,
+    },
+    children: [
+      {
+        path: ':id/batches',
+        component: BatchListComponent,
+        data: {
+          pageId: ':id',
+          module: 'blended-approvals',
+        },
+      },
+      {
+        path: ':id/batches/:batchid',
+        component: BatchDetailsComponent,
+        data: {
+          pageId: ':id',
+          module: 'blended-approvals',
+        },
+      },
+    ],
+  },
+]
+@NgModule({
+  declarations: [],
+  imports: [
+    RouterModule.forChild(routes),
+  ],
+  exports: [RouterModule],
+  providers: [],
+})
+export class BlendedApprovalsRoutingModule { }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts b/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
new file mode 100644
index 000000000..51bebb68a
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
@@ -0,0 +1,28 @@
+import { NgModule } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import {
+  BreadcrumbsOrgModule,
+  LeftMenuWithoutLogoModule,
+  UIORGTableModule,
+} from '@sunbird-cb/collection'
+import { WidgetResolverModule } from '@sunbird-cb/resolver'
+import { HomeModule } from '../home/home.module'
+import { RouterModule } from '@angular/router'
+import {
+  MatSidenavModule,
+  MatIconModule,
+} from '@angular/material'
+import { MatCardModule } from '@angular/material/card'
+import { BatchDetailsComponent } from './components/batch-details/batch-details.component'
+import { BatchListComponent } from './components/batch-list/batch-list.component'
+import { BlendedHomeComponent } from './components/blended-home/blended-home.component'
+import { BlendedApprovalsRoutingModule } from './blended-approvals-routing.module'
+
+@NgModule({
+  declarations: [BlendedHomeComponent, BatchListComponent, BatchDetailsComponent],
+  imports: [CommonModule, BlendedApprovalsRoutingModule, BreadcrumbsOrgModule, LeftMenuWithoutLogoModule, WidgetResolverModule,
+    MatSidenavModule, MatIconModule, HomeModule, RouterModule, UIORGTableModule, MatCardModule],
+  exports: [],
+  providers: [],
+})
+export class BlendedApprovalsModule { }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
new file mode 100644
index 000000000..4a38ad430
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
@@ -0,0 +1,9 @@
+<div class="flex flex-4 flex-column">
+  <mat-card class="flex-custom ws-mat-accent-border">
+    <mat-card-content>
+      <ng-container>
+        Batch details page
+      </ng-container>
+    </mat-card-content>
+  </mat-card>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.spec.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.spec.ts
new file mode 100644
index 000000000..b115f0643
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
+
+import { BatchDetailsComponent } from './batch-details.component'
+
+describe('BatchDetailsComponent', () => {
+  let component: BatchDetailsComponent
+  let fixture: ComponentFixture<BatchDetailsComponent>
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [BatchDetailsComponent],
+    })
+      .compileComponents()
+  }))
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(BatchDetailsComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
+
+  it('should create', () => {
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
new file mode 100644
index 000000000..1be646b57
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core'
+
+@Component({
+  selector: 'ws-app-batch-details',
+  templateUrl: './batch-details.component.html',
+  styleUrls: ['./batch-details.component.scss'],
+})
+export class BatchDetailsComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
new file mode 100644
index 000000000..3e4887ee3
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
@@ -0,0 +1,13 @@
+<div class="flex flex-4 flex-column">
+  <mat-card class="flex-custom ws-mat-accent-border">
+    <mat-card-content>
+      <ng-container>
+        Batch list
+
+        <br>
+        <a (click)="viewDetails(1)">Batch 1</a><br>
+        <a (click)="viewDetails(2)">Batch 2</a>
+      </ng-container>
+    </mat-card-content>
+  </mat-card>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.spec.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.spec.ts
new file mode 100644
index 000000000..4d9d188e3
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
+
+import { BatchListComponent } from './batch-list.component'
+
+describe('BatchListComponent', () => {
+  let component: BatchListComponent
+  let fixture: ComponentFixture<BatchListComponent>
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [BatchListComponent],
+    })
+      .compileComponents()
+  }))
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(BatchListComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
+
+  it('should create', () => {
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
new file mode 100644
index 000000000..7e84f57ed
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
@@ -0,0 +1,20 @@
+import { Component, OnInit } from '@angular/core'
+import { Router } from '@angular/router'
+
+@Component({
+  selector: 'ws-app-batch-list',
+  templateUrl: './batch-list.component.html',
+  styleUrls: ['./batch-list.component.scss'],
+})
+export class BatchListComponent implements OnInit {
+
+  constructor(private router: Router) { }
+
+  ngOnInit() {
+  }
+
+  viewDetails() {
+    this.router.navigate(['/app/blended-approvals/1/batches/1'])
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.html
new file mode 100644
index 000000000..2834e5704
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.html
@@ -0,0 +1,22 @@
+<!-- <mat-sidenav-container class="nav-container" autosize name="discuss-menu">
+  <mat-sidenav [mode]="mode$ | async" [(opened)]="sideNavBarOpened" class="left-nav">
+    <div class="contain">
+      <ng-container [wsResolverWidget]="widgetData"></ng-container>
+    </div>
+  </mat-sidenav>
+  <mat-sidenav-content>
+    <div *ngIf="screenSizeIsLtMedium">
+      <button type="button" mat-icon-button (click)="sideNavBarOpened = !sideNavBarOpened"
+        id="ws-auth-root-home-btn-menu" name="ws-auth-root-home-btn-menu">
+        <mat-icon>menu</mat-icon>
+      </button>
+    </div>
+    <div class="container-balanced"> -->
+<!-- <ws-widget-breadcrumbs-org
+        [widgetData]="{titles:[{title:'Blended programs', url:'/app/home/blended-approvals'},{title:role,url:'none'}] }">
+      </ws-widget-breadcrumbs-org> -->
+
+<router-outlet></router-outlet>
+<!-- </div>
+  </mat-sidenav-content>
+</mat-sidenav-container> -->
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.scss
new file mode 100644
index 000000000..5d507085c
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.scss
@@ -0,0 +1,82 @@
+@import 'ws-common';
+@import 'ws-vars';
+@import 'ws-mixins';
+
+.container-balanced {
+  @extend %page-center;
+  height: auto;
+  min-height: 75vh;
+  padding: 0;
+  box-sizing: border-box;
+  width: 100%!important;
+  margin-left: auto!important;
+  margin-right: auto!important;
+}
+
+.container2 {
+  position: relative;
+}
+
+.container-balanced-inner {
+  padding: 24px!important;
+  box-sizing: border-box
+}
+.container-balanced-banner {
+  @extend %page-center;
+  height: auto;
+}
+
+.left-nav {
+  min-width: 240px;
+  overflow: hidden !important;
+  box-sizing: border-box;
+  height: 85vh;
+  background: rgb(240, 243, 244);
+  box-shadow: none;
+  visibility: hidden;
+
+  @include breakpoint-xs {
+    min-width: 100%;
+    max-width: none;
+  }
+}
+
+.flex-3 {
+  flex: 3;
+}
+
+.flex-5 {
+  flex: 5;
+}
+
+.flex-update {
+  flex-direction: row;
+
+  @include breakpoint-xs {
+    flex-direction: column;
+  }
+
+  @include breakpoint-s {
+    flex-direction: column;
+  }
+}
+
+::ng-deep .mat-drawer-content {
+  overflow-x: hidden!important;
+  overflow-y: hidden!important;
+}
+
+::ng-deep .mat-drawer-inner-container {
+  overflow: hidden;
+}
+::ng-deep.mat-drawer-backdrop.mat-drawer-shown {
+  visibility: hidden !important;
+}
+::ng-deep.mat-progress-spinner {
+    display: block;
+    position: fixed!important;
+    top: 0;
+    margin-top: 30%;
+    left: 0;
+    margin-left: 45%;
+}
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.spec.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.spec.ts
new file mode 100644
index 000000000..756d380de
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
+
+import { BlendedHomeComponent } from './blended-home.component'
+
+describe('BlendedHomeComponent', () => {
+  let component: BlendedHomeComponent
+  let fixture: ComponentFixture<BlendedHomeComponent>
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [BlendedHomeComponent],
+    })
+      .compileComponents()
+  }))
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(BlendedHomeComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
+
+  it('should create', () => {
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.ts
new file mode 100644
index 000000000..cb8f5e9ba
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.ts
@@ -0,0 +1,57 @@
+import { Component, OnInit } from '@angular/core'
+import { Router, Event, NavigationEnd, ActivatedRoute } from '@angular/router'
+import { ILeftMenuWithoutLogo } from '@sunbird-cb/collection'
+import { NsWidgetResolver } from '@sunbird-cb/resolver'
+/* tslint:disable */
+import * as _ from 'lodash'
+/* tslint:enable */
+
+@Component({
+  selector: 'ws-app-blended-home',
+  templateUrl: './blended-home.component.html',
+  styleUrls: ['./blended-home.component.scss'],
+})
+export class BlendedHomeComponent implements OnInit {
+  currentRoute = 'blended-approvals'
+  myRoles!: Set<string>
+  widgetData!: NsWidgetResolver.IWidgetData<ILeftMenuWithoutLogo>
+  // isLtMedium$ = this.valueSvc.isLtMedium$
+  // mode$ = this.isLtMedium$.pipe(map(isMedium => (isMedium ? 'over' : 'side')))
+  private defaultSideNavBarOpenedSubscription: any
+  public screenSizeIsLtMedium = false
+  sideNavBarOpened = true
+  role: any
+
+  constructor(private router: Router, private activeRoute: ActivatedRoute) {
+    this.router.events.subscribe((event: Event) => {
+      if (event instanceof NavigationEnd) {
+        this.bindUrl(event.urlAfterRedirects.replace('/app/blended-approvals/', ''))
+        const fullProfile = _.get(this.activeRoute.snapshot, 'data.configService')
+        const departmentName = fullProfile ? fullProfile.unMappedUser.channel : ''
+        // if (this.activeRoute.snapshot.data.department.data) {
+        if (fullProfile) {
+          const leftData = this.activeRoute.snapshot.data.pageData.data.menus
+          _.set(leftData, 'widgetData.logo', true)
+          // _.set(leftData, 'widgetData.logoPath', _.get(this.activeRoute, 'snapshot.data.department.data.logo'))
+          _.set(leftData, 'widgetData.name', departmentName)
+          _.set(leftData, 'widgetData.userRoles', this.myRoles)
+          this.widgetData = leftData
+        } else {
+          this.widgetData = this.activeRoute.snapshot.data.pageData.data.menus
+        }
+      }
+    })
+  }
+
+  ngOnInit() {
+    if (this.defaultSideNavBarOpenedSubscription) {
+      this.defaultSideNavBarOpenedSubscription.unsubscribe()
+    }
+  }
+
+  bindUrl(path: string) {
+    if (path) {
+      this.currentRoute = path
+    }
+  }
+}
diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index eff0034ac..dfb6ab680 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -60,6 +60,7 @@ import { BudgetproofspopupComponent } from './components/budgetproofspopup/budge
 import { UploadService } from './services/upload.service'
 import { AdmintableComponent } from './components/admintable/admintable.component'
 import { UsersModule } from '../users/users.module'
+import { BlendedApprovalsComponent } from './routes/blended-approvals/blended-approvals.component'
 @NgModule({
   declarations: [
     HomeComponent,
@@ -81,6 +82,7 @@ import { UsersModule } from '../users/users.module'
     StaffdetailspopupComponent,
     BudgetschemepopupComponent,
     BudgetproofspopupComponent,
+    BlendedApprovalsComponent,
   ],
   imports: [
     CommonModule,
diff --git a/project/ws/app/src/lib/routes/home/home.rounting.module.ts b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
index 0a6ee0297..00f22bda7 100644
--- a/project/ws/app/src/lib/routes/home/home.rounting.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
@@ -17,6 +17,7 @@ import { StaffComponent } from './routes/staff/staff.component'
 import { BudgetComponent } from './routes/budget/budget.component'
 import { MdoinfoComponent } from './routes/mdoinfo/mdoinfo.component'
 import { PageResolve } from '@sunbird-cb/utils'
+import { BlendedApprovalsComponent } from './routes/blended-approvals/blended-approvals.component'
 const routes: Routes = [
   {
     path: '',
@@ -113,6 +114,14 @@ const routes: Routes = [
         },
         component: WorkallocationComponent,
       },
+      {
+        path: 'blended-approvals',
+        component: BlendedApprovalsComponent,
+        data: {
+          pageId: 'blended-approvals',
+          module: 'Home',
+        },
+      },
     ],
   },
   {
diff --git a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.html b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.html
new file mode 100644
index 000000000..658e1d500
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.html
@@ -0,0 +1,12 @@
+<div class="flex flex-4 flex-column">
+  <mat-card>
+    <mat-card-title class="flex-4 mobile-margin mat-h2">
+      Blended programs enrollment approvals
+    </mat-card-title>
+    <mat-card-content>
+      List
+      <br>
+      <a (click)="viewDetails()">Program1</a>
+    </mat-card-content>
+  </mat-card>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.scss b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
new file mode 100644
index 000000000..ba876521d
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
@@ -0,0 +1,20 @@
+import { Component, OnInit } from '@angular/core'
+import { Router } from '@angular/router'
+
+@Component({
+  selector: 'ws-app-blended-approvals',
+  templateUrl: './blended-approvals.component.html',
+  styleUrls: ['./blended-approvals.component.scss'],
+})
+export class BlendedApprovalsComponent implements OnInit {
+
+  constructor(private router: Router) { }
+
+  ngOnInit() {
+  }
+
+  viewDetails() {
+    this.router.navigate(['/app/blended-approvals/1/batches'])
+  }
+
+}
diff --git a/project/ws/app/src/public-api.ts b/project/ws/app/src/public-api.ts
index 77e9e876e..502087051 100644
--- a/project/ws/app/src/public-api.ts
+++ b/project/ws/app/src/public-api.ts
@@ -25,3 +25,4 @@ export * from './lib/routes/workallocation-v2/workallocation-v2.module'
 export * from './lib/routes/state-profile/state-profile.module'
 export * from './lib/routes/pipes/pipe-email/pipe-email.module'
 export * from './lib/routes/pipes/pipe-email/pipe-email.pipe'
+export * from './lib/routes/blended-program-approvals/blended-approvals.module'
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 949ef88d4..68b48f36e 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -189,6 +189,18 @@ const routes: Routes = [
       tnc: TncAppResolverService,
     },
   },
+  {
+    path: 'app/blended-approvals',
+    loadChildren: () => import('./routes/route-blended-approvals.module').then(u => u.RouteBlendedApprovalsModule),
+    canActivate: [GeneralGuard],
+    data: {
+      pageType: 'feature',
+      pageKey: 'blended-approvals',
+    },
+    resolve: {
+      pageData: PageResolve,
+    },
+  },
   {
     path: 'error-access-forbidden',
     component: ErrorResolverComponent,
diff --git a/src/app/routes/route-blended-approvals.module.ts b/src/app/routes/route-blended-approvals.module.ts
new file mode 100644
index 000000000..283d6f6de
--- /dev/null
+++ b/src/app/routes/route-blended-approvals.module.ts
@@ -0,0 +1,15 @@
+import { NgModule } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { BlendedApprovalsModule } from '@ws/app'
+
+@NgModule({
+  declarations: [],
+  imports: [
+    CommonModule,
+    BlendedApprovalsModule,
+  ],
+  exports: [
+    BlendedApprovalsModule,
+  ],
+})
+export class RouteBlendedApprovalsModule { }

From d2ca637c8f316356f872825542c9a4b4ea6207b6 Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Wed, 14 Jun 2023 16:47:49 +0530
Subject: [PATCH 109/887] Added blended program API listing

---
 .../blended-approvals.component.html          | 11 ++--
 .../blended-approvals.component.ts            | 62 ++++++++++++++++++-
 .../routes/home/services/blended.service.ts   | 17 +++++
 3 files changed, 81 insertions(+), 9 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/home/services/blended.service.ts

diff --git a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.html b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.html
index 658e1d500..b03005c62 100644
--- a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.html
@@ -1,12 +1,11 @@
 <div class="flex flex-4 flex-column">
   <mat-card>
-    <mat-card-title class="flex-4 mobile-margin mat-h2">
-      Blended programs enrollment approvals
-    </mat-card-title>
+    <div class="flex-4 mobile-margin text-capitalize mat-h2">Blended programs enrollment approvals</div>
     <mat-card-content>
-      List
-      <br>
-      <a (click)="viewDetails()">Program1</a>
+      <ng-container class="margin-top-l">
+        <ws-widget-org-user-table [tableData]='tabledata' [data]='getTableData' (eOnRowClick)="viewDetails($event)">
+        </ws-widget-org-user-table>
+      </ng-container>
     </mat-card-content>
   </mat-card>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
index ba876521d..4c1b32d2d 100644
--- a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
@@ -1,5 +1,7 @@
 import { Component, OnInit } from '@angular/core'
-import { Router } from '@angular/router'
+import { ActivatedRoute, Router } from '@angular/router'
+import { ITableData } from '@sunbird-cb/collection/lib/ui-org-table/interface/interfaces'
+import { BlendedService } from '../../services/blended.service'
 
 @Component({
   selector: 'ws-app-blended-approvals',
@@ -7,14 +9,68 @@ import { Router } from '@angular/router'
   styleUrls: ['./blended-approvals.component.scss'],
 })
 export class BlendedApprovalsComponent implements OnInit {
+  data: any[] = []
+  currentFilter = 'toapprove'
+  discussionList!: any
+  discussProfileData!: any
+  departName = ''
+  tabledata: ITableData = {
+    actions: [],
+    columns: [
+      { displayName: 'Program name', key: 'title' },
+      { displayName: 'Batches', key: 'batches' },
+      { displayName: 'Learners', key: 'learners', isList: true },
+      { displayName: 'New requests (Across batches)', key: 'newrequests', isList: true },
+    ],
+    needCheckBox: false,
+    needHash: false,
+    sortColumn: 'fullname',
+    sortState: 'asc',
+    needUserMenus: false,
+  }
+  configSvc: any
 
-  constructor(private router: Router) { }
+  constructor(
+    private activeRouter: ActivatedRoute,
+    private router: Router,
+    private bpService: BlendedService) { }
 
   ngOnInit() {
+    if (this.activeRouter.parent && this.activeRouter.parent.snapshot.data.configService) {
+      this.configSvc = this.activeRouter.parent.snapshot.data.configService
+    }
+    this.getBlendedPreogramsList()
+  }
+
+  getBlendedPreogramsList() {
+    const req = {
+      locale: ['en'],
+      query: '',
+      request: {
+        query: '',
+        filters: {
+          status: ['Live'],
+          primaryCategory: ['Course', 'Program', 'Standalone Assessment'],
+          reviewerIDs: this.configSvc.userProfile ? this.configSvc.userProfile.userId : '',
+        },
+        sort_by: { lastUpdatedOn: 'desc' },
+        facets: ['primaryCategory', 'mimeType'],
+        limit: 100,
+        offset: 0,
+      },
+    }
+    this.bpService.getBlendedPrograms(req).subscribe((res: any) => {
+      console.log('BP list', res.result)
+    })
   }
 
-  viewDetails() {
+  viewDetails(event: any) {
+    console.log('event', event.target.value)
     this.router.navigate(['/app/blended-approvals/1/batches'])
   }
 
+  get getTableData() {
+    return this.data
+  }
+
 }
diff --git a/project/ws/app/src/lib/routes/home/services/blended.service.ts b/project/ws/app/src/lib/routes/home/services/blended.service.ts
new file mode 100644
index 000000000..272f9cadc
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/services/blended.service.ts
@@ -0,0 +1,17 @@
+import { Injectable } from '@angular/core'
+import { HttpClient } from '@angular/common/http'
+import { Observable } from 'rxjs'
+
+const API_END_POINTS = {
+  GET_BLENDED_PROGRAMS: '/apis/proxies/v8/sunbirdigot/read',
+}
+
+@Injectable({
+  providedIn: 'root',
+})
+export class BlendedService {
+  constructor(private http: HttpClient) { }
+  getBlendedPrograms(request: any): Observable<any> {
+    return this.http.post<any>(API_END_POINTS.GET_BLENDED_PROGRAMS, request)
+  }
+}

From 575860bde4608965a4a73fba84c2e7e177746b06 Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Wed, 14 Jun 2023 16:49:33 +0530
Subject: [PATCH 110/887] Added batch details page UI with user cards & avatar

---
 .../blended-approvals.module.ts               |   6 +-
 .../avatar-photo/avatar-photo.component.html  |  23 ++
 .../avatar-photo/avatar-photo.component.scss  | 200 ++++++++++++++++++
 .../avatar-photo/avatar-photo.component.ts    |  94 ++++++++
 .../avatar-photo/avatar-photo.module.ts       |  22 ++
 .../batch-details.component.html              |  58 ++++-
 .../batch-details.component.scss              |  77 +++++++
 .../batch-details/batch-details.component.ts  |  56 +++++
 .../users-card/users-card.component.html      |  23 ++
 .../users-card/users-card.component.scss      |  30 +++
 .../users-card/users-card.component.spec.ts   |  25 +++
 .../users-card/users-card.component.ts        |  56 +++++
 12 files changed, 666 insertions(+), 4 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/avatar-photo/avatar-photo.component.html
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/avatar-photo/avatar-photo.component.scss
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/avatar-photo/avatar-photo.component.ts
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/avatar-photo/avatar-photo.module.ts
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.html
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.scss
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts b/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
index 51bebb68a..6ae516cfd 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
@@ -1,6 +1,7 @@
 import { NgModule } from '@angular/core'
 import { CommonModule } from '@angular/common'
 import {
+  AvatarPhotoModule,
   BreadcrumbsOrgModule,
   LeftMenuWithoutLogoModule,
   UIORGTableModule,
@@ -17,11 +18,12 @@ import { BatchDetailsComponent } from './components/batch-details/batch-details.
 import { BatchListComponent } from './components/batch-list/batch-list.component'
 import { BlendedHomeComponent } from './components/blended-home/blended-home.component'
 import { BlendedApprovalsRoutingModule } from './blended-approvals-routing.module'
+import { UsersCardComponent } from './components/users-card/users-card.component'
 
 @NgModule({
-  declarations: [BlendedHomeComponent, BatchListComponent, BatchDetailsComponent],
+  declarations: [BlendedHomeComponent, BatchListComponent, BatchDetailsComponent, UsersCardComponent],
   imports: [CommonModule, BlendedApprovalsRoutingModule, BreadcrumbsOrgModule, LeftMenuWithoutLogoModule, WidgetResolverModule,
-    MatSidenavModule, MatIconModule, HomeModule, RouterModule, UIORGTableModule, MatCardModule],
+    MatSidenavModule, MatIconModule, HomeModule, RouterModule, UIORGTableModule, MatCardModule, AvatarPhotoModule],
   exports: [],
   providers: [],
 })
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/avatar-photo/avatar-photo.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/avatar-photo/avatar-photo.component.html
new file mode 100644
index 000000000..33785e5fd
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/avatar-photo/avatar-photo.component.html
@@ -0,0 +1,23 @@
+<div [ngClass]="{'circle-s' : size=== 's',
+'circle-m' : size=== 'm',
+'circle-l' : size=== 'l',
+'circle-xl' : size=== 'xl',
+'circle-xxl' : size=== 'xxl',
+'circle-l-xs' : size=== 'l-xs',
+'circle-l-s' : size=== 'l-s',
+'circle-xl-s' : size=== 'xl-s',
+'circle-xxl-s': size=== 'xxl-s'}" [ngStyle]="{'background-color':  circleColor }">
+  <img *ngIf="!showInitials" src="{{photoUrl}}" [alt]="photoUrl? '' :(name || userInitials || size || random)">
+
+  <div *ngIf="showInitials" class="initials" i18n-aria-label>
+    {{ userInitials }}
+  </div>
+
+  <!-- <div *ngIf="imageType === 'user-photo'">
+    <img *ngIf="imageUrl" [src]="imageUrl" alt="user-image" class="user-image" [ngClass]="{'user-image-small': imageSize === 'small'}">
+    <div class="user-image" [ngClass]="{'user-image-small': imageSize === 'small'}">
+      <span class="name-initials-image font-normal ws-mat-primary-default-text ws-mat-accent-background"
+      *ngIf="!imageUrl">{{ shortName }}</span>
+    </div>
+  </div> -->
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/avatar-photo/avatar-photo.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/avatar-photo/avatar-photo.component.scss
new file mode 100644
index 000000000..07ff74faf
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/avatar-photo/avatar-photo.component.scss
@@ -0,0 +1,200 @@
+@import '~@sunbird-cb/design-system/src/styles/ws-common';
+@import '~@sunbird-cb/design-system/src/styles/ws-vars';
+@import '~@sunbird-cb/design-system/src/styles/ws-mixins';
+
+
+.circle-s {
+  border-radius: 10%;
+  width: 24px;
+  height: 24px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  img {
+    border-radius: 10%;
+    width: 24px;
+    height: 24px;
+  }
+
+  .initials {
+    color: #ffffff;
+    font-size: 10px;
+    line-height: 12px;
+    letter-spacing: 0.2625px;
+  }
+}
+
+.circle-m {
+  border-radius: 10%;
+  width: 40px !important;
+  height: 40px !important;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  img {
+    border-radius: 10%;
+    width: 40px;
+    height: 40px;
+  }
+
+  .initials {
+    color: #ffffff;
+    font-size: 14px;
+    line-height: 19px;
+    letter-spacing: 0.2625px;
+  }
+}
+
+.circle-l {
+  border-radius: 10%;
+  width: 80px;
+  height: 80px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  img {
+    border-radius: 10%;
+    width: 80px;
+    height: 80px;
+  }
+
+  .initials {
+    color: #ffffff;
+    font-size: 20px;
+    line-height: 19px;
+    letter-spacing: 0.2625px;
+  }
+}
+
+.circle-xl {
+  border-radius: 10%;
+  width: 105px;
+  height: 105px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  img {
+    border-radius: 10%;
+    width: 105px;
+    height: 105px;
+  }
+
+  .initials {
+    color: #ffffff;
+    font-size: 20px;
+    line-height: 19px;
+    letter-spacing: 0.2625px;
+  }
+}
+
+.circle-xxl {
+  border-radius: 10%;
+  width: 145px;
+  height: 145px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  img {
+    border-radius: 10%;
+    width: 145px;
+    height: 145px;
+  }
+
+  .initials {
+    color: #ffffff;
+    font-size: 20px;
+    line-height: 19px;
+    letter-spacing: 0.2625px;
+  }
+}
+.circle-l-xs{
+  border-radius: 4px;
+  width: 24px;
+  height: 24px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  img {
+    border-radius: 4px;
+    width: 24px;
+    height: 24px;
+  }
+
+  .initials {
+    color: #ffffff;
+    font-size: $size-s;
+    line-height: $size-s;
+    letter-spacing: 0.2625px;
+  }
+}
+.circle-l-s {
+  border-radius: 4px;
+  width: 80px;
+  height: 80px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  img {
+    border-radius: 4px;
+    width: 80px;
+    height: 80px;
+  }
+
+  .initials {
+    color: #ffffff;
+    font-size: $size-l;
+    line-height: $size-l;
+    letter-spacing: 0.2625px;
+  }
+}
+
+.circle-xl-s {
+  border-radius: 4px;
+  width: 152px;
+  height: 125px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  img {
+    border-radius: 4px;
+    width: 152px;
+    height: 125px;
+  }
+
+  .initials {
+    color: #ffffff;
+    font-size: $size-xl;
+    line-height: $size-xl;
+    letter-spacing: 0.2625px;
+  }
+}
+
+.circle-xxl-s {
+  border-radius: 4px;
+  width: 276px;
+  height: 208px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  img {
+    border-radius: 4px;
+    width: 276px;
+    height: 208px;
+  }
+
+  .initials {
+    color: #ffffff;
+    font-size: $size-xxl;
+    line-height: $size-xxl;
+    letter-spacing: 0.2625px;
+  }
+}
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/avatar-photo/avatar-photo.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/avatar-photo/avatar-photo.component.ts
new file mode 100644
index 000000000..1d2d4dee9
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/avatar-photo/avatar-photo.component.ts
@@ -0,0 +1,94 @@
+import { Component, OnInit, Input, OnChanges, SimpleChanges } from '@angular/core'
+
+@Component({
+  selector: 'ws-widget-avatar-photo',
+  templateUrl: './avatar-photo.component.html',
+  styleUrls: ['./avatar-photo.component.scss'],
+})
+export class AvatarPhotoComponent implements OnInit, OnChanges {
+  @Input() datalen: any
+
+  @Input()
+  public photoUrl!: string
+
+  @Input()
+  public name!: string
+  @Input() public size = ''
+  @Input() randomColor = false
+  @Input() initials?: string
+  public showInitials = false
+  public circleColor!: string
+  random = Math.random().toString(36).slice(2)
+
+  // public initials!: string
+
+  private colors = [
+    '#EB7181', // red
+    '#306933', // green
+    '#000000', // black
+    '#3670B2', // blue
+    '#4E9E87',
+    '#7E4C8D',
+  ]
+
+  private randomcolors = [
+    '#EB7181', // red
+    '#006400', // green
+    '#000000', // black
+    '#3670B2', // blue
+    '#4E9E87',
+    '#7E4C8D',
+  ]
+
+  ngOnInit() {
+    if (!this.photoUrl) {
+      this.showInitials = true
+      if (!this.initials) {
+        this.createInititals()
+      }
+      if (this.datalen === 1) {
+        this.randomcolors = [
+          '#006400', // green
+        ]
+      }
+      const randomIndex = Math.floor(Math.random() * Math.floor(this.colors.length))
+      this.circleColor = this.colors[randomIndex]
+      if (this.randomColor) {
+        const randomIndex1 = Math.floor(Math.random() * Math.floor(this.randomcolors.length))
+        this.circleColor = this.randomcolors[randomIndex1]
+      }
+    }
+
+  }
+  ngOnChanges(change: SimpleChanges) {
+    if (change.name.currentValue !== change.name.previousValue && !change.name.firstChange) {
+      this.createInititals()
+    }
+  }
+  get userInitials() {
+    return this.initials
+  }
+  private createInititals(): void {
+    let initials = ''
+    const array = `${this.name} `.toString().split(' ')
+    if (array[0] !== 'undefined' && typeof array[1] !== 'undefined') {
+      initials += array[0].charAt(0)
+      initials += array[1].charAt(0)
+    } else {
+      for (let i = 0; i < this.name.length; i += 1) {
+        if (this.name.charAt(i) === ' ') {
+          continue
+        }
+
+        if (this.name.charAt(i) === this.name.charAt(i)) {
+          initials += this.name.charAt(i)
+
+          if (initials.length === 2) {
+            break
+          }
+        }
+      }
+    }
+    this.initials = initials.toUpperCase()
+  }
+}
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/avatar-photo/avatar-photo.module.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/avatar-photo/avatar-photo.module.ts
new file mode 100644
index 000000000..ccdc7525b
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/avatar-photo/avatar-photo.module.ts
@@ -0,0 +1,22 @@
+import { NgModule } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { RouterModule } from '@angular/router'
+import { MatButtonModule, MatIconModule, MatMenuModule, MatRippleModule } from '@angular/material'
+import { WidgetResolverModule } from '@sunbird-cb/resolver'
+import { AvatarPhotoComponent } from './avatar-photo.component'
+
+@NgModule({
+  declarations: [AvatarPhotoComponent],
+  imports: [
+    CommonModule,
+    RouterModule,
+    MatButtonModule,
+    MatIconModule,
+    MatMenuModule,
+    MatRippleModule,
+    WidgetResolverModule,
+  ],
+  exports: [AvatarPhotoComponent],
+  entryComponents: [AvatarPhotoComponent],
+})
+export class AvatarPhotoModule { }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
index 4a38ad430..268463225 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
@@ -1,8 +1,62 @@
 <div class="flex flex-4 flex-column">
-  <mat-card class="flex-custom ws-mat-accent-border">
+  <mat-card class="flex-custom ws-mat-accent-border batch-detailspage">
+    <ws-widget-breadcrumbs-org [widgetData]="{titles:[{title:'Blended programs', url:'/app/home/blended-approvals'},
+      {title:'Program 1', url:'/app/blended-approvals/1/batches'}, {title:'Batches', url:'/app/blended-approvals/1/batches'},
+      {title:'Batch1',url:'none'}] }">
+    </ws-widget-breadcrumbs-org>
+    <div class="flex-4 mobile-margin mat-h2">
+      Batch 1
+    </div>
     <mat-card-content>
       <ng-container>
-        Batch details page
+        <div class="margin-bottom-xl margin-top-l grey-box paddig-m ws-mat-accent-border">
+          <p class="font-bold">Batch details</p>
+          <ul class="margin-top-m margin-bottom-m batch-data">
+            <li><mat-icon>tag</mat-icon> BTCHID123</li>
+            <li><mat-icon>event</mat-icon> 2 Jun, 2023 - 12 Jun, 2023</li>
+            <li><mat-icon>event</mat-icon> 10 Jun, 2023</li>
+            <li><mat-icon>people</mat-icon> 67 Learners</li>
+          </ul>
+        </div>
+      </ng-container>
+
+      <ng-container>
+        <div class="flex flex-1 flex-column margin-fix">
+          <div class="flex flex-1 filter max-height-60">
+            <a class="filter-option cursor-pointer" [ngClass]="{'ws-mat-accent-border-active font-bold' : currentFilter === 'pending',
+                                                'ws-mat-accent-border font-medium':currentFilter !== 'pending'}"
+              mat-button (click)="filter('pending')" role="button">Pending requests</a>
+            <a class="filter-option cursor-pointer"
+              [ngClass]="{'ws-mat-accent-border-active font-bold' : currentFilter === 'approved',
+                                                              'ws-mat-accent-border font-medium':currentFilter !== 'approved'}" mat-button
+              (click)="filter('approved')" role="button">Learners</a>
+            <a class="filter-option cursor-pointer"
+              [ngClass]="{'ws-mat-accent-border-active font-bold' : currentFilter === 'rejected',
+                                                                        'ws-mat-accent-border font-medium':currentFilter !== 'rejected'}" mat-button
+              (click)="filter('rejected')" role="button">Rejected requests</a>
+          </div>
+        </div>
+        <ng-container *ngIf="currentFilter === 'pending'">
+          <div class="b-c box">
+            <div *ngFor="let user of usersData">
+              <ws-app-users-card [user]="user" [actions]="true"></ws-app-users-card>
+            </div>
+          </div>
+        </ng-container>
+        <ng-container *ngIf="currentFilter === 'approved'">
+          <div class="b-c box">
+            <div *ngFor="let user of usersData">
+              <ws-app-users-card [user]="user" [actions]="false"></ws-app-users-card>
+            </div>
+          </div>
+        </ng-container>
+        <ng-container *ngIf="currentFilter === 'rejected'">
+          <div class="b-c box">
+            <div *ngFor="let user of usersData">
+              <ws-app-users-card [user]="user" [actions]="false"></ws-app-users-card>
+            </div>
+          </div>
+        </ng-container>
       </ng-container>
     </mat-card-content>
   </mat-card>
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss
index e69de29bb..ef3faff78 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss
@@ -0,0 +1,77 @@
+@import 'ws-common';
+@import 'ws-vars';
+@import 'ws-mixins';
+
+.grey-box {
+  background: #F5F5F5;
+  padding: 1em;
+
+  .batch-data {
+    list-style: none;
+    padding: 0;
+    font: 400 14px/20px Lato;
+
+    li {
+      display: inline;
+      margin-right: 2em;
+
+      .mat-icon {
+        color: #979797;
+        vertical-align: bottom;
+        font-size: 18px;
+        width: 20px;
+        height: 20px;
+      }
+    }
+  }
+}
+
+.filter {
+  .filter-option {
+    margin: $size-s $size-s;
+    /* border-bottom: darkslateblue; */
+    border-radius: 0;
+    border-bottom-width: 2px;
+    border-top-width: 0;
+    border-left-width: 0;
+    border-right-width: 0;
+  }
+
+  .filter-option:first-child {
+    margin-left: 0;
+  }
+}
+
+.box {
+  display: flex;
+  flex-wrap: wrap;
+}
+.box > * {
+  flex: 1 1 400px;
+
+  @include breakpoint-s {
+    flex: 1 1 350px;
+  }
+  @include breakpoint-xs {
+    flex: 1 1 100%;
+  }
+}
+.a {
+  flex: 0 0 150px;
+}
+.b-c {
+  flex-direction: row;
+  display: flex;
+  flex-grow: 1;
+  margin: 1em 0;
+  @include breakpoint-xs {
+    flex-direction: column;
+  }
+}
+.min-w {
+  min-width: 49%;
+}
+
+.font-medium {
+  font-weight: 500 !important;
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index 1be646b57..765a544dc 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -6,10 +6,66 @@ import { Component, OnInit } from '@angular/core'
   styleUrls: ['./batch-details.component.scss'],
 })
 export class BatchDetailsComponent implements OnInit {
+  currentFilter = 'pending'
+  usersData: any = []
 
   constructor() { }
 
   ngOnInit() {
+    this.usersData = [
+      {
+        city: '',
+        department: 'jpal',
+        desc: '',
+        designation: '',
+        email: 'test01july0907@yopmail.com',
+        first_name: 'test01 july0907',
+        last_name: '',
+        userLocation: '',
+        user_id: '27a35578-841c-450b-afc7-ace35f1051da',
+      },
+      {
+        city: '',
+        department: 'General Administration Ladakh',
+        desc: '',
+        designation: 'ACCOUNTS ASSISTANT',
+        email: 'JulyTest.Testjuly@yopmail.com',
+        first_name: 'JulyTest Testjuly',
+        last_name: '',
+        userLocation: '',
+        user_id: 'bdf547ba-79e8-49d9-9143-54353673212d',
+      },
+      {
+        city: '',
+        department: 'jpal',
+        desc: '',
+        designation: '',
+        email: 'testinguser0007@yopmail.com',
+        first_name: 'testinguser user',
+        last_name: '',
+        userLocation: '',
+        user_id: '8a24ee2d-20ec-4eb0-b559-627b30dfd894',
+      },
+    ]
+  }
+
+  filter(key: 'pending' | 'approved' | 'rejected') {
+    switch (key) {
+      case 'pending':
+        this.currentFilter = 'pending'
+        // this.getPendingList()
+        break
+      case 'approved':
+        this.currentFilter = 'approved'
+        // this.getApprovedList()
+        break
+      case 'rejected':
+        this.currentFilter = 'rejected'
+        // this.getRejectedList()
+        break
+      default:
+        break
+    }
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.html
new file mode 100644
index 000000000..e78dd36e4
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.html
@@ -0,0 +1,23 @@
+<div class="flex flex-row items-center card-container ws-mat-primary-tags" (click)="goToUserProfile(user)">
+  <a href="javascript:void(0)" class="flex flex-1 items-center ws-mat-primary-tags" i18n-aria-label role="link"
+    aria-label="click on it to visit user profile">
+    <div class="mr-3">
+      <ws-widget-avatar-photo [name]="getUseravatarName()" [photoUrl]="user?.photo" size="m">
+      </ws-widget-avatar-photo>
+    </div>
+    <div class="flex flex-col flex-1">
+      <div class="designation truncate ws-mat-black60-text" *ngIf="user?.first_name">
+        {{user?.first_name}}
+      </div>
+      <div class="designation truncate ws-mat-black60-text" *ngIf="!user?.first_name">
+        {{user?.channel}}
+      </div>
+    </div>
+    <div *ngIf="actions">
+      <button type="button" mat-button class="margin-right-m cursor-pointer border-0"
+        (click)="onSubmit('Reject')">Reject</button>
+      <button type="button" mat-button class="approve-btn cursor-pointer mat-accent-border"
+        (click)="onSubmit('Approve')">Approve</button>
+    </div>
+  </a>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.scss
new file mode 100644
index 000000000..8246cd307
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.scss
@@ -0,0 +1,30 @@
+.card-container {
+    padding: 20px 12px;
+    margin-bottom: 8px;
+    margin-right: 12px;
+    border-radius: 4px;
+}
+
+.name{
+    font-size: 16px;
+    line-height: 24px;
+    text-transform: capitalize;
+}
+.designation{
+    line-height: 21px;
+}
+
+.approve-btn {
+    width: auto;
+    border: 1px solid #0075B7;
+    border-radius: 4px;
+    color: #0075B7 !important;
+}
+
+button {
+    display: inline;
+    font: 600 14px/20px Lato;
+    padding: 0.5em 1em;
+    color: rgba(0,0,0,0.7);
+    background: transparent;
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.spec.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.spec.ts
new file mode 100644
index 000000000..debd773fc
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { UsersCardComponent } from './users-card.component';
+
+describe('UsersCardComponent', () => {
+  let component: UsersCardComponent;
+  let fixture: ComponentFixture<UsersCardComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ UsersCardComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(UsersCardComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
new file mode 100644
index 000000000..84817a372
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
@@ -0,0 +1,56 @@
+import { Component, Input, OnInit } from '@angular/core'
+
+@Component({
+  selector: 'ws-app-users-card',
+  templateUrl: './users-card.component.html',
+  styleUrls: ['./users-card.component.scss'],
+})
+export class UsersCardComponent implements OnInit {
+  @Input() user!: any
+  @Input() actions: any
+
+  constructor() { }
+
+  ngOnInit() {
+    console.log('actions', this.actions)
+  }
+
+  getUseravatarName() {
+    let name = ''
+    if (this.user && this.user.first_name) {
+      if (this.user.first_name) {
+        if (this.user.last_name && this.user.last_name !== null && this.user.last_name !== undefined) {
+          name = `${this.user.first_name} ${this.user.last_name}`
+        } else {
+          name = `${this.user.first_name}`
+        }
+      } else {
+        name = `${this.user.name}`
+      }
+    } else if (this.user && this.user.personalDetails) {
+      if (this.user.personalDetails.middlename) {
+        // tslint:disable-next-line:max-line-length
+        if (this.user.personalDetails.surname && this.user.personalDetails.surname !== null && this.user.personalDetails.surname !== undefined) {
+          // tslint:disable-next-line: max-line-length
+          name = `${this.user.personalDetails.firstname} ${this.user.personalDetails.middlename} ${this.user.personalDetails.surname}`
+        } else {
+          name = `${this.user.personalDetails.firstname} ${this.user.personalDetails.middlename}`
+        }
+      } else if (this.user.personalDetails.firstname) {
+        // tslint:disable-next-line:max-line-length
+        if (this.user.personalDetails.surname && this.user.personalDetails.surname !== null && this.user.personalDetails.surname !== undefined) {
+          // tslint:disable-next-line: max-line-length
+          name = `${this.user.personalDetails.firstname} ${this.user.personalDetails.surname}`
+        } else {
+          name = `${this.user.personalDetails.firstname}`
+        }
+      }
+    }
+    return name
+  }
+
+  onSubmit(actiontype: any) {
+    console.log('actiontype', actiontype)
+  }
+
+}

From 8dd5e781d866b5ba0dfc5fcc0384e1916dd9c23f Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Wed, 14 Jun 2023 16:50:19 +0530
Subject: [PATCH 111/887] Added batches listing page UI

---
 .../batch-list/batch-list.component.html      | 32 ++++++++++++++++---
 .../batch-list/batch-list.component.scss      | 12 +++++++
 2 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
index 3e4887ee3..b9376414d 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
@@ -1,12 +1,36 @@
 <div class="flex flex-4 flex-column">
   <mat-card class="flex-custom ws-mat-accent-border">
+    <ws-widget-breadcrumbs-org [widgetData]="{titles:[{title:'Blended programs', url:'/app/home/blended-approvals'},
+          {title:'Program 1', url:'/app/blended-approvals/1/batches'}, {title:'Batches', url:'none'}] }">
+    </ws-widget-breadcrumbs-org>
+    <div class="flex-4 mobile-margin mat-h2">
+      Batches
+    </div>
     <mat-card-content>
       <ng-container>
-        Batch list
+        <div class="batches-lsit">
+          <div class="grey-box paddig-m ws-mat-accent-border mat-body-2 cursor-pointer margin-bottom-m margin-right-l"
+            (click)="viewDetails(1)">
+            <div><span class="font-bold">Batch 1</span> <span class="float-right">BTCHID123</span></div>
+            <p class="">2 Jun, 2023 - 12 Jun, 2023</p>
+          </div>
 
-        <br>
-        <a (click)="viewDetails(1)">Batch 1</a><br>
-        <a (click)="viewDetails(2)">Batch 2</a>
+          <div class="grey-box paddig-m ws-mat-accent-border mat-body-2 cursor-pointer margin-bottom-m margin-right-l"
+            (click)="viewDetails(1)">
+            <div><span class="font-bold">Batch 1</span> <span class="float-right">BTCHID123</span></div>
+            <p class="">2 Jun, 2023 - 12 Jun, 2023</p>
+          </div>
+
+          <div class="grey-box paddig-m ws-mat-accent-border mat-body-2 cursor-pointer margin-bottom-m margin-right-l"
+            (click)="viewDetails(1)">
+            <div><span class="font-bold">Batch 1</span> <span class="float-right">BTCHID123</span></div>
+            <p class="">2 Jun, 2023 - 12 Jun, 2023</p>
+          </div>
+        </div>
+
+
+        <!-- <a (click)="viewDetails(1)">Batch 1</a><br>
+        <a (click)="viewDetails(2)">Batch 2</a> -->
       </ng-container>
     </mat-card-content>
   </mat-card>
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss
index e69de29bb..412b7dbcd 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss
@@ -0,0 +1,12 @@
+@import 'ws-common';
+@import 'ws-vars';
+@import 'ws-mixins';
+
+.grey-box {
+  background: #F5F5F5;
+  padding: 1em;
+  display: inline-block;
+  width: 28%;
+  border-radius: 4px;
+}
+

From ee7b64ccedd20985c8bf4f4498886d64cbda14a1 Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Wed, 14 Jun 2023 16:51:13 +0530
Subject: [PATCH 112/887] Updated left sidenav code for blended pages

---
 .../blended-home/blended-home.component.html  | 16 ++--
 .../blended-home/blended-home.component.scss  | 85 ++++++++++---------
 .../blended-home/blended-home.component.ts    |  4 +-
 3 files changed, 53 insertions(+), 52 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.html
index 2834e5704..9262d8dc4 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.html
@@ -1,6 +1,6 @@
-<!-- <mat-sidenav-container class="nav-container" autosize name="discuss-menu">
+<mat-sidenav-container class="container-balanced sticky" autosize name="discuss-menu">
   <mat-sidenav [mode]="mode$ | async" [(opened)]="sideNavBarOpened" class="left-nav">
-    <div class="contain">
+    <div class="container2" #stickyMenu>
       <ng-container [wsResolverWidget]="widgetData"></ng-container>
     </div>
   </mat-sidenav>
@@ -11,12 +11,8 @@
         <mat-icon>menu</mat-icon>
       </button>
     </div>
-    <div class="container-balanced"> -->
-<!-- <ws-widget-breadcrumbs-org
-        [widgetData]="{titles:[{title:'Blended programs', url:'/app/home/blended-approvals'},{title:role,url:'none'}] }">
-      </ws-widget-breadcrumbs-org> -->
-
-<router-outlet></router-outlet>
-<!-- </div>
+    <div class="container-balanced container-balanced-inner">
+      <router-outlet></router-outlet>
+    </div>
   </mat-sidenav-content>
-</mat-sidenav-container> -->
\ No newline at end of file
+</mat-sidenav-container>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.scss
index 5d507085c..aabbe4fa4 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.scss
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.scss
@@ -3,43 +3,42 @@
 @import 'ws-mixins';
 
 .container-balanced {
-  @extend %page-center;
-  height: auto;
-  min-height: 75vh;
-  padding: 0;
-  box-sizing: border-box;
-  width: 100%!important;
-  margin-left: auto!important;
-  margin-right: auto!important;
+  // @extend %page-center;
+  // height: auto;
+  min-height: 85vh;
+  // padding: 0;
+  // box-sizing: border-box;
+  // width: 100%!important;
+  // margin-left: auto!important;
+  // margin-right: auto!important;
 }
 
 .container2 {
   position: relative;
 }
 
-.container-balanced-inner {
-  padding: 24px!important;
-  box-sizing: border-box
-}
-.container-balanced-banner {
-  @extend %page-center;
-  height: auto;
-}
+// .container-balanced-inner {
+//   padding: 24px!important;
+//   box-sizing: border-box
+// }
+// .container-balanced-banner {
+//   @extend %page-center;
+//   height: auto;
+// }
 
-.left-nav {
-  min-width: 240px;
-  overflow: hidden !important;
-  box-sizing: border-box;
-  height: 85vh;
-  background: rgb(240, 243, 244);
-  box-shadow: none;
-  visibility: hidden;
+// .left-nav {
+//   min-width: 240px;
+//   overflow: hidden !important;
+//   box-sizing: border-box;
+//   background: rgb(240, 243, 244);
+//   box-shadow: none;
+//   visibility: hidden;
 
-  @include breakpoint-xs {
-    min-width: 100%;
-    max-width: none;
-  }
-}
+//   @include breakpoint-xs {
+//     min-width: 100%;
+//     max-width: none;
+//   }
+// }
 
 .flex-3 {
   flex: 3;
@@ -63,20 +62,24 @@
 
 ::ng-deep .mat-drawer-content {
   overflow-x: hidden!important;
-  overflow-y: hidden!important;
+  margin-left: 301px !important;
 }
-
-::ng-deep .mat-drawer-inner-container {
-  overflow: hidden;
+::ng-deep .mat-drawer {
+  background: #f0f3f4 !important;
+  border-right: 1px solid rgba(0,0,0,.12) !important;
+  box-shadow:  none !important;
 }
+// ::ng-deep .mat-drawer-inner-container {
+//   overflow: hidden;
+// }
 ::ng-deep.mat-drawer-backdrop.mat-drawer-shown {
   visibility: hidden !important;
 }
-::ng-deep.mat-progress-spinner {
-    display: block;
-    position: fixed!important;
-    top: 0;
-    margin-top: 30%;
-    left: 0;
-    margin-left: 45%;
-}
+// ::ng-deep.mat-progress-spinner {
+//     display: block;
+//     position: fixed!important;
+//     top: 0;
+//     margin-top: 30%;
+//     left: 0;
+//     margin-left: 45%;
+// }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.ts
index cb8f5e9ba..65f5fcfd0 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.ts
@@ -23,12 +23,14 @@ export class BlendedHomeComponent implements OnInit {
   role: any
 
   constructor(private router: Router, private activeRoute: ActivatedRoute) {
+    if (_.get(this.activeRoute, 'snapshot.data.configService.userRoles')) {
+      this.myRoles = _.get(this.activeRoute, 'snapshot.data.configService.userRoles')
+    }
     this.router.events.subscribe((event: Event) => {
       if (event instanceof NavigationEnd) {
         this.bindUrl(event.urlAfterRedirects.replace('/app/blended-approvals/', ''))
         const fullProfile = _.get(this.activeRoute.snapshot, 'data.configService')
         const departmentName = fullProfile ? fullProfile.unMappedUser.channel : ''
-        // if (this.activeRoute.snapshot.data.department.data) {
         if (fullProfile) {
           const leftData = this.activeRoute.snapshot.data.pageData.data.menus
           _.set(leftData, 'widgetData.logo', true)

From 30a8ea6908fa3723a26178a7b89557d194b7a34c Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Wed, 14 Jun 2023 16:51:55 +0530
Subject: [PATCH 113/887] Updated left sidenav css for events page

---
 .../events-home/events-home.component.scss    | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/project/ws/app/src/lib/routes/events/routes/events-home/events-home.component.scss b/project/ws/app/src/lib/routes/events/routes/events-home/events-home.component.scss
index 2d2a9b798..730b41d59 100644
--- a/project/ws/app/src/lib/routes/events/routes/events-home/events-home.component.scss
+++ b/project/ws/app/src/lib/routes/events/routes/events-home/events-home.component.scss
@@ -19,10 +19,10 @@
 }
 
 .left-nav {
-  min-width: 240px;
-  overflow: hidden!important;
-  height: 85vh;
-  box-sizing: border-box;
+  // min-width: 240px;
+  // overflow: hidden!important;
+  // height: 85vh;
+  // box-sizing: border-box;
   // max-width: 240px;
 
   // ::ng-deep.mat-drawer-inner-container {
@@ -87,10 +87,11 @@
 }
 
 .nav-container {
-  position: relative;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  min-height: calc(100vh - 164px);
+  // position: relative;
+  // top: 0;
+  // bottom: 0;
+  // left: 0;
+  // right: 0;
+  // min-height: calc(100vh - 164px);
+  min-height: calc(100vh - 115px);
 }

From 56a33bfd5c34f352a83a09aa0eb513a72b81be22 Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Thu, 15 Jun 2023 17:26:25 +0530
Subject: [PATCH 114/887] Blended pages API integrations

---
 .../batch-details.component.html              | 23 ++++-----
 .../batch-details/batch-details.component.ts  | 47 ++++++++++++++++++-
 .../batch-list/batch-list.component.html      | 30 +++---------
 .../batch-list/batch-list.component.scss      | 12 ++++-
 .../batch-list/batch-list.component.ts        | 34 ++++++++++++--
 .../services/blended-approval.service.ts      | 24 ++++++++++
 .../blended-approvals.component.ts            | 21 +++++----
 7 files changed, 141 insertions(+), 50 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
index 268463225..6853c4425 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
@@ -1,9 +1,6 @@
 <div class="flex flex-4 flex-column">
   <mat-card class="flex-custom ws-mat-accent-border batch-detailspage">
-    <ws-widget-breadcrumbs-org [widgetData]="{titles:[{title:'Blended programs', url:'/app/home/blended-approvals'},
-      {title:'Program 1', url:'/app/blended-approvals/1/batches'}, {title:'Batches', url:'/app/blended-approvals/1/batches'},
-      {title:'Batch1',url:'none'}] }">
-    </ws-widget-breadcrumbs-org>
+    <ws-widget-breadcrumbs-org [widgetData]="breadcrumbs" *ngIf="breadcrumbs"></ws-widget-breadcrumbs-org>
     <div class="flex-4 mobile-margin mat-h2">
       Batch 1
     </div>
@@ -11,11 +8,12 @@
       <ng-container>
         <div class="margin-bottom-xl margin-top-l grey-box paddig-m ws-mat-accent-border">
           <p class="font-bold">Batch details</p>
-          <ul class="margin-top-m margin-bottom-m batch-data">
-            <li><mat-icon>tag</mat-icon> BTCHID123</li>
-            <li><mat-icon>event</mat-icon> 2 Jun, 2023 - 12 Jun, 2023</li>
-            <li><mat-icon>event</mat-icon> 10 Jun, 2023</li>
-            <li><mat-icon>people</mat-icon> 67 Learners</li>
+          <ul class="margin-top-m margin-bottom-m batch-data" *ngIf="batchData">
+            <li><mat-icon>tag</mat-icon> {{batchData.batchId}}</li>
+            <li><mat-icon>event</mat-icon> {{batchData.startDate}} - {{batchData.endDate}}</li>
+            <li><mat-icon>event</mat-icon> {{batchData.enrollmentEndDate}}</li>
+            <li *ngIf="approvedUsers && approvedUsers.length > 0"><mat-icon>people</mat-icon> {{approvedUsers.length}}
+              Learners</li>
           </ul>
         </div>
       </ng-container>
@@ -44,11 +42,14 @@
           </div>
         </ng-container>
         <ng-container *ngIf="currentFilter === 'approved'">
-          <div class="b-c box">
-            <div *ngFor="let user of usersData">
+          <div class="b-c box" *ngIf="approvedUsers && approvedUsers.length > 0">
+            <div *ngFor="let user of approvedUsers">
               <ws-app-users-card [user]="user" [actions]="false"></ws-app-users-card>
             </div>
           </div>
+          <div class="b-c box" *ngIf="approvedUsers && approvedUsers.length == 0">
+            <p class="margin-top-m margin-bottom-m">No Learners</p>
+          </div>
         </ng-container>
         <ng-container *ngIf="currentFilter === 'rejected'">
           <div class="b-c box">
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index 765a544dc..6614435cc 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -1,4 +1,6 @@
 import { Component, OnInit } from '@angular/core'
+import { ActivatedRoute, Router } from '@angular/router'
+import { BlendedApporvalService } from '../../services/blended-approval.service'
 
 @Component({
   selector: 'ws-app-batch-details',
@@ -8,8 +10,24 @@ import { Component, OnInit } from '@angular/core'
 export class BatchDetailsComponent implements OnInit {
   currentFilter = 'pending'
   usersData: any = []
+  approvedUsers: any = []
+  programData: any
+  programID: any
+  batchID: any
+  batchData: any
+  breadcrumbs: any
 
-  constructor() { }
+  constructor(private router: Router, private activeRouter: ActivatedRoute, private bpService: BlendedApporvalService) {
+    const currentState = this.router.getCurrentNavigation()
+    if (currentState && currentState.extras.state) {
+      this.batchData = currentState.extras.state
+    }
+    this.programID = this.activeRouter.snapshot.params.id
+    this.batchID = this.activeRouter.snapshot.params.batchid
+    if (this.programID) {
+      this.getBPDetails(this.programID)
+    }
+  }
 
   ngOnInit() {
     this.usersData = [
@@ -57,7 +75,7 @@ export class BatchDetailsComponent implements OnInit {
         break
       case 'approved':
         this.currentFilter = 'approved'
-        // this.getApprovedList()
+        this.getLearnersList()
         break
       case 'rejected':
         this.currentFilter = 'rejected'
@@ -68,4 +86,29 @@ export class BatchDetailsComponent implements OnInit {
     }
   }
 
+  getBPDetails(programID: any) {
+    this.bpService.getBlendedProgramsDetails(programID).subscribe((res: any) => {
+      this.programData = res.result.content
+      this.breadcrumbs = {
+        titles: [{ title: 'Blended programs', url: '/app/home/blended-approvals' },
+        { title: this.programData.name, url: `/app/blended-approvals/${this.programData.identifier}/batches` },
+        { title: 'Batch 1', url: 'none' }],
+      }
+      if (!this.batchData) {
+        this.programData.batches.forEach((b: any) => {
+          if (b.batchId === this.batchID) {
+            this.batchData = b
+          }
+        })
+      }
+
+    })
+  }
+
+  getLearnersList() {
+    this.bpService.getLearners(this.batchData.batchId).subscribe((res: any) => {
+      this.approvedUsers = res.result.content
+    })
+  }
+
 }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
index b9376414d..509d88d30 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
@@ -1,36 +1,20 @@
 <div class="flex flex-4 flex-column">
   <mat-card class="flex-custom ws-mat-accent-border">
-    <ws-widget-breadcrumbs-org [widgetData]="{titles:[{title:'Blended programs', url:'/app/home/blended-approvals'},
-          {title:'Program 1', url:'/app/blended-approvals/1/batches'}, {title:'Batches', url:'none'}] }">
-    </ws-widget-breadcrumbs-org>
+    <ws-widget-breadcrumbs-org [widgetData]="breadcrumbs"
+      *ngIf="programData && breadcrumbs"></ws-widget-breadcrumbs-org>
     <div class="flex-4 mobile-margin mat-h2">
       Batches
     </div>
     <mat-card-content>
       <ng-container>
-        <div class="batches-lsit">
+        <div class="batches-lsit" *ngIf="programData && programData.batches">
           <div class="grey-box paddig-m ws-mat-accent-border mat-body-2 cursor-pointer margin-bottom-m margin-right-l"
-            (click)="viewDetails(1)">
-            <div><span class="font-bold">Batch 1</span> <span class="float-right">BTCHID123</span></div>
-            <p class="">2 Jun, 2023 - 12 Jun, 2023</p>
-          </div>
-
-          <div class="grey-box paddig-m ws-mat-accent-border mat-body-2 cursor-pointer margin-bottom-m margin-right-l"
-            (click)="viewDetails(1)">
-            <div><span class="font-bold">Batch 1</span> <span class="float-right">BTCHID123</span></div>
-            <p class="">2 Jun, 2023 - 12 Jun, 2023</p>
-          </div>
-
-          <div class="grey-box paddig-m ws-mat-accent-border mat-body-2 cursor-pointer margin-bottom-m margin-right-l"
-            (click)="viewDetails(1)">
-            <div><span class="font-bold">Batch 1</span> <span class="float-right">BTCHID123</span></div>
-            <p class="">2 Jun, 2023 - 12 Jun, 2023</p>
+            (click)="viewDetails(batch)" *ngFor="let batch of programData.batches">
+            <div><span class="font-bold">Batch 1</span> <span class="float-right">{{batch.batchId}}</span></div>
+            <p class="mat-body-2"><mat-icon>event</mat-icon> {{batch.startDate}} - {{batch.endDate}}</p>
+            <p class="mat-body-2"><mat-icon>event</mat-icon> {{batch.enrollmentEndDate}}</p>
           </div>
         </div>
-
-
-        <!-- <a (click)="viewDetails(1)">Batch 1</a><br>
-        <a (click)="viewDetails(2)">Batch 2</a> -->
       </ng-container>
     </mat-card-content>
   </mat-card>
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss
index 412b7dbcd..4417bfa27 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss
@@ -8,5 +8,15 @@
   display: inline-block;
   width: 28%;
   border-radius: 4px;
-}
 
+  .mat-body-2 {
+    margin-bottom: 0 !important;
+    .mat-icon {
+    color: #979797;
+    vertical-align: bottom;
+    font-size: 18px;
+    width: 20px;
+    height: 20px;
+  }
+  }
+}
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
index 7e84f57ed..6d9bbca5a 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
@@ -1,5 +1,6 @@
 import { Component, OnInit } from '@angular/core'
-import { Router } from '@angular/router'
+import { ActivatedRoute, Router } from '@angular/router'
+import { BlendedApporvalService } from '../../services/blended-approval.service'
 
 @Component({
   selector: 'ws-app-batch-list',
@@ -7,14 +8,37 @@ import { Router } from '@angular/router'
   styleUrls: ['./batch-list.component.scss'],
 })
 export class BatchListComponent implements OnInit {
+  programData: any
+  programID: any
+  breadcrumbs: any
 
-  constructor(private router: Router) { }
+  constructor(private router: Router, private activeRouter: ActivatedRoute, private bpService: BlendedApporvalService) {
+    const currentState = this.router.getCurrentNavigation()
+    this.programID = this.activeRouter.snapshot.params.id
+    if (currentState && currentState.extras.state) {
+      this.programData = currentState.extras.state
+    } else if (this.programID) {
+      this.getBPDetails(this.programID)
+    }
 
-  ngOnInit() {
+    if (this.programData && this.programData.name) {
+      this.breadcrumbs = {
+        titles: [{ title: 'Blended programs', url: '/app/home/blended-approvals' },
+        { title: this.programData.name, url: 'none' }],
+      }
+    }
   }
 
-  viewDetails() {
-    this.router.navigate(['/app/blended-approvals/1/batches/1'])
+  ngOnInit() { }
+
+  viewDetails(batch: any) {
+    this.router.navigate([`/app/blended-approvals/${this.programID}/batches/${batch.batchId}`], { state: batch })
+  }
+
+  getBPDetails(programID: any) {
+    this.bpService.getBlendedProgramsDetails(programID).subscribe((res: any) => {
+      this.programData = res.result.content
+    })
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
new file mode 100644
index 000000000..9176d1fdf
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
@@ -0,0 +1,24 @@
+import { Injectable } from '@angular/core'
+import { HttpClient } from '@angular/common/http'
+import { Observable } from 'rxjs'
+
+const API_END_POINTS = {
+  GET_PROGRAM_DETAILS: '/apis/proxies/v8/action/content/v3/hierarchy',
+  GET_LERANERS: '/apis/protected/v8/cohorts/course/getUsersForBatch',
+}
+
+@Injectable({
+  providedIn: 'root',
+})
+export class BlendedApporvalService {
+  constructor(private http: HttpClient) { }
+  getBlendedProgramsDetails(programID: any): Observable<any> {
+    const url = `${API_END_POINTS.GET_PROGRAM_DETAILS}/${programID}?mode=edit`
+    return this.http.get<any>(url)
+  }
+
+  getLearners(batchId: any): Observable<any> {
+    const url = `${API_END_POINTS.GET_LERANERS}/${batchId}`
+    return this.http.get<any>(url)
+  }
+}
diff --git a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
index 4c1b32d2d..b9e84025e 100644
--- a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
@@ -17,8 +17,8 @@ export class BlendedApprovalsComponent implements OnInit {
   tabledata: ITableData = {
     actions: [],
     columns: [
-      { displayName: 'Program name', key: 'title' },
-      { displayName: 'Batches', key: 'batches' },
+      { displayName: 'Program name', key: 'name' },
+      { displayName: 'Batches', key: 'batchesCount' },
       { displayName: 'Learners', key: 'learners', isList: true },
       { displayName: 'New requests (Across batches)', key: 'newrequests', isList: true },
     ],
@@ -50,23 +50,28 @@ export class BlendedApprovalsComponent implements OnInit {
         query: '',
         filters: {
           status: ['Live'],
-          primaryCategory: ['Course', 'Program', 'Standalone Assessment'],
-          reviewerIDs: this.configSvc.userProfile ? this.configSvc.userProfile.userId : '',
+          primaryCategory: ['Blended Program'],
         },
         sort_by: { lastUpdatedOn: 'desc' },
         facets: ['primaryCategory', 'mimeType'],
-        limit: 100,
+        limit: 5,
         offset: 0,
       },
     }
     this.bpService.getBlendedPrograms(req).subscribe((res: any) => {
-      console.log('BP list', res.result)
+      const resultList = res.result.content
+      resultList.forEach((val: any) => {
+        val.batchesCount = val.batches.length
+        val.learners = val.learnersCount
+        val.newrequests = val.requestsCount
+      })
+      this.data = resultList
     })
   }
 
   viewDetails(event: any) {
-    console.log('event', event.target.value)
-    this.router.navigate(['/app/blended-approvals/1/batches'])
+    const id = event.identifier
+    this.router.navigate([`/app/blended-approvals/${id}/batches`], { state: event })
   }
 
   get getTableData() {

From 3975a394375794119e3138453da45405f1ef8778 Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Fri, 16 Jun 2023 14:59:07 +0530
Subject: [PATCH 115/887] Blended pages UI updates

---
 .../batch-details/batch-details.component.scss  |  3 ++-
 .../batch-list/batch-list.component.html        | 16 ++++++++++++----
 .../batch-list/batch-list.component.scss        | 17 +++++++++++------
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss
index ef3faff78..7f59dad06 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss
@@ -35,6 +35,7 @@
     border-top-width: 0;
     border-left-width: 0;
     border-right-width: 0;
+    padding: 0.5em 1em !important;
   }
 
   .filter-option:first-child {
@@ -47,7 +48,7 @@
   flex-wrap: wrap;
 }
 .box > * {
-  flex: 1 1 400px;
+  flex: 0 0 550px;
 
   @include breakpoint-s {
     flex: 1 1 350px;
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
index 509d88d30..3282be5cc 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
@@ -8,11 +8,19 @@
     <mat-card-content>
       <ng-container>
         <div class="batches-lsit" *ngIf="programData && programData.batches">
-          <div class="grey-box paddig-m ws-mat-accent-border mat-body-2 cursor-pointer margin-bottom-m margin-right-l"
+          <div class="grey-box ws-mat-accent-border mat-body-2 cursor-pointer margin-bottom-m margin-right-l"
             (click)="viewDetails(batch)" *ngFor="let batch of programData.batches">
-            <div><span class="font-bold">Batch 1</span> <span class="float-right">{{batch.batchId}}</span></div>
-            <p class="mat-body-2"><mat-icon>event</mat-icon> {{batch.startDate}} - {{batch.endDate}}</p>
-            <p class="mat-body-2"><mat-icon>event</mat-icon> {{batch.enrollmentEndDate}}</p>
+            <div class="padding-left-s padding-right-s padding-xs">
+              <span class="font-bold mat-body">Batch 1</span>
+              <span class="float-right mat-body-2">{{batch.batchId}}</span>
+            </div>
+            <p class="padding-left-s padding-right-s margin-top-xs mat-body-2"><mat-icon>event</mat-icon>
+              {{batch.startDate}} -
+              {{batch.endDate}}</p>
+            <p class="padding-left-s padding-right-s margin-top-xs mat-body-2"><mat-icon>event</mat-icon>
+              {{batch.enrollmentEndDate}}</p>
+            <div class="request-box mat-body-2 margin-top-xs padding-xs padding-left-s padding-right-s">0 New requests
+            </div>
           </div>
         </div>
       </ng-container>
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss
index 4417bfa27..b6a30e3a3 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss
@@ -4,7 +4,6 @@
 
 .grey-box {
   background: #F5F5F5;
-  padding: 1em;
   display: inline-block;
   width: 28%;
   border-radius: 4px;
@@ -12,11 +11,17 @@
   .mat-body-2 {
     margin-bottom: 0 !important;
     .mat-icon {
-    color: #979797;
-    vertical-align: bottom;
-    font-size: 18px;
-    width: 20px;
-    height: 20px;
+      color: #979797;
+      vertical-align: bottom;
+      font-size: 18px;
+      width: 20px;
+      height: 20px;
+    }
   }
+
+  .request-box {
+    color: #D96454;
+    font: 600 14px/18px Lato !important;
+    border-top: 1px solid rgba(0, 0, 0, 0.08);
   }
 }

From b287955061941febc4d96092390836cf2896ba9d Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Tue, 20 Jun 2023 12:56:43 +0530
Subject: [PATCH 116/887]  UI updates

---
 .../components/batch-details/batch-details.component.html  | 7 +++----
 .../components/batch-list/batch-list.component.html        | 4 ++--
 .../blended-approvals/blended-approvals.component.ts       | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
index 6853c4425..bf820be34 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
@@ -2,7 +2,7 @@
   <mat-card class="flex-custom ws-mat-accent-border batch-detailspage">
     <ws-widget-breadcrumbs-org [widgetData]="breadcrumbs" *ngIf="breadcrumbs"></ws-widget-breadcrumbs-org>
     <div class="flex-4 mobile-margin mat-h2">
-      Batch 1
+      {{batchData.name}}
     </div>
     <mat-card-content>
       <ng-container>
@@ -12,8 +12,7 @@
             <li><mat-icon>tag</mat-icon> {{batchData.batchId}}</li>
             <li><mat-icon>event</mat-icon> {{batchData.startDate}} - {{batchData.endDate}}</li>
             <li><mat-icon>event</mat-icon> {{batchData.enrollmentEndDate}}</li>
-            <li *ngIf="approvedUsers && approvedUsers.length > 0"><mat-icon>people</mat-icon> {{approvedUsers.length}}
-              Learners</li>
+            <li><mat-icon>people</mat-icon> {{approvedUsers.length}} Learners</li>
           </ul>
         </div>
       </ng-container>
@@ -23,7 +22,7 @@
           <div class="flex flex-1 filter max-height-60">
             <a class="filter-option cursor-pointer" [ngClass]="{'ws-mat-accent-border-active font-bold' : currentFilter === 'pending',
                                                 'ws-mat-accent-border font-medium':currentFilter !== 'pending'}"
-              mat-button (click)="filter('pending')" role="button">Pending requests</a>
+              mat-button (click)="filter('pending')" role="button">New requests</a>
             <a class="filter-option cursor-pointer"
               [ngClass]="{'ws-mat-accent-border-active font-bold' : currentFilter === 'approved',
                                                               'ws-mat-accent-border font-medium':currentFilter !== 'approved'}" mat-button
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
index 3282be5cc..e9e1246a8 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
@@ -8,10 +8,10 @@
     <mat-card-content>
       <ng-container>
         <div class="batches-lsit" *ngIf="programData && programData.batches">
-          <div class="grey-box ws-mat-accent-border mat-body-2 cursor-pointer margin-bottom-m margin-right-l"
+          <div class="grey-box ws-mat-accent-border cursor-pointer margin-bottom-m margin-right-l"
             (click)="viewDetails(batch)" *ngFor="let batch of programData.batches">
             <div class="padding-left-s padding-right-s padding-xs">
-              <span class="font-bold mat-body">Batch 1</span>
+              <span class="mat-subheading-2">{{batch.name}}</span>
               <span class="float-right mat-body-2">{{batch.batchId}}</span>
             </div>
             <p class="padding-left-s padding-right-s margin-top-xs mat-body-2"><mat-icon>event</mat-icon>
diff --git a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
index b9e84025e..f0dcf86b0 100644
--- a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
@@ -54,7 +54,7 @@ export class BlendedApprovalsComponent implements OnInit {
         },
         sort_by: { lastUpdatedOn: 'desc' },
         facets: ['primaryCategory', 'mimeType'],
-        limit: 5,
+        limit: 1000,
         offset: 0,
       },
     }

From 4c6b1741294136047f711cebbce59bfe41e159f4 Mon Sep 17 00:00:00 2001
From: ajithkumar1995 <ajith.gajendheran@tarento.com>
Date: Tue, 20 Jun 2023 16:10:09 +0530
Subject: [PATCH 117/887] report downloads

---
 .../routes/users-view/users-view.component.ts | 109 +++++++++++-------
 1 file changed, 68 insertions(+), 41 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 17768c6e5..42d24db10 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -252,54 +252,81 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   }
 
   async downloadUserList() {
-    // const tempData: any = []
-    // if (this.currentFilter === 'active') {
-    //   this.activeUsers.forEach((element: any) => {
-    //     let tempRoles = ''
-    //     element.role.forEach((roleEle: any, index: any) => {
-    //       tempRoles = `${roleEle}${(index === 0) ? '' : ', '}${tempRoles}`
-    //     })
-    //     tempData.push({
-    //       'Full Name': element.fullname,
-    //       Email: element.email,
-    //       Roles: tempRoles,
-    //       Active: element.active,
-    //       // 'Organisation ID': element.orgId,
-    //       // 'Organisation Name': element.orgName,
-    //     })
-    //   })
-    // }
-    // if (this.currentFilter === 'inactive') {
-    //   this.inActiveUsers.forEach((element: any) => {
-    //     let tempRoles = ''
-    //     element.role.forEach((roleEle: any, index: any) => {
-    //       tempRoles = `${roleEle}${(index === 0) ? '' : ', '}${tempRoles}`
-    //     })
-    //     tempData.push({
-    //       'Full Name': element.fullname,
-    //       Email: element.email,
-    //       Roles: tempRoles,
-    //       Active: element.active,
-    //       // 'Organisation ID': element.orgId,
-    //       // 'Organisation Name': element.orgName,
-    //     })
-    //   })
-    // }
-    // const ws: XLSX.WorkSheet = XLSX.utils.json_to_sheet(tempData)
-    // const wb: XLSX.WorkBook = XLSX.utils.book_new()
-    // XLSX.utils.book_append_sheet(wb, ws, 'Sheet1')
-    // XLSX.writeFile(wb, `${(this.currentFilter === 'active') ?
-    // 'Active-' : (this.currentFilter === 'inactive') ? 'Inactive-' : ''}UserList.xlsx`)
-    // const tempDate = new Date() ${tempDate.getFullYear()}-${month}-${tempDate.getDate()}
+
+    const popup = this.snackBar
+
     const fileName = `userReport.xlsx`
+
     const downloadUrl = `${environment.domainName}${environment.userBucket}${this.configSvc.userProfile.rootOrgId}/${fileName}`
-    window.location.href = downloadUrl
+
+
+    const xhr = new XMLHttpRequest()
+
+    xhr.onreadystatechange = () => {
+
+      if (xhr.readyState !== 4) {
+
+        return
+
+      }
+
+      if (xhr.status === 200) {
+
+        window.location.href = downloadUrl
+
+      } else {
+
+        popup.open('File not generated yet!')
+
+      }
+
+    }
+
+    xhr.open('GET', downloadUrl)
+
+    xhr.send()
+
   }
 
+
+
+
   downloadConsumptionReport() {
+
+    const popup = this.snackBar
+
     const fileName = `userEnrolmentReport.xlsx`
+
     const downloadUrl = `${environment.domainName}${environment.userBucket}${this.configSvc.userProfile.rootOrgId}/${fileName}`
-    window.location.href = downloadUrl
+
+    // window.location.href = downloadUrl
+
+    const xhr = new XMLHttpRequest()
+
+    xhr.onreadystatechange = () => {
+
+      if (xhr.readyState !== 4) {
+
+        return
+
+      }
+
+      if (xhr.status === 200) {
+
+        window.location.href = downloadUrl
+
+      } else {
+
+        popup.open('File not generated yet!')
+
+      }
+
+    }
+
+    xhr.open('GET', downloadUrl)
+
+    xhr.send()
+
   }
 
   onUploadClick() {

From 9f5cc10ad117feab04bdf8dd29838512a6f76207 Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Tue, 20 Jun 2023 17:03:24 +0530
Subject: [PATCH 118/887] added click events in batch details page & corrected
 page reload

---
 .../batch-details.component.html              |  4 +-
 .../batch-details/batch-details.component.ts  |  4 ++
 .../users-card/users-card.component.html      |  6 +--
 .../users-card/users-card.component.ts        | 47 ++++++++++++++++---
 .../services/blended-approval.service.ts      |  7 ++-
 5 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
index bf820be34..de448b994 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
@@ -1,4 +1,4 @@
-<div class="flex flex-4 flex-column">
+<div class="flex flex-4 flex-column" *ngIf="batchData">
   <mat-card class="flex-custom ws-mat-accent-border batch-detailspage">
     <ws-widget-breadcrumbs-org [widgetData]="breadcrumbs" *ngIf="breadcrumbs"></ws-widget-breadcrumbs-org>
     <div class="flex-4 mobile-margin mat-h2">
@@ -36,7 +36,7 @@
         <ng-container *ngIf="currentFilter === 'pending'">
           <div class="b-c box">
             <div *ngFor="let user of usersData">
-              <ws-app-users-card [user]="user" [actions]="true"></ws-app-users-card>
+              <ws-app-users-card [user]="user" [actions]="true" (userClick)="onSubmit($event)"></ws-app-users-card>
             </div>
           </div>
         </ng-container>
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index 6614435cc..1f737983a 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -111,4 +111,8 @@ export class BatchDetailsComponent implements OnInit {
     })
   }
 
+  onSubmit(event: any) {
+    console.log('======', event)
+  }
+
 }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.html
index e78dd36e4..ebc117138 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.html
@@ -1,4 +1,4 @@
-<div class="flex flex-row items-center card-container ws-mat-primary-tags" (click)="goToUserProfile(user)">
+<div class="flex flex-row items-center card-container ws-mat-primary-tags">
   <a href="javascript:void(0)" class="flex flex-1 items-center ws-mat-primary-tags" i18n-aria-label role="link"
     aria-label="click on it to visit user profile">
     <div class="mr-3">
@@ -15,9 +15,9 @@
     </div>
     <div *ngIf="actions">
       <button type="button" mat-button class="margin-right-m cursor-pointer border-0"
-        (click)="onSubmit('Reject')">Reject</button>
+        (click)="clickReject()">Reject</button>
       <button type="button" mat-button class="approve-btn cursor-pointer mat-accent-border"
-        (click)="onSubmit('Approve')">Approve</button>
+        (click)="clickApprove()">Approve</button>
     </div>
   </a>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
index 84817a372..73eebfb27 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
@@ -1,4 +1,6 @@
-import { Component, Input, OnInit } from '@angular/core'
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
+import { MatDialog } from '@angular/material'
+import { DialogConfirmComponent } from '../../../../../../../../../src/app/component/dialog-confirm/dialog-confirm.component'
 
 @Component({
   selector: 'ws-app-users-card',
@@ -8,12 +10,11 @@ import { Component, Input, OnInit } from '@angular/core'
 export class UsersCardComponent implements OnInit {
   @Input() user!: any
   @Input() actions: any
+  @Output() userClick = new EventEmitter()
 
-  constructor() { }
+  constructor(private dialogue: MatDialog) { }
 
-  ngOnInit() {
-    console.log('actions', this.actions)
-  }
+  ngOnInit() { }
 
   getUseravatarName() {
     let name = ''
@@ -49,8 +50,40 @@ export class UsersCardComponent implements OnInit {
     return name
   }
 
-  onSubmit(actiontype: any) {
-    console.log('actiontype', actiontype)
+  clickApprove() {
+    const dialogRef = this.dialogue.open(DialogConfirmComponent, {
+      data: {
+        title: 'Are you sure?',
+        body: `Please click <strong>Yes</strong> to approve this request.`,
+      },
+    })
+    dialogRef.afterClosed().subscribe((response: any) => {
+      if (response) {
+        const data = {
+          action: 'Approve',
+          userData: this.user,
+        }
+        this.userClick.emit(data)
+      }
+    })
+  }
+
+  clickReject() {
+    const dialogRef = this.dialogue.open(DialogConfirmComponent, {
+      data: {
+        title: 'Are you sure?',
+        body: `Please click <strong>Yes</strong> to reject this request.`,
+      },
+    })
+    dialogRef.afterClosed().subscribe((response: any) => {
+      if (response) {
+        const data = {
+          action: 'Reject',
+          userData: this.user,
+        }
+        this.userClick.emit(data)
+      }
+    })
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
index 9176d1fdf..b51c2e310 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
@@ -3,6 +3,7 @@ import { HttpClient } from '@angular/common/http'
 import { Observable } from 'rxjs'
 
 const API_END_POINTS = {
+  UPDATE_REQUEST: '/v1/blendedprogram/workflow/update',
   GET_PROGRAM_DETAILS: '/apis/proxies/v8/action/content/v3/hierarchy',
   GET_LERANERS: '/apis/protected/v8/cohorts/course/getUsersForBatch',
 }
@@ -13,7 +14,7 @@ const API_END_POINTS = {
 export class BlendedApporvalService {
   constructor(private http: HttpClient) { }
   getBlendedProgramsDetails(programID: any): Observable<any> {
-    const url = `${API_END_POINTS.GET_PROGRAM_DETAILS}/${programID}?mode=edit`
+    const url = `${API_END_POINTS.GET_PROGRAM_DETAILS}/${programID}`
     return this.http.get<any>(url)
   }
 
@@ -21,4 +22,8 @@ export class BlendedApporvalService {
     const url = `${API_END_POINTS.GET_LERANERS}/${batchId}`
     return this.http.get<any>(url)
   }
+
+  updateBlendedRequests(req: any) {
+    return this.http.post<any>(`${API_END_POINTS.UPDATE_REQUEST}`, req)
+  }
 }

From 3415155b2cacc1a7369f5226c6250ed1abbd21a2 Mon Sep 17 00:00:00 2001
From: ajithkumar1995 <ajith.gajendheran@tarento.com>
Date: Wed, 21 Jun 2023 11:57:06 +0530
Subject: [PATCH 119/887] popup change

---
 .../routes/home/routes/roles-access/roles-access.component.ts  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.ts b/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.ts
index 58e932b39..48ac4390f 100644
--- a/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.ts
@@ -51,7 +51,9 @@ export class RolesAccessComponent implements OnInit, AfterViewInit, OnDestroy {
 
   /* Click event to navigate to a particular role */
   onRoleClick(role: any) {
+    debugger
     this.router.navigate([`/app/roles/${role.role}/users`])
+    // this.router.navigate([`/app/home/roles-users`], { queryParams: { role: event.role, orgID: rootOrgId } })
     // this.telemetrySvc.impression()
     this.events.raiseInteractTelemetry(
       {
@@ -67,6 +69,7 @@ export class RolesAccessComponent implements OnInit, AfterViewInit, OnDestroy {
 
   }
   fetchIndidualRoleData(rootOrgId: string, rolename: string) {
+    debugger
     this.usersService.getAllRoleUsers(rootOrgId, rolename).subscribe(data => {
       this.roleCountSpinner = true
       const individualCount = data.count

From 9e25d7773add0bba298beb73939948d82d3cb972 Mon Sep 17 00:00:00 2001
From: ajithkumar1995 <ajith.gajendheran@tarento.com>
Date: Wed, 21 Jun 2023 12:07:29 +0530
Subject: [PATCH 120/887] popup message change

---
 .../routes/home/routes/users-view/users-view.component.ts | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 42d24db10..e4af2bef4 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -259,7 +259,6 @@ export class UsersViewComponent implements OnInit, OnDestroy {
 
     const downloadUrl = `${environment.domainName}${environment.userBucket}${this.configSvc.userProfile.rootOrgId}/${fileName}`
 
-
     const xhr = new XMLHttpRequest()
 
     xhr.onreadystatechange = () => {
@@ -276,7 +275,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
 
       } else {
 
-        popup.open('File not generated yet!')
+        popup.open('Report is not available')
 
       }
 
@@ -288,9 +287,6 @@ export class UsersViewComponent implements OnInit, OnDestroy {
 
   }
 
-
-
-
   downloadConsumptionReport() {
 
     const popup = this.snackBar
@@ -317,7 +313,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
 
       } else {
 
-        popup.open('File not generated yet!')
+        popup.open('Report is not available')
 
       }
 

From 0e3a2b12bc34b29b874a8b59a2fbd13a24f9892b Mon Sep 17 00:00:00 2001
From: ajithkumar1995 <ajith.gajendheran@tarento.com>
Date: Wed, 21 Jun 2023 16:09:56 +0530
Subject: [PATCH 121/887] lint errors

---
 .../routes/home/routes/roles-access/roles-access.component.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.ts b/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.ts
index 48ac4390f..21e52cce1 100644
--- a/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.ts
@@ -51,7 +51,7 @@ export class RolesAccessComponent implements OnInit, AfterViewInit, OnDestroy {
 
   /* Click event to navigate to a particular role */
   onRoleClick(role: any) {
-    debugger
+    // debugger
     this.router.navigate([`/app/roles/${role.role}/users`])
     // this.router.navigate([`/app/home/roles-users`], { queryParams: { role: event.role, orgID: rootOrgId } })
     // this.telemetrySvc.impression()
@@ -69,7 +69,7 @@ export class RolesAccessComponent implements OnInit, AfterViewInit, OnDestroy {
 
   }
   fetchIndidualRoleData(rootOrgId: string, rolename: string) {
-    debugger
+    // debugger
     this.usersService.getAllRoleUsers(rootOrgId, rolename).subscribe(data => {
       this.roleCountSpinner = true
       const individualCount = data.count

From 719f47ac89086e42ceb54b4694a3bd4248520237 Mon Sep 17 00:00:00 2001
From: Saurav Verma <saurav.verma@tarento.com>
Date: Wed, 21 Jun 2023 17:04:32 +0530
Subject: [PATCH 122/887] accept reject ui work started

---
 .../batch-details.component.html              |   2 +-
 .../user-view/user-view.component.html        | 255 +++++++++++
 .../user-view/user-view.component.scss        | 399 ++++++++++++++++++
 .../user-view/user-view.component.ts          | 241 +++++++++++
 4 files changed, 896 insertions(+), 1 deletion(-)
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/user-view/user-view.component.html
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/user-view/user-view.component.scss
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/user-view/user-view.component.ts

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
index bf820be34..a349efb6e 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
@@ -36,7 +36,7 @@
         <ng-container *ngIf="currentFilter === 'pending'">
           <div class="b-c box">
             <div *ngFor="let user of usersData">
-              <ws-app-users-card [user]="user" [actions]="true"></ws-app-users-card>
+              <ws-app-users-card [user]="user" [actions]="true" (click)=""></ws-app-users-card>
             </div>
           </div>
         </ng-container>
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/user-view/user-view.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/user-view/user-view.component.html
new file mode 100644
index 000000000..bc10f60f7
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/user-view/user-view.component.html
@@ -0,0 +1,255 @@
+<div class="flex flex-4 flex-column">
+  <mat-card class="flex-custom" [attr.id]="tabsData && tabsData[0] && tabsData[0].key">
+    <mat-card-header class="flex-custom-m" *ngIf="portalProfile && portalProfile.personalDetails">
+      <div mat-card-avatar class="example-header-image">
+        <ng-container *ngIf="portalProfile.personalDetails.firstname && portalProfile.personalDetails.surname">
+          <ws-widget-avatar-photo [photoUrl]="portalProfile.photo || null" [name]="portalProfile.personalDetails.firstname +
+          ' ' +
+          portalProfile.personalDetails.surname"  size="xxl-s">
+          </ws-widget-avatar-photo>
+        </ng-container>
+        <ng-container *ngIf="portalProfile.personalDetails.firstName && !portalProfile.personalDetails.surname">
+        <ws-widget-avatar-photo [photoUrl]="portalProfile.photo || null" [name]="
+            portalProfile.personalDetails.firstName" size="xxl-s">
+        </ws-widget-avatar-photo>
+        </ng-container>
+      </div>
+      <div class="flex-1">
+
+        <div class="flex flex-1">
+          <div class="flex flex-4">
+          <ng-container *ngIf="portalProfile.personalDetails.firstname && portalProfile.personalDetails.surname">
+            <mat-card-title role="link" tabindex="0" class="flex mobile-margin text-capitalize mat-h2" [innerHTML]="
+              portalProfile.personalDetails.firstname 
+            ">
+            <span *ngIf="verifiedBadge" class="profile-badge">  <img class="profile-badge" src="fusion-assets/images/profile-badge.png" height="18">
+            </span>
+           </mat-card-title>
+            </ng-container>
+          <ng-container *ngIf="portalProfile.personalDetails.firstName && !portalProfile.personalDetails.surname">
+            <mat-card-title role="link" tabindex="0" class="flex mobile-margin text-capitalize mat-h2" [innerHTML]="
+              portalProfile.personalDetails.firstName 
+            ">
+            <span *ngIf="verifiedBadge" class="profile-badge">  <img class="profile-badge" src="fusion-assets/images/profile-badge.png" height="18">
+            </span>
+           </mat-card-title>
+           
+            </ng-container>
+            <!-- <div class="flex verified">
+              <mat-icon class="ws-mat-green-text" svgIcon="verified"></mat-icon>
+            </div> -->
+            <span *ngIf="verifiedBadge" class="profile-badge">  <img class="profile-badge" src="fusion-assets/images/profile-badge.png" height="18">
+            </span>
+          </div>
+          
+          <div class="flex flex-1 flex-row-reverse">
+            <div *ngIf="
+                portalProfile.id === currentUser ||
+                portalProfile.userId === currentUser
+              " class="ml-4 mr-6 mb-2 view-more ws-mat-accent-text view-all ws-mat-primary-lite-background-important">
+              <a mat-button [routerLink]="'/app/user-profile/details'">
+                <mat-icon class="margin-right-xs">edit</mat-icon>
+                <span i18n>{{ 'Edit Profile' }}</span>
+              </a>
+            </div>
+          </div>
+        </div>
+        <mat-card-subtitle role="link" tabindex="0" i18n-aria-label>
+          {{ portalProfile?.employmentDetails?.departmentName }}
+        </mat-card-subtitle>
+        <mat-card-subtitle role="link" tabindex="0" i18n-aria-label>
+          {{ portalProfile?.employmentDetails?.officialPostalAddress }}
+        </mat-card-subtitle>
+        <!-- <mat-card-subtitle>{{discussProfileData.email}}</mat-card-subtitle> -->
+        <ng-container>
+          <div class="flex flex-1 custom margin-0 margin-top-m bottom-fix mob" role="link" tabindex="0">
+            <div class="flex flex-1">
+              <span class="flex margin-right-l mobile">
+                <span class="ws-mat-default-text">{{
+                  connectionRequests?.length
+                  }}</span>
+                <span class="pad-4">Connections</span>
+              </span>
+              <span class="flex margin-right-l mobile">
+                <!-- {{discussProfileData | json}} -->
+                <span class="ws-mat-default-text">{{
+                  Math.abs(discussProfileData?.topiccount || 0)
+                  }}</span>
+                <span class="pad-4">Discussions</span>
+              </span>
+            </div>
+            <!-- <div class="flex flex-1" class="text-right mobile2">
+
+                <span class="noocoments" mat-card-subtitle>Last online
+                  {{discussProfileData.lastonline | pipeRelativeTime}}</span>
+              </div> -->
+          </div>
+        </ng-container>
+      </div>
+    </mat-card-header>
+    <mat-card-header class="flex-custom-m" *ngIf="!portalProfile || !portalProfile.personalDetails">
+      <div class="flex-1" role="link" tabindex="0">
+        <div class="flex flex-1">
+          <mat-card-title class="flex-4 mobile-margin text-capitalize mat-h2">
+            No Information Available
+          </mat-card-title>
+        </div>
+      </div>
+    </mat-card-header>
+  </mat-card>
+
+  <!-- <div class="flex flex-1 custom"> -->
+  <!-- <div class="container-balanced"> -->
+
+  <mat-sidenav-container name="discuss-menu" class="min-height margin-top-m">
+    <!-- <div class="flex-1" style="position: relative;"> -->
+    <!-- <mat-sidenav  [(opened)]="sideNavBarOpened" class="border-0">
+      <div class="contain">
+
+          <div #stickyMenu [class.sticky]="sticky">
+            <app-profile-v2-left-menu [tabsData]="tabsData" class="flex flex-1"></app-profile-v2-left-menu>
+          </div>
+
+      </div>
+    </mat-sidenav> -->
+
+    <mat-sidenav [mode]="mode$ | async" [(opened)]="sideNavBarOpened" class="border-0 sidenav_inner">
+      <div class="contain">
+        <div class="flex-1" style="position: relative">
+          <div #stickyMenu [class.sticky]="sticky">
+            <app-profile-v2-left-menu [tabsData]="tabsData" class="flex flex-1"></app-profile-v2-left-menu>
+          </div>
+        </div>
+      </div>
+    </mat-sidenav>
+
+    <mat-sidenav-content class="sidenav_content">
+      <div *ngIf="screenSizeIsLtMedium">
+        <button type="button" mat-icon-button (click)="sideNavBarOpened = !sideNavBarOpened"
+          id="ws-auth-root-home-btn-menu" name="ws-auth-root-home-btn-menu">
+          <mat-icon>menu</mat-icon>
+        </button>
+      </div>
+
+      <div class="main_network_box">
+        <ng-container *ngFor="let tab of tabsData;let i=index">
+          <!-- <ws-widget-profile-v2-academics *ngIf="pdfData" [widgetData]="tab"></ws-widget-profile-v2-academics> -->
+          <ng-container *ngIf="tab && tab.render && tab.enabled">
+            <ng-container *ngIf="
+            portalProfile.id === currentUser ||
+            portalProfile.userId === currentUser
+          ">
+              <ng-container *ngIf="tab.key === 'certifications'" [wsResolverWidget]="{
+                widgetType: tab.widget.widgetType,
+                widgetSubType: tab.widget.widgetSubType,
+                widgetHostClass: tab.widget.widgetHostClass,
+                widgetData: {
+                  name: tab.name,
+                  key: tab.key,
+                  data: enrolledCourse,
+                  certificates: allCertificate
+                }
+              }">
+              </ng-container>
+            </ng-container>
+            <ng-container *ngIf="tab.key !== 'certifications'" [wsResolverWidget]="{
+                widgetType: tab.widget.widgetType,
+                widgetSubType: tab.widget.widgetSubType,
+                widgetHostClass: tab.widget.widgetHostClass,
+                widgetData: {
+                  name: tab.name,
+                  key: tab.key,
+                  data: portalProfile[tab.dataKey]
+                }
+              }"></ng-container>
+          </ng-container>
+        </ng-container>
+        <ng-container *ngIf="discussionList">
+          <div [attr.id]="discussions"
+            class="flex flex-1 flex-column margin-top-xs margin-botton-xs dark-card discussion-card"
+            style="box-shadow: none">
+            <!-- <mat-card [attr.id]='discussions' class="margin-left-xs margin-top-xs margin-botton-xs dark-card discussion-card"
+          style="box-shadow: none;"> -->
+
+            <!-- <mat-card-content> -->
+            <div class="flex flex-1">
+              <span class="margin-bottom-xs margin-top-l mat-title flex-1">{{
+                'Discussions'
+                }}</span>
+              <!-- <div
+                class="ml-4 mr-6 mb-2 view-more ws-mat-accent-text view-all ws-mat-primary-lite-background-important">
+                <a mat-button [routerLink]="'/app/discuss/my-discussions'">
+                   <span i18n>{{'Go to discussion profile'}}</span>
+                </a>
+              </div> -->
+            </div>
+            <ng-container>
+              <!-- <mat-card class="recent-tabs"> -->
+              <div class="w-full">
+                <div class="flex flex-1 flex-column filter_outer_box">
+                  <div class="flex flex-1 filter flex-wrap">
+                    <a href="javascript:void(0)" class="filter-option font-normal" i18n-aria-label role="button"
+                      [ngClass]="{
+                        'ws-mat-accent-border-active':
+                          currentFilter === 'timestamp',
+                        'ws-mat-accent-border font-medium':
+                          currentFilter !== 'timestamp'
+                      }" mat-button (click)="filter('timestamp')">
+                      Recent posts
+                    </a>
+                    <a href="javascript:void(0)" class="filter-option" i18n-aria-label role="button" [ngClass]="{
+                        'ws-mat-accent-border-active': currentFilter === 'best',
+                        'ws-mat-accent-border font-medium':
+                          currentFilter !== 'best'
+                      }" mat-button (click)="filter('best')">
+                      Best posts
+                    </a>
+                    <a href="javascript:void(0)" class="filter-option" i18n-aria-label role="button" [ngClass]="{
+                        'ws-mat-accent-border-active':
+                          currentFilter === 'saved',
+                        'ws-mat-accent-border font-medium':
+                          currentFilter !== 'saved'
+                      }" mat-button (click)="filter('saved')" *ngIf="
+                        portalProfile.id === currentUser ||
+                        portalProfile.userId === currentUser
+                      ">
+                      Saved posts
+                    </a>
+                  </div>
+                </div>
+                <!-- </mat-card> -->
+              </div>
+            </ng-container>
+            <ng-container *ngIf="discussionList && discussionList.length > 0">
+              <ng-container *ngFor="let data of discussionList">
+                <app-dicuss-post-card [discuss]="data"></app-dicuss-post-card>
+              </ng-container>
+            </ng-container>
+            <ng-container *ngIf="!(discussionList && discussionList.length > 0)">
+              <mat-card class="no-shadow mat-card margin-bottom-l">
+                <mat-card-header>
+                  <mat-card-title>No Data</mat-card-title>
+                </mat-card-header>
+                <mat-card-content>
+                  <span>&nbsp;</span>
+                </mat-card-content>
+              </mat-card>
+            </ng-container>
+            <!-- </mat-card-content> -->
+            <!-- </mat-card> -->
+          </div>
+        </ng-container>
+      </div>
+    </mat-sidenav-content>
+
+    <div class="flex flex-1 custom">
+      <div class="flex-1" style="position: relative">
+        <div #stickyMenu [class.sticky]="sticky">
+          <app-profile-v2-right-menu class="flex flex-1"></app-profile-v2-right-menu>
+        </div>
+      </div>
+    </div>
+
+    <!-- </div> -->
+  </mat-sidenav-container>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/user-view/user-view.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/user-view/user-view.component.scss
new file mode 100644
index 000000000..b76653e67
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/user-view/user-view.component.scss
@@ -0,0 +1,399 @@
+@import 'ws-common';
+@import 'ws-vars';
+@import 'ws-mixins';
+
+.buton {
+  display: flex;
+  border: 1px solid;
+  flex: 1;
+  background: red;
+  align-content: center;
+  text-align: center;
+}
+
+.verified {
+  margin-left: $size-xs;
+  margin-top:#{$size-xs / 4}
+}
+
+.container-balanced {
+  max-width: 1202px;
+  margin-left: auto !important;
+  margin-right: auto !important;
+  height: auto;
+  min-height: 400px;
+}
+
+.flex-4 {
+  flex: 4;
+}
+
+.mob {
+  @include breakpoint-xs {
+    bottom: 0 !important;
+    position: unset !important;
+  }
+}
+
+.font-medium {
+  font-weight: 500 !important;
+}
+
+.bottom-fix {
+  bottom: 1.5rem;
+  position: absolute;
+}
+
+.view-more {
+  display: flex;
+  align-items: center;
+  text-align: center;
+  border: 1px solid;
+
+  .icon {
+    $icon-size: 24px;
+    font-size: $icon-size;
+    width: $icon-size;
+    height: $icon-size;
+    border: 1px solid;
+    border-radius: 50%;
+    padding: 8px;
+    margin-bottom: 8px;
+    margin-right: $size-s;
+  }
+}
+
+.view-all {
+  display: flex;
+  margin: 0 auto;
+  // border: 1px solid;
+  // font-weight: 500;
+  box-shadow: 0px 10px 30p;
+  /*#99999933*/
+  border-radius: 8px;
+  height: 40px;
+
+  @include breakpoint-xs {
+    margin: 8px 0;
+  }
+
+  a.mat-button {
+    height: 36px;
+  }
+}
+
+.responsive_icon {
+  display: none;
+}
+
+@media (min-width:320px) and (max-width:992px) {
+  .responsive_icon {
+    display: block;
+  }
+}
+
+.sidenav_inner {
+  width: 260px;
+  background-color: transparent !important;
+  border-right: 0 !important;
+
+  @include breakpoint-xs {
+    background-color: #fff !important;
+    // border-right: 1px solid !important;
+  }
+
+  @include breakpoint-s {
+    background-color: #fff !important;
+    // border-right: 1px solid !important;
+  }
+
+}
+
+// .sidenav_content {
+//   margin-left: 260px;
+// }
+
+.main_network_box {
+  margin-left: 32px;
+
+  @media (max-width:992px) {
+    margin-left: 0;
+  }
+}
+
+// ::ng-deep .mat-sidenav-backdrop.mat-sidenav-shown {
+//   visibility: hidden!important;
+// }
+
+.sticky {
+  position: sticky;
+  top: calc(#{$mat-toolbar-gt-xs});
+  overflow: hidden;
+  // z-index: 10;
+  // width: 100%;
+}
+
+@media (max-width: 768px) {
+  .filter_outer_box {
+    width: 100%;
+    overflow-x: scroll;
+    margin: 0 !important;
+    display: none !important;
+
+    .filter {
+      width: 480px;
+    }
+
+  }
+}
+
+
+
+.text-box {
+  display: flex;
+  border: 1px solid;
+  flex: 3;
+  align-content: center;
+  text-align: center;
+}
+
+.margin-fix {
+  @include breakpoint-xs {
+    margin: 0 $size-l 0 $size-l;
+  }
+
+  @include breakpoint-s {
+    margin: 0 $size-l 0 $size-l;
+  }
+}
+
+.overflow {
+  // @include breakpoint-xs {
+  //   width: 10em;
+  //   // outline: 1px solid #000;
+  //   margin: 0 0 2em 0;
+  //   text-overflow: ellipsis !important;
+  //   /**
+  //  * Required properties to achieve text-overflow
+  //  */
+  //   white-space: nowrap;
+  //   overflow: hidden;
+  // }
+  overflow: hidden;
+}
+
+.custom {
+
+  // height: 48px;
+  // max-height: 48px;
+  @include breakpoint-xs {
+    flex-direction: column;
+  }
+
+  @include breakpoint-s {
+    flex-direction: column;
+  }
+}
+
+.discuss-border {
+  border-radius: 4px;
+  /*.75rem;*/
+  border: 1px solid #DEDFE0;
+  flex: 1;
+  // max-width: 500px;
+  /* border-color: #cecece;*/
+}
+
+.discuss .mat-form-field-wrapper {
+  padding-bottom: 0px;
+
+  .mat-form-field-infix {
+    border-top-width: 5px !important;
+    padding: 0px;
+    padding-bottom: 5px;
+  }
+
+}
+
+
+.flex-3 {
+  flex: 3;
+}
+
+.filter {
+  .filter-option {
+    margin: $size-xs $size-m;
+    /* border-bottom: darkslateblue; */
+    border-radius: 0;
+    border-bottom-width: 2px;
+    border-top-width: 0;
+    border-left-width: 0;
+    border-right-width: 0;
+  }
+}
+
+.max-height-60 {
+  max-height: 60px;
+}
+
+.height-48 {
+  max-height: 48px;
+}
+
+.pagination {
+  justify-content: center;
+  flex-wrap: wrap;
+  margin-top: 0;
+  margin-bottom: 1rem;
+}
+
+.pagination {
+  display: -ms-flexbox;
+  display: flex;
+  padding-left: 0;
+  list-style: none;
+  border-radius: .25rem;
+}
+
+.page-item.active .page-link {
+  z-index: 1;
+  color: #fff;
+  background-color: #0074B6;
+  border-color: #0074B6;
+}
+
+a:not([href]):not([tabindex]) {
+  color: inherit;
+  text-decoration: none;
+}
+
+.page-link {
+  position: relative;
+  display: block;
+  padding: .5rem .75rem;
+  margin-left: -1px;
+  line-height: 1.25;
+  color: #0074B6;
+  background-color: #fff;
+  border: 1px solid #dee2e6;
+
+  &.separator {
+    font-size: 20px;
+  }
+}
+
+.page-item.disabled .page-link {
+  color: #6c757d;
+  pointer-events: none;
+  cursor: auto;
+  background-color: #fff;
+  border-color: #dee2e6;
+}
+
+.container-balanced {
+  @extend %page-center;
+}
+
+.discussion-card {
+  padding: 16px 8px;
+  box-sizing: border-box;
+}
+
+.flex-3 {
+  flex: 3;
+}
+
+.flex-update {
+  flex-direction: row;
+
+  @include breakpoint-xs {
+    flex-direction: row;
+  }
+
+  @include breakpoint-s {
+    flex-direction: row;
+  }
+}
+
+.flex-custom {
+  display: flex;
+
+  // @include breakpoint-xs {
+  flex-direction: column;
+  // }
+
+  @include breakpoint-xs {
+    margin: 0 8px;
+  }
+
+  @include breakpoint-s {
+    margin: 0 8px;
+  }
+}
+
+.flex-custom-m {
+  @include breakpoint-xs {
+    flex-direction: column;
+  }
+}
+
+.example-header-image {
+  width: auto;
+  height: auto;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.sidenav-align {
+  overflow: auto;
+  width: auto;
+  min-width: 380px;
+  min-height: 900px;
+
+}
+
+.margin-0 {
+  margin: 0;
+}
+
+.pad-4 {
+  padding: 0 0 0 $size-s;
+}
+
+.mobile-margin {
+  @include breakpoint-xs {
+    margin-top: $size-s;
+  }
+}
+
+.filter {
+  .filter-option {
+    margin: $size-s $size-s;
+    /* border-bottom: darkslateblue; */
+    border-radius: 0;
+    border-bottom-width: 2px;
+    border-top-width: 0;
+    border-left-width: 0;
+    border-right-width: 0;
+  }
+
+  .filter-option:first-child {
+    margin-left: 0;
+  }
+}
+
+.recent-tabs {
+  box-shadow: none !important;
+  border-radius: unset;
+  background: inherit !important;
+}
+
+.no-shadow {
+  box-shadow: none !important;
+}
+
+span.profile-badge {
+    padding-left: 5px;
+    padding-top: 5px;
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/user-view/user-view.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/user-view/user-view.component.ts
new file mode 100644
index 000000000..c4b3b0fcf
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/user-view/user-view.component.ts
@@ -0,0 +1,241 @@
+
+import { AfterViewInit, Component, ElementRef, HostListener, OnDestroy, OnInit, ViewChild } from '@angular/core'
+// import { NSProfileDataV2 } from '../../models/profile-v2.model'
+import { MatDialog } from '@angular/material/dialog'
+import { ActivatedRoute, Router } from '@angular/router'
+// import { DiscussService } from '../../../discuss/services/discuss.service'
+// import { ProfileV2Service } from '../../services/profile-v2.servive'
+/* tslint:disable */
+import _ from 'lodash'
+// import { NetworkV2Service } from '../../../network-v2/services/network-v2.service'
+// import { NSNetworkDataV2 } from '../../../network-v2/models/network-v2.model'
+import { ConfigurationsService, ValueService } from '@sunbird-cb/utils'
+import { map } from 'rxjs/operators'
+// import {
+//   WidgetUserService,
+//   NsContent,
+//   WidgetContentService,
+// } from '@sunbird-cb/collection'
+/* tslint:enable */
+// import {  } from '@sunbird-cb/utils'
+
+@Component({
+  selector: 'app-user-view',
+  templateUrl: './user-view.component.html',
+  styleUrls: ['./user-view.component.scss'],
+  /* tslint:disable */
+  host: { class: 'flex flex-1 margin-top-l' },
+  /* tslint:enable */
+})
+export class UserViewComponent implements OnInit, AfterViewInit, OnDestroy {
+  @ViewChild('stickyMenu', { static: true }) menuElement!: ElementRef
+  sticky = false
+  /* tslint:disable */
+  Math: any
+  /* tslint:enable */
+  elementPosition: any
+  currentFilter = 'timestamp'
+  discussionList!: any
+  discussProfileData!: any
+  // portalProfile!: NSProfileDataV2.IProfile
+  userDetails: any
+  location!: string | null
+  tabs: any
+  // tabsData: NSProfileDataV2.IProfileTab[]
+  currentUser!: string | null
+  // connectionRequests!: NSNetworkDataV2.INetworkUser[]
+  currentUsername: any
+  enrolledCourse: any = []
+  allCertificate: any = []
+
+  sideNavBarOpened = true
+  verifiedBadge = false
+  private defaultSideNavBarOpenedSubscription: any
+  public screenSizeIsLtMedium = false
+  isLtMedium$ = this.valueSvc.isLtMedium$
+  mode$ = this.isLtMedium$.pipe(map(isMedium => (isMedium ? 'over' : 'side')))
+
+  @HostListener('window:scroll', ['$event'])
+  handleScroll() {
+    const windowScroll = window.pageYOffset
+    if (windowScroll >= this.elementPosition) {
+      this.sticky = true
+    } else {
+      this.sticky = false
+    }
+  }
+
+  constructor(
+    public dialog: MatDialog,
+    private route: ActivatedRoute,
+    // private discussService: DiscussService,
+    // private networkV2Service: NetworkV2Service,
+    private configSvc: ConfigurationsService,
+    public router: Router,
+    private valueSvc: ValueService,
+    // private userSvc: WidgetUserService,
+    // private contentSvc: WidgetContentService,
+  ) {
+    this.Math = Math
+    this.currentUser = this.configSvc.userProfile && this.configSvc.userProfile.userId
+    // this.tabsData = this.route.parent && this.route.parent.snapshot.data.pageData.data.tabs || []
+    this.tabs = this.route.data.subscribe(data => {
+      if (data.profile.data.profileDetails.verifiedKarmayogi === true) {
+        this.verifiedBadge = true
+      }
+      // if (data.profile.data.profileDetails) {
+      //   this.portalProfile = data.profile.data.profileDetails
+      // } else {
+      //   this.portalProfile = data.profile.data
+      //   _.set(this.portalProfile, 'personalDetails.firstname', _.get(data.profile.data, 'firstName'))
+      //   // _.set(this.portalProfile, 'personalDetails.surname', _.get(data.profile.data, 'lastName'))
+      //   _.set(this.portalProfile, 'personalDetails.email', _.get(data.profile.data, 'email'))
+      //   _.set(this.portalProfile, 'personalDetails.userId', _.get(data.profile.data, 'userId'))
+      //   _.set(this.portalProfile, 'personalDetails.userName', _.get(data.profile.data, 'userName'))
+      // }
+
+      // const user = this.portalProfile.userId || this.portalProfile.id || _.get(data, 'profile.data.id') || ''
+      // if (this.portalProfile && !(this.portalProfile.id && this.portalProfile.userId)) {
+      //   this.portalProfile.id = user
+      //   this.portalProfile.userId = user
+      // }
+
+      /** // for loged in user only */
+      // if (user === this.currentUser) {
+      //   this.currentUsername = this.configSvc.userProfile && this.configSvc.userProfile.userName
+      // } else {
+      //   this.currentUsername = this.portalProfile.personalDetails && this.portalProfile.personalDetails !== null
+      //     ? this.portalProfile.personalDetails.userName
+      //     : this.portalProfile.userName
+      // }
+
+      // if (!this.portalProfile.personalDetails && user === this.currentUser) {
+      //   _.set(this.portalProfile, 'personalDetails.firstname', _.get(this.configSvc, 'userProfile.firstName'))
+      //   // _.set(this.portalProfile, 'personalDetails.surname', _.get(this.configSvc, 'userProfile.lastName'))
+      // }
+      /** // for loged in user only */
+      // this.decideAPICall()
+    })
+    // this.fetchUserBatchList()
+
+  }
+  // decideAPICall() {
+  //   const user = this.portalProfile.userId || this.portalProfile.id || ''
+  //   if (this.portalProfile && user) {
+  //     this.fetchUserDetails(this.currentUsername)
+  //     this.fetchConnectionDetails(user)
+  //   } else {
+
+  //     if (this.configSvc.userProfile) {
+  //       const me = this.configSvc.userProfile.userName || ''
+  //       if (me) {
+  //         this.fetchUserDetails(me)
+  //         this.fetchConnectionDetails(this.configSvc.userProfile.userId)
+  //       }
+  //     }
+
+  //   }
+  // }
+
+  ngOnInit() {
+    // int left blank
+
+    this.defaultSideNavBarOpenedSubscription = this.isLtMedium$.subscribe(isLtMedium => {
+      this.sideNavBarOpened = !isLtMedium
+    })
+  }
+
+  ngOnDestroy() {
+    if (this.tabs) {
+      this.tabs.unsubscribe()
+    }
+
+    if (this.defaultSideNavBarOpenedSubscription) {
+      this.defaultSideNavBarOpenedSubscription.unsubscribe()
+    }
+  }
+
+  ngAfterViewInit() {
+    this.elementPosition = this.menuElement.nativeElement.parentElement.offsetTop
+  }
+  fetchUserDetails(name: string) {
+    if (name) {
+      // this.discussService.fetchProfileInfo(name).subscribe((response: any) => {
+      //   if (response) {
+      //     this.discussProfileData = response
+      //     this.discussionList = _.uniqBy(_.filter(this.discussProfileData.posts, p => _.get(p, 'isMainPost') === true), 'tid') || []
+      //   }
+      // })
+    }
+  }
+  // fetchConnectionDetails(wid: string) {
+  //   // this.networkV2Service.fetchAllConnectionEstablishedById(wid).subscribe(
+  //   //   (data: any) => {
+  //   //     this.connectionRequests = data.result.data
+  //   //   },
+  //   //   (_err: any) => {
+  //   //     // this.openSnackbar(err.error.message.split('|')[1] || this.defaultError)
+  //   //   })
+  // }
+
+  filter(key: string | 'timestamp' | 'best' | 'saved') {
+    if (key) {
+      this.currentFilter = key
+      switch (key) {
+        case 'timestamp':
+          // this.discussionList = _.uniqBy(_.filter(this.discussProfileData.posts, p => _.get(p, 'isMainPost') === true), 'tid')
+          this.discussionList = this.discussProfileData.posts.filter((p: any) => (p.isMainPost === true))
+          break
+        case 'best':
+          // this.discussionList = _.uniqBy(this.discussProfileData.bestPosts, 'tid')
+          this.discussionList = this.discussProfileData.bestPosts
+          break
+        case 'saved':
+          // this.discussService.fetchSaved(this.currentUsername).subscribe((response: any) => {
+          //   if (response) {
+          //     // this.discussionList = _.uniqBy(response.posts, 'tid')
+          //     this.discussionList = response['posts']
+          //   } else {
+          //     this.discussionList = []
+          //   }
+          // },
+          //   // tslint:disable-next-line
+          //   () => {
+          //     this.discussionList = []
+          //   })
+          break
+        default:
+          // this.discussionList = _.uniqBy(this.discussProfileData.latestPosts, 'tid')
+          this.discussionList = this.discussProfileData.latestPosts
+          break
+      }
+    }
+  }
+
+  // fetchUserBatchList() {
+  //   const user = this.portalProfile.userId || this.portalProfile.id || ''
+  //   this.userSvc.fetchUserBatchList(user).subscribe((courses: NsContent.ICourse[]) => {
+
+  //     courses.forEach(items => {
+  //       if (items.completionPercentage === 100) {
+  //         this.enrolledCourse.push(items)
+  //         // return items;
+  //       }
+  //     })
+  //     this.downloadAllCertificate(this.enrolledCourse)
+  //   })
+  // }
+
+  // downloadAllCertificate(data: any) {
+  //   data.forEach((item: any) => {
+  //     if (item.issuedCertificates.length !== 0) {
+  //       const certId = item.issuedCertificates[0].identifier
+  //       this.contentSvc.downloadCert(certId).subscribe(response => {
+
+  //         this.allCertificate.push({ identifier: item.issuedCertificates[0].identifier, dataUrl: response.result.printUri })
+
+  //       })
+  //     }
+  //   })
+  // }
+}

From f539caf823bad8ccacff30b1539a8207b4c037d5 Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Wed, 21 Jun 2023 17:24:46 +0530
Subject: [PATCH 123/887] UI aligments & font updates

---
 .../batch-details.component.scss              |  4 +++
 .../batch-list/batch-list.component.html      | 27 +++++++++---------
 .../batch-list/batch-list.component.scss      | 28 +++++++++++++------
 .../blended-home/blended-home.component.scss  |  4 +--
 4 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss
index 7f59dad06..92a1c6046 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss
@@ -75,4 +75,8 @@
 
 .font-medium {
   font-weight: 500 !important;
+}
+
+::ng-deep.h-600-s-20-m {
+  font: 700 14px Lato !important;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
index e9e1246a8..15e5d5c78 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
@@ -1,8 +1,7 @@
-<div class="flex flex-4 flex-column">
-  <mat-card class="flex-custom ws-mat-accent-border">
-    <ws-widget-breadcrumbs-org [widgetData]="breadcrumbs"
-      *ngIf="programData && breadcrumbs"></ws-widget-breadcrumbs-org>
-    <div class="flex-4 mobile-margin mat-h2">
+<div class="flex flex-4 flex-column" *ngIf="programData">
+  <mat-card class="flex-custom">
+    <ws-widget-breadcrumbs-org [widgetData]="breadcrumbs" *ngIf="breadcrumbs"></ws-widget-breadcrumbs-org>
+    <div class="flex-4 mobile-margin mat-h2 margin-top-m">
       Batches
     </div>
     <mat-card-content>
@@ -10,16 +9,16 @@
         <div class="batches-lsit" *ngIf="programData && programData.batches">
           <div class="grey-box ws-mat-accent-border cursor-pointer margin-bottom-m margin-right-l"
             (click)="viewDetails(batch)" *ngFor="let batch of programData.batches">
-            <div class="padding-left-s padding-right-s padding-xs">
-              <span class="mat-subheading-2">{{batch.name}}</span>
-              <span class="float-right mat-body-2">{{batch.batchId}}</span>
+            <div class="padding-left-s padding-right-s padding-top-s padding-bottom-xs margin-remove">
+              <span class="mat-subheading-1 margin-remove">{{batch.name}}</span>
+              <span class="float-right mat-body-2 margin-remove">{{batch.batchId}}</span>
             </div>
-            <p class="padding-left-s padding-right-s margin-top-xs mat-body-2"><mat-icon>event</mat-icon>
-              {{batch.startDate}} -
-              {{batch.endDate}}</p>
-            <p class="padding-left-s padding-right-s margin-top-xs mat-body-2"><mat-icon>event</mat-icon>
-              {{batch.enrollmentEndDate}}</p>
-            <div class="request-box mat-body-2 margin-top-xs padding-xs padding-left-s padding-right-s">0 New requests
+            <div class="padding-left-s padding-right-s mat-body-2">
+              <!-- <p class="margin-remove"><mat-icon>tag</mat-icon> {{batch.batchId}}</p> -->
+              <p class="margin-remove"><mat-icon>event</mat-icon> {{batch.startDate}} - {{batch.endDate}}</p>
+              <p class="margin-remove"><mat-icon>event</mat-icon> {{batch.enrollmentEndDate}}</p>
+            </div>
+            <div class="request-box mat-body-2 margin-top-xs">{{batch.newrequestsCount}} New requests
             </div>
           </div>
         </div>
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss
index b6a30e3a3..1e1ddfbc8 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss
@@ -5,23 +5,35 @@
 .grey-box {
   background: #F5F5F5;
   display: inline-block;
-  width: 28%;
+  width: 31%;
   border-radius: 4px;
 
+  span {
+    display: inline-block;
+  }
+  .mat-subheading-1 {
+    width: 45%;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
   .mat-body-2 {
     margin-bottom: 0 !important;
+    line-height: 1.9em !important;
     .mat-icon {
-      color: #979797;
-      vertical-align: bottom;
-      font-size: 18px;
-      width: 20px;
-      height: 20px;
+      color: RGBA(0, 0, 0, 0.4);
+      vertical-align: text-bottom;
+      font-size: 16px;
+      width: 15px;
+      height: 16px;
+      margin-right: 6px
     }
   }
 
   .request-box {
-    color: #D96454;
-    font: 600 14px/18px Lato !important;
+    color: #D13924;
+    padding: 8px 14px;
     border-top: 1px solid rgba(0, 0, 0, 0.08);
   }
 }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.scss
index aabbe4fa4..8778775bc 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.scss
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.scss
@@ -4,9 +4,9 @@
 
 .container-balanced {
   // @extend %page-center;
-  // height: auto;
+  height: auto;
   min-height: 85vh;
-  // padding: 0;
+  padding: 5px 15px;
   // box-sizing: border-box;
   // width: 100%!important;
   // margin-left: auto!important;

From d4467ecb7f093450dd83a151d7c08dcab41dbab2 Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Wed, 21 Jun 2023 17:31:16 +0530
Subject: [PATCH 124/887] BP get request, approve & reject API integrations

---
 .../batch-details.component.html              |  20 ++-
 .../batch-details/batch-details.component.ts  | 138 ++++++++++++------
 .../batch-list/batch-list.component.ts        |  42 +++++-
 .../users-card/users-card.component.html      |  14 +-
 .../users-card/users-card.component.ts        |  32 +---
 .../services/blended-approval.service.ts      |   7 +-
 6 files changed, 155 insertions(+), 98 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
index de448b994..cc49820a6 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
@@ -1,7 +1,7 @@
 <div class="flex flex-4 flex-column" *ngIf="batchData">
-  <mat-card class="flex-custom ws-mat-accent-border batch-detailspage">
+  <mat-card class="flex-custom batch-detailspage">
     <ws-widget-breadcrumbs-org [widgetData]="breadcrumbs" *ngIf="breadcrumbs"></ws-widget-breadcrumbs-org>
-    <div class="flex-4 mobile-margin mat-h2">
+    <div class="flex-4 mobile-margin mat-h2 margin-top-m">
       {{batchData.name}}
     </div>
     <mat-card-content>
@@ -34,11 +34,14 @@
           </div>
         </div>
         <ng-container *ngIf="currentFilter === 'pending'">
-          <div class="b-c box">
-            <div *ngFor="let user of usersData">
+          <div class="b-c box" *ngIf="newUsers && newUsers.length > 0">
+            <div *ngFor="let user of newUsers">
               <ws-app-users-card [user]="user" [actions]="true" (userClick)="onSubmit($event)"></ws-app-users-card>
             </div>
           </div>
+          <div class="b-c box" *ngIf="newUsers && newUsers.length == 0">
+            <p class="padding-m">No new requests yet</p>
+          </div>
         </ng-container>
         <ng-container *ngIf="currentFilter === 'approved'">
           <div class="b-c box" *ngIf="approvedUsers && approvedUsers.length > 0">
@@ -47,15 +50,18 @@
             </div>
           </div>
           <div class="b-c box" *ngIf="approvedUsers && approvedUsers.length == 0">
-            <p class="margin-top-m margin-bottom-m">No Learners</p>
+            <p class="padding-m">No learners yet</p>
           </div>
         </ng-container>
         <ng-container *ngIf="currentFilter === 'rejected'">
-          <div class="b-c box">
-            <div *ngFor="let user of usersData">
+          <div class="b-c box" *ngIf="rejectedUsers && rejectedUsers.length > 0">
+            <div *ngFor="let user of rejectedUsers">
               <ws-app-users-card [user]="user" [actions]="false"></ws-app-users-card>
             </div>
           </div>
+          <div class="b-c box" *ngIf="rejectedUsers && rejectedUsers.length == 0">
+            <p class="padding-m">No rejected requests yet</p>
+          </div>
         </ng-container>
       </ng-container>
     </mat-card-content>
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index 1f737983a..13ab4e31a 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -1,4 +1,5 @@
 import { Component, OnInit } from '@angular/core'
+import { MatSnackBar } from '@angular/material'
 import { ActivatedRoute, Router } from '@angular/router'
 import { BlendedApporvalService } from '../../services/blended-approval.service'
 
@@ -9,15 +10,18 @@ import { BlendedApporvalService } from '../../services/blended-approval.service'
 })
 export class BatchDetailsComponent implements OnInit {
   currentFilter = 'pending'
-  usersData: any = []
   approvedUsers: any = []
   programData: any
   programID: any
   batchID: any
   batchData: any
   breadcrumbs: any
+  newUsers: any = []
+  rejectedUsers: any = []
 
-  constructor(private router: Router, private activeRouter: ActivatedRoute, private bpService: BlendedApporvalService) {
+  constructor(private router: Router, private activeRouter: ActivatedRoute,
+    // tslint:disable-next-line:align
+    private bpService: BlendedApporvalService, private snackBar: MatSnackBar) {
     const currentState = this.router.getCurrentNavigation()
     if (currentState && currentState.extras.state) {
       this.batchData = currentState.extras.state
@@ -29,49 +33,13 @@ export class BatchDetailsComponent implements OnInit {
     }
   }
 
-  ngOnInit() {
-    this.usersData = [
-      {
-        city: '',
-        department: 'jpal',
-        desc: '',
-        designation: '',
-        email: 'test01july0907@yopmail.com',
-        first_name: 'test01 july0907',
-        last_name: '',
-        userLocation: '',
-        user_id: '27a35578-841c-450b-afc7-ace35f1051da',
-      },
-      {
-        city: '',
-        department: 'General Administration Ladakh',
-        desc: '',
-        designation: 'ACCOUNTS ASSISTANT',
-        email: 'JulyTest.Testjuly@yopmail.com',
-        first_name: 'JulyTest Testjuly',
-        last_name: '',
-        userLocation: '',
-        user_id: 'bdf547ba-79e8-49d9-9143-54353673212d',
-      },
-      {
-        city: '',
-        department: 'jpal',
-        desc: '',
-        designation: '',
-        email: 'testinguser0007@yopmail.com',
-        first_name: 'testinguser user',
-        last_name: '',
-        userLocation: '',
-        user_id: '8a24ee2d-20ec-4eb0-b559-627b30dfd894',
-      },
-    ]
-  }
+  ngOnInit() { }
 
   filter(key: 'pending' | 'approved' | 'rejected') {
     switch (key) {
       case 'pending':
         this.currentFilter = 'pending'
-        // this.getPendingList()
+        this.getNewRequestsList()
         break
       case 'approved':
         this.currentFilter = 'approved'
@@ -79,7 +47,7 @@ export class BatchDetailsComponent implements OnInit {
         break
       case 'rejected':
         this.currentFilter = 'rejected'
-        // this.getRejectedList()
+        this.getRejectedList()
         break
       default:
         break
@@ -89,11 +57,6 @@ export class BatchDetailsComponent implements OnInit {
   getBPDetails(programID: any) {
     this.bpService.getBlendedProgramsDetails(programID).subscribe((res: any) => {
       this.programData = res.result.content
-      this.breadcrumbs = {
-        titles: [{ title: 'Blended programs', url: '/app/home/blended-approvals' },
-        { title: this.programData.name, url: `/app/blended-approvals/${this.programData.identifier}/batches` },
-        { title: 'Batch 1', url: 'none' }],
-      }
       if (!this.batchData) {
         this.programData.batches.forEach((b: any) => {
           if (b.batchId === this.batchID) {
@@ -101,18 +64,97 @@ export class BatchDetailsComponent implements OnInit {
           }
         })
       }
-
+      if (this.programData && this.batchData) {
+        this.breadcrumbs = {
+          titles: [{ title: 'Blended programs', url: '/app/home/blended-approvals' },
+          { title: this.programData.name, url: `/app/blended-approvals/${this.programData.identifier}/batches` },
+          { title: this.batchData.name, url: 'none' }],
+        }
+        this.getNewRequestsList()
+      }
     })
   }
 
   getLearnersList() {
     this.bpService.getLearners(this.batchData.batchId).subscribe((res: any) => {
-      this.approvedUsers = res.result.content
+      if (res && res.length > 0) {
+        this.approvedUsers = res.result.content
+      }
+    })
+  }
+
+  getNewRequestsList() {
+    const request = {
+      serviceName: 'blendedprogram',
+      applicationStatus: 'SEND_FOR_MDO_APPROVAL',
+      applicationIds: [this.batchData.batchId],
+      limit: 100,
+      offset: 0,
+      deptName: this.programData.organisation[0],
+    }
+    this.bpService.getRequests(request).subscribe((res: any) => {
+      if (res) {
+        this.newUsers = res.result.data
+      }
+    })
+  }
+
+  getRejectedList() {
+    const request = {
+      serviceName: 'blendedprogram',
+      applicationStatus: 'REJECTED',
+      applicationIds: [this.batchData.batchId],
+      limit: 100,
+      offset: 0,
+      deptName: this.programData.organisation[0],
+    }
+    this.bpService.getRequests(request).subscribe((res: any) => {
+      if (res) {
+        this.rejectedUsers = res.result.data
+      }
     })
   }
 
   onSubmit(event: any) {
     console.log('======', event)
+    const actionType = event.action.toUpperCase()
+    const reqData = event.userData.wfInfo[0]
+    const request = {
+      state: 'SEND_FOR_MDO_APPROVAL',
+      action: actionType,
+      wfId: reqData.wfId,
+      applicationId: reqData.applicationId,
+      userId: reqData.userId,
+      actorUserId: reqData.actorUUID,
+      serviceName: 'blendedprogram',
+      rootOrgId: reqData.rootOrg,
+      courseId: this.programID,
+      deptName: reqData.deptName,
+      updateFieldValues: [
+        {
+          toValue: {
+            name: event.userData.first_name,
+          },
+        },
+      ],
+    }
+    console.log('request', request)
+    this.bpService.updateBlendedRequests(request).subscribe((res: any) => {
+      console.log('res', res)
+      if (event.action === 'Approve') {
+        this.openSnackbar('Request is approved successfully!')
+        this.filter('approved')
+      } else {
+        this.openSnackbar('Request is rejected successfully!')
+        this.filter('rejected')
+      }
+    })
+  }
+
+  private openSnackbar(primaryMsg: string, duration: number = 5000) {
+    this.snackBar.open(primaryMsg, 'X', {
+      duration,
+    })
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
index 6d9bbca5a..5cd3be8c2 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
@@ -17,16 +17,18 @@ export class BatchListComponent implements OnInit {
     this.programID = this.activeRouter.snapshot.params.id
     if (currentState && currentState.extras.state) {
       this.programData = currentState.extras.state
+      if (this.programData && this.programData.name) {
+        this.breadcrumbs = {
+          titles: [{ title: 'Blended programs', url: '/app/home/blended-approvals' },
+          { title: this.programData.name, url: 'none' }],
+        }
+        this.programData.batches.forEach((b: any) => {
+          b.newrequestsCount = this.getNewRequestsList(b.batchId)
+        })
+      }
     } else if (this.programID) {
       this.getBPDetails(this.programID)
     }
-
-    if (this.programData && this.programData.name) {
-      this.breadcrumbs = {
-        titles: [{ title: 'Blended programs', url: '/app/home/blended-approvals' },
-        { title: this.programData.name, url: 'none' }],
-      }
-    }
   }
 
   ngOnInit() { }
@@ -38,6 +40,32 @@ export class BatchListComponent implements OnInit {
   getBPDetails(programID: any) {
     this.bpService.getBlendedProgramsDetails(programID).subscribe((res: any) => {
       this.programData = res.result.content
+      if (this.programData && this.programData.name) {
+        this.breadcrumbs = {
+          titles: [{ title: 'Blended programs', url: '/app/home/blended-approvals' },
+          { title: this.programData.name, url: 'none' }],
+        }
+
+        this.programData.batches.forEach((b: any) => {
+          b.newrequestsCount = this.getNewRequestsList(b.batchId)
+        })
+      }
+    })
+  }
+
+  getNewRequestsList(bId: any) {
+    const request = {
+      serviceName: 'blendedprogram',
+      applicationStatus: 'SEND_FOR_MDO_APPROVAL',
+      applicationIds: [bId],
+      limit: 100,
+      offset: 0,
+      deptName: this.programData.organisation[0],
+    }
+    this.bpService.getRequests(request).subscribe((res: any) => {
+      if (res) {
+        return res.result.data.length
+      }
     })
   }
 
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.html
index ebc117138..b81f77c49 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.html
@@ -5,13 +5,13 @@
       <ws-widget-avatar-photo [name]="getUseravatarName()" [photoUrl]="user?.photo" size="m">
       </ws-widget-avatar-photo>
     </div>
-    <div class="flex flex-col flex-1">
-      <div class="designation truncate ws-mat-black60-text" *ngIf="user?.first_name">
-        {{user?.first_name}}
-      </div>
-      <div class="designation truncate ws-mat-black60-text" *ngIf="!user?.first_name">
-        {{user?.channel}}
-      </div>
+    <div class="flex flex-col flex-1" *ngIf="user && user.userInfo">
+      <p class="truncate margin-remove mat-body-1">{{user?.userInfo.first_name}}</p>
+      <p class="truncate ws-mat-black60-text margin-remove mat-body-2">{{user?.wfInfo[0].deptName}}</p>
+    </div>
+    <div class="flex flex-col flex-1" *ngIf="user && !user.userInfo">
+      <p class="truncate margin-remove mat-body-1">{{user?.first_name}}</p>
+      <p class="truncate ws-mat-black60-text margin-remove mat-body-2">{{user?.deptName || user?.department }}</p>
     </div>
     <div *ngIf="actions">
       <button type="button" mat-button class="margin-right-m cursor-pointer border-0"
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
index 73eebfb27..aeb1e020b 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
@@ -18,34 +18,10 @@ export class UsersCardComponent implements OnInit {
 
   getUseravatarName() {
     let name = ''
-    if (this.user && this.user.first_name) {
-      if (this.user.first_name) {
-        if (this.user.last_name && this.user.last_name !== null && this.user.last_name !== undefined) {
-          name = `${this.user.first_name} ${this.user.last_name}`
-        } else {
-          name = `${this.user.first_name}`
-        }
-      } else {
-        name = `${this.user.name}`
-      }
-    } else if (this.user && this.user.personalDetails) {
-      if (this.user.personalDetails.middlename) {
-        // tslint:disable-next-line:max-line-length
-        if (this.user.personalDetails.surname && this.user.personalDetails.surname !== null && this.user.personalDetails.surname !== undefined) {
-          // tslint:disable-next-line: max-line-length
-          name = `${this.user.personalDetails.firstname} ${this.user.personalDetails.middlename} ${this.user.personalDetails.surname}`
-        } else {
-          name = `${this.user.personalDetails.firstname} ${this.user.personalDetails.middlename}`
-        }
-      } else if (this.user.personalDetails.firstname) {
-        // tslint:disable-next-line:max-line-length
-        if (this.user.personalDetails.surname && this.user.personalDetails.surname !== null && this.user.personalDetails.surname !== undefined) {
-          // tslint:disable-next-line: max-line-length
-          name = `${this.user.personalDetails.firstname} ${this.user.personalDetails.surname}`
-        } else {
-          name = `${this.user.personalDetails.firstname}`
-        }
-      }
+    if (this.user && this.user.userInfo) {
+      name = `${this.user.userInfo.first_name}`
+    } else {
+      name = `${this.user.first_name}`
     }
     return name
   }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
index b51c2e310..d9495688d 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
@@ -3,9 +3,10 @@ import { HttpClient } from '@angular/common/http'
 import { Observable } from 'rxjs'
 
 const API_END_POINTS = {
-  UPDATE_REQUEST: '/v1/blendedprogram/workflow/update',
+  UPDATE_REQUEST: '/apis/proxies/v8/workflow/blendedprogram/update',
   GET_PROGRAM_DETAILS: '/apis/proxies/v8/action/content/v3/hierarchy',
   GET_LERANERS: '/apis/protected/v8/cohorts/course/getUsersForBatch',
+  GET_REQUESTS: '/apis/proxies/v8/workflow/blendedprogram/search',
 }
 
 @Injectable({
@@ -23,6 +24,10 @@ export class BlendedApporvalService {
     return this.http.get<any>(url)
   }
 
+  getRequests(req: any) {
+    return this.http.post<any>(`${API_END_POINTS.GET_REQUESTS}`, req)
+  }
+
   updateBlendedRequests(req: any) {
     return this.http.post<any>(`${API_END_POINTS.UPDATE_REQUEST}`, req)
   }

From 62bce56255d7f200a85b68b85b48f4daddcb4cf2 Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Wed, 21 Jun 2023 17:41:53 +0530
Subject: [PATCH 125/887] Fixed lint & build issues

---
 .../batch-details/batch-details.component.ts  |  3 ++
 .../blended-home/blended-home.component.html  |  2 +-
 .../users-card/users-card.component.spec.ts   | 28 +++++++++----------
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index 13ab4e31a..961968f32 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -116,6 +116,7 @@ export class BatchDetailsComponent implements OnInit {
   }
 
   onSubmit(event: any) {
+    // tslint:disable-next-line:no-console
     console.log('======', event)
     const actionType = event.action.toUpperCase()
     const reqData = event.userData.wfInfo[0]
@@ -138,8 +139,10 @@ export class BatchDetailsComponent implements OnInit {
         },
       ],
     }
+    // tslint:disable-next-line:no-console
     console.log('request', request)
     this.bpService.updateBlendedRequests(request).subscribe((res: any) => {
+      // tslint:disable-next-line:no-console
       console.log('res', res)
       if (event.action === 'Approve') {
         this.openSnackbar('Request is approved successfully!')
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.html
index 9262d8dc4..d8f15b73e 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.html
@@ -1,5 +1,5 @@
 <mat-sidenav-container class="container-balanced sticky" autosize name="discuss-menu">
-  <mat-sidenav [mode]="mode$ | async" [(opened)]="sideNavBarOpened" class="left-nav">
+  <mat-sidenav [(opened)]="sideNavBarOpened" class="left-nav">
     <div class="container2" #stickyMenu>
       <ng-container [wsResolverWidget]="widgetData"></ng-container>
     </div>
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.spec.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.spec.ts
index debd773fc..966f4028f 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.spec.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.spec.ts
@@ -1,25 +1,25 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
 
-import { UsersCardComponent } from './users-card.component';
+import { UsersCardComponent } from './users-card.component'
 
 describe('UsersCardComponent', () => {
-  let component: UsersCardComponent;
-  let fixture: ComponentFixture<UsersCardComponent>;
+  let component: UsersCardComponent
+  let fixture: ComponentFixture<UsersCardComponent>
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ UsersCardComponent ]
+      declarations: [UsersCardComponent],
     })
-    .compileComponents();
-  }));
+      .compileComponents()
+  }))
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(UsersCardComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+    fixture = TestBed.createComponent(UsersCardComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
 
   it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
+    expect(component).toBeTruthy()
+  })
+})

From fe56b2ef03fd2704ca9f2d438290d4e561a883d9 Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Wed, 21 Jun 2023 17:44:49 +0530
Subject: [PATCH 126/887] last name removed, sidebar height increased

---
 .../app/src/lib/routes/access/routes/home/home.component.scss | 2 +-
 .../src/lib/routes/approvals/routes/home/home.component.scss  | 1 +
 .../components/event-list-view/event-list-view.component.scss | 1 +
 .../events/routes/events-home/events-home.component.html      | 2 +-
 .../events/routes/events-home/events-home.component.scss      | 2 +-
 .../routes/events/routes/view-event/view-event.component.scss | 1 +
 .../routes/events/routes/view-event/view-event.component.ts   | 3 ++-
 .../home/components/adduserpopup/adduserpopup.component.ts    | 2 +-
 .../components/leadershiptable/leadershiptable.component.ts   | 4 ++--
 .../app/src/lib/routes/home/routes/home/home.component.html   | 2 +-
 .../app/src/lib/routes/home/routes/home/home.component.scss   | 2 +-
 .../lib/routes/home/routes/leadership/leadership.component.ts | 2 +-
 .../src/lib/routes/home/routes/mdoinfo/mdoinfo.component.scss | 3 ++-
 .../app/src/lib/routes/search/routes/home/home.component.scss | 1 +
 .../search/routes/search-root/search-root.component.scss      | 1 +
 .../lib/routes/users/routes/view-user/view-user.component.ts  | 3 ++-
 .../components/activity-labels/activity-labels.component.ts   | 3 ++-
 17 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/project/ws/app/src/lib/routes/access/routes/home/home.component.scss b/project/ws/app/src/lib/routes/access/routes/home/home.component.scss
index de1a7816b..d5333bd72 100644
--- a/project/ws/app/src/lib/routes/access/routes/home/home.component.scss
+++ b/project/ws/app/src/lib/routes/access/routes/home/home.component.scss
@@ -5,7 +5,7 @@
 .container-balanced {
   @extend %page-center;
   height: auto;
-  min-height: 75vh;
+  min-height: 85vh;
   padding: 0;
   box-sizing: border-box;
   width: 100%!important;
diff --git a/project/ws/app/src/lib/routes/approvals/routes/home/home.component.scss b/project/ws/app/src/lib/routes/approvals/routes/home/home.component.scss
index b38ad9631..3a6462316 100644
--- a/project/ws/app/src/lib/routes/approvals/routes/home/home.component.scss
+++ b/project/ws/app/src/lib/routes/approvals/routes/home/home.component.scss
@@ -4,6 +4,7 @@
 @import 'ws-mixins';
 
 .container-balanced{
+  min-height: 85vh;
   max-width: 99%;
   margin-left: auto!important;
   margin-right: auto!important;
diff --git a/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.scss b/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.scss
index fc8220196..517c4c599 100644
--- a/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.scss
+++ b/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.scss
@@ -684,6 +684,7 @@ mat-header-row{
 
 .container-balanced{
   max-width: 99%;
+  min-height: 85vh;
   margin-left: auto!important;
   margin-right: auto!important;
 }
diff --git a/project/ws/app/src/lib/routes/events/routes/events-home/events-home.component.html b/project/ws/app/src/lib/routes/events/routes/events-home/events-home.component.html
index 0ffd839cd..66a82fa43 100644
--- a/project/ws/app/src/lib/routes/events/routes/events-home/events-home.component.html
+++ b/project/ws/app/src/lib/routes/events/routes/events-home/events-home.component.html
@@ -7,7 +7,7 @@
 
 <mat-sidenav-container autosize name="discuss-menu" class="nav-container" name="exp">
   <mat-sidenav [mode]="mode$ | async" [(opened)]="sideNavBarOpened" class="left-nav border-0">
-    <div class="contain">
+    <div class="container2">
       <ng-container [wsResolverWidget]="widgetData"></ng-container>
     </div>
   </mat-sidenav>
diff --git a/project/ws/app/src/lib/routes/events/routes/events-home/events-home.component.scss b/project/ws/app/src/lib/routes/events/routes/events-home/events-home.component.scss
index 2d2a9b798..e84030a61 100644
--- a/project/ws/app/src/lib/routes/events/routes/events-home/events-home.component.scss
+++ b/project/ws/app/src/lib/routes/events/routes/events-home/events-home.component.scss
@@ -5,7 +5,7 @@
 .container-balanced {
   @extend %page-center;
   height: auto;
-  min-height: 75vh;
+  min-height: 85vh;
   padding: 15px;
 }
 
diff --git a/project/ws/app/src/lib/routes/events/routes/view-event/view-event.component.scss b/project/ws/app/src/lib/routes/events/routes/view-event/view-event.component.scss
index 594c023cc..8fb04d7b2 100644
--- a/project/ws/app/src/lib/routes/events/routes/view-event/view-event.component.scss
+++ b/project/ws/app/src/lib/routes/events/routes/view-event/view-event.component.scss
@@ -7,6 +7,7 @@
   max-width: 99%;
   margin-left: auto!important;
   margin-right: auto!important;
+  min-height: 85vh;
 }
 
 .buton {
diff --git a/project/ws/app/src/lib/routes/events/routes/view-event/view-event.component.ts b/project/ws/app/src/lib/routes/events/routes/view-event/view-event.component.ts
index 824d1b7bc..a9b0817e2 100644
--- a/project/ws/app/src/lib/routes/events/routes/view-event/view-event.component.ts
+++ b/project/ws/app/src/lib/routes/events/routes/view-event/view-event.component.ts
@@ -47,7 +47,8 @@ export class ViewEventComponent implements OnInit, AfterViewInit {
         this.employmentDetails = profileData.employmentDetails
         this.skillDetails = profileData.skills
         this.interests = profileData.interests
-        this.fullname = `${this.basicInfo.firstname} ${this.basicInfo.surname}`
+        // this.fullname = `${this.basicInfo.firstname} ${this.basicInfo.surname}`
+        this.fullname = `${this.basicInfo.firstname}`
 
         let wfHistoryDatas = this.activeRoute.snapshot.data.workflowHistoryData.data.result.data || {}
         const datas: any[] = Object.values(wfHistoryDatas)
diff --git a/project/ws/app/src/lib/routes/home/components/adduserpopup/adduserpopup.component.ts b/project/ws/app/src/lib/routes/home/components/adduserpopup/adduserpopup.component.ts
index 41fb790d8..ac57a38bc 100644
--- a/project/ws/app/src/lib/routes/home/components/adduserpopup/adduserpopup.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/adduserpopup/adduserpopup.component.ts
@@ -40,7 +40,7 @@ export class AdduserpopupComponent implements OnInit {
     this.usersListData = data.data
     this.usersListData.forEach((user: any) => {
       const obj = {
-        fullname: `${user.firstName} ${user.lastName}`,
+        fullname: `${user.firstName}`,
         email: user.email,
         position: user.channel,
         id: user.id,
diff --git a/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.ts b/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.ts
index e40e7ef8c..a28dbe5c7 100644
--- a/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.ts
@@ -54,7 +54,7 @@ export class LeadershiptableComponent implements OnInit, OnChanges {
   constructor(public dialog: MatDialog, private activeRoute: ActivatedRoute, private snackBar: MatSnackBar,
     // tslint:disable-next-line:align
     private mdoinfoSrvc: MdoInfoService, private configSvc: ConfigurationsService, private router: Router,
-              private profileUtilSvc: ProfileV2UtillService) {
+    private profileUtilSvc: ProfileV2UtillService) {
     this.dataSource = new MatTableDataSource<any>()
     this.dataSource.paginator = this.paginator
   }
@@ -143,7 +143,7 @@ export class LeadershiptableComponent implements OnInit, OnChanges {
               }
               const obj = {
                 srnumber: index + 1,
-                fullname: `${user.firstName} ${user.lastName}`,
+                fullname: `${user.firstName}`,
                 email: this.profileUtilSvc.emailTransform(user.email),
                 position: pos,
                 id: user.id,
diff --git a/project/ws/app/src/lib/routes/home/routes/home/home.component.html b/project/ws/app/src/lib/routes/home/routes/home/home.component.html
index 0ffd839cd..66a82fa43 100644
--- a/project/ws/app/src/lib/routes/home/routes/home/home.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/home/home.component.html
@@ -7,7 +7,7 @@
 
 <mat-sidenav-container autosize name="discuss-menu" class="nav-container" name="exp">
   <mat-sidenav [mode]="mode$ | async" [(opened)]="sideNavBarOpened" class="left-nav border-0">
-    <div class="contain">
+    <div class="container2">
       <ng-container [wsResolverWidget]="widgetData"></ng-container>
     </div>
   </mat-sidenav>
diff --git a/project/ws/app/src/lib/routes/home/routes/home/home.component.scss b/project/ws/app/src/lib/routes/home/routes/home/home.component.scss
index 151d9bb4b..fb1dbbdab 100644
--- a/project/ws/app/src/lib/routes/home/routes/home/home.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/home/home.component.scss
@@ -5,7 +5,7 @@
 .container-balanced {
   @extend %page-center;
   height: auto;
-  min-height: 75vh;
+  min-height: 85vh;
   padding: 15px;
   box-sizing: border-box;
 }
diff --git a/project/ws/app/src/lib/routes/home/routes/leadership/leadership.component.ts b/project/ws/app/src/lib/routes/home/routes/leadership/leadership.component.ts
index 500e073cf..3ef38c8f3 100644
--- a/project/ws/app/src/lib/routes/home/routes/leadership/leadership.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/leadership/leadership.component.ts
@@ -139,7 +139,7 @@ export class LeadershipComponent implements OnInit, AfterViewInit, OnChanges {
         if (this.usersData.length > 0) {
           this.usersData.forEach((user: any, index: any)  => {
             const obj = {
-              fullname: `${user.firstName} ${user.lastName}`,
+              fullname: `${user.firstName}`,
               email: this.profileUtilSvc.emailTransform(user.email),
               position: user.channel,
               id: user.id,
diff --git a/project/ws/app/src/lib/routes/home/routes/mdoinfo/mdoinfo.component.scss b/project/ws/app/src/lib/routes/home/routes/mdoinfo/mdoinfo.component.scss
index e2accad1f..17a93f044 100644
--- a/project/ws/app/src/lib/routes/home/routes/mdoinfo/mdoinfo.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/mdoinfo/mdoinfo.component.scss
@@ -7,7 +7,8 @@
     height: auto;
     // min-height: 400px;
     min-height: calc(100vh - 160px);
-    width: 100%
+    width: 100%;
+    min-height: 85vh;
 }
 
 .container-balanced-banner {
diff --git a/project/ws/app/src/lib/routes/search/routes/home/home.component.scss b/project/ws/app/src/lib/routes/search/routes/home/home.component.scss
index 63008af41..c48b83527 100644
--- a/project/ws/app/src/lib/routes/search/routes/home/home.component.scss
+++ b/project/ws/app/src/lib/routes/search/routes/home/home.component.scss
@@ -5,6 +5,7 @@
 .container-balanced {
   @extend %page-center;
   height: auto;
+  min-height: 85vh;
   // min-height: 400px;
 }
 
diff --git a/project/ws/app/src/lib/routes/search/routes/search-root/search-root.component.scss b/project/ws/app/src/lib/routes/search/routes/search-root/search-root.component.scss
index 58c90dc15..e5ea4ad00 100644
--- a/project/ws/app/src/lib/routes/search/routes/search-root/search-root.component.scss
+++ b/project/ws/app/src/lib/routes/search/routes/search-root/search-root.component.scss
@@ -5,6 +5,7 @@
 .container-balanced {
   @extend %page-center;
   height: auto;
+  min-height: 85vh;
   // min-height: 400px;
 }
 
diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
index e4994cf34..83d2e2c30 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
@@ -73,7 +73,8 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
           this.userID = profileData.id || profileData.userId || profileDataAll.id
           this.basicInfo = profileData.personalDetails
           if (this.basicInfo) {
-            this.fullname = `${this.basicInfo.firstname} ${this.basicInfo.surname}`
+            // this.fullname = `${this.basicInfo.firstname} ${this.basicInfo.surname}`
+            this.fullname = `${this.basicInfo.firstname}`
           }
           this.academicDetails = profileData.academics
           this.professionalDetails = profileData.professionalDetails ? profileData.professionalDetails[0] : []
diff --git a/project/ws/app/src/lib/routes/workallocation-v2/components/activity-labels/activity-labels.component.ts b/project/ws/app/src/lib/routes/workallocation-v2/components/activity-labels/activity-labels.component.ts
index 516887635..982aed294 100644
--- a/project/ws/app/src/lib/routes/workallocation-v2/components/activity-labels/activity-labels.component.ts
+++ b/project/ws/app/src/lib/routes/workallocation-v2/components/activity-labels/activity-labels.component.ts
@@ -560,7 +560,8 @@ export class ActivityLabelsComponent implements OnInit, OnDestroy, AfterViewInit
             assignedToEmail = ''
         } else {
           // tslint:disable-next-line: prefer-template
-          assignedTo = _.get(event, 'option.value.firstName') + ' ' + _.get(event, 'option.value.lastName')
+          // assignedTo = _.get(event, 'option.value.firstName') + ' ' + _.get(event, 'option.value.lastName')
+          assignedTo = _.get(event, 'option.value.firstName')
           assignedToId = _.get(event, 'option.value.userId'),
             assignedToEmail = _.get(event, 'option.value.profileDetails.personalDetails.primaryEmail')
         }

From c6f620d11e945f28f4daea8d7049f57bdd5a4c1f Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Wed, 21 Jun 2023 17:49:16 +0530
Subject: [PATCH 127/887] lint fix

---
 .../components/leadershiptable/leadershiptable.component.ts     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.ts b/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.ts
index a28dbe5c7..9a2607a6c 100644
--- a/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.ts
@@ -54,7 +54,7 @@ export class LeadershiptableComponent implements OnInit, OnChanges {
   constructor(public dialog: MatDialog, private activeRoute: ActivatedRoute, private snackBar: MatSnackBar,
     // tslint:disable-next-line:align
     private mdoinfoSrvc: MdoInfoService, private configSvc: ConfigurationsService, private router: Router,
-    private profileUtilSvc: ProfileV2UtillService) {
+              private profileUtilSvc: ProfileV2UtillService) {
     this.dataSource = new MatTableDataSource<any>()
     this.dataSource.paginator = this.paginator
   }

From b03d0e2db2de2a94546749da271c9ee58363c847 Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Thu, 22 Jun 2023 12:08:07 +0530
Subject: [PATCH 128/887] Fixed count condition in BP listing

---
 .../routes/blended-approvals/blended-approvals.component.ts   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
index f0dcf86b0..9163957dd 100644
--- a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
@@ -62,8 +62,8 @@ export class BlendedApprovalsComponent implements OnInit {
       const resultList = res.result.content
       resultList.forEach((val: any) => {
         val.batchesCount = val.batches.length
-        val.learners = val.learnersCount
-        val.newrequests = val.requestsCount
+        // val.learners = val.learnersCount
+        // val.newrequests = val.requestsCount
       })
       this.data = resultList
     })

From c441991c2cc51c9bdb6f6325ee93415f70adbd9e Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Thu, 22 Jun 2023 13:54:50 +0530
Subject: [PATCH 129/887] Updated no batches condition in BP

---
 .../batch-list/batch-list.component.html      |  5 +++++
 .../batch-list/batch-list.component.ts        | 16 +++++++++-----
 .../blended-approvals.component.ts            | 22 +++++++++++++------
 3 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
index 15e5d5c78..aa2c2fcaf 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
@@ -22,6 +22,11 @@
             </div>
           </div>
         </div>
+        <div class="batches-lsit" *ngIf="programData && !programData.batches">
+          <div class="margin-top-l">
+            No batches yet
+          </div>
+        </div>
       </ng-container>
     </mat-card-content>
   </mat-card>
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
index 5cd3be8c2..7ebbc825a 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
@@ -22,9 +22,11 @@ export class BatchListComponent implements OnInit {
           titles: [{ title: 'Blended programs', url: '/app/home/blended-approvals' },
           { title: this.programData.name, url: 'none' }],
         }
-        this.programData.batches.forEach((b: any) => {
-          b.newrequestsCount = this.getNewRequestsList(b.batchId)
-        })
+        if (this.programData.batches) {
+          this.programData.batches.forEach((b: any) => {
+            b.newrequestsCount = this.getNewRequestsList(b.batchId)
+          })
+        }
       }
     } else if (this.programID) {
       this.getBPDetails(this.programID)
@@ -46,9 +48,11 @@ export class BatchListComponent implements OnInit {
           { title: this.programData.name, url: 'none' }],
         }
 
-        this.programData.batches.forEach((b: any) => {
-          b.newrequestsCount = this.getNewRequestsList(b.batchId)
-        })
+        if (this.programData.batches) {
+          this.programData.batches.forEach((b: any) => {
+            b.newrequestsCount = this.getNewRequestsList(b.batchId)
+          })
+        }
       }
     })
   }
diff --git a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
index 9163957dd..ad090b1f5 100644
--- a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
@@ -59,13 +59,21 @@ export class BlendedApprovalsComponent implements OnInit {
       },
     }
     this.bpService.getBlendedPrograms(req).subscribe((res: any) => {
-      const resultList = res.result.content
-      resultList.forEach((val: any) => {
-        val.batchesCount = val.batches.length
-        // val.learners = val.learnersCount
-        // val.newrequests = val.requestsCount
-      })
-      this.data = resultList
+      if (res && res.result.content) {
+        const resultList = res.result.content
+        resultList.forEach((val: any) => {
+          if (val.batches) {
+            val.batchesCount = val.batches.length
+            val.learners = 0
+            val.newrequests = 0
+          } else {
+            val.batchesCount = 0
+            val.learners = 0
+            val.newrequests = 0
+          }
+        })
+        this.data = resultList
+      }
     })
   }
 

From 68c22f74783f893aa02c6d3f560e4524080b0dbc Mon Sep 17 00:00:00 2001
From: ajithkumar1995 <ajith.gajendheran@tarento.com>
Date: Thu, 22 Jun 2023 14:12:12 +0530
Subject: [PATCH 130/887] role and count

---
 .../access/routes/users/users.component.ts    | 42 ++++++++++++++++---
 .../routes/users/services/users.service.ts    | 21 ++++++++++
 2 files changed, 57 insertions(+), 6 deletions(-)

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
index 03fd27593..dc9ca5785 100644
--- 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
@@ -2,10 +2,14 @@ import { AfterViewInit, Component, OnInit, OnDestroy } from '@angular/core'
 import { Router, ActivatedRoute } from '@angular/router'
 import { environment } from '../../../../../../../../../src/environments/environment'
 import { UsersService } from '../../services/users.service'
+import { UsersService as UsersService2 } from '../../../users/services/users.service'
+import { ChangeDetectorRef } from '@angular/core'
+
 /* tslint:disable */
 import _ from 'lodash'
 import { ITableData } from '@sunbird-cb/collection/lib/ui-org-table/interface/interfaces'
 import { ProfileV2UtillService } from '../../../home/services/home-utill.service'
+
 /* tslint:enable */
 @Component({
   selector: 'ws-app-users',
@@ -21,16 +25,29 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
   data2: any
   role: any
   roleName: string | undefined
+  currentRole: any
   private defaultSideNavBarOpenedSubscription: any
 
-  constructor(private usersSvc: UsersService, private router: Router, private route: ActivatedRoute,
-              private profileUtilSvc: ProfileV2UtillService) { }
+  constructor(private usersSvc: UsersService, private router: Router, private activatedRoute: ActivatedRoute, private route: ActivatedRoute,
+    private profileUtilSvc: ProfileV2UtillService, private userS: UsersService2, private cdref: ChangeDetectorRef) { }
+
+
   ngOnInit() {
     const url = this.router.url.split('/')
     this.role = url[url.length - 2]
     this.roleName = this.role.replace('%20', ' ')
     this.configSvc = _.get(this.route, 'snapshot.parent.data.configService') || {}
+    const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
+
     // int left blank
+    this.activatedRoute.params.subscribe(params => {
+      this.currentRole = params['role']
+      this.userS.getTotalRoleUsers(rootOrgId, this.currentRole).subscribe((data: any) => {
+        console.log('test', data)
+        this.usersData = data.count
+        this.getMyDepartment()
+      })
+    })
     this.tabledata = {
       // actions: [{ name: 'Details', label: 'Details', icon: 'remove_red_eye', type: 'link' }],
       actions: [],
@@ -46,12 +63,21 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
       sortState: 'asc',
       needUserMenus: false,
     }
-    this.usersData = _.get(this.route, 'snapshot.data.usersList.data') || {}
-    this.getMyDepartment()
+    // this.usersData = _.get(this.route, 'snapshot.data.usersList.data') || {}
+    // const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
+
+    // this.userS.getTotalRoleUsers(rootOrgId, this.currentRole).subscribe((data: any) => {
+    //   console.log('test', data)
+    //   this.usersData = data.count
+    //   this.getMyDepartment()
+    // })
+    // this.getMyDepartment()
   }
 
   ngAfterViewInit() {
-    // this.elementPosition = this.menuElement.nativeElement.parentElement.offsetTop
+    setTimeout(() => {
+      this.cdref.detectChanges() /*cdRef injected in constructor*/
+    }, 0)
   }
 
   /* API call to get all roles*/
@@ -78,6 +104,7 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
     return []
   }
   getMyDepartment() {
+    // debugger
     let users: any[] = []
     if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
       users = _.map(_.compact(_.map(this.usersData.content, i => {
@@ -86,6 +113,7 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
           _.each(i.organisations, o => {
             if (!o.isDeleted && (o.roles || []).indexOf(this.roleName) >= 0) {
               consider = true
+              console.log('organaisation', o.firstName, o.email)
             }
           })
         }
@@ -93,7 +121,7 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
       })),
         // tslint:disable-next-line
         user => {
-
+          // debugger
           return {
             fullName: `${user.firstName}`,
             // fullName: `${user.first_name} ${user.last_name}`,
@@ -105,6 +133,7 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
           }
         })
     }
+    // debugger
     this.data = users
 
     // this.profile.getMyDepartmentAll().subscribe(res => {
@@ -171,6 +200,7 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
 
   onEnterkySearch(enterValue: any) {
     const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
+    // debugger
     this.usersSvc.searchUserByenter(enterValue, rootOrgId).subscribe(data => {
       this.usersData = data.result.response
 
diff --git a/project/ws/app/src/lib/routes/users/services/users.service.ts b/project/ws/app/src/lib/routes/users/services/users.service.ts
index 03f185950..7fc111489 100644
--- a/project/ws/app/src/lib/routes/users/services/users.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/users.service.ts
@@ -120,6 +120,7 @@ export class UsersService {
   }
   // getAllRoleUsers(depId: string, role: {}): Observable<any> {
   getAllRoleUsers(depId: string, role: string): Observable<any> {
+    // debugger
     const reqBody = {
       request: {
         filters: {
@@ -137,6 +138,26 @@ export class UsersService {
       map(
         (data: any) => ({ role, count: _.get(data, 'result.response.count') })))
   }
+  getTotalRoleUsers(depId: string, role: string): Observable<any> {
+    // debugger
+    const reqBody = {
+      request: {
+        filters: {
+          rootOrgId: depId,
+          // status: 1,
+          'organisations.roles':
+            [role],
+
+        },
+        // limit: 1,
+      },
+    }
+    return this.http.post<any>(`${API_END_POINTS.GET_ALL_USERS}`, reqBody).pipe(
+      retry(1),
+      map(
+        (data: any) => ({ role, count: _.get(data, 'result.response') })))
+  }
+
 
   searchUserByenter(value: string, rootOrgId: string) {
     const reqBody = {

From 8b7edf23013fb8ed042645c0a021f50d60179750 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Thu, 22 Jun 2023 17:13:37 +0530
Subject: [PATCH 131/887] role count fixes

---
 .../access/routes/users/users.component.ts    | 41 ++++++++-----------
 .../home/services/home-utill.service.ts       |  4 +-
 .../routes/users/services/users.service.ts    |  1 -
 3 files changed, 21 insertions(+), 25 deletions(-)

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
index dc9ca5785..95359fce4 100644
--- 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
@@ -1,9 +1,8 @@
-import { AfterViewInit, Component, OnInit, OnDestroy } from '@angular/core'
+import { AfterViewInit, Component, OnInit, OnDestroy, ChangeDetectorRef, AfterContentChecked } from '@angular/core'
 import { Router, ActivatedRoute } from '@angular/router'
 import { environment } from '../../../../../../../../../src/environments/environment'
 import { UsersService } from '../../services/users.service'
 import { UsersService as UsersService2 } from '../../../users/services/users.service'
-import { ChangeDetectorRef } from '@angular/core'
 
 /* tslint:disable */
 import _ from 'lodash'
@@ -17,7 +16,7 @@ import { ProfileV2UtillService } from '../../../home/services/home-utill.service
   styleUrls: ['./users.component.scss'],
 })
 
-export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
+export class UsersComponent implements OnInit, AfterViewInit, AfterContentChecked, OnDestroy {
   tabledata!: ITableData
   configSvc: any
   data: any = []
@@ -27,26 +26,21 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
   roleName: string | undefined
   currentRole: any
   private defaultSideNavBarOpenedSubscription: any
+  rootOrgId: any
 
   constructor(private usersSvc: UsersService, private router: Router, private activatedRoute: ActivatedRoute, private route: ActivatedRoute,
     private profileUtilSvc: ProfileV2UtillService, private userS: UsersService2, private cdref: ChangeDetectorRef) { }
 
-
   ngOnInit() {
     const url = this.router.url.split('/')
     this.role = url[url.length - 2]
     this.roleName = this.role.replace('%20', ' ')
     this.configSvc = _.get(this.route, 'snapshot.parent.data.configService') || {}
-    const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
+    this.rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
 
     // int left blank
     this.activatedRoute.params.subscribe(params => {
       this.currentRole = params['role']
-      this.userS.getTotalRoleUsers(rootOrgId, this.currentRole).subscribe((data: any) => {
-        console.log('test', data)
-        this.usersData = data.count
-        this.getMyDepartment()
-      })
     })
     this.tabledata = {
       // actions: [{ name: 'Details', label: 'Details', icon: 'remove_red_eye', type: 'link' }],
@@ -63,21 +57,24 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
       sortState: 'asc',
       needUserMenus: false,
     }
-    // this.usersData = _.get(this.route, 'snapshot.data.usersList.data') || {}
-    // const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
+    this.fetchAllUsersWithRole()
+  }
 
-    // this.userS.getTotalRoleUsers(rootOrgId, this.currentRole).subscribe((data: any) => {
-    //   console.log('test', data)
-    //   this.usersData = data.count
-    //   this.getMyDepartment()
-    // })
-    // this.getMyDepartment()
+  fetchAllUsersWithRole() {
+    this.userS.getTotalRoleUsers(this.rootOrgId, this.currentRole).subscribe((data: any) => {
+      this.usersData = data.count
+      this.getMyDepartment()
+    })
   }
 
   ngAfterViewInit() {
-    setTimeout(() => {
-      this.cdref.detectChanges() /*cdRef injected in constructor*/
-    }, 0)
+    // setTimeout(() => {
+    //   this.cdref.detectChanges() /*cdRef injected in constructor*/
+    // }, 0)
+  }
+
+  ngAfterContentChecked(): void {
+    this.cdref.detectChanges()
   }
 
   /* API call to get all roles*/
@@ -113,7 +110,6 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
           _.each(i.organisations, o => {
             if (!o.isDeleted && (o.roles || []).indexOf(this.roleName) >= 0) {
               consider = true
-              console.log('organaisation', o.firstName, o.email)
             }
           })
         }
@@ -133,7 +129,6 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
           }
         })
     }
-    // debugger
     this.data = users
 
     // this.profile.getMyDepartmentAll().subscribe(res => {
diff --git a/project/ws/app/src/lib/routes/home/services/home-utill.service.ts b/project/ws/app/src/lib/routes/home/services/home-utill.service.ts
index a8361ea05..d693a70cf 100644
--- a/project/ws/app/src/lib/routes/home/services/home-utill.service.ts
+++ b/project/ws/app/src/lib/routes/home/services/home-utill.service.ts
@@ -33,7 +33,9 @@ export class ProfileV2UtillService {
 
   emailTransform(value: string): any {
     // return value.split('.').join('[dot]').replace('@', '[at]')
-    return value.replace(/\./g, '[dot]').replace('@', '[at]')
+    if (value !== undefined) {
+      return value.replace(/\./g, '[dot]').replace('@', '[at]')
+    }
 
   }
 
diff --git a/project/ws/app/src/lib/routes/users/services/users.service.ts b/project/ws/app/src/lib/routes/users/services/users.service.ts
index 7fc111489..40cdb353f 100644
--- a/project/ws/app/src/lib/routes/users/services/users.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/users.service.ts
@@ -158,7 +158,6 @@ export class UsersService {
         (data: any) => ({ role, count: _.get(data, 'result.response') })))
   }
 
-
   searchUserByenter(value: string, rootOrgId: string) {
     const reqBody = {
       request: {

From 46d72eac367644a84acc79291f139810b5f90716 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Thu, 22 Jun 2023 17:34:27 +0530
Subject: [PATCH 132/887] Env changes based on the page url

---
 .../lib/routes/access/access-routing.module.ts   |  4 ++--
 .../routes/approvals/approvals.routing.module.ts |  2 +-
 .../lib/routes/events/events.routing.module.ts   |  6 +++---
 .../src/lib/routes/home/home.rounting.module.ts  | 12 ++++++------
 .../my-dashboard/my-dashboard-routing.module.ts  |  1 +
 .../state-profile-routing.module.ts              | 16 ++++++++--------
 .../src/lib/routes/users/users.routing.module.ts |  4 ++--
 .../workallocation-v2-routing.module.ts          | 10 +++++-----
 8 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/project/ws/app/src/lib/routes/access/access-routing.module.ts b/project/ws/app/src/lib/routes/access/access-routing.module.ts
index d9a8aeef3..bf491f4f8 100644
--- a/project/ws/app/src/lib/routes/access/access-routing.module.ts
+++ b/project/ws/app/src/lib/routes/access/access-routing.module.ts
@@ -20,7 +20,7 @@ const routes: Routes = [
         component: PrivilegesComponent,
         data: {
           pageId: ':role',
-          module: 'roles-access',
+          module: 'Roles',
         },
       },
       {
@@ -28,7 +28,7 @@ const routes: Routes = [
         component: UsersComponent,
         data: {
           pageId: ':role',
-          module: 'roles-access',
+          module: 'Roles',
         },
         resolve: {
           usersList: UsersListResolve,
diff --git a/project/ws/app/src/lib/routes/approvals/approvals.routing.module.ts b/project/ws/app/src/lib/routes/approvals/approvals.routing.module.ts
index e5aa1d83d..ed32e1ca8 100644
--- a/project/ws/app/src/lib/routes/approvals/approvals.routing.module.ts
+++ b/project/ws/app/src/lib/routes/approvals/approvals.routing.module.ts
@@ -12,7 +12,7 @@ const routes: Routes = [
     runGuardsAndResolvers: 'always',
     data: {
       pageId: ':userId',
-      module: 'approval',
+      module: 'Approvals',
     },
     resolve: {
       profileData: HomeResolve,
diff --git a/project/ws/app/src/lib/routes/events/events.routing.module.ts b/project/ws/app/src/lib/routes/events/events.routing.module.ts
index 44a13fd0a..57ca58a51 100644
--- a/project/ws/app/src/lib/routes/events/events.routing.module.ts
+++ b/project/ws/app/src/lib/routes/events/events.routing.module.ts
@@ -21,7 +21,7 @@ const routes: Routes = [
         component: ListEventComponent,
         data: {
           pageId: 'list',
-          module: 'events',
+          module: 'Events',
         },
         resolve: {
           configService: ConfigResolveService,
@@ -32,7 +32,7 @@ const routes: Routes = [
         component: ViewEventComponent,
         data: {
           pageId: ':eventId',
-          module: 'events',
+          module: 'Events',
         },
       },
     ],
@@ -42,7 +42,7 @@ const routes: Routes = [
     component: CreateEventComponent,
     data: {
       pageId: 'create-event',
-      module: 'events',
+      module: 'Events',
     },
     resolve: {
       configService: ConfigResolveService,
diff --git a/project/ws/app/src/lib/routes/home/home.rounting.module.ts b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
index 0a6ee0297..e92d7774e 100644
--- a/project/ws/app/src/lib/routes/home/home.rounting.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
@@ -49,7 +49,7 @@ const routes: Routes = [
         },
         data: {
           pageId: 'users',
-          module: 'Home',
+          module: 'User',
           pageType: 'feature',
           pageKey: 'users-view',
         },
@@ -64,7 +64,7 @@ const routes: Routes = [
         },
         data: {
           pageId: 'users',
-          module: 'Home',
+          module: 'User',
           pageType: 'feature',
           pageKey: 'users-view',
         },
@@ -82,7 +82,7 @@ const routes: Routes = [
         component: RolesAccessComponent,
         data: {
           pageId: 'roles-access',
-          module: 'Home',
+          module: 'Roles',
         },
         resolve: {
           usersList: UsersListResolve,
@@ -93,14 +93,14 @@ const routes: Routes = [
         component: ApprovalsComponent,
         data: {
           pageId: 'approvals',
-          module: 'Home',
+          module: 'Approvals',
         },
       },
       {
         path: 'workallocation/:tab',
         data: {
           pageId: 'workallocation',
-          module: 'Home',
+          module: 'Work Allocation',
         },
         component: WorkallocationComponent,
       },
@@ -109,7 +109,7 @@ const routes: Routes = [
         redirectTo: 'workallocation/draft', pathMatch: 'full',
         data: {
           pageId: 'workallocation',
-          module: 'Home',
+          module: 'Work Allocation',
         },
         component: WorkallocationComponent,
       },
diff --git a/project/ws/app/src/lib/routes/my-dashboard/my-dashboard-routing.module.ts b/project/ws/app/src/lib/routes/my-dashboard/my-dashboard-routing.module.ts
index a6049fcb2..6ff59fe21 100644
--- a/project/ws/app/src/lib/routes/my-dashboard/my-dashboard-routing.module.ts
+++ b/project/ws/app/src/lib/routes/my-dashboard/my-dashboard-routing.module.ts
@@ -11,6 +11,7 @@ const routes: Routes = []
         path: '',
         component: MyDashboardHomeComponent,
         children: routes,
+        data: { module: 'Dashboard' }
       },
     ]),
   ],
diff --git a/project/ws/app/src/lib/routes/state-profile/state-profile-routing.module.ts b/project/ws/app/src/lib/routes/state-profile/state-profile-routing.module.ts
index cfde11638..6d3699a51 100644
--- a/project/ws/app/src/lib/routes/state-profile/state-profile-routing.module.ts
+++ b/project/ws/app/src/lib/routes/state-profile/state-profile-routing.module.ts
@@ -33,7 +33,7 @@ const routes: Routes = [
         component: WelcomeOnboardComponent,
         data: {
           pageId: 'state-profile/wolcome',
-          module: 'state-profile',
+          module: 'Setup',
         },
       },
       {
@@ -41,7 +41,7 @@ const routes: Routes = [
         component: InstituteProfileComponent,
         data: {
           pageId: 'state-profile/institute-profile',
-          module: 'state-profile',
+          module: 'Setup',
           pageType: 'feature',
           pageKey: 'institute-profile',
         },
@@ -54,7 +54,7 @@ const routes: Routes = [
         component: RolesAndFunctionsComponent,
         data: {
           pageId: 'state-profile/roles',
-          module: 'state-profile',
+          module: 'Setup',
         },
       },
       {
@@ -62,7 +62,7 @@ const routes: Routes = [
         component: InfrastructureComponent,
         data: {
           pageId: 'state-profile/infra',
-          module: 'state-profile',
+          module: 'Setup',
         },
       },
       {
@@ -70,7 +70,7 @@ const routes: Routes = [
         component: TrainingRogramsComponent,
         data: {
           pageId: 'state-profile/training-programs',
-          module: 'state-profile',
+          module: 'Setup',
         },
       },
       {
@@ -78,7 +78,7 @@ const routes: Routes = [
         component: ResearchComponent,
         data: {
           pageId: 'state-profile/research',
-          module: 'state-profile',
+          module: 'Setup',
         },
       },
       {
@@ -86,7 +86,7 @@ const routes: Routes = [
         component: ConsultancyComponent,
         data: {
           pageId: 'state-profile/consultancy',
-          module: 'state-profile',
+          module: 'Setup',
         },
       },
       {
@@ -94,7 +94,7 @@ const routes: Routes = [
         component: FacultyComponent,
         data: {
           pageId: 'state-profile/faculty',
-          module: 'state-profile',
+          module: 'Setup',
         },
       },
 
diff --git a/project/ws/app/src/lib/routes/users/users.routing.module.ts b/project/ws/app/src/lib/routes/users/users.routing.module.ts
index 7702f5909..d0712ad12 100644
--- a/project/ws/app/src/lib/routes/users/users.routing.module.ts
+++ b/project/ws/app/src/lib/routes/users/users.routing.module.ts
@@ -13,7 +13,7 @@ const routes: Routes = [
     component: ViewUserComponent,
     data: {
       pageId: ':userId',
-      module: 'user',
+      module: 'User',
     },
     resolve: {
       profileData: UserResolve,
@@ -28,7 +28,7 @@ const routes: Routes = [
     component: CreateUserComponent,
     data: {
       pageId: 'create-user',
-      module: 'Home',
+      module: 'User',
     },
     resolve: {
       // department: DepartmentResolve,
diff --git a/project/ws/app/src/lib/routes/workallocation-v2/workallocation-v2-routing.module.ts b/project/ws/app/src/lib/routes/workallocation-v2/workallocation-v2-routing.module.ts
index 776629d20..993f43967 100644
--- a/project/ws/app/src/lib/routes/workallocation-v2/workallocation-v2-routing.module.ts
+++ b/project/ws/app/src/lib/routes/workallocation-v2/workallocation-v2-routing.module.ts
@@ -26,7 +26,7 @@ const routes: Routes = [
           pageType: 'feature',
           pageKey: 'wat-comp-defaults',
           pageId: 'create/:workorder',
-          module: 'workallocation',
+          module: 'Work Allocation',
         },
 
         resolve: {
@@ -40,7 +40,7 @@ const routes: Routes = [
           pageType: 'feature',
           pageKey: 'wat-comp-defaults',
           pageId: 'update',
-          module: 'workallocation',
+          module: 'Work Allocation',
         },
         resolve: {
           pageData: PageResolve,
@@ -52,7 +52,7 @@ const routes: Routes = [
         component: DraftAllocationsComponent,
         data: {
           pageId: 'drafts/:workorder',
-          module: 'workallocation',
+          module: 'Work Allocation',
         },
       },
       {
@@ -60,14 +60,14 @@ const routes: Routes = [
         component: PublishedAllocationsComponent,
         data: {
           pageId: 'published/:workorder',
-          module: 'workallocation',
+          module: 'Work Allocation',
         },
       },
       {
         path: ':userId',
         data: {
           pageId: ':userId',
-          module: 'workallocation',
+          module: 'Work Allocation',
         },
         // component: UpdateWorkallocationComponent,
       }],

From a2afc478d2c7824bc9eeb46648b126005243b6ea Mon Sep 17 00:00:00 2001
From: Saurav Verma <saurav.verma@tarento.com>
Date: Thu, 22 Jun 2023 17:49:25 +0530
Subject: [PATCH 133/887] blended program user view

---
 .../components/batch-details/batch-details.component.html   | 2 +-
 .../components/batch-details/batch-details.component.ts     | 6 ++++++
 .../routes/blended-approvals/blended-approvals.component.ts | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
index a349efb6e..f61d5d7e2 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
@@ -36,7 +36,7 @@
         <ng-container *ngIf="currentFilter === 'pending'">
           <div class="b-c box">
             <div *ngFor="let user of usersData">
-              <ws-app-users-card [user]="user" [actions]="true" (click)=""></ws-app-users-card>
+              <ws-app-users-card [user]="user" [actions]="true" (click)="loadUsersView($event)"></ws-app-users-card>
             </div>
           </div>
         </ng-container>
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index 6614435cc..e5e0c7e2b 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -111,4 +111,10 @@ export class BatchDetailsComponent implements OnInit {
     })
   }
 
+  loadUsersView(event: any) {
+    console.log("Event data >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" + event)
+    // Logic to load the users-view component or navigate to its route
+    // You can use Angular's Router or any other mechanism to load the component
+  }
+
 }
diff --git a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
index f0dcf86b0..795cd0d74 100644
--- a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
@@ -61,6 +61,7 @@ export class BlendedApprovalsComponent implements OnInit {
     this.bpService.getBlendedPrograms(req).subscribe((res: any) => {
       const resultList = res.result.content
       resultList.forEach((val: any) => {
+        console.log(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>> ", val)
         val.batchesCount = val.batches.length
         val.learners = val.learnersCount
         val.newrequests = val.requestsCount

From defbd6e66ec661c7e329ca5888528cc38197c6cd Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Fri, 23 Jun 2023 10:22:14 +0530
Subject: [PATCH 134/887] Udpdated UI for BP pages

---
 .../batch-details/batch-details.component.ts  |  2 +-
 .../batch-list/batch-list.component.html      | 13 ++++--
 .../batch-list/batch-list.component.scss      |  6 +--
 .../batch-list/batch-list.component.ts        | 46 +++++++++++--------
 .../blended-approvals.component.ts            |  6 ++-
 5 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index 961968f32..7761d826e 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -128,7 +128,7 @@ export class BatchDetailsComponent implements OnInit {
       userId: reqData.userId,
       actorUserId: reqData.actorUUID,
       serviceName: 'blendedprogram',
-      rootOrgId: reqData.rootOrg,
+      rootOrg: reqData.rootOrg,
       courseId: this.programID,
       deptName: reqData.deptName,
       updateFieldValues: [
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
index aa2c2fcaf..5ed6b67df 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
@@ -11,15 +11,18 @@
             (click)="viewDetails(batch)" *ngFor="let batch of programData.batches">
             <div class="padding-left-s padding-right-s padding-top-s padding-bottom-xs margin-remove">
               <span class="mat-subheading-1 margin-remove">{{batch.name}}</span>
-              <span class="float-right mat-body-2 margin-remove">{{batch.batchId}}</span>
+              <!-- <span class="float-right mat-body-2 margin-remove">{{batch.batchId}}</span> -->
             </div>
             <div class="padding-left-s padding-right-s mat-body-2">
               <!-- <p class="margin-remove"><mat-icon>tag</mat-icon> {{batch.batchId}}</p> -->
-              <p class="margin-remove"><mat-icon>event</mat-icon> {{batch.startDate}} - {{batch.endDate}}</p>
-              <p class="margin-remove"><mat-icon>event</mat-icon> {{batch.enrollmentEndDate}}</p>
-            </div>
-            <div class="request-box mat-body-2 margin-top-xs">{{batch.newrequestsCount}} New requests
+              <p class="margin-remove"><mat-icon>event</mat-icon> {{batch.startDate | date: 'mediumDate'}} -
+                {{batch.endDate | date: 'mediumDate'}}</p>
+              <p class="margin-remove"><mat-icon>event</mat-icon> {{batch.enrollmentEndDate | date:'mediumDate'}}</p>
             </div>
+            <div class="request-box mat-body-2 margin-top-xs" *ngIf="batch.newrequestsCount > 1">
+              {{batch.newrequestsCount}} New requests</div>
+            <div class="request-box mat-body-2 margin-top-xs" *ngIf="batch.newrequestsCount === 1">
+              {{batch.newrequestsCount}} New request</div>
           </div>
         </div>
         <div class="batches-lsit" *ngIf="programData && !programData.batches">
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss
index 1e1ddfbc8..d8910a67e 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss
@@ -12,10 +12,10 @@
     display: inline-block;
   }
   .mat-subheading-1 {
-    width: 45%;
-    white-space: nowrap;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
     overflow: hidden;
-    text-overflow: ellipsis;
   }
 
   .mat-body-2 {
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
index 7ebbc825a..6b3b86c26 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
@@ -24,7 +24,20 @@ export class BatchListComponent implements OnInit {
         }
         if (this.programData.batches) {
           this.programData.batches.forEach((b: any) => {
-            b.newrequestsCount = this.getNewRequestsList(b.batchId)
+            // b.newrequestsCount = this.getNewRequestsList(b.batchId)
+            const request = {
+              serviceName: 'blendedprogram',
+              applicationStatus: 'SEND_FOR_MDO_APPROVAL',
+              applicationIds: [b.batchId],
+              limit: 100,
+              offset: 0,
+              deptName: this.programData.organisation[0],
+            }
+            this.bpService.getRequests(request).subscribe((resnew: any) => {
+              if (resnew) {
+                b.newrequestsCount = resnew.result.data.length
+              }
+            })
           })
         }
       }
@@ -50,27 +63,24 @@ export class BatchListComponent implements OnInit {
 
         if (this.programData.batches) {
           this.programData.batches.forEach((b: any) => {
-            b.newrequestsCount = this.getNewRequestsList(b.batchId)
+            // b.newrequestsCount = this.getNewRequestsList(b.batchId)
+            const request = {
+              serviceName: 'blendedprogram',
+              applicationStatus: 'SEND_FOR_MDO_APPROVAL',
+              applicationIds: [b.batchId],
+              limit: 100,
+              offset: 0,
+              deptName: this.programData.organisation[0],
+            }
+            this.bpService.getRequests(request).subscribe((resnew: any) => {
+              if (resnew) {
+                b.newrequestsCount = resnew.result.data.length
+              }
+            })
           })
         }
       }
     })
   }
 
-  getNewRequestsList(bId: any) {
-    const request = {
-      serviceName: 'blendedprogram',
-      applicationStatus: 'SEND_FOR_MDO_APPROVAL',
-      applicationIds: [bId],
-      limit: 100,
-      offset: 0,
-      deptName: this.programData.organisation[0],
-    }
-    this.bpService.getRequests(request).subscribe((res: any) => {
-      if (res) {
-        return res.result.data.length
-      }
-    })
-  }
-
 }
diff --git a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
index ad090b1f5..628c0402b 100644
--- a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
@@ -28,7 +28,7 @@ export class BlendedApprovalsComponent implements OnInit {
     sortState: 'asc',
     needUserMenus: false,
   }
-  configSvc: any
+  userProfile: any
 
   constructor(
     private activeRouter: ActivatedRoute,
@@ -37,7 +37,8 @@ export class BlendedApprovalsComponent implements OnInit {
 
   ngOnInit() {
     if (this.activeRouter.parent && this.activeRouter.parent.snapshot.data.configService) {
-      this.configSvc = this.activeRouter.parent.snapshot.data.configService
+      this.userProfile = this.activeRouter.parent.snapshot.data.configService.unMappedUser
+      // console.log('this.userProfile', this.userProfile)
     }
     this.getBlendedPreogramsList()
   }
@@ -51,6 +52,7 @@ export class BlendedApprovalsComponent implements OnInit {
         filters: {
           status: ['Live'],
           primaryCategory: ['Blended Program'],
+          createdFor: [this.userProfile.rootOrgId],
         },
         sort_by: { lastUpdatedOn: 'desc' },
         facets: ['primaryCategory', 'mimeType'],

From c4c78d8f0d7f281f791cdb2c531e4067c22ce8c6 Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Fri, 23 Jun 2023 17:45:27 +0530
Subject: [PATCH 135/887] Updated UI & approve condition in BP

---
 .../batch-details/batch-details.component.html | 17 ++++++++++++-----
 .../batch-details/batch-details.component.ts   | 18 ++++++++++++------
 .../batch-list/batch-list.component.html       |  5 +++--
 .../batch-list/batch-list.component.scss       |  4 ++++
 4 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
index cc49820a6..268354e94 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
@@ -10,8 +10,9 @@
           <p class="font-bold">Batch details</p>
           <ul class="margin-top-m margin-bottom-m batch-data" *ngIf="batchData">
             <li><mat-icon>tag</mat-icon> {{batchData.batchId}}</li>
-            <li><mat-icon>event</mat-icon> {{batchData.startDate}} - {{batchData.endDate}}</li>
-            <li><mat-icon>event</mat-icon> {{batchData.enrollmentEndDate}}</li>
+            <li><mat-icon>event</mat-icon> {{batchData.startDate | date: 'mediumDate'}} - {{batchData.endDate | date:
+              'mediumDate'}}</li>
+            <li><mat-icon>event</mat-icon> {{batchData.enrollmentEndDate | date: 'mediumDate'}}</li>
             <li><mat-icon>people</mat-icon> {{approvedUsers.length}} Learners</li>
           </ul>
         </div>
@@ -22,15 +23,21 @@
           <div class="flex flex-1 filter max-height-60">
             <a class="filter-option cursor-pointer" [ngClass]="{'ws-mat-accent-border-active font-bold' : currentFilter === 'pending',
                                                 'ws-mat-accent-border font-medium':currentFilter !== 'pending'}"
-              mat-button (click)="filter('pending')" role="button">New requests</a>
+              mat-button (click)="filter('pending')" role="button">New requests
+              <!-- <span *ngIf="newUsers" class="ws-mat-black60-text">({{newUsers.length}})</span> -->
+            </a>
             <a class="filter-option cursor-pointer"
               [ngClass]="{'ws-mat-accent-border-active font-bold' : currentFilter === 'approved',
                                                               'ws-mat-accent-border font-medium':currentFilter !== 'approved'}" mat-button
-              (click)="filter('approved')" role="button">Learners</a>
+              (click)="filter('approved')" role="button">Learners
+              <!-- <span *ngIf="approvedUsers" class="ws-mat-black60-text">({{approvedUsers.length}})</span> -->
+            </a>
             <a class="filter-option cursor-pointer"
               [ngClass]="{'ws-mat-accent-border-active font-bold' : currentFilter === 'rejected',
                                                                         'ws-mat-accent-border font-medium':currentFilter !== 'rejected'}" mat-button
-              (click)="filter('rejected')" role="button">Rejected requests</a>
+              (click)="filter('rejected')" role="button">Rejected requests
+              <!-- <span *ngIf="rejectedUsers" class="ws-mat-black60-text">({{rejectedUsers.length}})</span> -->
+            </a>
           </div>
         </div>
         <ng-container *ngIf="currentFilter === 'pending'">
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index 7761d826e..cd047e8e3 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -1,6 +1,8 @@
 import { Component, OnInit } from '@angular/core'
 import { MatSnackBar } from '@angular/material'
 import { ActivatedRoute, Router } from '@angular/router'
+// tslint:disable-next-line:import-name
+import _ from 'lodash'
 import { BlendedApporvalService } from '../../services/blended-approval.service'
 
 @Component({
@@ -78,7 +80,7 @@ export class BatchDetailsComponent implements OnInit {
   getLearnersList() {
     this.bpService.getLearners(this.batchData.batchId).subscribe((res: any) => {
       if (res && res.length > 0) {
-        this.approvedUsers = res.result.content
+        this.approvedUsers = res
       }
     })
   }
@@ -119,7 +121,10 @@ export class BatchDetailsComponent implements OnInit {
     // tslint:disable-next-line:no-console
     console.log('======', event)
     const actionType = event.action.toUpperCase()
-    const reqData = event.userData.wfInfo[0]
+    // const reqData = event.userData.wfInfo[0]
+    const reqData = _.maxBy(event.userData.wfInfo, (el: any) => {
+      return new Date(el.lastUpdatedOn).getTime()
+    })
     const request = {
       state: 'SEND_FOR_MDO_APPROVAL',
       action: actionType,
@@ -128,13 +133,13 @@ export class BatchDetailsComponent implements OnInit {
       userId: reqData.userId,
       actorUserId: reqData.actorUUID,
       serviceName: 'blendedprogram',
-      rootOrg: reqData.rootOrg,
+      rootOrgId: reqData.rootOrg,
       courseId: this.programID,
       deptName: reqData.deptName,
       updateFieldValues: [
         {
           toValue: {
-            name: event.userData.first_name,
+            name: event.userData.userInfo.first_name,
           },
         },
       ],
@@ -145,8 +150,9 @@ export class BatchDetailsComponent implements OnInit {
       // tslint:disable-next-line:no-console
       console.log('res', res)
       if (event.action === 'Approve') {
-        this.openSnackbar('Request is approved successfully!')
-        this.filter('approved')
+        this.newUsers = []
+        this.openSnackbar('Request is approved successfully! Further needs to be approved by program coordinator.')
+        this.getNewRequestsList()
       } else {
         this.openSnackbar('Request is rejected successfully!')
         this.filter('rejected')
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
index 5ed6b67df..cfc0ed121 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
@@ -9,7 +9,7 @@
         <div class="batches-lsit" *ngIf="programData && programData.batches">
           <div class="grey-box ws-mat-accent-border cursor-pointer margin-bottom-m margin-right-l"
             (click)="viewDetails(batch)" *ngFor="let batch of programData.batches">
-            <div class="padding-left-s padding-right-s padding-top-s padding-bottom-xs margin-remove">
+            <div class="padding-left-s padding-right-s padding-top-s padding-bottom-xs margin-remove title-div">
               <span class="mat-subheading-1 margin-remove">{{batch.name}}</span>
               <!-- <span class="float-right mat-body-2 margin-remove">{{batch.batchId}}</span> -->
             </div>
@@ -21,7 +21,8 @@
             </div>
             <div class="request-box mat-body-2 margin-top-xs" *ngIf="batch.newrequestsCount > 1">
               {{batch.newrequestsCount}} New requests</div>
-            <div class="request-box mat-body-2 margin-top-xs" *ngIf="batch.newrequestsCount === 1">
+            <div class="request-box mat-body-2 margin-top-xs"
+              *ngIf="batch.newrequestsCount === 1 || batch.newrequestsCount === 0">
               {{batch.newrequestsCount}} New request</div>
           </div>
         </div>
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss
index d8910a67e..3fe3a8e41 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss
@@ -8,6 +8,10 @@
   width: 31%;
   border-radius: 4px;
 
+  .title-div {
+    min-height: 48px;
+  }
+
   span {
     display: inline-block;
   }

From 2af6dddf969df2afb5da303c8cb2a3f097348310 Mon Sep 17 00:00:00 2001
From: Saurav Verma <saurav.verma@tarento.com>
Date: Mon, 26 Jun 2023 12:32:23 +0530
Subject: [PATCH 136/887] blended program pull

---
 .../components/batch-details/batch-details.component.html      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
index cc49820a6..00a070cac 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
@@ -36,7 +36,8 @@
         <ng-container *ngIf="currentFilter === 'pending'">
           <div class="b-c box" *ngIf="newUsers && newUsers.length > 0">
             <div *ngFor="let user of newUsers">
-              <ws-app-users-card [user]="user" [actions]="true" (userClick)="onSubmit($event)"></ws-app-users-card>
+              <ws-app-users-card [user]="user" [actions]="true" (click)="loadUsersView($event)"
+                (userClick)="onSubmit($event)"></ws-app-users-card>
             </div>
           </div>
           <div class="b-c box" *ngIf="newUsers && newUsers.length == 0">

From ca9ba7a36bbdd2a1741ed940376e33c1b338dbd6 Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Tue, 27 Jun 2023 11:19:59 +0530
Subject: [PATCH 137/887] Updated newrequests count in main BP listing page

---
 .../blended-approvals.component.ts            | 29 ++++++++++++++++---
 .../routes/home/services/blended.service.ts   |  5 ++++
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
index 628c0402b..a8436375e 100644
--- a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
@@ -19,7 +19,7 @@ export class BlendedApprovalsComponent implements OnInit {
     columns: [
       { displayName: 'Program name', key: 'name' },
       { displayName: 'Batches', key: 'batchesCount' },
-      { displayName: 'Learners', key: 'learners', isList: true },
+      // { displayName: 'Learners', key: 'learners', isList: true },
       { displayName: 'New requests (Across batches)', key: 'newrequests', isList: true },
     ],
     needCheckBox: false,
@@ -29,6 +29,7 @@ export class BlendedApprovalsComponent implements OnInit {
     needUserMenus: false,
   }
   userProfile: any
+  bIDs: any[] = []
 
   constructor(
     private activeRouter: ActivatedRoute,
@@ -66,11 +67,31 @@ export class BlendedApprovalsComponent implements OnInit {
         resultList.forEach((val: any) => {
           if (val.batches) {
             val.batchesCount = val.batches.length
-            val.learners = 0
-            val.newrequests = 0
+            // val.learners = 0
+            // val.newrequests = 0
+            val.batches.forEach((b: any) => {
+              this.bIDs.push(b.batchId)
+            })
+            if (this.bIDs && this.bIDs.length > 0) {
+              const request = {
+                serviceName: 'blendedprogram',
+                applicationStatus: 'SEND_FOR_MDO_APPROVAL',
+                applicationIds: this.bIDs,
+                limit: 100,
+                offset: 0,
+                deptName: this.userProfile.rootOrg.channel,
+              }
+              this.bpService.getRequests(request).subscribe((resnew: any) => {
+                if (resnew) {
+                  val.newrequests = resnew.result.data.length
+                }
+              })
+            } else {
+              val.newrequests = 0
+            }
           } else {
             val.batchesCount = 0
-            val.learners = 0
+            // val.learners = 0
             val.newrequests = 0
           }
         })
diff --git a/project/ws/app/src/lib/routes/home/services/blended.service.ts b/project/ws/app/src/lib/routes/home/services/blended.service.ts
index 272f9cadc..bbc7a34cb 100644
--- a/project/ws/app/src/lib/routes/home/services/blended.service.ts
+++ b/project/ws/app/src/lib/routes/home/services/blended.service.ts
@@ -4,6 +4,7 @@ import { Observable } from 'rxjs'
 
 const API_END_POINTS = {
   GET_BLENDED_PROGRAMS: '/apis/proxies/v8/sunbirdigot/read',
+  GET_REQUESTS: '/apis/proxies/v8/workflow/blendedprogram/search',
 }
 
 @Injectable({
@@ -14,4 +15,8 @@ export class BlendedService {
   getBlendedPrograms(request: any): Observable<any> {
     return this.http.post<any>(API_END_POINTS.GET_BLENDED_PROGRAMS, request)
   }
+
+  getRequests(req: any) {
+    return this.http.post<any>(`${API_END_POINTS.GET_REQUESTS}`, req)
+  }
 }

From b016f93af69bc9d229cbb6a52bce55848ac6f8ae Mon Sep 17 00:00:00 2001
From: Saurav Verma <saurav.verma@tarento.com>
Date: Thu, 29 Jun 2023 09:07:32 +0530
Subject: [PATCH 138/887] mdo learner ui

---
 .../blended-approvals-routing.module.ts       |  25 +-
 .../blended-approvals.module.ts               |   3 +-
 .../batch-details/batch-details.component.ts  |   4 +-
 .../profile-view/profile-view.component.html  | 353 ++++++++++++++++++
 .../profile-view.component.scss}              |  96 ++++-
 .../profile-view/profile-view.component.ts    | 224 +++++++++++
 .../user-view/user-view.component.html        | 255 -------------
 .../user-view/user-view.component.ts          | 241 ------------
 .../users-card/users-card.component.html      |   6 +-
 .../users-card/users-card.component.ts        |  11 +-
 .../services/blended-approval.service.ts      |   9 +
 .../blended-approvals.component.ts            |   1 -
 src/styles/styles.scss                        |   2 +-
 13 files changed, 721 insertions(+), 509 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.html
 rename project/ws/app/src/lib/routes/blended-program-approvals/components/{user-view/user-view.component.scss => profile-view/profile-view.component.scss} (77%)
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.ts
 delete mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/user-view/user-view.component.html
 delete mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/user-view/user-view.component.ts

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals-routing.module.ts b/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals-routing.module.ts
index 952e69d7b..f15a84a03 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals-routing.module.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals-routing.module.ts
@@ -1,9 +1,14 @@
 import { NgModule } from '@angular/core'
+import { MatListModule } from '@angular/material/list'
 import { Routes, RouterModule } from '@angular/router'
 import { ConfigResolveService } from '../home/resolvers/config-resolve.service'
 import { BatchDetailsComponent } from './components/batch-details/batch-details.component'
 import { BatchListComponent } from './components/batch-list/batch-list.component'
 import { BlendedHomeComponent } from './components/blended-home/blended-home.component'
+import { ProfileViewComponent } from './components/profile-view/profile-view.component'
+import { AvatarPhotoComponent } from './components/avatar-photo/avatar-photo.component'
+import { CommonModule } from '@angular/common'
+import { MatButtonModule, MatCardModule, MatIconModule, MatSidenavModule } from '@angular/material'
 
 const routes: Routes = [
   {
@@ -34,13 +39,31 @@ const routes: Routes = [
           module: 'blended-approvals',
         },
       },
+      {
+        path: 'user-profile/:userId',
+        component: ProfileViewComponent,
+        data: {
+          pageId: ':id',
+          module: 'blended-approvals',
+        },
+      },
     ],
   },
 ]
+
 @NgModule({
-  declarations: [],
+  declarations: [
+    ProfileViewComponent,
+    AvatarPhotoComponent,
+  ],
   imports: [
     RouterModule.forChild(routes),
+    CommonModule,
+    MatCardModule,
+    MatIconModule,
+    MatButtonModule,
+    MatListModule,
+    MatSidenavModule,
   ],
   exports: [RouterModule],
   providers: [],
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts b/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
index 6ae516cfd..5270e28b4 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
@@ -1,4 +1,5 @@
 import { NgModule } from '@angular/core'
+import { MatListModule } from '@angular/material/list'
 import { CommonModule } from '@angular/common'
 import {
   AvatarPhotoModule,
@@ -23,7 +24,7 @@ import { UsersCardComponent } from './components/users-card/users-card.component
 @NgModule({
   declarations: [BlendedHomeComponent, BatchListComponent, BatchDetailsComponent, UsersCardComponent],
   imports: [CommonModule, BlendedApprovalsRoutingModule, BreadcrumbsOrgModule, LeftMenuWithoutLogoModule, WidgetResolverModule,
-    MatSidenavModule, MatIconModule, HomeModule, RouterModule, UIORGTableModule, MatCardModule, AvatarPhotoModule],
+    MatSidenavModule, MatIconModule, HomeModule, RouterModule, UIORGTableModule, MatCardModule, AvatarPhotoModule, MatListModule],
   exports: [],
   providers: [],
 })
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index 426580ba6..024aae594 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -166,8 +166,8 @@ export class BatchDetailsComponent implements OnInit {
     })
   }
 
-  loadUsersView(event: any) {
-    console.log("Event data >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" + event)
+  loadUsersView(user: any) {
+    this.router.navigate([`/app/blended-approvals/user-profile/${user.userId}`], { state: user })
     // Logic to load the users-view component or navigate to its route
     // You can use Angular's Router or any other mechanism to load the component
   }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.html
new file mode 100644
index 000000000..299a191b4
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.html
@@ -0,0 +1,353 @@
+<div class="flex flex-4 flex-column">
+  <mat-card class="flex-custom mat-card" id="profileInfo">
+    <mat-card-header class="flex-custom-m mat-card-header ng-star-inserted">
+
+
+
+      <mat-card-header class="flex-custom-m" *ngIf="portalProfile && portalProfile?.personalDetails"></mat-card-header>
+      <div mat-card-avatar class="example-header-image">
+        <ng-container *ngIf="portalProfile?.personalDetails?.firstname">
+          <ws-widget-avatar-photo [photoUrl]="null" [name]="portalProfile?.personalDetails?.firstname" size="xxl-s">
+          </ws-widget-avatar-photo>
+        </ng-container>
+      </div>
+      <div class="flex-1">
+        <div class="flex flex-1">
+          <div class="flex flex-4">
+            <ng-container *ngIf="portalProfile?.personalDetails?.firstname">
+              <mat-card-title role="link" tabindex="0" class="flex mobile-margin text-capitalize mat-h2"
+                [innerHTML]="portalProfile?.personalDetails?.firstname">
+              </mat-card-title>
+            </ng-container>
+            <ng-container *ngIf="portalProfile?.personalDetails?.firstName">
+              <mat-card-title role="link" tabindex="0" class="flex mobile-margin text-capitalize mat-h2"
+                [innerHTML]="portalProfile?.personalDetails?.firstName">
+                <span *ngIf="verifiedBadge" class="profile-badge"> <img class="profile-badge"
+                    src="fusion-assets/images/profile-badge.png" height="18">
+                </span>
+              </mat-card-title>
+            </ng-container>
+            <span *ngIf="verifiedBadge" class="profile-badge"> <img class="profile-badge"
+                src="fusion-assets/images/profile-badge.png" height="18">
+            </span>
+          </div>
+          <div class="flex flex-1 flex-row-reverse">
+            <div *ngIf="portalProfile?.id === currentUser || portalProfile?.userId === currentUser"
+              class="ml-4 mr-6 mb-2 view-more ws-mat-accent-text view-all ws-mat-primary-lite-background-important">
+              <a mat-button [routerLink]="'/app/user-profile/details'">
+                <mat-icon class="margin-right-xs">edit</mat-icon>
+                <span i18n>{{ 'Edit Profile' }}</span>
+              </a>
+            </div>
+          </div>
+        </div>
+        <mat-card-subtitle role="link" tabindex="0" i18n-aria-label>
+          {{ portalProfile?.employmentDetails?.departmentName }}
+        </mat-card-subtitle>
+        <mat-card-subtitle role="link" tabindex="0" i18n-aria-label>
+          {{ portalProfile?.employmentDetails?.officialPostalAddress }}
+        </mat-card-subtitle>
+        <ng-container>
+          <div class="flex flex-1 custom margin-0 margin-top-m bottom-fix mob" role="link" tabindex="0">
+            <div class="flex flex-1">
+              <span class="flex margin-right-l mobile">
+                <span class="ws-mat-default-text">{{ connectionRequests?.length || 0 }}</span>
+                <span class="pad-4">Connections</span>
+              </span>
+              <span class="flex margin-right-l mobile">
+                <span class="ws-mat-default-text">{{ Math.abs(discussProfileData?.topiccount || 0) }}</span>
+                <span class="pad-4">Discussions</span>
+
+              </span>
+            </div>
+            <!-- <div class="flex flex-1" class="text-right mobile2">
+
+                      <span class="noocoments" mat-card-subtitle>Last online
+                        {{discussProfileData.lastonline | pipeRelativeTime}}</span>
+                    </div> -->
+          </div>
+        </ng-container>
+      </div>
+    </mat-card-header>
+    <mat-card-header class="flex-custom-m" *ngIf="!portalProfile || !portalProfile?.personalDetails">
+      <div class="flex-1" role="link" tabindex="0">
+        <div class="flex flex-1">
+          <mat-card-title class="flex-4 mobile-margin text-capitalize mat-h2">
+            No Information Available
+          </mat-card-title>
+        </div>
+      </div>
+    </mat-card-header>
+
+
+    <mat-sidenav-container name="discuss-menu" class="min-height margin-top-m">
+      <mat-sidenav [mode]="mode$ | async" [(opened)]="sideNavBarOpened" class="border-0 sidenav_inner">
+        <div class="contain">
+          <div class="flex-1" style="position: relative">
+            <div #stickyMenu [class.sticky]="sticky">
+              <!-- <app-profile-v2-left-menu [tabsData]="tabsData" class="flex flex-1"></app-profile-v2-left-menu> -->
+            </div>
+          </div>
+        </div>
+      </mat-sidenav>
+
+      <mat-sidenav-content class="sidenav_content">
+        <div *ngIf="screenSizeIsLtMedium">
+          <button type="button" mat-icon-button (click)="sideNavBarOpened = !sideNavBarOpened"
+            id="ws-auth-root-home-btn-menu" name="ws-auth-root-home-btn-menu">
+            <mat-icon>menu</mat-icon>
+          </button>
+        </div>
+
+        <div class="main_network_box">
+          <ng-container *ngFor="let tab of tabsData;let i=index">
+            <!-- <ws-widget-profile-v2-academics *ngIf="pdfData" [widgetData]="tab"></ws-widget-profile-v2-academics> -->
+            <ng-container *ngIf="tab && tab.render && tab.enabled">
+              <ng-container *ngIf="
+                portalProfile?.id === currentUser ||
+                portalProfile?.userId === currentUser
+              ">
+                <!-- <ng-container *ngIf="tab.key === 'certifications'" [wsResolverWidget]="{
+                    widgetType: tab.widget.widgetType,
+                    widgetSubType: tab.widget.widgetSubType,
+                    widgetHostClass: tab.widget.widgetHostClass,
+                    widgetData: {
+                      name: tab.name,
+                      key: tab.key,
+                      data: enrolledCourse,
+                      certificates: allCertificate
+                    }
+                  }">
+              </ng-container> -->
+              </ng-container>
+              <!-- <ng-container *ngIf="tab.key !== 'certifications'" [wsResolverWidget]="{
+                    widgetType: tab.widget.widgetType,
+                    widgetSubType: tab.widget.widgetSubType,
+                    widgetHostClass: tab.widget.widgetHostClass,
+                    widgetData: {
+                      name: tab.name,
+                      key: tab.key,
+                      data: portalProfile[tab.dataKey]
+                    }
+                  }"></ng-container> -->
+            </ng-container>
+          </ng-container>
+          <ng-container *ngIf="discussionList">
+            <div [attr.id]="discussions"
+              class="flex flex-1 flex-column margin-top-xs margin-botton-xs dark-card discussion-card"
+              style="box-shadow: none">
+              <!-- <mat-card [attr.id]='discussions' class="margin-left-xs margin-top-xs margin-botton-xs dark-card discussion-card"
+              style="box-shadow: none;"> -->
+
+              <!-- <mat-card-content> -->
+              <div class="flex flex-1">
+                <span class="margin-bottom-xs margin-top-l mat-title flex-1">{{
+                  'Discussions'
+                  }}</span>
+                <!-- <div
+                    class="ml-4 mr-6 mb-2 view-more ws-mat-accent-text view-all ws-mat-primary-lite-background-important">
+                    <a mat-button [routerLink]="'/app/discuss/my-discussions'">
+                       <span i18n>{{'Go to discussion profile'}}</span>
+                    </a>
+                  </div> -->
+              </div>
+              <ng-container>
+                <!-- <mat-card class="recent-tabs"> -->
+                <div class="w-full">
+                  <div class="flex flex-1 flex-column filter_outer_box">
+                    <div class="flex flex-1 filter flex-wrap">
+                      <a href="javascript:void(0)" class="filter-option font-normal" i18n-aria-label role="button"
+                        [ngClass]="{
+                            'ws-mat-accent-border-active':
+                              currentFilter === 'timestamp',
+                            'ws-mat-accent-border font-medium':
+                              currentFilter !== 'timestamp'
+                          }" mat-button (click)="filter('timestamp')">
+                        Recent posts
+                      </a>
+                      <a href="javascript:void(0)" class="filter-option" i18n-aria-label role="button" [ngClass]="{
+                            'ws-mat-accent-border-active': currentFilter === 'best',
+                            'ws-mat-accent-border font-medium':
+                              currentFilter !== 'best'
+                          }" mat-button (click)="filter('best')">
+                        Best posts
+                      </a>
+                      <a href="javascript:void(0)" class="filter-option" i18n-aria-label role="button" [ngClass]="{
+                            'ws-mat-accent-border-active':
+                              currentFilter === 'saved',
+                            'ws-mat-accent-border font-medium':
+                              currentFilter !== 'saved'
+                          }" mat-button (click)="filter('saved')" *ngIf="
+                            portalProfile?.id === currentUser ||
+                            portalProfile?.userId === currentUser
+                          ">
+                        Saved posts
+                      </a>
+                    </div>
+                  </div>
+                  <!-- </mat-card> -->
+                </div>
+              </ng-container>
+              <!-- <ng-container *ngIf="discussionList && discussionList.length > 0">
+              <ng-container *ngFor="let data of discussionList">
+                <app-dicuss-post-card [discuss]="data"></app-dicuss-post-card>
+              </ng-container>
+            </ng-container>
+            <ng-container *ngIf="!(discussionList && discussionList.length > 0)">
+              <mat-card class="no-shadow mat-card margin-bottom-l">
+                <mat-card-header>
+                  <mat-card-title>No Data</mat-card-title>
+                </mat-card-header>
+                <mat-card-content>
+                  <span>&nbsp;</span>
+                </mat-card-content>
+              </mat-card>
+            </ng-container> -->
+              <!-- </mat-card-content> -->
+              <!-- </mat-card> -->
+            </div>
+          </ng-container>
+        </div>
+      </mat-sidenav-content>
+
+
+
+      <!-- </div> -->
+    </mat-sidenav-container>
+  </mat-card>
+
+  <div class="container sidenav">
+    <mat-nav-list class="margin-left-xs margin-right-s margin-top-m flex-1 mat-nav-list mat-list-base"
+      role="navigation">
+      <a class="mat-list-item  " mat-list-item="" matripple="" style="">
+        <div class="mat-list-item-content">
+          <div class="mat-list-item-ripple mat-ripple" mat-ripple=""></div>
+          <div class="mat-list-text"></div>
+          <span class="padding-left-xs">Profile info</span>
+        </div>
+      </a>
+
+      <a class="mat-list-item   ws-active-discuss-route" (click)="selectTab(2)" mat-list-item="" matripple="" style="">
+        <div class="mat-list-item-content">
+          <div class="mat-list-item-ripple mat-ripple" mat-ripple=""></div>
+          <div class="mat-list-text"></div>
+          <span class="padding-left-xs">Certifications</span>
+        </div>
+      </a>
+
+      <a class="mat-list-item " (click)="selectTab(3)" mat-list-item="" matripple="" style="">
+        <div class="mat-list-item-content">
+          <div class="mat-list-item-ripple mat-ripple" mat-ripple=""></div>
+          <div class="mat-list-text"></div>
+          <span class="padding-left-xs">Career history</span>
+        </div>
+      </a>
+
+      <a class="mat-list-item " (click)="selectTab(4)" mat-list-item="" matripple="" style="">
+        <div class="mat-list-item-content">
+          <div class="mat-list-item-ripple mat-ripple" mat-ripple=""></div>
+          <div class="mat-list-text"></div>
+          <span class="padding-left-xs">Academics</span>
+        </div>
+      </a>
+
+      <a class="mat-list-item " (click)="selectTab(5)" mat-list-item="" matripple="" style="">
+        <div class="mat-list-item-content">
+          <div class="mat-list-item-ripple mat-ripple" mat-ripple=""></div>
+          <div class="mat-list-text"></div>
+          <span class="padding-left-xs">Hobbies</span>
+        </div>
+      </a>
+    </mat-nav-list>
+
+
+
+    <div class="container sidenav-right">
+
+      <mat-card class="card-container-sidenav-profile-card" *ngIf="selectedTab === 2">
+        <mat-card-header>
+          <mat-card-title>Certifications</mat-card-title>
+        </mat-card-header>
+        <mat-card class="card-container-sidenav-profile" *ngFor="let data of certificationData">
+          <div class="image-container image-card-container">
+            <img mat-card-lg-image [src]="data.courseLogoUrl" height="50" alt="Image" class="card-image" />
+          </div>
+          <div class="content-container">
+            <mat-card-content>
+              <mat-card-title>{{data.content.name}}</mat-card-title>
+              <mat-card-subtitle>{{data.content.description}}</mat-card-subtitle>
+            </mat-card-content>
+          </div>
+        </mat-card>
+      </mat-card>
+
+
+      <mat-card class="card-container-sidenav-profile-card" *ngIf="selectedTab === 3">
+        <mat-card-content class="mat-card-content" *ngFor="let designationData of designation">
+          <span class="mat-subheading-1 flex-4 mobile-margin" role="link" tabindex="0"> Career
+            history
+          </span>
+          <div *ngIf="viewProfile">
+            <mat-card class="mt-2 mat-list-item dark-card mat-card " role="link" tabindex="0">
+              <div class="flex flex-1">
+
+                <span class="flex-1 mat-subheading-1"> {{designationData.designation}} </span>
+                <span class="mat-subheading-2 ws-mat-black60-text">
+                  Joined {{designationData.doj}}
+                </span>
+              </div>
+              <div class="mat-body-2 flex-1"> {{designationData.description}}</div>
+              <div class="mat-body-2 flex-1 ws-mat-black60-text"> {{designationData.location}} </div>
+            </mat-card>
+          </div>
+        </mat-card-content>
+      </mat-card>
+
+      <mat-card class="card-container-sidenav-profile-card" *ngIf="selectedTab === 4">
+        <div class="flex flex-1 flex-column margin-top-xs margin-left-xs margin-right-xs">
+          <mat-card class="flex-custom mat-card" id="academics">
+            <mat-card-content class="mat-card-content">
+              <span class="mat-subheading-1 flex-4 mobile-margin" role="link" tabindex="0">Academics</span>
+              <mat-card class="no-shadow mt-2 mat-list-item dark-card mat-card ng-star-inserted" role="link"
+                tabindex="0" *ngFor="let academicsData of academics">
+                <div class="flex flex-1 mobile-margin margin-f">
+                  <span class="flex-1 mat-subheading-1">{{academicsData.type}}</span>
+                  <span
+                    class="mat-subheading-2 ws-mat-black60-text ng-star-inserted">{{academicsData.yearOfPassing}}</span>
+                </div>
+                <div class="mat-body-2 flex-1 mobile-margin">{{academicsData.nameOfInstitute}}</div>
+              </mat-card>
+              <!-- <mat-card class="no-shadow mt-2 mat-list-item dark-card mat-card ng-star-inserted" role="link"
+                tabindex="0">
+                <div class="flex flex-1 mobile-margin margin-f">
+                  <span class="flex-1 mat-subheading-1">XII STANDARD</span>
+                  <span class="mat-subheading-2 ws-mat-black60-text ng-star-inserted">0000</span>
+                </div>
+                <div class="mat-body-2 flex-1 mobile-margin">mds</div>
+              </mat-card> -->
+            </mat-card-content>
+          </mat-card>
+        </div>
+      </mat-card>
+
+      <mat-card class="card-container-sidenav-profile-card" *ngIf="selectedTab === 5">
+        <div class="flex flex-1 flex-column margin-top-xs margin-left-xs margin-right-xs">
+          <mat-card class="flex-custom mat-card" id="hobbies">
+            <mat-card-content class="mat-card-content">
+              <span class="mat-subheading-1 flex-4 mobile-margin" role="link" tabindex="0">Hobbies</span>
+              <mat-card class="no-shadow mt-2 mat-list-item dark-card mat-card ng-star-inserted" role="link"
+                tabindex="0">
+                <div class="flex flex-1 mobile-margin margin-f">
+                  <span class="mat-subtitle flex-1 mobile-margin">No hobbies information available</span>
+                </div>
+              </mat-card>
+            </mat-card-content>
+          </mat-card>
+        </div>
+      </mat-card>
+
+    </div>
+  </div>
+
+
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/user-view/user-view.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.scss
similarity index 77%
rename from project/ws/app/src/lib/routes/blended-program-approvals/components/user-view/user-view.component.scss
rename to project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.scss
index b76653e67..c240d9aae 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/user-view/user-view.component.scss
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.scss
@@ -389,11 +389,101 @@ a:not([href]):not([tabindex]) {
   background: inherit !important;
 }
 
-.no-shadow {
-  box-shadow: none !important;
-}
 
 span.profile-badge {
     padding-left: 5px;
     padding-top: 5px;
+}
+
+mat-sidenav-container.custom-sidenav-container.mat-drawer-container.mat-sidenav-container {
+    min-height: 900px;
+}
+
+
+.card-container-sidenav-profile {
+  display: flex;
+  background: #f5f6fa!important;
+    color: rgba(0,0,0,.87)!important;
+}
+
+.image-container {
+  width: 50%; /* Adjust the width according to your needs */
+  margin: 11px;
+}
+
+.card-image {
+  width: 100%;
+  height: auto;
+  object-fit: cover;
+}
+
+
+.card-container-sidenav-profile{
+    width: 95%;
+    padding: 16px;
+    box-shadow: 1px 1px 2px 1px rgba(0,0,0,.2);
+}
+
+.sidebar-nav {
+    box-shadow: 1px 1px 1px 1px;
+    width: 100%;
+}
+
+.theme-igot.day-mode .mat-drawer-side {
+    background: #f0f3f4;
+    width: 273px;
+    overflow: visible;
+}
+
+.mat-drawer-inner-container {
+    width: 216px;
+}
+
+
+
+mat-sidenav.custom-sidenav-navbar.mat-drawer.mat-sidenav {
+    width: 230px;
+    background: #f5f6fa;
+}
+
+.left-sidedenav-bar {
+    background: #f5f6fa;
+}
+
+mat-card.mt-2.mat-list-item.dark-card.mat-card {
+    background: #f5f6fa!important;
+}
+
+.container.sidenav {
+    display: flex;
+    flex-direction: row;
+    margin-top: 31px;
+}
+
+.mat-list-base .mat-list-item .mat-list-item-content, .mat-list-base .mat-list-option .mat-list-item-content {
+
+    padding: 13px 36px;
+}
+
+.mat-list-base .mat-list-item .mat-list-item-content, .mat-list-base .mat-list-option .mat-list-item-content {
+    /* padding: 12px 49px; */
+    min-width: 200px !important;
+}
+
+.bottom-fix{
+    bottom: 1.5rem;
+    position: sticky;
+}
+
+.image-container.image-card-container {
+    width: 135px;
+}
+
+mat-card.card-container-sidenav-profile.mat-card {
+    margin-bottom: 13px;
+}
+
+.theme-igot.day-mode .mat-card {
+  // box-shadow: none !important;
+  box-shadow: 1px 1px 1px 1px #eee !important;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.ts
new file mode 100644
index 000000000..4798764b9
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.ts
@@ -0,0 +1,224 @@
+
+import { AfterViewInit, Component, ElementRef, HostListener, OnDestroy, OnInit, ViewChild } from '@angular/core'
+// import { MatNavList } from '@angular/material/list'
+import { NSProfileDataV2 } from '../../../../routes/approvals/models/profile-v2.model'
+import { MatDialog } from '@angular/material/dialog'
+import { ActivatedRoute, Router } from '@angular/router'
+// import { DiscussService } from '../../../discuss/services/discuss.service'
+// import { ProfileV2Service } from '../../services/profile-v2.servive'
+/* tslint:disable */
+import _ from 'lodash'
+// import { NetworkV2Service } from '../../../network-v2/services/network-v2.service'
+// import { NSNetworkDataV2 } from '../../../network-v2/models/network-v2.model'
+// import { ConfigurationsService, ValueService } from '@sunbird-cb/utils'
+// import { map } from 'rxjs/operators'
+import { BlendedApporvalService } from '../../services/blended-approval.service'
+
+import {
+  WidgetUserService,
+  NsContent
+  // WidgetContentService,
+} from '@sunbird-cb/collection'
+/* tslint:enable */
+// import {  } from '@sunbird-cb/utils'
+
+@Component({
+  selector: 'app-profile-view',
+  templateUrl: './profile-view.component.html',
+  styleUrls: ['./profile-view.component.scss'],
+  /* tslint:disable */
+  host: { class: 'flex flex-1 margin-top-l' },
+  /* tslint:enable */
+})
+export class ProfileViewComponent implements OnInit, AfterViewInit, OnDestroy {
+
+  constructor(
+    public dialog: MatDialog,
+    private route: ActivatedRoute,
+    private bpService: BlendedApporvalService,
+    public router: Router,
+    private userSvc: WidgetUserService,
+  ) {
+    this.Math = Math
+    // this.currentUser = this.configSvc.userProfile && this.configSvc.userProfile.userId
+
+    this.tabsData = this.route.parent && this.route.parent.snapshot.data.pageData.data.tabs || []
+    const userId = this.route.snapshot.params.userId
+
+    this.bpService.getUserById(userId).subscribe((res: any) => {
+      this.viewProfile = res
+      // this.designation = res?.profileDetails?.professionalDetails[0]?.designation;
+      this.userSvc.fetchUserBatchList(userId).subscribe((result: any) => {
+        this.certificationData = result
+      })
+      this.portalProfile = res
+      this.designation = res.profileDetails.professionalDetails
+      this.academics = res.profileDetails.academics
+
+      // this.location = res.profileDetails.professionalDetails[0].location
+      // this.doj = res.profileDetails.professionalDetails[0].doj
+      // this.description = res.profileDetails.professionalDetails[0].description
+
+      this.tabs = this.route.data.subscribe(data => {
+        if (res.profileDetails.verifiedKarmayogi === true) {
+          this.verifiedBadge = true
+        }
+
+        if (res.profileDetails) {
+          this.portalProfile = res.profileDetails
+        } else {
+          this.portalProfile = res
+          _.set(this.portalProfile, 'personalDetails.firstname', _.get(res, 'firstName'))
+          _.set(this.portalProfile, 'personalDetails.email', _.get(res, 'email'))
+          _.set(this.portalProfile, 'personalDetails.userId', _.get(res, 'userId'))
+          _.set(this.portalProfile, 'personalDetails.userName', _.get(res, 'userName'))
+        }
+
+        const user = this.portalProfile.userId || this.portalProfile.id || _.get(data, 'res.id') || ''
+        if (this.portalProfile && !(this.portalProfile.id && this.portalProfile.userId)) {
+          this.portalProfile.id = user
+          this.portalProfile.userId = user
+        }
+
+
+      })
+      // this.fetchUserBatchList()
+
+    })
+
+  }
+  @ViewChild('stickyMenu', { static: true }) menuElement!: ElementRef
+  sticky = false
+  /* tslint:disable */
+  selectedTab: number = 2; // Default selected tab
+  doj: any
+  description: any
+  academics: any
+
+  Math: any
+  /* tslint:enable */
+  elementPosition: any
+  currentFilter = 'timestamp'
+  discussionList!: any
+  discussProfileData!: any
+  portalProfile!: NSProfileDataV2.IProfile
+  userDetails: any
+  location!: string | null
+  tabs: any
+  designation!: string | null
+  tabsData: NSProfileDataV2.IProfileTab[]
+  currentUser!: string | null
+  // connectionRequests!: NSNetworkDataV2.INetworkUser[]
+  currentUsername: any
+  certificationData: any
+  viewProfile: any[] = []
+  enrolledCourse: any = []
+  allCertificate: any = []
+
+  sideNavBarOpened = true
+  verifiedBadge = false
+  private defaultSideNavBarOpenedSubscription: any
+  public screenSizeIsLtMedium = false
+
+  selectTab(tabIndex: number): void {
+    this.selectedTab = tabIndex
+  }
+  // isLtMedium$ = this.valueSvc.isLtMedium$
+  // mode$ = this.isLtMedium$.pipe(map(isMedium => (isMedium ? 'over' : 'side')))
+
+  @HostListener('window:scroll', ['$event'])
+  handleScroll() {
+    const windowScroll = window.pageYOffset
+    if (windowScroll >= this.elementPosition) {
+      this.sticky = true
+    } else {
+      this.sticky = false
+    }
+  }
+  decideAPICall() {
+    const user = this.portalProfile.userId || this.portalProfile.id || ''
+    if (this.portalProfile && user) {
+      this.fetchUserDetails(this.currentUsername)
+      // this.fetchConnectionDetails(user)
+    } else {
+
+      // if (this.configSvc.userProfile) {
+      //   const me = this.configSvc.userProfile.userName || ''
+      //   if (me) {
+      //     this.fetchUserDetails(me)
+      //     // this.fetchConnectionDetails(this.configSvc.userProfile.userId)
+      //   }
+      // }
+
+    }
+  }
+
+  ngOnInit() {
+
+    // int left blank
+
+    // this.defaultSideNavBarOpenedSubscription = this.isLtMedium$.subscribe(isLtMedium => {
+    //   this.sideNavBarOpened = !isLtMedium
+    // })
+  }
+
+  ngOnDestroy() {
+    if (this.tabs) {
+      this.tabs.unsubscribe()
+    }
+
+    if (this.defaultSideNavBarOpenedSubscription) {
+      this.defaultSideNavBarOpenedSubscription.unsubscribe()
+    }
+  }
+
+  ngAfterViewInit() {
+    // this.elementPosition = this.menuElement.nativeElement.parentElement.offsetTop
+  }
+  fetchUserDetails(name: string) {
+    if (name) {
+      // this.discussService.fetchProfileInfo(name).subscribe((response: any) => {
+      //   if (response) {
+      //     this.discussProfileData = response
+      //     this.discussionList = _.uniqBy(_.filter(this.discussProfileData.posts, p => _.get(p, 'isMainPost') === true), 'tid') || []
+      //   }
+      // })
+    }
+  }
+  // fetchConnectionDetails(wid: string) {
+  //   this.networkV2Service.fetchAllConnectionEstablishedById(wid).subscribe(
+  //     (data: any) => {
+  //       this.connectionRequests = data.result.data
+  //     },
+  //     (_err: any) => {
+  //       // this.openSnackbar(err.error.message.split('|')[1] || this.defaultError)
+  //     })
+  // }
+
+  fetchUserBatchList() {
+    const user = this.portalProfile.userId || this.portalProfile.id || ''
+    this.userSvc.fetchUserBatchList(user).subscribe((courses: NsContent.ICourse[]) => {
+
+      courses.forEach(items => {
+        if (items.completionPercentage === 100) {
+          this.enrolledCourse.push(items)
+          // return items;
+        }
+      })
+      // this.downloadAllCertificate(this.enrolledCourse)
+    })
+  }
+
+  // downloadAllCertificate(data: any) {
+  //   data.forEach((item: any) => {
+  //     if (item.issuedCertificates.length !== 0) {
+  //       const certId = item.issuedCertificates[0].identifier
+  //       this.contentSvc.downloadCert(certId).subscribe(response => {
+
+  //         this.allCertificate.push({ identifier: item.issuedCertificates[0].identifier, dataUrl: response.result.printUri })
+
+  //       })
+  //     }
+  //   })
+  // }
+}
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/user-view/user-view.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/user-view/user-view.component.html
deleted file mode 100644
index bc10f60f7..000000000
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/user-view/user-view.component.html
+++ /dev/null
@@ -1,255 +0,0 @@
-<div class="flex flex-4 flex-column">
-  <mat-card class="flex-custom" [attr.id]="tabsData && tabsData[0] && tabsData[0].key">
-    <mat-card-header class="flex-custom-m" *ngIf="portalProfile && portalProfile.personalDetails">
-      <div mat-card-avatar class="example-header-image">
-        <ng-container *ngIf="portalProfile.personalDetails.firstname && portalProfile.personalDetails.surname">
-          <ws-widget-avatar-photo [photoUrl]="portalProfile.photo || null" [name]="portalProfile.personalDetails.firstname +
-          ' ' +
-          portalProfile.personalDetails.surname"  size="xxl-s">
-          </ws-widget-avatar-photo>
-        </ng-container>
-        <ng-container *ngIf="portalProfile.personalDetails.firstName && !portalProfile.personalDetails.surname">
-        <ws-widget-avatar-photo [photoUrl]="portalProfile.photo || null" [name]="
-            portalProfile.personalDetails.firstName" size="xxl-s">
-        </ws-widget-avatar-photo>
-        </ng-container>
-      </div>
-      <div class="flex-1">
-
-        <div class="flex flex-1">
-          <div class="flex flex-4">
-          <ng-container *ngIf="portalProfile.personalDetails.firstname && portalProfile.personalDetails.surname">
-            <mat-card-title role="link" tabindex="0" class="flex mobile-margin text-capitalize mat-h2" [innerHTML]="
-              portalProfile.personalDetails.firstname 
-            ">
-            <span *ngIf="verifiedBadge" class="profile-badge">  <img class="profile-badge" src="fusion-assets/images/profile-badge.png" height="18">
-            </span>
-           </mat-card-title>
-            </ng-container>
-          <ng-container *ngIf="portalProfile.personalDetails.firstName && !portalProfile.personalDetails.surname">
-            <mat-card-title role="link" tabindex="0" class="flex mobile-margin text-capitalize mat-h2" [innerHTML]="
-              portalProfile.personalDetails.firstName 
-            ">
-            <span *ngIf="verifiedBadge" class="profile-badge">  <img class="profile-badge" src="fusion-assets/images/profile-badge.png" height="18">
-            </span>
-           </mat-card-title>
-           
-            </ng-container>
-            <!-- <div class="flex verified">
-              <mat-icon class="ws-mat-green-text" svgIcon="verified"></mat-icon>
-            </div> -->
-            <span *ngIf="verifiedBadge" class="profile-badge">  <img class="profile-badge" src="fusion-assets/images/profile-badge.png" height="18">
-            </span>
-          </div>
-          
-          <div class="flex flex-1 flex-row-reverse">
-            <div *ngIf="
-                portalProfile.id === currentUser ||
-                portalProfile.userId === currentUser
-              " class="ml-4 mr-6 mb-2 view-more ws-mat-accent-text view-all ws-mat-primary-lite-background-important">
-              <a mat-button [routerLink]="'/app/user-profile/details'">
-                <mat-icon class="margin-right-xs">edit</mat-icon>
-                <span i18n>{{ 'Edit Profile' }}</span>
-              </a>
-            </div>
-          </div>
-        </div>
-        <mat-card-subtitle role="link" tabindex="0" i18n-aria-label>
-          {{ portalProfile?.employmentDetails?.departmentName }}
-        </mat-card-subtitle>
-        <mat-card-subtitle role="link" tabindex="0" i18n-aria-label>
-          {{ portalProfile?.employmentDetails?.officialPostalAddress }}
-        </mat-card-subtitle>
-        <!-- <mat-card-subtitle>{{discussProfileData.email}}</mat-card-subtitle> -->
-        <ng-container>
-          <div class="flex flex-1 custom margin-0 margin-top-m bottom-fix mob" role="link" tabindex="0">
-            <div class="flex flex-1">
-              <span class="flex margin-right-l mobile">
-                <span class="ws-mat-default-text">{{
-                  connectionRequests?.length
-                  }}</span>
-                <span class="pad-4">Connections</span>
-              </span>
-              <span class="flex margin-right-l mobile">
-                <!-- {{discussProfileData | json}} -->
-                <span class="ws-mat-default-text">{{
-                  Math.abs(discussProfileData?.topiccount || 0)
-                  }}</span>
-                <span class="pad-4">Discussions</span>
-              </span>
-            </div>
-            <!-- <div class="flex flex-1" class="text-right mobile2">
-
-                <span class="noocoments" mat-card-subtitle>Last online
-                  {{discussProfileData.lastonline | pipeRelativeTime}}</span>
-              </div> -->
-          </div>
-        </ng-container>
-      </div>
-    </mat-card-header>
-    <mat-card-header class="flex-custom-m" *ngIf="!portalProfile || !portalProfile.personalDetails">
-      <div class="flex-1" role="link" tabindex="0">
-        <div class="flex flex-1">
-          <mat-card-title class="flex-4 mobile-margin text-capitalize mat-h2">
-            No Information Available
-          </mat-card-title>
-        </div>
-      </div>
-    </mat-card-header>
-  </mat-card>
-
-  <!-- <div class="flex flex-1 custom"> -->
-  <!-- <div class="container-balanced"> -->
-
-  <mat-sidenav-container name="discuss-menu" class="min-height margin-top-m">
-    <!-- <div class="flex-1" style="position: relative;"> -->
-    <!-- <mat-sidenav  [(opened)]="sideNavBarOpened" class="border-0">
-      <div class="contain">
-
-          <div #stickyMenu [class.sticky]="sticky">
-            <app-profile-v2-left-menu [tabsData]="tabsData" class="flex flex-1"></app-profile-v2-left-menu>
-          </div>
-
-      </div>
-    </mat-sidenav> -->
-
-    <mat-sidenav [mode]="mode$ | async" [(opened)]="sideNavBarOpened" class="border-0 sidenav_inner">
-      <div class="contain">
-        <div class="flex-1" style="position: relative">
-          <div #stickyMenu [class.sticky]="sticky">
-            <app-profile-v2-left-menu [tabsData]="tabsData" class="flex flex-1"></app-profile-v2-left-menu>
-          </div>
-        </div>
-      </div>
-    </mat-sidenav>
-
-    <mat-sidenav-content class="sidenav_content">
-      <div *ngIf="screenSizeIsLtMedium">
-        <button type="button" mat-icon-button (click)="sideNavBarOpened = !sideNavBarOpened"
-          id="ws-auth-root-home-btn-menu" name="ws-auth-root-home-btn-menu">
-          <mat-icon>menu</mat-icon>
-        </button>
-      </div>
-
-      <div class="main_network_box">
-        <ng-container *ngFor="let tab of tabsData;let i=index">
-          <!-- <ws-widget-profile-v2-academics *ngIf="pdfData" [widgetData]="tab"></ws-widget-profile-v2-academics> -->
-          <ng-container *ngIf="tab && tab.render && tab.enabled">
-            <ng-container *ngIf="
-            portalProfile.id === currentUser ||
-            portalProfile.userId === currentUser
-          ">
-              <ng-container *ngIf="tab.key === 'certifications'" [wsResolverWidget]="{
-                widgetType: tab.widget.widgetType,
-                widgetSubType: tab.widget.widgetSubType,
-                widgetHostClass: tab.widget.widgetHostClass,
-                widgetData: {
-                  name: tab.name,
-                  key: tab.key,
-                  data: enrolledCourse,
-                  certificates: allCertificate
-                }
-              }">
-              </ng-container>
-            </ng-container>
-            <ng-container *ngIf="tab.key !== 'certifications'" [wsResolverWidget]="{
-                widgetType: tab.widget.widgetType,
-                widgetSubType: tab.widget.widgetSubType,
-                widgetHostClass: tab.widget.widgetHostClass,
-                widgetData: {
-                  name: tab.name,
-                  key: tab.key,
-                  data: portalProfile[tab.dataKey]
-                }
-              }"></ng-container>
-          </ng-container>
-        </ng-container>
-        <ng-container *ngIf="discussionList">
-          <div [attr.id]="discussions"
-            class="flex flex-1 flex-column margin-top-xs margin-botton-xs dark-card discussion-card"
-            style="box-shadow: none">
-            <!-- <mat-card [attr.id]='discussions' class="margin-left-xs margin-top-xs margin-botton-xs dark-card discussion-card"
-          style="box-shadow: none;"> -->
-
-            <!-- <mat-card-content> -->
-            <div class="flex flex-1">
-              <span class="margin-bottom-xs margin-top-l mat-title flex-1">{{
-                'Discussions'
-                }}</span>
-              <!-- <div
-                class="ml-4 mr-6 mb-2 view-more ws-mat-accent-text view-all ws-mat-primary-lite-background-important">
-                <a mat-button [routerLink]="'/app/discuss/my-discussions'">
-                   <span i18n>{{'Go to discussion profile'}}</span>
-                </a>
-              </div> -->
-            </div>
-            <ng-container>
-              <!-- <mat-card class="recent-tabs"> -->
-              <div class="w-full">
-                <div class="flex flex-1 flex-column filter_outer_box">
-                  <div class="flex flex-1 filter flex-wrap">
-                    <a href="javascript:void(0)" class="filter-option font-normal" i18n-aria-label role="button"
-                      [ngClass]="{
-                        'ws-mat-accent-border-active':
-                          currentFilter === 'timestamp',
-                        'ws-mat-accent-border font-medium':
-                          currentFilter !== 'timestamp'
-                      }" mat-button (click)="filter('timestamp')">
-                      Recent posts
-                    </a>
-                    <a href="javascript:void(0)" class="filter-option" i18n-aria-label role="button" [ngClass]="{
-                        'ws-mat-accent-border-active': currentFilter === 'best',
-                        'ws-mat-accent-border font-medium':
-                          currentFilter !== 'best'
-                      }" mat-button (click)="filter('best')">
-                      Best posts
-                    </a>
-                    <a href="javascript:void(0)" class="filter-option" i18n-aria-label role="button" [ngClass]="{
-                        'ws-mat-accent-border-active':
-                          currentFilter === 'saved',
-                        'ws-mat-accent-border font-medium':
-                          currentFilter !== 'saved'
-                      }" mat-button (click)="filter('saved')" *ngIf="
-                        portalProfile.id === currentUser ||
-                        portalProfile.userId === currentUser
-                      ">
-                      Saved posts
-                    </a>
-                  </div>
-                </div>
-                <!-- </mat-card> -->
-              </div>
-            </ng-container>
-            <ng-container *ngIf="discussionList && discussionList.length > 0">
-              <ng-container *ngFor="let data of discussionList">
-                <app-dicuss-post-card [discuss]="data"></app-dicuss-post-card>
-              </ng-container>
-            </ng-container>
-            <ng-container *ngIf="!(discussionList && discussionList.length > 0)">
-              <mat-card class="no-shadow mat-card margin-bottom-l">
-                <mat-card-header>
-                  <mat-card-title>No Data</mat-card-title>
-                </mat-card-header>
-                <mat-card-content>
-                  <span>&nbsp;</span>
-                </mat-card-content>
-              </mat-card>
-            </ng-container>
-            <!-- </mat-card-content> -->
-            <!-- </mat-card> -->
-          </div>
-        </ng-container>
-      </div>
-    </mat-sidenav-content>
-
-    <div class="flex flex-1 custom">
-      <div class="flex-1" style="position: relative">
-        <div #stickyMenu [class.sticky]="sticky">
-          <app-profile-v2-right-menu class="flex flex-1"></app-profile-v2-right-menu>
-        </div>
-      </div>
-    </div>
-
-    <!-- </div> -->
-  </mat-sidenav-container>
-</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/user-view/user-view.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/user-view/user-view.component.ts
deleted file mode 100644
index c4b3b0fcf..000000000
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/user-view/user-view.component.ts
+++ /dev/null
@@ -1,241 +0,0 @@
-
-import { AfterViewInit, Component, ElementRef, HostListener, OnDestroy, OnInit, ViewChild } from '@angular/core'
-// import { NSProfileDataV2 } from '../../models/profile-v2.model'
-import { MatDialog } from '@angular/material/dialog'
-import { ActivatedRoute, Router } from '@angular/router'
-// import { DiscussService } from '../../../discuss/services/discuss.service'
-// import { ProfileV2Service } from '../../services/profile-v2.servive'
-/* tslint:disable */
-import _ from 'lodash'
-// import { NetworkV2Service } from '../../../network-v2/services/network-v2.service'
-// import { NSNetworkDataV2 } from '../../../network-v2/models/network-v2.model'
-import { ConfigurationsService, ValueService } from '@sunbird-cb/utils'
-import { map } from 'rxjs/operators'
-// import {
-//   WidgetUserService,
-//   NsContent,
-//   WidgetContentService,
-// } from '@sunbird-cb/collection'
-/* tslint:enable */
-// import {  } from '@sunbird-cb/utils'
-
-@Component({
-  selector: 'app-user-view',
-  templateUrl: './user-view.component.html',
-  styleUrls: ['./user-view.component.scss'],
-  /* tslint:disable */
-  host: { class: 'flex flex-1 margin-top-l' },
-  /* tslint:enable */
-})
-export class UserViewComponent implements OnInit, AfterViewInit, OnDestroy {
-  @ViewChild('stickyMenu', { static: true }) menuElement!: ElementRef
-  sticky = false
-  /* tslint:disable */
-  Math: any
-  /* tslint:enable */
-  elementPosition: any
-  currentFilter = 'timestamp'
-  discussionList!: any
-  discussProfileData!: any
-  // portalProfile!: NSProfileDataV2.IProfile
-  userDetails: any
-  location!: string | null
-  tabs: any
-  // tabsData: NSProfileDataV2.IProfileTab[]
-  currentUser!: string | null
-  // connectionRequests!: NSNetworkDataV2.INetworkUser[]
-  currentUsername: any
-  enrolledCourse: any = []
-  allCertificate: any = []
-
-  sideNavBarOpened = true
-  verifiedBadge = false
-  private defaultSideNavBarOpenedSubscription: any
-  public screenSizeIsLtMedium = false
-  isLtMedium$ = this.valueSvc.isLtMedium$
-  mode$ = this.isLtMedium$.pipe(map(isMedium => (isMedium ? 'over' : 'side')))
-
-  @HostListener('window:scroll', ['$event'])
-  handleScroll() {
-    const windowScroll = window.pageYOffset
-    if (windowScroll >= this.elementPosition) {
-      this.sticky = true
-    } else {
-      this.sticky = false
-    }
-  }
-
-  constructor(
-    public dialog: MatDialog,
-    private route: ActivatedRoute,
-    // private discussService: DiscussService,
-    // private networkV2Service: NetworkV2Service,
-    private configSvc: ConfigurationsService,
-    public router: Router,
-    private valueSvc: ValueService,
-    // private userSvc: WidgetUserService,
-    // private contentSvc: WidgetContentService,
-  ) {
-    this.Math = Math
-    this.currentUser = this.configSvc.userProfile && this.configSvc.userProfile.userId
-    // this.tabsData = this.route.parent && this.route.parent.snapshot.data.pageData.data.tabs || []
-    this.tabs = this.route.data.subscribe(data => {
-      if (data.profile.data.profileDetails.verifiedKarmayogi === true) {
-        this.verifiedBadge = true
-      }
-      // if (data.profile.data.profileDetails) {
-      //   this.portalProfile = data.profile.data.profileDetails
-      // } else {
-      //   this.portalProfile = data.profile.data
-      //   _.set(this.portalProfile, 'personalDetails.firstname', _.get(data.profile.data, 'firstName'))
-      //   // _.set(this.portalProfile, 'personalDetails.surname', _.get(data.profile.data, 'lastName'))
-      //   _.set(this.portalProfile, 'personalDetails.email', _.get(data.profile.data, 'email'))
-      //   _.set(this.portalProfile, 'personalDetails.userId', _.get(data.profile.data, 'userId'))
-      //   _.set(this.portalProfile, 'personalDetails.userName', _.get(data.profile.data, 'userName'))
-      // }
-
-      // const user = this.portalProfile.userId || this.portalProfile.id || _.get(data, 'profile.data.id') || ''
-      // if (this.portalProfile && !(this.portalProfile.id && this.portalProfile.userId)) {
-      //   this.portalProfile.id = user
-      //   this.portalProfile.userId = user
-      // }
-
-      /** // for loged in user only */
-      // if (user === this.currentUser) {
-      //   this.currentUsername = this.configSvc.userProfile && this.configSvc.userProfile.userName
-      // } else {
-      //   this.currentUsername = this.portalProfile.personalDetails && this.portalProfile.personalDetails !== null
-      //     ? this.portalProfile.personalDetails.userName
-      //     : this.portalProfile.userName
-      // }
-
-      // if (!this.portalProfile.personalDetails && user === this.currentUser) {
-      //   _.set(this.portalProfile, 'personalDetails.firstname', _.get(this.configSvc, 'userProfile.firstName'))
-      //   // _.set(this.portalProfile, 'personalDetails.surname', _.get(this.configSvc, 'userProfile.lastName'))
-      // }
-      /** // for loged in user only */
-      // this.decideAPICall()
-    })
-    // this.fetchUserBatchList()
-
-  }
-  // decideAPICall() {
-  //   const user = this.portalProfile.userId || this.portalProfile.id || ''
-  //   if (this.portalProfile && user) {
-  //     this.fetchUserDetails(this.currentUsername)
-  //     this.fetchConnectionDetails(user)
-  //   } else {
-
-  //     if (this.configSvc.userProfile) {
-  //       const me = this.configSvc.userProfile.userName || ''
-  //       if (me) {
-  //         this.fetchUserDetails(me)
-  //         this.fetchConnectionDetails(this.configSvc.userProfile.userId)
-  //       }
-  //     }
-
-  //   }
-  // }
-
-  ngOnInit() {
-    // int left blank
-
-    this.defaultSideNavBarOpenedSubscription = this.isLtMedium$.subscribe(isLtMedium => {
-      this.sideNavBarOpened = !isLtMedium
-    })
-  }
-
-  ngOnDestroy() {
-    if (this.tabs) {
-      this.tabs.unsubscribe()
-    }
-
-    if (this.defaultSideNavBarOpenedSubscription) {
-      this.defaultSideNavBarOpenedSubscription.unsubscribe()
-    }
-  }
-
-  ngAfterViewInit() {
-    this.elementPosition = this.menuElement.nativeElement.parentElement.offsetTop
-  }
-  fetchUserDetails(name: string) {
-    if (name) {
-      // this.discussService.fetchProfileInfo(name).subscribe((response: any) => {
-      //   if (response) {
-      //     this.discussProfileData = response
-      //     this.discussionList = _.uniqBy(_.filter(this.discussProfileData.posts, p => _.get(p, 'isMainPost') === true), 'tid') || []
-      //   }
-      // })
-    }
-  }
-  // fetchConnectionDetails(wid: string) {
-  //   // this.networkV2Service.fetchAllConnectionEstablishedById(wid).subscribe(
-  //   //   (data: any) => {
-  //   //     this.connectionRequests = data.result.data
-  //   //   },
-  //   //   (_err: any) => {
-  //   //     // this.openSnackbar(err.error.message.split('|')[1] || this.defaultError)
-  //   //   })
-  // }
-
-  filter(key: string | 'timestamp' | 'best' | 'saved') {
-    if (key) {
-      this.currentFilter = key
-      switch (key) {
-        case 'timestamp':
-          // this.discussionList = _.uniqBy(_.filter(this.discussProfileData.posts, p => _.get(p, 'isMainPost') === true), 'tid')
-          this.discussionList = this.discussProfileData.posts.filter((p: any) => (p.isMainPost === true))
-          break
-        case 'best':
-          // this.discussionList = _.uniqBy(this.discussProfileData.bestPosts, 'tid')
-          this.discussionList = this.discussProfileData.bestPosts
-          break
-        case 'saved':
-          // this.discussService.fetchSaved(this.currentUsername).subscribe((response: any) => {
-          //   if (response) {
-          //     // this.discussionList = _.uniqBy(response.posts, 'tid')
-          //     this.discussionList = response['posts']
-          //   } else {
-          //     this.discussionList = []
-          //   }
-          // },
-          //   // tslint:disable-next-line
-          //   () => {
-          //     this.discussionList = []
-          //   })
-          break
-        default:
-          // this.discussionList = _.uniqBy(this.discussProfileData.latestPosts, 'tid')
-          this.discussionList = this.discussProfileData.latestPosts
-          break
-      }
-    }
-  }
-
-  // fetchUserBatchList() {
-  //   const user = this.portalProfile.userId || this.portalProfile.id || ''
-  //   this.userSvc.fetchUserBatchList(user).subscribe((courses: NsContent.ICourse[]) => {
-
-  //     courses.forEach(items => {
-  //       if (items.completionPercentage === 100) {
-  //         this.enrolledCourse.push(items)
-  //         // return items;
-  //       }
-  //     })
-  //     this.downloadAllCertificate(this.enrolledCourse)
-  //   })
-  // }
-
-  // downloadAllCertificate(data: any) {
-  //   data.forEach((item: any) => {
-  //     if (item.issuedCertificates.length !== 0) {
-  //       const certId = item.issuedCertificates[0].identifier
-  //       this.contentSvc.downloadCert(certId).subscribe(response => {
-
-  //         this.allCertificate.push({ identifier: item.issuedCertificates[0].identifier, dataUrl: response.result.printUri })
-
-  //       })
-  //     }
-  //   })
-  // }
-}
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.html
index b81f77c49..3735578d6 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.html
@@ -2,14 +2,14 @@
   <a href="javascript:void(0)" class="flex flex-1 items-center ws-mat-primary-tags" i18n-aria-label role="link"
     aria-label="click on it to visit user profile">
     <div class="mr-3">
-      <ws-widget-avatar-photo [name]="getUseravatarName()" [photoUrl]="user?.photo" size="m">
+      <ws-widget-avatar-photo [name]="getUseravatarName()" [photoUrl]="user?.photo" size="m" (click)="loadUser(user)">
       </ws-widget-avatar-photo>
     </div>
-    <div class="flex flex-col flex-1" *ngIf="user && user.userInfo">
+    <div class="flex flex-col flex-1" *ngIf="user && user.userInfo" (click)="loadUser(user)">
       <p class="truncate margin-remove mat-body-1">{{user?.userInfo.first_name}}</p>
       <p class="truncate ws-mat-black60-text margin-remove mat-body-2">{{user?.wfInfo[0].deptName}}</p>
     </div>
-    <div class="flex flex-col flex-1" *ngIf="user && !user.userInfo">
+    <div class="flex flex-col flex-1" *ngIf="user && !user.userInfo" (click)="loadUser(user)">
       <p class="truncate margin-remove mat-body-1">{{user?.first_name}}</p>
       <p class="truncate ws-mat-black60-text margin-remove mat-body-2">{{user?.deptName || user?.department }}</p>
     </div>
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
index aeb1e020b..5ae09f849 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
@@ -1,6 +1,7 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
 import { MatDialog } from '@angular/material'
 import { DialogConfirmComponent } from '../../../../../../../../../src/app/component/dialog-confirm/dialog-confirm.component'
+import { Router } from '@angular/router'
 
 @Component({
   selector: 'ws-app-users-card',
@@ -10,9 +11,11 @@ import { DialogConfirmComponent } from '../../../../../../../../../src/app/compo
 export class UsersCardComponent implements OnInit {
   @Input() user!: any
   @Input() actions: any
+  @Input() public photoUrl!: string
+  @Input() public name!: string
   @Output() userClick = new EventEmitter()
 
-  constructor(private dialogue: MatDialog) { }
+  constructor(private dialogue: MatDialog, private router: Router) { }
 
   ngOnInit() { }
 
@@ -62,4 +65,10 @@ export class UsersCardComponent implements OnInit {
     })
   }
 
+  loadUser(user: any) {
+    this.router.navigate([`/app/blended-approvals/user-profile/${user.user_id}`], { state: user })
+    // Logic to load the users-view component or navigate to its route
+    // You can use Angular's Router or any other mechanism to load the component
+  }
+
 }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
index d9495688d..0bfc56073 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
@@ -1,12 +1,14 @@
 import { Injectable } from '@angular/core'
 import { HttpClient } from '@angular/common/http'
 import { Observable } from 'rxjs'
+import { map } from 'rxjs/operators'
 
 const API_END_POINTS = {
   UPDATE_REQUEST: '/apis/proxies/v8/workflow/blendedprogram/update',
   GET_PROGRAM_DETAILS: '/apis/proxies/v8/action/content/v3/hierarchy',
   GET_LERANERS: '/apis/protected/v8/cohorts/course/getUsersForBatch',
   GET_REQUESTS: '/apis/proxies/v8/workflow/blendedprogram/search',
+  READ_USER: '/apis/proxies/v8/api/user/v2/read/',
 }
 
 @Injectable({
@@ -31,4 +33,11 @@ export class BlendedApporvalService {
   updateBlendedRequests(req: any) {
     return this.http.post<any>(`${API_END_POINTS.UPDATE_REQUEST}`, req)
   }
+
+  getUserById(userid: string): Observable<any> {
+    if (userid) {
+      return this.http.get<any>(API_END_POINTS.READ_USER + userid).pipe(map(resp => _.get(resp, 'result.response')))
+    }
+    return this.http.get<any>(API_END_POINTS.READ_USER).pipe(map(resp => _.get(resp, 'result.response')))
+  }
 }
diff --git a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
index 64feee60b..628c0402b 100644
--- a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
@@ -64,7 +64,6 @@ export class BlendedApprovalsComponent implements OnInit {
       if (res && res.result.content) {
         const resultList = res.result.content
         resultList.forEach((val: any) => {
-          console.log(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>", val)
           if (val.batches) {
             val.batchesCount = val.batches.length
             val.learners = 0
diff --git a/src/styles/styles.scss b/src/styles/styles.scss
index 7e555e7df..05b7fcad4 100644
--- a/src/styles/styles.scss
+++ b/src/styles/styles.scss
@@ -644,7 +644,7 @@ h3.shepherd-title {
 }
 
 .theme-igot.day-mode .mat-card {
-  box-shadow: none !important;
+  box-shadow: none ;
 }
 
 .card-heading {

From 0e027c9f1520a9eb466ca2e0ad57c8d441c1ed43 Mon Sep 17 00:00:00 2001
From: Saurav Verma <saurav.verma@tarento.com>
Date: Thu, 29 Jun 2023 09:34:05 +0530
Subject: [PATCH 139/887] MDO learner ui page

---
 .../profile-view/profile-view.component.html        | 13 +++++++------
 .../profile-view/profile-view.component.scss        |  5 +++++
 .../profile-view/profile-view.component.ts          |  1 -
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.html
index 299a191b4..00670938c 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.html
@@ -1,4 +1,5 @@
 <div class="flex flex-4 flex-column">
+  <!-- <ws-widget-breadcrumbs-org [widgetData]="breadcrumbs" *ngIf="breadcrumbs"></ws-widget-breadcrumbs-org> -->
   <mat-card class="flex-custom mat-card" id="profileInfo">
     <mat-card-header class="flex-custom-m mat-card-header ng-star-inserted">
 
@@ -50,13 +51,13 @@
         <ng-container>
           <div class="flex flex-1 custom margin-0 margin-top-m bottom-fix mob" role="link" tabindex="0">
             <div class="flex flex-1">
-              <span class="flex margin-right-l mobile">
+              <!-- <span class="flex margin-right-l mobile">
                 <span class="ws-mat-default-text">{{ connectionRequests?.length || 0 }}</span>
                 <span class="pad-4">Connections</span>
-              </span>
+              </span> -->
               <span class="flex margin-right-l mobile">
-                <span class="ws-mat-default-text">{{ Math.abs(discussProfileData?.topiccount || 0) }}</span>
-                <span class="pad-4">Discussions</span>
+                <!-- <span class="ws-mat-default-text">{{ Math.abs(discussProfileData?.topiccount || 0) }}</span>
+                <span class="pad-4">Discussions</span> -->
 
               </span>
             </div>
@@ -219,13 +220,13 @@
   <div class="container sidenav">
     <mat-nav-list class="margin-left-xs margin-right-s margin-top-m flex-1 mat-nav-list mat-list-base"
       role="navigation">
-      <a class="mat-list-item  " mat-list-item="" matripple="" style="">
+      <!-- <a class="mat-list-item  " mat-list-item="" matripple="" style="">
         <div class="mat-list-item-content">
           <div class="mat-list-item-ripple mat-ripple" mat-ripple=""></div>
           <div class="mat-list-text"></div>
           <span class="padding-left-xs">Profile info</span>
         </div>
-      </a>
+      </a> -->
 
       <a class="mat-list-item   ws-active-discuss-route" (click)="selectTab(2)" mat-list-item="" matripple="" style="">
         <div class="mat-list-item-content">
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.scss
index c240d9aae..b6e2a555e 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.scss
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.scss
@@ -486,4 +486,9 @@ mat-card.card-container-sidenav-profile.mat-card {
 .theme-igot.day-mode .mat-card {
   // box-shadow: none !important;
   box-shadow: 1px 1px 1px 1px #eee !important;
+}
+
+::ng-deep.circle-xxl-s {
+    width: 150px !important;
+    height: 130px !important;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.ts
index 4798764b9..0335a1dd1 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.ts
@@ -80,7 +80,6 @@ export class ProfileViewComponent implements OnInit, AfterViewInit, OnDestroy {
           this.portalProfile.userId = user
         }
 
-
       })
       // this.fetchUserBatchList()
 

From cd777169db518fd1fcf65fc274b7f86162335f0c Mon Sep 17 00:00:00 2001
From: Saurav Verma <saurav.verma@tarento.com>
Date: Thu, 29 Jun 2023 09:39:01 +0530
Subject: [PATCH 140/887] MDO learner ui page

---
 .../services/blended-approval.service.ts                         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
index 0bfc56073..d7b4b634a 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core'
 import { HttpClient } from '@angular/common/http'
 import { Observable } from 'rxjs'
 import { map } from 'rxjs/operators'
+import _ from 'lodash'
 
 const API_END_POINTS = {
   UPDATE_REQUEST: '/apis/proxies/v8/workflow/blendedprogram/update',

From ee599046b6b58d6f4ca2cea31125b4cdc40aa8a7 Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Thu, 29 Jun 2023 14:35:14 +0530
Subject: [PATCH 141/887] Updates

---
 .../approvals/models/profile-v2.model.ts      |  1 +
 .../blended-approvals-routing.module.ts       | 17 +---
 .../blended-approvals.module.ts               |  7 +-
 .../batch-details.component.html              |  6 +-
 .../batch-details/batch-details.component.ts  | 26 ++++--
 .../batch-list/batch-list.component.ts        |  9 +-
 .../profile-view/profile-view.component.html  | 93 ++++++-------------
 .../profile-view/profile-view.component.ts    | 90 +++++++++---------
 .../users-card/users-card.component.ts        |  7 +-
 .../services/blended-approval.service.ts      |  1 +
 .../blended-approvals.component.ts            |  2 +-
 11 files changed, 121 insertions(+), 138 deletions(-)

diff --git a/project/ws/app/src/lib/routes/approvals/models/profile-v2.model.ts b/project/ws/app/src/lib/routes/approvals/models/profile-v2.model.ts
index 921c69bf0..5ec2be622 100644
--- a/project/ws/app/src/lib/routes/approvals/models/profile-v2.model.ts
+++ b/project/ws/app/src/lib/routes/approvals/models/profile-v2.model.ts
@@ -77,6 +77,7 @@ export namespace NSProfileDataV2 {
     dob: string
     domicileMedium: string
     firstname: string
+    firstName: string
     lasttname: string
     gender: string
     knownLanguages: any[]
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals-routing.module.ts b/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals-routing.module.ts
index f15a84a03..0d5c1cf7b 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals-routing.module.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals-routing.module.ts
@@ -1,14 +1,10 @@
 import { NgModule } from '@angular/core'
-import { MatListModule } from '@angular/material/list'
 import { Routes, RouterModule } from '@angular/router'
 import { ConfigResolveService } from '../home/resolvers/config-resolve.service'
 import { BatchDetailsComponent } from './components/batch-details/batch-details.component'
 import { BatchListComponent } from './components/batch-list/batch-list.component'
 import { BlendedHomeComponent } from './components/blended-home/blended-home.component'
 import { ProfileViewComponent } from './components/profile-view/profile-view.component'
-import { AvatarPhotoComponent } from './components/avatar-photo/avatar-photo.component'
-import { CommonModule } from '@angular/common'
-import { MatButtonModule, MatCardModule, MatIconModule, MatSidenavModule } from '@angular/material'
 
 const routes: Routes = [
   {
@@ -40,7 +36,7 @@ const routes: Routes = [
         },
       },
       {
-        path: 'user-profile/:userId',
+        path: ':id/batches/:batchid/:userId',
         component: ProfileViewComponent,
         data: {
           pageId: ':id',
@@ -52,18 +48,9 @@ const routes: Routes = [
 ]
 
 @NgModule({
-  declarations: [
-    ProfileViewComponent,
-    AvatarPhotoComponent,
-  ],
+  declarations: [],
   imports: [
     RouterModule.forChild(routes),
-    CommonModule,
-    MatCardModule,
-    MatIconModule,
-    MatButtonModule,
-    MatListModule,
-    MatSidenavModule,
   ],
   exports: [RouterModule],
   providers: [],
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts b/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
index 5270e28b4..eb8b467a7 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
@@ -13,6 +13,7 @@ import { RouterModule } from '@angular/router'
 import {
   MatSidenavModule,
   MatIconModule,
+  MatButtonModule,
 } from '@angular/material'
 import { MatCardModule } from '@angular/material/card'
 import { BatchDetailsComponent } from './components/batch-details/batch-details.component'
@@ -20,11 +21,13 @@ import { BatchListComponent } from './components/batch-list/batch-list.component
 import { BlendedHomeComponent } from './components/blended-home/blended-home.component'
 import { BlendedApprovalsRoutingModule } from './blended-approvals-routing.module'
 import { UsersCardComponent } from './components/users-card/users-card.component'
+import { ProfileViewComponent } from './components/profile-view/profile-view.component'
 
 @NgModule({
-  declarations: [BlendedHomeComponent, BatchListComponent, BatchDetailsComponent, UsersCardComponent],
+  declarations: [BlendedHomeComponent, BatchListComponent, BatchDetailsComponent, UsersCardComponent, ProfileViewComponent],
   imports: [CommonModule, BlendedApprovalsRoutingModule, BreadcrumbsOrgModule, LeftMenuWithoutLogoModule, WidgetResolverModule,
-    MatSidenavModule, MatIconModule, HomeModule, RouterModule, UIORGTableModule, MatCardModule, AvatarPhotoModule, MatListModule],
+    MatSidenavModule, MatButtonModule, MatIconModule, HomeModule, RouterModule, UIORGTableModule,
+    MatCardModule, AvatarPhotoModule, MatListModule],
   exports: [],
   providers: [],
 })
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
index 9b24cf94d..5db263df2 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
@@ -43,7 +43,7 @@
         <ng-container *ngIf="currentFilter === 'pending'">
           <div class="b-c box" *ngIf="newUsers && newUsers.length > 0">
             <div *ngFor="let user of newUsers">
-              <ws-app-users-card [user]="user" [actions]="true" (click)="loadUsersView($event)"
+              <ws-app-users-card [user]="user" [actions]="true" [programData]="linkData"
                 (userClick)="onSubmit($event)"></ws-app-users-card>
             </div>
           </div>
@@ -54,7 +54,7 @@
         <ng-container *ngIf="currentFilter === 'approved'">
           <div class="b-c box" *ngIf="approvedUsers && approvedUsers.length > 0">
             <div *ngFor="let user of approvedUsers">
-              <ws-app-users-card [user]="user" [actions]="false"></ws-app-users-card>
+              <ws-app-users-card [user]="user" [actions]="false" [programData]="linkData"></ws-app-users-card>
             </div>
           </div>
           <div class="b-c box" *ngIf="approvedUsers && approvedUsers.length == 0">
@@ -64,7 +64,7 @@
         <ng-container *ngIf="currentFilter === 'rejected'">
           <div class="b-c box" *ngIf="rejectedUsers && rejectedUsers.length > 0">
             <div *ngFor="let user of rejectedUsers">
-              <ws-app-users-card [user]="user" [actions]="false"></ws-app-users-card>
+              <ws-app-users-card [user]="user" [actions]="false" [programData]="linkData"></ws-app-users-card>
             </div>
           </div>
           <div class="b-c box" *ngIf="rejectedUsers && rejectedUsers.length == 0">
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index 024aae594..5059ec6d6 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -20,6 +20,8 @@ export class BatchDetailsComponent implements OnInit {
   breadcrumbs: any
   newUsers: any = []
   rejectedUsers: any = []
+  linkData: any
+  userProfile: any
 
   constructor(private router: Router, private activeRouter: ActivatedRoute,
     // tslint:disable-next-line:align
@@ -28,6 +30,10 @@ export class BatchDetailsComponent implements OnInit {
     if (currentState && currentState.extras.state) {
       this.batchData = currentState.extras.state
     }
+    if (this.activeRouter.parent && this.activeRouter.parent.snapshot.data.configService) {
+      this.userProfile = this.activeRouter.parent.snapshot.data.configService.unMappedUser
+      // console.log('this.userProfile', this.userProfile)
+    }
     this.programID = this.activeRouter.snapshot.params.id
     this.batchID = this.activeRouter.snapshot.params.batchid
     if (this.programID) {
@@ -72,6 +78,12 @@ export class BatchDetailsComponent implements OnInit {
           { title: this.programData.name, url: `/app/blended-approvals/${this.programData.identifier}/batches` },
           { title: this.batchData.name, url: 'none' }],
         }
+        this.linkData = {
+          programName: this.programData.name,
+          programID: this.programData.identifier,
+          batchName: this.batchData.name,
+          batchID: this.batchID,
+        }
         this.getNewRequestsList()
       }
     })
@@ -92,7 +104,7 @@ export class BatchDetailsComponent implements OnInit {
       applicationIds: [this.batchData.batchId],
       limit: 100,
       offset: 0,
-      deptName: this.programData.organisation[0],
+      deptName: this.userProfile.channel,
     }
     this.bpService.getRequests(request).subscribe((res: any) => {
       if (res) {
@@ -108,7 +120,7 @@ export class BatchDetailsComponent implements OnInit {
       applicationIds: [this.batchData.batchId],
       limit: 100,
       offset: 0,
-      deptName: this.programData.organisation[0],
+      deptName: this.userProfile.channel,
     }
     this.bpService.getRequests(request).subscribe((res: any) => {
       if (res) {
@@ -166,10 +178,10 @@ export class BatchDetailsComponent implements OnInit {
     })
   }
 
-  loadUsersView(user: any) {
-    this.router.navigate([`/app/blended-approvals/user-profile/${user.userId}`], { state: user })
-    // Logic to load the users-view component or navigate to its route
-    // You can use Angular's Router or any other mechanism to load the component
-  }
+  // loadUsersView(user: any) {
+  //   this.router.navigate([`/app/blended-approvals/user-profile/${user.userId}`], { state: user })
+  //   // Logic to load the users-view component or navigate to its route
+  //   // You can use Angular's Router or any other mechanism to load the component
+  // }
 
 }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
index 6b3b86c26..b6a1974d3 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
@@ -11,10 +11,15 @@ export class BatchListComponent implements OnInit {
   programData: any
   programID: any
   breadcrumbs: any
+  userProfile: any
 
   constructor(private router: Router, private activeRouter: ActivatedRoute, private bpService: BlendedApporvalService) {
     const currentState = this.router.getCurrentNavigation()
     this.programID = this.activeRouter.snapshot.params.id
+    if (this.activeRouter.parent && this.activeRouter.parent.snapshot.data.configService) {
+      this.userProfile = this.activeRouter.parent.snapshot.data.configService.unMappedUser
+      // console.log('this.userProfile', this.userProfile)
+    }
     if (currentState && currentState.extras.state) {
       this.programData = currentState.extras.state
       if (this.programData && this.programData.name) {
@@ -31,7 +36,7 @@ export class BatchListComponent implements OnInit {
               applicationIds: [b.batchId],
               limit: 100,
               offset: 0,
-              deptName: this.programData.organisation[0],
+              deptName: this.userProfile.channel,
             }
             this.bpService.getRequests(request).subscribe((resnew: any) => {
               if (resnew) {
@@ -70,7 +75,7 @@ export class BatchListComponent implements OnInit {
               applicationIds: [b.batchId],
               limit: 100,
               offset: 0,
-              deptName: this.programData.organisation[0],
+              deptName: this.userProfile.channel,
             }
             this.bpService.getRequests(request).subscribe((resnew: any) => {
               if (resnew) {
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.html
index 00670938c..797c19a24 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.html
@@ -1,10 +1,7 @@
 <div class="flex flex-4 flex-column">
-  <!-- <ws-widget-breadcrumbs-org [widgetData]="breadcrumbs" *ngIf="breadcrumbs"></ws-widget-breadcrumbs-org> -->
+  <ws-widget-breadcrumbs-org [widgetData]="breadcrumbs" *ngIf="breadcrumbs"></ws-widget-breadcrumbs-org>
   <mat-card class="flex-custom mat-card" id="profileInfo">
     <mat-card-header class="flex-custom-m mat-card-header ng-star-inserted">
-
-
-
       <mat-card-header class="flex-custom-m" *ngIf="portalProfile && portalProfile?.personalDetails"></mat-card-header>
       <div mat-card-avatar class="example-header-image">
         <ng-container *ngIf="portalProfile?.personalDetails?.firstname">
@@ -23,16 +20,16 @@
             <ng-container *ngIf="portalProfile?.personalDetails?.firstName">
               <mat-card-title role="link" tabindex="0" class="flex mobile-margin text-capitalize mat-h2"
                 [innerHTML]="portalProfile?.personalDetails?.firstName">
-                <span *ngIf="verifiedBadge" class="profile-badge"> <img class="profile-badge"
+                <!-- <span *ngIf="verifiedBadge" class="profile-badge"> <img class="profile-badge"
                     src="fusion-assets/images/profile-badge.png" height="18">
-                </span>
+                </span> -->
               </mat-card-title>
             </ng-container>
-            <span *ngIf="verifiedBadge" class="profile-badge"> <img class="profile-badge"
+            <!-- <span *ngIf="verifiedBadge" class="profile-badge"> <img class="profile-badge"
                 src="fusion-assets/images/profile-badge.png" height="18">
-            </span>
+            </span> -->
           </div>
-          <div class="flex flex-1 flex-row-reverse">
+          <!-- <div class="flex flex-1 flex-row-reverse">
             <div *ngIf="portalProfile?.id === currentUser || portalProfile?.userId === currentUser"
               class="ml-4 mr-6 mb-2 view-more ws-mat-accent-text view-all ws-mat-primary-lite-background-important">
               <a mat-button [routerLink]="'/app/user-profile/details'">
@@ -40,7 +37,7 @@
                 <span i18n>{{ 'Edit Profile' }}</span>
               </a>
             </div>
-          </div>
+          </div> -->
         </div>
         <mat-card-subtitle role="link" tabindex="0" i18n-aria-label>
           {{ portalProfile?.employmentDetails?.departmentName }}
@@ -82,7 +79,7 @@
 
 
     <mat-sidenav-container name="discuss-menu" class="min-height margin-top-m">
-      <mat-sidenav [mode]="mode$ | async" [(opened)]="sideNavBarOpened" class="border-0 sidenav_inner">
+      <mat-sidenav [(opened)]="sideNavBarOpened" class="border-0 sidenav_inner">
         <div class="contain">
           <div class="flex-1" style="position: relative">
             <div #stickyMenu [class.sticky]="sticky">
@@ -133,27 +130,16 @@
                   }"></ng-container> -->
             </ng-container>
           </ng-container>
-          <ng-container *ngIf="discussionList">
+          <!-- <ng-container *ngIf="discussionList">
             <div [attr.id]="discussions"
               class="flex flex-1 flex-column margin-top-xs margin-botton-xs dark-card discussion-card"
               style="box-shadow: none">
-              <!-- <mat-card [attr.id]='discussions' class="margin-left-xs margin-top-xs margin-botton-xs dark-card discussion-card"
-              style="box-shadow: none;"> -->
-
-              <!-- <mat-card-content> -->
               <div class="flex flex-1">
                 <span class="margin-bottom-xs margin-top-l mat-title flex-1">{{
                   'Discussions'
                   }}</span>
-                <!-- <div
-                    class="ml-4 mr-6 mb-2 view-more ws-mat-accent-text view-all ws-mat-primary-lite-background-important">
-                    <a mat-button [routerLink]="'/app/discuss/my-discussions'">
-                       <span i18n>{{'Go to discussion profile'}}</span>
-                    </a>
-                  </div> -->
               </div>
               <ng-container>
-                <!-- <mat-card class="recent-tabs"> -->
                 <div class="w-full">
                   <div class="flex flex-1 flex-column filter_outer_box">
                     <div class="flex flex-1 filter flex-wrap">
@@ -186,28 +172,10 @@
                       </a>
                     </div>
                   </div>
-                  <!-- </mat-card> -->
                 </div>
               </ng-container>
-              <!-- <ng-container *ngIf="discussionList && discussionList.length > 0">
-              <ng-container *ngFor="let data of discussionList">
-                <app-dicuss-post-card [discuss]="data"></app-dicuss-post-card>
-              </ng-container>
-            </ng-container>
-            <ng-container *ngIf="!(discussionList && discussionList.length > 0)">
-              <mat-card class="no-shadow mat-card margin-bottom-l">
-                <mat-card-header>
-                  <mat-card-title>No Data</mat-card-title>
-                </mat-card-header>
-                <mat-card-content>
-                  <span>&nbsp;</span>
-                </mat-card-content>
-              </mat-card>
-            </ng-container> -->
-              <!-- </mat-card-content> -->
-              <!-- </mat-card> -->
             </div>
-          </ng-container>
+          </ng-container> -->
         </div>
       </mat-sidenav-content>
 
@@ -228,7 +196,8 @@
         </div>
       </a> -->
 
-      <a class="mat-list-item   ws-active-discuss-route" (click)="selectTab(2)" mat-list-item="" matripple="" style="">
+      <a class="mat-list-item" [ngClass]="{'ws-active-discuss-route font-bold' : selectedTab === 2}"
+        (click)="selectTab(2)">
         <div class="mat-list-item-content">
           <div class="mat-list-item-ripple mat-ripple" mat-ripple=""></div>
           <div class="mat-list-text"></div>
@@ -236,7 +205,8 @@
         </div>
       </a>
 
-      <a class="mat-list-item " (click)="selectTab(3)" mat-list-item="" matripple="" style="">
+      <a class="mat-list-item" [ngClass]="{'ws-active-discuss-route font-bold' : selectedTab === 3}"
+        (click)="selectTab(3)">
         <div class="mat-list-item-content">
           <div class="mat-list-item-ripple mat-ripple" mat-ripple=""></div>
           <div class="mat-list-text"></div>
@@ -244,7 +214,8 @@
         </div>
       </a>
 
-      <a class="mat-list-item " (click)="selectTab(4)" mat-list-item="" matripple="" style="">
+      <a class="mat-list-item" [ngClass]="{'ws-active-discuss-route font-bold' : selectedTab === 4}"
+        (click)="selectTab(4)">
         <div class="mat-list-item-content">
           <div class="mat-list-item-ripple mat-ripple" mat-ripple=""></div>
           <div class="mat-list-text"></div>
@@ -252,7 +223,8 @@
         </div>
       </a>
 
-      <a class="mat-list-item " (click)="selectTab(5)" mat-list-item="" matripple="" style="">
+      <a class="mat-list-item" [ngClass]="{'ws-active-discuss-route font-bold' : selectedTab === 5}"
+        (click)="selectTab(5)">
         <div class="mat-list-item-content">
           <div class="mat-list-item-ripple mat-ripple" mat-ripple=""></div>
           <div class="mat-list-text"></div>
@@ -261,15 +233,12 @@
       </a>
     </mat-nav-list>
 
-
-
     <div class="container sidenav-right">
-
       <mat-card class="card-container-sidenav-profile-card" *ngIf="selectedTab === 2">
         <mat-card-header>
           <mat-card-title>Certifications</mat-card-title>
         </mat-card-header>
-        <mat-card class="card-container-sidenav-profile" *ngFor="let data of certificationData">
+        <div class="card-container-sidenav-profile" *ngFor="let data of certificationData">
           <div class="image-container image-card-container">
             <img mat-card-lg-image [src]="data.courseLogoUrl" height="50" alt="Image" class="card-image" />
           </div>
@@ -279,17 +248,14 @@
               <mat-card-subtitle>{{data.content.description}}</mat-card-subtitle>
             </mat-card-content>
           </div>
-        </mat-card>
+        </div>
       </mat-card>
 
-
       <mat-card class="card-container-sidenav-profile-card" *ngIf="selectedTab === 3">
         <mat-card-content class="mat-card-content" *ngFor="let designationData of designation">
-          <span class="mat-subheading-1 flex-4 mobile-margin" role="link" tabindex="0"> Career
-            history
-          </span>
+          <span class="mat-subheading-1 flex-4 mobile-margin" role="link" tabindex="0"> Career history</span>
           <div *ngIf="viewProfile">
-            <mat-card class="mt-2 mat-list-item dark-card mat-card " role="link" tabindex="0">
+            <div class="mt-2 mat-list-item dark-card mat-card " role="link" tabindex="0">
               <div class="flex flex-1">
 
                 <span class="flex-1 mat-subheading-1"> {{designationData.designation}} </span>
@@ -299,14 +265,14 @@
               </div>
               <div class="mat-body-2 flex-1"> {{designationData.description}}</div>
               <div class="mat-body-2 flex-1 ws-mat-black60-text"> {{designationData.location}} </div>
-            </mat-card>
+            </div>
           </div>
         </mat-card-content>
       </mat-card>
 
       <mat-card class="card-container-sidenav-profile-card" *ngIf="selectedTab === 4">
         <div class="flex flex-1 flex-column margin-top-xs margin-left-xs margin-right-xs">
-          <mat-card class="flex-custom mat-card" id="academics">
+          <div class="flex-custom mat-card" id="academics">
             <mat-card-content class="mat-card-content">
               <span class="mat-subheading-1 flex-4 mobile-margin" role="link" tabindex="0">Academics</span>
               <mat-card class="no-shadow mt-2 mat-list-item dark-card mat-card ng-star-inserted" role="link"
@@ -327,23 +293,22 @@
                 <div class="mat-body-2 flex-1 mobile-margin">mds</div>
               </mat-card> -->
             </mat-card-content>
-          </mat-card>
+          </div>
         </div>
       </mat-card>
 
       <mat-card class="card-container-sidenav-profile-card" *ngIf="selectedTab === 5">
         <div class="flex flex-1 flex-column margin-top-xs margin-left-xs margin-right-xs">
-          <mat-card class="flex-custom mat-card" id="hobbies">
+          <div class="flex-custom mat-card" id="hobbies">
             <mat-card-content class="mat-card-content">
               <span class="mat-subheading-1 flex-4 mobile-margin" role="link" tabindex="0">Hobbies</span>
-              <mat-card class="no-shadow mt-2 mat-list-item dark-card mat-card ng-star-inserted" role="link"
-                tabindex="0">
+              <div class="no-shadow mt-2 mat-list-item dark-card mat-card ng-star-inserted" role="link" tabindex="0">
                 <div class="flex flex-1 mobile-margin margin-f">
                   <span class="mat-subtitle flex-1 mobile-margin">No hobbies information available</span>
                 </div>
-              </mat-card>
+              </div>
             </mat-card-content>
-          </mat-card>
+          </div>
         </div>
       </mat-card>
 
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.ts
index 0335a1dd1..10b739bb2 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.ts
@@ -31,6 +31,40 @@ import {
   /* tslint:enable */
 })
 export class ProfileViewComponent implements OnInit, AfterViewInit, OnDestroy {
+  @ViewChild('stickyMenu', { static: true }) menuElement!: ElementRef
+  sticky = false
+  /* tslint:disable */
+  selectedTab: number = 2; // Default selected tab
+  doj: any
+  description: any
+  academics: any
+
+  Math: any
+  /* tslint:enable */
+  elementPosition: any
+  currentFilter = 'timestamp'
+  discussionList!: any
+  discussProfileData!: any
+  portalProfile!: NSProfileDataV2.IProfile
+  userDetails: any
+  location!: string | null
+  tabs: any
+  designation!: string | null
+  tabsData: NSProfileDataV2.IProfileTab[]
+  currentUser!: string | null
+  // connectionRequests!: NSNetworkDataV2.INetworkUser[]
+  currentUsername: any
+  certificationData: any
+  viewProfile: any[] = []
+  enrolledCourse: any = []
+  allCertificate: any = []
+
+  sideNavBarOpened = true
+  verifiedBadge = false
+  private defaultSideNavBarOpenedSubscription: any
+  public screenSizeIsLtMedium = false
+  programData: any
+  breadcrumbs: any
 
   constructor(
     public dialog: MatDialog,
@@ -41,7 +75,18 @@ export class ProfileViewComponent implements OnInit, AfterViewInit, OnDestroy {
   ) {
     this.Math = Math
     // this.currentUser = this.configSvc.userProfile && this.configSvc.userProfile.userId
-
+    const currentState = this.router.getCurrentNavigation()
+    if (currentState && currentState.extras.state) {
+      this.programData = currentState.extras.state
+      if (this.programData) {
+        this.breadcrumbs = {
+          titles: [{ title: 'Blended programs', url: '/app/home/blended-approvals' },
+          { title: this.programData.programName, url: `/app/blended-approvals/${this.programData.programID}/batches` },
+          // tslint:disable-next-line:max-line-length
+          { title: this.programData.batchName, url: `/app/blended-approvals/${this.programData.programID}/batches/${this.programData.batchID}` }],
+        }
+      }
+    }
     this.tabsData = this.route.parent && this.route.parent.snapshot.data.pageData.data.tabs || []
     const userId = this.route.snapshot.params.userId
 
@@ -84,41 +129,7 @@ export class ProfileViewComponent implements OnInit, AfterViewInit, OnDestroy {
       // this.fetchUserBatchList()
 
     })
-
   }
-  @ViewChild('stickyMenu', { static: true }) menuElement!: ElementRef
-  sticky = false
-  /* tslint:disable */
-  selectedTab: number = 2; // Default selected tab
-  doj: any
-  description: any
-  academics: any
-
-  Math: any
-  /* tslint:enable */
-  elementPosition: any
-  currentFilter = 'timestamp'
-  discussionList!: any
-  discussProfileData!: any
-  portalProfile!: NSProfileDataV2.IProfile
-  userDetails: any
-  location!: string | null
-  tabs: any
-  designation!: string | null
-  tabsData: NSProfileDataV2.IProfileTab[]
-  currentUser!: string | null
-  // connectionRequests!: NSNetworkDataV2.INetworkUser[]
-  currentUsername: any
-  certificationData: any
-  viewProfile: any[] = []
-  enrolledCourse: any = []
-  allCertificate: any = []
-
-  sideNavBarOpened = true
-  verifiedBadge = false
-  private defaultSideNavBarOpenedSubscription: any
-  public screenSizeIsLtMedium = false
-
   selectTab(tabIndex: number): void {
     this.selectedTab = tabIndex
   }
@@ -152,14 +163,7 @@ export class ProfileViewComponent implements OnInit, AfterViewInit, OnDestroy {
     }
   }
 
-  ngOnInit() {
-
-    // int left blank
-
-    // this.defaultSideNavBarOpenedSubscription = this.isLtMedium$.subscribe(isLtMedium => {
-    //   this.sideNavBarOpened = !isLtMedium
-    // })
-  }
+  ngOnInit() { }
 
   ngOnDestroy() {
     if (this.tabs) {
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
index 5ae09f849..6054f521b 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
@@ -11,6 +11,7 @@ import { Router } from '@angular/router'
 export class UsersCardComponent implements OnInit {
   @Input() user!: any
   @Input() actions: any
+  @Input() programData: any
   @Input() public photoUrl!: string
   @Input() public name!: string
   @Output() userClick = new EventEmitter()
@@ -66,7 +67,11 @@ export class UsersCardComponent implements OnInit {
   }
 
   loadUser(user: any) {
-    this.router.navigate([`/app/blended-approvals/user-profile/${user.user_id}`], { state: user })
+    this.programData.user = user
+    const userId = user.user_id || user.wfInfo[0].userId
+    // tslint:disable-next-line:max-line-length
+    this.router.navigate([`/app/blended-approvals/${this.programData.programID}/batches/${this.programData.batchID}/${userId}`], { state: this.programData })
+    // this.router.navigate([`/app/blended-approvals/user-profile/${user.user_id}`], { state: user })
     // Logic to load the users-view component or navigate to its route
     // You can use Angular's Router or any other mechanism to load the component
   }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
index d7b4b634a..818c3e040 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core'
 import { HttpClient } from '@angular/common/http'
 import { Observable } from 'rxjs'
 import { map } from 'rxjs/operators'
+// tslint:disable-next-line:import-name
 import _ from 'lodash'
 
 const API_END_POINTS = {
diff --git a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
index a8436375e..1790da7cd 100644
--- a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
@@ -79,7 +79,7 @@ export class BlendedApprovalsComponent implements OnInit {
                 applicationIds: this.bIDs,
                 limit: 100,
                 offset: 0,
-                deptName: this.userProfile.rootOrg.channel,
+                deptName: this.userProfile.channel,
               }
               this.bpService.getRequests(request).subscribe((resnew: any) => {
                 if (resnew) {

From 1ff5ebb7731ae5378183f2d04e5554c644903cfe Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Fri, 30 Jun 2023 18:58:09 +0530
Subject: [PATCH 142/887] Updates date format

---
 .../components/batch-details/batch-details.component.ts     | 2 --
 .../components/batch-list/batch-list.component.html         | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index 5059ec6d6..e45333671 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -130,8 +130,6 @@ export class BatchDetailsComponent implements OnInit {
   }
 
   onSubmit(event: any) {
-    // tslint:disable-next-line:no-console
-    console.log('======', event)
     const actionType = event.action.toUpperCase()
     // const reqData = event.userData.wfInfo[0]
     const reqData = _.maxBy(event.userData.wfInfo, (el: any) => {
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
index cfc0ed121..d3f6ab13d 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
@@ -15,9 +15,9 @@
             </div>
             <div class="padding-left-s padding-right-s mat-body-2">
               <!-- <p class="margin-remove"><mat-icon>tag</mat-icon> {{batch.batchId}}</p> -->
-              <p class="margin-remove"><mat-icon>event</mat-icon> {{batch.startDate | date: 'mediumDate'}} -
-                {{batch.endDate | date: 'mediumDate'}}</p>
-              <p class="margin-remove"><mat-icon>event</mat-icon> {{batch.enrollmentEndDate | date:'mediumDate'}}</p>
+              <p class="margin-remove"><mat-icon>event</mat-icon> {{batch.startDate | date: 'dd/MMM/yyyy'}} -
+                {{batch.endDate | date: 'dd/MMM/yyyy'}}</p>
+              <p class="margin-remove"><mat-icon>event</mat-icon> {{batch.enrollmentEndDate | date:'dd/MMM/yyyy'}}</p>
             </div>
             <div class="request-box mat-body-2 margin-top-xs" *ngIf="batch.newrequestsCount > 1">
               {{batch.newrequestsCount}} New requests</div>

From 537f3ed3ced096d979b9a5ab3c5e3e6369dff7ea Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Mon, 3 Jul 2023 10:56:17 +0530
Subject: [PATCH 143/887] file upload table responsive fixes

---
 .../users-view/users-view.component.html      |   2 +-
 .../users-view/users-view.component.scss      |   6 +
 .../users-upload/users-upload.component.html  | 173 +++++++++---------
 .../users-upload/users-upload.component.scss  |  19 +-
 4 files changed, 112 insertions(+), 88 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index c637b388e..1e3254b7c 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -1,4 +1,4 @@
-<div class="flex flex-4 flex-column">
+<div class="flex flex-4 flex-column main-flex-box">
   <mat-card class="ws-mat-accent-border">
     <!-- <mat-card-header class="flex-custom-m">
       <div class="flex-1" role="link" tabindex="0">
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.scss b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.scss
index c3981dc74..fe5f76c55 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.scss
@@ -207,6 +207,12 @@ a:not([href]):not([tabindex]) {
   @extend %page-center;
 }
 
+@media screen and (max-width: 1024px) {
+  .main-flex-box {
+  overflow: auto;
+}
+}
+
 .flex-3 {
   flex: 3;
 }
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
index 370f5a6ae..234b59b77 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
@@ -42,88 +42,89 @@ <h2 class="w-full contacts-head">File uploads</h2>
     </div>
     <!-- <div *ngIf="bulkUploadData && bulkUploadData.length"> -->
     <div [hidden]="!bulkUploadData || (bulkUploadData && !bulkUploadData.length) || fetching">
-      <div class=" mx-5 my-5 table-container w-full">
-        <div class="pt-2 ">
-          <!-- <div class=" m-5 flex items-end justify-end">
+      <div class=" mx-5 my-5 table-container">
+        <!-- <div class="pt-2 "> -->
+        <!-- <div class=" m-5 flex items-end justify-end">
           <button mat-raised-button color="primary" class="self-end" i18n (click)="refreshTable()">
             <ng-container i18n>Refresh</ng-container>
           </button>
         </div> -->
-          <mat-table mat-table [dataSource]="dataSource" matSort [matSortActive]="tabledata?.sortColumn"
-            [matSortDirection]="tabledata?.sortState">
-
-            <!-- ID Column -->
-            <ng-container matColumnDef="identifier">
-              <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Id
-              </th>
-              <td mat-cell *matCellDef="let row"> {{row.identifier}} </td>
-              <!-- <mat-header-cell *matHeaderCellDef mat-sort-header> Id </mat-header-cell>
+        <mat-table mat-table [dataSource]="dataSource" matSort [matSortActive]="tabledata?.sortColumn"
+          [matSortDirection]="tabledata?.sortState" id="upload-data-box">
+
+          <!-- ID Column -->
+          <ng-container matColumnDef="identifier">
+            <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Id
+            </th>
+            <td mat-cell *matCellDef="let row"> {{row.identifier}} </td>
+            <!-- <mat-header-cell *matHeaderCellDef mat-sort-header> Id </mat-header-cell>
               <mat-cell *matCellDef="let row"> {{row.identifier}} </mat-cell> -->
-            </ng-container>
-
-
-            <!-- Name Column -->
-            <ng-container matColumnDef="fileName">
-              <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Name
-              </th>
-              <td mat-cell *matCellDef="let row">
-                <!-- <a href="{{row.filePath}}" download="{{row.fileName}}"> {{row.fileName}}</a> -->
-                <span class="cursor-pointer ws-mat-accent-text" (click)="downloadFullFile(row)"> {{row.fileName}}</span>
-              </td>
-            </ng-container>
-
-            <!-- status Column -->
-            <ng-container matColumnDef="status">
-              <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Status
-              </th>
-              <td mat-cell *matCellDef="let row"> {{row.status}} </td>
-            </ng-container>
-
-            <!-- Failed Record Count Column -->
-            <ng-container matColumnDef="failedRecordsCount">
-              <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Failed
-                Records
-                on
-              </th>
-              <td mat-cell *matCellDef="let row"> {{row.failedRecordsCount}} </td>
-            </ng-container>
-
-            <!-- Success Records COunt Column -->
-            <ng-container matColumnDef="successfulRecordsCount">
-              <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Success
-                Records
-                on
-              </th>
-              <td mat-cell *matCellDef="let row"> {{row.successfulRecordsCount }} </td>
-            </ng-container>
-
-            <!-- Total Records COunt Column -->
-            <ng-container matColumnDef="totalRecords">
-              <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Total
-                Records
-                on
-              </th>
-              <td mat-cell *matCellDef="let row"> {{row.totalRecords }} </td>
-            </ng-container>
-
-            <!-- status Column -->
-            <ng-container matColumnDef="dateCreatedOn">
-              <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Created
-                on
-              </th>
-              <td mat-cell *matCellDef="let row"> {{row.dateCreatedOn | date:'dd MMM yyy h:mm a' }} </td>
-            </ng-container>
-
-            <!-- status Column -->
-            <ng-container matColumnDef="dateUpdatedOn">
-              <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Updated
-                on
-              </th>
-              <td mat-cell *matCellDef="let row"> {{row.dateUpdatedOn | date:'dd MMM yyy h:mm a' }} </td>
-            </ng-container>
-
-            <!-- report Column -->
-            <!-- <ng-container matColumnDef="report">
+          </ng-container>
+
+
+          <!-- Name Column -->
+          <ng-container matColumnDef="fileName">
+            <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Name
+            </th>
+            <td mat-cell *matCellDef="let row">
+              <!-- <a href="{{row.filePath}}" download="{{row.fileName}}"> {{row.fileName}}</a> -->
+              <span class="cursor-pointer text-span ws-mat-accent-text" (click)="downloadFullFile(row)">
+                {{row.fileName}}</span>
+            </td>
+          </ng-container>
+
+          <!-- status Column -->
+          <ng-container matColumnDef="status">
+            <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Status
+            </th>
+            <td mat-cell *matCellDef="let row"> {{row.status}} </td>
+          </ng-container>
+
+          <!-- Failed Record Count Column -->
+          <ng-container matColumnDef="failedRecordsCount">
+            <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Failed
+              Records
+              on
+            </th>
+            <td mat-cell *matCellDef="let row"> {{row.failedRecordsCount}} </td>
+          </ng-container>
+
+          <!-- Success Records COunt Column -->
+          <ng-container matColumnDef="successfulRecordsCount">
+            <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Success
+              Records
+              on
+            </th>
+            <td mat-cell *matCellDef="let row"> {{row.successfulRecordsCount }} </td>
+          </ng-container>
+
+          <!-- Total Records COunt Column -->
+          <ng-container matColumnDef="totalRecords">
+            <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Total
+              Records
+              on
+            </th>
+            <td mat-cell *matCellDef="let row"> {{row.totalRecords }} </td>
+          </ng-container>
+
+          <!-- status Column -->
+          <ng-container matColumnDef="dateCreatedOn">
+            <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Created
+              on
+            </th>
+            <td mat-cell *matCellDef="let row"> {{row.dateCreatedOn | date:'dd MMM yyy h:mm a' }} </td>
+          </ng-container>
+
+          <!-- status Column -->
+          <ng-container matColumnDef="dateUpdatedOn">
+            <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Updated
+              on
+            </th>
+            <td mat-cell *matCellDef="let row"> {{row.dateUpdatedOn | date:'dd MMM yyy h:mm a' }} </td>
+          </ng-container>
+
+          <!-- report Column -->
+          <!-- <ng-container matColumnDef="report">
                   <th mat-header-cell *matHeaderCellDef mat-sort-header> report </th>
                   <td mat-cell *matCellDef="let row">
                     <button mat-raised-button color="primary" i18n *ngIf="row.status === 'completed'"
@@ -133,18 +134,18 @@ <h2 class="w-full contacts-head">File uploads</h2>
                   </td>
                 </ng-container> -->
 
-            <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-            <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
+          <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+          <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
 
-            <!-- Row shown when there is no matching data. -->
-            <tr class="mat-row" *matNoDataRow>
-              <td class="mat-cell" colspan="4">No data ...</td>
-            </tr>
+          <!-- Row shown when there is no matching data. -->
+          <tr class="mat-row" *matNoDataRow>
+            <td class="mat-cell" colspan="4">No data ...</td>
+          </tr>
 
-          </mat-table>
+        </mat-table>
 
-          <mat-paginator [pageSize]="10" [pageSizeOptions]="[5, 10, 25, 100]"></mat-paginator>
-        </div>
+        <mat-paginator [pageSize]="10" [pageSizeOptions]="[5, 10, 25, 100]"></mat-paginator>
+        <!-- </div> -->
       </div>
     </div>
     <ng-container *ngIf="(!bulkUploadData || !bulkUploadData.length) && !fetching">
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
index 0ed43f930..0b431e1e3 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
@@ -9,10 +9,21 @@ table {
 
   td, th {
     width: 25%;
+    padding: 0px 12px!important;
   }
 
   .table-container{
-       position: relative;
+      position: relative;
+      width: 100%;
+      @media screen and (max-width: 1024px) {
+         overflow-x: scroll;
+      }
+  }
+
+  .text-span {
+    word-break: break-all!important;
+    min-width: 180px!important;
+    display: block;
   }
 
   .example-loading-shade {
@@ -28,6 +39,12 @@ table {
     justify-content: center;
   }
 
+   @media screen and (max-width: 1024px) {
+    #upload-data-box {
+      overflow-x: scroll;
+    }
+  }
+
 .download-btn {
     min-width: 112px;
     width: auto;

From a5afae41ae30af959c0fa7b1076cfcd6b2afc960 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Mon, 3 Jul 2023 10:58:26 +0530
Subject: [PATCH 144/887] lint fixes

---
 .../app/src/lib/routes/access/routes/users/users.component.ts   | 2 +-
 .../src/lib/routes/my-dashboard/my-dashboard-routing.module.ts  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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
index 95359fce4..02802c1d2 100644
--- 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
@@ -29,7 +29,7 @@ export class UsersComponent implements OnInit, AfterViewInit, AfterContentChecke
   rootOrgId: any
 
   constructor(private usersSvc: UsersService, private router: Router, private activatedRoute: ActivatedRoute, private route: ActivatedRoute,
-    private profileUtilSvc: ProfileV2UtillService, private userS: UsersService2, private cdref: ChangeDetectorRef) { }
+              private profileUtilSvc: ProfileV2UtillService, private userS: UsersService2, private cdref: ChangeDetectorRef) { }
 
   ngOnInit() {
     const url = this.router.url.split('/')
diff --git a/project/ws/app/src/lib/routes/my-dashboard/my-dashboard-routing.module.ts b/project/ws/app/src/lib/routes/my-dashboard/my-dashboard-routing.module.ts
index 6ff59fe21..1d4b9ba16 100644
--- a/project/ws/app/src/lib/routes/my-dashboard/my-dashboard-routing.module.ts
+++ b/project/ws/app/src/lib/routes/my-dashboard/my-dashboard-routing.module.ts
@@ -11,7 +11,7 @@ const routes: Routes = []
         path: '',
         component: MyDashboardHomeComponent,
         children: routes,
-        data: { module: 'Dashboard' }
+        data: { module: 'Dashboard' },
       },
     ]),
   ],

From bfd839c9cb79eb27035677043803abe0acfc07dc Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Wed, 5 Jul 2023 17:18:38 +0530
Subject: [PATCH 145/887] Added check for past batches

---
 .../batch-list/batch-list.component.html      |  6 +-
 .../batch-list/batch-list.component.ts        | 61 +++++++++++--------
 .../blended-approvals.component.ts            |  8 ++-
 3 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
index d3f6ab13d..6f68b859f 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
@@ -6,9 +6,9 @@
     </div>
     <mat-card-content>
       <ng-container>
-        <div class="batches-lsit" *ngIf="programData && programData.batches">
+        <div class="batches-lsit" *ngIf="programData && batchesList && batchesList.length > 0">
           <div class="grey-box ws-mat-accent-border cursor-pointer margin-bottom-m margin-right-l"
-            (click)="viewDetails(batch)" *ngFor="let batch of programData.batches">
+            (click)="viewDetails(batch)" *ngFor="let batch of batchesList">
             <div class="padding-left-s padding-right-s padding-top-s padding-bottom-xs margin-remove title-div">
               <span class="mat-subheading-1 margin-remove">{{batch.name}}</span>
               <!-- <span class="float-right mat-body-2 margin-remove">{{batch.batchId}}</span> -->
@@ -26,7 +26,7 @@
               {{batch.newrequestsCount}} New request</div>
           </div>
         </div>
-        <div class="batches-lsit" *ngIf="programData && !programData.batches">
+        <div class="batches-lsit" *ngIf="batchesList && batchesList.length === 0">
           <div class="margin-top-l">
             No batches yet
           </div>
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
index b6a1974d3..bd54c5c8e 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
@@ -1,5 +1,6 @@
 import { Component, OnInit } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
+import moment from 'moment'
 import { BlendedApporvalService } from '../../services/blended-approval.service'
 
 @Component({
@@ -12,6 +13,7 @@ export class BatchListComponent implements OnInit {
   programID: any
   breadcrumbs: any
   userProfile: any
+  batchesList: any = []
 
   constructor(private router: Router, private activeRouter: ActivatedRoute, private bpService: BlendedApporvalService) {
     const currentState = this.router.getCurrentNavigation()
@@ -28,21 +30,27 @@ export class BatchListComponent implements OnInit {
           { title: this.programData.name, url: 'none' }],
         }
         if (this.programData.batches) {
+          const today = moment(new Date())
           this.programData.batches.forEach((b: any) => {
             // b.newrequestsCount = this.getNewRequestsList(b.batchId)
-            const request = {
-              serviceName: 'blendedprogram',
-              applicationStatus: 'SEND_FOR_MDO_APPROVAL',
-              applicationIds: [b.batchId],
-              limit: 100,
-              offset: 0,
-              deptName: this.userProfile.channel,
-            }
-            this.bpService.getRequests(request).subscribe((resnew: any) => {
-              if (resnew) {
-                b.newrequestsCount = resnew.result.data.length
+            const allowedBatch = today.isSameOrBefore(moment(b.endDate || new Date()), 'day')
+            if (allowedBatch) {
+              this.batchesList.push(b)
+              const request = {
+                serviceName: 'blendedprogram',
+                applicationStatus: 'SEND_FOR_MDO_APPROVAL',
+                applicationIds: [b.batchId],
+                limit: 100,
+                offset: 0,
+                deptName: this.userProfile.channel,
               }
-            })
+              this.bpService.getRequests(request).subscribe((resnew: any) => {
+                if (resnew) {
+                  b.newrequestsCount = resnew.result.data.length
+                }
+              })
+            }
+
           })
         }
       }
@@ -67,21 +75,26 @@ export class BatchListComponent implements OnInit {
         }
 
         if (this.programData.batches) {
+          const today = moment(new Date())
           this.programData.batches.forEach((b: any) => {
+            const allowedBatch = today.isSameOrBefore(moment(b.endDate || new Date()), 'day')
             // b.newrequestsCount = this.getNewRequestsList(b.batchId)
-            const request = {
-              serviceName: 'blendedprogram',
-              applicationStatus: 'SEND_FOR_MDO_APPROVAL',
-              applicationIds: [b.batchId],
-              limit: 100,
-              offset: 0,
-              deptName: this.userProfile.channel,
-            }
-            this.bpService.getRequests(request).subscribe((resnew: any) => {
-              if (resnew) {
-                b.newrequestsCount = resnew.result.data.length
+            if (allowedBatch) {
+              this.batchesList.push(b)
+              const request = {
+                serviceName: 'blendedprogram',
+                applicationStatus: 'SEND_FOR_MDO_APPROVAL',
+                applicationIds: [b.batchId],
+                limit: 100,
+                offset: 0,
+                deptName: this.userProfile.channel,
               }
-            })
+              this.bpService.getRequests(request).subscribe((resnew: any) => {
+                if (resnew) {
+                  b.newrequestsCount = resnew.result.data.length
+                }
+              })
+            }
           })
         }
       }
diff --git a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
index 1790da7cd..36ac7dcba 100644
--- a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
@@ -1,6 +1,7 @@
 import { Component, OnInit } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
 import { ITableData } from '@sunbird-cb/collection/lib/ui-org-table/interface/interfaces'
+import moment from 'moment'
 import { BlendedService } from '../../services/blended.service'
 
 @Component({
@@ -69,8 +70,13 @@ export class BlendedApprovalsComponent implements OnInit {
             val.batchesCount = val.batches.length
             // val.learners = 0
             // val.newrequests = 0
+
+            const today = moment(new Date())
             val.batches.forEach((b: any) => {
-              this.bIDs.push(b.batchId)
+              const allowedBatch = today.isSameOrBefore(moment(b.endDate || new Date()), 'day')
+              if (allowedBatch) {
+                this.bIDs.push(b.batchId)
+              }
             })
             if (this.bIDs && this.bIDs.length > 0) {
               const request = {

From d79b746a93e394389e3af16b1ac41ca341def80d Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Wed, 5 Jul 2023 18:03:33 +0530
Subject: [PATCH 146/887] Added pipes & corrected code in profile view page

---
 .../blended-approvals.module.ts               |   4 +-
 .../profile-view/profile-view.component.html  | 273 ++++++------------
 .../profile-view/profile-view.component.scss  |  30 +-
 .../profile-view/profile-view.component.ts    | 146 ++++------
 .../services/blended-approval.service.ts      |   6 +
 .../pipe-email/pipe-certimage-URL.pipe.ts     |  67 +++++
 .../pipes/pipe-email/pipe-email.module.ts     |   5 +-
 .../pipe-order-by/pipe-order-by.module.ts     |  12 +
 .../pipes/pipe-order-by/pipe-order-by.pipe.ts |  10 +
 project/ws/app/src/public-api.ts              |   3 +
 10 files changed, 271 insertions(+), 285 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/pipes/pipe-email/pipe-certimage-URL.pipe.ts
 create mode 100644 project/ws/app/src/lib/routes/pipes/pipe-order-by/pipe-order-by.module.ts
 create mode 100644 project/ws/app/src/lib/routes/pipes/pipe-order-by/pipe-order-by.pipe.ts

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts b/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
index eb8b467a7..a83ca5011 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
@@ -22,12 +22,14 @@ import { BlendedHomeComponent } from './components/blended-home/blended-home.com
 import { BlendedApprovalsRoutingModule } from './blended-approvals-routing.module'
 import { UsersCardComponent } from './components/users-card/users-card.component'
 import { ProfileViewComponent } from './components/profile-view/profile-view.component'
+import { PipeEmailModule } from '../pipes/pipe-email/pipe-email.module'
+import { PipeOrderByModule } from '../pipes/pipe-order-by/pipe-order-by.module'
 
 @NgModule({
   declarations: [BlendedHomeComponent, BatchListComponent, BatchDetailsComponent, UsersCardComponent, ProfileViewComponent],
   imports: [CommonModule, BlendedApprovalsRoutingModule, BreadcrumbsOrgModule, LeftMenuWithoutLogoModule, WidgetResolverModule,
     MatSidenavModule, MatButtonModule, MatIconModule, HomeModule, RouterModule, UIORGTableModule,
-    MatCardModule, AvatarPhotoModule, MatListModule],
+    MatCardModule, AvatarPhotoModule, MatListModule, PipeEmailModule, PipeOrderByModule],
   exports: [],
   providers: [],
 })
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.html
index 797c19a24..d25c3d4a2 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.html
@@ -2,7 +2,7 @@
   <ws-widget-breadcrumbs-org [widgetData]="breadcrumbs" *ngIf="breadcrumbs"></ws-widget-breadcrumbs-org>
   <mat-card class="flex-custom mat-card" id="profileInfo">
     <mat-card-header class="flex-custom-m mat-card-header ng-star-inserted">
-      <mat-card-header class="flex-custom-m" *ngIf="portalProfile && portalProfile?.personalDetails"></mat-card-header>
+      <!-- <mat-card-header class="flex-custom-m" *ngIf="portalProfile && portalProfile?.personalDetails"></mat-card-header> -->
       <div mat-card-avatar class="example-header-image">
         <ng-container *ngIf="portalProfile?.personalDetails?.firstname">
           <ws-widget-avatar-photo [photoUrl]="null" [name]="portalProfile?.personalDetails?.firstname" size="xxl-s">
@@ -25,19 +25,7 @@
                 </span> -->
               </mat-card-title>
             </ng-container>
-            <!-- <span *ngIf="verifiedBadge" class="profile-badge"> <img class="profile-badge"
-                src="fusion-assets/images/profile-badge.png" height="18">
-            </span> -->
           </div>
-          <!-- <div class="flex flex-1 flex-row-reverse">
-            <div *ngIf="portalProfile?.id === currentUser || portalProfile?.userId === currentUser"
-              class="ml-4 mr-6 mb-2 view-more ws-mat-accent-text view-all ws-mat-primary-lite-background-important">
-              <a mat-button [routerLink]="'/app/user-profile/details'">
-                <mat-icon class="margin-right-xs">edit</mat-icon>
-                <span i18n>{{ 'Edit Profile' }}</span>
-              </a>
-            </div>
-          </div> -->
         </div>
         <mat-card-subtitle role="link" tabindex="0" i18n-aria-label>
           {{ portalProfile?.employmentDetails?.departmentName }}
@@ -45,29 +33,9 @@
         <mat-card-subtitle role="link" tabindex="0" i18n-aria-label>
           {{ portalProfile?.employmentDetails?.officialPostalAddress }}
         </mat-card-subtitle>
-        <ng-container>
-          <div class="flex flex-1 custom margin-0 margin-top-m bottom-fix mob" role="link" tabindex="0">
-            <div class="flex flex-1">
-              <!-- <span class="flex margin-right-l mobile">
-                <span class="ws-mat-default-text">{{ connectionRequests?.length || 0 }}</span>
-                <span class="pad-4">Connections</span>
-              </span> -->
-              <span class="flex margin-right-l mobile">
-                <!-- <span class="ws-mat-default-text">{{ Math.abs(discussProfileData?.topiccount || 0) }}</span>
-                <span class="pad-4">Discussions</span> -->
-
-              </span>
-            </div>
-            <!-- <div class="flex flex-1" class="text-right mobile2">
-
-                      <span class="noocoments" mat-card-subtitle>Last online
-                        {{discussProfileData.lastonline | pipeRelativeTime}}</span>
-                    </div> -->
-          </div>
-        </ng-container>
       </div>
     </mat-card-header>
-    <mat-card-header class="flex-custom-m" *ngIf="!portalProfile || !portalProfile?.personalDetails">
+    <!-- <mat-card-header class="flex-custom-m" *ngIf="!portalProfile || !portalProfile?.personalDetails">
       <div class="flex-1" role="link" tabindex="0">
         <div class="flex flex-1">
           <mat-card-title class="flex-4 mobile-margin text-capitalize mat-h2">
@@ -75,114 +43,7 @@
           </mat-card-title>
         </div>
       </div>
-    </mat-card-header>
-
-
-    <mat-sidenav-container name="discuss-menu" class="min-height margin-top-m">
-      <mat-sidenav [(opened)]="sideNavBarOpened" class="border-0 sidenav_inner">
-        <div class="contain">
-          <div class="flex-1" style="position: relative">
-            <div #stickyMenu [class.sticky]="sticky">
-              <!-- <app-profile-v2-left-menu [tabsData]="tabsData" class="flex flex-1"></app-profile-v2-left-menu> -->
-            </div>
-          </div>
-        </div>
-      </mat-sidenav>
-
-      <mat-sidenav-content class="sidenav_content">
-        <div *ngIf="screenSizeIsLtMedium">
-          <button type="button" mat-icon-button (click)="sideNavBarOpened = !sideNavBarOpened"
-            id="ws-auth-root-home-btn-menu" name="ws-auth-root-home-btn-menu">
-            <mat-icon>menu</mat-icon>
-          </button>
-        </div>
-
-        <div class="main_network_box">
-          <ng-container *ngFor="let tab of tabsData;let i=index">
-            <!-- <ws-widget-profile-v2-academics *ngIf="pdfData" [widgetData]="tab"></ws-widget-profile-v2-academics> -->
-            <ng-container *ngIf="tab && tab.render && tab.enabled">
-              <ng-container *ngIf="
-                portalProfile?.id === currentUser ||
-                portalProfile?.userId === currentUser
-              ">
-                <!-- <ng-container *ngIf="tab.key === 'certifications'" [wsResolverWidget]="{
-                    widgetType: tab.widget.widgetType,
-                    widgetSubType: tab.widget.widgetSubType,
-                    widgetHostClass: tab.widget.widgetHostClass,
-                    widgetData: {
-                      name: tab.name,
-                      key: tab.key,
-                      data: enrolledCourse,
-                      certificates: allCertificate
-                    }
-                  }">
-              </ng-container> -->
-              </ng-container>
-              <!-- <ng-container *ngIf="tab.key !== 'certifications'" [wsResolverWidget]="{
-                    widgetType: tab.widget.widgetType,
-                    widgetSubType: tab.widget.widgetSubType,
-                    widgetHostClass: tab.widget.widgetHostClass,
-                    widgetData: {
-                      name: tab.name,
-                      key: tab.key,
-                      data: portalProfile[tab.dataKey]
-                    }
-                  }"></ng-container> -->
-            </ng-container>
-          </ng-container>
-          <!-- <ng-container *ngIf="discussionList">
-            <div [attr.id]="discussions"
-              class="flex flex-1 flex-column margin-top-xs margin-botton-xs dark-card discussion-card"
-              style="box-shadow: none">
-              <div class="flex flex-1">
-                <span class="margin-bottom-xs margin-top-l mat-title flex-1">{{
-                  'Discussions'
-                  }}</span>
-              </div>
-              <ng-container>
-                <div class="w-full">
-                  <div class="flex flex-1 flex-column filter_outer_box">
-                    <div class="flex flex-1 filter flex-wrap">
-                      <a href="javascript:void(0)" class="filter-option font-normal" i18n-aria-label role="button"
-                        [ngClass]="{
-                            'ws-mat-accent-border-active':
-                              currentFilter === 'timestamp',
-                            'ws-mat-accent-border font-medium':
-                              currentFilter !== 'timestamp'
-                          }" mat-button (click)="filter('timestamp')">
-                        Recent posts
-                      </a>
-                      <a href="javascript:void(0)" class="filter-option" i18n-aria-label role="button" [ngClass]="{
-                            'ws-mat-accent-border-active': currentFilter === 'best',
-                            'ws-mat-accent-border font-medium':
-                              currentFilter !== 'best'
-                          }" mat-button (click)="filter('best')">
-                        Best posts
-                      </a>
-                      <a href="javascript:void(0)" class="filter-option" i18n-aria-label role="button" [ngClass]="{
-                            'ws-mat-accent-border-active':
-                              currentFilter === 'saved',
-                            'ws-mat-accent-border font-medium':
-                              currentFilter !== 'saved'
-                          }" mat-button (click)="filter('saved')" *ngIf="
-                            portalProfile?.id === currentUser ||
-                            portalProfile?.userId === currentUser
-                          ">
-                        Saved posts
-                      </a>
-                    </div>
-                  </div>
-                </div>
-              </ng-container>
-            </div>
-          </ng-container> -->
-        </div>
-      </mat-sidenav-content>
-
-
-
-      <!-- </div> -->
-    </mat-sidenav-container>
+    </mat-card-header> -->
   </mat-card>
 
   <div class="container sidenav">
@@ -238,45 +99,80 @@
         <mat-card-header>
           <mat-card-title>Certifications</mat-card-title>
         </mat-card-header>
-        <div class="card-container-sidenav-profile" *ngFor="let data of certificationData">
-          <div class="image-container image-card-container">
-            <img mat-card-lg-image [src]="data.courseLogoUrl" height="50" alt="Image" class="card-image" />
-          </div>
-          <div class="content-container">
-            <mat-card-content>
-              <mat-card-title>{{data.content.name}}</mat-card-title>
-              <mat-card-subtitle>{{data.content.description}}</mat-card-subtitle>
-            </mat-card-content>
-          </div>
+        <div *ngIf="allCertificate && allCertificate.length > 0" class="certificate-box">
+          <!-- <div class="card-container-sidenav-profile" *ngFor="let data of allCertificate">
+            <div class="image-container image-card-container">
+              <img mat-card-lg-image [src]="data.courseLogoUrl" height="50" alt="Image" class="card-image" />
+            </div>
+            <div class="content-container">
+              <mat-card-content>
+                <mat-card-title>{{data.content.name}}</mat-card-title>
+                <mat-card-subtitle>{{data.content.description}}</mat-card-subtitle>
+              </mat-card-content>
+            </div>
+          </div> -->
+          <mat-card class="mt-2 mat-list-item dark-card" *ngFor="let certificate of allCertificate" role="link"
+            tabindex="0">
+            <div class="flex flex-1 cursor-pointer">
+              <div *ngIf="certificate.content?.appIcon" class="float-left">
+                <img [src]="certificate.content?.appIcon | pipeCertImageURL" class="app-icon example-header-image"
+                  [alt]="certificate.content.name || iGOT" />
+              </div>
+              <div *ngIf="!certificate.content?.appIcon" class="float-left">
+                <img src="/assets/instances/eagle/app_logos/default.png" class="app-icon example-header-image"
+                  [alt]="certificate.content.name || iGOT" />
+              </div>
+              <div class="flex flex-col gap-1">
+                <div class="subheading">{{certificate.content?.name}}</div>
+                <div>{{certificate.content?.description}}</div>
+                <div>{{certpaDate(certificate.issuedCertificates.lastIssuedOn)}}</div>
+              </div>
+            </div>
+          </mat-card>
+        </div>
+        <div *ngIf="allCertificate && allCertificate.length === 0">
+          No certifications
         </div>
       </mat-card>
 
       <mat-card class="card-container-sidenav-profile-card" *ngIf="selectedTab === 3">
-        <mat-card-content class="mat-card-content" *ngFor="let designationData of designation">
-          <span class="mat-subheading-1 flex-4 mobile-margin" role="link" tabindex="0"> Career history</span>
-          <div *ngIf="viewProfile">
-            <div class="mt-2 mat-list-item dark-card mat-card " role="link" tabindex="0">
-              <div class="flex flex-1">
-
-                <span class="flex-1 mat-subheading-1"> {{designationData.designation}} </span>
-                <span class="mat-subheading-2 ws-mat-black60-text">
-                  Joined {{designationData.doj}}
-                </span>
-              </div>
-              <div class="mat-body-2 flex-1"> {{designationData.description}}</div>
-              <div class="mat-body-2 flex-1 ws-mat-black60-text"> {{designationData.location}} </div>
-            </div>
+        <mat-card-header>
+          <mat-card-title>Career history</mat-card-title>
+        </mat-card-header>
+        <div class="flex flex-1 flex-column margin-top-xs margin-left-xs margin-right-xs">
+          <div class="flex-custom" id="hobbies">
+            <mat-card-content class="mat-card-content" *ngIf="designation && designation.length > 0">
+              <mat-card class="no-shadow mt-2 mat-list-item dark-card mat-card"
+                *ngFor="let designationData of designation">
+                <div class="mt-2 mat-list-item" role="link" tabindex="0">
+                  <div class="flex flex-1">
+
+                    <span class="flex-1 mat-subheading-1"> {{designationData.designation}} </span>
+                    <span class="mat-subheading-2 ws-mat-black60-text">
+                      Joined {{designationData.doj}}
+                    </span>
+                  </div>
+                  <div class="mat-body-2 flex-1"> {{designationData.description}}</div>
+                  <div class="mat-body-2 flex-1 ws-mat-black60-text"> {{designationData.location}} </div>
+                </div>
+              </mat-card>
+            </mat-card-content>
+            <mat-card-content *ngIf="designation && designation.length === 0">
+              <div>No designations</div>
+            </mat-card-content>
           </div>
-        </mat-card-content>
+        </div>
       </mat-card>
 
       <mat-card class="card-container-sidenav-profile-card" *ngIf="selectedTab === 4">
+        <mat-card-header>
+          <mat-card-title>Academics</mat-card-title>
+        </mat-card-header>
         <div class="flex flex-1 flex-column margin-top-xs margin-left-xs margin-right-xs">
-          <div class="flex-custom mat-card" id="academics">
-            <mat-card-content class="mat-card-content">
-              <span class="mat-subheading-1 flex-4 mobile-margin" role="link" tabindex="0">Academics</span>
-              <mat-card class="no-shadow mt-2 mat-list-item dark-card mat-card ng-star-inserted" role="link"
-                tabindex="0" *ngFor="let academicsData of academics">
+          <div class="flex-custom" id="academics">
+            <mat-card-content class="mat-card-content" *ngIf="academics && academics.length > 0">
+              <mat-card class="no-shadow mt-2 mat-list-item dark-card mat-card"
+                *ngFor="let academicsData of academics | orderBy:'yearOfPassing':'desc'">
                 <div class="flex flex-1 mobile-margin margin-f">
                   <span class="flex-1 mat-subheading-1">{{academicsData.type}}</span>
                   <span
@@ -284,36 +180,33 @@
                 </div>
                 <div class="mat-body-2 flex-1 mobile-margin">{{academicsData.nameOfInstitute}}</div>
               </mat-card>
-              <!-- <mat-card class="no-shadow mt-2 mat-list-item dark-card mat-card ng-star-inserted" role="link"
-                tabindex="0">
-                <div class="flex flex-1 mobile-margin margin-f">
-                  <span class="flex-1 mat-subheading-1">XII STANDARD</span>
-                  <span class="mat-subheading-2 ws-mat-black60-text ng-star-inserted">0000</span>
-                </div>
-                <div class="mat-body-2 flex-1 mobile-margin">mds</div>
-              </mat-card> -->
+            </mat-card-content>
+            <mat-card-content *ngIf="academics && academics.length === 0">
+              <div>No academics</div>
             </mat-card-content>
           </div>
         </div>
       </mat-card>
 
       <mat-card class="card-container-sidenav-profile-card" *ngIf="selectedTab === 5">
+        <mat-card-header>
+          <mat-card-title>Hobbies</mat-card-title>
+        </mat-card-header>
         <div class="flex flex-1 flex-column margin-top-xs margin-left-xs margin-right-xs">
-          <div class="flex-custom mat-card" id="hobbies">
-            <mat-card-content class="mat-card-content">
-              <span class="mat-subheading-1 flex-4 mobile-margin" role="link" tabindex="0">Hobbies</span>
-              <div class="no-shadow mt-2 mat-list-item dark-card mat-card ng-star-inserted" role="link" tabindex="0">
-                <div class="flex flex-1 mobile-margin margin-f">
-                  <span class="mat-subtitle flex-1 mobile-margin">No hobbies information available</span>
+          <div class="flex-custom" id="hobbies">
+            <mat-card-content *ngIf="hobbies && hobbies.length > 0">
+              <mat-card class="no-shadow mt-2 mat-list-item dark-card mat-card" *ngFor="let hobby of hobbies">
+                <div class="hobby">
+                  <span role="link" tabindex="0" class="text-capitalize mat-body-2">{{hobby}}</span>
                 </div>
-              </div>
+              </mat-card>
+            </mat-card-content>
+            <mat-card-content *ngIf="hobbies && hobbies.length === 0">
+              <div>No academics</div>
             </mat-card-content>
           </div>
         </div>
       </mat-card>
-
     </div>
   </div>
-
-
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.scss
index b6e2a555e..6c7e3253f 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.scss
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.scss
@@ -491,4 +491,32 @@ mat-card.card-container-sidenav-profile.mat-card {
 ::ng-deep.circle-xxl-s {
     width: 150px !important;
     height: 130px !important;
-}
\ No newline at end of file
+}
+
+.certificate-box {
+    .example-header-image {
+      background-size: cover;
+      width: 98px;
+      border-radius: calc(#{$size-s} - #{$size-xs}) !important;
+      height: 98px;
+      padding-right: 24px;
+    }
+
+    .margin-f {
+      margin: 0 0 1rem 0 !important;
+    }
+
+    .no-shadow {
+      box-shadow: none !important;
+    }
+
+    .subheading {
+      font: 600 16px/24px Montserrat;
+    }
+
+    .img-size {
+      height: 100px;
+      width: 100px;
+      padding-right: 24px;
+    }
+  }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.ts
index 10b739bb2..1781d5ba3 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.ts
@@ -1,26 +1,13 @@
 
 import { AfterViewInit, Component, ElementRef, HostListener, OnDestroy, OnInit, ViewChild } from '@angular/core'
-// import { MatNavList } from '@angular/material/list'
 import { NSProfileDataV2 } from '../../../../routes/approvals/models/profile-v2.model'
 import { MatDialog } from '@angular/material/dialog'
 import { ActivatedRoute, Router } from '@angular/router'
-// import { DiscussService } from '../../../discuss/services/discuss.service'
-// import { ProfileV2Service } from '../../services/profile-v2.servive'
 /* tslint:disable */
 import _ from 'lodash'
-// import { NetworkV2Service } from '../../../network-v2/services/network-v2.service'
-// import { NSNetworkDataV2 } from '../../../network-v2/models/network-v2.model'
-// import { ConfigurationsService, ValueService } from '@sunbird-cb/utils'
-// import { map } from 'rxjs/operators'
 import { BlendedApporvalService } from '../../services/blended-approval.service'
-
-import {
-  WidgetUserService,
-  NsContent
-  // WidgetContentService,
-} from '@sunbird-cb/collection'
-/* tslint:enable */
-// import {  } from '@sunbird-cb/utils'
+import { WidgetUserService } from '@sunbird-cb/collection'
+import moment from 'moment'
 
 @Component({
   selector: 'app-profile-view',
@@ -37,8 +24,8 @@ export class ProfileViewComponent implements OnInit, AfterViewInit, OnDestroy {
   selectedTab: number = 2; // Default selected tab
   doj: any
   description: any
-  academics: any
-
+  academics: any = []
+  hobbies: any = []
   Math: any
   /* tslint:enable */
   elementPosition: any
@@ -49,12 +36,12 @@ export class ProfileViewComponent implements OnInit, AfterViewInit, OnDestroy {
   userDetails: any
   location!: string | null
   tabs: any
-  designation!: string | null
+  designation: any = []
   tabsData: NSProfileDataV2.IProfileTab[]
   currentUser!: string | null
   // connectionRequests!: NSNetworkDataV2.INetworkUser[]
   currentUsername: any
-  certificationData: any
+  certificationData: any = []
   viewProfile: any[] = []
   enrolledCourse: any = []
   allCertificate: any = []
@@ -94,15 +81,21 @@ export class ProfileViewComponent implements OnInit, AfterViewInit, OnDestroy {
       this.viewProfile = res
       // this.designation = res?.profileDetails?.professionalDetails[0]?.designation;
       this.userSvc.fetchUserBatchList(userId).subscribe((result: any) => {
-        this.certificationData = result
+        result.forEach((items: any) => {
+          if (items.completionPercentage === 100) {
+            this.certificationData.push(items)
+            // return items;
+          }
+        })
+        this.downloadAllCertificate(this.certificationData)
+        // this.certificationData = result
       })
       this.portalProfile = res
-      this.designation = res.profileDetails.professionalDetails
-      this.academics = res.profileDetails.academics
-
-      // this.location = res.profileDetails.professionalDetails[0].location
-      // this.doj = res.profileDetails.professionalDetails[0].doj
-      // this.description = res.profileDetails.professionalDetails[0].description
+      if (res.profileDetails) {
+        this.designation = res.profileDetails.professionalDetails ? res.profileDetails.professionalDetails : []
+        this.academics = res.profileDetails.academics ? res.profileDetails.academics : []
+        this.hobbies = res.profileDetails.interests ? res.profileDetails.interests : []
+      }
 
       this.tabs = this.route.data.subscribe(data => {
         if (res.profileDetails.verifiedKarmayogi === true) {
@@ -126,10 +119,45 @@ export class ProfileViewComponent implements OnInit, AfterViewInit, OnDestroy {
         }
 
       })
-      // this.fetchUserBatchList()
 
     })
   }
+
+  downloadAllCertificate(data: any) {
+    data.forEach((item: any) => {
+      if (item.issuedCertificates.length !== 0) {
+        item.issuedCertificates.forEach((cid: any) => {
+          // const certId = item.issuedCertificates[0].identifier
+          const certId = cid.identifier
+          this.bpService.downloadCert(certId).subscribe((response: any) => {
+            this.allCertificate.push({
+              identifier: certId,
+              dataUrl: response.result.printUri,
+              content: item.content,
+              issuedCertificates: cid,
+            })
+
+          })
+        })
+      }
+    })
+  }
+
+  paDate(date: any): string {
+    const dat = moment(date, 'DD-MM-YYYY').toDate()
+    return dat.toDateString()
+  }
+
+  certpaDate(date: any): string {
+    let dat
+    if (date) {
+
+      dat = `Issued on ${moment(date).format('MMM YYYY')}`
+    } else {
+      dat = 'Certificate Not issued '
+    }
+    return dat
+  }
   selectTab(tabIndex: number): void {
     this.selectedTab = tabIndex
   }
@@ -145,23 +173,6 @@ export class ProfileViewComponent implements OnInit, AfterViewInit, OnDestroy {
       this.sticky = false
     }
   }
-  decideAPICall() {
-    const user = this.portalProfile.userId || this.portalProfile.id || ''
-    if (this.portalProfile && user) {
-      this.fetchUserDetails(this.currentUsername)
-      // this.fetchConnectionDetails(user)
-    } else {
-
-      // if (this.configSvc.userProfile) {
-      //   const me = this.configSvc.userProfile.userName || ''
-      //   if (me) {
-      //     this.fetchUserDetails(me)
-      //     // this.fetchConnectionDetails(this.configSvc.userProfile.userId)
-      //   }
-      // }
-
-    }
-  }
 
   ngOnInit() { }
 
@@ -176,52 +187,5 @@ export class ProfileViewComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   ngAfterViewInit() {
-    // this.elementPosition = this.menuElement.nativeElement.parentElement.offsetTop
-  }
-  fetchUserDetails(name: string) {
-    if (name) {
-      // this.discussService.fetchProfileInfo(name).subscribe((response: any) => {
-      //   if (response) {
-      //     this.discussProfileData = response
-      //     this.discussionList = _.uniqBy(_.filter(this.discussProfileData.posts, p => _.get(p, 'isMainPost') === true), 'tid') || []
-      //   }
-      // })
-    }
   }
-  // fetchConnectionDetails(wid: string) {
-  //   this.networkV2Service.fetchAllConnectionEstablishedById(wid).subscribe(
-  //     (data: any) => {
-  //       this.connectionRequests = data.result.data
-  //     },
-  //     (_err: any) => {
-  //       // this.openSnackbar(err.error.message.split('|')[1] || this.defaultError)
-  //     })
-  // }
-
-  fetchUserBatchList() {
-    const user = this.portalProfile.userId || this.portalProfile.id || ''
-    this.userSvc.fetchUserBatchList(user).subscribe((courses: NsContent.ICourse[]) => {
-
-      courses.forEach(items => {
-        if (items.completionPercentage === 100) {
-          this.enrolledCourse.push(items)
-          // return items;
-        }
-      })
-      // this.downloadAllCertificate(this.enrolledCourse)
-    })
-  }
-
-  // downloadAllCertificate(data: any) {
-  //   data.forEach((item: any) => {
-  //     if (item.issuedCertificates.length !== 0) {
-  //       const certId = item.issuedCertificates[0].identifier
-  //       this.contentSvc.downloadCert(certId).subscribe(response => {
-
-  //         this.allCertificate.push({ identifier: item.issuedCertificates[0].identifier, dataUrl: response.result.printUri })
-
-  //       })
-  //     }
-  //   })
-  // }
 }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
index 818c3e040..ac0c4c69c 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
@@ -11,6 +11,7 @@ const API_END_POINTS = {
   GET_LERANERS: '/apis/protected/v8/cohorts/course/getUsersForBatch',
   GET_REQUESTS: '/apis/proxies/v8/workflow/blendedprogram/search',
   READ_USER: '/apis/proxies/v8/api/user/v2/read/',
+  CERT_DOWNLOAD: `/apis/protected/v8/cohorts/course/batch/cert/download/`,
 }
 
 @Injectable({
@@ -42,4 +43,9 @@ export class BlendedApporvalService {
     }
     return this.http.get<any>(API_END_POINTS.READ_USER).pipe(map(resp => _.get(resp, 'result.response')))
   }
+
+  downloadCert(certId: any) {
+    const url = `${API_END_POINTS.CERT_DOWNLOAD}/${certId}`
+    return this.http.get<any>(url)
+  }
 }
diff --git a/project/ws/app/src/lib/routes/pipes/pipe-email/pipe-certimage-URL.pipe.ts b/project/ws/app/src/lib/routes/pipes/pipe-email/pipe-certimage-URL.pipe.ts
new file mode 100644
index 000000000..8fc105c5a
--- /dev/null
+++ b/project/ws/app/src/lib/routes/pipes/pipe-email/pipe-certimage-URL.pipe.ts
@@ -0,0 +1,67 @@
+import { Pipe, PipeTransform } from '@angular/core'
+import { environment } from 'src/environments/environment'
+
+@Pipe({
+  name: 'pipeCertImageURL',
+})
+export class PipeCertificateImageURL implements PipeTransform {
+
+  transform(value: string): any {
+    if (value.indexOf('/public/content') > -1) {
+      if (value.indexOf('/content/content') === -1 || value.indexOf('/content/collection') === -1) {
+        const mainUrl = value && value.split('/content').pop() || ''
+        const finalURL = `${environment.contentHost}/assets/certimage/content${mainUrl}`
+        return value ? finalURL : ''
+      }
+    }
+
+    if (value.indexOf('/public/content') === -1) {
+      if (value.indexOf('/content/content') > -1 || value.indexOf('/igot/content') > -1 || value.indexOf('/content-store/content') > -1) {
+        const mainUrl = value && value.split('/content').pop() || ''
+        const finalURL = `${environment.contentHost}/assets/public/content${mainUrl}`
+        return value ? finalURL : ''
+      }
+      if (value.indexOf('/igotprod/collection') > -1) {
+        const mainUrl = value && value.split('/igotprod').pop() || ''
+        const finalURL = `${environment.contentHost}/assets/public/${mainUrl}`
+        return value ? finalURL : ''
+      }
+      if (value.indexOf('/igotprod/content') > -1) {
+        const mainUrl = value && value.split('/igotprod').pop() || ''
+        const finalURL = `${environment.contentHost}/assets/public/${mainUrl}`
+        return value ? finalURL : ''
+      }
+      if (value.indexOf('/igotbm/collection') > -1) {
+        const mainUrl = value && value.split('/igotbm').pop() || ''
+        const finalURL = `${environment.contentHost}/assets/public/${mainUrl}`
+        return value ? finalURL : ''
+      }
+      if (value.indexOf('/igotbm/content') > -1) {
+        const mainUrl = value && value.split('/igotbm').pop() || ''
+        const finalURL = `${environment.contentHost}/assets/public/${mainUrl}`
+        return value ? finalURL : ''
+      }
+      if (value.indexOf('/igot/collection') > -1) {
+        const mainUrl = value && value.split('/igot').pop() || ''
+        const finalURL = `${environment.contentHost}/assets/public/${mainUrl}`
+        return value ? finalURL : ''
+      }
+      if (value.indexOf('/igot/content') > -1) {
+        const mainUrl = value && value.split('/igot').pop() || ''
+        const finalURL = `${environment.contentHost}/assets/public/${mainUrl}`
+        return value ? finalURL : ''
+      }
+      if (value.indexOf('/content/collection') > -1) {
+        const mainUrl = value && value.split('/content').pop() || ''
+        const finalURL = `${environment.contentHost}/assets/public/${mainUrl}`
+        return value ? finalURL : ''
+      }
+      if (value.indexOf('/content/content') === -1 || value.indexOf('/content/collection') === -1) {
+        const mainUrl = value && value.split('/content').pop() || ''
+        const finalURL = `${environment.contentHost}/assets/public/${mainUrl}`
+        return value ? finalURL : ''
+      }
+
+    }
+  }
+}
diff --git a/project/ws/app/src/lib/routes/pipes/pipe-email/pipe-email.module.ts b/project/ws/app/src/lib/routes/pipes/pipe-email/pipe-email.module.ts
index 16405a2c1..f515cf173 100644
--- a/project/ws/app/src/lib/routes/pipes/pipe-email/pipe-email.module.ts
+++ b/project/ws/app/src/lib/routes/pipes/pipe-email/pipe-email.module.ts
@@ -1,12 +1,13 @@
 import { NgModule } from '@angular/core'
 import { CommonModule } from '@angular/common'
 import { PipeEmailPipe } from './pipe-email.pipe'
+import { PipeCertificateImageURL } from './pipe-certimage-URL.pipe'
 
 @NgModule({
-  declarations: [PipeEmailPipe],
+  declarations: [PipeEmailPipe, PipeCertificateImageURL],
   imports: [
     CommonModule,
   ],
-  exports: [PipeEmailPipe],
+  exports: [PipeEmailPipe, PipeCertificateImageURL],
 })
 export class PipeEmailModule { }
diff --git a/project/ws/app/src/lib/routes/pipes/pipe-order-by/pipe-order-by.module.ts b/project/ws/app/src/lib/routes/pipes/pipe-order-by/pipe-order-by.module.ts
new file mode 100644
index 000000000..80846dc56
--- /dev/null
+++ b/project/ws/app/src/lib/routes/pipes/pipe-order-by/pipe-order-by.module.ts
@@ -0,0 +1,12 @@
+import { NgModule } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { OrderByPipe } from './pipe-order-by.pipe'
+
+@NgModule({
+  declarations: [OrderByPipe],
+  imports: [
+    CommonModule,
+  ],
+  exports: [OrderByPipe],
+})
+export class PipeOrderByModule { }
diff --git a/project/ws/app/src/lib/routes/pipes/pipe-order-by/pipe-order-by.pipe.ts b/project/ws/app/src/lib/routes/pipes/pipe-order-by/pipe-order-by.pipe.ts
new file mode 100644
index 000000000..0a8da21e1
--- /dev/null
+++ b/project/ws/app/src/lib/routes/pipes/pipe-order-by/pipe-order-by.pipe.ts
@@ -0,0 +1,10 @@
+import { Pipe, PipeTransform } from '@angular/core'
+import { orderBy } from 'lodash'
+
+@Pipe({
+  name: 'orderBy',
+})
+
+export class OrderByPipe implements PipeTransform {
+  transform = orderBy
+}
diff --git a/project/ws/app/src/public-api.ts b/project/ws/app/src/public-api.ts
index 502087051..d58143619 100644
--- a/project/ws/app/src/public-api.ts
+++ b/project/ws/app/src/public-api.ts
@@ -25,4 +25,7 @@ export * from './lib/routes/workallocation-v2/workallocation-v2.module'
 export * from './lib/routes/state-profile/state-profile.module'
 export * from './lib/routes/pipes/pipe-email/pipe-email.module'
 export * from './lib/routes/pipes/pipe-email/pipe-email.pipe'
+export * from './lib/routes/pipes/pipe-email/pipe-certimage-URL.pipe'
+export * from './lib/routes/pipes/pipe-order-by/pipe-order-by.module'
+export * from './lib/routes/pipes/pipe-order-by/pipe-order-by.pipe'
 export * from './lib/routes/blended-program-approvals/blended-approvals.module'

From c953130f2ba7e50e4dfc7ce25a62ac8eb01f41d1 Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Wed, 5 Jul 2023 23:24:10 +0530
Subject: [PATCH 147/887] Added certificate view dialog

---
 .../blended-approvals.module.ts               |  3 +-
 .../profile-certificate-dialog.component.html | 56 +++++++++++
 .../profile-certificate-dialog.component.scss | 98 +++++++++++++++++++
 .../profile-certificate-dialog.component.ts   | 92 +++++++++++++++++
 .../profile-certificate-dialog.module.ts      | 26 +++++
 .../profile-view/profile-view.component.html  |  2 +-
 .../profile-view/profile-view.component.ts    | 15 ++-
 7 files changed, 288 insertions(+), 4 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/profile-certificate-dialog/profile-certificate-dialog.component.html
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/profile-certificate-dialog/profile-certificate-dialog.component.scss
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/profile-certificate-dialog/profile-certificate-dialog.component.ts
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/profile-certificate-dialog/profile-certificate-dialog.module.ts

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts b/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
index a83ca5011..0b1235b64 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
@@ -24,12 +24,13 @@ import { UsersCardComponent } from './components/users-card/users-card.component
 import { ProfileViewComponent } from './components/profile-view/profile-view.component'
 import { PipeEmailModule } from '../pipes/pipe-email/pipe-email.module'
 import { PipeOrderByModule } from '../pipes/pipe-order-by/pipe-order-by.module'
+import { ProfileCertificateDialogModule } from './components/profile-certificate-dialog/profile-certificate-dialog.module'
 
 @NgModule({
   declarations: [BlendedHomeComponent, BatchListComponent, BatchDetailsComponent, UsersCardComponent, ProfileViewComponent],
   imports: [CommonModule, BlendedApprovalsRoutingModule, BreadcrumbsOrgModule, LeftMenuWithoutLogoModule, WidgetResolverModule,
     MatSidenavModule, MatButtonModule, MatIconModule, HomeModule, RouterModule, UIORGTableModule,
-    MatCardModule, AvatarPhotoModule, MatListModule, PipeEmailModule, PipeOrderByModule],
+    MatCardModule, AvatarPhotoModule, MatListModule, PipeEmailModule, PipeOrderByModule, ProfileCertificateDialogModule],
   exports: [],
   providers: [],
 })
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-certificate-dialog/profile-certificate-dialog.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-certificate-dialog/profile-certificate-dialog.component.html
new file mode 100644
index 000000000..953dfd43a
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-certificate-dialog/profile-certificate-dialog.component.html
@@ -0,0 +1,56 @@
+<mat-card class="no-shadow flex flex-1">
+  <mat-card-content>
+    <div #images>
+      <img [src]="url | pipeSafeSanitizer: 'url'" alt="Certificate" role="image" class="certificate-banner-image" />
+    </div>
+  </mat-card-content>
+  <!--
+  <div class="flex flex-col">
+    <mat-card-title>
+      <span i18n>About the course</span>
+    </mat-card-title>
+
+    <div>
+      <div *ngIf="this.data.value.content?.appIcon" class="float-left">
+        <img [src]="this.data.value.content?.posterImage | pipePublicURL" class="app-icon course-image"
+          [alt]="this.data.value.content.name || iGOT" />
+      </div>
+      <div *ngIf="!this.data.value.content?.appIcon" class="float-left">
+        <img src="/assets/instances/eagle/app_logos/default.png" class="app-icon course-image default"
+          [alt]="this.data.value.content.name || iGOT" />
+      </div>
+    </div>
+    <div class="subheading pb-1 cursor-pointer">
+      {{ this.data.value.content?.name }}
+    </div>
+    <div>
+      {{ this.data.value.content?.description }}
+    </div>
+     <a (click)="navigate(this.data.value.collectionId)" [mat-dialog-close]="true" class="link-course cursor-pointer">
+      View Course
+    </a> <div class="flex flex-row gap-3 mtop">
+      <a mat-button [matMenuTriggerFor]="menu" class="ws-mat-accent-border-active mat-accent">
+        <mat-icon class="mat-icon material-icons-outlined download_icon margin-right-xs">cloud_download</mat-icon>
+        Download
+      </a>
+      <a mat-button (click)="shareCert()" class="ws-mat-accent-border-active mat-accent">
+        <mat-icon class="mat-icon material-icons-outlined download_icon margin-right-xs">share</mat-icon>
+        Share
+      </a>
+    </div>
+  </div> -->
+</mat-card>
+<!-- <mat-menu #menu="matMenu">
+  <button mat-menu-item (click)='downloadCertPdf()'>
+    <mat-icon>picture_as_pdf</mat-icon>
+    <span>PDF</span>
+  </button>
+  <button mat-menu-item (click)='downloadCertPng()'>
+    <mat-icon>photo</mat-icon>
+    <span>PNG</span>
+  </button>
+  <button mat-menu-item (click)='downloadCert()'>
+    <mat-icon>photo_size_select_actual</mat-icon>
+    <span>SVG</span>
+  </button>
+</mat-menu> -->
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-certificate-dialog/profile-certificate-dialog.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-certificate-dialog/profile-certificate-dialog.component.scss
new file mode 100644
index 000000000..54739360e
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-certificate-dialog/profile-certificate-dialog.component.scss
@@ -0,0 +1,98 @@
+@import "ws-mixins";
+.no-shadow {
+    box-shadow: none !important;
+    // width: 500px;
+    // height: 500px;
+}
+.certificate-banner-image {
+    height: 400px;
+    display: flex;
+    width: auto;
+    margin: 0px auto;
+    padding-right: 1rem;
+    @include breakpoint-lt-l {
+        width: 100%;
+        height: auto;
+        flex: 1;
+    }
+}
+
+a.download_btn {
+    background-color: #f0f0f0;
+    border-radius: 4px 4px;
+    float: right;
+    height: 40px;
+    padding: 0px 16px;
+    text-align: center;
+    line-height: 40px;
+    text-decoration: none;
+    color: rgba(0, 0, 0, 0.6);
+    font-size: 14px;
+    font-weight: 600;
+    margin-top: 16px;
+    margin-right: 0px;
+}
+
+.download_icon {
+    font-size: 16px;
+    vertical-align: text-top;
+}
+.close-button {
+    float: right;
+    top: -24px;
+    right: -24px;
+}
+
+.close-icon {
+    transition: 1s ease-in-out;
+}
+
+.close-icon:hover {
+    transform: rotate(180deg);
+}
+
+::ng-deep .icon-outside .close-button {
+    float: right;
+    top: -52px;
+    right: -52px;
+}
+::ng-deep .icon-outside .mat-dialog-container {
+    overflow: unset;
+}
+
+::ng-deep .mat-card-content {
+    margin-bottom: 0;
+}
+
+.certificate-banner-image {
+    svg {
+        width: 500;
+        height: 500;
+        @include breakpoint-lt-l {
+            width: auto;
+            height: auto;
+            flex: 1;
+        }
+    }
+}
+
+.course-image{
+ height: 110px;
+ width: 250px;
+ padding-bottom: .5rem;
+}
+
+.subheading{
+    font: 600 16px/24px Montserrat;
+  }
+
+  .mtop{
+      margin-top: auto;
+  }
+
+.link-course {
+    font: 600 12px/14px Lato;
+    margin: 0px 0 2px;
+    letter-spacing: 0px;
+    color: #00A9F4;
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-certificate-dialog/profile-certificate-dialog.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-certificate-dialog/profile-certificate-dialog.component.ts
new file mode 100644
index 000000000..7c1a24d59
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-certificate-dialog/profile-certificate-dialog.component.ts
@@ -0,0 +1,92 @@
+import { Component, Inject, OnInit } from '@angular/core'
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'
+
+@Component({
+  selector: 'ws-widget-app-profile-certificate-dialog',
+  templateUrl: './profile-certificate-dialog.component.html',
+  styleUrls: ['./profile-certificate-dialog.component.scss'],
+})
+export class ProfileCertificateDialogComponent implements OnInit {
+  url!: string
+  courseName: any
+  author!: string
+  // navUrl: any = ''
+  // shareUrl = 'https://medium.com/@garfunkel61/angular-simplest-solution-for-social-sharing-feature-6f00d5d99c5e'
+
+  constructor(
+    public dialogRef: MatDialogRef<ProfileCertificateDialogComponent>,
+    @Inject(MAT_DIALOG_DATA) public data: any) { }
+
+  ngOnInit() {
+    this.url = this.data.cet
+    // this.createNavigationUrl()
+  }
+
+  // private createNavigationUrl() {
+  //   this.navUrl = `https://www.linkedin.com/shareArticle?title=I%20earned%20a%20certficiation&url=${this.data.value.content.appIcon}`
+  // }
+
+  // navigate(data: any) {
+  //   this.router.navigateByUrl(`/app/toc/${data}/overview`)
+  // }
+
+  // downloadCert() {
+  //   const a: any = document.createElement('a')
+  //   a.href = this.data.cet
+  //   a.download = 'Certificate'
+  //   document.body.appendChild(a)
+  //   a.style = 'display: none'
+  //   a.click()
+  //   a.remove()
+  // }
+  // downloadCertPng() {
+  //   const uriData = this.data.cet
+  //   const img = new Image()
+  //   img.src = uriData
+  //   img.width = 1820
+  //   img.height = 1000
+  //   img.onload = () => {
+  //     const canvas = document.createElement('canvas');
+  //     [canvas.width, canvas.height] = [img.width, img.height]
+  //     const ctx = canvas.getContext('2d')
+  //     if (ctx) {
+  //       ctx.drawImage(img, 0, 0, img.width, img.height)
+  //       const a = document.createElement('a')
+  //       const quality = 1.0 // https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/imageSmoothingQuality
+  //       a.href = canvas.toDataURL('image/png', quality)
+  //       a.download = 'Certificate'
+  //       a.append(canvas)
+  //       a.click()
+  //       a.remove()
+  //     }
+  //   }
+  // }
+  // async downloadCertPdf() {
+  //   const uriData = this.data.cet
+  //   const img = new Image()
+  //   img.src = uriData
+  //   img.width = 1820
+  //   img.height = 1000
+  //   img.onload = () => {
+  //     const canvas = document.createElement('canvas');
+  //     [canvas.width, canvas.height] = [img.width, img.height]
+  //     const ctx = canvas.getContext('2d')
+  //     if (ctx) {
+  //       ctx.drawImage(img, 0, 0, img.width, img.height)
+  //       const quality = 1.0 // https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/imageSmoothingQuality
+  //       const dataImg = canvas.toDataURL('application/pdf', quality)
+  //       const pdf = new jsPDF('landscape', 'px', 'a4')
+
+  //       // add the image to the PDF
+  //       pdf.addImage(dataImg, 10, 20, 600, 350)
+
+  //       // download the PDF
+  //       pdf.save('Certificate.pdf')
+  //     }
+  //   }
+  // }
+  // shareCert() {
+  //   return window.open(this.navUrl, '_blank')
+  // }
+
+}
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-certificate-dialog/profile-certificate-dialog.module.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-certificate-dialog/profile-certificate-dialog.module.ts
new file mode 100644
index 000000000..035005229
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-certificate-dialog/profile-certificate-dialog.module.ts
@@ -0,0 +1,26 @@
+import { NgModule } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { ProfileCertificateDialogComponent } from './profile-certificate-dialog.component'
+import { MatButtonModule, MatCardModule, MatDialogModule, MatIconModule, MatSnackBarModule, MatTooltipModule, MatMenuModule } from '@angular/material'
+import { PipeSafeSanitizerModule } from '@sunbird-cb/utils'
+
+@NgModule({
+  declarations: [ProfileCertificateDialogComponent],
+  imports: [
+    CommonModule,
+    CommonModule,
+    MatButtonModule,
+    MatCardModule,
+    MatIconModule,
+    MatTooltipModule,
+    MatDialogModule,
+    MatMenuModule,
+    MatSnackBarModule,
+    PipeSafeSanitizerModule,
+  ],
+  exports: [
+    ProfileCertificateDialogComponent,
+  ],
+  entryComponents: [ProfileCertificateDialogComponent],
+})
+export class ProfileCertificateDialogModule { }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.html
index d25c3d4a2..08ee51461 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.html
@@ -113,7 +113,7 @@
           </div> -->
           <mat-card class="mt-2 mat-list-item dark-card" *ngFor="let certificate of allCertificate" role="link"
             tabindex="0">
-            <div class="flex flex-1 cursor-pointer">
+            <div (click)="openCertificateDialog(certificate)" class="flex flex-1 cursor-pointer">
               <div *ngIf="certificate.content?.appIcon" class="float-left">
                 <img [src]="certificate.content?.appIcon | pipeCertImageURL" class="app-icon example-header-image"
                   [alt]="certificate.content.name || iGOT" />
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.ts
index 1781d5ba3..8466ad3c3 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.ts
@@ -8,6 +8,7 @@ import _ from 'lodash'
 import { BlendedApporvalService } from '../../services/blended-approval.service'
 import { WidgetUserService } from '@sunbird-cb/collection'
 import moment from 'moment'
+import { ProfileCertificateDialogComponent } from '../profile-certificate-dialog/profile-certificate-dialog.component'
 
 @Component({
   selector: 'app-profile-view',
@@ -161,8 +162,6 @@ export class ProfileViewComponent implements OnInit, AfterViewInit, OnDestroy {
   selectTab(tabIndex: number): void {
     this.selectedTab = tabIndex
   }
-  // isLtMedium$ = this.valueSvc.isLtMedium$
-  // mode$ = this.isLtMedium$.pipe(map(isMedium => (isMedium ? 'over' : 'side')))
 
   @HostListener('window:scroll', ['$event'])
   handleScroll() {
@@ -188,4 +187,16 @@ export class ProfileViewComponent implements OnInit, AfterViewInit, OnDestroy {
 
   ngAfterViewInit() {
   }
+
+  openCertificateDialog(value: any) {
+    if (value.issuedCertificates.length !== 0) {
+      if (value.issuedCertificates.identifier === value.identifier) {
+        const cet = value.dataUrl
+        this.dialog.open(ProfileCertificateDialogComponent, {
+          autoFocus: false,
+          data: { cet, value },
+        })
+      }
+    }
+  }
 }

From 0997dda9d0ab366b4f492242ba20f9b1f3d101da Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Wed, 5 Jul 2023 23:35:43 +0530
Subject: [PATCH 148/887] Updated css

---
 .../profile-view/profile-view.component.html      | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.html
index 08ee51461..a3d754cd2 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/profile-view/profile-view.component.html
@@ -47,8 +47,7 @@
   </mat-card>
 
   <div class="container sidenav">
-    <mat-nav-list class="margin-left-xs margin-right-s margin-top-m flex-1 mat-nav-list mat-list-base"
-      role="navigation">
+    <mat-nav-list class="margin-left-xs margin-right-s flex-1 mat-nav-list mat-list-base" role="navigation">
       <!-- <a class="mat-list-item  " mat-list-item="" matripple="" style="">
         <div class="mat-list-item-content">
           <div class="mat-list-item-ripple mat-ripple" mat-ripple=""></div>
@@ -130,7 +129,7 @@
             </div>
           </mat-card>
         </div>
-        <div *ngIf="allCertificate && allCertificate.length === 0">
+        <div class="margin-left-s" *ngIf="allCertificate && allCertificate.length === 0">
           No certifications
         </div>
       </mat-card>
@@ -157,8 +156,8 @@
                 </div>
               </mat-card>
             </mat-card-content>
-            <mat-card-content *ngIf="designation && designation.length === 0">
-              <div>No designations</div>
+            <mat-card-content class="margin-left-s" *ngIf="designation && designation.length === 0">
+              <div>No career history</div>
             </mat-card-content>
           </div>
         </div>
@@ -181,7 +180,7 @@
                 <div class="mat-body-2 flex-1 mobile-margin">{{academicsData.nameOfInstitute}}</div>
               </mat-card>
             </mat-card-content>
-            <mat-card-content *ngIf="academics && academics.length === 0">
+            <mat-card-content class="margin-left-s" *ngIf="academics && academics.length === 0">
               <div>No academics</div>
             </mat-card-content>
           </div>
@@ -201,8 +200,8 @@
                 </div>
               </mat-card>
             </mat-card-content>
-            <mat-card-content *ngIf="hobbies && hobbies.length === 0">
-              <div>No academics</div>
+            <mat-card-content class="margin-left-s" *ngIf="hobbies && hobbies.length === 0">
+              <div>No hobbies</div>
             </mat-card-content>
           </div>
         </div>

From 8f05aa78cc9178d267a60ac13277331b24dddd0c Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Thu, 6 Jul 2023 11:58:33 +0530
Subject: [PATCH 149/887] Updated cssfor left menu

---
 src/styles/utility.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/styles/utility.scss b/src/styles/utility.scss
index d10a73f06..7e42272f7 100644
--- a/src/styles/utility.scss
+++ b/src/styles/utility.scss
@@ -560,3 +560,7 @@
   background-color: darkgrey;
   opacity: 0.8 !important;
 }
+
+.mat-list-base {
+  margin-bottom: 0.6em !important;
+}
\ No newline at end of file

From bd9868ab35cc71faae101c7f65d1ba89b34948c2 Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Thu, 6 Jul 2023 13:02:13 +0530
Subject: [PATCH 150/887] Fixed new requests count issue

---
 .../blended-approvals.component.ts            | 52 ++++++++++---------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
index 36ac7dcba..ef8e1698a 100644
--- a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
@@ -66,39 +66,41 @@ export class BlendedApprovalsComponent implements OnInit {
       if (res && res.result.content) {
         const resultList = res.result.content
         resultList.forEach((val: any) => {
+          val.batchesCount = 0
+          val.newrequests = 0
           if (val.batches) {
-            val.batchesCount = val.batches.length
-            // val.learners = 0
-            // val.newrequests = 0
-
+            // val.batchesCount = val.batches.length
             const today = moment(new Date())
+            const allowedBatchList: any[] = []
+            const bIds: any[] = []
             val.batches.forEach((b: any) => {
               const allowedBatch = today.isSameOrBefore(moment(b.endDate || new Date()), 'day')
               if (allowedBatch) {
-                this.bIDs.push(b.batchId)
+                allowedBatchList.push(b)
               }
             })
-            if (this.bIDs && this.bIDs.length > 0) {
-              const request = {
-                serviceName: 'blendedprogram',
-                applicationStatus: 'SEND_FOR_MDO_APPROVAL',
-                applicationIds: this.bIDs,
-                limit: 100,
-                offset: 0,
-                deptName: this.userProfile.channel,
-              }
-              this.bpService.getRequests(request).subscribe((resnew: any) => {
-                if (resnew) {
-                  val.newrequests = resnew.result.data.length
+            val.batchesCount = allowedBatchList.length
+
+            allowedBatchList.forEach((ab: any) => {
+              bIds.push(ab.batchId)
+              if (bIds.length === allowedBatchList.length) {
+                const request = {
+                  serviceName: 'blendedprogram',
+                  applicationStatus: 'SEND_FOR_MDO_APPROVAL',
+                  applicationIds: bIds,
+                  limit: 100,
+                  offset: 0,
+                  deptName: this.userProfile.channel,
                 }
-              })
-            } else {
-              val.newrequests = 0
-            }
-          } else {
-            val.batchesCount = 0
-            // val.learners = 0
-            val.newrequests = 0
+                this.bpService.getRequests(request).subscribe((resnew: any) => {
+                  if (resnew) {
+                    val.newrequests = resnew.result.data.length
+                  }
+                })
+              } else {
+                val.newrequests = 0
+              }
+            })
           }
         })
         this.data = resultList

From bf554e912f46fe70774f13997a3677e44ede45d7 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Thu, 13 Jul 2023 18:37:41 +0530
Subject: [PATCH 151/887] MDO admin can create and update user with PUBLIC role
 only

---
 .../create-user/create-user.component.ts      | 19 ++++++++++++++++---
 .../routes/view-user/view-user.component.ts   | 19 ++++++++++++++++---
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
index 1fe48a9b6..c9603d019 100644
--- a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
@@ -43,6 +43,7 @@ export class CreateUserComponent implements OnInit, OnDestroy {
   disableCreateButton = false
   displayLoader = false
   emailLengthVal = false
+  isMdoAdmin = false
 
   @HostListener('window:scroll', ['$event'])
   handleScroll() {
@@ -90,13 +91,25 @@ export class CreateUserComponent implements OnInit, OnDestroy {
         this.departmentName = fullProfile ? fullProfile.unMappedUser.channel : ''
         const orgLst = _.get(this.activeRoute.snapshot, 'data.rolesList.data.orgTypeList')
 
+        if (this.configService.unMappedUser && this.configService.unMappedUser.roles) {
+          this.isMdoAdmin = this.configService.unMappedUser.roles.includes('MDO_ADMIN')
+        }
+
         // new code
         for (let i = 0; i < orgLst.length; i += 1) {
           if (orgLst[i].name === 'MDO') {
             _.each(orgLst[i].roles, rolesObject => {
-              this.uniqueRoles.push({
-                roleName: rolesObject, description: rolesObject,
-              })
+              if (this.isMdoAdmin) {
+                if (rolesObject === 'PUBLIC') {
+                  this.uniqueRoles.push({
+                    roleName: rolesObject, description: rolesObject,
+                  })
+                }
+              } else {
+                this.uniqueRoles.push({
+                  roleName: rolesObject, description: rolesObject,
+                })
+              }
             })
           }
         }
diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
index 83d2e2c30..6b214d637 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
@@ -46,6 +46,7 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
   qpParam: any
   qpPath: any
   breadcrumbs: any
+  isMdoAdmin = false
 
   @HostListener('window:scroll', ['$event'])
   handleScroll() {
@@ -89,13 +90,25 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
         this.departmentName = fullProfile ? fullProfile.unMappedUser.channel : ''
         const orgLst = _.get(this.activeRoute.snapshot, 'data.rolesList.data.orgTypeList')
 
+        if (fullProfile.unMappedUser && fullProfile.unMappedUser.roles) {
+          this.isMdoAdmin = fullProfile.unMappedUser.roles.includes('MDO_ADMIN')
+        }
+
         // New code for roles
         for (let i = 0; i < orgLst.length; i += 1) {
           if (orgLst[i].name === 'MDO') {
             _.each(orgLst[i].roles, rolesObject => {
-              this.uniqueRoles.push({
-                roleName: rolesObject, description: rolesObject,
-              })
+              if (this.isMdoAdmin) {
+                if (rolesObject === 'PUBLIC') {
+                  this.uniqueRoles.push({
+                    roleName: rolesObject, description: rolesObject,
+                  })
+                }
+              } else {
+                this.uniqueRoles.push({
+                  roleName: rolesObject, description: rolesObject,
+                })
+              }
             })
           }
         }

From 7412e498a86e7420121443f5928acb0b7e052d86 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Fri, 14 Jul 2023 18:31:13 +0530
Subject: [PATCH 152/887] Show edit user link conditionaly for MDO admin role

---
 .../routes/users-view/users-view.component.html    |  2 +-
 .../home/routes/users-view/users-view.component.ts | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index 1e3254b7c..be27c95dd 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -36,7 +36,7 @@
       <ng-container *ngIf="usersData && currentFilter !== 'upload'">
         <ws-widget-org-user-table [userId]="currentUser" [tableData]="tabledata" [data]="dataForTable" [isUpload]=false
           [isCreate]=true [isDownload]=true [isConsumptionReport]=true (eOnButtonClick)="clickHandler($event)"
-          (actionsClick)="menuActions($event)" (searchByEnterKey)="onEnterkySearch($event)">
+          (actionsClick)="menuActions($event)" (searchByEnterKey)="onEnterkySearch($event)" [showEditOnCondition]=true>
         </ws-widget-org-user-table>
         <!-- <ws-widget-org-user-table [tableData]="tabledata" [data]="dataForTable" [isUpload]=true [isCreate]=true
           (eOnButtonClick)="clickHandler($event)" (eOnRowClick)="onRoleClick($event)" (actionsClick)="menuActions($event)"
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index e4af2bef4..74702b714 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -47,6 +47,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   activeUsersData!: any[]
   inactiveUsersData!: any[]
   content: NsContent.IContent = {} as NsContent.IContent
+  isMdoAdmin = false
 
   tabledata: ITableData = {
     actions: [],
@@ -94,6 +95,9 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   }
   ngOnInit() {
     this.currentFilter = this.route.snapshot.params['tab'] || 'active'
+    if (this.configSvc.unMappedUser && this.configSvc.unMappedUser.roles) {
+      this.isMdoAdmin = this.configSvc.unMappedUser.roles.includes('MDO_ADMIN')
+    }
     this.getAllUsers()
   }
 
@@ -149,6 +153,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
           roles: _.join(_.map((org.roles || []), i => `<li>${i}</li>`), ''),
           orgId: user.rootOrgId,
           orgName: user.rootOrgName,
+          allowEditUser: this.showEditUser(org.roles)
         })
       })
     }
@@ -173,12 +178,21 @@ export class UsersViewComponent implements OnInit, OnDestroy {
           roles: _.join(_.map((org.roles || []), i => `<li>${i}</li>`), ''),
           orgId: user.rootOrgId,
           orgName: user.rootOrgName,
+          allowEditUser: this.showEditUser(org.roles)
         })
       })
     }
     return inactiveUsersData
   }
 
+  showEditUser(roles: any): boolean {
+    if (this.isMdoAdmin) {
+      return (roles.includes('PUBLIC') && roles.length === 1)
+    } else {
+      return true
+    }
+  }
+
   blockedUsers() {
     const blockedUsersData: any[] = []
     if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {

From 0ed70e4dbd72bae226e9704aa0fc4031774de316 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Mon, 17 Jul 2023 14:30:51 +0530
Subject: [PATCH 153/887] changes screen size

---
 .../components/users-upload/users-upload.component.scss   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
index 0b431e1e3..b59245733 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
@@ -15,8 +15,8 @@ table {
   .table-container{
       position: relative;
       width: 100%;
-      @media screen and (max-width: 1024px) {
-         overflow-x: scroll;
+      @media screen and (max-width: 1440px) {
+         overflow-x: auto;
       }
   }
 
@@ -39,9 +39,9 @@ table {
     justify-content: center;
   }
 
-   @media screen and (max-width: 1024px) {
+   @media screen and (max-width: 1440px) {
     #upload-data-box {
-      overflow-x: scroll;
+      overflow-x: auto;
     }
   }
 

From 1c1e6e01c89889fa4fd95f2838912863155ba6af Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Mon, 17 Jul 2023 16:07:21 +0530
Subject: [PATCH 154/887] table scroll issue fix

---
 .../users-upload/users-upload.component.html  |  2 +-
 .../users-upload/users-upload.component.scss  | 21 +++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
index 234b59b77..c57cb0d01 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
@@ -41,7 +41,7 @@ <h2 class="w-full contacts-head">File uploads</h2>
       <mat-spinner></mat-spinner>
     </div>
     <!-- <div *ngIf="bulkUploadData && bulkUploadData.length"> -->
-    <div [hidden]="!bulkUploadData || (bulkUploadData && !bulkUploadData.length) || fetching">
+    <div [hidden]="!bulkUploadData || (bulkUploadData && !bulkUploadData.length) || fetching" class="table-main-box">
       <div class=" mx-5 my-5 table-container">
         <!-- <div class="pt-2 "> -->
         <!-- <div class=" m-5 flex items-end justify-end">
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
index b59245733..0ab2c1ce4 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
@@ -12,12 +12,15 @@ table {
     padding: 0px 12px!important;
   }
 
-  .table-container{
+
+
+  .table-main-box, .table-container{
       position: relative;
       width: 100%;
-      @media screen and (max-width: 1440px) {
-         overflow-x: auto;
-      }
+      overflow-x: auto;
+      // @media screen and (max-width: 1440px) {
+      //    overflow-x: auto;
+      // }
   }
 
   .text-span {
@@ -39,11 +42,11 @@ table {
     justify-content: center;
   }
 
-   @media screen and (max-width: 1440px) {
-    #upload-data-box {
-      overflow-x: auto;
-    }
-  }
+  //  @media screen and (max-width: 1440px) {
+  //   #upload-data-box {
+  //     overflow-x: auto;
+  //   }
+  // }
 
 .download-btn {
     min-width: 112px;

From 207bd2f302894fbbd0e145097bf85a14cae25e17 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Mon, 17 Jul 2023 18:06:08 +0530
Subject: [PATCH 155/887] updated the collection package & work allocation
 table pagination

---
 package.json                                                  | 2 +-
 .../work-allocation-list/table.component.ts                   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 710f94c27..5e832b006 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@angular/router": "~8.2.1",
     "@angular/service-worker": "~8.2.1",
     "@project-sunbird/telemetry-sdk": "0.0.26",
-    "@sunbird-cb/collection": "^1.0.24",
+    "@sunbird-cb/collection": "^1.0.25",
     "@sunbird-cb/design-system": "0.0.1",
     "@sunbird-cb/rain-dashboards": "^0.4.14",
     "@sunbird-cb/resolver": "^1.0.0",
diff --git a/project/ws/app/src/lib/head/work-allocation-table/work-allocation-list/table.component.ts b/project/ws/app/src/lib/head/work-allocation-table/work-allocation-list/table.component.ts
index 6bf8f2777..1468dc197 100644
--- a/project/ws/app/src/lib/head/work-allocation-table/work-allocation-list/table.component.ts
+++ b/project/ws/app/src/lib/head/work-allocation-table/work-allocation-list/table.component.ts
@@ -41,8 +41,8 @@ export class WorkAllocationTableComponent implements OnInit, OnChanges {
   length!: number
   departmentRole!: string
   departmentId!: string | undefined
-  pageSize = 10
-  pageSizeOptions = [10, 20]
+  pageSize = 20
+  pageSizeOptions = [20, 30]
   config: ExportAsConfig = {
     type: 'pdf',
     elementIdOrContent: 'downloadtemplate',

From c35bd4366d7eaca69e960fe043d3ed65269a573b Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Mon, 17 Jul 2023 18:15:54 +0530
Subject: [PATCH 156/887] table changes

---
 .../users-upload/users-upload.component.html  | 81 ++++++++++++-------
 .../users-upload/users-upload.component.scss  | 37 ++++++---
 .../users-upload/users-upload.component.ts    |  4 +-
 3 files changed, 79 insertions(+), 43 deletions(-)

diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
index c57cb0d01..642affa21 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
@@ -42,85 +42,99 @@ <h2 class="w-full contacts-head">File uploads</h2>
     </div>
     <!-- <div *ngIf="bulkUploadData && bulkUploadData.length"> -->
     <div [hidden]="!bulkUploadData || (bulkUploadData && !bulkUploadData.length) || fetching" class="table-main-box">
-      <div class=" mx-5 my-5 table-container">
+      <div class="mx-5 my-5 table-container">
         <!-- <div class="pt-2 "> -->
         <!-- <div class=" m-5 flex items-end justify-end">
           <button mat-raised-button color="primary" class="self-end" i18n (click)="refreshTable()">
             <ng-container i18n>Refresh</ng-container>
           </button>
         </div> -->
+
         <mat-table mat-table [dataSource]="dataSource" matSort [matSortActive]="tabledata?.sortColumn"
-          [matSortDirection]="tabledata?.sortState" id="upload-data-box">
+          [matSortDirection]="tabledata?.sortState" id="upload-data-box" class="example-table table1 responsiveTable">
 
           <!-- ID Column -->
-          <ng-container matColumnDef="identifier">
-            <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Id
-            </th>
-            <td mat-cell *matCellDef="let row"> {{row.identifier}} </td>
-            <!-- <mat-header-cell *matHeaderCellDef mat-sort-header> Id </mat-header-cell>
-              <mat-cell *matCellDef="let row"> {{row.identifier}} </mat-cell> -->
-          </ng-container>
+          <!-- <ng-container matColumnDef="identifier">
+            <mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Id
+            </mat-header-cell>
+            <mat-cell *matCellDef="let row"> {{row.identifier}} </mat-cell>
+          </ng-container> -->
 
 
           <!-- Name Column -->
           <ng-container matColumnDef="fileName">
-            <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Name
-            </th>
-            <td mat-cell *matCellDef="let row">
-              <!-- <a href="{{row.filePath}}" download="{{row.fileName}}"> {{row.fileName}}</a> -->
+            <mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Name
+            </mat-header-cell>
+            <mat-cell *matCellDef="let row">
               <span class="cursor-pointer text-span ws-mat-accent-text" (click)="downloadFullFile(row)">
                 {{row.fileName}}</span>
-            </td>
+            </mat-cell>
           </ng-container>
 
           <!-- status Column -->
           <ng-container matColumnDef="status">
-            <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Status
-            </th>
-            <td mat-cell *matCellDef="let row"> {{row.status}} </td>
+            <mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Status
+            </mat-header-cell>
+            <mat-cell *matCellDef="let row"> {{row.status}} </mat-cell>
           </ng-container>
 
           <!-- Failed Record Count Column -->
           <ng-container matColumnDef="failedRecordsCount">
-            <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Failed
+            <mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell coloum-size">
+              Failed
               Records
               on
-            </th>
-            <td mat-cell *matCellDef="let row"> {{row.failedRecordsCount}} </td>
+            </mat-header-cell>
+            <mat-cell *matCellDef="let row"> {{row.failedRecordsCount}} </mat-cell>
           </ng-container>
 
           <!-- Success Records COunt Column -->
           <ng-container matColumnDef="successfulRecordsCount">
-            <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Success
+            <mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell  coloum-size">
+              Success
               Records
               on
-            </th>
-            <td mat-cell *matCellDef="let row"> {{row.successfulRecordsCount }} </td>
+            </mat-header-cell>
+            <mat-cell *matCellDef="let row"> {{row.successfulRecordsCount}} </mat-cell>
           </ng-container>
 
           <!-- Total Records COunt Column -->
           <ng-container matColumnDef="totalRecords">
-            <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Total
+            <!-- <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Total
               Records
               on
             </th>
-            <td mat-cell *matCellDef="let row"> {{row.totalRecords }} </td>
+            <td mat-cell *matCellDef="let row"> {{row.totalRecords }} </td> -->
+            <mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell  coloum-size">
+              Total
+              Records
+              on
+            </mat-header-cell>
+            <mat-cell *matCellDef="let row"> {{row.totalRecords}} </mat-cell>
           </ng-container>
 
           <!-- status Column -->
           <ng-container matColumnDef="dateCreatedOn">
-            <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Created
+            <!-- <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Created
               on
             </th>
-            <td mat-cell *matCellDef="let row"> {{row.dateCreatedOn | date:'dd MMM yyy h:mm a' }} </td>
+            <td mat-cell *matCellDef="let row"> {{row.dateCreatedOn | date:'dd MMM yyy h:mm a' }} </td> -->
+            <mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Created
+              on
+            </mat-header-cell>
+            <mat-cell *matCellDef="let row"> {{row.dateCreatedOn | date:'dd MMM yyy h:mm a' }} </mat-cell>
           </ng-container>
 
           <!-- status Column -->
           <ng-container matColumnDef="dateUpdatedOn">
-            <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Updated
+            <!-- <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Updated
               on
             </th>
-            <td mat-cell *matCellDef="let row"> {{row.dateUpdatedOn | date:'dd MMM yyy h:mm a' }} </td>
+            <td mat-cell *matCellDef="let row"> {{row.dateUpdatedOn | date:'dd MMM yyy h:mm a' }} </td> -->
+            <mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Updated
+              on
+            </mat-header-cell>
+            <mat-cell *matCellDef="let row"> {{row.dateUpdatedOn | date:'dd MMM yyy h:mm a' }} </mat-cell>
           </ng-container>
 
           <!-- report Column -->
@@ -134,8 +148,13 @@ <h2 class="w-full contacts-head">File uploads</h2>
                   </td>
                 </ng-container> -->
 
-          <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-          <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
+          <!-- <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+          <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr> -->
+
+          <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
+
+          <mat-row *matRowDef="let row; columns: displayedColumns;">
+          </mat-row>
 
           <!-- Row shown when there is no matching data. -->
           <tr class="mat-row" *matNoDataRow>
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
index 0ab2c1ce4..bb2c42d4a 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
@@ -1,6 +1,9 @@
 table {
     width: 100%;
   }
+  .mat-table {
+  overflow: auto;
+}
 
   .mat-form-field {
     font-size: 14px;
@@ -12,20 +15,34 @@ table {
     padding: 0px 12px!important;
   }
 
+.mat-row {
+  height: auto;
+}
+
+  .mat-cell {
+  // width: 25%;
+  padding: 0px 12px!important;
+  font-size: 14px !important;
+  }
 
+  .mat-header-cell {
+      font-size: 14px;
+    line-height: 1.1;
+    font-weight: 600;
+}
 
   .table-main-box, .table-container{
       position: relative;
       width: 100%;
       overflow-x: auto;
-      // @media screen and (max-width: 1440px) {
-      //    overflow-x: auto;
-      // }
+      @media screen and (max-width: 1440px) {
+         overflow-x: auto;
+      }
   }
 
   .text-span {
     word-break: break-all!important;
-    min-width: 180px!important;
+    // min-width: 180px!important;
     display: block;
   }
 
@@ -42,11 +59,11 @@ table {
     justify-content: center;
   }
 
-  //  @media screen and (max-width: 1440px) {
-  //   #upload-data-box {
-  //     overflow-x: auto;
-  //   }
-  // }
+   @media screen and (max-width: 1440px) {
+    #upload-data-box {
+      overflow-x: auto;
+    }
+  }
 
 .download-btn {
     min-width: 112px;
@@ -64,4 +81,4 @@ table {
 
 .upload-btn:disabled {
     opacity: 0.7;
-}
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
index 9c350951c..2cf9581c3 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
@@ -30,11 +30,11 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
   uplaodSuccessMsg!: string
   dataSource: MatTableDataSource<any>
   // tslint:disable-next-line:max-line-length
-  displayedColumns: string[] = ['identifier', 'fileName', 'status', 'failedRecordsCount', 'successfulRecordsCount', 'totalRecords', 'dateCreatedOn', 'dateUpdatedOn']
+  displayedColumns: string[] = ['fileName', 'status', 'failedRecordsCount', 'successfulRecordsCount', 'totalRecords', 'dateCreatedOn', 'dateUpdatedOn']
   tabledata: any = {
     actions: [],
     columns: [
-      { displayName: 'Id', key: 'identifier' },
+      // { displayName: 'Id', key: 'identifier' },
       { displayName: 'Name', key: 'fileName' },
       { displayName: 'Status', key: 'status' },
       { displayName: 'Failed Records', key: 'failedRecordsCount' },

From 0bff70a7cd2c817bfd267779e5f006f0cc9abd80 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Tue, 18 Jul 2023 16:05:51 +0530
Subject: [PATCH 157/887] fixed the events table height

---
 .../components/event-list-view/event-list-view.component.html | 4 ++--
 .../components/event-list-view/event-list-view.component.scss | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.html b/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.html
index 7d00ee514..bd3262751 100644
--- a/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.html
+++ b/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.html
@@ -3,7 +3,7 @@
     <div class="example-table-container">
         <div class="container-balanced">
             <div class="flex flex-1 custom">
-                <div class="flex-3">
+                <div class="flex-2">
                     <div class="search">
                         <div class=rsearch>
                             <mat-icon class="color-60 search-icon">search</mat-icon>
@@ -12,7 +12,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="flex-1 right-align">
+                <div class="flex-2 right-align">
                     <button type="button" mat-button class="create-btn" *ngIf="isCreate" (click)="onCreateClick()">
                         Create new
                     </button>
diff --git a/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.scss b/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.scss
index 517c4c599..ffddec722 100644
--- a/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.scss
+++ b/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.scss
@@ -684,7 +684,6 @@ mat-header-row{
 
 .container-balanced{
   max-width: 99%;
-  min-height: 85vh;
   margin-left: auto!important;
   margin-right: auto!important;
 }
@@ -767,4 +766,4 @@ mat-header-row{
   top: 19px;
   font-size: 20px;
   left: 10px;
-}
\ No newline at end of file
+}

From a049b94fb2288eb3d86538f8bacdb5a69486b702 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Wed, 19 Jul 2023 12:31:10 +0530
Subject: [PATCH 158/887] file upload table-responsive fixes

---
 .../home/routes/home/home.component.scss      |   8 +-
 .../users-upload/users-upload.component.html  |  18 +-
 .../users-upload/users-upload.component.scss  | 160 ++++++++++++------
 3 files changed, 121 insertions(+), 65 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/home/home.component.scss b/project/ws/app/src/lib/routes/home/routes/home/home.component.scss
index fb1dbbdab..106cea1a8 100644
--- a/project/ws/app/src/lib/routes/home/routes/home/home.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/home/home.component.scss
@@ -21,9 +21,9 @@
 
 .left-nav {
   min-width: 240px;
-  overflow: hidden!important;
+  overflow: hidden !important;
   box-sizing: border-box;
-  height: 85vh;
+  height: 100vh;
   // max-width: 240px;
 
   // ::ng-deep.mat-drawer-inner-container {
@@ -94,5 +94,7 @@
   left: 0;
   right: 0;
   min-height: calc(100vh - 115px);
-}
+  // height: calc(100vh - 115px);
+  // padding-bottom: 50px;
 
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
index 642affa21..e613a4f90 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
@@ -63,7 +63,8 @@ <h2 class="w-full contacts-head">File uploads</h2>
 
           <!-- Name Column -->
           <ng-container matColumnDef="fileName">
-            <mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Name
+            <mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell fileName">
+              Name
             </mat-header-cell>
             <mat-cell *matCellDef="let row">
               <span class="cursor-pointer text-span ws-mat-accent-text" (click)="downloadFullFile(row)">
@@ -73,7 +74,8 @@ <h2 class="w-full contacts-head">File uploads</h2>
 
           <!-- status Column -->
           <ng-container matColumnDef="status">
-            <mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Status
+            <mat-header-cell *matHeaderCellDef mat-sort-header
+              class="ws-mat-black60-text mat-header-cell coloum-size-staus"> Status
             </mat-header-cell>
             <mat-cell *matCellDef="let row"> {{row.status}} </mat-cell>
           </ng-container>
@@ -83,17 +85,15 @@ <h2 class="w-full contacts-head">File uploads</h2>
             <mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell coloum-size">
               Failed
               Records
-              on
             </mat-header-cell>
             <mat-cell *matCellDef="let row"> {{row.failedRecordsCount}} </mat-cell>
           </ng-container>
 
           <!-- Success Records COunt Column -->
           <ng-container matColumnDef="successfulRecordsCount">
-            <mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell  coloum-size">
+            <mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell coloum-size">
               Success
               Records
-              on
             </mat-header-cell>
             <mat-cell *matCellDef="let row"> {{row.successfulRecordsCount}} </mat-cell>
           </ng-container>
@@ -108,7 +108,6 @@ <h2 class="w-full contacts-head">File uploads</h2>
             <mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell  coloum-size">
               Total
               Records
-              on
             </mat-header-cell>
             <mat-cell *matCellDef="let row"> {{row.totalRecords}} </mat-cell>
           </ng-container>
@@ -134,7 +133,10 @@ <h2 class="w-full contacts-head">File uploads</h2>
             <mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Updated
               on
             </mat-header-cell>
-            <mat-cell *matCellDef="let row"> {{row.dateUpdatedOn | date:'dd MMM yyy h:mm a' }} </mat-cell>
+            <mat-cell *matCellDef="let row">
+              <span class="text-span">{{row.dateUpdatedOn | date:'dd MMM yyy h:mm a' }}</span>
+            </mat-cell>
+            <!-- <mat-cell *matCellDef="let row"> {{row.dateUpdatedOn | date:'dd MMM yyy h:mm a' }} </mat-cell> -->
           </ng-container>
 
           <!-- report Column -->
@@ -163,7 +165,7 @@ <h2 class="w-full contacts-head">File uploads</h2>
 
         </mat-table>
 
-        <mat-paginator [pageSize]="10" [pageSizeOptions]="[5, 10, 25, 100]"></mat-paginator>
+        <mat-paginator [pageSize]="5" [pageSizeOptions]="[5, 10, 25, 100]"></mat-paginator>
         <!-- </div> -->
       </div>
     </div>
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
index bb2c42d4a..c4c275b08 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
@@ -1,84 +1,136 @@
 table {
-    width: 100%;
-  }
-  .mat-table {
-  overflow: auto;
+  width: 100%;
 }
 
-  .mat-form-field {
-    font-size: 14px;
-    width: 100%;
-  }
+.mat-table {
+  width: 100%;
+  // overflow: auto;
+  // max-height: 400px;
+}
 
-  td, th {
-    width: 25%;
-    padding: 0px 12px!important;
-  }
+.mat-form-field {
+  font-size: 14px;
+  width: 100%;
+}
+
+td,
+th {
+  width: 25%;
+  padding: 0px 12px !important;
+}
 
 .mat-row {
   height: auto;
 }
 
-  .mat-cell {
+.mat-cell {
   // width: 25%;
-  padding: 0px 12px!important;
+  padding: 0px 10px !important;
   font-size: 14px !important;
-  }
+}
+
+.mat-header-row {
+  background-color: #f5f5f5 !important;
+}
 
-  .mat-header-cell {
-      font-size: 14px;
-    line-height: 1.1;
-    font-weight: 600;
+.mat-header-cell {
+  font-size: 14px;
+  line-height: 1.1;
+  font-weight: 600;
+  background-color: #f5f5f5;
+  padding: 0px 10px;
+  justify-content: center;
 }
 
-  .table-main-box, .table-container{
-      position: relative;
-      width: 100%;
-      overflow-x: auto;
-      @media screen and (max-width: 1440px) {
-         overflow-x: auto;
-      }
+.table-main-box,
+.table-container {
+  position: relative;
+  width: 100%;
+  // overflow-x: auto;
+  // min-height: 750px;
+  // max-height: 750px;
+
+  @media screen and (max-width: 1440px) {
+    // overflow-x: auto;
   }
+}
 
+@media screen and (min-width: 1024px) {
   .text-span {
-    word-break: break-all!important;
-    // min-width: 180px!important;
-    display: block;
+    word-break: none;
   }
+}
 
-  .example-loading-shade {
-    position: absolute;
-    top: 0;
-    left: 0;
-    bottom: 0px;
-    right: 0;
-    background: rgba(0, 0, 0, 0.15);
-    z-index: 1;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
+.text-span {
+  word-break: break-all !important;
+  // min-width: 180px!important;
+  display: block;
+}
+
+.example-loading-shade {
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0px;
+  right: 0;
+  background: rgba(0, 0, 0, 0.15);
+  z-index: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
 
-   @media screen and (max-width: 1440px) {
-    #upload-data-box {
-      overflow-x: auto;
-    }
+@media screen and (max-width: 1440px) {
+  #upload-data-box {
+    overflow-x: auto;
   }
+}
 
 .download-btn {
-    min-width: 112px;
-    width: auto;
-    border: 1px solid #0075B7;
-    border-radius: 4px;
-    color: #0075B7 !important;
+  min-width: 112px;
+  width: auto;
+  border: 1px solid #0075B7;
+  border-radius: 4px;
+  color: #0075B7 !important;
 }
 
 .upload-btn {
-    width: auto;
-    background: #0075B7 !important;
-    color: white !important;
+  width: auto;
+  background: #0075B7 !important;
+  color: white !important;
 }
 
 .upload-btn:disabled {
-    opacity: 0.7;
+  opacity: 0.7;
+}
+
+.fileName {
+  justify-content: flex-start !important;
+}
+
+.mat-column-fileName {
+  width: 30% !important;
+  max-width: 30%;
+}
+
+.mat-column-status {
+  width: 12% !important;
+  max-width: 13%;
+  justify-content: center;
+}
+
+.mat-column-failedRecordsCount,
+.mat-column-successfulRecordsCount,
+.mat-column-totalRecords {
+  width: 10% !important;
+  max-width: 9%;
+  justify-content: center;
+}
+
+.mat-column-dateCreatedOn,
+.mat-column-dateUpdatedOn {
+  width: 100px !important;
+  min-width: 100px !important;
+  max-width: 14%;
+  justify-content: center;
 }
\ No newline at end of file

From c89ef534671808c8f5b715d7504d7d83a9163fd4 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Wed, 19 Jul 2023 12:44:05 +0530
Subject: [PATCH 159/887] text alignment fixes

---
 .../users-upload/users-upload.component.html     | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
index e613a4f90..1049d77c5 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
@@ -32,11 +32,23 @@
       </div>
     </mat-card>
   </div>
+
+  <div class="flex flex-row fle-wrap w-full">
+    <div class="flex-1 inline-flex items-end justify-flex-start">
+      <h2 class="contacts-head">File uploads</h2>
+    </div>
+    <div class="flex-1 inline-flex items-end justify-end">
+      <div class="mb-4 ws-mat-black60-text">
+        Need help? contact us <a class="mat-accent" target="_blank" href="{{contactUsUrl}}">here</a>
+      </div>
+    </div>
+  </div>
+
   <div class="w-full relative">
-    <h2 class="w-full contacts-head">File uploads</h2>
+    <!-- <h2 class="w-full contacts-head">File uploads</h2>
     <div class="mb-4 ws-mat-black60-text">
       Need help? contact us <a class="mat-accent" target="_blank" href="{{contactUsUrl}}">here</a>
-    </div>
+    </div> -->
     <div class="example-loading w-full text-center" *ngIf="fetching">
       <mat-spinner></mat-spinner>
     </div>

From 22942da870bb5be2f17d8b72bb99a32062be81c1 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Wed, 19 Jul 2023 18:10:03 +0530
Subject: [PATCH 160/887] Fixing lint errors

---
 .../routes/home/routes/users-view/users-view.component.ts  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 74702b714..e14ae6105 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -153,7 +153,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
           roles: _.join(_.map((org.roles || []), i => `<li>${i}</li>`), ''),
           orgId: user.rootOrgId,
           orgName: user.rootOrgName,
-          allowEditUser: this.showEditUser(org.roles)
+          allowEditUser: this.showEditUser(org.roles),
         })
       })
     }
@@ -178,7 +178,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
           roles: _.join(_.map((org.roles || []), i => `<li>${i}</li>`), ''),
           orgId: user.rootOrgId,
           orgName: user.rootOrgName,
-          allowEditUser: this.showEditUser(org.roles)
+          allowEditUser: this.showEditUser(org.roles),
         })
       })
     }
@@ -188,9 +188,8 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   showEditUser(roles: any): boolean {
     if (this.isMdoAdmin) {
       return (roles.includes('PUBLIC') && roles.length === 1)
-    } else {
-      return true
     }
+    return true
   }
 
   blockedUsers() {

From a67e29e08351cefe73e5c6c21c4bdfe5ea5d8317 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Tue, 25 Jul 2023 11:57:41 +0530
Subject: [PATCH 161/887] sprint 5 changes

---
 .../ws/app/src/lib/routes/home/home.module.ts |   2 +
 .../lib/routes/home/home.rounting.module.ts   |   9 +
 .../routes/approvals/approvals.component.ts   |   2 +
 .../reports-section.component.html            |  22 +++
 .../reports-section.component.scss            |   9 +
 .../reports-section.component.ts              |  77 +++++++++
 .../users-view/users-view.component.html      |   4 +-
 .../routes/users-view/users-view.component.ts |  80 ---------
 .../home/services/download-report.service.ts  |  16 ++
 .../users-upload/users-upload.component.html  | 159 ++++--------------
 .../users-upload/users-upload.component.scss  | 105 +++++++-----
 .../users-upload/users-upload.component.ts    | 124 +++++++-------
 .../routes/users/services/upload.service.ts   |   4 +-
 .../app/src/lib/routes/users/users.module.ts  |   7 +-
 14 files changed, 301 insertions(+), 319 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html
 create mode 100644 project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.scss
 create mode 100644 project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
 create mode 100644 project/ws/app/src/lib/routes/home/services/download-report.service.ts

diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index dfb6ab680..53d8265a9 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -61,6 +61,7 @@ import { UploadService } from './services/upload.service'
 import { AdmintableComponent } from './components/admintable/admintable.component'
 import { UsersModule } from '../users/users.module'
 import { BlendedApprovalsComponent } from './routes/blended-approvals/blended-approvals.component'
+import { ReportsSectionComponent } from './routes/reports-section/reports-section.component'
 @NgModule({
   declarations: [
     HomeComponent,
@@ -83,6 +84,7 @@ import { BlendedApprovalsComponent } from './routes/blended-approvals/blended-ap
     BudgetschemepopupComponent,
     BudgetproofspopupComponent,
     BlendedApprovalsComponent,
+    ReportsSectionComponent,
   ],
   imports: [
     CommonModule,
diff --git a/project/ws/app/src/lib/routes/home/home.rounting.module.ts b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
index d4c6c061f..3ebc801ee 100644
--- a/project/ws/app/src/lib/routes/home/home.rounting.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
@@ -18,6 +18,7 @@ import { BudgetComponent } from './routes/budget/budget.component'
 import { MdoinfoComponent } from './routes/mdoinfo/mdoinfo.component'
 import { PageResolve } from '@sunbird-cb/utils'
 import { BlendedApprovalsComponent } from './routes/blended-approvals/blended-approvals.component'
+import { ReportsSectionComponent } from './routes/reports-section/reports-section.component'
 const routes: Routes = [
   {
     path: '',
@@ -122,6 +123,14 @@ const routes: Routes = [
           module: 'Home',
         },
       },
+      {
+        path: 'reports-section',
+        component: ReportsSectionComponent,
+        data: {
+          pageId: 'reports-section',
+          module: 'Home',
+        },
+      },
     ],
   },
   {
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
index d54c9df5e..5b2ef46ca 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
@@ -29,6 +29,7 @@ export class ApprovalsComponent implements OnInit, OnDestroy {
       { displayName: 'Full Name', key: 'fullname' },
       { displayName: 'Requested on', key: 'requestedon' },
       { displayName: 'Fields', key: 'fields', isList: true },
+      { displayName: 'Tags', key: 'tag', isList: true },
     ],
     needCheckBox: false,
     needHash: false,
@@ -156,6 +157,7 @@ export class ApprovalsComponent implements OnInit, OnDestroy {
           ${currentdate.getSeconds()}`,
             fields: keys.slice(0, -1),
             userWorkflow: approval,
+            tag: (approval.userInfo && approval.userInfo.tag) ? `${approval.userInfo.tag}` : '',
           })
         })
       })
diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html
new file mode 100644
index 000000000..49d0fa65c
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html
@@ -0,0 +1,22 @@
+<div class="flex flex-4 flex-column">
+  <mat-card>
+    <div class="flex-4 mobile-margin text-capitalize mat-h2">Download reports</div>
+    <mat-card-content>
+      <ng-container class="margin-top-l">
+        <div class="flex">
+          <div *ngFor="let item of btnList" class="margin-right-m">
+            <button type="button" mat-button class="upload-btn" (click)="onButtonClick(item.type, $event)">
+              <mat-icon>vertical_align_bottom</mat-icon> {{item.name}}
+            </button>
+          </div>
+          <!-- <button type="button" mat-button class="upload-btn" (click)="onButtonClick('consumptionReport', $event)">
+            <mat-icon>vertical_align_bottom</mat-icon> Consumption Report
+          </button>
+          <button type="button" mat-button class="upload-btn" (click)="onButtonClick('assessmentReport', $event)">
+            <mat-icon>vertical_align_bottom</mat-icon> Assessment Report
+          </button> -->
+        </div>
+      </ng-container>
+    </mat-card-content>
+  </mat-card>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.scss b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.scss
new file mode 100644
index 000000000..59ff6a543
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.scss
@@ -0,0 +1,9 @@
+.upload-btn {
+  //width: 150px;
+  border: 1px solid #DEDEDE;
+  border-radius: 4px;
+  color: #848484 !important;
+  font-family: 'Lato';
+  font-weight: 700;
+  font-size: 14px;
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
new file mode 100644
index 000000000..588c391f7
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
@@ -0,0 +1,77 @@
+import { Component, OnInit } from '@angular/core'
+import { ActivatedRoute } from '@angular/router'
+import { environment } from '../../../../../../../../../src/environments/environment'
+import { MatSnackBar } from '@angular/material'
+import { DownloadReportService } from '../../services/download-report.service'
+
+@Component({
+  selector: 'ws-app-reports-section',
+  templateUrl: './reports-section.component.html',
+  styleUrls: ['./reports-section.component.scss'],
+})
+export class ReportsSectionComponent implements OnInit {
+  configSvc!: any
+  btnList!: any
+  constructor(
+    private activeRouter: ActivatedRoute,
+    private snackBar: MatSnackBar,
+    private downloadService: DownloadReportService
+  ) {
+    this.configSvc = this.activeRouter.parent && this.activeRouter.parent.snapshot.data.configService
+  }
+
+  async ngOnInit() {
+    this.btnList = await this.downloadService.fetchDownloadJson().toPromise().catch(_error => { })
+  }
+
+  onButtonClick(type: any) {
+    switch (type) {
+      case 'downloadUserReport':
+        this.downloadUserList()
+        break
+      case 'consumptionReport':
+        this.downloadConsumptionReport()
+        break
+    }
+  }
+
+  async downloadUserList() {
+    const popup = this.snackBar
+    const fileName = `userReport.xlsx`
+    const downloadUrl = `${environment.domainName}${environment.userBucket}${this.configSvc.userProfile.rootOrgId}/${fileName}`
+    const xhr = new XMLHttpRequest()
+    xhr.onreadystatechange = () => {
+      if (xhr.readyState !== 4) {
+        return
+      }
+      if (xhr.status === 200) {
+        window.location.href = downloadUrl
+      } else {
+        popup.open('Report is not available')
+      }
+    }
+    xhr.open('GET', downloadUrl)
+    xhr.send()
+  }
+
+  downloadConsumptionReport() {
+    const popup = this.snackBar
+    const fileName = `userEnrolmentReport.xlsx`
+    const downloadUrl = `${environment.domainName}${environment.userBucket}${this.configSvc.userProfile.rootOrgId}/${fileName}`
+    // window.location.href = downloadUrl
+    const xhr = new XMLHttpRequest()
+    xhr.onreadystatechange = () => {
+      if (xhr.readyState !== 4) {
+        return
+      }
+      if (xhr.status === 200) {
+        window.location.href = downloadUrl
+      } else {
+        popup.open('Report is not available')
+      }
+    }
+    xhr.open('GET', downloadUrl)
+    xhr.send()
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index 1e3254b7c..0e7fb7e79 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -35,8 +35,8 @@
       </div>
       <ng-container *ngIf="usersData && currentFilter !== 'upload'">
         <ws-widget-org-user-table [userId]="currentUser" [tableData]="tabledata" [data]="dataForTable" [isUpload]=false
-          [isCreate]=true [isDownload]=true [isConsumptionReport]=true (eOnButtonClick)="clickHandler($event)"
-          (actionsClick)="menuActions($event)" (searchByEnterKey)="onEnterkySearch($event)">
+          [isCreate]=true (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuActions($event)"
+          (searchByEnterKey)="onEnterkySearch($event)">
         </ws-widget-org-user-table>
         <!-- <ws-widget-org-user-table [tableData]="tabledata" [data]="dataForTable" [isUpload]=true [isCreate]=true
           (eOnButtonClick)="clickHandler($event)" (eOnRowClick)="onRoleClick($event)" (actionsClick)="menuActions($event)"
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index e4af2bef4..5c527fd19 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -230,12 +230,6 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       case 'upload':
         this.onUploadClick()
         break
-      case 'download':
-        this.downloadUserList()
-        break
-      case 'consumptionReport':
-        this.downloadConsumptionReport()
-        break
     }
   }
 
@@ -251,80 +245,6 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     )
   }
 
-  async downloadUserList() {
-
-    const popup = this.snackBar
-
-    const fileName = `userReport.xlsx`
-
-    const downloadUrl = `${environment.domainName}${environment.userBucket}${this.configSvc.userProfile.rootOrgId}/${fileName}`
-
-    const xhr = new XMLHttpRequest()
-
-    xhr.onreadystatechange = () => {
-
-      if (xhr.readyState !== 4) {
-
-        return
-
-      }
-
-      if (xhr.status === 200) {
-
-        window.location.href = downloadUrl
-
-      } else {
-
-        popup.open('Report is not available')
-
-      }
-
-    }
-
-    xhr.open('GET', downloadUrl)
-
-    xhr.send()
-
-  }
-
-  downloadConsumptionReport() {
-
-    const popup = this.snackBar
-
-    const fileName = `userEnrolmentReport.xlsx`
-
-    const downloadUrl = `${environment.domainName}${environment.userBucket}${this.configSvc.userProfile.rootOrgId}/${fileName}`
-
-    // window.location.href = downloadUrl
-
-    const xhr = new XMLHttpRequest()
-
-    xhr.onreadystatechange = () => {
-
-      if (xhr.readyState !== 4) {
-
-        return
-
-      }
-
-      if (xhr.status === 200) {
-
-        window.location.href = downloadUrl
-
-      } else {
-
-        popup.open('Report is not available')
-
-      }
-
-    }
-
-    xhr.open('GET', downloadUrl)
-
-    xhr.send()
-
-  }
-
   onUploadClick() {
     this.filter('upload')
   }
diff --git a/project/ws/app/src/lib/routes/home/services/download-report.service.ts b/project/ws/app/src/lib/routes/home/services/download-report.service.ts
new file mode 100644
index 000000000..22c337f9c
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/services/download-report.service.ts
@@ -0,0 +1,16 @@
+import { Injectable } from '@angular/core'
+import { HttpClient } from '@angular/common/http'
+import { Observable } from 'rxjs'
+import { ConfigurationsService } from '@sunbird-cb/utils'
+
+@Injectable({
+  providedIn: 'root',
+})
+export class DownloadReportService {
+  baseUrl = this.configSvc.sitePath
+  constructor(private http: HttpClient, private configSvc: ConfigurationsService) { }
+
+  fetchDownloadJson(): Observable<any> {
+    return this.http.get<any>(`${this.baseUrl}/feature/download-report.json`).pipe()
+  }
+}
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
index 234b59b77..379e65ab2 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
@@ -1,153 +1,62 @@
 <div class="flex flex-wrap">
   <div class="flex flex-row fle-wrap w-full">
-    <div class="flex-1 inline-flex items-end justify-end">
-      <!-- <span class="mat-body-1 mr-5 pl-1">Download the sample file</span> -->
-      <button class="download-btn mat-accent-border mat-button mat-button-base" i18n (click)="downloadFile()">
-        <ng-container i18n>Download sample file</ng-container>
-      </button>
-    </div>
+
   </div>
   <div class="flex flex-row fle-wrap w-full">
     <mat-card class="my-5 flex-custom ws-mat-accent-border mat-card w-full">
-      <div>
-        <form [formGroup]="formGroup" #form>
-          <input type="file" class="mb-5" (change)="onFileChange($event)" name="file" placeholder="Choose file"
-            (dblclick)="$event.preventDefault();"
+      <div class="flex flex-row">
+        <form [formGroup]="formGroup" #form class="flex">
+          <button *ngIf="!fileName" type="button" (click)="fileInput.click()" (dblclick)="$event.preventDefault();"
+            class="download-btn mat-accent-border mat-button mat-button-base">Choose File</button>
+          <label class="file-name mr-5" *ngIf="fileName">Selected file : <b>{{fileName}}</b></label>
+          <input hidden type="file" #fileInput class="" (click)="fileClick($event)" (change)="onFileChange($event)"
+            name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();"
             accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel, .xlsx, .xls" />
           <!-- <input type="submit" [disabled]="formGroup.invalid" value="upload" /> -->
           <mat-error *ngIf="showFileError">Only .xlsx or .csv files are accepted</mat-error>
 
-          <div class="mt-5 text-left">
+          <div class="text-left mr-5">
             <div *ngIf="displayLoader | async" class="pr-4 flex items-center justify-center">
               <mat-spinner [diameter]="30"></mat-spinner>
             </div>
-            <button mat-button class="upload-btn mat-button mat-button-base" type="submit" i18n
+            <button mat-button class="upload-btn mat-button mat-button-base mr-5" type="submit" i18n
               [disabled]="formGroup.invalid || (displayLoader | async)" (click)="onSubmit(form)"
-              (dblclick)="$event.preventDefault();">
+              (dblclick)="$event.preventDefault();" *ngIf="fileName">
               <ng-container i18n>Upload</ng-container>
             </button>
           </div>
+          <div class="text-left">
+            <button mat-button class="download-btn mat-accent-border mat-button mat-button-base" type="button" i18n
+              (click)="cancelSelected()" (dblclick)="$event.preventDefault();" *ngIf="fileName">
+              <ng-container i18n>Cancel</ng-container>
+            </button>
+          </div>
 
         </form>
+        <div class="flex-1 inline-flex items-end justify-end">
+          <!-- <span class="mat-body-1 mr-5 pl-1">Download the sample file</span> -->
+          <button class="download-btn mat-accent-border mat-button mat-button-base" i18n (click)="downloadFile()">
+            <ng-container i18n>Download sample file</ng-container>
+          </button>
+        </div>
+      </div>
+      <div class="flex flex-row">
+        <div class="mt-2 ws-mat-black60-text">
+          Need help? contact us <a class="mat-accent" target="_blank" href="{{contactUsUrl}}">here</a>
+        </div>
       </div>
     </mat-card>
   </div>
   <div class="w-full relative">
-    <h2 class="w-full contacts-head">File uploads</h2>
-    <div class="mb-4 ws-mat-black60-text">
-      Need help? contact us <a class="mat-accent" target="_blank" href="{{contactUsUrl}}">here</a>
-    </div>
+    <!-- <h2 class="w-full contacts-head">File uploads</h2> -->
+
     <div class="example-loading w-full text-center" *ngIf="fetching">
       <mat-spinner></mat-spinner>
     </div>
-    <!-- <div *ngIf="bulkUploadData && bulkUploadData.length"> -->
-    <div [hidden]="!bulkUploadData || (bulkUploadData && !bulkUploadData.length) || fetching">
-      <div class=" mx-5 my-5 table-container">
-        <!-- <div class="pt-2 "> -->
-        <!-- <div class=" m-5 flex items-end justify-end">
-          <button mat-raised-button color="primary" class="self-end" i18n (click)="refreshTable()">
-            <ng-container i18n>Refresh</ng-container>
-          </button>
-        </div> -->
-        <mat-table mat-table [dataSource]="dataSource" matSort [matSortActive]="tabledata?.sortColumn"
-          [matSortDirection]="tabledata?.sortState" id="upload-data-box">
-
-          <!-- ID Column -->
-          <ng-container matColumnDef="identifier">
-            <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Id
-            </th>
-            <td mat-cell *matCellDef="let row"> {{row.identifier}} </td>
-            <!-- <mat-header-cell *matHeaderCellDef mat-sort-header> Id </mat-header-cell>
-              <mat-cell *matCellDef="let row"> {{row.identifier}} </mat-cell> -->
-          </ng-container>
-
-
-          <!-- Name Column -->
-          <ng-container matColumnDef="fileName">
-            <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Name
-            </th>
-            <td mat-cell *matCellDef="let row">
-              <!-- <a href="{{row.filePath}}" download="{{row.fileName}}"> {{row.fileName}}</a> -->
-              <span class="cursor-pointer text-span ws-mat-accent-text" (click)="downloadFullFile(row)">
-                {{row.fileName}}</span>
-            </td>
-          </ng-container>
-
-          <!-- status Column -->
-          <ng-container matColumnDef="status">
-            <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Status
-            </th>
-            <td mat-cell *matCellDef="let row"> {{row.status}} </td>
-          </ng-container>
-
-          <!-- Failed Record Count Column -->
-          <ng-container matColumnDef="failedRecordsCount">
-            <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Failed
-              Records
-              on
-            </th>
-            <td mat-cell *matCellDef="let row"> {{row.failedRecordsCount}} </td>
-          </ng-container>
-
-          <!-- Success Records COunt Column -->
-          <ng-container matColumnDef="successfulRecordsCount">
-            <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Success
-              Records
-              on
-            </th>
-            <td mat-cell *matCellDef="let row"> {{row.successfulRecordsCount }} </td>
-          </ng-container>
-
-          <!-- Total Records COunt Column -->
-          <ng-container matColumnDef="totalRecords">
-            <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Total
-              Records
-              on
-            </th>
-            <td mat-cell *matCellDef="let row"> {{row.totalRecords }} </td>
-          </ng-container>
-
-          <!-- status Column -->
-          <ng-container matColumnDef="dateCreatedOn">
-            <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Created
-              on
-            </th>
-            <td mat-cell *matCellDef="let row"> {{row.dateCreatedOn | date:'dd MMM yyy h:mm a' }} </td>
-          </ng-container>
-
-          <!-- status Column -->
-          <ng-container matColumnDef="dateUpdatedOn">
-            <th mat-header-cell *matHeaderCellDef mat-sort-header class="ws-mat-black60-text mat-header-cell"> Updated
-              on
-            </th>
-            <td mat-cell *matCellDef="let row"> {{row.dateUpdatedOn | date:'dd MMM yyy h:mm a' }} </td>
-          </ng-container>
-
-          <!-- report Column -->
-          <!-- <ng-container matColumnDef="report">
-                  <th mat-header-cell *matHeaderCellDef mat-sort-header> report </th>
-                  <td mat-cell *matCellDef="let row">
-                    <button mat-raised-button color="primary" i18n *ngIf="row.status === 'completed'"
-                      (click)="downloadReport(row)">
-                      <ng-container i18n>Download</ng-container>
-                    </button>
-                  </td>
-                </ng-container> -->
-
-          <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-          <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
-
-          <!-- Row shown when there is no matching data. -->
-          <tr class="mat-row" *matNoDataRow>
-            <td class="mat-cell" colspan="4">No data ...</td>
-          </tr>
-
-        </mat-table>
-
-        <mat-paginator [pageSize]="10" [pageSizeOptions]="[5, 10, 25, 100]"></mat-paginator>
-        <!-- </div> -->
-      </div>
-    </div>
+    <ng-container *ngIf="!fetching && tableList && tableList.length > 0">
+      <ws-widget-org-user-table [tableData]='tabledata' [data]='tableList' (eOnRowClick)="downloadFullFile($event)">
+      </ws-widget-org-user-table>
+    </ng-container>
     <ng-container *ngIf="(!bulkUploadData || !bulkUploadData.length) && !fetching">
       <h4 class="w-full
        ws-mat-black60-text text-center">No data to be displayed!</h4>
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
index 0b431e1e3..40472602b 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
@@ -1,64 +1,77 @@
 table {
-    width: 100%;
-  }
+  width: 100%;
+}
 
-  .mat-form-field {
-    font-size: 14px;
-    width: 100%;
-  }
+.mat-form-field {
+  font-size: 14px;
+  width: 100%;
+}
 
-  td, th {
-    width: 25%;
-    padding: 0px 12px!important;
-  }
+td, th {
+  padding: 0px 12px!important;
+}
 
-  .table-container{
-      position: relative;
-      width: 100%;
-      @media screen and (max-width: 1024px) {
-         overflow-x: scroll;
-      }
+.table-container{
+  position: relative;
+  width: 100%;
+  @media screen and (max-width: 1024px) {
+    overflow-x: scroll;
   }
+}
 
-  .text-span {
-    word-break: break-all!important;
-    min-width: 180px!important;
-    display: block;
-  }
+.mat-column-fileName {
+  width: 25% !important;
+}
+.mat-column-dateCreatedOn {
+  width: 20% !important;
+}
+.mat-column-dateUpdatedOn {
+  width: 20% !important;
+}
 
-  .example-loading-shade {
-    position: absolute;
-    top: 0;
-    left: 0;
-    bottom: 0px;
-    right: 0;
-    background: rgba(0, 0, 0, 0.15);
-    z-index: 1;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
+.text-span {
+  word-break: break-all!important;
+  min-width: 180px!important;
+  display: block;
+}
 
-   @media screen and (max-width: 1024px) {
-    #upload-data-box {
-      overflow-x: scroll;
-    }
+.example-loading-shade {
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0px;
+  right: 0;
+  background: rgba(0, 0, 0, 0.15);
+  z-index: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+  @media screen and (max-width: 1024px) {
+  #upload-data-box {
+    overflow-x: scroll;
   }
+}
 
 .download-btn {
-    min-width: 112px;
-    width: auto;
-    border: 1px solid #0075B7;
-    border-radius: 4px;
-    color: #0075B7 !important;
+  min-width: 112px;
+  width: auto;
+  border: 1px solid #0075B7;
+  border-radius: 4px;
+  color: #0075B7 !important;
 }
 
 .upload-btn {
-    width: auto;
-    background: #0075B7 !important;
-    color: white !important;
+  width: auto;
+  background: #0075B7 !important;
+  color: white !important;
 }
 
 .upload-btn:disabled {
-    opacity: 0.7;
+  opacity: 0.7;
+}
+
+.file-name {
+  line-height: 2;
 }
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
index 9c350951c..93ca53781 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
@@ -9,6 +9,8 @@ import { environment } from 'src/environments/environment'
 import { ActivatedRoute } from '@angular/router'
 // tslint:disable-next-line
 import _ from 'lodash'
+import { ITableData } from '@sunbird-cb/collection/lib/ui-org-table/interface/interfaces'
+import { DatePipe } from '@angular/common'
 
 @Component({
   selector: 'ws-app-users-upload',
@@ -16,12 +18,13 @@ import _ from 'lodash'
   styleUrls: ['./users-upload.component.scss'],
 })
 export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
-  private fileName: any
+  tableList!: any[]
+  public fileName: any
   public displayLoader!: Observable<boolean>
   public formGroup = this.fb.group({
     file: ['', Validators.required],
   })
-  fetching = false
+  fetching = true
   showFileError = false
   @ViewChild('toastSuccess', { static: true }) toastSuccess!: ElementRef<any>
   @ViewChild('toastError', { static: true }) toastError!: ElementRef<any>
@@ -30,25 +33,8 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
   uplaodSuccessMsg!: string
   dataSource: MatTableDataSource<any>
   // tslint:disable-next-line:max-line-length
-  displayedColumns: string[] = ['identifier', 'fileName', 'status', 'failedRecordsCount', 'successfulRecordsCount', 'totalRecords', 'dateCreatedOn', 'dateUpdatedOn']
-  tabledata: any = {
-    actions: [],
-    columns: [
-      { displayName: 'Id', key: 'identifier' },
-      { displayName: 'Name', key: 'fileName' },
-      { displayName: 'Status', key: 'status' },
-      { displayName: 'Failed Records', key: 'failedRecordsCount' },
-      { displayName: 'Success Records', key: 'successfulRecordsCount' },
-      { displayName: 'Total Records', key: 'totalRecords' },
-      { displayName: 'Created on', key: 'dateCreatedOn' },
-      { displayName: 'Updated on', key: 'dateUpdatedOn' },
-    ],
-    needCheckBox: false,
-    needHash: false,
-    sortColumn: 'dateCreatedOn',
-    sortState: 'desc',
-    needUserMenus: false,
-  }
+  displayedColumns: string[] = ['fileName', 'status', 'failedRecordsCount', 'successfulRecordsCount', 'totalRecords', 'dateCreatedOn', 'dateUpdatedOn']
+  tabledata!: ITableData
   departments: string[] = []
   contactUsUrl = ''
   fileSelected!: any
@@ -73,6 +59,7 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
     private fileService: FileService,
     private snackBar: MatSnackBar,
     private route: ActivatedRoute,
+    public datepipe: DatePipe
   ) {
     this.rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
     this.dataSource = new MatTableDataSource(this.bulkUploadData)
@@ -89,6 +76,24 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
   ngOnInit() {
     this.displayLoader = this.fileService.isLoading()
     this.contactUsUrl = `${environment.karmYogiPath}/public/contact `
+    this.tabledata = {
+      actions: [],
+      columns: [
+        // { displayName: 'Id', key: 'identifier' },
+        { displayName: 'Name', key: 'fileName' },
+        { displayName: 'Status', key: 'status' },
+        { displayName: 'Failed Records', key: 'failedRecordsCount' },
+        { displayName: 'Success Records', key: 'successfulRecordsCount' },
+        { displayName: 'Total Records', key: 'totalRecords' },
+        { displayName: 'Created on', key: 'dateCreatedOn' },
+        { displayName: 'Updated on', key: 'dateUpdatedOn' },
+      ],
+      needCheckBox: false,
+      needHash: false,
+      sortColumn: 'dateCreatedOn',
+      sortState: 'desc',
+      needUserMenus: false,
+    }
     this.getBulkUploadData()
   }
   ngAfterViewInit() {
@@ -100,54 +105,42 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   getBulkUploadData() {
-    this.fetching = true
-    this.fileService.getBulkUploadDataV1(this.rootOrgId).then((res: any) => {
-      this.fetching = false
+    this.fileService.getBulkUploadDataV1(this.rootOrgId).subscribe((res: any) => {
+      this.tableList = []
       if (res.result && res.result.content) {
         this.bulkUploadData = res.result.content
+        this.bulkUploadData.forEach((element: any) => {
+          this.tableList.push({
+            fileName: element.fileName,
+            status: element.status ? element.status : '',
+            failedRecordsCount: element.failedRecordsCount ? element.failedRecordsCount : '',
+            successfulRecordsCount: element.successfulRecordsCount ? element.successfulRecordsCount : '',
+            totalRecords: element.totalRecords ? element.totalRecords : '',
+            dateCreatedOn: element.dateCreatedOn ? element.dateCreatedOn : '',
+            dateUpdatedOn: element.dateUpdatedOn ? element.dateUpdatedOn : '',
+          })
+        })
+        this.fetching = false
         // this.bulkUploadData = []
         this.dataSource = new MatTableDataSource(this.bulkUploadData)
         setTimeout(() => this.dataSource.paginator = this.paginator)
-        setTimeout(
-          () => {
-            if (this.sort) {
-              this.sort.active = this.tabledata.sortColumn,
-                this.sort.start = this.tabledata.sortState
-            }
-            this.dataSource.sort = this.sort
-          },
-          100)
+        // setTimeout(
+        //   () => {
+        //     if (this.sort) {
+        //       this.sort.active = this.tabledata.sortColumn,
+        //         this.sort.start = this.tabledata.sortState
+        //     }
+        //     this.dataSource.sort = this.sort
+        //   },
+        //   100)
+      } else {
+        this.fetching = false
       }
     })
-      .catch(() => { })
-      .finally(() => {
-        this.fetching = false
-      })
   }
 
   public onFileChange(event: any) {
     this.showFileError = false
-    // const reader = new FileReader()
-    // if (event.target.files && event.target.files.length) {
-    //   this.fileName = event.target.files[0].name
-    //   const [file] = event.target.files
-    //   reader.readAsDataURL(file)
-
-    //   reader.onload = () => {
-    //     this.formGroup.patchValue({
-    //       file: reader.result,
-    //     })
-    //   }
-    // }
-
-    // const file: File = event.target.files[0]
-    // this.fileName = file.name
-
-    // this.fileSelected = file
-    // this.formGroup.patchValue({
-    //   file,
-    // })
-
     const fileList = (<HTMLInputElement>event.target).files
     if (fileList && fileList.length > 0) {
       const file: File = fileList[0]
@@ -159,6 +152,16 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
     }
   }
 
+  fileClick(event: any) {
+    event.target.value = ''
+  }
+
+  cancelSelected() {
+    this.fileName = ''
+    this.fileSelected = ''
+    this.formGroup.controls['file'].setValue('')
+  }
+
   public onSubmit(form: any): void {
     // Validate File type before uploading
     if (this.fileService.validateFile(this.fileName)) {
@@ -214,9 +217,8 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
     }
   }
 
-  downloadFullFile(file: any) {
-    const fname = file.fileName
-    const url = `/apis/proxies/v8/user/v1/bulkuser/download/${fname}`
+  downloadFullFile(event: any) {
+    const url = `/apis/proxies/v8/user/v1/bulkuser/download/${event.fileName}`
     window.open(url, '_blank')
   }
 }
diff --git a/project/ws/app/src/lib/routes/users/services/upload.service.ts b/project/ws/app/src/lib/routes/users/services/upload.service.ts
index 0badf3952..0c645c2bf 100644
--- a/project/ws/app/src/lib/routes/users/services/upload.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/upload.service.ts
@@ -84,8 +84,8 @@ export class FileService {
     return await this.http.get(`${API_ENDPOINTS.getBulkUploadData}`).toPromise()
   }
 
-  async getBulkUploadDataV1(rootOrgId: any) {
-    return await this.http.get(`${API_ENDPOINTS.getBulkUploadData}/${rootOrgId}`).toPromise()
+  public getBulkUploadDataV1(rootOrgId: any): Observable<any> {
+    return this.http.get(`${API_ENDPOINTS.getBulkUploadData}/${rootOrgId}`)
   }
 
   // public downloadFile(filename: string) {
diff --git a/project/ws/app/src/lib/routes/users/users.module.ts b/project/ws/app/src/lib/routes/users/users.module.ts
index 8e2821526..02fb1ffdc 100644
--- a/project/ws/app/src/lib/routes/users/users.module.ts
+++ b/project/ws/app/src/lib/routes/users/users.module.ts
@@ -1,10 +1,10 @@
 import { NgModule } from '@angular/core'
-import { CommonModule } from '@angular/common'
+import { CommonModule, DatePipe } from '@angular/common'
 import { CreateUserComponent } from './routes/create-user/create-user.component'
 import { ViewUserComponent } from './routes/view-user/view-user.component'
 import { RouterModule } from '@angular/router'
 import { UsersRoutingModule } from './users.routing.module'
-import { BreadcrumbsOrgModule, ScrollspyLeftMenuModule } from '@sunbird-cb/collection'
+import { BreadcrumbsOrgModule, ScrollspyLeftMenuModule, UIORGTableModule } from '@sunbird-cb/collection'
 import {
   MatSidenavModule, MatGridListModule, MatListModule, MatCardModule, MatFormFieldModule, MatInputModule,
   MatIconModule, MatButtonModule, MatRadioModule, MatDialogModule, MatSelectModule, MatProgressSpinnerModule,
@@ -27,8 +27,9 @@ import { PipeEmailModule } from '../pipes/pipe-email/pipe-email.module'
     MatFormFieldModule, MatInputModule, MatButtonModule, MatIconModule, MatGridListModule,
     MatRadioModule, MatDialogModule, ReactiveFormsModule, MatSelectModule, MatProgressSpinnerModule,
     MatExpansionModule, MatDividerModule, MatPaginatorModule, MatTableModule, WidgetResolverModule, MatSortModule, PipeEmailModule,
+    UIORGTableModule,
   ],
-  providers: [RolesService, FileService],
+  providers: [RolesService, FileService, DatePipe],
   exports: [UsersUploadComponent],
 })
 export class UsersModule { }

From 5ac44086668ce200a7854bf5d5a7d8870baf236d Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Tue, 25 Jul 2023 18:08:23 +0530
Subject: [PATCH 162/887] package update

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5e832b006..373c82b05 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@angular/router": "~8.2.1",
     "@angular/service-worker": "~8.2.1",
     "@project-sunbird/telemetry-sdk": "0.0.26",
-    "@sunbird-cb/collection": "^1.0.25",
+    "@sunbird-cb/collection": "^1.0.26",
     "@sunbird-cb/design-system": "0.0.1",
     "@sunbird-cb/rain-dashboards": "^0.4.14",
     "@sunbird-cb/resolver": "^1.0.0",

From 03b5caf41a860041c17b94e5e70f9fcf88fb1bd3 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Wed, 26 Jul 2023 13:28:15 +0530
Subject: [PATCH 163/887] update the collection version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 373c82b05..15e3807a1 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@angular/router": "~8.2.1",
     "@angular/service-worker": "~8.2.1",
     "@project-sunbird/telemetry-sdk": "0.0.26",
-    "@sunbird-cb/collection": "^1.0.26",
+    "@sunbird-cb/collection": "^1.0.27",
     "@sunbird-cb/design-system": "0.0.1",
     "@sunbird-cb/rain-dashboards": "^0.4.14",
     "@sunbird-cb/resolver": "^1.0.0",

From b82f3ccde16f1e8986770eff0d841b61812ce4ac Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Thu, 27 Jul 2023 17:55:59 +0530
Subject: [PATCH 164/887] event list ui fixes

---
 .../event-list-view.component.html            |  7 ++--
 .../event-list-view.component.scss            | 34 +++++++++----------
 .../event-list-view.component.ts              | 19 ++++++++---
 .../routes/list/list-event.component.ts       |  4 +--
 4 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.html b/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.html
index 7d00ee514..7c5df007d 100644
--- a/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.html
+++ b/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.html
@@ -64,9 +64,10 @@
             </div>
         </mat-table>
     </div>
-    <div *ngIf="dataSource.filteredData.length <= 0" class="h-600-s-20-m color-60 text-center">
-        No result found
+    <div *ngIf="dataSource.filteredData.length <= 0" class="h-600-s-20-m color-60 mt-4 mb-4 text-center">
+        No events found
     </div>
-    <mat-paginator [length]="length" [pageSize]="pageSize" [pageSizeOptions]="pageSizeOptions">
+    <mat-paginator [hidden]="dataSource && dataSource.filteredData.length < 1" [length]="length" [pageSize]="pageSize"
+        [pageSizeOptions]="pageSizeOptions" class="mt-1">
     </mat-paginator>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.scss b/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.scss
index 517c4c599..e8a00dad5 100644
--- a/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.scss
+++ b/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.scss
@@ -16,12 +16,12 @@ table {
 }
 
 .mat-cell {
-	font-size: 14px;
+  font-size: 14px;
 }
 
 th.mat-header-cell {
-	font-size:16px;
-	font-weight: bold;
+  font-size: 16px;
+  font-weight: bold;
 }
 
 
@@ -659,8 +659,8 @@ $title-line-count: 2;
   padding: 9px 9px 9px 35px;
   margin-bottom: 20px;
   margin-top: 10px;
-  font: normal 14px Lato ;
-  font-weight: 400 ;
+  font: normal 14px Lato;
+  font-weight: 400;
 }
 
 .searchText {
@@ -669,24 +669,24 @@ $title-line-count: 2;
   margin: 23px 0 0 auto;
 }
 
-.action-btn{
+.action-btn {
   border: none;
   background: transparent;
 }
 
-mat-header-row{
+mat-header-row {
   min-height: 40px;
 }
 
-.mat-header-cell{
+.mat-header-cell {
   background-color: #F5F5F5;
 }
 
-.container-balanced{
+.container-balanced {
   max-width: 99%;
-  min-height: 85vh;
-  margin-left: auto!important;
-  margin-right: auto!important;
+  height: 100%;
+  margin-left: auto !important;
+  margin-right: auto !important;
 }
 
 .flex-3 {
@@ -719,7 +719,7 @@ mat-header-row{
 
 .flex-custom {
   display: flex;
- flex-direction: column;
+  flex-direction: column;
 }
 
 .flex-custom-m {
@@ -728,7 +728,7 @@ mat-header-row{
   }
 }
 
-.right-align{
+.right-align {
   text-align: right;
 }
 
@@ -750,9 +750,9 @@ mat-header-row{
   font-size: 14px;
 }
 
-.upload-btn{
+.upload-btn {
   width: 150px;
-  border:1px solid #DEDEDE;
+  border: 1px solid #DEDEDE;
   border-radius: 4px;
   margin: 0 15px;
   color: #848484 !important;
@@ -762,7 +762,7 @@ mat-header-row{
 }
 
 
-.search-icon{
+.search-icon {
   position: absolute;
   top: 19px;
   font-size: 20px;
diff --git a/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.ts b/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.ts
index b18f8333f..d747c1a44 100644
--- a/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.ts
+++ b/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.ts
@@ -1,6 +1,6 @@
 import {
   Component, OnInit, Input, Output, EventEmitter, ViewChild,
-  AfterViewInit, OnChanges, SimpleChanges, Inject,
+  AfterViewInit, OnChanges, SimpleChanges, Inject, ChangeDetectorRef,
 } from '@angular/core'
 import { SelectionModel } from '@angular/cdk/collections'
 import { MatTableDataSource } from '@angular/material/table'
@@ -48,7 +48,11 @@ export class EventListViewComponent implements OnInit, AfterViewInit, OnChanges
   pageSize = 5
   pageSizeOptions = [5, 10, 20]
   @ViewChild(MatPaginator, { static: true }) paginator!: MatPaginator
-  @ViewChild(MatSort, { static: true }) sort?: MatSort
+  @ViewChild(MatSort, { static: false }) set matSort(sort: MatSort) {
+    if (!this.dataSource.sort) {
+      this.dataSource.sort = sort
+    }
+  }
   selection = new SelectionModel<any>(true, [])
   dialogRef: any
   configSvc: any
@@ -59,6 +63,7 @@ export class EventListViewComponent implements OnInit, AfterViewInit, OnChanges
     private events: EventService,
     // private telemetrySvc: TelemetryService,
     private route: ActivatedRoute,
+    private cd: ChangeDetectorRef,
     @Inject(MAT_DIALOG_DATA) public content: IContentShareData,
   ) {
     this.configSvc = this.route.parent && this.route.parent.snapshot.data.configService
@@ -74,15 +79,21 @@ export class EventListViewComponent implements OnInit, AfterViewInit, OnChanges
     }
     this.dataSource.data = this.data
     this.dataSource.paginator = this.paginator
-    this.dataSource.sort = this.sort
+    // this.dataSource.sort = this.sort
   }
 
   ngOnChanges(data: SimpleChanges) {
     this.dataSource.data = _.get(data, 'data.currentValue')
     this.length = this.dataSource.data.length
+    this.paginator.firstPage()
   }
 
-  ngAfterViewInit() { }
+  ngAfterViewInit() {
+  }
+
+  ngAfterViewChecked() {
+    this.cd.detectChanges()
+  }
 
   applyFilter(filterValue: any) {
     if (filterValue) {
diff --git a/project/ws/app/src/lib/routes/events/routes/list/list-event.component.ts b/project/ws/app/src/lib/routes/events/routes/list/list-event.component.ts
index 719faddd4..5cd4bc854 100644
--- a/project/ws/app/src/lib/routes/events/routes/list/list-event.component.ts
+++ b/project/ws/app/src/lib/routes/events/routes/list/list-event.component.ts
@@ -71,8 +71,8 @@ export class ListEventComponent implements OnInit, AfterViewInit, OnDestroy {
             ],
             needCheckBox: false,
             needHash: false,
-            sortColumn: '',
-            sortState: 'asc',
+            sortColumn: 'eventCreatedOn',
+            sortState: 'desc',
         }
         this.fetchEvents()
     }

From 4dd328a48cffe262104a4d271da0169398cf304c Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Fri, 28 Jul 2023 19:05:26 +0530
Subject: [PATCH 165/887] fixed version since there are breking changes in the
 newer version of lib

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 710f94c27..be80fddea 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@angular/router": "~8.2.1",
     "@angular/service-worker": "~8.2.1",
     "@project-sunbird/telemetry-sdk": "0.0.26",
-    "@sunbird-cb/collection": "^1.0.24",
+    "@sunbird-cb/collection": "1.0.24",
     "@sunbird-cb/design-system": "0.0.1",
     "@sunbird-cb/rain-dashboards": "^0.4.14",
     "@sunbird-cb/resolver": "^1.0.0",

From 257fc8c43e3d8bcfeb32f6962786031eda00b09e Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Mon, 31 Jul 2023 11:57:14 +0530
Subject: [PATCH 166/887] lint fixes

---
 .../components/event-list-view/event-list-view.component.ts   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.ts b/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.ts
index d747c1a44..ae87017c2 100644
--- a/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.ts
+++ b/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.ts
@@ -1,6 +1,6 @@
 import {
   Component, OnInit, Input, Output, EventEmitter, ViewChild,
-  AfterViewInit, OnChanges, SimpleChanges, Inject, ChangeDetectorRef,
+  AfterViewInit, OnChanges, SimpleChanges, Inject, ChangeDetectorRef, AfterViewChecked,
 } from '@angular/core'
 import { SelectionModel } from '@angular/cdk/collections'
 import { MatTableDataSource } from '@angular/material/table'
@@ -24,7 +24,7 @@ export interface IContentShareData {
   templateUrl: './event-list-view.component.html',
   styleUrls: ['./event-list-view.component.scss'],
 })
-export class EventListViewComponent implements OnInit, AfterViewInit, OnChanges {
+export class EventListViewComponent implements OnInit, AfterViewInit, OnChanges, AfterViewChecked {
 
   @Input() tableData!: ITableData | undefined
   @Input() data?: []

From 90cfec7e2d507120b5df67a0ae1a5aae64c7abe2 Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Mon, 31 Jul 2023 12:49:31 +0530
Subject: [PATCH 167/887] Updated batch details API to read API

---
 .../services/blended-approval.service.ts                       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
index ac0c4c69c..17a653e1e 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
@@ -7,7 +7,8 @@ import _ from 'lodash'
 
 const API_END_POINTS = {
   UPDATE_REQUEST: '/apis/proxies/v8/workflow/blendedprogram/update',
-  GET_PROGRAM_DETAILS: '/apis/proxies/v8/action/content/v3/hierarchy',
+  // GET_PROGRAM_DETAILS: '/apis/proxies/v8/action/content/v3/hierarchy',
+  GET_PROGRAM_DETAILS: '/apis/proxies/v8/action/content/v3/read',
   GET_LERANERS: '/apis/protected/v8/cohorts/course/getUsersForBatch',
   GET_REQUESTS: '/apis/proxies/v8/workflow/blendedprogram/search',
   READ_USER: '/apis/proxies/v8/api/user/v2/read/',

From 306ad8cb43b74c9dda2ecffd5d28f711fd6d4732 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Mon, 31 Jul 2023 13:12:48 +0530
Subject: [PATCH 168/887] version fix fo scroll

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index be80fddea..710f94c27 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@angular/router": "~8.2.1",
     "@angular/service-worker": "~8.2.1",
     "@project-sunbird/telemetry-sdk": "0.0.26",
-    "@sunbird-cb/collection": "1.0.24",
+    "@sunbird-cb/collection": "^1.0.24",
     "@sunbird-cb/design-system": "0.0.1",
     "@sunbird-cb/rain-dashboards": "^0.4.14",
     "@sunbird-cb/resolver": "^1.0.0",

From fec660fc4811c927df73f7c9426f3045bae62320 Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Mon, 31 Jul 2023 14:34:31 +0530
Subject: [PATCH 169/887] Fixed event listing height css

---
 .../components/event-list-view/event-list-view.component.scss   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.scss b/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.scss
index 517c4c599..14d05fdcb 100644
--- a/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.scss
+++ b/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.scss
@@ -684,7 +684,7 @@ mat-header-row{
 
 .container-balanced{
   max-width: 99%;
-  min-height: 85vh;
+  // min-height: 85vh;
   margin-left: auto!important;
   margin-right: auto!important;
 }

From 9b7cad6eb5c36236d5278434b98e6e7485dc01a8 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Wed, 2 Aug 2023 12:22:41 +0530
Subject: [PATCH 170/887] Batch - new request badge

---
 .../batch-list/batch-list.component.html       | 10 +++++++---
 .../batch-list/batch-list.component.scss       | 18 +++++++++++++++++-
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
index 6f68b859f..a69583079 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
@@ -10,13 +10,17 @@
           <div class="grey-box ws-mat-accent-border cursor-pointer margin-bottom-m margin-right-l"
             (click)="viewDetails(batch)" *ngFor="let batch of batchesList">
             <div class="padding-left-s padding-right-s padding-top-s padding-bottom-xs margin-remove title-div">
-              <span class="mat-subheading-1 margin-remove">{{batch.name}}</span>
-              <!-- <span class="float-right mat-body-2 margin-remove">{{batch.batchId}}</span> -->
+              <span class="float-left mat-subheading-1 margin-remove">
+                <span *ngIf="batch.newrequestsCount > 0" class="circle"></span>
+                {{batch.name}}
+              </span>
+              <span class="float-right mat-subheading-1 margin-remove color-60">{{batch.batchId}}</span>
             </div>
             <div class="padding-left-s padding-right-s mat-body-2">
-              <!-- <p class="margin-remove"><mat-icon>tag</mat-icon> {{batch.batchId}}</p> -->
+              <p class="margin-remove">Start and end date</p>
               <p class="margin-remove"><mat-icon>event</mat-icon> {{batch.startDate | date: 'dd/MMM/yyyy'}} -
                 {{batch.endDate | date: 'dd/MMM/yyyy'}}</p>
+              <p class="margin-remove extra-margin">Last enrolment date</p>
               <p class="margin-remove"><mat-icon>event</mat-icon> {{batch.enrollmentEndDate | date:'dd/MMM/yyyy'}}</p>
             </div>
             <div class="request-box mat-body-2 margin-top-xs" *ngIf="batch.newrequestsCount > 1">
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss
index 3fe3a8e41..7a50bb1c4 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss
@@ -38,6 +38,22 @@
   .request-box {
     color: #D13924;
     padding: 8px 14px;
-    border-top: 1px solid rgba(0, 0, 0, 0.08);
+    //border-top: 1px solid rgba(0, 0, 0, 0.08);
+  }
+  .extra-margin {
+    margin-top: 10px!important;
+  }
+  .circle {
+    width: 10px;
+    height: 10px;
+    background:red;
+    border-radius:50%;
+    -moz-border-radius:50%;
+    -webkit-border-radius:50%;
+    line-height:20px;
+    vertical-align:middle;
+    text-align:center;
+    color:white;
+    margin-bottom: 2px;
   }
 }

From beebe546fcef6ea7329fc7adc1f024f1394dbbf0 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Fri, 4 Aug 2023 15:09:56 +0530
Subject: [PATCH 171/887] bug fix

---
 .../event-list-view/event-list-view.component.ts      | 11 ++++++++---
 .../routes/events/routes/list/list-event.component.ts |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.ts b/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.ts
index b18f8333f..8ce3d5139 100644
--- a/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.ts
+++ b/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.ts
@@ -52,6 +52,7 @@ export class EventListViewComponent implements OnInit, AfterViewInit, OnChanges
   selection = new SelectionModel<any>(true, [])
   dialogRef: any
   configSvc: any
+  searchColumn!: string
 
   constructor(
     private router: Router,
@@ -73,8 +74,6 @@ export class EventListViewComponent implements OnInit, AfterViewInit, OnChanges
       this.displayedColumns = this.tableData.columns
     }
     this.dataSource.data = this.data
-    this.dataSource.paginator = this.paginator
-    this.dataSource.sort = this.sort
   }
 
   ngOnChanges(data: SimpleChanges) {
@@ -82,7 +81,13 @@ export class EventListViewComponent implements OnInit, AfterViewInit, OnChanges
     this.length = this.dataSource.data.length
   }
 
-  ngAfterViewInit() { }
+  ngAfterViewInit() {
+    this.dataSource.paginator = this.paginator
+    this.dataSource.sort = this.sort
+    this.dataSource.filterPredicate = function (data: any, filter: string): boolean {
+      return data.eventName.toLowerCase().includes(filter)
+    }
+  }
 
   applyFilter(filterValue: any) {
     if (filterValue) {
diff --git a/project/ws/app/src/lib/routes/events/routes/list/list-event.component.ts b/project/ws/app/src/lib/routes/events/routes/list/list-event.component.ts
index 719faddd4..a99132fab 100644
--- a/project/ws/app/src/lib/routes/events/routes/list/list-event.component.ts
+++ b/project/ws/app/src/lib/routes/events/routes/list/list-event.component.ts
@@ -72,7 +72,7 @@ export class ListEventComponent implements OnInit, AfterViewInit, OnDestroy {
             needCheckBox: false,
             needHash: false,
             sortColumn: '',
-            sortState: 'asc',
+            sortState: 'asc'
         }
         this.fetchEvents()
     }

From be18ffe96533c408735a33ed0b92636bdab1d017 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Fri, 4 Aug 2023 15:17:18 +0530
Subject: [PATCH 172/887] lint issue fix

---
 .../src/lib/routes/events/routes/list/list-event.component.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/events/routes/list/list-event.component.ts b/project/ws/app/src/lib/routes/events/routes/list/list-event.component.ts
index a99132fab..719faddd4 100644
--- a/project/ws/app/src/lib/routes/events/routes/list/list-event.component.ts
+++ b/project/ws/app/src/lib/routes/events/routes/list/list-event.component.ts
@@ -72,7 +72,7 @@ export class ListEventComponent implements OnInit, AfterViewInit, OnDestroy {
             needCheckBox: false,
             needHash: false,
             sortColumn: '',
-            sortState: 'asc'
+            sortState: 'asc',
         }
         this.fetchEvents()
     }

From e9318e35292e8e8820ca8ed681e3344ebcc0d251 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Fri, 4 Aug 2023 17:01:02 +0530
Subject: [PATCH 173/887] Update batch details and session tab

---
 .../blended-approvals.module.ts               |  8 +++--
 .../batch-details.component.html              | 21 ++++++++++++
 .../batch-details.component.scss              |  6 +++-
 .../batch-details/batch-details.component.ts  | 28 +++++++++++++++-
 .../batch-list/batch-list.component.html      | 19 ++++++-----
 .../batch-list/batch-list.component.scss      | 16 +++++----
 .../batch-list/batch-list.component.ts        | 17 ++++++++++
 .../session-card/session-card.component.html  | 33 +++++++++++++++++++
 .../session-card/session-card.component.scss  | 19 +++++++++++
 .../session-card.component.spec.ts            | 25 ++++++++++++++
 .../session-card/session-card.component.ts    | 17 ++++++++++
 11 files changed, 188 insertions(+), 21 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.html
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.scss
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.ts

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts b/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
index 0b1235b64..73392ea40 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
@@ -14,6 +14,7 @@ import {
   MatSidenavModule,
   MatIconModule,
   MatButtonModule,
+  MatBadgeModule,
 } from '@angular/material'
 import { MatCardModule } from '@angular/material/card'
 import { BatchDetailsComponent } from './components/batch-details/batch-details.component'
@@ -24,13 +25,14 @@ import { UsersCardComponent } from './components/users-card/users-card.component
 import { ProfileViewComponent } from './components/profile-view/profile-view.component'
 import { PipeEmailModule } from '../pipes/pipe-email/pipe-email.module'
 import { PipeOrderByModule } from '../pipes/pipe-order-by/pipe-order-by.module'
-import { ProfileCertificateDialogModule } from './components/profile-certificate-dialog/profile-certificate-dialog.module'
+import { ProfileCertificateDialogModule } from './components/profile-certificate-dialog/profile-certificate-dialog.module';
+import { SessionCardComponent } from './components/session-card/session-card.component'
 
 @NgModule({
-  declarations: [BlendedHomeComponent, BatchListComponent, BatchDetailsComponent, UsersCardComponent, ProfileViewComponent],
+  declarations: [BlendedHomeComponent, BatchListComponent, BatchDetailsComponent, UsersCardComponent, ProfileViewComponent, SessionCardComponent],
   imports: [CommonModule, BlendedApprovalsRoutingModule, BreadcrumbsOrgModule, LeftMenuWithoutLogoModule, WidgetResolverModule,
     MatSidenavModule, MatButtonModule, MatIconModule, HomeModule, RouterModule, UIORGTableModule,
-    MatCardModule, AvatarPhotoModule, MatListModule, PipeEmailModule, PipeOrderByModule, ProfileCertificateDialogModule],
+    MatCardModule, AvatarPhotoModule, MatListModule, PipeEmailModule, PipeOrderByModule, ProfileCertificateDialogModule, MatBadgeModule],
   exports: [],
   providers: [],
 })
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
index 5db263df2..6f33b4f0f 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
@@ -38,10 +38,18 @@
               (click)="filter('rejected')" role="button">Rejected requests
               <!-- <span *ngIf="rejectedUsers" class="ws-mat-black60-text">({{rejectedUsers.length}})</span> -->
             </a>
+            <a class="filter-option cursor-pointer"
+              [ngClass]="{'ws-mat-accent-border-active font-bold' : currentFilter === 'sessions',
+                                                                                    'ws-mat-accent-border font-medium':currentFilter !== 'sessions'}"
+              mat-button (click)="filter('sessions')" role="button">Sessions details
+              <!-- <span *ngIf="rejectedUsers" class="ws-mat-black60-text">({{rejectedUsers.length}})</span> -->
+            </a>
           </div>
         </div>
         <ng-container *ngIf="currentFilter === 'pending'">
           <div class="b-c box" *ngIf="newUsers && newUsers.length > 0">
+            <p class="padding-m new-request-count"> {{newUsers.length}} New
+              requests</p>
             <div *ngFor="let user of newUsers">
               <ws-app-users-card [user]="user" [actions]="true" [programData]="linkData"
                 (userClick)="onSubmit($event)"></ws-app-users-card>
@@ -71,6 +79,19 @@
             <p class="padding-m">No rejected requests yet</p>
           </div>
         </ng-container>
+        <ng-container *ngIf="currentFilter === 'sessions'">
+          <div *ngIf="sessionDetails && sessionDetails.length > 0">
+            <div class="flex-4 mobile-margin mat-h2 margin-top-m">
+              Sessions
+            </div>
+            <div *ngFor="let individulaSession of sessionDetails">
+              <ws-app-session-card [session]="individulaSession"></ws-app-session-card>
+            </div>
+          </div>
+          <div class="b-c box" *ngIf="sessionDetails && sessionDetails.length == 0">
+            <p class="padding-m">No sessions yet</p>
+          </div>
+        </ng-container>
       </ng-container>
     </mat-card-content>
   </mat-card>
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss
index 92a1c6046..b38798014 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss
@@ -79,4 +79,8 @@
 
 ::ng-deep.h-600-s-20-m {
   font: 700 14px Lato !important;
-}
\ No newline at end of file
+}
+.new-request-count {
+  color: red;
+  font-weight: bold;
+}
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index e45333671..24c9fd2f8 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -22,6 +22,7 @@ export class BatchDetailsComponent implements OnInit {
   rejectedUsers: any = []
   linkData: any
   userProfile: any
+  sessionDetails: any = []
 
   constructor(private router: Router, private activeRouter: ActivatedRoute,
     // tslint:disable-next-line:align
@@ -43,7 +44,7 @@ export class BatchDetailsComponent implements OnInit {
 
   ngOnInit() { }
 
-  filter(key: 'pending' | 'approved' | 'rejected') {
+  filter(key: 'pending' | 'approved' | 'rejected' | 'sessions') {
     switch (key) {
       case 'pending':
         this.currentFilter = 'pending'
@@ -57,6 +58,10 @@ export class BatchDetailsComponent implements OnInit {
         this.currentFilter = 'rejected'
         this.getRejectedList()
         break
+      case 'sessions':
+        this.currentFilter = 'sessions'
+        this.getSessionDetails()
+        break
       default:
         break
     }
@@ -129,6 +134,27 @@ export class BatchDetailsComponent implements OnInit {
     })
   }
 
+  getSessionDetails() {
+    this.sessionDetails = [
+      {
+        title: "Intro to AI - Session 1",
+        description: "Angular is an open-source, JavaScript framework written in TypeScript. Google maintains it, and its primary purpose is to develop single-page applications. As a framework, Angular has clear advantages while also providing a standard structure for developers to work with. It enables users to create large applications in a maintainable manner. Frameworks in general boost web development efficiency and performance by providing a consistent structure so that developers don’t have to keep rebuilding code from scratch. Frameworks are time savers that offer developers a host of extra features that can be added to software without requiring extra effort.",
+        type: "Offline session",
+        facilitator: "Rangarajan",
+        localtion: "Yes",
+        qrCode: "Yes"
+      },
+      {
+        title: "Intro to Angular - Session 3",
+        description: 'Angular is a popular open-source web application framework developed by Google. It is written in TypeScript and is widely used for building dynamic and robust single-page applications (SPAs). Angular provides a set of tools and features that allow developers to create complex client-side applications with ease.',
+        type: "Online session",
+        facilitator: "Venkat Kandagaddala",
+        localtion: "No",
+        qrCode: "Yes"
+      }
+    ]
+  }
+
   onSubmit(event: any) {
     const actionType = event.action.toUpperCase()
     // const reqData = event.userData.wfInfo[0]
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
index a69583079..59f6af3cd 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
@@ -7,9 +7,10 @@
     <mat-card-content>
       <ng-container>
         <div class="batches-lsit" *ngIf="programData && batchesList && batchesList.length > 0">
-          <div class="grey-box ws-mat-accent-border cursor-pointer margin-bottom-m margin-right-l"
-            (click)="viewDetails(batch)" *ngFor="let batch of batchesList">
-            <div class="padding-left-s padding-right-s padding-top-s padding-bottom-xs margin-remove title-div">
+          <div class="grey-box ws-mat-accent-border cursor-pointer margin-bottom-m margin-right-l demo-section"
+            (click)="viewDetails(batch)" *ngFor="let batch of batchesList" [matBadge]="batch.newrequestsCount"
+            matBadgeColor="warn">
+            <div class="padding-left-s padding-right-s padding-top-s margin-remove title-div">
               <span class="float-left mat-subheading-1 margin-remove">
                 <span *ngIf="batch.newrequestsCount > 0" class="circle"></span>
                 {{batch.name}}
@@ -20,14 +21,14 @@
               <p class="margin-remove">Start and end date</p>
               <p class="margin-remove"><mat-icon>event</mat-icon> {{batch.startDate | date: 'dd/MMM/yyyy'}} -
                 {{batch.endDate | date: 'dd/MMM/yyyy'}}</p>
-              <p class="margin-remove extra-margin">Last enrolment date</p>
+              <p class="margin-remove  extra-padding">Last enrolment date</p>
               <p class="margin-remove"><mat-icon>event</mat-icon> {{batch.enrollmentEndDate | date:'dd/MMM/yyyy'}}</p>
             </div>
-            <div class="request-box mat-body-2 margin-top-xs" *ngIf="batch.newrequestsCount > 1">
-              {{batch.newrequestsCount}} New requests</div>
-            <div class="request-box mat-body-2 margin-top-xs"
-              *ngIf="batch.newrequestsCount === 1 || batch.newrequestsCount === 0">
-              {{batch.newrequestsCount}} New request</div>
+            <div class="padding-left-s padding-right-s mat-body-2 extra-padding">
+              <p class="margin-remove"><mat-icon>person</mat-icon>
+                {{batch.learnersCount}}/{{batch.batchAttributes?.currentBatchSize || 50}} learners enrolled
+              </p>
+            </div>
           </div>
         </div>
         <div class="batches-lsit" *ngIf="batchesList && batchesList.length === 0">
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss
index 7a50bb1c4..45c9c1303 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss
@@ -7,9 +7,10 @@
   display: inline-block;
   width: 31%;
   border-radius: 4px;
+  padding-bottom: 10px;
 
   .title-div {
-    min-height: 48px;
+    min-height: 35px;
   }
 
   span {
@@ -31,7 +32,7 @@
       font-size: 16px;
       width: 15px;
       height: 16px;
-      margin-right: 6px
+      margin-right: 6px;
     }
   }
 
@@ -40,12 +41,13 @@
     padding: 8px 14px;
     //border-top: 1px solid rgba(0, 0, 0, 0.08);
   }
-  .extra-margin {
-    margin-top: 10px!important;
+  .extra-padding {
+    padding-top: 10px;
   }
+
   .circle {
-    width: 10px;
-    height: 10px;
+    width: 8px;
+    height: 8px;
     background:red;
     border-radius:50%;
     -moz-border-radius:50%;
@@ -54,6 +56,6 @@
     vertical-align:middle;
     text-align:center;
     color:white;
-    margin-bottom: 2px;
+    margin-bottom: 4px;
   }
 }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
index bd54c5c8e..72f897377 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
@@ -1,5 +1,6 @@
 import { Component, OnInit } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
+
 import moment from 'moment'
 import { BlendedApporvalService } from '../../services/blended-approval.service'
 
@@ -44,11 +45,19 @@ export class BatchListComponent implements OnInit {
                 offset: 0,
                 deptName: this.userProfile.channel,
               }
+              b.newrequestsCount = Math.floor(Math.random() * (10 - 0 + 0)) + 0
+              b.learnersCount = 0
               this.bpService.getRequests(request).subscribe((resnew: any) => {
                 if (resnew) {
                   b.newrequestsCount = resnew.result.data.length
                 }
               })
+              this.bpService.getLearners(b.batchId).subscribe((res: any) => {
+                console.log("learners ", res)
+                if (res && res.length > 0) {
+                  b.learnersCount = res.length
+                }
+              })
             }
 
           })
@@ -89,11 +98,19 @@ export class BatchListComponent implements OnInit {
                 offset: 0,
                 deptName: this.userProfile.channel,
               }
+              b.learnersCount = 0
+              b.newrequestsCount = Math.floor(Math.random() * (10 - 0 + 0)) + 0
               this.bpService.getRequests(request).subscribe((resnew: any) => {
                 if (resnew) {
                   b.newrequestsCount = resnew.result.data.length
                 }
               })
+              this.bpService.getLearners(b.batchId).subscribe((res: any) => {
+                console.log("learners ", res)
+                if (res && res.length > 0) {
+                  b.learnersCount = res.length
+                }
+              })
             }
           })
         }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.html
new file mode 100644
index 000000000..9a529ac44
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.html
@@ -0,0 +1,33 @@
+<div class="margin-bottom-xl margin-top-l grey-box paddig-m ws-mat-accent-border">
+  <div class="details">
+    <p class="font-bold">{{session.title}}</p>
+    <p>{{session.description}}</p>
+    <div class="color-60 margin-top-l">
+      <ul class="margin-top-m margin-bottom-m batch-data">
+        <li>{{session.type}}</li>
+        <li>{{session.type}}</li>
+        <li>{{session.type}}</li>
+      </ul>
+    </div>
+  </div>
+  <div class="session-division">
+    <div class="details">
+      <div class="grid grid-cols-2 gap-1">
+        <div class="flex flex-column">
+          <div class="font-bold">QR attendance required</div>
+          <div>{{session.qrCode}}</div>
+        </div>
+        <div class="flex flex-column">
+          <div class="font-bold">Capture location details</div>
+          <div>{{session.localtion}}</div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="session-division">
+    <div class="details">
+      <div class="font-bold">Facilitator</div>
+      <div>{{session.facilitator}}</div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.scss
new file mode 100644
index 000000000..c5042abe4
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.scss
@@ -0,0 +1,19 @@
+.grey-box {
+  background: #F5F5F5;
+  .details {
+    padding: 1em;
+  }
+  .batch-data {
+    list-style: none;
+    padding: 0;
+    font: 400 14px/20px Lato;
+
+    li {
+      display: inline;
+      margin-right: 2em;
+    }
+  }
+}
+.session-division {
+  border-top: 1px solid #c3c3c3;
+}
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.spec.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.spec.ts
new file mode 100644
index 000000000..87a3cb062
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { SessionCardComponent } from './session-card.component';
+
+describe('SessionCardComponent', () => {
+  let component: SessionCardComponent;
+  let fixture: ComponentFixture<SessionCardComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ SessionCardComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SessionCardComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.ts
new file mode 100644
index 000000000..90f37e30c
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.ts
@@ -0,0 +1,17 @@
+import { Component, Input, OnInit } from '@angular/core'
+
+@Component({
+  selector: 'ws-app-session-card',
+  templateUrl: './session-card.component.html',
+  styleUrls: ['./session-card.component.scss']
+})
+export class SessionCardComponent implements OnInit {
+
+  @Input() session!: any
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

From e83fcd4cc0d8d88f7862f004c9333c1b55259de2 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Mon, 7 Aug 2023 17:12:39 +0530
Subject: [PATCH 174/887] Session tab for blended programs

---
 .../batch-details.component.html              |  2 +-
 .../batch-details/batch-details.component.ts  | 15 +++++++++++--
 .../session-card/session-card.component.html  | 21 +++++++++++++-----
 .../session-card/session-card.component.scss  | 22 +++++++++++++------
 4 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
index 6f33b4f0f..8e3c6817f 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
@@ -41,7 +41,7 @@
             <a class="filter-option cursor-pointer"
               [ngClass]="{'ws-mat-accent-border-active font-bold' : currentFilter === 'sessions',
                                                                                     'ws-mat-accent-border font-medium':currentFilter !== 'sessions'}"
-              mat-button (click)="filter('sessions')" role="button">Sessions details
+              mat-button (click)="filter('sessions')" role="button">Session details
               <!-- <span *ngIf="rejectedUsers" class="ws-mat-black60-text">({{rejectedUsers.length}})</span> -->
             </a>
           </div>
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index 24c9fd2f8..9ba27ef16 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -142,7 +142,12 @@ export class BatchDetailsComponent implements OnInit {
         type: "Offline session",
         facilitator: "Rangarajan",
         localtion: "Yes",
-        qrCode: "Yes"
+        qrCode: "Yes",
+        duration: "4Hrs",
+        date: "12 June 2023",
+        time: "9:00 AM - 1:00 PM",
+        feedbackUrl: "https://surveymonkey.com/123456",
+        joinLink: "https://teams.microsoft.com/QWDDIKMV129"
       },
       {
         title: "Intro to Angular - Session 3",
@@ -150,7 +155,13 @@ export class BatchDetailsComponent implements OnInit {
         type: "Online session",
         facilitator: "Venkat Kandagaddala",
         localtion: "No",
-        qrCode: "Yes"
+        qrCode: "Yes",
+        duration: "8Hrs",
+        date: "31 Aug 2023",
+        time: "9:00 AM - 5:00 PM",
+        feedbackUrl: "https://surveymonkey.com/67890",
+        feedbackUrlHelpText: "This survey won't take more than 2 minutes.",
+        joinLink: "https://teams.microsoft.com/ABCDPIKL123"
       }
     ]
   }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.html
index 9a529ac44..32bc0f3f8 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.html
@@ -2,12 +2,21 @@
   <div class="details">
     <p class="font-bold">{{session.title}}</p>
     <p>{{session.description}}</p>
-    <div class="color-60 margin-top-l">
-      <ul class="margin-top-m margin-bottom-m batch-data">
-        <li>{{session.type}}</li>
-        <li>{{session.type}}</li>
-        <li>{{session.type}}</li>
-      </ul>
+    <div class="color-60 margin-top-l margin-top-m margin-bottom-m">
+      <div class="flex flex-1 flex-row">
+        <div class="flex margin-right-m">{{session.type}}</div>
+        <div class="flex margin-right-m bullet-span">{{session.date}}</div>
+        <div class="flex bullet-span">{{session.duration}}, {{session.time}}</div>
+      </div>
+    </div>
+    <div class="margin-top-l">
+      <div class="font-bold">Join this link </div>
+      <div><a [href]="session.joinLink" target="_blank" class="link">{{session.joinLink}}</a></div>
+    </div>
+    <div class="margin-top-l margin-bottom-s" *ngIf="session.feedbackUrl">
+      <div class="font-bold">Provide feedback</div>
+      <div><a [href]="session.feedbackUrl" target="_blank" class="link">{{session.feedbackUrl}}</a></div>
+      <div class="color-60 link-help-text" *ngIf="session.feedbackUrlHelpText">{{session.feedbackUrlHelpText}}</div>
     </div>
   </div>
   <div class="session-division">
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.scss
index c5042abe4..d6ac474ae 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.scss
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.scss
@@ -3,17 +3,25 @@
   .details {
     padding: 1em;
   }
-  .batch-data {
-    list-style: none;
+  .session-data {
     padding: 0;
     font: 400 14px/20px Lato;
+  }
+
+  .link {
+    background-color: #F5F5F5!important;
+  }
 
-    li {
-      display: inline;
-      margin-right: 2em;
-    }
+  .link-help-text {
+    font-size: 13px;
   }
+
+  .bullet-span::before {
+    content: "\2022";
+    padding-right: 5px;
+  }
+
 }
 .session-division {
-  border-top: 1px solid #c3c3c3;
+  border-top: 1px solid #e5dddd;
 }

From 8bb889b1380793ee505b17b4c7c2508f594703e9 Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Tue, 8 Aug 2023 15:33:48 +0530
Subject: [PATCH 175/887] Fixed left menu & upload table UI

---
 .../home/routes/home/home.component.scss      |  2 +-
 .../users-upload/users-upload.component.html  |  4 +--
 .../users-upload/users-upload.component.scss  | 33 +++++++++++++++++++
 src/styles/_ws-common.scss                    |  5 +++
 4 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/home/home.component.scss b/project/ws/app/src/lib/routes/home/routes/home/home.component.scss
index 106cea1a8..164f2462b 100644
--- a/project/ws/app/src/lib/routes/home/routes/home/home.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/home/home.component.scss
@@ -23,7 +23,7 @@
   min-width: 240px;
   overflow: hidden !important;
   box-sizing: border-box;
-  height: 100vh;
+  // height: 100vh;
   // max-width: 240px;
 
   // ::ng-deep.mat-drawer-inner-container {
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
index 4e8deb634..b134fa949 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
@@ -40,11 +40,11 @@
           </button>
         </div>
       </div>
-      <div class="flex flex-row">
+      <!-- <div class="flex flex-row">
         <div class="mt-2 ws-mat-black60-text">
           Need help? contact us <a class="mat-accent" target="_blank" href="{{contactUsUrl}}">here</a>
         </div>
-      </div>
+      </div> -->
     </mat-card>
   </div>
 
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
index da6c76c8d..980b7a6c7 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
@@ -82,4 +82,37 @@ td, th {
   min-width: 100px !important;
   max-width: 14%;
   justify-content: center;
+}
+
+::ng-deep .mat-header-cell:nth-child(1),
+::ng-deep .mat-cell:nth-child(1) {
+  flex: 0 0 28% !important;
+  width: 28% !important;
+}
+
+::ng-deep .mat-header-cell:nth-child(2),
+::ng-deep .mat-cell:nth-child(2) {
+  flex: 0 0 10% !important;
+  width: 10% !important;
+}
+
+::ng-deep .mat-header-cell:nth-child(3),
+::ng-deep .mat-cell:nth-child(3) {
+  flex: 0 0 10% !important;
+  width: 10% !important;
+}
+
+::ng-deep .mat-header-cell:nth-child(4),
+::ng-deep .mat-cell:nth-child(4) {
+  flex: 0 0 10% !important;
+  width: 10% !important;
+}
+::ng-deep .mat-header-cell:nth-child(5),
+::ng-deep .mat-cell:nth-child(5) {
+  flex: 0 0 10% !important;
+  width: 10% !important;
+}
+
+::ng-deep.textclass {
+  margin: 0 !important;
 }
\ No newline at end of file
diff --git a/src/styles/_ws-common.scss b/src/styles/_ws-common.scss
index 88a712750..de9b43d04 100644
--- a/src/styles/_ws-common.scss
+++ b/src/styles/_ws-common.scss
@@ -1,6 +1,11 @@
 @import 'ws-vars';
 @import 'ws-mixins';
 
+// for main left sidebar fix in all pages
+::ng-deep .mat-nav-list.custom-class {
+  max-height: 100% !important;
+}
+
 %background-image-center {
   background-repeat: no-repeat;
   background-size: cover;

From d6e9be4c2072537a06ec0bb4741baa3efb674218 Mon Sep 17 00:00:00 2001
From: Bharath Kumar <bharathkumar@TI-MAC-087.local>
Date: Tue, 8 Aug 2023 16:40:52 +0530
Subject: [PATCH 176/887] changes in the version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 710f94c27..ce77822ed 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "@project-sunbird/telemetry-sdk": "0.0.26",
     "@sunbird-cb/collection": "^1.0.24",
     "@sunbird-cb/design-system": "0.0.1",
-    "@sunbird-cb/rain-dashboards": "^0.4.14",
+    "@sunbird-cb/rain-dashboards": "0.4.22-rc.1",
     "@sunbird-cb/resolver": "^1.0.0",
     "@sunbird-cb/utils": "^1.0.13",
     "@types/file-saver": "^2.0.1",

From 2f102353d0f9b07a1085e8169fdea02d227a3012 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Wed, 9 Aug 2023 17:23:20 +0530
Subject: [PATCH 177/887] Nominate learners for a blended program

---
 .../blended-approvals.module.ts               |  11 +-
 .../batch-details.component.html              |   7 +-
 .../batch-details.component.scss              |   8 ++
 .../batch-details/batch-details.component.ts  |  45 +++++--
 .../batch-list/batch-list.component.ts        |   8 +-
 .../nominate-users-dialog.component.html      |  56 +++++++++
 .../nominate-users-dialog.component.scss      | 111 ++++++++++++++++++
 .../nominate-users-dialog.component.spec.ts   |  25 ++++
 .../nominate-users-dialog.component.ts        |  81 +++++++++++++
 9 files changed, 337 insertions(+), 15 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.html
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.scss
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts b/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
index 73392ea40..3e6f8a0c7 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
@@ -15,6 +15,9 @@ import {
   MatIconModule,
   MatButtonModule,
   MatBadgeModule,
+  MatTableModule,
+  MatCheckboxModule,
+  MatSortModule
 } from '@angular/material'
 import { MatCardModule } from '@angular/material/card'
 import { BatchDetailsComponent } from './components/batch-details/batch-details.component'
@@ -25,15 +28,17 @@ import { UsersCardComponent } from './components/users-card/users-card.component
 import { ProfileViewComponent } from './components/profile-view/profile-view.component'
 import { PipeEmailModule } from '../pipes/pipe-email/pipe-email.module'
 import { PipeOrderByModule } from '../pipes/pipe-order-by/pipe-order-by.module'
-import { ProfileCertificateDialogModule } from './components/profile-certificate-dialog/profile-certificate-dialog.module';
+import { ProfileCertificateDialogModule } from './components/profile-certificate-dialog/profile-certificate-dialog.module'
 import { SessionCardComponent } from './components/session-card/session-card.component'
+import { NominateUsersDialogComponent } from './components/nominate-users-dialog/nominate-users-dialog.component'
 
 @NgModule({
-  declarations: [BlendedHomeComponent, BatchListComponent, BatchDetailsComponent, UsersCardComponent, ProfileViewComponent, SessionCardComponent],
+  declarations: [BlendedHomeComponent, BatchListComponent, BatchDetailsComponent, UsersCardComponent, ProfileViewComponent, SessionCardComponent, NominateUsersDialogComponent],
   imports: [CommonModule, BlendedApprovalsRoutingModule, BreadcrumbsOrgModule, LeftMenuWithoutLogoModule, WidgetResolverModule,
     MatSidenavModule, MatButtonModule, MatIconModule, HomeModule, RouterModule, UIORGTableModule,
-    MatCardModule, AvatarPhotoModule, MatListModule, PipeEmailModule, PipeOrderByModule, ProfileCertificateDialogModule, MatBadgeModule],
+    MatCardModule, AvatarPhotoModule, MatListModule, PipeEmailModule, PipeOrderByModule, ProfileCertificateDialogModule, MatBadgeModule, MatTableModule, MatCheckboxModule, MatSortModule],
   exports: [],
   providers: [],
+  entryComponents: [NominateUsersDialogComponent]
 })
 export class BlendedApprovalsModule { }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
index 8e3c6817f..283fbbc83 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
@@ -19,7 +19,7 @@
       </ng-container>
 
       <ng-container>
-        <div class="flex flex-1 flex-column margin-fix">
+        <div class="flex flex-1 flex-row margin-fix">
           <div class="flex flex-1 filter max-height-60">
             <a class="filter-option cursor-pointer" [ngClass]="{'ws-mat-accent-border-active font-bold' : currentFilter === 'pending',
                                                 'ws-mat-accent-border font-medium':currentFilter !== 'pending'}"
@@ -45,6 +45,11 @@
               <!-- <span *ngIf="rejectedUsers" class="ws-mat-black60-text">({{rejectedUsers.length}})</span> -->
             </a>
           </div>
+          <div class="flex-2 right-align margin-top-l" *ngIf="currentFilter === 'approved'">
+            <button type="button" mat-button class="add-nomine-btn" (click)="onNominateUsersClick('nominateUsers')">
+              Nominate learners
+            </button>
+          </div>
         </div>
         <ng-container *ngIf="currentFilter === 'pending'">
           <div class="b-c box" *ngIf="newUsers && newUsers.length > 0">
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss
index b38798014..47eec0def 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss
@@ -84,3 +84,11 @@
   color: red;
   font-weight: bold;
 }
+
+.add-nomine-btn {
+  background: #0075B7 !important;
+  color: white !important;
+  font-family: 'Lato';
+  font-weight: 700;
+  font-size: 14px;
+}
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index 9ba27ef16..ef7dabd4f 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -1,9 +1,12 @@
 import { Component, OnInit } from '@angular/core'
-import { MatSnackBar } from '@angular/material'
+import { MatDialog, MatSnackBar } from '@angular/material'
 import { ActivatedRoute, Router } from '@angular/router'
 // tslint:disable-next-line:import-name
 import _ from 'lodash'
 import { BlendedApporvalService } from '../../services/blended-approval.service'
+import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
+import { EventService } from '@sunbird-cb/utils'
+import { NominateUsersDialogComponent } from '../nominate-users-dialog/nominate-users-dialog.component'
 
 @Component({
   selector: 'ws-app-batch-details',
@@ -26,14 +29,17 @@ export class BatchDetailsComponent implements OnInit {
 
   constructor(private router: Router, private activeRouter: ActivatedRoute,
     // tslint:disable-next-line:align
-    private bpService: BlendedApporvalService, private snackBar: MatSnackBar) {
+    private bpService: BlendedApporvalService,
+    private snackBar: MatSnackBar,
+    private events: EventService,
+    private dialogue: MatDialog) {
     const currentState = this.router.getCurrentNavigation()
     if (currentState && currentState.extras.state) {
       this.batchData = currentState.extras.state
     }
     if (this.activeRouter.parent && this.activeRouter.parent.snapshot.data.configService) {
       this.userProfile = this.activeRouter.parent.snapshot.data.configService.unMappedUser
-      // console.log('this.userProfile', this.userProfile)
+      console.log('this.userProfile', this.userProfile)
     }
     this.programID = this.activeRouter.snapshot.params.id
     this.batchID = this.activeRouter.snapshot.params.batchid
@@ -65,6 +71,7 @@ export class BatchDetailsComponent implements OnInit {
       default:
         break
     }
+    this.raiseTelemetry(this.currentFilter)
   }
 
   getBPDetails(programID: any) {
@@ -137,23 +144,23 @@ export class BatchDetailsComponent implements OnInit {
   getSessionDetails() {
     this.sessionDetails = [
       {
-        title: "Intro to AI - Session 1",
+        title: "Intro to Angular - Session 1",
         description: "Angular is an open-source, JavaScript framework written in TypeScript. Google maintains it, and its primary purpose is to develop single-page applications. As a framework, Angular has clear advantages while also providing a standard structure for developers to work with. It enables users to create large applications in a maintainable manner. Frameworks in general boost web development efficiency and performance by providing a consistent structure so that developers don’t have to keep rebuilding code from scratch. Frameworks are time savers that offer developers a host of extra features that can be added to software without requiring extra effort.",
         type: "Offline session",
         facilitator: "Rangarajan",
         localtion: "Yes",
         qrCode: "Yes",
         duration: "4Hrs",
-        date: "12 June 2023",
+        date: "23 Aug 2023",
         time: "9:00 AM - 1:00 PM",
         feedbackUrl: "https://surveymonkey.com/123456",
         joinLink: "https://teams.microsoft.com/QWDDIKMV129"
       },
       {
-        title: "Intro to Angular - Session 3",
+        title: "Intro to Angular - Session 2",
         description: 'Angular is a popular open-source web application framework developed by Google. It is written in TypeScript and is widely used for building dynamic and robust single-page applications (SPAs). Angular provides a set of tools and features that allow developers to create complex client-side applications with ease.',
         type: "Online session",
-        facilitator: "Venkat Kandagaddala",
+        facilitator: "Maximilian Schwarzmüller",
         localtion: "No",
         qrCode: "Yes",
         duration: "8Hrs",
@@ -207,6 +214,30 @@ export class BatchDetailsComponent implements OnInit {
     })
   }
 
+  raiseTelemetry(name: string) {
+    this.events.raiseInteractTelemetry(
+      {
+        type: TelemetryEvents.EnumInteractTypes.CLICK,
+        subType: TelemetryEvents.EnumInteractSubTypes.SIDE_NAV,
+        id: `${_.camelCase(name)}-tab`,
+      },
+      {},
+    )
+  }
+
+  onNominateUsersClick(name: string) {
+    const dialogRef = this.dialogue.open(NominateUsersDialogComponent, {
+      width: '950px',
+      data: { orgId: this.userProfile.rootOrgId },
+      disableClose: true
+    })
+    console.log("name ", name)
+    dialogRef.afterClosed().subscribe((response: any) => {
+      console.log("response ", response)
+    })
+
+  }
+
   private openSnackbar(primaryMsg: string, duration: number = 5000) {
     this.snackBar.open(primaryMsg, 'X', {
       duration,
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
index 72f897377..a0818699b 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
@@ -45,10 +45,10 @@ export class BatchListComponent implements OnInit {
                 offset: 0,
                 deptName: this.userProfile.channel,
               }
-              b.newrequestsCount = Math.floor(Math.random() * (10 - 0 + 0)) + 0
+              b.newrequestsCount = Math.floor(Math.random() * (100 - 0 + 0)) + 0
               b.learnersCount = 0
               this.bpService.getRequests(request).subscribe((resnew: any) => {
-                if (resnew) {
+                if (resnew && resnew.length > 0) {
                   b.newrequestsCount = resnew.result.data.length
                 }
               })
@@ -99,9 +99,9 @@ export class BatchListComponent implements OnInit {
                 deptName: this.userProfile.channel,
               }
               b.learnersCount = 0
-              b.newrequestsCount = Math.floor(Math.random() * (10 - 0 + 0)) + 0
+              b.newrequestsCount = Math.floor(Math.random() * (100 - 0 + 0)) + 0
               this.bpService.getRequests(request).subscribe((resnew: any) => {
-                if (resnew) {
+                if (resnew && resnew.length > 0) {
                   b.newrequestsCount = resnew.result.data.length
                 }
               })
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.html
new file mode 100644
index 000000000..24482ff05
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.html
@@ -0,0 +1,56 @@
+<div class="nominate-dialog">
+  <h2 mat-dialog-title>Nominate learners</h2>
+
+  <div class="example-table-container">
+    <div class="container-balanced">
+      <div class="flex flex-1 custom">
+        <div class="flex-1">
+          <div class="search">
+            <div class="rsearch">
+              <mat-icon class="color-60 search-icon">search</mat-icon>
+              <input class="search-input color-60" type="Standard" label="" (input)="applyFilter($event.target.value)"
+                (keydown.enter)="onSearchEnter($event)" placeholder="Search" autofocus="none">
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="users-data">
+      <table mat-table [dataSource]="dataSource" class="mat-elevation-z8 nominate-learners  margin-top-l" matSort
+        matSortActive="name" matSortDirection="asc" matSortDisableClear *ngIf="dataSource.filteredData.length > 0">
+
+        <ng-container matColumnDef="select">
+          <th mat-header-cell *matHeaderCellDef class="header-row">
+
+          </th>
+          <td mat-cell *matCellDef="let row">
+            <mat-checkbox (click)="$event.stopPropagation()" (change)="$event ? selection.toggle(row) : null"
+              [checked]="selection.isSelected(row)">
+            </mat-checkbox>
+          </td>
+        </ng-container>
+
+        <ng-container matColumnDef="{{colname.name}}" *ngFor="let colname of tableColumns">
+          <th mat-header-cell *matHeaderCellDef class="header-row" mat-sort-header> {{colname.dispalyName}} </th>
+          <td mat-cell *matCellDef="let element"> {{element[colname.name]}}</td>
+        </ng-container>
+
+        <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+        <tr mat-row *matRowDef="let row; columns: displayedColumns;" (click)="selection.toggle(row)">
+        </tr>
+      </table>
+      <mat-card class="flex-1" role="none" *ngIf="dataSource.filteredData.length === 0">
+        <span class="mat-subtitle">No data found</span>
+      </mat-card>
+    </div>
+
+    <div mat-dialog-actions class="margin-top-m mat-dialog-actions">
+      <button mat-raised-button type="button"
+        class="flex-auto-display mat-button-base margin-right-m ws-mat-default-text" i18n
+        (click)="closeDiaogBox()">Cancel</button>
+      <button class="text-white ws-mat-primary-background margin-right-m" mat-raised-button color="primary"
+        type="submit" i18n [disabled]="this.selection.selected.length === 0" (click)="addLearners()"><span
+          class="text-white">Nominate</span></button>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.scss
new file mode 100644
index 000000000..61f45cf18
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.scss
@@ -0,0 +1,111 @@
+@import 'ws-mixins';
+@import 'ws-vars';
+@import 'ws-common';
+
+
+.ws-mat-primary-background {
+  background-color: #0075B7 !important;
+  border-radius: 4px;
+  margin-right: 16px;
+  color: white !important;
+}
+
+.ws-mat-primary-background:disabled, .ws-mat-primary-background[disabled] {
+  opacity: 0.6;
+}
+
+.nominate-dialog {
+  position: relative;
+}
+
+.nominate-container {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+}
+.search-icon {
+  position: absolute;
+  top: 9px;
+  font-size: 20px;
+  left: 10px;
+}
+
+.container-balanced {
+  max-width: 99%;
+  margin-left: auto !important;
+  margin-right: auto !important;
+}
+
+.flex-1 {
+  flex: 1;
+}
+
+.search {
+  display: flex;
+  flex: 1;
+}
+
+.rsearch {
+  display: flex;
+  position: relative;
+  flex: 1 1 auto;
+}
+
+.search-input {
+  width: 45%;
+  border-radius: 4px;
+  border: 1px solid #d5d0d0;
+  padding: 9px 9px 9px 35px;
+  margin-bottom: 20px;
+  margin-top: 0;
+  font: normal 14px Lato;
+  font-weight: 400;
+}
+.nominate-learners {
+  width: 100%;
+
+}
+.mat-cell {
+  width: 33%!important;
+}
+
+.add-nominees-btn {
+  background: #0075B7 !important;
+  color: white !important;
+  font-family: 'Lato';
+  font-weight: 700;
+  font-size: 14px;
+}
+.cancle-nominees-btn {
+  background: white !important;
+  color: #0075B7 !important;
+  font-family: 'Lato';
+  font-weight: 700;
+  font-size: 14px;
+}
+
+.users-data {
+  max-height: 500px;
+  overflow: auto;
+}
+
+.header-row {
+  background-color: #f5f5f5 !important;
+  font-size: 16px;
+  width: 15%;
+}
+
+.add-nominees-btn:disabled{
+  opacity: 0.6!important;
+}
+
+.mat-dialog-actions {
+  justify-content: flex-end;
+  margin-bottom: -10px!important;
+}
+.mat-header-row, .mat-row {
+  height: 40px!important;
+}
+.mat-column-select {
+  width: 5%!important;
+}
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.spec.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.spec.ts
new file mode 100644
index 000000000..ffec865d0
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { NominateUsersDialogComponent } from './nominate-users-dialog.component';
+
+describe('NominateUsersDialogComponent', () => {
+  let component: NominateUsersDialogComponent;
+  let fixture: ComponentFixture<NominateUsersDialogComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ NominateUsersDialogComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(NominateUsersDialogComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
new file mode 100644
index 000000000..44eb8ec86
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
@@ -0,0 +1,81 @@
+import { SelectionModel } from '@angular/cdk/collections'
+import { Component, Inject, OnInit, ViewChild } from '@angular/core'
+import { MAT_DIALOG_DATA, MatDialogRef, MatTableDataSource } from '@angular/material'
+import { UsersService } from '../../../users/services/users.service'
+import { MatSort } from '@angular/material/sort'
+
+@Component({
+  selector: 'ws-app-nominate-users-dialog',
+  templateUrl: './nominate-users-dialog.component.html',
+  styleUrls: ['./nominate-users-dialog.component.scss'],
+
+})
+export class NominateUsersDialogComponent implements OnInit {
+
+  displayedColumns: string[] = ['select', 'name', 'email'];
+
+  selection = new SelectionModel(true, []);
+  filteredUsers: any = []
+  dataSource = new MatTableDataSource<any>()
+
+  @ViewChild(MatSort, { static: false }) set matSort(sort: MatSort) {
+    if (!this.dataSource.sort) {
+      this.dataSource.sort = sort
+    }
+  }
+
+  tableColumns = [
+    { name: 'name', dispalyName: "Full name" },
+    { name: 'email', dispalyName: "Email" },
+  ]
+
+  constructor(public dialogRef: MatDialogRef<NominateUsersDialogComponent>,
+    private usersService: UsersService,
+    @Inject(MAT_DIALOG_DATA) public data: any) { }
+
+  ngOnInit() {
+    const filterObj = {
+      request: {
+        query: '',
+        filters: {
+          rootOrgId: this.data.orgId,
+        },
+      },
+    }
+    this.getAllUsers(filterObj)
+  }
+
+  getAllUsers(filterObj: any) {
+    this.filteredUsers = []
+    this.usersService.getAllUsers(filterObj).subscribe(data => {
+      data.content.map((details: any) => {
+        this.filteredUsers.push({
+          name: details.firstName,
+          email: details.maskedEmail,
+          userId: details.id
+        })
+      })
+      this.dataSource = new MatTableDataSource(this.filteredUsers)
+    })
+  }
+
+  applyFilter(filterValue: string) {
+    const filterObj = {
+      request: {
+        query: filterValue ? filterValue.trim().toLowerCase() : '',
+        filters: {
+          rootOrgId: this.data.orgId,
+        },
+      },
+    }
+    this.getAllUsers(filterObj)
+  }
+
+  addLearners() {
+    console.log("learners", this.selection.selected)
+  }
+
+  closeDiaogBox() {
+    this.dialogRef.close("close")
+  }
+}

From 17540a6cd1a1e7cb0479c1e6865bf80886818001 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Wed, 9 Aug 2023 18:03:55 +0530
Subject: [PATCH 178/887] lint fixes

---
 .../blended-approvals.module.ts               | 10 ++--
 .../batch-details/batch-details.component.ts  | 58 +++++++++----------
 .../batch-list/batch-list.component.ts        | 14 ++---
 .../nominate-users-dialog.component.spec.ts   | 28 ++++-----
 .../nominate-users-dialog.component.ts        | 18 +++---
 .../session-card.component.spec.ts            | 28 ++++-----
 .../session-card/session-card.component.ts    |  2 +-
 7 files changed, 78 insertions(+), 80 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts b/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
index 3e6f8a0c7..494a8da23 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
@@ -17,7 +17,7 @@ import {
   MatBadgeModule,
   MatTableModule,
   MatCheckboxModule,
-  MatSortModule
+  MatSortModule,
 } from '@angular/material'
 import { MatCardModule } from '@angular/material/card'
 import { BatchDetailsComponent } from './components/batch-details/batch-details.component'
@@ -33,12 +33,14 @@ import { SessionCardComponent } from './components/session-card/session-card.com
 import { NominateUsersDialogComponent } from './components/nominate-users-dialog/nominate-users-dialog.component'
 
 @NgModule({
-  declarations: [BlendedHomeComponent, BatchListComponent, BatchDetailsComponent, UsersCardComponent, ProfileViewComponent, SessionCardComponent, NominateUsersDialogComponent],
+  declarations: [BlendedHomeComponent, BatchListComponent, BatchDetailsComponent, UsersCardComponent, ProfileViewComponent,
+    SessionCardComponent, NominateUsersDialogComponent],
   imports: [CommonModule, BlendedApprovalsRoutingModule, BreadcrumbsOrgModule, LeftMenuWithoutLogoModule, WidgetResolverModule,
     MatSidenavModule, MatButtonModule, MatIconModule, HomeModule, RouterModule, UIORGTableModule,
-    MatCardModule, AvatarPhotoModule, MatListModule, PipeEmailModule, PipeOrderByModule, ProfileCertificateDialogModule, MatBadgeModule, MatTableModule, MatCheckboxModule, MatSortModule],
+    MatCardModule, AvatarPhotoModule, MatListModule, PipeEmailModule, PipeOrderByModule, ProfileCertificateDialogModule,
+    MatBadgeModule, MatTableModule, MatCheckboxModule, MatSortModule],
   exports: [],
   providers: [],
-  entryComponents: [NominateUsersDialogComponent]
+  entryComponents: [NominateUsersDialogComponent],
 })
 export class BlendedApprovalsModule { }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index ef7dabd4f..aa8aab422 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -30,16 +30,16 @@ export class BatchDetailsComponent implements OnInit {
   constructor(private router: Router, private activeRouter: ActivatedRoute,
     // tslint:disable-next-line:align
     private bpService: BlendedApporvalService,
-    private snackBar: MatSnackBar,
-    private events: EventService,
-    private dialogue: MatDialog) {
+              private snackBar: MatSnackBar,
+              private events: EventService,
+              private dialogue: MatDialog) {
     const currentState = this.router.getCurrentNavigation()
     if (currentState && currentState.extras.state) {
       this.batchData = currentState.extras.state
     }
     if (this.activeRouter.parent && this.activeRouter.parent.snapshot.data.configService) {
       this.userProfile = this.activeRouter.parent.snapshot.data.configService.unMappedUser
-      console.log('this.userProfile', this.userProfile)
+      // console.log('this.userProfile', this.userProfile)
     }
     this.programID = this.activeRouter.snapshot.params.id
     this.batchID = this.activeRouter.snapshot.params.batchid
@@ -144,32 +144,32 @@ export class BatchDetailsComponent implements OnInit {
   getSessionDetails() {
     this.sessionDetails = [
       {
-        title: "Intro to Angular - Session 1",
-        description: "Angular is an open-source, JavaScript framework written in TypeScript. Google maintains it, and its primary purpose is to develop single-page applications. As a framework, Angular has clear advantages while also providing a standard structure for developers to work with. It enables users to create large applications in a maintainable manner. Frameworks in general boost web development efficiency and performance by providing a consistent structure so that developers don’t have to keep rebuilding code from scratch. Frameworks are time savers that offer developers a host of extra features that can be added to software without requiring extra effort.",
-        type: "Offline session",
-        facilitator: "Rangarajan",
-        localtion: "Yes",
-        qrCode: "Yes",
-        duration: "4Hrs",
-        date: "23 Aug 2023",
-        time: "9:00 AM - 1:00 PM",
-        feedbackUrl: "https://surveymonkey.com/123456",
-        joinLink: "https://teams.microsoft.com/QWDDIKMV129"
+        title: 'Intro to Angular - Session 1',
+        description: 'Angular is an open-source, JavaScript framework written in TypeScript. Google maintains it, and its primary purpose is to develop single-page applications. As a framework, Angular has clear advantages while also providing a standard structure for developers to work with. It enables users to create large applications in a maintainable manner. Frameworks in general boost web development efficiency and performance by providing a consistent structure so that developers don’t have to keep rebuilding code from scratch. Frameworks are time savers that offer developers a host of extra features that can be added to software without requiring extra effort.',
+        type: 'Offline session',
+        facilitator: 'Rangarajan',
+        localtion: 'Yes',
+        qrCode: 'Yes',
+        duration: '4Hrs',
+        date: '23 Aug 2023',
+        time: '9:00 AM - 1:00 PM',
+        feedbackUrl: 'https://surveymonkey.com/123456',
+        joinLink: 'https://teams.microsoft.com/QWDDIKMV129',
       },
       {
-        title: "Intro to Angular - Session 2",
+        title: 'Intro to Angular - Session 2',
         description: 'Angular is a popular open-source web application framework developed by Google. It is written in TypeScript and is widely used for building dynamic and robust single-page applications (SPAs). Angular provides a set of tools and features that allow developers to create complex client-side applications with ease.',
-        type: "Online session",
-        facilitator: "Maximilian Schwarzmüller",
-        localtion: "No",
-        qrCode: "Yes",
-        duration: "8Hrs",
-        date: "31 Aug 2023",
-        time: "9:00 AM - 5:00 PM",
-        feedbackUrl: "https://surveymonkey.com/67890",
-        feedbackUrlHelpText: "This survey won't take more than 2 minutes.",
-        joinLink: "https://teams.microsoft.com/ABCDPIKL123"
-      }
+        type: 'Online session',
+        facilitator: 'Maximilian Schwarzmüller',
+        localtion: 'No',
+        qrCode: 'Yes',
+        duration: '8Hrs',
+        date: '31 Aug 2023',
+        time: '9:00 AM - 5:00 PM',
+        feedbackUrl: 'https://surveymonkey.com/67890',
+        feedbackUrlHelpText: 'This survey won\'t take more than 2 minutes.',
+        joinLink: 'https://teams.microsoft.com/ABCDPIKL123',
+      },
     ]
   }
 
@@ -229,11 +229,9 @@ export class BatchDetailsComponent implements OnInit {
     const dialogRef = this.dialogue.open(NominateUsersDialogComponent, {
       width: '950px',
       data: { orgId: this.userProfile.rootOrgId },
-      disableClose: true
+      disableClose: true,
     })
-    console.log("name ", name)
     dialogRef.afterClosed().subscribe((response: any) => {
-      console.log("response ", response)
     })
 
   }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
index a0818699b..4125a4c43 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
@@ -52,10 +52,9 @@ export class BatchListComponent implements OnInit {
                   b.newrequestsCount = resnew.result.data.length
                 }
               })
-              this.bpService.getLearners(b.batchId).subscribe((res: any) => {
-                console.log("learners ", res)
-                if (res && res.length > 0) {
-                  b.learnersCount = res.length
+              this.bpService.getLearners(b.batchId).subscribe((r: any) => {
+                if (r && r.length > 0) {
+                  b.learnersCount = r.length
                 }
               })
             }
@@ -105,10 +104,9 @@ export class BatchListComponent implements OnInit {
                   b.newrequestsCount = resnew.result.data.length
                 }
               })
-              this.bpService.getLearners(b.batchId).subscribe((res: any) => {
-                console.log("learners ", res)
-                if (res && res.length > 0) {
-                  b.learnersCount = res.length
+              this.bpService.getLearners(b.batchId).subscribe((r: any) => {
+                if (r && r.length > 0) {
+                  b.learnersCount = r.length
                 }
               })
             }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.spec.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.spec.ts
index ffec865d0..34ccc7863 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.spec.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.spec.ts
@@ -1,25 +1,25 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
 
-import { NominateUsersDialogComponent } from './nominate-users-dialog.component';
+import { NominateUsersDialogComponent } from './nominate-users-dialog.component'
 
 describe('NominateUsersDialogComponent', () => {
-  let component: NominateUsersDialogComponent;
-  let fixture: ComponentFixture<NominateUsersDialogComponent>;
+  let component: NominateUsersDialogComponent
+  let fixture: ComponentFixture<NominateUsersDialogComponent>
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ NominateUsersDialogComponent ]
+      declarations: [NominateUsersDialogComponent],
     })
-    .compileComponents();
-  }));
+    .compileComponents()
+  }))
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(NominateUsersDialogComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+    fixture = TestBed.createComponent(NominateUsersDialogComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
 
   it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
index 44eb8ec86..c2889a656 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
@@ -12,9 +12,9 @@ import { MatSort } from '@angular/material/sort'
 })
 export class NominateUsersDialogComponent implements OnInit {
 
-  displayedColumns: string[] = ['select', 'name', 'email'];
+  displayedColumns: string[] = ['select', 'name', 'email']
 
-  selection = new SelectionModel(true, []);
+  selection = new SelectionModel(true, [])
   filteredUsers: any = []
   dataSource = new MatTableDataSource<any>()
 
@@ -25,13 +25,13 @@ export class NominateUsersDialogComponent implements OnInit {
   }
 
   tableColumns = [
-    { name: 'name', dispalyName: "Full name" },
-    { name: 'email', dispalyName: "Email" },
+    { name: 'name', dispalyName: 'Full name' },
+    { name: 'email', dispalyName: 'Email' },
   ]
 
   constructor(public dialogRef: MatDialogRef<NominateUsersDialogComponent>,
-    private usersService: UsersService,
-    @Inject(MAT_DIALOG_DATA) public data: any) { }
+              private usersService: UsersService,
+              @Inject(MAT_DIALOG_DATA) public data: any) { }
 
   ngOnInit() {
     const filterObj = {
@@ -52,7 +52,7 @@ export class NominateUsersDialogComponent implements OnInit {
         this.filteredUsers.push({
           name: details.firstName,
           email: details.maskedEmail,
-          userId: details.id
+          userId: details.id,
         })
       })
       this.dataSource = new MatTableDataSource(this.filteredUsers)
@@ -72,10 +72,10 @@ export class NominateUsersDialogComponent implements OnInit {
   }
 
   addLearners() {
-    console.log("learners", this.selection.selected)
+    console.log('learners', this.selection.selected)
   }
 
   closeDiaogBox() {
-    this.dialogRef.close("close")
+    this.dialogRef.close('close')
   }
 }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.spec.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.spec.ts
index 87a3cb062..4d39d2a43 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.spec.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.spec.ts
@@ -1,25 +1,25 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
 
-import { SessionCardComponent } from './session-card.component';
+import { SessionCardComponent } from './session-card.component'
 
 describe('SessionCardComponent', () => {
-  let component: SessionCardComponent;
-  let fixture: ComponentFixture<SessionCardComponent>;
+  let component: SessionCardComponent
+  let fixture: ComponentFixture<SessionCardComponent>
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ SessionCardComponent ]
+      declarations: [SessionCardComponent],
     })
-    .compileComponents();
-  }));
+    .compileComponents()
+  }))
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(SessionCardComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+    fixture = TestBed.createComponent(SessionCardComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
 
   it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.ts
index 90f37e30c..de5cc11f8 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.ts
@@ -3,7 +3,7 @@ import { Component, Input, OnInit } from '@angular/core'
 @Component({
   selector: 'ws-app-session-card',
   templateUrl: './session-card.component.html',
-  styleUrls: ['./session-card.component.scss']
+  styleUrls: ['./session-card.component.scss'],
 })
 export class SessionCardComponent implements OnInit {
 

From daa10955cc10d47cfe4bed81b1a4dc50eb426140 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Thu, 10 Aug 2023 15:59:10 +0530
Subject: [PATCH 179/887] Search users based on button click

---
 .../batch-details/batch-details.component.ts       |  9 ++++++---
 .../nominate-users-dialog.component.html           | 14 ++++++++++----
 .../nominate-users-dialog.component.scss           |  8 ++++++--
 .../nominate-users-dialog.component.ts             | 11 ++++++-----
 4 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index aa8aab422..896b4fced 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -30,9 +30,9 @@ export class BatchDetailsComponent implements OnInit {
   constructor(private router: Router, private activeRouter: ActivatedRoute,
     // tslint:disable-next-line:align
     private bpService: BlendedApporvalService,
-              private snackBar: MatSnackBar,
-              private events: EventService,
-              private dialogue: MatDialog) {
+    private snackBar: MatSnackBar,
+    private events: EventService,
+    private dialogue: MatDialog) {
     const currentState = this.router.getCurrentNavigation()
     if (currentState && currentState.extras.state) {
       this.batchData = currentState.extras.state
@@ -230,8 +230,11 @@ export class BatchDetailsComponent implements OnInit {
       width: '950px',
       data: { orgId: this.userProfile.rootOrgId },
       disableClose: true,
+      autoFocus: false
     })
+    console.log(name)
     dialogRef.afterClosed().subscribe((response: any) => {
+      console.log(response)
     })
 
   }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.html
index 24482ff05..7f2aae423 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.html
@@ -3,20 +3,26 @@ <h2 mat-dialog-title>Nominate learners</h2>
 
   <div class="example-table-container">
     <div class="container-balanced">
-      <div class="flex flex-1 custom">
+      <div class="flex flex-1 flex-row">
         <div class="flex-1">
           <div class="search">
             <div class="rsearch">
               <mat-icon class="color-60 search-icon">search</mat-icon>
-              <input class="search-input color-60" type="Standard" label="" (input)="applyFilter($event.target.value)"
-                (keydown.enter)="onSearchEnter($event)" placeholder="Search" autofocus="none">
+              <input class="search-input color-60" type="Standard" #searchText placeholder="Search by name or email"
+                autofocus="none">
             </div>
           </div>
         </div>
+        <div class="flex-2 margin-left-m">
+          <button class="text-white ws-mat-primary-background" mat-raised-button color="primary" type="submit" i18n
+            (click)="searchUsers(searchText)">
+            <span class="text-white">Search</span>
+          </button>
+        </div>
       </div>
     </div>
     <div class="users-data">
-      <table mat-table [dataSource]="dataSource" class="mat-elevation-z8 nominate-learners  margin-top-l" matSort
+      <table mat-table [dataSource]="dataSource" class="mat-elevation-z8 nominate-learners  margin-top-s" matSort
         matSortActive="name" matSortDirection="asc" matSortDisableClear *ngIf="dataSource.filteredData.length > 0">
 
         <ng-container matColumnDef="select">
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.scss
index 61f45cf18..b86b5a89a 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.scss
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.scss
@@ -45,6 +45,10 @@
   flex: 1;
 }
 
+.flex-2 {
+  flex: 2;
+}
+
 .rsearch {
   display: flex;
   position: relative;
@@ -52,7 +56,7 @@
 }
 
 .search-input {
-  width: 45%;
+  width: 100%;
   border-radius: 4px;
   border: 1px solid #d5d0d0;
   padding: 9px 9px 9px 35px;
@@ -85,7 +89,7 @@
 }
 
 .users-data {
-  max-height: 500px;
+  height: 500px;
   overflow: auto;
 }
 
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
index c2889a656..3c9bca48e 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
@@ -13,7 +13,7 @@ import { MatSort } from '@angular/material/sort'
 export class NominateUsersDialogComponent implements OnInit {
 
   displayedColumns: string[] = ['select', 'name', 'email']
-
+  searchText: string = ''
   selection = new SelectionModel(true, [])
   filteredUsers: any = []
   dataSource = new MatTableDataSource<any>()
@@ -30,8 +30,8 @@ export class NominateUsersDialogComponent implements OnInit {
   ]
 
   constructor(public dialogRef: MatDialogRef<NominateUsersDialogComponent>,
-              private usersService: UsersService,
-              @Inject(MAT_DIALOG_DATA) public data: any) { }
+    private usersService: UsersService,
+    @Inject(MAT_DIALOG_DATA) public data: any) { }
 
   ngOnInit() {
     const filterObj = {
@@ -47,6 +47,7 @@ export class NominateUsersDialogComponent implements OnInit {
 
   getAllUsers(filterObj: any) {
     this.filteredUsers = []
+    this.dataSource = new MatTableDataSource()
     this.usersService.getAllUsers(filterObj).subscribe(data => {
       data.content.map((details: any) => {
         this.filteredUsers.push({
@@ -59,10 +60,10 @@ export class NominateUsersDialogComponent implements OnInit {
     })
   }
 
-  applyFilter(filterValue: string) {
+  searchUsers(filterValue: any) {
     const filterObj = {
       request: {
-        query: filterValue ? filterValue.trim().toLowerCase() : '',
+        query: filterValue.value ? filterValue.value.trim().toLowerCase() : '',
         filters: {
           rootOrgId: this.data.orgId,
         },

From 2a242cb05b43facfb05cc91bd7240d34461f77a1 Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Thu, 10 Aug 2023 18:08:26 +0530
Subject: [PATCH 180/887] Fixed bulk upload pages issues, event list sort &
 updated collection lib version

---
 package.json                                  |  2 +-
 .../event-list-view.component.ts              | 18 ++++----
 .../users-upload/users-upload.component.html  |  4 +-
 .../users-upload/users-upload.component.scss  | 42 ++++++-------------
 .../users-upload/users-upload.component.ts    |  6 ++-
 5 files changed, 31 insertions(+), 41 deletions(-)

diff --git a/package.json b/package.json
index be914dd7a..0e63a7005 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@angular/router": "~8.2.1",
     "@angular/service-worker": "~8.2.1",
     "@project-sunbird/telemetry-sdk": "0.0.26",
-    "@sunbird-cb/collection": "^1.0.27",
+    "@sunbird-cb/collection": "^1.0.29",
     "@sunbird-cb/design-system": "0.0.1",
     "@sunbird-cb/rain-dashboards": "0.4.22-rc.1",
     "@sunbird-cb/resolver": "^1.0.0",
diff --git a/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.ts b/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.ts
index 62bc5feac..e61ba79ce 100644
--- a/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.ts
+++ b/project/ws/app/src/lib/routes/events/components/event-list-view/event-list-view.component.ts
@@ -48,12 +48,16 @@ export class EventListViewComponent implements OnInit, AfterViewInit, OnChanges,
   pageSize = 5
   pageSizeOptions = [5, 10, 20]
   @ViewChild(MatPaginator, { static: true }) paginator!: MatPaginator
-  // @ViewChild(MatSort, { static: false }) set matSort(sort: MatSort) {
-  //   if (!this.dataSource.sort) {
-  //     this.dataSource.sort = sort
-  //   }
-  // }
-  @ViewChild(MatSort, { static: true }) sort?: MatSort
+  @ViewChild(MatSort, { static: false }) set matSort(sort: MatSort) {
+
+    if (!this.dataSource.sort) {
+
+      this.dataSource.sort = sort
+
+    }
+
+  }
+  // @ViewChild(MatSort, { static: true }) sort?: MatSort
   selection = new SelectionModel<any>(true, [])
   dialogRef: any
   configSvc: any
@@ -90,7 +94,7 @@ export class EventListViewComponent implements OnInit, AfterViewInit, OnChanges,
 
   ngAfterViewInit() {
     this.dataSource.paginator = this.paginator
-    this.dataSource.sort = this.sort
+    // this.dataSource.sort = this.sort
     this.dataSource.filterPredicate = function (data: any, filter: string): boolean {
       return data.eventName.toLowerCase().includes(filter)
     }
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
index b134fa949..74535d7e9 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
@@ -59,14 +59,14 @@ <h2 class="contacts-head">File uploads</h2>
     </div>
   </div>
 
-  <div class="w-full relative">
+  <div class="w-full relative bulkupload-table">
     <!-- <h2 class="w-full contacts-head">File uploads</h2> -->
 
     <div class="example-loading w-full text-center" *ngIf="fetching">
       <mat-spinner></mat-spinner>
     </div>
     <ng-container *ngIf="!fetching && tableList && tableList.length > 0">
-      <ws-widget-org-user-table [tableData]='tabledata' [data]='tableList' (eOnRowClick)="downloadFullFile($event)">
+      <ws-widget-org-user-table [tableData]='tabledata' [data]='tableList' (actionsClick)="downloadFullFile($event)">
       </ws-widget-org-user-table>
     </ng-container>
     <ng-container *ngIf="(!bulkUploadData || !bulkUploadData.length) && !fetching">
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
index 980b7a6c7..cd32381a7 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
@@ -76,43 +76,27 @@ td, th {
   line-height: 2;
 }
 
-.mat-column-dateCreatedOn,
-.mat-column-dateUpdatedOn {
-  width: 100px !important;
-  min-width: 100px !important;
-  max-width: 14%;
-  justify-content: center;
+::ng-deep .bulkupload-table .mat-column-dateCreatedOn,
+::ng-deep .bulkupload-table .mat-column-dateUpdatedOn {
+  flex: 0 0 14% !important;
+  width: 14% !important;
 }
 
-::ng-deep .mat-header-cell:nth-child(1),
-::ng-deep .mat-cell:nth-child(1) {
+::ng-deep .bulkupload-table .mat-column-fileName {
   flex: 0 0 28% !important;
   width: 28% !important;
 }
 
-::ng-deep .mat-header-cell:nth-child(2),
-::ng-deep .mat-cell:nth-child(2) {
-  flex: 0 0 10% !important;
-  width: 10% !important;
-}
-
-::ng-deep .mat-header-cell:nth-child(3),
-::ng-deep .mat-cell:nth-child(3) {
-  flex: 0 0 10% !important;
-  width: 10% !important;
-}
-
-::ng-deep .mat-header-cell:nth-child(4),
-::ng-deep .mat-cell:nth-child(4) {
-  flex: 0 0 10% !important;
-  width: 10% !important;
-}
-::ng-deep .mat-header-cell:nth-child(5),
-::ng-deep .mat-cell:nth-child(5) {
-  flex: 0 0 10% !important;
-  width: 10% !important;
+::ng-deep .bulkupload-table .mat-header-cell,
+::ng-deep .bulkupload-table .mat-cell {
+  padding-right: 8px !important;
 }
 
 ::ng-deep.textclass {
   margin: 0 !important;
+}
+
+::ng-deep .bulkupload-table .mat-sort-header-button {
+  line-height: 1.5;
+  text-align: left;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
index 93ca53781..894d44237 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
@@ -77,7 +77,6 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
     this.displayLoader = this.fileService.isLoading()
     this.contactUsUrl = `${environment.karmYogiPath}/public/contact `
     this.tabledata = {
-      actions: [],
       columns: [
         // { displayName: 'Id', key: 'identifier' },
         { displayName: 'Name', key: 'fileName' },
@@ -93,6 +92,8 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
       sortColumn: 'dateCreatedOn',
       sortState: 'desc',
       needUserMenus: false,
+      actions: [{ icon: 'download', label: 'Download File', name: 'DownloadFile', type: 'link', disabled: false }],
+      actionColumnName: 'Download File',
     }
     this.getBulkUploadData()
   }
@@ -174,6 +175,7 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
             _res => {
               // this.uplaodSuccessMsg = res
               this.openSnackbar('File uploaded successfully..!')
+              this.cancelSelected()
               // // tslint:disable-next-line: no-non-null-assertion
               // this.formGroup!.get('file')!.setValue(['', Validators.required])
               if (form && form.file) {
@@ -218,7 +220,7 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   downloadFullFile(event: any) {
-    const url = `/apis/proxies/v8/user/v1/bulkuser/download/${event.fileName}`
+    const url = `/apis/proxies/v8/user/v1/bulkuser/download/${event.row.fileName}`
     window.open(url, '_blank')
   }
 }

From 66195de61db10eedb65b7437b69b7a72f0129bb0 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Fri, 11 Aug 2023 15:43:37 +0530
Subject: [PATCH 181/887] fix new request count alignment

---
 .../components/batch-details/batch-details.component.html     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
index 283fbbc83..264b5d627 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
@@ -52,9 +52,9 @@
           </div>
         </div>
         <ng-container *ngIf="currentFilter === 'pending'">
+          <p class="padding-m new-request-count" *ngIf="newUsers.length > 0"> {{newUsers.length}} New
+            requests</p>
           <div class="b-c box" *ngIf="newUsers && newUsers.length > 0">
-            <p class="padding-m new-request-count"> {{newUsers.length}} New
-              requests</p>
             <div *ngFor="let user of newUsers">
               <ws-app-users-card [user]="user" [actions]="true" [programData]="linkData"
                 (userClick)="onSubmit($event)"></ws-app-users-card>

From 846d4464e6d8a657f7432f1e8b4b81b0fc1ff4f6 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Fri, 11 Aug 2023 17:32:07 +0530
Subject: [PATCH 182/887] Reject learner flow

---
 .../blended-approvals.module.ts               | 12 +++++--
 .../batch-details.component.html              |  3 +-
 .../batch-details/batch-details.component.ts  |  6 ++++
 .../reject-reason-dialog.component.html       | 23 ++++++++++++++
 .../reject-reason-dialog.component.scss       | 31 +++++++++++++++++++
 .../reject-reason-dialog.component.spec.ts    | 25 +++++++++++++++
 .../reject-reason-dialog.component.ts         | 26 ++++++++++++++++
 .../users-card/users-card.component.html      | 10 ++++--
 .../users-card/users-card.component.scss      |  6 +++-
 .../users-card/users-card.component.ts        | 18 +++++++++++
 10 files changed, 152 insertions(+), 8 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.html
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.scss
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.ts

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts b/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
index 494a8da23..7fe713358 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
@@ -18,6 +18,9 @@ import {
   MatTableModule,
   MatCheckboxModule,
   MatSortModule,
+  MatFormFieldModule,
+  MatDialogModule,
+  MatInputModule
 } from '@angular/material'
 import { MatCardModule } from '@angular/material/card'
 import { BatchDetailsComponent } from './components/batch-details/batch-details.component'
@@ -31,16 +34,19 @@ import { PipeOrderByModule } from '../pipes/pipe-order-by/pipe-order-by.module'
 import { ProfileCertificateDialogModule } from './components/profile-certificate-dialog/profile-certificate-dialog.module'
 import { SessionCardComponent } from './components/session-card/session-card.component'
 import { NominateUsersDialogComponent } from './components/nominate-users-dialog/nominate-users-dialog.component'
+import { RejectReasonDialogComponent } from './components/reject-reason-dialog/reject-reason-dialog.component'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+//import { AppButtonModule } from '../../head/app-button/app-button.module'
 
 @NgModule({
   declarations: [BlendedHomeComponent, BatchListComponent, BatchDetailsComponent, UsersCardComponent, ProfileViewComponent,
-    SessionCardComponent, NominateUsersDialogComponent],
+    SessionCardComponent, NominateUsersDialogComponent, RejectReasonDialogComponent],
   imports: [CommonModule, BlendedApprovalsRoutingModule, BreadcrumbsOrgModule, LeftMenuWithoutLogoModule, WidgetResolverModule,
     MatSidenavModule, MatButtonModule, MatIconModule, HomeModule, RouterModule, UIORGTableModule,
     MatCardModule, AvatarPhotoModule, MatListModule, PipeEmailModule, PipeOrderByModule, ProfileCertificateDialogModule,
-    MatBadgeModule, MatTableModule, MatCheckboxModule, MatSortModule],
+    MatBadgeModule, MatTableModule, MatCheckboxModule, MatSortModule, FormsModule, ReactiveFormsModule, MatFormFieldModule, MatDialogModule, MatInputModule],
   exports: [],
   providers: [],
-  entryComponents: [NominateUsersDialogComponent],
+  entryComponents: [NominateUsersDialogComponent, RejectReasonDialogComponent],
 })
 export class BlendedApprovalsModule { }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
index 264b5d627..74b09d848 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
@@ -67,7 +67,8 @@
         <ng-container *ngIf="currentFilter === 'approved'">
           <div class="b-c box" *ngIf="approvedUsers && approvedUsers.length > 0">
             <div *ngFor="let user of approvedUsers">
-              <ws-app-users-card [user]="user" [actions]="false" [programData]="linkData"></ws-app-users-card>
+              <ws-app-users-card [user]="user" [actions]="false" [remove]="removeLearner(batchData.startDate)"
+                [programData]="linkData"></ws-app-users-card>
             </div>
           </div>
           <div class="b-c box" *ngIf="approvedUsers && approvedUsers.length == 0">
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index 896b4fced..e15abfec3 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -251,4 +251,10 @@ export class BatchDetailsComponent implements OnInit {
   //   // You can use Angular's Router or any other mechanism to load the component
   // }
 
+  removeLearner(startDate: any) {
+    const sDate: Date = new Date(startDate)
+    const currentDate: Date = new Date('2023-08-11')
+    return currentDate < sDate
+  }
+
 }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.html
new file mode 100644
index 000000000..313af001c
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.html
@@ -0,0 +1,23 @@
+<div class="reason-dialog">
+  <h2 mat-dialog-title class="required">Please provide the reason for removal</h2>
+  <form [formGroup]="reasonForm" (ngSubmit)="onSubmit()" class="flex-4">
+    <div mat-dialog-content>
+      <mat-form-field appearance="outline" class="margin-top-xs">
+        <textarea matInput #reason formControlName="reason" maxlength="500" i18n-placeholder
+          placeholder="Enter your reason here" type="text" rows="5"></textarea>
+        <mat-hint i18n class="no-padding">
+          Limited to 500 characters.
+        </mat-hint>
+        <mat-error i18n="Reason Error | Explains reason is required" class="no-padding">
+          Reason is required
+        </mat-error>
+      </mat-form-field>
+    </div>
+    <div mat-dialog-actions class="flex-row-reverse margin-top-m">
+      <button mat-button class="text-white ws-mat-primary-background" mat-raised-button color="primary" type="submit"
+        i18n [disabled]="!reasonForm.valid"><span class="text-white">Reject</span></button>
+      <button mat-button mat-raised-button class="flex-auto-display mat-button-base margin-right-m ws-mat-default-text"
+        [mat-dialog-close]=false cdkFocusInitial i18n>Cancel</button>
+    </div>
+  </form>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.scss
new file mode 100644
index 000000000..f1b0eb463
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.scss
@@ -0,0 +1,31 @@
+@import 'ws-mixins';
+@import 'ws-vars';
+@import 'ws-common';
+
+
+.ws-mat-primary-background {
+  background-color: #0075B7 !important;
+  border-radius: 4px;
+  color: white !important;
+}
+
+.ws-mat-primary-background:disabled, .ws-mat-primary-background[disabled] {
+  opacity: 0.6;
+}
+
+.reason-dialog {
+  position: relative;
+}
+.required:after {
+  content:" *";
+  color: red;
+  position: absolute;
+  right: -5px;
+}
+.mat-form-field {
+  width: 100%!important;
+}
+
+.mat-form-field-flex.no-padding {
+  padding-left: 0!important;
+}
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.spec.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.spec.ts
new file mode 100644
index 000000000..22133293d
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { RejectReasonDialogComponent } from './reject-reason-dialog.component';
+
+describe('RejectReasonDialogComponent', () => {
+  let component: RejectReasonDialogComponent;
+  let fixture: ComponentFixture<RejectReasonDialogComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ RejectReasonDialogComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(RejectReasonDialogComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.ts
new file mode 100644
index 000000000..187d49dc1
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.ts
@@ -0,0 +1,26 @@
+import { Component, OnInit } from '@angular/core'
+import { FormControl, FormGroup, Validators } from '@angular/forms'
+import { MatDialogRef } from '@angular/material'
+
+@Component({
+  selector: 'ws-app-reject-reason-dialog',
+  templateUrl: './reject-reason-dialog.component.html',
+  styleUrls: ['./reject-reason-dialog.component.scss']
+})
+export class RejectReasonDialogComponent implements OnInit {
+  reasonForm!: FormGroup
+  constructor(public dialogRef: MatDialogRef<RejectReasonDialogComponent>) {
+    this.reasonForm = new FormGroup({
+      reason: new FormControl('', [Validators.required, Validators.maxLength(500)]),
+    })
+  }
+
+  ngOnInit() {
+  }
+
+  onSubmit() {
+    // console.log('this.reasonForm.value', this.reasonForm.value)
+    this.dialogRef.close(this.reasonForm.value)
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.html
index 3735578d6..7e8a4af7e 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.html
@@ -7,17 +7,21 @@
     </div>
     <div class="flex flex-col flex-1" *ngIf="user && user.userInfo" (click)="loadUser(user)">
       <p class="truncate margin-remove mat-body-1">{{user?.userInfo.first_name}}</p>
-      <p class="truncate ws-mat-black60-text margin-remove mat-body-2">{{user?.wfInfo[0].deptName}}</p>
+      <p class="truncate ws-mat-black60-text margin-remove mat-body-2">{{user?.wfInfo[0].deptName | slice:0:30}}</p>
     </div>
     <div class="flex flex-col flex-1" *ngIf="user && !user.userInfo" (click)="loadUser(user)">
       <p class="truncate margin-remove mat-body-1">{{user?.first_name}}</p>
-      <p class="truncate ws-mat-black60-text margin-remove mat-body-2">{{user?.deptName || user?.department }}</p>
+      <p class="truncate ws-mat-black60-text margin-remove mat-body-2">{{user?.deptName || user?.department}}</p>
     </div>
-    <div *ngIf="actions">
+    <div *ngIf="actions && !remove">
       <button type="button" mat-button class="margin-right-m cursor-pointer border-0"
         (click)="clickReject()">Reject</button>
       <button type="button" mat-button class="approve-btn cursor-pointer mat-accent-border"
         (click)="clickApprove()">Approve</button>
     </div>
+    <div *ngIf="remove && remove.toString() === 'true'">
+      <button type="button" mat-button class="cursor-pointer border-0 remove-user"
+        (click)="clickRemove()">Remove</button>
+    </div>
   </a>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.scss
index 8246cd307..4bbb4ff19 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.scss
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.scss
@@ -27,4 +27,8 @@ button {
     padding: 0.5em 1em;
     color: rgba(0,0,0,0.7);
     background: transparent;
-}
\ No newline at end of file
+}
+
+.remove-user {
+    color: #0075B7!important;
+}
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
index 6054f521b..3129f5a2e 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
@@ -2,6 +2,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
 import { MatDialog } from '@angular/material'
 import { DialogConfirmComponent } from '../../../../../../../../../src/app/component/dialog-confirm/dialog-confirm.component'
 import { Router } from '@angular/router'
+import { RejectReasonDialogComponent } from '../reject-reason-dialog/reject-reason-dialog.component'
 
 @Component({
   selector: 'ws-app-users-card',
@@ -15,6 +16,7 @@ export class UsersCardComponent implements OnInit {
   @Input() public photoUrl!: string
   @Input() public name!: string
   @Output() userClick = new EventEmitter()
+  @Input() remove: any
 
   constructor(private dialogue: MatDialog, private router: Router) { }
 
@@ -66,6 +68,22 @@ export class UsersCardComponent implements OnInit {
     })
   }
 
+  clickRemove() {
+    const dialogRef = this.dialogue.open(RejectReasonDialogComponent, {
+      width: '450px',
+      disableClose: true,
+
+    })
+    dialogRef.afterClosed().subscribe((response: any) => {
+      console.log(response)
+      if (response) {
+        console.log("user ", this.user)
+      }
+
+    })
+
+  }
+
   loadUser(user: any) {
     this.programData.user = user
     const userId = user.user_id || user.wfInfo[0].userId

From 3e5673f70b18f4fdd522f36cd13670cda684338e Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Wed, 16 Aug 2023 14:16:06 +0530
Subject: [PATCH 183/887] Search learners in batch details page

---
 .../batch-details.component.html              | 37 +++++++++++-
 .../batch-details.component.scss              | 38 +++++++++++++
 .../batch-details/batch-details.component.ts  | 56 +++++++++++++++++++
 3 files changed, 129 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
index 74b09d848..55a3874af 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
@@ -52,7 +52,18 @@
           </div>
         </div>
         <ng-container *ngIf="currentFilter === 'pending'">
-          <p class="padding-m new-request-count" *ngIf="newUsers.length > 0"> {{newUsers.length}} New
+          <div class="flex flex-1 flex-row margin-top-l" *ngIf="clonedNewUsers && clonedNewUsers.length > 0">
+            <div class="flex-1">
+              <div class="search">
+                <div class="rsearch">
+                  <mat-icon class="color-60 search-icon">search</mat-icon>
+                  <input class="search-input color-60" type="Standard" #searchText placeholder="Search for a learner"
+                    autofocus="none" (input)="onSearchLearners(searchText.value)">
+                </div>
+              </div>
+            </div>
+          </div>
+          <p class="new-request-count" *ngIf="newUsers.length > 0"> {{newUsers.length}} New
             requests</p>
           <div class="b-c box" *ngIf="newUsers && newUsers.length > 0">
             <div *ngFor="let user of newUsers">
@@ -65,6 +76,17 @@
           </div>
         </ng-container>
         <ng-container *ngIf="currentFilter === 'approved'">
+          <div class="flex flex-1 flex-row margin-top-l" *ngIf="clonedApprovedUsers && clonedApprovedUsers.length > 0">
+            <div class="flex-1">
+              <div class="search">
+                <div class="rsearch">
+                  <mat-icon class="color-60 search-icon">search</mat-icon>
+                  <input class="search-input color-60" type="Standard" #searchText placeholder="Search for a learner"
+                    autofocus="none" (input)="onSearchLearners(searchText.value)">
+                </div>
+              </div>
+            </div>
+          </div>
           <div class="b-c box" *ngIf="approvedUsers && approvedUsers.length > 0">
             <div *ngFor="let user of approvedUsers">
               <ws-app-users-card [user]="user" [actions]="false" [remove]="removeLearner(batchData.startDate)"
@@ -76,7 +98,18 @@
           </div>
         </ng-container>
         <ng-container *ngIf="currentFilter === 'rejected'">
-          <div class="b-c box" *ngIf="rejectedUsers && rejectedUsers.length > 0">
+          <div class="flex flex-1 flex-row margin-top-l" *ngIf="rejectedUsers && rejectedUsers.length > 0">
+            <div class="flex-1">
+              <div class="search">
+                <div class="rsearch">
+                  <mat-icon class="color-60 search-icon">search</mat-icon>
+                  <input class="search-input color-60" type="Standard" #searchText placeholder="Search for a learner"
+                    autofocus="none" (input)="onSearchLearners(searchText.value)">
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class=" b-c box" *ngIf="rejectedUsers && rejectedUsers.length > 0">
             <div *ngFor="let user of rejectedUsers">
               <ws-app-users-card [user]="user" [actions]="false" [programData]="linkData"></ws-app-users-card>
             </div>
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss
index 47eec0def..0fbf137f2 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss
@@ -92,3 +92,41 @@
   font-weight: 700;
   font-size: 14px;
 }
+
+.flex-1 {
+  flex: 1;
+}
+
+.search {
+  display: flex;
+  flex: 1;
+}
+
+.flex-2 {
+  flex: 2;
+}
+
+.rsearch {
+  display: flex;
+  position: relative;
+  flex: 1 1 auto;
+}
+
+.search-input {
+  width: 100%;
+  border-radius: 4px;
+  border: 1px solid #d5d0d0;
+  padding: 9px 9px 9px 35px;
+  margin-bottom: 20px;
+  margin-top: 0;
+  font: normal 14px Lato;
+  font-weight: 400;
+  height: 1.8rem;
+}
+
+.search-icon {
+  position: absolute;
+  top: 15px;
+  font-size: 20px;
+  left: 10px;
+}
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index e15abfec3..82cf060d4 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -26,6 +26,9 @@ export class BatchDetailsComponent implements OnInit {
   linkData: any
   userProfile: any
   sessionDetails: any = []
+  clonedNewUsers: any = []
+  clonedRejectedUsers: any = []
+  clonedApprovedUsers: any = []
 
   constructor(private router: Router, private activeRouter: ActivatedRoute,
     // tslint:disable-next-line:align
@@ -51,6 +54,9 @@ export class BatchDetailsComponent implements OnInit {
   ngOnInit() { }
 
   filter(key: 'pending' | 'approved' | 'rejected' | 'sessions') {
+    this.approvedUsers = []
+    this.rejectedUsers = []
+    this.newUsers = []
     switch (key) {
       case 'pending':
         this.currentFilter = 'pending'
@@ -105,6 +111,7 @@ export class BatchDetailsComponent implements OnInit {
     this.bpService.getLearners(this.batchData.batchId).subscribe((res: any) => {
       if (res && res.length > 0) {
         this.approvedUsers = res
+        this.clonedApprovedUsers = res
       }
     })
   }
@@ -121,6 +128,7 @@ export class BatchDetailsComponent implements OnInit {
     this.bpService.getRequests(request).subscribe((res: any) => {
       if (res) {
         this.newUsers = res.result.data
+        this.clonedNewUsers = res.result.data
       }
     })
   }
@@ -137,6 +145,7 @@ export class BatchDetailsComponent implements OnInit {
     this.bpService.getRequests(request).subscribe((res: any) => {
       if (res) {
         this.rejectedUsers = res.result.data
+        this.clonedRejectedUsers = res.result.data
       }
     })
   }
@@ -257,4 +266,51 @@ export class BatchDetailsComponent implements OnInit {
     return currentDate < sDate
   }
 
+  filterNewUsers(searchText: string) {
+    if (searchText.length > 0) {
+      this.newUsers = this.newUsers.filter((result: any) => {
+        if (result.userInfo) {
+          return result.userInfo.first_name.toLowerCase().includes(searchText.toLowerCase())
+        }
+      })
+    } else {
+      this.newUsers = this.clonedNewUsers
+    }
+  }
+
+  filterApprovedUsers(searchText: string) {
+    if (searchText.length > 0) {
+      this.approvedUsers = this.approvedUsers.filter((result: any) => {
+        console.log(result)
+        if (result.first_name) {
+          return result.first_name.toLowerCase().includes(searchText.toLowerCase())
+        }
+      })
+    } else {
+      this.approvedUsers = this.clonedApprovedUsers
+    }
+  }
+
+  filterRejectedUsers(searchText: string) {
+    if (searchText.length > 0) {
+      this.rejectedUsers = this.rejectedUsers.filter((result: any) => {
+        if (result.userInfo) {
+          return result.userInfo.first_name.toLowerCase().includes(searchText.toLowerCase())
+        }
+      })
+    } else {
+      this.rejectedUsers = this.clonedRejectedUsers
+    }
+  }
+
+  onSearchLearners(searchText: string) {
+    if (this.currentFilter === 'pending') {
+      this.filterNewUsers(searchText)
+    } else if (this.currentFilter === 'approved') {
+      this.filterApprovedUsers(searchText)
+    } else if (this.currentFilter === 'rejected') {
+      this.filterRejectedUsers(searchText)
+    }
+  }
+
 }

From 5a39e5ba68216857bdef5c29969d15563fb3e7e4 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Wed, 16 Aug 2023 15:54:13 +0530
Subject: [PATCH 184/887] changes in batch details page

---
 .../batch-details/batch-details.component.html         | 10 +++++++---
 .../batch-details/batch-details.component.scss         |  4 ----
 .../components/batch-list/batch-list.component.ts      |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
index 55a3874af..9a5945916 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
@@ -14,6 +14,8 @@
               'mediumDate'}}</li>
             <li><mat-icon>event</mat-icon> {{batchData.enrollmentEndDate | date: 'mediumDate'}}</li>
             <li><mat-icon>people</mat-icon> {{approvedUsers.length}} Learners</li>
+            <li *ngIf="this.currentFilter === 'approved'"><mat-icon>person</mat-icon>
+              {{batchData.batchAttributes?.currentBatchSize}} Learners</li>
           </ul>
         </div>
       </ng-container>
@@ -58,7 +60,7 @@
                 <div class="rsearch">
                   <mat-icon class="color-60 search-icon">search</mat-icon>
                   <input class="search-input color-60" type="Standard" #searchText placeholder="Search for a learner"
-                    autofocus="none" (input)="onSearchLearners(searchText.value)">
+                    (input)="onSearchLearners(searchText.value)">
                 </div>
               </div>
             </div>
@@ -82,11 +84,13 @@
                 <div class="rsearch">
                   <mat-icon class="color-60 search-icon">search</mat-icon>
                   <input class="search-input color-60" type="Standard" #searchText placeholder="Search for a learner"
-                    autofocus="none" (input)="onSearchLearners(searchText.value)">
+                    (input)="onSearchLearners(searchText.value)">
                 </div>
               </div>
             </div>
           </div>
+          <p class="font-bold" *ngIf="approvedUsers.length > 0"> {{approvedUsers.length}} learners in this batch
+          </p>
           <div class="b-c box" *ngIf="approvedUsers && approvedUsers.length > 0">
             <div *ngFor="let user of approvedUsers">
               <ws-app-users-card [user]="user" [actions]="false" [remove]="removeLearner(batchData.startDate)"
@@ -104,7 +108,7 @@
                 <div class="rsearch">
                   <mat-icon class="color-60 search-icon">search</mat-icon>
                   <input class="search-input color-60" type="Standard" #searchText placeholder="Search for a learner"
-                    autofocus="none" (input)="onSearchLearners(searchText.value)">
+                    (input)="onSearchLearners(searchText.value)">
                 </div>
               </div>
             </div>
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss
index 0fbf137f2..96081dfdd 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss
@@ -102,10 +102,6 @@
   flex: 1;
 }
 
-.flex-2 {
-  flex: 2;
-}
-
 .rsearch {
   display: flex;
   position: relative;
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
index 4125a4c43..e3660e54f 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
@@ -45,10 +45,10 @@ export class BatchListComponent implements OnInit {
                 offset: 0,
                 deptName: this.userProfile.channel,
               }
-              b.newrequestsCount = Math.floor(Math.random() * (100 - 0 + 0)) + 0
+              //b.newrequestsCount = Math.floor(Math.random() * (100 - 0 + 0)) + 0
               b.learnersCount = 0
               this.bpService.getRequests(request).subscribe((resnew: any) => {
-                if (resnew && resnew.length > 0) {
+                if (resnew && resnew.result && resnew.result.data && resnew.result.data.length > 0) {
                   b.newrequestsCount = resnew.result.data.length
                 }
               })
@@ -98,9 +98,9 @@ export class BatchListComponent implements OnInit {
                 deptName: this.userProfile.channel,
               }
               b.learnersCount = 0
-              b.newrequestsCount = Math.floor(Math.random() * (100 - 0 + 0)) + 0
+              //b.newrequestsCount = Math.floor(Math.random() * (100 - 0 + 0)) + 0
               this.bpService.getRequests(request).subscribe((resnew: any) => {
-                if (resnew && resnew.length > 0) {
+                if (resnew && resnew.result && resnew.result.data && resnew.result.data.length > 0) {
                   b.newrequestsCount = resnew.result.data.length
                 }
               })

From b0886f825ad823e5eaadc95f8e64897a9935f5b0 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Wed, 16 Aug 2023 16:28:07 +0530
Subject: [PATCH 185/887] reject user popup changes

---
 .../reject-reason-dialog/reject-reason-dialog.component.html  | 4 ++--
 .../components/users-card/users-card.component.ts             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.html
index 313af001c..09602ff5f 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.html
@@ -1,10 +1,10 @@
 <div class="reason-dialog">
-  <h2 mat-dialog-title class="required">Please provide the reason for removal</h2>
+  <h2 mat-dialog-title class="required">Please provide the reason for removing the user from the batch</h2>
   <form [formGroup]="reasonForm" (ngSubmit)="onSubmit()" class="flex-4">
     <div mat-dialog-content>
       <mat-form-field appearance="outline" class="margin-top-xs">
         <textarea matInput #reason formControlName="reason" maxlength="500" i18n-placeholder
-          placeholder="Enter your reason here" type="text" rows="5"></textarea>
+          placeholder="Enter reason here" type="text" rows="5"></textarea>
         <mat-hint i18n class="no-padding">
           Limited to 500 characters.
         </mat-hint>
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
index 3129f5a2e..8db2da4df 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
@@ -70,7 +70,7 @@ export class UsersCardComponent implements OnInit {
 
   clickRemove() {
     const dialogRef = this.dialogue.open(RejectReasonDialogComponent, {
-      width: '450px',
+      width: '950px',
       disableClose: true,
 
     })

From b1340ea834aa29dab453d11d9def9334f383e253 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Thu, 17 Aug 2023 16:48:54 +0530
Subject: [PATCH 186/887] UI feedback changes

---
 .../batch-details/batch-details.component.html         |  2 +-
 .../components/batch-list/batch-list.component.html    |  6 +++---
 .../components/batch-list/batch-list.component.scss    | 10 ++++------
 .../reject-reason-dialog.component.html                |  2 +-
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
index 9a5945916..05db5ef51 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
@@ -102,7 +102,7 @@
           </div>
         </ng-container>
         <ng-container *ngIf="currentFilter === 'rejected'">
-          <div class="flex flex-1 flex-row margin-top-l" *ngIf="rejectedUsers && rejectedUsers.length > 0">
+          <div class="flex flex-1 flex-row margin-top-l" *ngIf="clonedRejectedUsers && clonedRejectedUsers.length > 0">
             <div class="flex-1">
               <div class="search">
                 <div class="rsearch">
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
index 59f6af3cd..0b5edd9f8 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
@@ -15,13 +15,13 @@
                 <span *ngIf="batch.newrequestsCount > 0" class="circle"></span>
                 {{batch.name}}
               </span>
-              <span class="float-right mat-subheading-1 margin-remove color-60">{{batch.batchId}}</span>
+
             </div>
             <div class="padding-left-s padding-right-s mat-body-2">
-              <p class="margin-remove">Start and end date</p>
+              <p class="margin-remove sub-header">Start date and end date</p>
               <p class="margin-remove"><mat-icon>event</mat-icon> {{batch.startDate | date: 'dd/MMM/yyyy'}} -
                 {{batch.endDate | date: 'dd/MMM/yyyy'}}</p>
-              <p class="margin-remove  extra-padding">Last enrolment date</p>
+              <p class="margin-remove  extra-padding sub-header">Last enrolment date</p>
               <p class="margin-remove"><mat-icon>event</mat-icon> {{batch.enrollmentEndDate | date:'dd/MMM/yyyy'}}</p>
             </div>
             <div class="padding-left-s padding-right-s mat-body-2 extra-padding">
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss
index 45c9c1303..d0398b0dc 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.scss
@@ -3,7 +3,7 @@
 @import 'ws-mixins';
 
 .grey-box {
-  background: #F5F5F5;
+  background: #f0f3f4 !important;
   display: inline-block;
   width: 31%;
   border-radius: 4px;
@@ -16,11 +16,9 @@
   span {
     display: inline-block;
   }
-  .mat-subheading-1 {
-    display: -webkit-box;
-    -webkit-line-clamp: 2;
-    -webkit-box-orient: vertical;
-    overflow: hidden;
+
+  .sub-header {
+    font-size: 12px!important;
   }
 
   .mat-body-2 {
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.html
index 09602ff5f..1c5cee62d 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.html
@@ -2,7 +2,7 @@
   <h2 mat-dialog-title class="required">Please provide the reason for removing the user from the batch</h2>
   <form [formGroup]="reasonForm" (ngSubmit)="onSubmit()" class="flex-4">
     <div mat-dialog-content>
-      <mat-form-field appearance="outline" class="margin-top-xs">
+      <mat-form-field appearance="outline">
         <textarea matInput #reason formControlName="reason" maxlength="500" i18n-placeholder
           placeholder="Enter reason here" type="text" rows="5"></textarea>
         <mat-hint i18n class="no-padding">

From 5996a474ae6bdda59c41485f31529ae702819bb3 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Thu, 24 Aug 2023 13:18:34 +0530
Subject: [PATCH 187/887] API integration - Session details

---
 .../batch-details.component.html              |  6 +-
 .../batch-details/batch-details.component.ts  | 61 ++++++++++---------
 .../session-card/session-card.component.html  | 32 ++++++----
 3 files changed, 54 insertions(+), 45 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
index 05db5ef51..42601c55a 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
@@ -40,10 +40,10 @@
               (click)="filter('rejected')" role="button">Rejected requests
               <!-- <span *ngIf="rejectedUsers" class="ws-mat-black60-text">({{rejectedUsers.length}})</span> -->
             </a>
-            <a class="filter-option cursor-pointer"
+            <a class="filter-option cursor-pointer" *ngIf="batchData.batchAttributes.sessionDetails"
               [ngClass]="{'ws-mat-accent-border-active font-bold' : currentFilter === 'sessions',
-                                                                                    'ws-mat-accent-border font-medium':currentFilter !== 'sessions'}"
-              mat-button (click)="filter('sessions')" role="button">Session details
+                                                                                    'ws-mat-accent-border font-medium':currentFilter !== 'sessions'}" mat-button (click)="filter('sessions')"
+              role="button">Session details
               <!-- <span *ngIf="rejectedUsers" class="ws-mat-black60-text">({{rejectedUsers.length}})</span> -->
             </a>
           </div>
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index 82cf060d4..bbc41aeca 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -49,6 +49,8 @@ export class BatchDetailsComponent implements OnInit {
     if (this.programID) {
       this.getBPDetails(this.programID)
     }
+
+    console.log("batchData ", this.batchData)
   }
 
   ngOnInit() { }
@@ -151,35 +153,36 @@ export class BatchDetailsComponent implements OnInit {
   }
 
   getSessionDetails() {
-    this.sessionDetails = [
-      {
-        title: 'Intro to Angular - Session 1',
-        description: 'Angular is an open-source, JavaScript framework written in TypeScript. Google maintains it, and its primary purpose is to develop single-page applications. As a framework, Angular has clear advantages while also providing a standard structure for developers to work with. It enables users to create large applications in a maintainable manner. Frameworks in general boost web development efficiency and performance by providing a consistent structure so that developers don’t have to keep rebuilding code from scratch. Frameworks are time savers that offer developers a host of extra features that can be added to software without requiring extra effort.',
-        type: 'Offline session',
-        facilitator: 'Rangarajan',
-        localtion: 'Yes',
-        qrCode: 'Yes',
-        duration: '4Hrs',
-        date: '23 Aug 2023',
-        time: '9:00 AM - 1:00 PM',
-        feedbackUrl: 'https://surveymonkey.com/123456',
-        joinLink: 'https://teams.microsoft.com/QWDDIKMV129',
-      },
-      {
-        title: 'Intro to Angular - Session 2',
-        description: 'Angular is a popular open-source web application framework developed by Google. It is written in TypeScript and is widely used for building dynamic and robust single-page applications (SPAs). Angular provides a set of tools and features that allow developers to create complex client-side applications with ease.',
-        type: 'Online session',
-        facilitator: 'Maximilian Schwarzmüller',
-        localtion: 'No',
-        qrCode: 'Yes',
-        duration: '8Hrs',
-        date: '31 Aug 2023',
-        time: '9:00 AM - 5:00 PM',
-        feedbackUrl: 'https://surveymonkey.com/67890',
-        feedbackUrlHelpText: 'This survey won\'t take more than 2 minutes.',
-        joinLink: 'https://teams.microsoft.com/ABCDPIKL123',
-      },
-    ]
+    this.sessionDetails = this.batchData.batchAttributes.sessionDetails
+    // this.sessionDetails = [
+    //   {
+    //     title: 'Intro to Angular - Session 1',
+    //     description: 'Angular is an open-source, JavaScript framework written in TypeScript. Google maintains it, and its primary purpose is to develop single-page applications. As a framework, Angular has clear advantages while also providing a standard structure for developers to work with. It enables users to create large applications in a maintainable manner. Frameworks in general boost web development efficiency and performance by providing a consistent structure so that developers don’t have to keep rebuilding code from scratch. Frameworks are time savers that offer developers a host of extra features that can be added to software without requiring extra effort.',
+    //     type: 'Offline session',
+    //     facilitator: 'Rangarajan',
+    //     localtion: 'Yes',
+    //     qrCode: 'Yes',
+    //     duration: '4Hrs',
+    //     date: '23 Aug 2023',
+    //     time: '9:00 AM - 1:00 PM',
+    //     feedbackUrl: 'https://surveymonkey.com/123456',
+    //     joinLink: 'https://teams.microsoft.com/QWDDIKMV129',
+    //   },
+    //   {
+    //     title: 'Intro to Angular - Session 2',
+    //     description: 'Angular is a popular open-source web application framework developed by Google. It is written in TypeScript and is widely used for building dynamic and robust single-page applications (SPAs). Angular provides a set of tools and features that allow developers to create complex client-side applications with ease.',
+    //     type: 'Online session',
+    //     facilitator: 'Maximilian Schwarzmüller',
+    //     localtion: 'No',
+    //     qrCode: 'Yes',
+    //     duration: '8Hrs',
+    //     date: '31 Aug 2023',
+    //     time: '9:00 AM - 5:00 PM',
+    //     feedbackUrl: 'https://surveymonkey.com/67890',
+    //     feedbackUrlHelpText: 'This survey won\'t take more than 2 minutes.',
+    //     joinLink: 'https://teams.microsoft.com/ABCDPIKL123',
+    //   },
+    // ]
   }
 
   onSubmit(event: any) {
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.html
index 32bc0f3f8..58ff48bd7 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.html
@@ -5,18 +5,24 @@
     <div class="color-60 margin-top-l margin-top-m margin-bottom-m">
       <div class="flex flex-1 flex-row">
         <div class="flex margin-right-m">{{session.type}}</div>
-        <div class="flex margin-right-m bullet-span">{{session.date}}</div>
-        <div class="flex bullet-span">{{session.duration}}, {{session.time}}</div>
+        <div class="flex margin-right-m bullet-span">{{session.startDate | date: 'dd MMM yyyy'}}</div>
+        <div class="flex bullet-span">{{session.sessionDuration}}Hrs, {{session.startTime || 'No response' }} -
+          {{session.endTime || 'No response'}}
+        </div>
       </div>
     </div>
-    <div class="margin-top-l">
-      <div class="font-bold">Join this link </div>
-      <div><a [href]="session.joinLink" target="_blank" class="link">{{session.joinLink}}</a></div>
+    <div class="margin-top-l margin-bottom-s" *ngIf="session.session_handout">
+      <div class="margin-bottom-s" *ngFor="let handout of session.session_handout">
+        <div class="font-bold">{{handout.title}}</div>
+        <div><a [href]="handout.file || handout.url" target="_blank" class="link">{{handout.file || handout.url}}</a>
+        </div>
+      </div>
     </div>
-    <div class="margin-top-l margin-bottom-s" *ngIf="session.feedbackUrl">
-      <div class="font-bold">Provide feedback</div>
-      <div><a [href]="session.feedbackUrl" target="_blank" class="link">{{session.feedbackUrl}}</a></div>
-      <div class="color-60 link-help-text" *ngIf="session.feedbackUrlHelpText">{{session.feedbackUrlHelpText}}</div>
+    <div class="margin-top-l margin-bottom-s" *ngIf="session.attach_links">
+      <div class="margin-bottom-xs" *ngFor="let link of session.attach_links">
+        <div class="font-bold">{{link.title}}</div>
+        <div><a [href]="link.url" target="_blank" class="link">{{link.url}}</a></div>
+      </div>
     </div>
   </div>
   <div class="session-division">
@@ -24,19 +30,19 @@
       <div class="grid grid-cols-2 gap-1">
         <div class="flex flex-column">
           <div class="font-bold">QR attendance required</div>
-          <div>{{session.qrCode}}</div>
+          <div>{{session.qrCode || 'No response' }}</div>
         </div>
         <div class="flex flex-column">
           <div class="font-bold">Capture location details</div>
-          <div>{{session.localtion}}</div>
+          <div>{{session.localtion || 'No response'}}</div>
         </div>
       </div>
     </div>
   </div>
-  <div class="session-division">
+  <div class="session-division" *ngIf="session.facilatorDetails">
     <div class="details">
       <div class="font-bold">Facilitator</div>
-      <div>{{session.facilitator}}</div>
+      <div *ngFor="let facilitator of session.facilatorDetails">{{facilitator.name}}</div>
     </div>
   </div>
 </div>
\ No newline at end of file

From a7998929650bcdc847c34584074ee0cb89c4a27c Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Fri, 25 Aug 2023 17:04:47 +0530
Subject: [PATCH 188/887] Nominate users for a batch

---
 .../batch-details.component.html              |  2 +-
 .../batch-details/batch-details.component.ts  | 42 ++++++++++++--
 .../nominate-users-dialog.component.html      |  5 +-
 .../nominate-users-dialog.component.scss      | 16 ++++++
 .../nominate-users-dialog.component.ts        | 56 ++++++++++++++++++-
 .../users-card/users-card.component.ts        |  9 ++-
 .../services/blended-approval.service.ts      |  5 ++
 7 files changed, 121 insertions(+), 14 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
index 42601c55a..c07657f16 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
@@ -94,7 +94,7 @@
           <div class="b-c box" *ngIf="approvedUsers && approvedUsers.length > 0">
             <div *ngFor="let user of approvedUsers">
               <ws-app-users-card [user]="user" [actions]="false" [remove]="removeLearner(batchData.startDate)"
-                [programData]="linkData"></ws-app-users-card>
+                (userClick)="removeUser($event)" [programData]="linkData"></ws-app-users-card>
             </div>
           </div>
           <div class="b-c box" *ngIf="approvedUsers && approvedUsers.length == 0">
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index bbc41aeca..9c4f696a5 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -42,15 +42,12 @@ export class BatchDetailsComponent implements OnInit {
     }
     if (this.activeRouter.parent && this.activeRouter.parent.snapshot.data.configService) {
       this.userProfile = this.activeRouter.parent.snapshot.data.configService.unMappedUser
-      // console.log('this.userProfile', this.userProfile)
     }
     this.programID = this.activeRouter.snapshot.params.id
     this.batchID = this.activeRouter.snapshot.params.batchid
     if (this.programID) {
       this.getBPDetails(this.programID)
     }
-
-    console.log("batchData ", this.batchData)
   }
 
   ngOnInit() { }
@@ -226,6 +223,37 @@ export class BatchDetailsComponent implements OnInit {
     })
   }
 
+  removeUser(event: any) {
+    console.log("event ", event)
+    const actionType = event.action.toUpperCase()
+    // const reqData = event.userData.wfInfo[0]
+    const reqData = _.maxBy(event.userData.wfInfo, (el: any) => {
+      return new Date(el.lastUpdatedOn).getTime()
+    })
+    const request = {
+      state: 'APPROVED',
+      action: actionType,
+      wfId: reqData.wfId,
+      applicationId: reqData.applicationId,
+      userId: reqData.userId,
+      actorUserId: reqData.actorUUID,
+      serviceName: 'blendedprogram',
+      rootOrgId: reqData.rootOrg,
+      courseId: this.programID,
+      deptName: reqData.deptName,
+      comment: '',
+      updateFieldValues: [
+        {
+          toValue: {
+            name: event.userData.userInfo.first_name,
+          },
+        },
+      ],
+    }
+    // tslint:disable-next-line:no-console
+    console.log('request', request)
+  }
+
   raiseTelemetry(name: string) {
     this.events.raiseInteractTelemetry(
       {
@@ -240,13 +268,15 @@ export class BatchDetailsComponent implements OnInit {
   onNominateUsersClick(name: string) {
     const dialogRef = this.dialogue.open(NominateUsersDialogComponent, {
       width: '950px',
-      data: { orgId: this.userProfile.rootOrgId },
+      data: { orgId: this.userProfile.rootOrgId, courseId: this.programID, applicationId: this.batchData.batchId },
       disableClose: true,
       autoFocus: false
     })
-    console.log(name)
+
     dialogRef.afterClosed().subscribe((response: any) => {
-      console.log(response)
+      if (response && response === 'done') {
+        this.getLearnersList()
+      }
     })
 
   }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.html
index 7f2aae423..68e2dceae 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.html
@@ -1,3 +1,4 @@
+<div id="loader" *ngIf="displayLoader"></div>
 <div class="nominate-dialog">
   <h2 mat-dialog-title>Nominate learners</h2>
 
@@ -22,8 +23,8 @@ <h2 mat-dialog-title>Nominate learners</h2>
       </div>
     </div>
     <div class="users-data">
-      <table mat-table [dataSource]="dataSource" class="mat-elevation-z8 nominate-learners  margin-top-s" matSort
-        matSortActive="name" matSortDirection="asc" matSortDisableClear *ngIf="dataSource.filteredData.length > 0">
+      <table mat-table [dataSource]="dataSource" class="nominate-learners  margin-top-s" matSort matSortActive="name"
+        matSortDirection="asc" matSortDisableClear *ngIf="dataSource.filteredData.length > 0">
 
         <ng-container matColumnDef="select">
           <th mat-header-cell *matHeaderCellDef class="header-row">
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.scss
index b86b5a89a..28668b512 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.scss
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.scss
@@ -113,3 +113,19 @@
 .mat-column-select {
   width: 5%!important;
 }
+
+::ng-deep#loader {
+  border: 4px solid #d9e4fa;
+  border-radius: 50%;
+  border-top: 4px solid #3498db;
+  width: 20px;
+  height: 20px;
+  margin: 0 1em;
+  -webkit-animation: spin 2s linear infinite;
+  /* Safari */
+  animation: spin 2s linear infinite;
+  position: absolute;
+  top: 49%;
+  z-index: 9999999999999;
+  left: 45%;
+}
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
index 3c9bca48e..6f08a9bae 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
@@ -1,8 +1,9 @@
 import { SelectionModel } from '@angular/cdk/collections'
 import { Component, Inject, OnInit, ViewChild } from '@angular/core'
-import { MAT_DIALOG_DATA, MatDialogRef, MatTableDataSource } from '@angular/material'
+import { MAT_DIALOG_DATA, MatDialogRef, MatSnackBar, MatTableDataSource } from '@angular/material'
 import { UsersService } from '../../../users/services/users.service'
 import { MatSort } from '@angular/material/sort'
+import { BlendedApporvalService } from '../../services/blended-approval.service'
 
 @Component({
   selector: 'ws-app-nominate-users-dialog',
@@ -17,6 +18,7 @@ export class NominateUsersDialogComponent implements OnInit {
   selection = new SelectionModel(true, [])
   filteredUsers: any = []
   dataSource = new MatTableDataSource<any>()
+  displayLoader = false
 
   @ViewChild(MatSort, { static: false }) set matSort(sort: MatSort) {
     if (!this.dataSource.sort) {
@@ -31,7 +33,8 @@ export class NominateUsersDialogComponent implements OnInit {
 
   constructor(public dialogRef: MatDialogRef<NominateUsersDialogComponent>,
     private usersService: UsersService,
-    @Inject(MAT_DIALOG_DATA) public data: any) { }
+    @Inject(MAT_DIALOG_DATA) public data: any, private bpService: BlendedApporvalService,
+    private snackBar: MatSnackBar,) { }
 
   ngOnInit() {
     const filterObj = {
@@ -46,17 +49,30 @@ export class NominateUsersDialogComponent implements OnInit {
   }
 
   getAllUsers(filterObj: any) {
+    this.displayLoader = true
     this.filteredUsers = []
     this.dataSource = new MatTableDataSource()
     this.usersService.getAllUsers(filterObj).subscribe(data => {
       data.content.map((details: any) => {
+        let dept = (details.profileDetails && details.profileDetails.employmentDetails) ? details.profileDetails.employmentDetails.departmentName : details.rootOrgName
         this.filteredUsers.push({
           name: details.firstName,
           email: details.maskedEmail,
           userId: details.id,
+          rootOrgId: this.data.orgId,
+          actorUserId: details.id,
+          state: "APPROVED",
+          serviceName: 'blendedprogram',
+          deptName: dept,
+          courseId: this.data.courseId, // blended program course ID
+          applicationId: this.data.applicationId, //blended program batch ID
+          updateFieldValues: [
+            { toValue: { name: details.firstName } }
+          ]
         })
       })
       this.dataSource = new MatTableDataSource(this.filteredUsers)
+      this.displayLoader = false
     })
   }
 
@@ -73,10 +89,44 @@ export class NominateUsersDialogComponent implements OnInit {
   }
 
   addLearners() {
-    console.log('learners', this.selection.selected)
+    let seletedLearner: any = []
+    if (this.selection.selected.length > 0) {
+      this.selection.selected.map((user: any) => {
+        let obj = {
+          userId: user.userId,
+          rootOrgId: this.data.orgId,
+          actorUserId: user.userId,
+          state: "APPROVED",
+          serviceName: 'blendedprogram',
+          deptName: user.deptName,
+          courseId: this.data.courseId, // blended program course ID
+          applicationId: this.data.applicationId, //blended program batch ID
+          updateFieldValues: user.updateFieldValues
+        }
+        seletedLearner.push(obj)
+      })
+      console.log("seletedLearner ", seletedLearner)
+      this.bpService.nominateLearners(seletedLearner).subscribe((res: any) => {
+        // tslint:disable-next-line:no-console
+        console.log('res', res)
+        this.openSnackbar('Users are added successfully!')
+        this.dialogRef.close('done')
+      }, (err: { error: any }) => {
+        // tslint:disable-next-line:no-console
+        console.log(err)
+        this.openSnackbar('some thing went wrong, Please try after sometime.')
+      })
+    }
+
   }
 
   closeDiaogBox() {
     this.dialogRef.close('close')
   }
+
+  private openSnackbar(primaryMsg: string, duration: number = 5000) {
+    this.snackBar.open(primaryMsg, 'X', {
+      duration,
+    })
+  }
 }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
index 8db2da4df..0b4802377 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
@@ -75,9 +75,14 @@ export class UsersCardComponent implements OnInit {
 
     })
     dialogRef.afterClosed().subscribe((response: any) => {
-      console.log(response)
       if (response) {
-        console.log("user ", this.user)
+        const data = {
+          action: 'Remove',
+          userData: this.user,
+          comment: response.reason
+        }
+        console.log(response)
+        this.userClick.emit(data)
       }
 
     })
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
index ac0c4c69c..31bc7c876 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
@@ -12,6 +12,7 @@ const API_END_POINTS = {
   GET_REQUESTS: '/apis/proxies/v8/workflow/blendedprogram/search',
   READ_USER: '/apis/proxies/v8/api/user/v2/read/',
   CERT_DOWNLOAD: `/apis/protected/v8/cohorts/course/batch/cert/download/`,
+  NOMINATE_LEARNERS: '/apis/proxies/v8/workflow/blendedprogram/admin/enrol',
 }
 
 @Injectable({
@@ -48,4 +49,8 @@ export class BlendedApporvalService {
     const url = `${API_END_POINTS.CERT_DOWNLOAD}/${certId}`
     return this.http.get<any>(url)
   }
+
+  nominateLearners(req: any) {
+    return this.http.post<any>(`${API_END_POINTS.NOMINATE_LEARNERS}`, req)
+  }
 }

From d837064aca220b3b15325becd641bf4c0fd331cb Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Mon, 28 Aug 2023 11:16:53 +0530
Subject: [PATCH 189/887] Filter existing learners in nominate learners

---
 .../head/_services/telemetry.event.model.ts   |  1 +
 .../batch-details/batch-details.component.ts  | 14 +++++--
 .../nominate-users-dialog.component.ts        | 38 +++++++++++--------
 3 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/project/ws/app/src/lib/head/_services/telemetry.event.model.ts b/project/ws/app/src/lib/head/_services/telemetry.event.model.ts
index 57a7addfd..c27294833 100644
--- a/project/ws/app/src/lib/head/_services/telemetry.event.model.ts
+++ b/project/ws/app/src/lib/head/_services/telemetry.event.model.ts
@@ -15,6 +15,7 @@ export namespace TelemetryEvents {
     EVENTS_TAB = 'events-tab',
     APPROVAL_TAB = 'approval-tab',
     SCROLLY_MENU = 'scrolly-menu',
+    NOMINATE_BTN = 'nominate-learners-btn'
 
   }
   export enum EnumIdtype {
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index 9c4f696a5..3b8fea2d3 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -76,7 +76,7 @@ export class BatchDetailsComponent implements OnInit {
       default:
         break
     }
-    this.raiseTelemetry(this.currentFilter)
+    this.raiseTelemetry(this.currentFilter, TelemetryEvents.EnumInteractSubTypes.TAB_CONTENT)
   }
 
   getBPDetails(programID: any) {
@@ -254,11 +254,11 @@ export class BatchDetailsComponent implements OnInit {
     console.log('request', request)
   }
 
-  raiseTelemetry(name: string) {
+  raiseTelemetry(name: string, subtype: string) {
     this.events.raiseInteractTelemetry(
       {
         type: TelemetryEvents.EnumInteractTypes.CLICK,
-        subType: TelemetryEvents.EnumInteractSubTypes.SIDE_NAV,
+        subType: subtype,
         id: `${_.camelCase(name)}-tab`,
       },
       {},
@@ -266,9 +266,15 @@ export class BatchDetailsComponent implements OnInit {
   }
 
   onNominateUsersClick(name: string) {
+    this.raiseTelemetry(name, TelemetryEvents.EnumInteractSubTypes.NOMINATE_BTN)
     const dialogRef = this.dialogue.open(NominateUsersDialogComponent, {
       width: '950px',
-      data: { orgId: this.userProfile.rootOrgId, courseId: this.programID, applicationId: this.batchData.batchId },
+      data: {
+        orgId: this.userProfile.rootOrgId,
+        courseId: this.programID,
+        applicationId: this.batchData.batchId,
+        learners: this.approvedUsers
+      },
       disableClose: true,
       autoFocus: false
     })
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
index 6f08a9bae..2cbe174a6 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
@@ -19,6 +19,7 @@ export class NominateUsersDialogComponent implements OnInit {
   filteredUsers: any = []
   dataSource = new MatTableDataSource<any>()
   displayLoader = false
+  learners: any = []
 
   @ViewChild(MatSort, { static: false }) set matSort(sort: MatSort) {
     if (!this.dataSource.sort) {
@@ -52,24 +53,31 @@ export class NominateUsersDialogComponent implements OnInit {
     this.displayLoader = true
     this.filteredUsers = []
     this.dataSource = new MatTableDataSource()
+    this.learners = this.data.learners.map((u: any) => {
+      return u.user_id
+    })
     this.usersService.getAllUsers(filterObj).subscribe(data => {
       data.content.map((details: any) => {
         let dept = (details.profileDetails && details.profileDetails.employmentDetails) ? details.profileDetails.employmentDetails.departmentName : details.rootOrgName
-        this.filteredUsers.push({
-          name: details.firstName,
-          email: details.maskedEmail,
-          userId: details.id,
-          rootOrgId: this.data.orgId,
-          actorUserId: details.id,
-          state: "APPROVED",
-          serviceName: 'blendedprogram',
-          deptName: dept,
-          courseId: this.data.courseId, // blended program course ID
-          applicationId: this.data.applicationId, //blended program batch ID
-          updateFieldValues: [
-            { toValue: { name: details.firstName } }
-          ]
-        })
+        console.log("this.learners ", this.learners)
+        if (!this.learners.includes(details.id)) {
+          this.filteredUsers.push({
+            name: details.firstName,
+            email: details.maskedEmail,
+            userId: details.id,
+            rootOrgId: this.data.orgId,
+            actorUserId: details.id,
+            state: "APPROVED",
+            serviceName: 'blendedprogram',
+            deptName: dept,
+            courseId: this.data.courseId, // blended program course ID
+            applicationId: this.data.applicationId, //blended program batch ID
+            updateFieldValues: [
+              { toValue: { name: details.firstName } }
+            ]
+          })
+        }
+
       })
       this.dataSource = new MatTableDataSource(this.filteredUsers)
       this.displayLoader = false

From e5aa67c73ed847bff696a81058871831ad3d771f Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Mon, 28 Aug 2023 18:54:18 +0530
Subject: [PATCH 190/887] Remove learner API integration

---
 .../batch-details/batch-details.component.ts  | 30 +++++++------------
 .../services/blended-approval.service.ts      |  5 ++++
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index 3b8fea2d3..95d5418f6 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -224,34 +224,26 @@ export class BatchDetailsComponent implements OnInit {
   }
 
   removeUser(event: any) {
-    console.log("event ", event)
     const actionType = event.action.toUpperCase()
-    // const reqData = event.userData.wfInfo[0]
-    const reqData = _.maxBy(event.userData.wfInfo, (el: any) => {
-      return new Date(el.lastUpdatedOn).getTime()
-    })
     const request = {
+      rootOrgId: this.userProfile.rootOrgId,
+      userId: event.userData.user_id,
+      actorUserId: this.userProfile.userId,
       state: 'APPROVED',
       action: actionType,
-      wfId: reqData.wfId,
-      applicationId: reqData.applicationId,
-      userId: reqData.userId,
-      actorUserId: reqData.actorUUID,
+      applicationId: this.batchID,
       serviceName: 'blendedprogram',
-      rootOrgId: reqData.rootOrg,
       courseId: this.programID,
-      deptName: reqData.deptName,
-      comment: '',
-      updateFieldValues: [
-        {
-          toValue: {
-            name: event.userData.userInfo.first_name,
-          },
-        },
-      ],
+      deptName: event.userData.department,
+      comment: event.comment,
     }
     // tslint:disable-next-line:no-console
     console.log('request', request)
+    this.bpService.removeLearner(request).subscribe((res: any) => {
+      console.log('request', res)
+      this.openSnackbar('Learner is removed successfully!')
+      this.filter('approved')
+    })
   }
 
   raiseTelemetry(name: string, subtype: string) {
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
index 31bc7c876..75c3ae56c 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
@@ -13,6 +13,7 @@ const API_END_POINTS = {
   READ_USER: '/apis/proxies/v8/api/user/v2/read/',
   CERT_DOWNLOAD: `/apis/protected/v8/cohorts/course/batch/cert/download/`,
   NOMINATE_LEARNERS: '/apis/proxies/v8/workflow/blendedprogram/admin/enrol',
+  REMOVE_LEARNER: '/apis/proxies/v8/workflow/blendedprogram/remove'
 }
 
 @Injectable({
@@ -53,4 +54,8 @@ export class BlendedApporvalService {
   nominateLearners(req: any) {
     return this.http.post<any>(`${API_END_POINTS.NOMINATE_LEARNERS}`, req)
   }
+
+  removeLearner(req: any) {
+    return this.http.post<any>(`${API_END_POINTS.REMOVE_LEARNER}`, req)
+  }
 }

From 60f132d4851e2c9d917b98acc8d9a8ee9c8cb858 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Fri, 1 Sep 2023 09:53:12 +0530
Subject: [PATCH 191/887] Sessions card with QR code and location details

---
 .../components/batch-details/batch-details.component.html | 2 +-
 .../components/session-card/session-card.component.html   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
index c07657f16..f27fb1187 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
@@ -128,7 +128,7 @@
               Sessions
             </div>
             <div *ngFor="let individulaSession of sessionDetails">
-              <ws-app-session-card [session]="individulaSession"></ws-app-session-card>
+              <ws-app-session-card [session]="individulaSession" [batch]="batchData"></ws-app-session-card>
             </div>
           </div>
           <div class="b-c box" *ngIf="sessionDetails && sessionDetails.length == 0">
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.html
index 58ff48bd7..1927075dc 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.html
@@ -28,13 +28,13 @@
   <div class="session-division">
     <div class="details">
       <div class="grid grid-cols-2 gap-1">
-        <div class="flex flex-column">
+        <div class="flex flex-column" *ngIf="batch.enableQR">
           <div class="font-bold">QR attendance required</div>
-          <div>{{session.qrCode || 'No response' }}</div>
+          <div>{{batch.enableQR }}</div>
         </div>
-        <div class="flex flex-column">
+        <div class="flex flex-column" *ngIf="batch.batchLocationDetails">
           <div class="font-bold">Capture location details</div>
-          <div>{{session.localtion || 'No response'}}</div>
+          <div>{{batch.batchLocationDetails}}</div>
         </div>
       </div>
     </div>

From f7181cb7966b41f81ea5a85bccb398410e4dabad Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Fri, 1 Sep 2023 14:47:04 +0530
Subject: [PATCH 192/887] Batch details with new fields

---
 .../batch-details/batch-details.component.ts  | 29 -------------------
 .../session-card/session-card.component.html  | 12 ++++----
 .../session-card/session-card.component.ts    |  2 ++
 3 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index 95d5418f6..59e913373 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -151,35 +151,6 @@ export class BatchDetailsComponent implements OnInit {
 
   getSessionDetails() {
     this.sessionDetails = this.batchData.batchAttributes.sessionDetails
-    // this.sessionDetails = [
-    //   {
-    //     title: 'Intro to Angular - Session 1',
-    //     description: 'Angular is an open-source, JavaScript framework written in TypeScript. Google maintains it, and its primary purpose is to develop single-page applications. As a framework, Angular has clear advantages while also providing a standard structure for developers to work with. It enables users to create large applications in a maintainable manner. Frameworks in general boost web development efficiency and performance by providing a consistent structure so that developers don’t have to keep rebuilding code from scratch. Frameworks are time savers that offer developers a host of extra features that can be added to software without requiring extra effort.',
-    //     type: 'Offline session',
-    //     facilitator: 'Rangarajan',
-    //     localtion: 'Yes',
-    //     qrCode: 'Yes',
-    //     duration: '4Hrs',
-    //     date: '23 Aug 2023',
-    //     time: '9:00 AM - 1:00 PM',
-    //     feedbackUrl: 'https://surveymonkey.com/123456',
-    //     joinLink: 'https://teams.microsoft.com/QWDDIKMV129',
-    //   },
-    //   {
-    //     title: 'Intro to Angular - Session 2',
-    //     description: 'Angular is a popular open-source web application framework developed by Google. It is written in TypeScript and is widely used for building dynamic and robust single-page applications (SPAs). Angular provides a set of tools and features that allow developers to create complex client-side applications with ease.',
-    //     type: 'Online session',
-    //     facilitator: 'Maximilian Schwarzmüller',
-    //     localtion: 'No',
-    //     qrCode: 'Yes',
-    //     duration: '8Hrs',
-    //     date: '31 Aug 2023',
-    //     time: '9:00 AM - 5:00 PM',
-    //     feedbackUrl: 'https://surveymonkey.com/67890',
-    //     feedbackUrlHelpText: 'This survey won\'t take more than 2 minutes.',
-    //     joinLink: 'https://teams.microsoft.com/ABCDPIKL123',
-    //   },
-    // ]
   }
 
   onSubmit(event: any) {
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.html
index 1927075dc..71b1dafcf 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.html
@@ -6,7 +6,7 @@
       <div class="flex flex-1 flex-row">
         <div class="flex margin-right-m">{{session.type}}</div>
         <div class="flex margin-right-m bullet-span">{{session.startDate | date: 'dd MMM yyyy'}}</div>
-        <div class="flex bullet-span">{{session.sessionDuration}}Hrs, {{session.startTime || 'No response' }} -
+        <div class="flex bullet-span">{{session.sessionDuration}}, {{session.startTime || 'No response' }} -
           {{session.endTime || 'No response'}}
         </div>
       </div>
@@ -28,18 +28,18 @@
   <div class="session-division">
     <div class="details">
       <div class="grid grid-cols-2 gap-1">
-        <div class="flex flex-column" *ngIf="batch.enableQR">
+        <div class="flex flex-column">
           <div class="font-bold">QR attendance required</div>
-          <div>{{batch.enableQR }}</div>
+          <div>{{batch.batchAttributes?.enableQR ? 'Yes' : 'No' }}</div>
         </div>
-        <div class="flex flex-column" *ngIf="batch.batchLocationDetails">
+        <div class="flex flex-column" *ngIf="batch.batchAttributes?.batchLocationDetails">
           <div class="font-bold">Capture location details</div>
-          <div>{{batch.batchLocationDetails}}</div>
+          <div>{{batch.batchAttributes?.batchLocationDetails || 'No'}}</div>
         </div>
       </div>
     </div>
   </div>
-  <div class="session-division" *ngIf="session.facilatorDetails">
+  <div class="session-division" *ngIf="session.facilatorDetails.length > 0">
     <div class="details">
       <div class="font-bold">Facilitator</div>
       <div *ngFor="let facilitator of session.facilatorDetails">{{facilitator.name}}</div>
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.ts
index de5cc11f8..4966d436f 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.ts
@@ -8,10 +8,12 @@ import { Component, Input, OnInit } from '@angular/core'
 export class SessionCardComponent implements OnInit {
 
   @Input() session!: any
+  @Input() batch!: any
 
   constructor() { }
 
   ngOnInit() {
+    console.log("batch ", this.batch)
   }
 
 }

From 18e1ef4473df00bfbb16a5f4bc64d5149c7b297a Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Fri, 1 Sep 2023 18:17:40 +0530
Subject: [PATCH 193/887] Fixed the table columns width

---
 .../work-allocation-list/table.component.scss    | 16 ++++++++++++++++
 .../users-upload/users-upload.component.scss     |  7 ++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/head/work-allocation-table/work-allocation-list/table.component.scss b/project/ws/app/src/lib/head/work-allocation-table/work-allocation-list/table.component.scss
index fe8854639..e5a12c9bd 100644
--- a/project/ws/app/src/lib/head/work-allocation-table/work-allocation-list/table.component.scss
+++ b/project/ws/app/src/lib/head/work-allocation-table/work-allocation-list/table.component.scss
@@ -722,3 +722,19 @@ $title-line-count: 2;
 ::ng-deep.custom-btn {
   margin-right: 10px !important;
 }
+
+
+::ng-deep .example-table .mat-column-Menu {
+  flex: 0 0 8% !important;
+  width: 8% !important;
+}
+
+::ng-deep .example-table .mat-column-Errors {
+  flex: 0 0 6% !important;
+  width: 6% !important;
+}
+
+::ng-deep .example-table .mat-column-lastupdatedon, ::ng-deep .example-table .mat-column-lastupdatedby {
+  flex: 0 0 17% !important;
+  width: 17% !important;
+}
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
index cd32381a7..22d4caf71 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
@@ -82,6 +82,11 @@ td, th {
   width: 14% !important;
 }
 
+::ng-deep .bulkupload-table .mat-column-status {
+  flex: 0 0 10% !important;
+  width: 10% !important;
+}
+
 ::ng-deep .bulkupload-table .mat-column-fileName {
   flex: 0 0 28% !important;
   width: 28% !important;
@@ -99,4 +104,4 @@ td, th {
 ::ng-deep .bulkupload-table .mat-sort-header-button {
   line-height: 1.5;
   text-align: left;
-}
\ No newline at end of file
+}

From 2ed2ad34d7663b0a7558c6b42ea81ca093ab21bd Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Fri, 1 Sep 2023 19:53:32 +0530
Subject: [PATCH 194/887] API implemetation - remove learners

---
 .../batch-details/batch-details.component.ts           | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index 59e913373..623cd2c41 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -207,6 +207,9 @@ export class BatchDetailsComponent implements OnInit {
       courseId: this.programID,
       deptName: event.userData.department,
       comment: event.comment,
+      updateFieldValues: [{
+        toValue: { name: event.userData.first_name }
+      }]
     }
     // tslint:disable-next-line:no-console
     console.log('request', request)
@@ -214,9 +217,12 @@ export class BatchDetailsComponent implements OnInit {
       console.log('request', res)
       this.openSnackbar('Learner is removed successfully!')
       this.filter('approved')
+    }, (err: { error: any }) => {
+      this.openSnackbar(err.error)
     })
   }
 
+
   raiseTelemetry(name: string, subtype: string) {
     this.events.raiseInteractTelemetry(
       {
@@ -316,3 +322,7 @@ export class BatchDetailsComponent implements OnInit {
   }
 
 }
+function err(arg0: (error: any) => void): null | undefined {
+  throw new Error('Function not implemented.')
+}
+

From f6db1d2ea7a73353356659341fc9fdc3f12c171f Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Sat, 2 Sep 2023 10:46:47 +0530
Subject: [PATCH 195/887] Session details with v2 structure

---
 .../batch-details/batch-details.component.html     |  2 +-
 .../batch-details/batch-details.component.ts       | 14 ++++++--------
 .../session-card/session-card.component.html       |  2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
index f27fb1187..92a42a5ce 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
@@ -40,7 +40,7 @@
               (click)="filter('rejected')" role="button">Rejected requests
               <!-- <span *ngIf="rejectedUsers" class="ws-mat-black60-text">({{rejectedUsers.length}})</span> -->
             </a>
-            <a class="filter-option cursor-pointer" *ngIf="batchData.batchAttributes.sessionDetails"
+            <a class="filter-option cursor-pointer" *ngIf="batchData.batchAttributes.sessionDetails_v2"
               [ngClass]="{'ws-mat-accent-border-active font-bold' : currentFilter === 'sessions',
                                                                                     'ws-mat-accent-border font-medium':currentFilter !== 'sessions'}" mat-button (click)="filter('sessions')"
               role="button">Session details
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index 623cd2c41..b07d6e0c1 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -150,7 +150,7 @@ export class BatchDetailsComponent implements OnInit {
   }
 
   getSessionDetails() {
-    this.sessionDetails = this.batchData.batchAttributes.sessionDetails
+    this.sessionDetails = this.batchData.batchAttributes.sessionDetails_v2
   }
 
   onSubmit(event: any) {
@@ -211,14 +211,15 @@ export class BatchDetailsComponent implements OnInit {
         toValue: { name: event.userData.first_name }
       }]
     }
-    // tslint:disable-next-line:no-console
-    console.log('request', request)
     this.bpService.removeLearner(request).subscribe((res: any) => {
-      console.log('request', res)
       this.openSnackbar('Learner is removed successfully!')
       this.filter('approved')
+      // tslint:disable-next-line:no-console
+      console.log(res)
     }, (err: { error: any }) => {
-      this.openSnackbar(err.error)
+      // tslint:disable-next-line:no-console
+      console.log('request', err)
+      this.openSnackbar('Something went wrong. Please try after sometime.')
     })
   }
 
@@ -322,7 +323,4 @@ export class BatchDetailsComponent implements OnInit {
   }
 
 }
-function err(arg0: (error: any) => void): null | undefined {
-  throw new Error('Function not implemented.')
-}
 
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.html
index 71b1dafcf..2138e8087 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.html
@@ -4,7 +4,7 @@
     <p>{{session.description}}</p>
     <div class="color-60 margin-top-l margin-top-m margin-bottom-m">
       <div class="flex flex-1 flex-row">
-        <div class="flex margin-right-m">{{session.type}}</div>
+        <div class="flex margin-right-m">{{session.sessionType}}</div>
         <div class="flex margin-right-m bullet-span">{{session.startDate | date: 'dd MMM yyyy'}}</div>
         <div class="flex bullet-span">{{session.sessionDuration}}, {{session.startTime || 'No response' }} -
           {{session.endTime || 'No response'}}

From fe8149549bafaf6f775212308875259e2789b6da Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Sat, 2 Sep 2023 11:22:25 +0530
Subject: [PATCH 196/887] session details with v2

---
 .../components/session-card/session-card.component.html   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.html
index 2138e8087..8de994b32 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.html
@@ -11,15 +11,15 @@
         </div>
       </div>
     </div>
-    <div class="margin-top-l margin-bottom-s" *ngIf="session.session_handout">
-      <div class="margin-bottom-s" *ngFor="let handout of session.session_handout">
+    <div class="margin-top-l margin-bottom-s" *ngIf="session.sessionHandouts">
+      <div class="margin-bottom-s" *ngFor="let handout of session.sessionHandouts">
         <div class="font-bold">{{handout.title}}</div>
         <div><a [href]="handout.file || handout.url" target="_blank" class="link">{{handout.file || handout.url}}</a>
         </div>
       </div>
     </div>
-    <div class="margin-top-l margin-bottom-s" *ngIf="session.attach_links">
-      <div class="margin-bottom-xs" *ngFor="let link of session.attach_links">
+    <div class="margin-top-l margin-bottom-s" *ngIf="session.attachLinks">
+      <div class="margin-bottom-xs" *ngFor="let link of session.attachLinks">
         <div class="font-bold">{{link.title}}</div>
         <div><a [href]="link.url" target="_blank" class="link">{{link.url}}</a></div>
       </div>

From a18cb42fbffc54e04b8f3a717ff1df8640b5dbb4 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Sat, 2 Sep 2023 13:03:04 +0530
Subject: [PATCH 197/887] bug fix and report section modification

---
 .../reports-section.component.html            | 11 ++-
 .../reports-section.component.ts              | 76 +++++++++++--------
 .../users-upload/users-upload.component.scss  |  6 ++
 .../users-upload/users-upload.component.ts    |  6 +-
 4 files changed, 60 insertions(+), 39 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html
index 49d0fa65c..f5bbd3471 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html
@@ -1,8 +1,8 @@
 <div class="flex flex-4 flex-column">
   <mat-card>
-    <div class="flex-4 mobile-margin text-capitalize mat-h2">Download reports</div>
+    <div class="flex-4 mobile-margin text-capitalize mat-h2">Reports</div>
     <mat-card-content>
-      <ng-container class="margin-top-l">
+      <!-- <ng-container class="margin-top-l">
         <div class="flex">
           <div *ngFor="let item of btnList" class="margin-right-m">
             <button type="button" mat-button class="upload-btn" (click)="onButtonClick(item.type, $event)">
@@ -14,8 +14,13 @@
           </button>
           <button type="button" mat-button class="upload-btn" (click)="onButtonClick('assessmentReport', $event)">
             <mat-icon>vertical_align_bottom</mat-icon> Assessment Report
-          </button> -->
+          </button> --
         </div>
+      </ng-container> -->
+      <ng-container class="margin-top-l" *ngIf="reportSectionData && reportSectionData.length > 0">
+        <ws-widget-org-user-table [tableData]='tabledata' [data]='reportSectionData'
+          (actionsClick)="downloadFullFile($event)">
+        </ws-widget-org-user-table>
       </ng-container>
     </mat-card-content>
   </mat-card>
diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
index 588c391f7..5c8dd7cac 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
@@ -1,8 +1,10 @@
-import { Component, OnInit } from '@angular/core'
+import { Component, OnInit, ViewChild } from '@angular/core'
 import { ActivatedRoute } from '@angular/router'
 import { environment } from '../../../../../../../../../src/environments/environment'
-import { MatSnackBar } from '@angular/material'
+import { MatPaginator, MatSnackBar, MatTableDataSource } from '@angular/material'
 import { DownloadReportService } from '../../services/download-report.service'
+import { ITableData } from '@sunbird-cb/collection/lib/ui-org-table/interface/interfaces'
+import { DatePipe } from '@angular/common'
 
 @Component({
   selector: 'ws-app-reports-section',
@@ -10,55 +12,63 @@ import { DownloadReportService } from '../../services/download-report.service'
   styleUrls: ['./reports-section.component.scss'],
 })
 export class ReportsSectionComponent implements OnInit {
+  @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | null = null
   configSvc!: any
   btnList!: any
+  tabledata!: ITableData
+  dataSource: MatTableDataSource<any>
+  reportSectionData: any
+
   constructor(
     private activeRouter: ActivatedRoute,
     private snackBar: MatSnackBar,
-    private downloadService: DownloadReportService
+    private downloadService: DownloadReportService,
+    private datePipe: DatePipe
   ) {
     this.configSvc = this.activeRouter.parent && this.activeRouter.parent.snapshot.data.configService
+    this.dataSource = new MatTableDataSource(this.reportSectionData)
+    this.dataSource.paginator = this.paginator
   }
 
   async ngOnInit() {
     this.btnList = await this.downloadService.fetchDownloadJson().toPromise().catch(_error => { })
-  }
-
-  onButtonClick(type: any) {
-    switch (type) {
-      case 'downloadUserReport':
-        this.downloadUserList()
-        break
-      case 'consumptionReport':
-        this.downloadConsumptionReport()
-        break
+    this.tabledata = {
+      columns: [
+        // { displayName: 'Id', key: 'identifier' },
+        { displayName: 'Report name', key: 'reportName' },
+        { displayName: 'Report type', key: 'reportType' },
+      ],
+      needCheckBox: false,
+      needHash: false,
+      sortColumn: 'dateCreatedOn',
+      sortState: 'desc',
+      needUserMenus: false,
+      actions: [{ icon: 'download', label: 'Download report', name: 'DownloadFile', type: 'link', disabled: false }],
+      actionColumnName: 'Download report',
     }
+    this.reportSectionData = []
+    this.btnList.forEach((element: any) => {
+      if (element.enabled) {
+        this.reportSectionData.push({ reportName: element.name, reportType: element.reportType, type: element.type })
+      }
+    })
+    this.dataSource = new MatTableDataSource(this.reportSectionData)
+    setTimeout(() => this.dataSource.paginator = this.paginator)
   }
 
-  async downloadUserList() {
-    const popup = this.snackBar
-    const fileName = `userReport.xlsx`
-    const downloadUrl = `${environment.domainName}${environment.userBucket}${this.configSvc.userProfile.rootOrgId}/${fileName}`
-    const xhr = new XMLHttpRequest()
-    xhr.onreadystatechange = () => {
-      if (xhr.readyState !== 4) {
-        return
-      }
-      if (xhr.status === 200) {
-        window.location.href = downloadUrl
-      } else {
-        popup.open('Report is not available')
-      }
+  downloadFullFile(event: any) {
+    if (event && event.row && event.row.type) {
+      this.downloadReportFile(event.row.type)
     }
-    xhr.open('GET', downloadUrl)
-    xhr.send()
   }
 
-  downloadConsumptionReport() {
+  async downloadReportFile(type: string) {
+    const currentDate = this.datePipe.transform(new Date(), 'yyyy-MM-dd')
+    const apiProxy = `apis/proxies/v8/storage/v1/report`
     const popup = this.snackBar
-    const fileName = `userEnrolmentReport.xlsx`
-    const downloadUrl = `${environment.domainName}${environment.userBucket}${this.configSvc.userProfile.rootOrgId}/${fileName}`
-    // window.location.href = downloadUrl
+    const fileName = `${this.configSvc.userProfile.rootOrgId}.csv`
+    const downloadUrl =
+      `${environment.domainName}${apiProxy}/${type}/${currentDate}/mdoid=${this.configSvc.userProfile.rootOrgId}/${fileName}`
     const xhr = new XMLHttpRequest()
     xhr.onreadystatechange = () => {
       if (xhr.readyState !== 4) {
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
index cd32381a7..4ad2f0b7d 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
@@ -63,6 +63,7 @@ td, th {
 }
 
 .upload-btn {
+  min-width: 112px;
   width: auto;
   background: #0075B7 !important;
   color: white !important;
@@ -87,6 +88,11 @@ td, th {
   width: 28% !important;
 }
 
+::ng-deep .bulkupload-table .mat-column-status {
+  flex: 0 0 10% !important;
+  width: 10% !important;
+}
+
 ::ng-deep .bulkupload-table .mat-header-cell,
 ::ng-deep .bulkupload-table .mat-cell {
   padding-right: 8px !important;
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
index 894d44237..1f83a4376 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
@@ -114,9 +114,9 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
           this.tableList.push({
             fileName: element.fileName,
             status: element.status ? element.status : '',
-            failedRecordsCount: element.failedRecordsCount ? element.failedRecordsCount : '',
-            successfulRecordsCount: element.successfulRecordsCount ? element.successfulRecordsCount : '',
-            totalRecords: element.totalRecords ? element.totalRecords : '',
+            failedRecordsCount: element.failedRecordsCount ? element.failedRecordsCount : 0,
+            successfulRecordsCount: element.successfulRecordsCount ? element.successfulRecordsCount : 0,
+            totalRecords: element.totalRecords ? element.totalRecords : 0,
             dateCreatedOn: element.dateCreatedOn ? element.dateCreatedOn : '',
             dateUpdatedOn: element.dateUpdatedOn ? element.dateUpdatedOn : '',
           })

From 5df5c64291e3d0bed4f80629db02366cb5be9cab Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Mon, 4 Sep 2023 18:29:55 +0530
Subject: [PATCH 198/887] bug fix for download for report-section

---
 .../home/routes/reports-section/reports-section.component.ts    | 2 +-
 src/environments/environment.bm.ts                              | 1 +
 src/environments/environment.dev.ts                             | 1 +
 src/environments/environment.np.ts                              | 1 +
 src/environments/environment.preprod.ts                         | 1 +
 src/environments/environment.prod.ts                            | 1 +
 src/environments/environment.ts                                 | 2 ++
 7 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
index 5c8dd7cac..7b42b7594 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
@@ -68,7 +68,7 @@ export class ReportsSectionComponent implements OnInit {
     const popup = this.snackBar
     const fileName = `${this.configSvc.userProfile.rootOrgId}.csv`
     const downloadUrl =
-      `${environment.domainName}${apiProxy}/${type}/${currentDate}/mdoid=${this.configSvc.userProfile.rootOrgId}/${fileName}`
+      `${environment.mdoPath}${apiProxy}/${type}/${currentDate}/mdoid=${this.configSvc.userProfile.rootOrgId}/${fileName}`
     const xhr = new XMLHttpRequest()
     xhr.onreadystatechange = () => {
       if (xhr.readyState !== 4) {
diff --git a/src/environments/environment.bm.ts b/src/environments/environment.bm.ts
index 24412506b..6cf3303fc 100644
--- a/src/environments/environment.bm.ts
+++ b/src/environments/environment.bm.ts
@@ -9,4 +9,5 @@ export const environment = {
   contentBucket: (window as { [key: string]: any })['env']['azureBucket'] || '',
   userBucket: (window as { [key: string]: any })['env']['userBucket'] || '',
   domainName: (window as { [key: string]: any })['env']['domainName'] || '',
+  mdoPath: (window as { [key: string]: any })['env']['mdoPath'] || '',
 }
diff --git a/src/environments/environment.dev.ts b/src/environments/environment.dev.ts
index 1fc55536e..bc5b41814 100644
--- a/src/environments/environment.dev.ts
+++ b/src/environments/environment.dev.ts
@@ -9,4 +9,5 @@ export const environment = {
   contentBucket: (window as { [key: string]: any })['env']['azureBucket'] || '',
   userBucket: (window as { [key: string]: any })['env']['userBucket'] || '',
   domainName: (window as { [key: string]: any })['env']['domainName'] || '',
+  mdoPath: (window as { [key: string]: any })['env']['mdoPath'] || '',
 }
diff --git a/src/environments/environment.np.ts b/src/environments/environment.np.ts
index f2599bb9e..5e517edb3 100644
--- a/src/environments/environment.np.ts
+++ b/src/environments/environment.np.ts
@@ -9,4 +9,5 @@ export const environment = {
   contentBucket: (window as { [key: string]: any })['env']['azureBucket'] || '',
   userBucket: (window as { [key: string]: any })['env']['userBucket'] || '',
   domainName: (window as { [key: string]: any })['env']['domainName'] || '',
+  mdoPath: (window as { [key: string]: any })['env']['mdoPath'] || '',
 }
diff --git a/src/environments/environment.preprod.ts b/src/environments/environment.preprod.ts
index 1fc55536e..bc5b41814 100644
--- a/src/environments/environment.preprod.ts
+++ b/src/environments/environment.preprod.ts
@@ -9,4 +9,5 @@ export const environment = {
   contentBucket: (window as { [key: string]: any })['env']['azureBucket'] || '',
   userBucket: (window as { [key: string]: any })['env']['userBucket'] || '',
   domainName: (window as { [key: string]: any })['env']['domainName'] || '',
+  mdoPath: (window as { [key: string]: any })['env']['mdoPath'] || '',
 }
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 1fc55536e..bc5b41814 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -9,4 +9,5 @@ export const environment = {
   contentBucket: (window as { [key: string]: any })['env']['azureBucket'] || '',
   userBucket: (window as { [key: string]: any })['env']['userBucket'] || '',
   domainName: (window as { [key: string]: any })['env']['domainName'] || '',
+  mdoPath: (window as { [key: string]: any })['env']['mdoPath'] || '',
 }
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 09bc35305..d38f3f022 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -13,6 +13,7 @@ export const environment: IEnvironment = {
   contentBucket: (window as { [key: string]: any })['env']['azureBucket'] || '',
   userBucket: (window as { [key: string]: any })['env']['userBucket'] || '',
   domainName: (window as { [key: string]: any })['env']['domainName'] || '',
+  mdoPath: (window as { [key: string]: any })['env']['mdoPath'] || '',
 }
 interface IEnvironment {
   name: null | string
@@ -25,6 +26,7 @@ interface IEnvironment {
   contentBucket?: string
   userBucket?: string
   domainName?: string
+  mdoPath: string
 }
 
 /*

From 9726e706ada05bf71b8791d5339f06126172ba1c Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Tue, 5 Sep 2023 14:21:53 +0530
Subject: [PATCH 199/887] Allow naminate user till batch enrollment date

---
 .../batch-details/batch-details.component.html         |  2 +-
 .../batch-details/batch-details.component.ts           | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
index 92a42a5ce..cc7224ef8 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
@@ -47,7 +47,7 @@
               <!-- <span *ngIf="rejectedUsers" class="ws-mat-black60-text">({{rejectedUsers.length}})</span> -->
             </a>
           </div>
-          <div class="flex-2 right-align margin-top-l" *ngIf="currentFilter === 'approved'">
+          <div class="flex-2 right-align margin-top-l" *ngIf="currentFilter === 'approved' && allowToNominate()">
             <button type="button" mat-button class="add-nomine-btn" (click)="onNominateUsersClick('nominateUsers')">
               Nominate learners
             </button>
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index b07d6e0c1..b615f2027 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -7,7 +7,7 @@ import { BlendedApporvalService } from '../../services/blended-approval.service'
 import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
 import { EventService } from '@sunbird-cb/utils'
 import { NominateUsersDialogComponent } from '../nominate-users-dialog/nominate-users-dialog.component'
-
+import moment from 'moment'
 @Component({
   selector: 'ws-app-batch-details',
   templateUrl: './batch-details.component.html',
@@ -270,9 +270,11 @@ export class BatchDetailsComponent implements OnInit {
   // }
 
   removeLearner(startDate: any) {
-    const sDate: Date = new Date(startDate)
-    const currentDate: Date = new Date('2023-08-11')
-    return currentDate < sDate
+    return moment(moment().format('YYYY-MM-DD')).isBefore(moment(startDate))
+  }
+
+  allowToNominate() {
+    return moment(moment().format('YYYY-MM-DD')).isSameOrBefore(moment(this.batchData.enrollmentEndDate))
   }
 
   filterNewUsers(searchText: string) {

From 5375a0588c082fc53ca070c47da4cf7d0e04a265 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Tue, 5 Sep 2023 16:52:02 +0530
Subject: [PATCH 200/887] lint fixes

---
 .../head/_services/telemetry.event.model.ts   |  2 +-
 .../blended-approvals.module.ts               |  7 ++--
 .../batch-details/batch-details.component.ts  | 19 +++++------
 .../batch-list/batch-list.component.ts        |  4 +--
 .../nominate-users-dialog.component.ts        | 33 +++++++++----------
 .../reject-reason-dialog.component.spec.ts    | 28 ++++++++--------
 .../reject-reason-dialog.component.ts         |  2 +-
 .../session-card/session-card.component.ts    |  1 -
 .../users-card/users-card.component.ts        |  5 +--
 .../services/blended-approval.service.ts      |  2 +-
 10 files changed, 48 insertions(+), 55 deletions(-)

diff --git a/project/ws/app/src/lib/head/_services/telemetry.event.model.ts b/project/ws/app/src/lib/head/_services/telemetry.event.model.ts
index c27294833..b38caa0a0 100644
--- a/project/ws/app/src/lib/head/_services/telemetry.event.model.ts
+++ b/project/ws/app/src/lib/head/_services/telemetry.event.model.ts
@@ -15,7 +15,7 @@ export namespace TelemetryEvents {
     EVENTS_TAB = 'events-tab',
     APPROVAL_TAB = 'approval-tab',
     SCROLLY_MENU = 'scrolly-menu',
-    NOMINATE_BTN = 'nominate-learners-btn'
+    NOMINATE_BTN = 'nominate-learners-btn',
 
   }
   export enum EnumIdtype {
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts b/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
index 7fe713358..0c1772cb7 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
@@ -20,7 +20,7 @@ import {
   MatSortModule,
   MatFormFieldModule,
   MatDialogModule,
-  MatInputModule
+  MatInputModule,
 } from '@angular/material'
 import { MatCardModule } from '@angular/material/card'
 import { BatchDetailsComponent } from './components/batch-details/batch-details.component'
@@ -36,7 +36,7 @@ import { SessionCardComponent } from './components/session-card/session-card.com
 import { NominateUsersDialogComponent } from './components/nominate-users-dialog/nominate-users-dialog.component'
 import { RejectReasonDialogComponent } from './components/reject-reason-dialog/reject-reason-dialog.component'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
-//import { AppButtonModule } from '../../head/app-button/app-button.module'
+// import { AppButtonModule } from '../../head/app-button/app-button.module'
 
 @NgModule({
   declarations: [BlendedHomeComponent, BatchListComponent, BatchDetailsComponent, UsersCardComponent, ProfileViewComponent,
@@ -44,7 +44,8 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'
   imports: [CommonModule, BlendedApprovalsRoutingModule, BreadcrumbsOrgModule, LeftMenuWithoutLogoModule, WidgetResolverModule,
     MatSidenavModule, MatButtonModule, MatIconModule, HomeModule, RouterModule, UIORGTableModule,
     MatCardModule, AvatarPhotoModule, MatListModule, PipeEmailModule, PipeOrderByModule, ProfileCertificateDialogModule,
-    MatBadgeModule, MatTableModule, MatCheckboxModule, MatSortModule, FormsModule, ReactiveFormsModule, MatFormFieldModule, MatDialogModule, MatInputModule],
+    MatBadgeModule, MatTableModule, MatCheckboxModule, MatSortModule, FormsModule, ReactiveFormsModule,
+    MatFormFieldModule, MatDialogModule, MatInputModule],
   exports: [],
   providers: [],
   entryComponents: [NominateUsersDialogComponent, RejectReasonDialogComponent],
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index b615f2027..47c4553f0 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -33,9 +33,9 @@ export class BatchDetailsComponent implements OnInit {
   constructor(private router: Router, private activeRouter: ActivatedRoute,
     // tslint:disable-next-line:align
     private bpService: BlendedApporvalService,
-    private snackBar: MatSnackBar,
-    private events: EventService,
-    private dialogue: MatDialog) {
+              private snackBar: MatSnackBar,
+              private events: EventService,
+              private dialogue: MatDialog) {
     const currentState = this.router.getCurrentNavigation()
     if (currentState && currentState.extras.state) {
       this.batchData = currentState.extras.state
@@ -208,22 +208,21 @@ export class BatchDetailsComponent implements OnInit {
       deptName: event.userData.department,
       comment: event.comment,
       updateFieldValues: [{
-        toValue: { name: event.userData.first_name }
-      }]
+        toValue: { name: event.userData.first_name },
+      }],
     }
     this.bpService.removeLearner(request).subscribe((res: any) => {
       this.openSnackbar('Learner is removed successfully!')
       this.filter('approved')
       // tslint:disable-next-line:no-console
       console.log(res)
-    }, (err: { error: any }) => {
+    },                                              (err: { error: any }) => {
       // tslint:disable-next-line:no-console
       console.log('request', err)
       this.openSnackbar('Something went wrong. Please try after sometime.')
     })
   }
 
-
   raiseTelemetry(name: string, subtype: string) {
     this.events.raiseInteractTelemetry(
       {
@@ -243,10 +242,10 @@ export class BatchDetailsComponent implements OnInit {
         orgId: this.userProfile.rootOrgId,
         courseId: this.programID,
         applicationId: this.batchData.batchId,
-        learners: this.approvedUsers
+        learners: this.approvedUsers,
       },
       disableClose: true,
-      autoFocus: false
+      autoFocus: false,
     })
 
     dialogRef.afterClosed().subscribe((response: any) => {
@@ -292,7 +291,6 @@ export class BatchDetailsComponent implements OnInit {
   filterApprovedUsers(searchText: string) {
     if (searchText.length > 0) {
       this.approvedUsers = this.approvedUsers.filter((result: any) => {
-        console.log(result)
         if (result.first_name) {
           return result.first_name.toLowerCase().includes(searchText.toLowerCase())
         }
@@ -325,4 +323,3 @@ export class BatchDetailsComponent implements OnInit {
   }
 
 }
-
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
index e3660e54f..de493d2c6 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
@@ -45,7 +45,7 @@ export class BatchListComponent implements OnInit {
                 offset: 0,
                 deptName: this.userProfile.channel,
               }
-              //b.newrequestsCount = Math.floor(Math.random() * (100 - 0 + 0)) + 0
+              // b.newrequestsCount = Math.floor(Math.random() * (100 - 0 + 0)) + 0
               b.learnersCount = 0
               this.bpService.getRequests(request).subscribe((resnew: any) => {
                 if (resnew && resnew.result && resnew.result.data && resnew.result.data.length > 0) {
@@ -98,7 +98,7 @@ export class BatchListComponent implements OnInit {
                 deptName: this.userProfile.channel,
               }
               b.learnersCount = 0
-              //b.newrequestsCount = Math.floor(Math.random() * (100 - 0 + 0)) + 0
+              // b.newrequestsCount = Math.floor(Math.random() * (100 - 0 + 0)) + 0
               this.bpService.getRequests(request).subscribe((resnew: any) => {
                 if (resnew && resnew.result && resnew.result.data && resnew.result.data.length > 0) {
                   b.newrequestsCount = resnew.result.data.length
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
index 2cbe174a6..202a7cda9 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
@@ -14,7 +14,7 @@ import { BlendedApporvalService } from '../../services/blended-approval.service'
 export class NominateUsersDialogComponent implements OnInit {
 
   displayedColumns: string[] = ['select', 'name', 'email']
-  searchText: string = ''
+  searchText = ''
   selection = new SelectionModel(true, [])
   filteredUsers: any = []
   dataSource = new MatTableDataSource<any>()
@@ -33,9 +33,9 @@ export class NominateUsersDialogComponent implements OnInit {
   ]
 
   constructor(public dialogRef: MatDialogRef<NominateUsersDialogComponent>,
-    private usersService: UsersService,
-    @Inject(MAT_DIALOG_DATA) public data: any, private bpService: BlendedApporvalService,
-    private snackBar: MatSnackBar,) { }
+              private usersService: UsersService,
+              @Inject(MAT_DIALOG_DATA) public data: any, private bpService: BlendedApporvalService,
+              private snackBar: MatSnackBar) { }
 
   ngOnInit() {
     const filterObj = {
@@ -58,8 +58,8 @@ export class NominateUsersDialogComponent implements OnInit {
     })
     this.usersService.getAllUsers(filterObj).subscribe(data => {
       data.content.map((details: any) => {
-        let dept = (details.profileDetails && details.profileDetails.employmentDetails) ? details.profileDetails.employmentDetails.departmentName : details.rootOrgName
-        console.log("this.learners ", this.learners)
+        const dept = (details.profileDetails && details.profileDetails.employmentDetails)
+          ? details.profileDetails.employmentDetails.departmentName : details.rootOrgName
         if (!this.learners.includes(details.id)) {
           this.filteredUsers.push({
             name: details.firstName,
@@ -67,14 +67,14 @@ export class NominateUsersDialogComponent implements OnInit {
             userId: details.id,
             rootOrgId: this.data.orgId,
             actorUserId: details.id,
-            state: "APPROVED",
+            state: 'APPROVED',
             serviceName: 'blendedprogram',
             deptName: dept,
             courseId: this.data.courseId, // blended program course ID
-            applicationId: this.data.applicationId, //blended program batch ID
+            applicationId: this.data.applicationId, // blended program batch ID
             updateFieldValues: [
-              { toValue: { name: details.firstName } }
-            ]
+              { toValue: { name: details.firstName } },
+            ],
           })
         }
 
@@ -97,29 +97,28 @@ export class NominateUsersDialogComponent implements OnInit {
   }
 
   addLearners() {
-    let seletedLearner: any = []
+    const seletedLearner: any = []
     if (this.selection.selected.length > 0) {
       this.selection.selected.map((user: any) => {
-        let obj = {
+        const obj = {
           userId: user.userId,
           rootOrgId: this.data.orgId,
           actorUserId: user.userId,
-          state: "APPROVED",
+          state: 'APPROVED',
           serviceName: 'blendedprogram',
           deptName: user.deptName,
           courseId: this.data.courseId, // blended program course ID
-          applicationId: this.data.applicationId, //blended program batch ID
-          updateFieldValues: user.updateFieldValues
+          applicationId: this.data.applicationId, // blended program batch ID
+          updateFieldValues: user.updateFieldValues,
         }
         seletedLearner.push(obj)
       })
-      console.log("seletedLearner ", seletedLearner)
       this.bpService.nominateLearners(seletedLearner).subscribe((res: any) => {
         // tslint:disable-next-line:no-console
         console.log('res', res)
         this.openSnackbar('Users are added successfully!')
         this.dialogRef.close('done')
-      }, (err: { error: any }) => {
+      },                                                        (err: { error: any }) => {
         // tslint:disable-next-line:no-console
         console.log(err)
         this.openSnackbar('some thing went wrong, Please try after sometime.')
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.spec.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.spec.ts
index 22133293d..11c5dc9d3 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.spec.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.spec.ts
@@ -1,25 +1,25 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
 
-import { RejectReasonDialogComponent } from './reject-reason-dialog.component';
+import { RejectReasonDialogComponent } from './reject-reason-dialog.component'
 
 describe('RejectReasonDialogComponent', () => {
-  let component: RejectReasonDialogComponent;
-  let fixture: ComponentFixture<RejectReasonDialogComponent>;
+  let component: RejectReasonDialogComponent
+  let fixture: ComponentFixture<RejectReasonDialogComponent>
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ RejectReasonDialogComponent ]
+      declarations: [RejectReasonDialogComponent],
     })
-    .compileComponents();
-  }));
+    .compileComponents()
+  }))
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(RejectReasonDialogComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+    fixture = TestBed.createComponent(RejectReasonDialogComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
 
   it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.ts
index 187d49dc1..8cc036807 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.ts
@@ -5,7 +5,7 @@ import { MatDialogRef } from '@angular/material'
 @Component({
   selector: 'ws-app-reject-reason-dialog',
   templateUrl: './reject-reason-dialog.component.html',
-  styleUrls: ['./reject-reason-dialog.component.scss']
+  styleUrls: ['./reject-reason-dialog.component.scss'],
 })
 export class RejectReasonDialogComponent implements OnInit {
   reasonForm!: FormGroup
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.ts
index 4966d436f..f2b396fa0 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.ts
@@ -13,7 +13,6 @@ export class SessionCardComponent implements OnInit {
   constructor() { }
 
   ngOnInit() {
-    console.log("batch ", this.batch)
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
index 0b4802377..9d45ce5ba 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
@@ -79,14 +79,11 @@ export class UsersCardComponent implements OnInit {
         const data = {
           action: 'Remove',
           userData: this.user,
-          comment: response.reason
+          comment: response.reason,
         }
-        console.log(response)
         this.userClick.emit(data)
       }
-
     })
-
   }
 
   loadUser(user: any) {
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
index 75c3ae56c..81a7a05ff 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
@@ -13,7 +13,7 @@ const API_END_POINTS = {
   READ_USER: '/apis/proxies/v8/api/user/v2/read/',
   CERT_DOWNLOAD: `/apis/protected/v8/cohorts/course/batch/cert/download/`,
   NOMINATE_LEARNERS: '/apis/proxies/v8/workflow/blendedprogram/admin/enrol',
-  REMOVE_LEARNER: '/apis/proxies/v8/workflow/blendedprogram/remove'
+  REMOVE_LEARNER: '/apis/proxies/v8/workflow/blendedprogram/remove',
 }
 
 @Injectable({

From cee87463cd5555fb0301c9c7501a4567f9f4b0fa Mon Sep 17 00:00:00 2001
From: Bharath Kumar <bharathkumar@TI-MAC-087.local>
Date: Thu, 7 Sep 2023 18:56:03 +0530
Subject: [PATCH 201/887] changes inthe user check

---
 .../routes/home/routes/users-view/users-view.component.ts    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index c9b849c4c..285d03472 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -187,7 +187,10 @@ export class UsersViewComponent implements OnInit, OnDestroy {
 
   showEditUser(roles: any): boolean {
     if (this.isMdoAdmin) {
-      return (roles.includes('PUBLIC') && roles.length === 1)
+      if (roles && roles.length > 0) {
+        return (roles.includes('PUBLIC') && roles.length === 1)
+      }
+      return false
     }
     return true
   }

From b28eb2e6bf8271d9d6d4f62e7d01f0d0f6fe6aad Mon Sep 17 00:00:00 2001
From: Bharath Kumar <bharathkumar@TI-MAC-087.local>
Date: Tue, 12 Sep 2023 17:40:02 +0530
Subject: [PATCH 202/887] changes in mdo users

---
 .../routes/reports-section/reports-section.component.ts     | 2 +-
 .../users/routes/create-user/create-user.component.html     | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
index 7b42b7594..a3e92e10c 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
@@ -68,7 +68,7 @@ export class ReportsSectionComponent implements OnInit {
     const popup = this.snackBar
     const fileName = `${this.configSvc.userProfile.rootOrgId}.csv`
     const downloadUrl =
-      `${environment.mdoPath}${apiProxy}/${type}/${currentDate}/mdoid=${this.configSvc.userProfile.rootOrgId}/${fileName}`
+      `${environment.mdoPath}/${apiProxy}/${type}/${currentDate}/mdoid=${this.configSvc.userProfile.rootOrgId}/${fileName}`
     const xhr = new XMLHttpRequest()
     xhr.onreadystatechange = () => {
       if (xhr.readyState !== 4) {
diff --git a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html
index fb6e99884..50503caef 100644
--- a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html
+++ b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html
@@ -1,6 +1,8 @@
 <div>
-  <ws-widget-breadcrumbs-org [widgetData]="breadcrumbs">
-  </ws-widget-breadcrumbs-org>
+  <div class="flex margin-left-xl">
+    <ws-widget-breadcrumbs-org [widgetData]="breadcrumbs">
+    </ws-widget-breadcrumbs-org>
+  </div>
 
   <mat-sidenav-container class="sticky" autosize name="discuss-menu">
     <mat-sidenav [(opened)]="sideNavBarOpened" class="left-nav">

From 1def924bc1100153c39c41d40d349b0938812abc Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Wed, 13 Sep 2023 19:34:43 +0530
Subject: [PATCH 203/887] bug fix

---
 .../reports-section/reports-section.component.scss     | 10 ++++++++++
 .../reports-section/reports-section.component.ts       |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.scss b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.scss
index 59ff6a543..11b1caea6 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.scss
@@ -6,4 +6,14 @@
   font-family: 'Lato';
   font-weight: 700;
   font-size: 14px;
+}
+
+::ng-deep .p1-btn {
+  box-shadow: none !important;
+  padding: 0 !important;
+  text-align: left !important;
+  span {
+    text-decoration: underline !important;
+    color: #0075B7 !important;
+  }
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
index a3e92e10c..6c10a0f6f 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
@@ -43,8 +43,8 @@ export class ReportsSectionComponent implements OnInit {
       sortColumn: 'dateCreatedOn',
       sortState: 'desc',
       needUserMenus: false,
-      actions: [{ icon: 'download', label: 'Download report', name: 'DownloadFile', type: 'link', disabled: false }],
-      actionColumnName: 'Download report',
+      actions: [{ icon: '', label: 'Download', name: 'DownloadFile', type: 'Standard', disabled: false }],
+      actionColumnName: 'Action',
     }
     this.reportSectionData = []
     this.btnList.forEach((element: any) => {

From 93e9250ec02e6c94e1f5bf75b64653f2a904cc13 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Thu, 14 Sep 2023 16:32:50 +0530
Subject: [PATCH 204/887] MDO LEADER can't create another MDO LEADER

---
 .../routes/create-user/create-user.component.ts      | 12 +++++++++---
 .../users/routes/view-user/view-user.component.ts    | 12 +++++++++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
index c9603d019..5d3a87fbf 100644
--- a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
@@ -44,6 +44,7 @@ export class CreateUserComponent implements OnInit, OnDestroy {
   displayLoader = false
   emailLengthVal = false
   isMdoAdmin = false
+  isMdoLeader = false
 
   @HostListener('window:scroll', ['$event'])
   handleScroll() {
@@ -93,6 +94,7 @@ export class CreateUserComponent implements OnInit, OnDestroy {
 
         if (this.configService.unMappedUser && this.configService.unMappedUser.roles) {
           this.isMdoAdmin = this.configService.unMappedUser.roles.includes('MDO_ADMIN')
+          this.isMdoLeader = this.configService.unMappedUser.roles.includes('MDO_LEADER')
         }
 
         // new code
@@ -106,9 +108,13 @@ export class CreateUserComponent implements OnInit, OnDestroy {
                   })
                 }
               } else {
-                this.uniqueRoles.push({
-                  roleName: rolesObject, description: rolesObject,
-                })
+                if (this.isMdoLeader) {
+                  if (rolesObject !== 'MDO_LEADER') {
+                    this.uniqueRoles.push({
+                      roleName: rolesObject, description: rolesObject,
+                    })
+                  }
+                }
               }
             })
           }
diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
index 6b214d637..d4b42df2d 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
@@ -47,6 +47,7 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
   qpPath: any
   breadcrumbs: any
   isMdoAdmin = false
+  isMdoLeader = false
 
   @HostListener('window:scroll', ['$event'])
   handleScroll() {
@@ -92,6 +93,7 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
 
         if (fullProfile.unMappedUser && fullProfile.unMappedUser.roles) {
           this.isMdoAdmin = fullProfile.unMappedUser.roles.includes('MDO_ADMIN')
+          this.isMdoLeader = fullProfile.unMappedUser.roles.includes('MDO_LEADER')
         }
 
         // New code for roles
@@ -105,9 +107,13 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
                   })
                 }
               } else {
-                this.uniqueRoles.push({
-                  roleName: rolesObject, description: rolesObject,
-                })
+                if (this.isMdoLeader) {
+                  if (rolesObject !== 'MDO_LEADER') {
+                    this.uniqueRoles.push({
+                      roleName: rolesObject, description: rolesObject,
+                    })
+                  }
+                }
               }
             })
           }

From 210b2d9bf6b2a236c910387b9c864193fc92b67d Mon Sep 17 00:00:00 2001
From: Bharath Kumar <bharathkumar@TI-MAC-087.local>
Date: Tue, 19 Sep 2023 15:23:05 +0530
Subject: [PATCH 205/887] added condition

---
 .../components/batch-details/batch-details.component.html   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
index cc7224ef8..e96b88ccb 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
@@ -40,10 +40,10 @@
               (click)="filter('rejected')" role="button">Rejected requests
               <!-- <span *ngIf="rejectedUsers" class="ws-mat-black60-text">({{rejectedUsers.length}})</span> -->
             </a>
-            <a class="filter-option cursor-pointer" *ngIf="batchData.batchAttributes.sessionDetails_v2"
+            <a class="filter-option cursor-pointer" *ngIf="batchData?.batchAttributes?.sessionDetails_v2"
               [ngClass]="{'ws-mat-accent-border-active font-bold' : currentFilter === 'sessions',
-                                                                                    'ws-mat-accent-border font-medium':currentFilter !== 'sessions'}" mat-button (click)="filter('sessions')"
-              role="button">Session details
+                                                                                    'ws-mat-accent-border font-medium':currentFilter !== 'sessions'}" mat-button (click)="filter('sessions')" role="button">Session
+              details
               <!-- <span *ngIf="rejectedUsers" class="ws-mat-black60-text">({{rejectedUsers.length}})</span> -->
             </a>
           </div>

From bdbb1945491069a7d711dc376cb5b276aa913b37 Mon Sep 17 00:00:00 2001
From: Bharath Kumar <bharathkumar@TI-MAC-087.local>
Date: Tue, 19 Sep 2023 15:24:10 +0530
Subject: [PATCH 206/887] added condition

---
 .../routes/blended-approvals/blended-approvals.component.ts     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
index ef8e1698a..8cc2067c4 100644
--- a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
@@ -18,7 +18,7 @@ export class BlendedApprovalsComponent implements OnInit {
   tabledata: ITableData = {
     actions: [],
     columns: [
-      { displayName: 'Program name', key: 'name' },
+      { displayName: 'Blended Program name', key: 'name' },
       { displayName: 'Batches', key: 'batchesCount' },
       // { displayName: 'Learners', key: 'learners', isList: true },
       { displayName: 'New requests (Across batches)', key: 'newrequests', isList: true },

From 3b74618318e78428653c6e62b69e2cec90762166 Mon Sep 17 00:00:00 2001
From: Bharath Kumar <bharathkumar@TI-MAC-087.local>
Date: Tue, 19 Sep 2023 17:36:31 +0530
Subject: [PATCH 207/887] changes in the report

---
 .../reports-section/reports-section.component.ts       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
index 7b42b7594..0f3e5e1b6 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
@@ -49,7 +49,7 @@ export class ReportsSectionComponent implements OnInit {
     this.reportSectionData = []
     this.btnList.forEach((element: any) => {
       if (element.enabled) {
-        this.reportSectionData.push({ reportName: element.name, reportType: element.reportType, type: element.type })
+        this.reportSectionData.push({ reportName: element.name, reportType: element.reportType, type: element.type, fileName: element.downloadReportFileName })
       }
     })
     this.dataSource = new MatTableDataSource(this.reportSectionData)
@@ -57,16 +57,16 @@ export class ReportsSectionComponent implements OnInit {
   }
 
   downloadFullFile(event: any) {
-    if (event && event.row && event.row.type) {
-      this.downloadReportFile(event.row.type)
+    if (event && event.row && event.row.type && event.row.fileName) {
+      this.downloadReportFile(event.row.type, event.row.fileName)
     }
   }
 
-  async downloadReportFile(type: string) {
+  async downloadReportFile(type: string, reportFileName: string) {
     const currentDate = this.datePipe.transform(new Date(), 'yyyy-MM-dd')
     const apiProxy = `apis/proxies/v8/storage/v1/report`
     const popup = this.snackBar
-    const fileName = `${this.configSvc.userProfile.rootOrgId}.csv`
+    const fileName = `${reportFileName}.csv`
     const downloadUrl =
       `${environment.mdoPath}${apiProxy}/${type}/${currentDate}/mdoid=${this.configSvc.userProfile.rootOrgId}/${fileName}`
     const xhr = new XMLHttpRequest()

From 06838f94786ccfcaff11564ad97584cd1ef7649f Mon Sep 17 00:00:00 2001
From: Bharath Kumar <bharathkumar@TI-MAC-087.local>
Date: Tue, 19 Sep 2023 17:40:44 +0530
Subject: [PATCH 208/887] changes in the report

---
 .../home/routes/reports-section/reports-section.component.ts     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
index 0f3e5e1b6..8b315cdd7 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
@@ -49,6 +49,7 @@ export class ReportsSectionComponent implements OnInit {
     this.reportSectionData = []
     this.btnList.forEach((element: any) => {
       if (element.enabled) {
+        // tslint:disable-next-line:max-line-length
         this.reportSectionData.push({ reportName: element.name, reportType: element.reportType, type: element.type, fileName: element.downloadReportFileName })
       }
     })

From b3ce43dc286f92b7f64c60a474a4cb0a586e3f4b Mon Sep 17 00:00:00 2001
From: Bharath Kumar <bharathkumar@TI-MAC-087.local>
Date: Tue, 19 Sep 2023 18:06:32 +0530
Subject: [PATCH 209/887] changes in  the names

---
 .../reports-section/reports-section.component.ts      | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
index a3e92e10c..fb4c38270 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
@@ -49,7 +49,8 @@ export class ReportsSectionComponent implements OnInit {
     this.reportSectionData = []
     this.btnList.forEach((element: any) => {
       if (element.enabled) {
-        this.reportSectionData.push({ reportName: element.name, reportType: element.reportType, type: element.type })
+        // tslint:disable-next-line:max-line-length
+        this.reportSectionData.push({ reportName: element.name, reportType: element.reportType, type: element.type, fileName: element.downloadReportFileName })
       }
     })
     this.dataSource = new MatTableDataSource(this.reportSectionData)
@@ -57,16 +58,16 @@ export class ReportsSectionComponent implements OnInit {
   }
 
   downloadFullFile(event: any) {
-    if (event && event.row && event.row.type) {
-      this.downloadReportFile(event.row.type)
+    if (event && event.row && event.row.type && event.type.fileName) {
+      this.downloadReportFile(event.row.type, event.type.fileName)
     }
   }
 
-  async downloadReportFile(type: string) {
+  async downloadReportFile(type: string, reportFileName: string) {
     const currentDate = this.datePipe.transform(new Date(), 'yyyy-MM-dd')
     const apiProxy = `apis/proxies/v8/storage/v1/report`
     const popup = this.snackBar
-    const fileName = `${this.configSvc.userProfile.rootOrgId}.csv`
+    const fileName = `${reportFileName}.csv`
     const downloadUrl =
       `${environment.mdoPath}/${apiProxy}/${type}/${currentDate}/mdoid=${this.configSvc.userProfile.rootOrgId}/${fileName}`
     const xhr = new XMLHttpRequest()

From 9c4663e7bb29db7d1534987b424b409637e0dd44 Mon Sep 17 00:00:00 2001
From: Bharath Kumar <bharathkumar@TI-MAC-087.local>
Date: Tue, 19 Sep 2023 19:25:35 +0530
Subject: [PATCH 210/887] changes in type

---
 .../home/routes/reports-section/reports-section.component.ts  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
index fb4c38270..f4c566f21 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
@@ -58,8 +58,8 @@ export class ReportsSectionComponent implements OnInit {
   }
 
   downloadFullFile(event: any) {
-    if (event && event.row && event.row.type && event.type.fileName) {
-      this.downloadReportFile(event.row.type, event.type.fileName)
+    if (event && event.row && event.row.type && event.row.fileName) {
+      this.downloadReportFile(event.row.type, event.row.fileName)
     }
   }
 

From 76e870f494c33bfd8b8299eb99368fd2eb624925 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Tue, 19 Sep 2023 22:26:45 +0530
Subject: [PATCH 211/887] bug fix

---
 .../routes/reports-section/reports-section.component.ts   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
index f222aa22c..1c92afd13 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
@@ -49,8 +49,12 @@ export class ReportsSectionComponent implements OnInit {
     this.reportSectionData = []
     this.btnList.forEach((element: any) => {
       if (element.enabled) {
-        // tslint:disable-next-line:max-line-length
-        this.reportSectionData.push({ reportName: element.name, reportType: element.reportType, type: element.type, fileName: element.downloadReportFileName })
+        this.reportSectionData.push({
+          reportName: element.name,
+          reportType: element.reportType,
+          type: element.type,
+          fileName: element.downloadReportFileName,
+        })
       }
     })
     this.dataSource = new MatTableDataSource(this.reportSectionData)

From 34619334e3ed7918366a47289de7fa6a51fca689 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Wed, 20 Sep 2023 19:48:24 +0530
Subject: [PATCH 212/887] Bugs fixes - #104590 & #104461

---
 .../components/batch-details/batch-details.component.html    | 5 ++---
 .../components/batch-details/batch-details.component.scss    | 4 ++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
index e96b88ccb..021025411 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
@@ -14,8 +14,6 @@
               'mediumDate'}}</li>
             <li><mat-icon>event</mat-icon> {{batchData.enrollmentEndDate | date: 'mediumDate'}}</li>
             <li><mat-icon>people</mat-icon> {{approvedUsers.length}} Learners</li>
-            <li *ngIf="this.currentFilter === 'approved'"><mat-icon>person</mat-icon>
-              {{batchData.batchAttributes?.currentBatchSize}} Learners</li>
           </ul>
         </div>
       </ng-container>
@@ -48,7 +46,8 @@
             </a>
           </div>
           <div class="flex-2 right-align margin-top-l" *ngIf="currentFilter === 'approved' && allowToNominate()">
-            <button type="button" mat-button class="add-nomine-btn" (click)="onNominateUsersClick('nominateUsers')">
+            <button type="button" mat-button class="add-nomine-btn" (click)="onNominateUsersClick('nominateUsers')"
+              [disabled]="programData.wfApprovalType === 'oneStepPCApproval' || programData.wfApprovalType === 'twoStepPCAndMDOApproval'">
               Nominate learners
             </button>
           </div>
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss
index 96081dfdd..b093d5139 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss
@@ -126,3 +126,7 @@
   font-size: 20px;
   left: 10px;
 }
+
+.mat-button[disabled] {
+  opacity: 0.6;
+}

From 55dc3377538a79891a10a3ed682711412659d581 Mon Sep 17 00:00:00 2001
From: dakshayini-krishnappa <dakshayini.krishnappa@tarento.com>
Date: Fri, 22 Sep 2023 01:01:10 +0530
Subject: [PATCH 213/887] lint issue fix

---
 .../users-view/users-view.component.html      |  7 +++++
 .../users-view/users-view.component.scss      | 13 ++++++++++
 .../routes/users-view/users-view.component.ts | 26 +++++++++++++++----
 .../routes/users/services/users.service.ts    | 26 ++++++++++++++-----
 4 files changed, 61 insertions(+), 11 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index 85091d7b1..df65a4996 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -38,6 +38,13 @@
           [isCreate]=true (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuActions($event)"
           (searchByEnterKey)="onEnterkySearch($event)" [showEditOnCondition]=true>
         </ws-widget-org-user-table>
+        <div style="float: right;display: flex;">
+          <button class="mr-5 move-button" matTooltip="display prev 250 data"
+            [disabled]="(currentOffset > 0)? false :true" (click)="getAllUsers(250,'prev')">Prev </button>
+          <button class="move-button" matTooltip=" display next 250 data"
+            [disabled]="(currentOffset >= userDataTotalCount)? true :false" (click)="getAllUsers(250,'next')">Next
+          </button>
+        </div>
         <!-- <ws-widget-org-user-table [tableData]="tabledata" [data]="dataForTable" [isUpload]=true [isCreate]=true
           (eOnButtonClick)="clickHandler($event)" (eOnRowClick)="onRoleClick($event)" (actionsClick)="menuActions($event)"
           (searchByEnterKey)="onEnterkySearch($event)">
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.scss b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.scss
index fe5f76c55..68b471138 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.scss
@@ -295,4 +295,17 @@ a:not([href]):not([tabindex]) {
 
 ::ng-deep.mat-header-cell .mat-icon {
   padding-left: 0.3em !important;
+}
+
+.move-button{
+  cursor: pointer;
+  height: auto;
+  border-radius: 4px;
+  border: none;
+  width: 60px;
+  // background: #0075b7!important;
+  // color: #fff!important;
+  //font-weight: 700;
+  font-family: Lato;
+  font-size: 14px;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 285d03472..b2b1e03e9 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -62,6 +62,8 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     sortState: 'asc',
     needUserMenus: true,
   }
+  currentOffset = 0
+  userDataTotalCount = 0
   constructor(
     public dialog: MatDialog,
     private route: ActivatedRoute,
@@ -215,7 +217,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     return blockedUsersData
   }
 
-  getAllUsers() {
+  getAllUsers(offset?: number, functionality?: string) {
     this.loaderService.changeLoad.next(true)
     const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
     // const filterObj = {
@@ -230,10 +232,24 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     //   this.usersData = data
     //   this.filterData()
     // })
-    this.usersService.getAllKongUsers(rootOrgId).subscribe(data => {
-      this.usersData = data.result.response
-      this.filterData()
-    })
+
+    if (functionality !== undefined && offset !== undefined) {
+      if (functionality === 'next') {
+        this.currentOffset = this.currentOffset + offset
+      } else { this.currentOffset = this.currentOffset - offset }
+
+      this.usersService.getAllKongUsers(rootOrgId, this.currentOffset).subscribe(data => {
+        this.userDataTotalCount = data.result.response.count
+        this.usersData = data.result.response
+        this.filterData()
+      })
+    } else {
+      this.usersService.getAllKongUsers(rootOrgId).subscribe(data => {
+        this.userDataTotalCount = data.result.response.count
+        this.usersData = data.result.response
+        this.filterData()
+      })
+    }
   }
 
   clickHandler(event: any) {
diff --git a/project/ws/app/src/lib/routes/users/services/users.service.ts b/project/ws/app/src/lib/routes/users/services/users.service.ts
index 40cdb353f..a50b31f6c 100644
--- a/project/ws/app/src/lib/routes/users/services/users.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/users.service.ts
@@ -108,14 +108,28 @@ export class UsersService {
     return this.http.post<any>(`${API_END_POINTS.NEW_USER_UN_BLOCK_API}`, org)
   }
 
-  getAllKongUsers(depId: string): Observable<any> {
-    const reqBody = {
-      request: {
-        filters: {
-          rootOrgId: depId,
+  getAllKongUsers(depId: string, offsetNum?: number): Observable<any> {
+    let reqBody
+    if (offsetNum !== undefined) {
+      reqBody = {
+        request: {
+          filters: {
+            rootOrgId: depId,
+          },
+          limit: 250,
+          offset: offsetNum
         },
-      },
+      }
+    } else {
+      reqBody = {
+        request: {
+          filters: {
+            rootOrgId: depId,
+          },
+        },
+      }
     }
+
     return this.http.post<any>(`${API_END_POINTS.GET_ALL_USERS}`, reqBody)
   }
   // getAllRoleUsers(depId: string, role: {}): Observable<any> {

From becb7bed583500c5759ac60ae8576570fe421561 Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Fri, 22 Sep 2023 17:54:30 +0530
Subject: [PATCH 214/887] Fix #104685, #104879 nominate user flow change,
 created for filter removed

---
 .../batch-details/batch-details.component.ts        |  1 +
 .../nominate-users-dialog.component.ts              | 13 ++++++++-----
 .../session-card/session-card.component.html        |  2 +-
 .../blended-approvals.component.ts                  |  3 ++-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index 47c4553f0..e77349bfa 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -243,6 +243,7 @@ export class BatchDetailsComponent implements OnInit {
         courseId: this.programID,
         applicationId: this.batchData.batchId,
         learners: this.approvedUsers,
+        wfApprovalType: this.programData.wfApprovalType,
       },
       disableClose: true,
       autoFocus: false,
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
index 202a7cda9..3767a20b4 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
@@ -97,6 +97,7 @@ export class NominateUsersDialogComponent implements OnInit {
   }
 
   addLearners() {
+    const stateTobe = (this.data.wfApprovalType === 'twoStepMDOAndPCApproval') ? 'SEND_FOR_PC_APPROVAL' : 'APPROVED'
     const seletedLearner: any = []
     if (this.selection.selected.length > 0) {
       this.selection.selected.map((user: any) => {
@@ -104,7 +105,7 @@ export class NominateUsersDialogComponent implements OnInit {
           userId: user.userId,
           rootOrgId: this.data.orgId,
           actorUserId: user.userId,
-          state: 'APPROVED',
+          state: stateTobe,
           serviceName: 'blendedprogram',
           deptName: user.deptName,
           courseId: this.data.courseId, // blended program course ID
@@ -113,10 +114,12 @@ export class NominateUsersDialogComponent implements OnInit {
         }
         seletedLearner.push(obj)
       })
-      this.bpService.nominateLearners(seletedLearner).subscribe((res: any) => {
-        // tslint:disable-next-line:no-console
-        console.log('res', res)
-        this.openSnackbar('Users are added successfully!')
+      this.bpService.nominateLearners(seletedLearner).subscribe((_res: any) => {
+        if (this.data.wfApprovalType === 'twoStepMDOAndPCApproval') {
+          this.openSnackbar('Request sent to Program coordinator for approval.')
+        } else {
+          this.openSnackbar('Users are nominated successfully!')
+        }
         this.dialogRef.close('done')
       },                                                        (err: { error: any }) => {
         // tslint:disable-next-line:no-console
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.html
index 8de994b32..317945072 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/session-card/session-card.component.html
@@ -33,7 +33,7 @@
           <div>{{batch.batchAttributes?.enableQR ? 'Yes' : 'No' }}</div>
         </div>
         <div class="flex flex-column" *ngIf="batch.batchAttributes?.batchLocationDetails">
-          <div class="font-bold">Capture location details</div>
+          <div class="font-bold">Location</div>
           <div>{{batch.batchAttributes?.batchLocationDetails || 'No'}}</div>
         </div>
       </div>
diff --git a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
index 8cc2067c4..488f20f00 100644
--- a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
@@ -54,7 +54,8 @@ export class BlendedApprovalsComponent implements OnInit {
         filters: {
           status: ['Live'],
           primaryCategory: ['Blended Program'],
-          createdFor: [this.userProfile.rootOrgId],
+          // createdFor: [this.userProfile.rootOrgId],
+          createdFor: [],
         },
         sort_by: { lastUpdatedOn: 'desc' },
         facets: ['primaryCategory', 'mimeType'],

From 9c1221a04f6761922323c745af747f59965819c9 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Sat, 23 Sep 2023 09:40:58 +0530
Subject: [PATCH 215/887] Approval message changes for oneStepMDOApproval

---
 .../batch-details/batch-details.component.ts  | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index e77349bfa..94c569670 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -33,9 +33,9 @@ export class BatchDetailsComponent implements OnInit {
   constructor(private router: Router, private activeRouter: ActivatedRoute,
     // tslint:disable-next-line:align
     private bpService: BlendedApporvalService,
-              private snackBar: MatSnackBar,
-              private events: EventService,
-              private dialogue: MatDialog) {
+    private snackBar: MatSnackBar,
+    private events: EventService,
+    private dialogue: MatDialog) {
     const currentState = this.router.getCurrentNavigation()
     if (currentState && currentState.extras.state) {
       this.batchData = currentState.extras.state
@@ -185,7 +185,8 @@ export class BatchDetailsComponent implements OnInit {
       console.log('res', res)
       if (event.action === 'Approve') {
         this.newUsers = []
-        this.openSnackbar('Request is approved successfully! Further needs to be approved by program coordinator.')
+        if (this.programData.wfApprovalType)
+          this.openSnackbar(this.requestMesages())
         this.getNewRequestsList()
       } else {
         this.openSnackbar('Request is rejected successfully!')
@@ -194,6 +195,14 @@ export class BatchDetailsComponent implements OnInit {
     })
   }
 
+  requestMesages() {
+    if (this.programData.wfApprovalType === 'oneStepMDOApproval') {
+      return 'Request is approved successfully'
+    } else {
+      return 'Request is approved successfully! Further needs to be approved by program coordinator.'
+    }
+  }
+
   removeUser(event: any) {
     const actionType = event.action.toUpperCase()
     const request = {
@@ -216,7 +225,7 @@ export class BatchDetailsComponent implements OnInit {
       this.filter('approved')
       // tslint:disable-next-line:no-console
       console.log(res)
-    },                                              (err: { error: any }) => {
+    }, (err: { error: any }) => {
       // tslint:disable-next-line:no-console
       console.log('request', err)
       this.openSnackbar('Something went wrong. Please try after sometime.')

From d3ea7e450744e6f867c077964d55c1cea57d4ccc Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Sat, 23 Sep 2023 10:35:57 +0530
Subject: [PATCH 216/887] Disable remove learner for oneStepPCApproval,
 twoStepPCAndMDOApproval

---
 .../components/batch-details/batch-details.component.ts     | 1 +
 .../components/users-card/users-card.component.html         | 4 ++--
 .../components/users-card/users-card.component.scss         | 3 +++
 .../components/users-card/users-card.component.ts           | 6 ++++++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index 94c569670..969dc7734 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -100,6 +100,7 @@ export class BatchDetailsComponent implements OnInit {
           programID: this.programData.identifier,
           batchName: this.batchData.name,
           batchID: this.batchID,
+          approvalType: this.programData.wfApprovalType
         }
         this.getNewRequestsList()
       }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.html
index 7e8a4af7e..bcc78cdb3 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.html
@@ -20,8 +20,8 @@
         (click)="clickApprove()">Approve</button>
     </div>
     <div *ngIf="remove && remove.toString() === 'true'">
-      <button type="button" mat-button class="cursor-pointer border-0 remove-user"
-        (click)="clickRemove()">Remove</button>
+      <button type="button" mat-button class="cursor-pointer border-0 remove-user" (click)="clickRemove()"
+        [disabled]="canDisableRemoveLink()">Remove</button>
     </div>
   </a>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.scss
index 4bbb4ff19..622ebd918 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.scss
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.scss
@@ -32,3 +32,6 @@ button {
 .remove-user {
     color: #0075B7!important;
 }
+.remove-user[disabled] {
+    opacity: 0.6;
+}
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
index 9d45ce5ba..8b6fabdb5 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
@@ -96,4 +96,10 @@ export class UsersCardComponent implements OnInit {
     // You can use Angular's Router or any other mechanism to load the component
   }
 
+  canDisableRemoveLink() {
+    return this.programData.approvalType && (
+      this.programData.approvalType === 'oneStepPCApproval' ||
+      this.programData.approvalType === 'twoStepPCAndMDOApproval')
+  }
+
 }

From 1c14116ca1b9f9f6f883bccdc2212942825b3511 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Sat, 23 Sep 2023 11:24:04 +0530
Subject: [PATCH 217/887] lint fix

---
 .../batch-details/batch-details.component.ts    | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index 969dc7734..1ba6d5be4 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -33,9 +33,9 @@ export class BatchDetailsComponent implements OnInit {
   constructor(private router: Router, private activeRouter: ActivatedRoute,
     // tslint:disable-next-line:align
     private bpService: BlendedApporvalService,
-    private snackBar: MatSnackBar,
-    private events: EventService,
-    private dialogue: MatDialog) {
+              private snackBar: MatSnackBar,
+              private events: EventService,
+              private dialogue: MatDialog) {
     const currentState = this.router.getCurrentNavigation()
     if (currentState && currentState.extras.state) {
       this.batchData = currentState.extras.state
@@ -100,7 +100,7 @@ export class BatchDetailsComponent implements OnInit {
           programID: this.programData.identifier,
           batchName: this.batchData.name,
           batchID: this.batchID,
-          approvalType: this.programData.wfApprovalType
+          approvalType: this.programData.wfApprovalType,
         }
         this.getNewRequestsList()
       }
@@ -186,8 +186,9 @@ export class BatchDetailsComponent implements OnInit {
       console.log('res', res)
       if (event.action === 'Approve') {
         this.newUsers = []
-        if (this.programData.wfApprovalType)
+        if (this.programData.wfApprovalType) {
           this.openSnackbar(this.requestMesages())
+        }
         this.getNewRequestsList()
       } else {
         this.openSnackbar('Request is rejected successfully!')
@@ -199,9 +200,9 @@ export class BatchDetailsComponent implements OnInit {
   requestMesages() {
     if (this.programData.wfApprovalType === 'oneStepMDOApproval') {
       return 'Request is approved successfully'
-    } else {
-      return 'Request is approved successfully! Further needs to be approved by program coordinator.'
     }
+      return 'Request is approved successfully! Further needs to be approved by program coordinator.'
+
   }
 
   removeUser(event: any) {
@@ -226,7 +227,7 @@ export class BatchDetailsComponent implements OnInit {
       this.filter('approved')
       // tslint:disable-next-line:no-console
       console.log(res)
-    }, (err: { error: any }) => {
+    },                                              (err: { error: any }) => {
       // tslint:disable-next-line:no-console
       console.log('request', err)
       this.openSnackbar('Something went wrong. Please try after sometime.')

From bef6aae48a057cd2f04fd77117cc338f034ebd2c Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Sat, 23 Sep 2023 13:00:03 +0530
Subject: [PATCH 218/887] lint fixes

---
 .../batch-details/batch-details.component.html  |  3 ++-
 .../batch-details/batch-details.component.ts    | 17 ++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
index 021025411..ee9a330c9 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
@@ -13,7 +13,8 @@
             <li><mat-icon>event</mat-icon> {{batchData.startDate | date: 'mediumDate'}} - {{batchData.endDate | date:
               'mediumDate'}}</li>
             <li><mat-icon>event</mat-icon> {{batchData.enrollmentEndDate | date: 'mediumDate'}}</li>
-            <li><mat-icon>people</mat-icon> {{approvedUsers.length}} Learners</li>
+            <li><mat-icon>people</mat-icon> {{showLearners()}} Learners
+            </li>
           </ul>
         </div>
       </ng-container>
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index 1ba6d5be4..eeb2fca00 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -29,6 +29,7 @@ export class BatchDetailsComponent implements OnInit {
   clonedNewUsers: any = []
   clonedRejectedUsers: any = []
   clonedApprovedUsers: any = []
+  learnerCount = 0
 
   constructor(private router: Router, private activeRouter: ActivatedRoute,
     // tslint:disable-next-line:align
@@ -112,6 +113,7 @@ export class BatchDetailsComponent implements OnInit {
       if (res && res.length > 0) {
         this.approvedUsers = res
         this.clonedApprovedUsers = res
+        this.learnerCount = res.length
       }
     })
   }
@@ -131,6 +133,12 @@ export class BatchDetailsComponent implements OnInit {
         this.clonedNewUsers = res.result.data
       }
     })
+
+    this.bpService.getLearners(this.batchData.batchId).subscribe((res: any) => {
+      if (res && res.length > 0) {
+        this.learnerCount = res.length
+      }
+    })
   }
 
   getRejectedList() {
@@ -201,7 +209,7 @@ export class BatchDetailsComponent implements OnInit {
     if (this.programData.wfApprovalType === 'oneStepMDOApproval') {
       return 'Request is approved successfully'
     }
-      return 'Request is approved successfully! Further needs to be approved by program coordinator.'
+    return 'Request is approved successfully! Further needs to be approved by program coordinator.'
 
   }
 
@@ -334,4 +342,11 @@ export class BatchDetailsComponent implements OnInit {
     }
   }
 
+  showLearners() {
+    if (this.batchData && this.batchData.batchAttributes && this.batchData.batchAttributes.currentBatchSize) {
+      return `${this.learnerCount}/${this.batchData.batchAttributes.currentBatchSize}`
+    }
+    return this.learnerCount
+  }
+
 }

From 9fb04d636ecff2c4f7f7bc36cc14a312fb989ff3 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Sat, 23 Sep 2023 14:36:00 +0530
Subject: [PATCH 219/887] Capture reason to reject learner

---
 .../batch-details/batch-details.component.ts         |  5 +++--
 .../reject-reason-dialog.component.html              |  2 +-
 .../reject-reason-dialog.component.ts                |  8 +++++---
 .../components/users-card/users-card.component.ts    | 12 ++++++++----
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index eeb2fca00..7645d3f01 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -179,6 +179,7 @@ export class BatchDetailsComponent implements OnInit {
       rootOrgId: reqData.rootOrg,
       courseId: this.programID,
       deptName: reqData.deptName,
+      comment: event.comment,
       updateFieldValues: [
         {
           toValue: {
@@ -187,8 +188,6 @@ export class BatchDetailsComponent implements OnInit {
         },
       ],
     }
-    // tslint:disable-next-line:no-console
-    console.log('request', request)
     this.bpService.updateBlendedRequests(request).subscribe((res: any) => {
       // tslint:disable-next-line:no-console
       console.log('res', res)
@@ -199,6 +198,7 @@ export class BatchDetailsComponent implements OnInit {
         }
         this.getNewRequestsList()
       } else {
+        this.getLearnersList()
         this.openSnackbar('Request is rejected successfully!')
         this.filter('rejected')
       }
@@ -235,6 +235,7 @@ export class BatchDetailsComponent implements OnInit {
       this.filter('approved')
       // tslint:disable-next-line:no-console
       console.log(res)
+      this.getLearnersList()
     },                                              (err: { error: any }) => {
       // tslint:disable-next-line:no-console
       console.log('request', err)
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.html
index 1c5cee62d..270a8d229 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.html
@@ -1,5 +1,5 @@
 <div class="reason-dialog">
-  <h2 mat-dialog-title class="required">Please provide the reason for removing the user from the batch</h2>
+  <h2 mat-dialog-title class="required">{{data.title}}</h2>
   <form [formGroup]="reasonForm" (ngSubmit)="onSubmit()" class="flex-4">
     <div mat-dialog-content>
       <mat-form-field appearance="outline">
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.ts
index 8cc036807..50ea294f3 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.ts
@@ -1,6 +1,6 @@
-import { Component, OnInit } from '@angular/core'
+import { Component, Inject, OnInit } from '@angular/core'
 import { FormControl, FormGroup, Validators } from '@angular/forms'
-import { MatDialogRef } from '@angular/material'
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'
 
 @Component({
   selector: 'ws-app-reject-reason-dialog',
@@ -8,8 +8,10 @@ import { MatDialogRef } from '@angular/material'
   styleUrls: ['./reject-reason-dialog.component.scss'],
 })
 export class RejectReasonDialogComponent implements OnInit {
+
   reasonForm!: FormGroup
-  constructor(public dialogRef: MatDialogRef<RejectReasonDialogComponent>) {
+  constructor(public dialogRef: MatDialogRef<RejectReasonDialogComponent>,
+              @Inject(MAT_DIALOG_DATA) public data: any) {
     this.reasonForm = new FormGroup({
       reason: new FormControl('', [Validators.required, Validators.maxLength(500)]),
     })
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
index 8b6fabdb5..fbb22530a 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
@@ -51,10 +51,11 @@ export class UsersCardComponent implements OnInit {
   }
 
   clickReject() {
-    const dialogRef = this.dialogue.open(DialogConfirmComponent, {
+    const dialogRef = this.dialogue.open(RejectReasonDialogComponent, {
+      width: '950px',
+      disableClose: true,
       data: {
-        title: 'Are you sure?',
-        body: `Please click <strong>Yes</strong> to reject this request.`,
+        title: 'Please provide the reason for rejecting the user from the batch',
       },
     })
     dialogRef.afterClosed().subscribe((response: any) => {
@@ -62,6 +63,7 @@ export class UsersCardComponent implements OnInit {
         const data = {
           action: 'Reject',
           userData: this.user,
+          comment: response.reason,
         }
         this.userClick.emit(data)
       }
@@ -72,7 +74,9 @@ export class UsersCardComponent implements OnInit {
     const dialogRef = this.dialogue.open(RejectReasonDialogComponent, {
       width: '950px',
       disableClose: true,
-
+      data: {
+        title: 'Please provide the reason for removing the user from the batch',
+      },
     })
     dialogRef.afterClosed().subscribe((response: any) => {
       if (response) {

From 0487e4aab2b1ae9a5a3cd03126c9bcf009f92a16 Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Sun, 24 Sep 2023 14:37:55 +0530
Subject: [PATCH 220/887] pagination fix reverted

---
 .../routes/home/routes/users-view/users-view.component.html  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index df65a4996..ba16b17bd 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -38,13 +38,14 @@
           [isCreate]=true (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuActions($event)"
           (searchByEnterKey)="onEnterkySearch($event)" [showEditOnCondition]=true>
         </ws-widget-org-user-table>
-        <div style="float: right;display: flex;">
+        <!-- <div style="float: right;display: flex;">
           <button class="mr-5 move-button" matTooltip="display prev 250 data"
             [disabled]="(currentOffset > 0)? false :true" (click)="getAllUsers(250,'prev')">Prev </button>
           <button class="move-button" matTooltip=" display next 250 data"
             [disabled]="(currentOffset >= userDataTotalCount)? true :false" (click)="getAllUsers(250,'next')">Next
           </button>
-        </div>
+        </div> -->
+        
         <!-- <ws-widget-org-user-table [tableData]="tabledata" [data]="dataForTable" [isUpload]=true [isCreate]=true
           (eOnButtonClick)="clickHandler($event)" (eOnRowClick)="onRoleClick($event)" (actionsClick)="menuActions($event)"
           (searchByEnterKey)="onEnterkySearch($event)">

From cd70d69d72c19656c5f749d92ec9177db54528a8 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Sun, 24 Sep 2023 21:10:30 +0530
Subject: [PATCH 221/887] added view report to mdo

---
 package.json                                  |  1 +
 .../access/routes/users/users.component.ts    |  5 +-
 .../blended-approvals.module.ts               | 10 ++-
 .../batch-details.component.html              |  4 +-
 .../batch-details.component.scss              |  4 +-
 .../users-card/users-card.component.html      |  2 +
 .../users-card/users-card.component.scss      | 11 +++
 .../users-card/users-card.component.ts        | 32 ++++++++-
 .../view-report-dialog.component.html         | 16 +++++
 .../view-report-dialog.component.scss         | 50 ++++++++++++++
 .../view-report-dialog.component.ts           | 68 +++++++++++++++++++
 .../services/blended-approval.service.ts      |  5 ++
 .../roles-access/roles-access.component.ts    | 10 ++-
 .../search-input-home.component.ts            | 17 +++--
 .../routes/users/services/users.service.ts    |  2 -
 .../comp-details/comp-details.component.ts    |  1 -
 .../competency-labels.component.ts            |  1 -
 17 files changed, 209 insertions(+), 30 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/view-report-dialog/view-report-dialog.component.html
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/view-report-dialog/view-report-dialog.component.scss
 create mode 100644 project/ws/app/src/lib/routes/blended-program-approvals/components/view-report-dialog/view-report-dialog.component.ts

diff --git a/package.json b/package.json
index 0e63a7005..9fd362532 100644
--- a/package.json
+++ b/package.json
@@ -48,6 +48,7 @@
     "@sunbird-cb/resolver": "^1.0.0",
     "@sunbird-cb/utils": "^1.0.13",
     "@types/file-saver": "^2.0.1",
+    "@sunbird-cb/micro-surveys": "2.0.13",
     "brace": "^0.11.1",
     "chart.js": "^2.8.0",
     "d3": "^5.9.7",
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
index 02802c1d2..b535cdd6f 100644
--- 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
@@ -29,7 +29,7 @@ export class UsersComponent implements OnInit, AfterViewInit, AfterContentChecke
   rootOrgId: any
 
   constructor(private usersSvc: UsersService, private router: Router, private activatedRoute: ActivatedRoute, private route: ActivatedRoute,
-              private profileUtilSvc: ProfileV2UtillService, private userS: UsersService2, private cdref: ChangeDetectorRef) { }
+    private profileUtilSvc: ProfileV2UtillService, private userS: UsersService2, private cdref: ChangeDetectorRef) { }
 
   ngOnInit() {
     const url = this.router.url.split('/')
@@ -101,7 +101,6 @@ export class UsersComponent implements OnInit, AfterViewInit, AfterContentChecke
     return []
   }
   getMyDepartment() {
-    // debugger
     let users: any[] = []
     if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
       users = _.map(_.compact(_.map(this.usersData.content, i => {
@@ -117,7 +116,6 @@ export class UsersComponent implements OnInit, AfterViewInit, AfterContentChecke
       })),
         // tslint:disable-next-line
         user => {
-          // debugger
           return {
             fullName: `${user.firstName}`,
             // fullName: `${user.first_name} ${user.last_name}`,
@@ -195,7 +193,6 @@ export class UsersComponent implements OnInit, AfterViewInit, AfterContentChecke
 
   onEnterkySearch(enterValue: any) {
     const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
-    // debugger
     this.usersSvc.searchUserByenter(enterValue, rootOrgId).subscribe(data => {
       this.usersData = data.result.response
 
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts b/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
index 0b1235b64..f44f5e81b 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/blended-approvals.module.ts
@@ -25,13 +25,19 @@ import { ProfileViewComponent } from './components/profile-view/profile-view.com
 import { PipeEmailModule } from '../pipes/pipe-email/pipe-email.module'
 import { PipeOrderByModule } from '../pipes/pipe-order-by/pipe-order-by.module'
 import { ProfileCertificateDialogModule } from './components/profile-certificate-dialog/profile-certificate-dialog.module'
+import { ViewReportDialogComponent } from './components/view-report-dialog/view-report-dialog.component'
+import { MicroSurveyModule } from '@sunbird-cb/micro-surveys'
+import { MatProgressSpinnerModule } from '@angular/material'
 
 @NgModule({
-  declarations: [BlendedHomeComponent, BatchListComponent, BatchDetailsComponent, UsersCardComponent, ProfileViewComponent],
+  declarations: [BlendedHomeComponent, BatchListComponent, BatchDetailsComponent, UsersCardComponent, ProfileViewComponent,
+    ViewReportDialogComponent],
   imports: [CommonModule, BlendedApprovalsRoutingModule, BreadcrumbsOrgModule, LeftMenuWithoutLogoModule, WidgetResolverModule,
     MatSidenavModule, MatButtonModule, MatIconModule, HomeModule, RouterModule, UIORGTableModule,
-    MatCardModule, AvatarPhotoModule, MatListModule, PipeEmailModule, PipeOrderByModule, ProfileCertificateDialogModule],
+    MatCardModule, AvatarPhotoModule, MatListModule, PipeEmailModule, PipeOrderByModule,
+    ProfileCertificateDialogModule, MicroSurveyModule, MatProgressSpinnerModule],
   exports: [],
   providers: [],
+  entryComponents: [ViewReportDialogComponent]
 })
 export class BlendedApprovalsModule { }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
index 5db263df2..223091bf1 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
@@ -43,8 +43,8 @@
         <ng-container *ngIf="currentFilter === 'pending'">
           <div class="b-c box" *ngIf="newUsers && newUsers.length > 0">
             <div *ngFor="let user of newUsers">
-              <ws-app-users-card [user]="user" [actions]="true" [programData]="linkData"
-                (userClick)="onSubmit($event)"></ws-app-users-card>
+              <ws-app-users-card [user]="user" [actions]="true" [programData]="linkData" (userClick)="onSubmit($event)"
+                [contentData]="programData" [type]="'newRequest'"></ws-app-users-card>
             </div>
           </div>
           <div class="b-c box" *ngIf="newUsers && newUsers.length == 0">
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss
index 92a1c6046..0871a57af 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss
@@ -48,10 +48,10 @@
   flex-wrap: wrap;
 }
 .box > * {
-  flex: 0 0 550px;
+  flex: 0 0 100%;
 
   @include breakpoint-s {
-    flex: 1 1 350px;
+    flex: 1 1 100%;
   }
   @include breakpoint-xs {
     flex: 1 1 100%;
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.html
index 3735578d6..1c4a39534 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.html
@@ -14,6 +14,8 @@
       <p class="truncate ws-mat-black60-text margin-remove mat-body-2">{{user?.deptName || user?.department }}</p>
     </div>
     <div *ngIf="actions">
+      <button type="button" mat-button class="view-report-btn cursor-pointer mat-accent-border mr-10"
+        (click)="openReportDialog()" *ngIf="isViewReport">View response</button>
       <button type="button" mat-button class="margin-right-m cursor-pointer border-0"
         (click)="clickReject()">Reject</button>
       <button type="button" mat-button class="approve-btn cursor-pointer mat-accent-border"
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.scss
index 8246cd307..e78d80ea6 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.scss
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.scss
@@ -27,4 +27,15 @@ button {
     padding: 0.5em 1em;
     color: rgba(0,0,0,0.7);
     background: transparent;
+}
+
+.view-report-btn {
+  width: auto;
+  border: 1px solid rgba(0, 0, 0, 0.16);
+  border-radius: 4px;
+  color: rgba(0, 0, 0, 0.87) !important;
+
+  &:focus-visible {
+    outline: none;
+  }
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
index 6054f521b..bbe27e5a9 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
@@ -2,6 +2,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
 import { MatDialog } from '@angular/material'
 import { DialogConfirmComponent } from '../../../../../../../../../src/app/component/dialog-confirm/dialog-confirm.component'
 import { Router } from '@angular/router'
+import { ViewReportDialogComponent } from '../view-report-dialog/view-report-dialog.component'
 
 @Component({
   selector: 'ws-app-users-card',
@@ -11,14 +12,24 @@ import { Router } from '@angular/router'
 export class UsersCardComponent implements OnInit {
   @Input() user!: any
   @Input() actions: any
+  @Input() type?: any
+  @Input() contentData?: any
   @Input() programData: any
   @Input() public photoUrl!: string
   @Input() public name!: string
   @Output() userClick = new EventEmitter()
 
+  isViewReport = false
+  viewReportData = {
+    userId: '',
+    formId: '',
+  }
+
   constructor(private dialogue: MatDialog, private router: Router) { }
 
-  ngOnInit() { }
+  ngOnInit() {
+    this.checkForSurveyLink()
+  }
 
   getUseravatarName() {
     let name = ''
@@ -76,4 +87,23 @@ export class UsersCardComponent implements OnInit {
     // You can use Angular's Router or any other mechanism to load the component
   }
 
+  checkForSurveyLink() {
+    if (this.type === 'newRequest' && this.contentData && this.contentData['wfSurveyLink']) {
+      this.isViewReport = true
+      const sID = this.contentData.wfSurveyLink.split('surveys/')
+      this.viewReportData.formId = sID[1]
+      this.viewReportData.userId = (this.user
+        && this.user.userInfo && this.user.userInfo.wid) ? this.user.userInfo.wid : ''
+    }
+  }
+
+  openReportDialog() {
+    const dialogRef = this.dialogue.open(ViewReportDialogComponent, {
+      data: this.viewReportData,
+      autoFocus: false,
+      width: '920px',
+    })
+    dialogRef.afterClosed().subscribe(() => { })
+  }
+
 }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/view-report-dialog/view-report-dialog.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/view-report-dialog/view-report-dialog.component.html
new file mode 100644
index 000000000..c375716b8
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/view-report-dialog/view-report-dialog.component.html
@@ -0,0 +1,16 @@
+<h1 mat-dialog-title>User Survey Report</h1>
+<div mat-dialog-content class="dialog-container">
+  <div class="content-inner-box flex flex-1 flex-col">
+    <div class="content-card flex flex-1 flex-col">
+      <section #fullScreenContainer class="survey-container" *ngIf="latestData">
+        <lib-micro-survey class="view-report" [apiData]="apiData" [isReadOnly]="isReadOnly"
+          [surveyId]="latestData.formId" [applicationId]="latestData.applicationId"
+          [courseId]="latestData.dataObject.courseId"></lib-micro-survey>
+      </section>
+    </div>
+  </div>
+  <mat-spinner class="display-center" *ngIf="showSpinner"></mat-spinner>
+</div>
+<div mat-dialog-actions class="flex-end">
+  <button mat-button mat-dialog-close class="close-btn" (click)="onClose()">Close</button>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/view-report-dialog/view-report-dialog.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/view-report-dialog/view-report-dialog.component.scss
new file mode 100644
index 000000000..58ae0df9f
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/view-report-dialog/view-report-dialog.component.scss
@@ -0,0 +1,50 @@
+@import 'ws-mixins';
+@import 'ws-vars';
+@import 'ws-common';
+
+::ng-deep.view-report .main-lib-body {
+  margin: 10px;
+}
+
+::ng-deep.view-report .main-container {
+  width: auto !important;
+  overflow-y: auto !important;
+  max-height: auto !important;
+}
+
+::ng-deep.view-report .lib-container {
+  height: 100% !important;
+}
+
+::ng-deep.view-report .lib-container-2 {
+  height: auto;
+  min-height: unset !important;
+  padding: 0 !important;
+}
+
+.view-report {
+  width: 88%;
+}
+
+.survey-container {
+  display: flex !important;
+}
+
+.close-btn {
+  width: auto;
+  border: 1px solid #0075B7;
+  border-radius: 4px;
+  color: #0075B7 !important;
+}
+
+.display-center {
+  position: relative;
+  top: 50%;
+  left: 35%;
+  transform: translate(-50%, -50%);
+  margin: 10px;
+}
+
+.dialog-container {
+  position: relative;
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/view-report-dialog/view-report-dialog.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/view-report-dialog/view-report-dialog.component.ts
new file mode 100644
index 000000000..e0d4559f5
--- /dev/null
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/view-report-dialog/view-report-dialog.component.ts
@@ -0,0 +1,68 @@
+import { Component, Inject, OnInit } from '@angular/core'
+import { FormControl, FormGroup, Validators } from '@angular/forms'
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'
+/* tslint:disable */
+import _ from 'lodash'
+import { BlendedApporvalService } from '../../services/blended-approval.service'
+/* tslint:enable */
+
+@Component({
+  selector: 'ws-auth-app-view-report-dialog',
+  templateUrl: './view-report-dialog.component.html',
+  styleUrls: ['./view-report-dialog.component.scss'],
+})
+export class ViewReportDialogComponent implements OnInit {
+  reasonForm!: FormGroup
+  apiData: any
+  latestData: any
+  isReadOnly = true
+  showSpinner = true
+
+  constructor(
+    public dialogRef: MatDialogRef<ViewReportDialogComponent>,
+    @Inject(MAT_DIALOG_DATA) public data: any,
+    private bpService: BlendedApporvalService,
+  ) {
+    this.reasonForm = new FormGroup({
+      reason: new FormControl('', [Validators.required, Validators.maxLength(500)]),
+    })
+  }
+
+  ngOnInit() {
+    this.getSurveyReport()
+  }
+
+  async getSurveyReport() {
+    const req = {
+      searchObjects: [
+        {
+          key: 'formId',
+          values: this.data.formId,
+        },
+        {
+          key: 'updatedBy',
+          values: this.data.userId,
+        },
+      ],
+    }
+    const resList = await this.bpService.getSurveyByUserID(req).toPromise().catch(_error => { })
+    if (resList && resList.statusInfo && resList.statusInfo.statusCode && resList.statusInfo.statusCode === 200) {
+      const tempData = _.sortBy(resList.responseData, ['timestamp'])
+      this.latestData = tempData[tempData.length - 1]
+      setTimeout(() => {
+        this.showSpinner = false
+      }, 1000)
+    }
+    this.apiData = {
+      getAPI: `/apis/proxies/v8/forms/getFormById?id=${this.latestData.formId}`,
+      postAPI: `/apis/proxies/v8/forms/v1/saveFormSubmit`,
+      getAllApplications: `/apis/proxies/v8/forms/getAllApplications`,
+      customizedHeader: {},
+    }
+  }
+
+  onClose() {
+    this.dialogRef.close(true)
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
index 17a653e1e..e2b361179 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
@@ -13,6 +13,7 @@ const API_END_POINTS = {
   GET_REQUESTS: '/apis/proxies/v8/workflow/blendedprogram/search',
   READ_USER: '/apis/proxies/v8/api/user/v2/read/',
   CERT_DOWNLOAD: `/apis/protected/v8/cohorts/course/batch/cert/download/`,
+  SEARCH_FORM_WITH_USERID: 'apis/proxies/v8/forms/searchForms',
 }
 
 @Injectable({
@@ -49,4 +50,8 @@ export class BlendedApporvalService {
     const url = `${API_END_POINTS.CERT_DOWNLOAD}/${certId}`
     return this.http.get<any>(url)
   }
+
+  getSurveyByUserID(req: any) {
+    return this.http.post<any>(`${API_END_POINTS.SEARCH_FORM_WITH_USERID}`, req)
+  }
 }
diff --git a/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.ts b/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.ts
index 21e52cce1..0029bc9d6 100644
--- a/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.ts
@@ -21,11 +21,11 @@ export class RolesAccessComponent implements OnInit, AfterViewInit, OnDestroy {
   uniqueRoles: any = []
 
   constructor(private router: Router,
-              private activeRouter: ActivatedRoute,
-              private usersService: UsersService,
+    private activeRouter: ActivatedRoute,
+    private usersService: UsersService,
     // private telemetrySvc: TelemetryService,
-              private events: EventService,
-              private roleservice: RolesService) { }
+    private events: EventService,
+    private roleservice: RolesService) { }
 
   ngOnInit() {
     this.tabledata = {
@@ -51,7 +51,6 @@ export class RolesAccessComponent implements OnInit, AfterViewInit, OnDestroy {
 
   /* Click event to navigate to a particular role */
   onRoleClick(role: any) {
-    // debugger
     this.router.navigate([`/app/roles/${role.role}/users`])
     // this.router.navigate([`/app/home/roles-users`], { queryParams: { role: event.role, orgID: rootOrgId } })
     // this.telemetrySvc.impression()
@@ -69,7 +68,6 @@ export class RolesAccessComponent implements OnInit, AfterViewInit, OnDestroy {
 
   }
   fetchIndidualRoleData(rootOrgId: string, rolename: string) {
-    // debugger
     this.usersService.getAllRoleUsers(rootOrgId, rolename).subscribe(data => {
       this.roleCountSpinner = true
       const individualCount = data.count
diff --git a/project/ws/app/src/lib/routes/search/components/search-input-home/search-input-home.component.ts b/project/ws/app/src/lib/routes/search/components/search-input-home/search-input-home.component.ts
index 5b875cfe0..8ac67a483 100644
--- a/project/ws/app/src/lib/routes/search/components/search-input-home/search-input-home.component.ts
+++ b/project/ws/app/src/lib/routes/search/components/search-input-home/search-input-home.component.ts
@@ -40,7 +40,6 @@ export class SearchInputHomeComponent implements OnInit, OnChanges {
 
   ) {
     // if (!this.activated.snapshot.data.searchPageData) {
-    //   // debugger;
     //   this.searchServSvc.getSearchConfig().then(data => {
     //     this.activated.snapshot.data.searchPageData = {
     //       data
@@ -100,14 +99,14 @@ export class SearchInputHomeComponent implements OnInit, OnChanges {
 
   ngOnInit() {
     // if (!this.activated.snapshot.data.searchPageData) {
-      this.searchServSvc.getSearchConfig().then(data => {
-        this.activated.snapshot.data = {
-          searchPageData: { data },
-        }
-      }).then(() => {
-        this.autoFilter()
-        this.init()
-      })
+    this.searchServSvc.getSearchConfig().then(data => {
+      this.activated.snapshot.data = {
+        searchPageData: { data },
+      }
+    }).then(() => {
+      this.autoFilter()
+      this.init()
+    })
     // } else {
     //   this.autoFilter();
     //   this.init();
diff --git a/project/ws/app/src/lib/routes/users/services/users.service.ts b/project/ws/app/src/lib/routes/users/services/users.service.ts
index 40cdb353f..bfd912a1e 100644
--- a/project/ws/app/src/lib/routes/users/services/users.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/users.service.ts
@@ -120,7 +120,6 @@ export class UsersService {
   }
   // getAllRoleUsers(depId: string, role: {}): Observable<any> {
   getAllRoleUsers(depId: string, role: string): Observable<any> {
-    // debugger
     const reqBody = {
       request: {
         filters: {
@@ -139,7 +138,6 @@ export class UsersService {
         (data: any) => ({ role, count: _.get(data, 'result.response.count') })))
   }
   getTotalRoleUsers(depId: string, role: string): Observable<any> {
-    // debugger
     const reqBody = {
       request: {
         filters: {
diff --git a/project/ws/app/src/lib/routes/workallocation-v2/components/comp-details/comp-details.component.ts b/project/ws/app/src/lib/routes/workallocation-v2/components/comp-details/comp-details.component.ts
index c8cf71ebf..56abfe25e 100644
--- a/project/ws/app/src/lib/routes/workallocation-v2/components/comp-details/comp-details.component.ts
+++ b/project/ws/app/src/lib/routes/workallocation-v2/components/comp-details/comp-details.component.ts
@@ -66,7 +66,6 @@ export class CompDetailsComponent implements OnInit, OnDestroy {
         const lst = _.map(_.get(this.dataStructure[index], 'levelList') || [], r => {
           return { alias: r.alias, level: r.level }
         })
-        // debugger
         const fg = this.formBuilder.group({
           localId: this.dataStructure[index].localId,
           compId: this.dataStructure[index].compId,
diff --git a/project/ws/app/src/lib/routes/workallocation-v2/components/competency-labels/competency-labels.component.ts b/project/ws/app/src/lib/routes/workallocation-v2/components/competency-labels/competency-labels.component.ts
index ab9c3ec70..4ee25fdc4 100644
--- a/project/ws/app/src/lib/routes/workallocation-v2/components/competency-labels/competency-labels.component.ts
+++ b/project/ws/app/src/lib/routes/workallocation-v2/components/competency-labels/competency-labels.component.ts
@@ -97,7 +97,6 @@ export class CompetencyLabelsComponent implements OnInit, OnDestroy, AfterViewIn
         if (!(this.groupcompetencyList && this.groupcompetencyList.value)) {
           this.addNewGroup(false, grp)
         }
-        // debugger
         const complist = _.map(_.get(grpData[i], 'competencyDetails'), (numa: any) => {
           return {
             localId: this.watStore.getID,

From 54152d5b6cf5413831f1bc9474783a2a57eee5b8 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Sun, 24 Sep 2023 21:59:14 +0530
Subject: [PATCH 222/887] lint issues fix

---
 .../src/lib/routes/access/routes/users/users.component.ts | 2 +-
 .../view-report-dialog/view-report-dialog.component.ts    | 2 +-
 .../home/routes/roles-access/roles-access.component.ts    | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

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
index b535cdd6f..476f753c5 100644
--- 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
@@ -29,7 +29,7 @@ export class UsersComponent implements OnInit, AfterViewInit, AfterContentChecke
   rootOrgId: any
 
   constructor(private usersSvc: UsersService, private router: Router, private activatedRoute: ActivatedRoute, private route: ActivatedRoute,
-    private profileUtilSvc: ProfileV2UtillService, private userS: UsersService2, private cdref: ChangeDetectorRef) { }
+              private profileUtilSvc: ProfileV2UtillService, private userS: UsersService2, private cdref: ChangeDetectorRef) { }
 
   ngOnInit() {
     const url = this.router.url.split('/')
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/view-report-dialog/view-report-dialog.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/view-report-dialog/view-report-dialog.component.ts
index e0d4559f5..6917560aa 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/view-report-dialog/view-report-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/view-report-dialog/view-report-dialog.component.ts
@@ -51,7 +51,7 @@ export class ViewReportDialogComponent implements OnInit {
       this.latestData = tempData[tempData.length - 1]
       setTimeout(() => {
         this.showSpinner = false
-      }, 1000)
+      },         1000)
     }
     this.apiData = {
       getAPI: `/apis/proxies/v8/forms/getFormById?id=${this.latestData.formId}`,
diff --git a/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.ts b/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.ts
index 0029bc9d6..84729e5e2 100644
--- a/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.ts
@@ -21,11 +21,11 @@ export class RolesAccessComponent implements OnInit, AfterViewInit, OnDestroy {
   uniqueRoles: any = []
 
   constructor(private router: Router,
-    private activeRouter: ActivatedRoute,
-    private usersService: UsersService,
+              private activeRouter: ActivatedRoute,
+              private usersService: UsersService,
     // private telemetrySvc: TelemetryService,
-    private events: EventService,
-    private roleservice: RolesService) { }
+              private events: EventService,
+              private roleservice: RolesService) { }
 
   ngOnInit() {
     this.tabledata = {

From 79fd627fbfe544be719878ee889885c7de0d434f Mon Sep 17 00:00:00 2001
From: dakshayini-krishnappa <dakshayini.krishnappa@tarento.com>
Date: Mon, 25 Sep 2023 12:28:51 +0530
Subject: [PATCH 223/887] hotfix changes

---
 .../routes/home/routes/users-view/users-view.component.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index ba16b17bd..34b3ca2ed 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -38,14 +38,14 @@
           [isCreate]=true (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuActions($event)"
           (searchByEnterKey)="onEnterkySearch($event)" [showEditOnCondition]=true>
         </ws-widget-org-user-table>
-        <!-- <div style="float: right;display: flex;">
+        <div style="float: right;display: flex;">
           <button class="mr-5 move-button" matTooltip="display prev 250 data"
             [disabled]="(currentOffset > 0)? false :true" (click)="getAllUsers(250,'prev')">Prev </button>
           <button class="move-button" matTooltip=" display next 250 data"
             [disabled]="(currentOffset >= userDataTotalCount)? true :false" (click)="getAllUsers(250,'next')">Next
           </button>
-        </div> -->
-        
+        </div>
+
         <!-- <ws-widget-org-user-table [tableData]="tabledata" [data]="dataForTable" [isUpload]=true [isCreate]=true
           (eOnButtonClick)="clickHandler($event)" (eOnRowClick)="onRoleClick($event)" (actionsClick)="menuActions($event)"
           (searchByEnterKey)="onEnterkySearch($event)">

From 1e800e4916b14ccaa00300050c3e77a45a5d5824 Mon Sep 17 00:00:00 2001
From: dakshayini-krishnappa <dakshayini.krishnappa@tarento.com>
Date: Mon, 25 Sep 2023 12:32:18 +0530
Subject: [PATCH 224/887] hotfix changes

---
 project/ws/app/src/lib/routes/users/services/users.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/users/services/users.service.ts b/project/ws/app/src/lib/routes/users/services/users.service.ts
index a50b31f6c..2c0c472b6 100644
--- a/project/ws/app/src/lib/routes/users/services/users.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/users.service.ts
@@ -117,7 +117,7 @@ export class UsersService {
             rootOrgId: depId,
           },
           limit: 250,
-          offset: offsetNum
+          offset: offsetNum,
         },
       }
     } else {

From cc73adffe057a94f9023a69627f2256065be1778 Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Mon, 25 Sep 2023 12:58:52 +0530
Subject: [PATCH 225/887] Task #104694: Added Inititate as state for nominate
 req

---
 .../nominate-users-dialog.component.ts          | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
index 3767a20b4..d74713603 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
@@ -33,9 +33,9 @@ export class NominateUsersDialogComponent implements OnInit {
   ]
 
   constructor(public dialogRef: MatDialogRef<NominateUsersDialogComponent>,
-              private usersService: UsersService,
-              @Inject(MAT_DIALOG_DATA) public data: any, private bpService: BlendedApporvalService,
-              private snackBar: MatSnackBar) { }
+    private usersService: UsersService,
+    @Inject(MAT_DIALOG_DATA) public data: any, private bpService: BlendedApporvalService,
+    private snackBar: MatSnackBar) { }
 
   ngOnInit() {
     const filterObj = {
@@ -97,7 +97,6 @@ export class NominateUsersDialogComponent implements OnInit {
   }
 
   addLearners() {
-    const stateTobe = (this.data.wfApprovalType === 'twoStepMDOAndPCApproval') ? 'SEND_FOR_PC_APPROVAL' : 'APPROVED'
     const seletedLearner: any = []
     if (this.selection.selected.length > 0) {
       this.selection.selected.map((user: any) => {
@@ -105,7 +104,7 @@ export class NominateUsersDialogComponent implements OnInit {
           userId: user.userId,
           rootOrgId: this.data.orgId,
           actorUserId: user.userId,
-          state: stateTobe,
+          state: 'INITIATE',
           serviceName: 'blendedprogram',
           deptName: user.deptName,
           courseId: this.data.courseId, // blended program course ID
@@ -115,13 +114,9 @@ export class NominateUsersDialogComponent implements OnInit {
         seletedLearner.push(obj)
       })
       this.bpService.nominateLearners(seletedLearner).subscribe((_res: any) => {
-        if (this.data.wfApprovalType === 'twoStepMDOAndPCApproval') {
-          this.openSnackbar('Request sent to Program coordinator for approval.')
-        } else {
-          this.openSnackbar('Users are nominated successfully!')
-        }
+        this.openSnackbar('Users are nominated successfully!')
         this.dialogRef.close('done')
-      },                                                        (err: { error: any }) => {
+      }, (err: { error: any }) => {
         // tslint:disable-next-line:no-console
         console.log(err)
         this.openSnackbar('some thing went wrong, Please try after sometime.')

From 567f369b8d87dcf45b0fc047c6a179c12d777a3b Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Thu, 28 Sep 2023 10:34:59 +0530
Subject: [PATCH 226/887] Bugs #105825 and #106140

---
 .../reject-reason-dialog/reject-reason-dialog.component.html    | 2 +-
 .../components/users-card/users-card.component.ts               | 2 ++
 .../routes/blended-approvals/blended-approvals.component.html   | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.html
index 270a8d229..4fab32d76 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.html
@@ -15,7 +15,7 @@ <h2 mat-dialog-title class="required">{{data.title}}</h2>
     </div>
     <div mat-dialog-actions class="flex-row-reverse margin-top-m">
       <button mat-button class="text-white ws-mat-primary-background" mat-raised-button color="primary" type="submit"
-        i18n [disabled]="!reasonForm.valid"><span class="text-white">Reject</span></button>
+        i18n [disabled]="!reasonForm.valid"><span class="text-white">{{data.buttonText}}</span></button>
       <button mat-button mat-raised-button class="flex-auto-display mat-button-base margin-right-m ws-mat-default-text"
         [mat-dialog-close]=false cdkFocusInitial i18n>Cancel</button>
     </div>
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
index fbb22530a..58d38a1fa 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
@@ -56,6 +56,7 @@ export class UsersCardComponent implements OnInit {
       disableClose: true,
       data: {
         title: 'Please provide the reason for rejecting the user from the batch',
+        buttonText: 'Reject'
       },
     })
     dialogRef.afterClosed().subscribe((response: any) => {
@@ -76,6 +77,7 @@ export class UsersCardComponent implements OnInit {
       disableClose: true,
       data: {
         title: 'Please provide the reason for removing the user from the batch',
+        buttonText: 'Remove'
       },
     })
     dialogRef.afterClosed().subscribe((response: any) => {
diff --git a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.html b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.html
index b03005c62..6e52a63ff 100644
--- a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.html
@@ -1,6 +1,6 @@
 <div class="flex flex-4 flex-column">
   <mat-card>
-    <div class="flex-4 mobile-margin text-capitalize mat-h2">Blended programs enrollment approvals</div>
+    <div class="flex-4 mobile-margin text-capitalize mat-h2">Blended Program</div>
     <mat-card-content>
       <ng-container class="margin-top-l">
         <ws-widget-org-user-table [tableData]='tabledata' [data]='getTableData' (eOnRowClick)="viewDetails($event)">

From a63cff1f129a87eb0f24830da7b9f4a42e8644f9 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Thu, 28 Sep 2023 11:58:03 +0530
Subject: [PATCH 227/887] Bug #105093

---
 .../nominate-users-dialog.component.ts                      | 6 +++++-
 .../components/users-card/users-card.component.ts           | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
index 3767a20b4..405393e1b 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
@@ -118,7 +118,11 @@ export class NominateUsersDialogComponent implements OnInit {
         if (this.data.wfApprovalType === 'twoStepMDOAndPCApproval') {
           this.openSnackbar('Request sent to Program coordinator for approval.')
         } else {
-          this.openSnackbar('Users are nominated successfully!')
+          if (_res[0] && _res[0].result && _res[0].result.status === 'BAD_REQUEST') {
+            this.openSnackbar(_res[0].result.errmsg)
+          } else {
+            this.openSnackbar('Users are nominated successfully!')
+          }
         }
         this.dialogRef.close('done')
       },                                                        (err: { error: any }) => {
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
index 58d38a1fa..bac75cf2d 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
@@ -56,7 +56,7 @@ export class UsersCardComponent implements OnInit {
       disableClose: true,
       data: {
         title: 'Please provide the reason for rejecting the user from the batch',
-        buttonText: 'Reject'
+        buttonText: 'Reject',
       },
     })
     dialogRef.afterClosed().subscribe((response: any) => {
@@ -77,7 +77,7 @@ export class UsersCardComponent implements OnInit {
       disableClose: true,
       data: {
         title: 'Please provide the reason for removing the user from the batch',
-        buttonText: 'Remove'
+        buttonText: 'Remove',
       },
     })
     dialogRef.afterClosed().subscribe((response: any) => {

From 63da91d3826e37ee78061e4284bcc96fb0f7e38e Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Thu, 28 Sep 2023 17:36:54 +0530
Subject: [PATCH 228/887] Task #105619: SUrvey response, heading and timestamp
 removed

---
 .../view-report-dialog/view-report-dialog.component.html      | 2 +-
 .../view-report-dialog/view-report-dialog.component.scss      | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/view-report-dialog/view-report-dialog.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/view-report-dialog/view-report-dialog.component.html
index c375716b8..efb012131 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/view-report-dialog/view-report-dialog.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/view-report-dialog/view-report-dialog.component.html
@@ -1,4 +1,4 @@
-<h1 mat-dialog-title>User Survey Report</h1>
+<!-- <h1 mat-dialog-title>User Survey Report</h1> -->
 <div mat-dialog-content class="dialog-container">
   <div class="content-inner-box flex flex-1 flex-col">
     <div class="content-card flex flex-1 flex-col">
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/view-report-dialog/view-report-dialog.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/view-report-dialog/view-report-dialog.component.scss
index 58ae0df9f..b000f1465 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/view-report-dialog/view-report-dialog.component.scss
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/view-report-dialog/view-report-dialog.component.scss
@@ -47,4 +47,8 @@
 
 .dialog-container {
   position: relative;
+}
+
+::ng-deep .header-container label {
+  display: none !important;
 }
\ No newline at end of file

From 568e8081204ce1e24875280aee31e16e7d6ccf55 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Thu, 28 Sep 2023 17:47:46 +0530
Subject: [PATCH 229/887] update collection package

---
 package.json                                                    | 2 +-
 .../routes/blended-approvals/blended-approvals.component.ts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 9fd362532..e678c5c6c 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@angular/router": "~8.2.1",
     "@angular/service-worker": "~8.2.1",
     "@project-sunbird/telemetry-sdk": "0.0.26",
-    "@sunbird-cb/collection": "^1.0.29",
+    "@sunbird-cb/collection": "^1.0.32",
     "@sunbird-cb/design-system": "0.0.1",
     "@sunbird-cb/rain-dashboards": "0.4.22-rc.1",
     "@sunbird-cb/resolver": "^1.0.0",
diff --git a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
index 488f20f00..aabd30d3f 100644
--- a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
@@ -18,7 +18,7 @@ export class BlendedApprovalsComponent implements OnInit {
   tabledata: ITableData = {
     actions: [],
     columns: [
-      { displayName: 'Blended Program name', key: 'name' },
+      { displayName: 'Blended Program name', key: 'name', imageUrl: true },
       { displayName: 'Batches', key: 'batchesCount' },
       // { displayName: 'Learners', key: 'learners', isList: true },
       { displayName: 'New requests (Across batches)', key: 'newrequests', isList: true },

From 9ede34bc6f8305cb3c9a74b0807393e015ad1261 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Thu, 28 Sep 2023 18:11:52 +0530
Subject: [PATCH 230/887] Perform search on key enter in nominate learners

---
 .../nominate-users-dialog/nominate-users-dialog.component.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.html
index 68e2dceae..8f1f52934 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.html
@@ -10,7 +10,7 @@ <h2 mat-dialog-title>Nominate learners</h2>
             <div class="rsearch">
               <mat-icon class="color-60 search-icon">search</mat-icon>
               <input class="search-input color-60" type="Standard" #searchText placeholder="Search by name or email"
-                autofocus="none">
+                autofocus="none" (keyup.enter)="searchUsers(searchText)">
             </div>
           </div>
         </div>

From f07ea5d83f7cd71de666114a067f4f5bfb4ec0c3 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Thu, 28 Sep 2023 18:19:26 +0530
Subject: [PATCH 231/887] Approve/Reject API endpoint

---
 .../services/blended-approval.service.ts                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
index fd485aff6..45f5f5e2d 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
@@ -6,7 +6,7 @@ import { map } from 'rxjs/operators'
 import _ from 'lodash'
 
 const API_END_POINTS = {
-  UPDATE_REQUEST: '/apis/proxies/v8/workflow/blendedprogram/update',
+  UPDATE_REQUEST: '/apis/proxies/v8/workflow/blendedprogram/update/mdo',
   // GET_PROGRAM_DETAILS: '/apis/proxies/v8/action/content/v3/hierarchy',
   GET_PROGRAM_DETAILS: '/apis/proxies/v8/action/content/v3/read',
   GET_LERANERS: '/apis/protected/v8/cohorts/course/getUsersForBatch',

From f53c80bb9f6bc0e915e6ba80ebcaf3fa323af5fb Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Fri, 29 Sep 2023 12:45:11 +0530
Subject: [PATCH 232/887] Remove learner API changes

---
 .../services/blended-approval.service.ts                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
index 45f5f5e2d..0e08a69bb 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
@@ -15,7 +15,7 @@ const API_END_POINTS = {
   CERT_DOWNLOAD: `/apis/protected/v8/cohorts/course/batch/cert/download/`,
   SEARCH_FORM_WITH_USERID: 'apis/proxies/v8/forms/searchForms',
   NOMINATE_LEARNERS: '/apis/proxies/v8/workflow/blendedprogram/admin/enrol',
-  REMOVE_LEARNER: '/apis/proxies/v8/workflow/blendedprogram/remove',
+  REMOVE_LEARNER: '/apis/proxies/v8/workflow/blendedprogram/remove/mdo',
 }
 
 @Injectable({

From 74374334529de952c4616a9596824dbd7ada22fa Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Fri, 29 Sep 2023 14:54:04 +0530
Subject: [PATCH 233/887] added approval status

---
 .../batch-details.component.html              | 28 ++++++++
 .../batch-details/batch-details.component.ts  | 72 +++++++++++++++++--
 .../nominate-users-dialog.component.ts        |  8 +--
 .../users-card/users-card.component.html      | 36 ++++++++++
 .../users-card/users-card.component.scss      | 10 +++
 .../users-card/users-card.component.ts        |  1 +
 .../services/blended-approval.service.ts      |  5 ++
 7 files changed, 151 insertions(+), 9 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
index 77d3a6b51..64fd3678b 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
@@ -39,6 +39,11 @@
               (click)="filter('rejected')" role="button">Rejected requests
               <!-- <span *ngIf="rejectedUsers" class="ws-mat-black60-text">({{rejectedUsers.length}})</span> -->
             </a>
+            <a class="filter-option cursor-pointer"
+              [ngClass]="{'ws-mat-accent-border-active font-bold' : currentFilter === 'approvalStatus',
+                                                                                    'ws-mat-accent-border font-medium':currentFilter !== 'approvalStatus'}"
+              mat-button (click)="filter('approvalStatus')" role="button">Approval Status
+            </a>
             <a class="filter-option cursor-pointer" *ngIf="batchData?.batchAttributes?.sessionDetails_v2"
               [ngClass]="{'ws-mat-accent-border-active font-bold' : currentFilter === 'sessions',
                                                                                     'ws-mat-accent-border font-medium':currentFilter !== 'sessions'}" mat-button (click)="filter('sessions')" role="button">Session
@@ -122,6 +127,29 @@
             <p class="padding-m">No rejected requests yet</p>
           </div>
         </ng-container>
+        <ng-container *ngIf="currentFilter === 'approvalStatus'">
+          <div class="flex flex-1 flex-row margin-top-l"
+            *ngIf="clonedApprovalStatusUsers && clonedApprovalStatusUsers.length > 0">
+            <div class="flex-1">
+              <div class="search">
+                <div class="rsearch">
+                  <mat-icon class="color-60 search-icon">search</mat-icon>
+                  <input class="search-input color-60" type="Standard" #searchText placeholder="Search for a learner"
+                    (input)="onSearchLearners(searchText.value)">
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class=" b-c box" *ngIf="approvalStatus && approvalStatus.length > 0">
+            <div *ngFor="let user of approvalStatus">
+              <ws-app-users-card [user]="user" [actions]="false" [programData]="linkData"
+                [approvalType]="true"></ws-app-users-card>
+            </div>
+          </div>
+          <div class="b-c box" *ngIf="approvalStatus && approvalStatus.length == 0">
+            <p class="padding-m">No rejected requests yet</p>
+          </div>
+        </ng-container>
         <ng-container *ngIf="currentFilter === 'sessions'">
           <div *ngIf="sessionDetails && sessionDetails.length > 0">
             <div class="flex-4 mobile-margin mat-h2 margin-top-m">
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index 7645d3f01..edf48aa3c 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -23,6 +23,7 @@ export class BatchDetailsComponent implements OnInit {
   breadcrumbs: any
   newUsers: any = []
   rejectedUsers: any = []
+  approvalStatus: any = []
   linkData: any
   userProfile: any
   sessionDetails: any = []
@@ -30,13 +31,14 @@ export class BatchDetailsComponent implements OnInit {
   clonedRejectedUsers: any = []
   clonedApprovedUsers: any = []
   learnerCount = 0
+  clonedApprovalStatusUsers: any = []
 
   constructor(private router: Router, private activeRouter: ActivatedRoute,
     // tslint:disable-next-line:align
     private bpService: BlendedApporvalService,
-              private snackBar: MatSnackBar,
-              private events: EventService,
-              private dialogue: MatDialog) {
+    private snackBar: MatSnackBar,
+    private events: EventService,
+    private dialogue: MatDialog) {
     const currentState = this.router.getCurrentNavigation()
     if (currentState && currentState.extras.state) {
       this.batchData = currentState.extras.state
@@ -53,7 +55,7 @@ export class BatchDetailsComponent implements OnInit {
 
   ngOnInit() { }
 
-  filter(key: 'pending' | 'approved' | 'rejected' | 'sessions') {
+  filter(key: 'pending' | 'approved' | 'rejected' | 'sessions' | 'approvalStatus') {
     this.approvedUsers = []
     this.rejectedUsers = []
     this.newUsers = []
@@ -74,6 +76,10 @@ export class BatchDetailsComponent implements OnInit {
         this.currentFilter = 'sessions'
         this.getSessionDetails()
         break
+      case 'approvalStatus':
+        this.currentFilter = 'approvalStatus'
+        this.getApprovalStatusList()
+        break
       default:
         break
     }
@@ -158,6 +164,24 @@ export class BatchDetailsComponent implements OnInit {
     })
   }
 
+  getApprovalStatusList() {
+    const request = {
+      serviceName: ['blendedprogram'],
+      applicationStatus: ['SEND_FOR_PC_APPROVAL', 'SEND_FOR_MDO_APPROVAL', 'REJECTED', 'REMOVED'],
+      applicationIds: [this.batchData.batchId],
+      limit: 100,
+      offset: 0,
+      deptName: [this.userProfile.channel],
+    }
+    this.bpService.getSerchRequests(request).subscribe((res: any) => {
+      if (res) {
+        this.approvalStatus = res.result.data
+        this.clonedApprovalStatusUsers = res.result.data
+        this.getActionType()
+      }
+    })
+  }
+
   getSessionDetails() {
     this.sessionDetails = this.batchData.batchAttributes.sessionDetails_v2
   }
@@ -236,7 +260,7 @@ export class BatchDetailsComponent implements OnInit {
       // tslint:disable-next-line:no-console
       console.log(res)
       this.getLearnersList()
-    },                                              (err: { error: any }) => {
+    }, (err: { error: any }) => {
       // tslint:disable-next-line:no-console
       console.log('request', err)
       this.openSnackbar('Something went wrong. Please try after sometime.')
@@ -333,6 +357,18 @@ export class BatchDetailsComponent implements OnInit {
     }
   }
 
+  filterApprovalStatusUsers(searchText: string) {
+    if (searchText.length > 0) {
+      this.approvalStatus = this.approvalStatus.filter((result: any) => {
+        if (result.userInfo) {
+          return result.userInfo.first_name.toLowerCase().includes(searchText.toLowerCase())
+        }
+      })
+    } else {
+      this.approvalStatus = this.clonedApprovalStatusUsers
+    }
+  }
+
   onSearchLearners(searchText: string) {
     if (this.currentFilter === 'pending') {
       this.filterNewUsers(searchText)
@@ -340,6 +376,8 @@ export class BatchDetailsComponent implements OnInit {
       this.filterApprovedUsers(searchText)
     } else if (this.currentFilter === 'rejected') {
       this.filterRejectedUsers(searchText)
+    } else if (this.currentFilter === 'approvalStatus') {
+      this.filterApprovalStatusUsers(searchText)
     }
   }
 
@@ -350,4 +388,28 @@ export class BatchDetailsComponent implements OnInit {
     return this.learnerCount
   }
 
+  getActionType() {
+    if (this.approvalStatus && this.approvalStatus.length > 0) {
+      this.approvalStatus.forEach((element: any) => {
+        if (element && element.wfInfo.length > 0) {
+          element.wfInfo = _.sortBy(element.wfInfo, ['lastUpdatedOn'])
+          let lastModify = (element.wfInfo[element.wfInfo.length - 1].modificationHistory) ?
+            JSON.parse(element.wfInfo[element.wfInfo.length - 1].modificationHistory) : []
+          if (element.wfInfo[element.wfInfo.length - 1].currentStatus === 'REJECTED' && lastModify.length > 0) {
+            lastModify = lastModify.filter((v: any) => v.action === 'REJECT')
+            element['approvalAction'] = (lastModify[lastModify.length - 1].role === 'MDO_ADMIN') ? 'rejectedByMdo' :
+              (lastModify[lastModify.length - 1].role === 'PROGRAM_COORDINATOR') ? 'rejectedByPc' : ''
+          } else if (element.wfInfo[element.wfInfo.length - 1].currentStatus === 'SEND_FOR_MDO_APPROVAL') {
+            element['approvalAction'] = 'pendingForMdo'
+          } else if (element.wfInfo[element.wfInfo.length - 1].currentStatus === 'SEND_FOR_PC_APPROVAL') {
+            element['approvalAction'] = 'pendingForPc'
+          } else if (element.wfInfo[element.wfInfo.length - 1].currentStatus === 'REMOVED' && lastModify.length > 0) {
+            lastModify = lastModify.filter((v: any) => v.action === 'REMOVE')
+            element['approvalAction'] = (lastModify[lastModify.length - 1].role === 'MDO_ADMIN') ? 'removeByMdo' :
+              (lastModify[lastModify.length - 1].role === 'PROGRAM_COORDINATOR') ? 'removeByPc' : ''
+          }
+        }
+      })
+    }
+  }
 }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
index f96d92f12..06c5ca28e 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
@@ -33,9 +33,9 @@ export class NominateUsersDialogComponent implements OnInit {
   ]
 
   constructor(public dialogRef: MatDialogRef<NominateUsersDialogComponent>,
-    private usersService: UsersService,
-    @Inject(MAT_DIALOG_DATA) public data: any, private bpService: BlendedApporvalService,
-    private snackBar: MatSnackBar) { }
+              private usersService: UsersService,
+              @Inject(MAT_DIALOG_DATA) public data: any, private bpService: BlendedApporvalService,
+              private snackBar: MatSnackBar) { }
 
   ngOnInit() {
     const filterObj = {
@@ -124,7 +124,7 @@ export class NominateUsersDialogComponent implements OnInit {
           }
         }
         this.dialogRef.close('done')
-      }, (err: { error: any }) => {
+      },                                                        (err: { error: any }) => {
         // tslint:disable-next-line:no-console
         console.log(err)
         this.openSnackbar('some thing went wrong, Please try after sometime.')
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.html
index 42da53b7b..d877abe2c 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.html
@@ -13,6 +13,42 @@
       <p class="truncate margin-remove mat-body-1">{{user?.first_name}}</p>
       <p class="truncate ws-mat-black60-text margin-remove mat-body-2">{{user?.deptName || user?.department}}</p>
     </div>
+    <div *ngIf="approvalType" class="flex flex-middle">
+      <div [ngSwitch]="user?.approvalAction">
+        <div *ngSwitchCase="'rejected'" class="flex flex-row flex-middle">
+          <mat-icon class="rejectedIcon">cancel</mat-icon>
+          <span class="margin-left-xs">Rejected by me</span>
+        </div>
+        <div *ngSwitchCase="'pending'" class="flex flex-row flex-middle">
+          <mat-icon class="pendingIcon">error</mat-icon>
+          <span class="margin-left-xs">Pending with me</span>
+        </div>
+        <div *ngSwitchCase="'rejectedByMdo'" class="flex flex-row flex-middle">
+          <mat-icon class="rejectedIcon">cancel</mat-icon>
+          <span class="margin-left-xs">Rejected by MDO Admin</span>
+        </div>
+        <div *ngSwitchCase="'rejectedByPc'" class="flex flex-row flex-middle">
+          <mat-icon class="rejectedIcon">cancel</mat-icon>
+          <span class="margin-left-xs">Rejected by Program Coordinator</span>
+        </div>
+        <div *ngSwitchCase="'pendingForMdo'" class="flex flex-row flex-middle">
+          <mat-icon class="pendingIcon">error</mat-icon>
+          <span class="margin-left-xs">Pending with MDO Admin</span>
+        </div>
+        <div *ngSwitchCase="'pendingForPc'" class="flex flex-row flex-middle">
+          <mat-icon class="pendingIcon">error</mat-icon>
+          <span class="margin-left-xs">Pending with Program Coordinator</span>
+        </div>
+        <div *ngSwitchCase="'removeByMdo'" class="flex flex-row flex-middle">
+          <mat-icon class="rejectedIcon">delete</mat-icon>
+          <span class="margin-left-xs">Removed by MDO Admin</span>
+        </div>
+        <div *ngSwitchCase="'removeByPc'" class="flex flex-row flex-middle">
+          <mat-icon class="rejectedIcon">delete</mat-icon>
+          <span class="margin-left-xs">Removed by Program Coordinator</span>
+        </div>
+      </div>
+    </div>
     <div *ngIf="actions && !remove">
       <button type="button" mat-button class="view-report-btn cursor-pointer mat-accent-border mr-10"
         (click)="openReportDialog()" *ngIf="isViewReport">View response</button>
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.scss
index c861e3f77..efb1192da 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.scss
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.scss
@@ -45,3 +45,13 @@ button {
 .remove-user[disabled] {
     opacity: 0.6;
 }
+
+.rejectedIcon {
+  padding-top: 1px;
+  color: #d13924 !important;
+}
+
+.pendingIcon {
+  padding-top: 1px;
+  color: #e99e38 !important;
+}
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
index c33cb38e1..220024c82 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
@@ -15,6 +15,7 @@ export class UsersCardComponent implements OnInit {
   @Input() actions: any
   @Input() type?: any
   @Input() contentData?: any
+  @Input() approvalType?: any
   @Input() programData: any
   @Input() public photoUrl!: string
   @Input() public name!: string
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
index 0e08a69bb..d08f430c6 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
@@ -11,6 +11,7 @@ const API_END_POINTS = {
   GET_PROGRAM_DETAILS: '/apis/proxies/v8/action/content/v3/read',
   GET_LERANERS: '/apis/protected/v8/cohorts/course/getUsersForBatch',
   GET_REQUESTS: '/apis/proxies/v8/workflow/blendedprogram/search',
+  GET_SEARCH_LIST: '/apis/proxies/v8/workflow/blendedprogram/searchV2/mdo',
   READ_USER: '/apis/proxies/v8/api/user/v2/read/',
   CERT_DOWNLOAD: `/apis/protected/v8/cohorts/course/batch/cert/download/`,
   SEARCH_FORM_WITH_USERID: 'apis/proxies/v8/forms/searchForms',
@@ -37,6 +38,10 @@ export class BlendedApporvalService {
     return this.http.post<any>(`${API_END_POINTS.GET_REQUESTS}`, req)
   }
 
+  getSerchRequests(req: any) {
+    return this.http.post<any>(`${API_END_POINTS.GET_SEARCH_LIST}`, req)
+  }
+
   updateBlendedRequests(req: any) {
     return this.http.post<any>(`${API_END_POINTS.UPDATE_REQUEST}`, req)
   }

From 3168ef5162022988cb4c2391dcce846666f13f42 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Fri, 29 Sep 2023 23:36:32 +0530
Subject: [PATCH 234/887] Reports table with last updated on

---
 .../reports-section.component.ts              | 45 ++++++++++++++-----
 .../home/services/download-report.service.ts  |  4 ++
 2 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
index 1c92afd13..0b37588ec 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
@@ -18,6 +18,7 @@ export class ReportsSectionComponent implements OnInit {
   tabledata!: ITableData
   dataSource: MatTableDataSource<any>
   reportSectionData: any
+  lastUpdatedOn!: any
 
   constructor(
     private activeRouter: ActivatedRoute,
@@ -32,11 +33,31 @@ export class ReportsSectionComponent implements OnInit {
 
   async ngOnInit() {
     this.btnList = await this.downloadService.fetchDownloadJson().toPromise().catch(_error => { })
+    this.downloadService.fetctReportsUpdatedOn(this.configSvc.userProfile.rootOrgId).subscribe((res: any) => {
+      this.lastUpdatedOn = res
+      this.reportSectionData = []
+      this.btnList.forEach((element: any) => {
+        const latUpdate: any = this.getLastModified(element.downloadReportFileName)
+        if (element.enabled) {
+          this.reportSectionData.push({
+            reportName: element.name,
+            reportType: element.reportType,
+            type: element.type,
+            fileName: element.downloadReportFileName,
+            reportUpdatedOn: latUpdate,
+          })
+        }
+      })
+      this.dataSource = new MatTableDataSource(this.reportSectionData)
+    },                                                                                         error => {
+    }
+    )
     this.tabledata = {
       columns: [
         // { displayName: 'Id', key: 'identifier' },
         { displayName: 'Report name', key: 'reportName' },
         { displayName: 'Report type', key: 'reportType' },
+        { displayName: 'Last Updated On', key: 'reportUpdatedOn' },
       ],
       needCheckBox: false,
       needHash: false,
@@ -46,21 +67,21 @@ export class ReportsSectionComponent implements OnInit {
       actions: [{ icon: '', label: 'Download', name: 'DownloadFile', type: 'Standard', disabled: false }],
       actionColumnName: 'Action',
     }
-    this.reportSectionData = []
-    this.btnList.forEach((element: any) => {
-      if (element.enabled) {
-        this.reportSectionData.push({
-          reportName: element.name,
-          reportType: element.reportType,
-          type: element.type,
-          fileName: element.downloadReportFileName,
-        })
-      }
-    })
-    this.dataSource = new MatTableDataSource(this.reportSectionData)
     setTimeout(() => this.dataSource.paginator = this.paginator)
   }
 
+  getLastModified(name: any) {
+    const fname = `${name}.csv`
+    if (this.lastUpdatedOn) {
+      const hashName = this.lastUpdatedOn[`${fname}`]
+      if (hashName) {
+        return this.datePipe.transform(hashName.lastModified, 'dd/MM/yyyy, h:mm a') || ''
+      }
+      return ''
+    }
+    return ''
+  }
+
   downloadFullFile(event: any) {
     if (event && event.row && event.row.type && event.row.fileName) {
       this.downloadReportFile(event.row.type, event.row.fileName)
diff --git a/project/ws/app/src/lib/routes/home/services/download-report.service.ts b/project/ws/app/src/lib/routes/home/services/download-report.service.ts
index 22c337f9c..dec9b4e6e 100644
--- a/project/ws/app/src/lib/routes/home/services/download-report.service.ts
+++ b/project/ws/app/src/lib/routes/home/services/download-report.service.ts
@@ -13,4 +13,8 @@ export class DownloadReportService {
   fetchDownloadJson(): Observable<any> {
     return this.http.get<any>(`${this.baseUrl}/feature/download-report.json`).pipe()
   }
+
+  fetctReportsUpdatedOn(orgId: string): Observable<any> {
+    return this.http.get<any>(`/apis/proxies/v8/storage/v1/reportInfo/${orgId}`).pipe()
+  }
 }

From d1b4942b9dd5bb92c957b81c9492e6396f6bf362 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Sat, 30 Sep 2023 00:31:03 +0530
Subject: [PATCH 235/887] lint fix

---
 .../home/routes/reports-section/reports-section.component.ts  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
index 0b37588ec..2c184d260 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
@@ -49,9 +49,7 @@ export class ReportsSectionComponent implements OnInit {
         }
       })
       this.dataSource = new MatTableDataSource(this.reportSectionData)
-    },                                                                                         error => {
-    }
-    )
+    })
     this.tabledata = {
       columns: [
         // { displayName: 'Id', key: 'identifier' },

From 8a5fe4cdb29da1bc8a1586c2d8d948790e56a62a Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Tue, 3 Oct 2023 10:37:23 +0530
Subject: [PATCH 236/887] Error handling in API to get the last updated time

---
 .../reports-section/reports-section.component.ts       | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
index 2c184d260..5803d20bb 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
@@ -32,10 +32,15 @@ export class ReportsSectionComponent implements OnInit {
   }
 
   async ngOnInit() {
-    this.btnList = await this.downloadService.fetchDownloadJson().toPromise().catch(_error => { })
+    this.reportSectionData = []
     this.downloadService.fetctReportsUpdatedOn(this.configSvc.userProfile.rootOrgId).subscribe((res: any) => {
       this.lastUpdatedOn = res
-      this.reportSectionData = []
+    }, err => {
+      // tslint:disable-next-line:no-console
+      console.log(err)
+    })
+    this.downloadService.fetchDownloadJson().subscribe((result: any) => {
+      this.btnList = result
       this.btnList.forEach((element: any) => {
         const latUpdate: any = this.getLastModified(element.downloadReportFileName)
         if (element.enabled) {
@@ -50,6 +55,7 @@ export class ReportsSectionComponent implements OnInit {
       })
       this.dataSource = new MatTableDataSource(this.reportSectionData)
     })
+
     this.tabledata = {
       columns: [
         // { displayName: 'Id', key: 'identifier' },

From 6d844b154d3ce828b716f08ca93b6251b61db16c Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Wed, 4 Oct 2023 12:52:50 +0530
Subject: [PATCH 237/887] Last updated at in reports

---
 .../reports-section.component.ts              | 56 ++++++++++---------
 1 file changed, 31 insertions(+), 25 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
index 5803d20bb..0dc9b67c4 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
@@ -31,31 +31,7 @@ export class ReportsSectionComponent implements OnInit {
     this.dataSource.paginator = this.paginator
   }
 
-  async ngOnInit() {
-    this.reportSectionData = []
-    this.downloadService.fetctReportsUpdatedOn(this.configSvc.userProfile.rootOrgId).subscribe((res: any) => {
-      this.lastUpdatedOn = res
-    }, err => {
-      // tslint:disable-next-line:no-console
-      console.log(err)
-    })
-    this.downloadService.fetchDownloadJson().subscribe((result: any) => {
-      this.btnList = result
-      this.btnList.forEach((element: any) => {
-        const latUpdate: any = this.getLastModified(element.downloadReportFileName)
-        if (element.enabled) {
-          this.reportSectionData.push({
-            reportName: element.name,
-            reportType: element.reportType,
-            type: element.type,
-            fileName: element.downloadReportFileName,
-            reportUpdatedOn: latUpdate,
-          })
-        }
-      })
-      this.dataSource = new MatTableDataSource(this.reportSectionData)
-    })
-
+  ngOnInit() {
     this.tabledata = {
       columns: [
         // { displayName: 'Id', key: 'identifier' },
@@ -71,9 +47,39 @@ export class ReportsSectionComponent implements OnInit {
       actions: [{ icon: '', label: 'Download', name: 'DownloadFile', type: 'Standard', disabled: false }],
       actionColumnName: 'Action',
     }
+
+    this.reportSectionData = []
+    this.downloadService.fetchDownloadJson().subscribe((result: any) => {
+      this.btnList = result
+      this.downloadService.fetctReportsUpdatedOn(this.configSvc.userProfile.rootOrgId).subscribe((res: any) => {
+        this.lastUpdatedOn = res
+        this.getTableData()
+      }, err => {
+        // tslint:disable-next-line:no-console
+        console.log(err)
+        this.getTableData()
+      })
+    })
     setTimeout(() => this.dataSource.paginator = this.paginator)
   }
 
+
+  getTableData() {
+    this.btnList.forEach((element: any) => {
+      const latUpdate: any = this.getLastModified(element.downloadReportFileName)
+      if (element.enabled) {
+        this.reportSectionData.push({
+          reportName: element.name,
+          reportType: element.reportType,
+          type: element.type,
+          fileName: element.downloadReportFileName,
+          reportUpdatedOn: latUpdate,
+        })
+      }
+    })
+    this.dataSource = new MatTableDataSource(this.reportSectionData)
+  }
+
   getLastModified(name: any) {
     const fname = `${name}.csv`
     if (this.lastUpdatedOn) {

From d9480fb29f7e2d4d7557297428dbd3e11612f359 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Wed, 4 Oct 2023 15:30:11 +0530
Subject: [PATCH 238/887] added role

---
 .../routes/users/routes/create-user/create-user.component.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
index 5d3a87fbf..17edc2bda 100644
--- a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
@@ -107,6 +107,11 @@ export class CreateUserComponent implements OnInit, OnDestroy {
                     roleName: rolesObject, description: rolesObject,
                   })
                 }
+                if (rolesObject === 'MDO_DASHBOARD_USER') {
+                  this.uniqueRoles.push({
+                    roleName: rolesObject, description: rolesObject,
+                  })
+                }
               } else {
                 if (this.isMdoLeader) {
                   if (rolesObject !== 'MDO_LEADER') {

From c283a885b6665419a15a2befca1871e261c148c8 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Wed, 4 Oct 2023 15:34:38 +0530
Subject: [PATCH 239/887] lint fix

---
 .../components/batch-details/batch-details.component.ts   | 8 ++++----
 .../routes/reports-section/reports-section.component.ts   | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index edf48aa3c..4140cf229 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -36,9 +36,9 @@ export class BatchDetailsComponent implements OnInit {
   constructor(private router: Router, private activeRouter: ActivatedRoute,
     // tslint:disable-next-line:align
     private bpService: BlendedApporvalService,
-    private snackBar: MatSnackBar,
-    private events: EventService,
-    private dialogue: MatDialog) {
+              private snackBar: MatSnackBar,
+              private events: EventService,
+              private dialogue: MatDialog) {
     const currentState = this.router.getCurrentNavigation()
     if (currentState && currentState.extras.state) {
       this.batchData = currentState.extras.state
@@ -260,7 +260,7 @@ export class BatchDetailsComponent implements OnInit {
       // tslint:disable-next-line:no-console
       console.log(res)
       this.getLearnersList()
-    }, (err: { error: any }) => {
+    },                                              (err: { error: any }) => {
       // tslint:disable-next-line:no-console
       console.log('request', err)
       this.openSnackbar('Something went wrong. Please try after sometime.')
diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
index 0dc9b67c4..67564af98 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
@@ -54,7 +54,7 @@ export class ReportsSectionComponent implements OnInit {
       this.downloadService.fetctReportsUpdatedOn(this.configSvc.userProfile.rootOrgId).subscribe((res: any) => {
         this.lastUpdatedOn = res
         this.getTableData()
-      }, err => {
+      },                                                                                         err => {
         // tslint:disable-next-line:no-console
         console.log(err)
         this.getTableData()
@@ -63,7 +63,6 @@ export class ReportsSectionComponent implements OnInit {
     setTimeout(() => this.dataSource.paginator = this.paginator)
   }
 
-
   getTableData() {
     this.btnList.forEach((element: any) => {
       const latUpdate: any = this.getLastModified(element.downloadReportFileName)

From 130245273743dff868f7be13ce7e5c105c3a6dd8 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Wed, 4 Oct 2023 17:45:14 +0530
Subject: [PATCH 240/887] user role assign fixes

---
 .../batch-details/batch-details.component.ts  |  8 +--
 .../reports-section.component.ts              |  3 +-
 .../create-user/create-user.component.ts      | 56 +++++++++++--------
 3 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index edf48aa3c..4140cf229 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -36,9 +36,9 @@ export class BatchDetailsComponent implements OnInit {
   constructor(private router: Router, private activeRouter: ActivatedRoute,
     // tslint:disable-next-line:align
     private bpService: BlendedApporvalService,
-    private snackBar: MatSnackBar,
-    private events: EventService,
-    private dialogue: MatDialog) {
+              private snackBar: MatSnackBar,
+              private events: EventService,
+              private dialogue: MatDialog) {
     const currentState = this.router.getCurrentNavigation()
     if (currentState && currentState.extras.state) {
       this.batchData = currentState.extras.state
@@ -260,7 +260,7 @@ export class BatchDetailsComponent implements OnInit {
       // tslint:disable-next-line:no-console
       console.log(res)
       this.getLearnersList()
-    }, (err: { error: any }) => {
+    },                                              (err: { error: any }) => {
       // tslint:disable-next-line:no-console
       console.log('request', err)
       this.openSnackbar('Something went wrong. Please try after sometime.')
diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
index 0dc9b67c4..67564af98 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
@@ -54,7 +54,7 @@ export class ReportsSectionComponent implements OnInit {
       this.downloadService.fetctReportsUpdatedOn(this.configSvc.userProfile.rootOrgId).subscribe((res: any) => {
         this.lastUpdatedOn = res
         this.getTableData()
-      }, err => {
+      },                                                                                         err => {
         // tslint:disable-next-line:no-console
         console.log(err)
         this.getTableData()
@@ -63,7 +63,6 @@ export class ReportsSectionComponent implements OnInit {
     setTimeout(() => this.dataSource.paginator = this.paginator)
   }
 
-
   getTableData() {
     this.btnList.forEach((element: any) => {
       const latUpdate: any = this.getLastModified(element.downloadReportFileName)
diff --git a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
index 5d3a87fbf..5606deda3 100644
--- a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
@@ -202,38 +202,46 @@ export class CreateUserComponent implements OnInit, OnDestroy {
         firstName: form.value.fname,
         // lastName: form.value.lname,
         channel: this.departmentName ? this.departmentName : null,
+        roles: form.value.roles,
       },
     }
 
     this.usersSvc.createUser(newobj).subscribe(res => {
       if (res) {
         this.displayLoader = false
-        const dreq = {
-          request: {
-            organisationId: this.department,
-            userId: res.userId,
-            roles: form.value.roles,
-          },
+        this.openSnackbar('User Created Successfully')
+        this.disableCreateButton = false
+        if (this.qpParam === 'MDOinfo') {
+          this.router.navigate(['/app/home/mdoinfo/leadership'])
+        } else {
+          this.router.navigate(['/app/home/users'])
         }
+        // const dreq = {
+        //   request: {
+        //     organisationId: this.department,
+        //     userId: res.userId,
+        //     roles: form.value.roles,
+        //   },
+        // }
 
-        this.usersSvc.addUserToDepartment(dreq).subscribe(dres => {
-          if (dres) {
-            this.createUserForm.reset({ fname: '', email: '', department: this.departmentName, roles: '' })
-            // this.createUserForm.reset({ fname: '', lname: '', email: '', department: this.departmentName, roles: '' })
-            this.openSnackbar('User Created Successfully')
-            this.disableCreateButton = false
-            if (this.qpParam === 'MDOinfo') {
-              this.router.navigate(['/app/home/mdoinfo/leadership'])
-            } else {
-              this.router.navigate(['/app/home/users'])
-            }
-          }
-        },
-          // tslint:disable-next-line
-          (err: any) => {
-            this.displayLoader = false
-            this.openSnackbar(err.error || err || `Some error occurred while updateing new user's role, Please try again later!`)
-          })
+        // this.usersSvc.addUserToDepartment(dreq).subscribe(dres => {
+        //   if (dres) {
+        //     this.createUserForm.reset({ fname: '', email: '', department: this.departmentName, roles: '' })
+        //     // this.createUserForm.reset({ fname: '', lname: '', email: '', department: this.departmentName, roles: '' })
+        //     this.openSnackbar('User Created Successfully')
+        //     this.disableCreateButton = false
+        //     if (this.qpParam === 'MDOinfo') {
+        //       this.router.navigate(['/app/home/mdoinfo/leadership'])
+        //     } else {
+        //       this.router.navigate(['/app/home/users'])
+        //     }
+        //   }
+        // },
+        //   // tslint:disable-next-line
+        //   (err: any) => {
+        //     this.displayLoader = false
+        //     this.openSnackbar(err.error || err || `Some error occurred while updateing new user's role, Please try again later!`)
+        //   })
       }
     },
       // tslint:disable-next-line

From 77314f4040235fa593db51d0f35138dd8276a288 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Thu, 5 Oct 2023 17:00:59 +0530
Subject: [PATCH 241/887] mdo dashboard user role added in update page

---
 .../lib/routes/users/routes/view-user/view-user.component.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
index d4b42df2d..fe121b124 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
@@ -106,6 +106,11 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
                     roleName: rolesObject, description: rolesObject,
                   })
                 }
+                if (rolesObject === 'MDO_DASHBOARD_USER') {
+                  this.uniqueRoles.push({
+                    roleName: rolesObject, description: rolesObject,
+                  })
+                }
               } else {
                 if (this.isMdoLeader) {
                   if (rolesObject !== 'MDO_LEADER') {

From 11d9f874266ed46b7728b317fa34b8df3b3c6628 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Thu, 5 Oct 2023 19:28:49 +0530
Subject: [PATCH 242/887] Language changes

---
 .../batch-details.component.html              | 29 +------------------
 .../routes/list/list-event.component.ts       |  4 +--
 .../routes/approvals/approvals.component.ts   |  2 +-
 .../blended-approvals.component.html          |  2 +-
 .../blended-approvals.component.ts            |  2 +-
 .../reports-section.component.ts              |  2 +-
 .../routes/users-view/users-view.component.ts |  2 +-
 .../users-upload/users-upload.component.html  |  2 +-
 .../users-upload/users-upload.component.ts    | 10 +++----
 9 files changed, 14 insertions(+), 41 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
index 64fd3678b..d91ed3869 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
@@ -33,16 +33,10 @@
               (click)="filter('approved')" role="button">Learners
               <!-- <span *ngIf="approvedUsers" class="ws-mat-black60-text">({{approvedUsers.length}})</span> -->
             </a>
-            <a class="filter-option cursor-pointer"
-              [ngClass]="{'ws-mat-accent-border-active font-bold' : currentFilter === 'rejected',
-                                                                        'ws-mat-accent-border font-medium':currentFilter !== 'rejected'}" mat-button
-              (click)="filter('rejected')" role="button">Rejected requests
-              <!-- <span *ngIf="rejectedUsers" class="ws-mat-black60-text">({{rejectedUsers.length}})</span> -->
-            </a>
             <a class="filter-option cursor-pointer"
               [ngClass]="{'ws-mat-accent-border-active font-bold' : currentFilter === 'approvalStatus',
                                                                                     'ws-mat-accent-border font-medium':currentFilter !== 'approvalStatus'}"
-              mat-button (click)="filter('approvalStatus')" role="button">Approval Status
+              mat-button (click)="filter('approvalStatus')" role="button">Enroll status
             </a>
             <a class="filter-option cursor-pointer" *ngIf="batchData?.batchAttributes?.sessionDetails_v2"
               [ngClass]="{'ws-mat-accent-border-active font-bold' : currentFilter === 'sessions',
@@ -106,27 +100,6 @@
             <p class="padding-m">No learners yet</p>
           </div>
         </ng-container>
-        <ng-container *ngIf="currentFilter === 'rejected'">
-          <div class="flex flex-1 flex-row margin-top-l" *ngIf="clonedRejectedUsers && clonedRejectedUsers.length > 0">
-            <div class="flex-1">
-              <div class="search">
-                <div class="rsearch">
-                  <mat-icon class="color-60 search-icon">search</mat-icon>
-                  <input class="search-input color-60" type="Standard" #searchText placeholder="Search for a learner"
-                    (input)="onSearchLearners(searchText.value)">
-                </div>
-              </div>
-            </div>
-          </div>
-          <div class=" b-c box" *ngIf="rejectedUsers && rejectedUsers.length > 0">
-            <div *ngFor="let user of rejectedUsers">
-              <ws-app-users-card [user]="user" [actions]="false" [programData]="linkData"></ws-app-users-card>
-            </div>
-          </div>
-          <div class="b-c box" *ngIf="rejectedUsers && rejectedUsers.length == 0">
-            <p class="padding-m">No rejected requests yet</p>
-          </div>
-        </ng-container>
         <ng-container *ngIf="currentFilter === 'approvalStatus'">
           <div class="flex flex-1 flex-row margin-top-l"
             *ngIf="clonedApprovalStatusUsers && clonedApprovalStatusUsers.length > 0">
diff --git a/project/ws/app/src/lib/routes/events/routes/list/list-event.component.ts b/project/ws/app/src/lib/routes/events/routes/list/list-event.component.ts
index 5cd4bc854..91c434300 100644
--- a/project/ws/app/src/lib/routes/events/routes/list/list-event.component.ts
+++ b/project/ws/app/src/lib/routes/events/routes/list/list-event.component.ts
@@ -62,10 +62,10 @@ export class ListEventComponent implements OnInit, AfterViewInit, OnDestroy {
     ngOnInit() {
         this.tabledata = {
             columns: [
-                { displayName: 'Cover Picture', key: 'eventThumbnail' },
+                { displayName: 'Cover picture', key: 'eventThumbnail' },
                 { displayName: 'Title', key: 'eventName' },
                 { displayName: 'Date and time', key: 'eventStartDate' },
-                { displayName: 'Created On', key: 'eventCreatedOn' },
+                { displayName: 'Created on', key: 'eventCreatedOn' },
                 { displayName: 'Duration', key: 'eventDuration' },
                 { displayName: 'Joined', key: 'eventjoined' },
             ],
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
index 5b2ef46ca..bf469e1bc 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
@@ -26,7 +26,7 @@ export class ApprovalsComponent implements OnInit, OnDestroy {
     // { name: 'Reject', label: 'Reject', icon: 'remove_red_eye', type: 'Reject' }],
     actions: [],
     columns: [
-      { displayName: 'Full Name', key: 'fullname' },
+      { displayName: 'Full name', key: 'fullname' },
       { displayName: 'Requested on', key: 'requestedon' },
       { displayName: 'Fields', key: 'fields', isList: true },
       { displayName: 'Tags', key: 'tag', isList: true },
diff --git a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.html b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.html
index 6e52a63ff..a945f5050 100644
--- a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.html
@@ -1,6 +1,6 @@
 <div class="flex flex-4 flex-column">
   <mat-card>
-    <div class="flex-4 mobile-margin text-capitalize mat-h2">Blended Program</div>
+    <div class="flex-4 mobile-margin text-capitalize mat-h2">Blended program</div>
     <mat-card-content>
       <ng-container class="margin-top-l">
         <ws-widget-org-user-table [tableData]='tabledata' [data]='getTableData' (eOnRowClick)="viewDetails($event)">
diff --git a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
index aabd30d3f..bbca4dc52 100644
--- a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
@@ -18,7 +18,7 @@ export class BlendedApprovalsComponent implements OnInit {
   tabledata: ITableData = {
     actions: [],
     columns: [
-      { displayName: 'Blended Program name', key: 'name', imageUrl: true },
+      { displayName: 'CBP name', key: 'name', imageUrl: true },
       { displayName: 'Batches', key: 'batchesCount' },
       // { displayName: 'Learners', key: 'learners', isList: true },
       { displayName: 'New requests (Across batches)', key: 'newrequests', isList: true },
diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
index 0dc9b67c4..eb92a1355 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
@@ -37,7 +37,7 @@ export class ReportsSectionComponent implements OnInit {
         // { displayName: 'Id', key: 'identifier' },
         { displayName: 'Report name', key: 'reportName' },
         { displayName: 'Report type', key: 'reportType' },
-        { displayName: 'Last Updated On', key: 'reportUpdatedOn' },
+        { displayName: 'Last updated on', key: 'reportUpdatedOn' },
       ],
       needCheckBox: false,
       needHash: false,
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index b2b1e03e9..2351e93f7 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -52,7 +52,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   tabledata: ITableData = {
     actions: [],
     columns: [
-      { displayName: 'Full Name', key: 'fullname' },
+      { displayName: 'Full name', key: 'fullname' },
       { displayName: 'Email', key: 'email' },
       { displayName: 'Roles', key: 'roles', isList: true },
     ],
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
index 74535d7e9..2549c579a 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
@@ -7,7 +7,7 @@
       <div class="flex flex-row">
         <form [formGroup]="formGroup" #form class="flex">
           <button *ngIf="!fileName" type="button" (click)="fileInput.click()" (dblclick)="$event.preventDefault();"
-            class="download-btn mat-accent-border mat-button mat-button-base">Choose File</button>
+            class="download-btn mat-accent-border mat-button mat-button-base">Choose file</button>
           <label class="file-name mr-5" *ngIf="fileName">Selected file : <b>{{fileName}}</b></label>
           <input hidden type="file" #fileInput class="" (click)="fileClick($event)" (change)="onFileChange($event)"
             name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();"
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
index 1f83a4376..200a647dd 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
@@ -81,9 +81,9 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
         // { displayName: 'Id', key: 'identifier' },
         { displayName: 'Name', key: 'fileName' },
         { displayName: 'Status', key: 'status' },
-        { displayName: 'Failed Records', key: 'failedRecordsCount' },
-        { displayName: 'Success Records', key: 'successfulRecordsCount' },
-        { displayName: 'Total Records', key: 'totalRecords' },
+        { displayName: 'Failed records', key: 'failedRecordsCount' },
+        { displayName: 'Success records', key: 'successfulRecordsCount' },
+        { displayName: 'Total records', key: 'totalRecords' },
         { displayName: 'Created on', key: 'dateCreatedOn' },
         { displayName: 'Updated on', key: 'dateUpdatedOn' },
       ],
@@ -92,8 +92,8 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
       sortColumn: 'dateCreatedOn',
       sortState: 'desc',
       needUserMenus: false,
-      actions: [{ icon: 'download', label: 'Download File', name: 'DownloadFile', type: 'link', disabled: false }],
-      actionColumnName: 'Download File',
+      actions: [{ icon: 'download', label: 'Download file', name: 'DownloadFile', type: 'link', disabled: false }],
+      actionColumnName: 'Download file',
     }
     this.getBulkUploadData()
   }

From fdf62870fc60eec12505d452ea32128685124c9e Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Thu, 5 Oct 2023 19:49:44 +0530
Subject: [PATCH 243/887] Changes in get learners API

---
 .../components/batch-details/batch-details.component.ts       | 4 ++--
 .../components/batch-list/batch-list.component.ts             | 4 ++--
 .../services/blended-approval.service.ts                      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index edf48aa3c..b91b8263c 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -115,7 +115,7 @@ export class BatchDetailsComponent implements OnInit {
   }
 
   getLearnersList() {
-    this.bpService.getLearners(this.batchData.batchId).subscribe((res: any) => {
+    this.bpService.getLearners(this.batchData.batchId, this.userProfile.channel).subscribe((res: any) => {
       if (res && res.length > 0) {
         this.approvedUsers = res
         this.clonedApprovedUsers = res
@@ -140,7 +140,7 @@ export class BatchDetailsComponent implements OnInit {
       }
     })
 
-    this.bpService.getLearners(this.batchData.batchId).subscribe((res: any) => {
+    this.bpService.getLearners(this.batchData.batchId, this.userProfile.channel).subscribe((res: any) => {
       if (res && res.length > 0) {
         this.learnerCount = res.length
       }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
index de493d2c6..cf2b47ccf 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
@@ -52,7 +52,7 @@ export class BatchListComponent implements OnInit {
                   b.newrequestsCount = resnew.result.data.length
                 }
               })
-              this.bpService.getLearners(b.batchId).subscribe((r: any) => {
+              this.bpService.getLearners(b.batchId, this.userProfile.channel).subscribe((r: any) => {
                 if (r && r.length > 0) {
                   b.learnersCount = r.length
                 }
@@ -104,7 +104,7 @@ export class BatchListComponent implements OnInit {
                   b.newrequestsCount = resnew.result.data.length
                 }
               })
-              this.bpService.getLearners(b.batchId).subscribe((r: any) => {
+              this.bpService.getLearners(b.batchId, this.userProfile.channel).subscribe((r: any) => {
                 if (r && r.length > 0) {
                   b.learnersCount = r.length
                 }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
index d08f430c6..753586413 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
@@ -29,8 +29,8 @@ export class BlendedApporvalService {
     return this.http.get<any>(url)
   }
 
-  getLearners(batchId: any): Observable<any> {
-    const url = `${API_END_POINTS.GET_LERANERS}/${batchId}`
+  getLearners(batchId: any, orgName: any): Observable<any> {
+    const url = `${API_END_POINTS.GET_LERANERS}/${batchId}/${orgName}`
     return this.http.get<any>(url)
   }
 

From 31ab387c203584e17ac6317430d005c3d93d6b20 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Fri, 6 Oct 2023 10:56:25 +0530
Subject: [PATCH 244/887] Reject message changes

---
 .../components/batch-details/batch-details.component.ts         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index b91b8263c..7374fa68a 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -223,7 +223,7 @@ export class BatchDetailsComponent implements OnInit {
         this.getNewRequestsList()
       } else {
         this.getLearnersList()
-        this.openSnackbar('Request is rejected successfully!')
+        this.openSnackbar('Request is removed successfully.')
         this.filter('rejected')
       }
     })

From 2f5c8f185f5b4c55fd2f3c2743c27db3e7876ed7 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Fri, 6 Oct 2023 13:40:55 +0530
Subject: [PATCH 245/887] Bugs #105094, #107402 and #107400

---
 .../batch-details/batch-details.component.ts           |  3 +++
 .../nominate-users-dialog.component.ts                 | 10 +++++-----
 .../components/users-card/users-card.component.ts      |  5 ++---
 .../blended-approvals/blended-approvals.component.html |  2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index 7374fa68a..2957d30e6 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -136,6 +136,9 @@ export class BatchDetailsComponent implements OnInit {
     this.bpService.getRequests(request).subscribe((res: any) => {
       if (res) {
         this.newUsers = res.result.data
+        this.newUsers.sort((a: any, b: any) => {
+          return <any>new Date(b.wfInfo[0].lastUpdatedOn) - <any>new Date(a.wfInfo[0].lastUpdatedOn)
+        })
         this.clonedNewUsers = res.result.data
       }
     })
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
index 06c5ca28e..abbee1226 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
@@ -33,9 +33,9 @@ export class NominateUsersDialogComponent implements OnInit {
   ]
 
   constructor(public dialogRef: MatDialogRef<NominateUsersDialogComponent>,
-              private usersService: UsersService,
-              @Inject(MAT_DIALOG_DATA) public data: any, private bpService: BlendedApporvalService,
-              private snackBar: MatSnackBar) { }
+    private usersService: UsersService,
+    @Inject(MAT_DIALOG_DATA) public data: any, private bpService: BlendedApporvalService,
+    private snackBar: MatSnackBar) { }
 
   ngOnInit() {
     const filterObj = {
@@ -120,11 +120,11 @@ export class NominateUsersDialogComponent implements OnInit {
           if (_res[0] && _res[0].result && _res[0].result.status === 'BAD_REQUEST') {
             this.openSnackbar(_res[0].result.errmsg)
           } else {
-            this.openSnackbar('Users are nominated successfully!')
+            this.openSnackbar('User(s) nominated successfully!')
           }
         }
         this.dialogRef.close('done')
-      },                                                        (err: { error: any }) => {
+      }, (err: { error: any }) => {
         // tslint:disable-next-line:no-console
         console.log(err)
         this.openSnackbar('some thing went wrong, Please try after sometime.')
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
index 220024c82..39328c819 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/users-card/users-card.component.ts
@@ -134,9 +134,8 @@ export class UsersCardComponent implements OnInit {
   }
 
   canDisableRemoveLink() {
-    return this.programData.approvalType && (
-      this.programData.approvalType === 'oneStepPCApproval' ||
-      this.programData.approvalType === 'twoStepPCAndMDOApproval')
+    return this.programData.approvalType &&
+      this.programData.approvalType === 'oneStepPCApproval'
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.html b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.html
index a945f5050..620ed207e 100644
--- a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.html
@@ -1,6 +1,6 @@
 <div class="flex flex-4 flex-column">
   <mat-card>
-    <div class="flex-4 mobile-margin text-capitalize mat-h2">Blended program</div>
+    <div class="flex-4 mobile-margin mat-h2">Blended program</div>
     <mat-card-content>
       <ng-container class="margin-top-l">
         <ws-widget-org-user-table [tableData]='tabledata' [data]='getTableData' (eOnRowClick)="viewDetails($event)">

From f96338cdd81289613353441d27db4280cb60277a Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Mon, 9 Oct 2023 17:40:54 +0530
Subject: [PATCH 246/887] Task #108243: Fixed error message based on approval
 type work flow

---
 .../head/_services/widget-content.model.ts    |  7 +++++++
 .../batch-details/batch-details.component.ts  | 21 ++++++++++++-------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/project/ws/app/src/lib/head/_services/widget-content.model.ts b/project/ws/app/src/lib/head/_services/widget-content.model.ts
index 5da0c3c31..522d0e393 100644
--- a/project/ws/app/src/lib/head/_services/widget-content.model.ts
+++ b/project/ws/app/src/lib/head/_services/widget-content.model.ts
@@ -423,4 +423,11 @@ export namespace NsContent {
   export enum ETagType {
     NEWLY_ADDED = 'NEWLY ADDED',
   }
+
+  export enum WFBlendedProgramApprovalTypes {
+    ONE_STEP_PC = 'oneStepPCApproval',
+    ONE_STEP_MDO = 'oneStepMDOApproval',
+    TWO_STEP_MDO_PC = 'twoStepMDOAndPCApproval',
+    TWO_STEP_PC_MDO = 'twoStepPCAndMDOApproval',
+  }
 }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index 4212829f7..172c394c1 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -8,6 +8,7 @@ import { TelemetryEvents } from '../../../../head/_services/telemetry.event.mode
 import { EventService } from '@sunbird-cb/utils'
 import { NominateUsersDialogComponent } from '../nominate-users-dialog/nominate-users-dialog.component'
 import moment from 'moment'
+import { NsContent } from '../../../../head/_services/widget-content.model'
 @Component({
   selector: 'ws-app-batch-details',
   templateUrl: './batch-details.component.html',
@@ -36,9 +37,9 @@ export class BatchDetailsComponent implements OnInit {
   constructor(private router: Router, private activeRouter: ActivatedRoute,
     // tslint:disable-next-line:align
     private bpService: BlendedApporvalService,
-              private snackBar: MatSnackBar,
-              private events: EventService,
-              private dialogue: MatDialog) {
+    private snackBar: MatSnackBar,
+    private events: EventService,
+    private dialogue: MatDialog) {
     const currentState = this.router.getCurrentNavigation()
     if (currentState && currentState.extras.state) {
       this.batchData = currentState.extras.state
@@ -233,11 +234,15 @@ export class BatchDetailsComponent implements OnInit {
   }
 
   requestMesages() {
-    if (this.programData.wfApprovalType === 'oneStepMDOApproval') {
-      return 'Request is approved successfully'
+    if (this.programData.wfApprovalType === NsContent.WFBlendedProgramApprovalTypes.ONE_STEP_MDO ||
+      this.programData.wfApprovalType === NsContent.WFBlendedProgramApprovalTypes.TWO_STEP_PC_MDO
+    ) {
+      return 'Request is approved successfully!'
     }
-    return 'Request is approved successfully! Further needs to be approved by program coordinator.'
-
+    if (this.programData.wfApprovalType === NsContent.WFBlendedProgramApprovalTypes.TWO_STEP_MDO_PC) {
+      return 'Request is approved successfully! Further needs to be approved by program coordinator.'
+    }
+    return 'Request is approved successfully!'
   }
 
   removeUser(event: any) {
@@ -263,7 +268,7 @@ export class BatchDetailsComponent implements OnInit {
       // tslint:disable-next-line:no-console
       console.log(res)
       this.getLearnersList()
-    },                                              (err: { error: any }) => {
+    }, (err: { error: any }) => {
       // tslint:disable-next-line:no-console
       console.log('request', err)
       this.openSnackbar('Something went wrong. Please try after sometime.')

From 159a2d27792e56f1d426ca266405f22cbfe8b5fe Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Mon, 9 Oct 2023 17:46:11 +0530
Subject: [PATCH 247/887] Task #108326: Updated message

---
 .../components/batch-details/batch-details.component.html       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
index d91ed3869..89ded89c9 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
@@ -120,7 +120,7 @@
             </div>
           </div>
           <div class="b-c box" *ngIf="approvalStatus && approvalStatus.length == 0">
-            <p class="padding-m">No rejected requests yet</p>
+            <p class="padding-m">No requests yet</p>
           </div>
         </ng-container>
         <ng-container *ngIf="currentFilter === 'sessions'">

From de5a70ea034a1c4b9e477204010548a3cd0795ef Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Mon, 9 Oct 2023 17:50:45 +0530
Subject: [PATCH 248/887] Updated new request sort order

---
 .../batch-details/batch-details.component.ts       | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index 4212829f7..530afe1ec 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -36,9 +36,12 @@ export class BatchDetailsComponent implements OnInit {
   constructor(private router: Router, private activeRouter: ActivatedRoute,
     // tslint:disable-next-line:align
     private bpService: BlendedApporvalService,
-              private snackBar: MatSnackBar,
-              private events: EventService,
-              private dialogue: MatDialog) {
+    // tslint:disable-next-line:align
+    private snackBar: MatSnackBar,
+    // tslint:disable-next-line:align
+    private events: EventService,
+    // tslint:disable-next-line:align
+    private dialogue: MatDialog) {
     const currentState = this.router.getCurrentNavigation()
     if (currentState && currentState.extras.state) {
       this.batchData = currentState.extras.state
@@ -137,7 +140,7 @@ export class BatchDetailsComponent implements OnInit {
       if (res) {
         this.newUsers = res.result.data
         this.newUsers.sort((a: any, b: any) => {
-          return <any>new Date(b.wfInfo[0].lastUpdatedOn) - <any>new Date(a.wfInfo[0].lastUpdatedOn)
+          return <any>new Date(a.wfInfo[0].lastUpdatedOn) - <any>new Date(b.wfInfo[0].lastUpdatedOn)
         })
         this.clonedNewUsers = res.result.data
       }
@@ -263,7 +266,8 @@ export class BatchDetailsComponent implements OnInit {
       // tslint:disable-next-line:no-console
       console.log(res)
       this.getLearnersList()
-    },                                              (err: { error: any }) => {
+      // tslint:disable-next-line:align
+    }, (err: { error: any }) => {
       // tslint:disable-next-line:no-console
       console.log('request', err)
       this.openSnackbar('Something went wrong. Please try after sometime.')

From 47d61759c30f81123592a8b2e0b1958a6806dd1a Mon Sep 17 00:00:00 2001
From: Bharath Kumar <bharathkumar@TI-MAC-087.local>
Date: Tue, 10 Oct 2023 15:29:12 +0530
Subject: [PATCH 249/887] changes in error message

---
 .../components/batch-details/batch-details.component.ts   | 4 ++++
 .../nominate-users-dialog.component.ts                    | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index ead939442..37d563160 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -233,6 +233,10 @@ export class BatchDetailsComponent implements OnInit {
         this.openSnackbar('Request is removed successfully.')
         this.filter('rejected')
       }
+    },                                                      (_err: any) => {
+      if (_err && _err.result && _err.result.errmsg) {
+        this.openSnackbar(_err.result.errmsg)
+      }
     })
   }
 
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
index abbee1226..24fd9fd05 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
@@ -33,9 +33,9 @@ export class NominateUsersDialogComponent implements OnInit {
   ]
 
   constructor(public dialogRef: MatDialogRef<NominateUsersDialogComponent>,
-    private usersService: UsersService,
-    @Inject(MAT_DIALOG_DATA) public data: any, private bpService: BlendedApporvalService,
-    private snackBar: MatSnackBar) { }
+              private usersService: UsersService,
+              @Inject(MAT_DIALOG_DATA) public data: any, private bpService: BlendedApporvalService,
+              private snackBar: MatSnackBar) { }
 
   ngOnInit() {
     const filterObj = {
@@ -124,7 +124,7 @@ export class NominateUsersDialogComponent implements OnInit {
           }
         }
         this.dialogRef.close('done')
-      }, (err: { error: any }) => {
+      },                                                        (err: { error: any }) => {
         // tslint:disable-next-line:no-console
         console.log(err)
         this.openSnackbar('some thing went wrong, Please try after sometime.')

From fe8c7b657fa6c18fd2c769cafe1762d3c21c4961 Mon Sep 17 00:00:00 2001
From: Bharath Kumar <bharathkumar@TI-MAC-087.local>
Date: Tue, 10 Oct 2023 16:15:57 +0530
Subject: [PATCH 250/887] error msg display

---
 .../components/batch-details/batch-details.component.ts   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index 37d563160..d730dab7d 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -233,10 +233,10 @@ export class BatchDetailsComponent implements OnInit {
         this.openSnackbar('Request is removed successfully.')
         this.filter('rejected')
       }
-    },                                                      (_err: any) => {
-      if (_err && _err.result && _err.result.errmsg) {
-        this.openSnackbar(_err.result.errmsg)
-      }
+    },                                                      (error: any) => {
+      this.openSnackbar(_.get(error, 'error.params.errmsg') ||
+        _.get(error, 'error.result.errmsg') ||
+        'Something went wrong, please try again later!')
     })
   }
 

From 949c59e371fa8dada9a0cad017e6ffea2b7dc6cb Mon Sep 17 00:00:00 2001
From: Bharath Kumar <bharathkumar@TI-MAC-087.local>
Date: Wed, 11 Oct 2023 15:18:39 +0530
Subject: [PATCH 251/887] changes in the error message

---
 src/app/services/app-interceptor.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/services/app-interceptor.service.ts b/src/app/services/app-interceptor.service.ts
index c68b19328..a6d3ba788 100644
--- a/src/app/services/app-interceptor.service.ts
+++ b/src/app/services/app-interceptor.service.ts
@@ -74,7 +74,7 @@ export class AppInterceptorService implements HttpInterceptor {
                 break
             }
           }
-          return throwError('error')
+          return throwError(error || 'error')
         })
       )
     }

From 51fd1d7280c99518754a99e8b67551e3cb904044 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Wed, 11 Oct 2023 21:50:02 +0530
Subject: [PATCH 252/887] Fix learner count in batch details

---
 .../components/batch-details/batch-details.component.ts   | 8 ++++++--
 .../services/blended-approval.service.ts                  | 5 +++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index d730dab7d..ceb07dcdc 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -123,9 +123,10 @@ export class BatchDetailsComponent implements OnInit {
       if (res && res.length > 0) {
         this.approvedUsers = res
         this.clonedApprovedUsers = res
-        this.learnerCount = res.length
+        // this.learnerCount = res.length
       }
     })
+    this.getAllLearner()
   }
 
   getNewRequestsList() {
@@ -146,8 +147,11 @@ export class BatchDetailsComponent implements OnInit {
         this.clonedNewUsers = res.result.data
       }
     })
+    this.getAllLearner()
+  }
 
-    this.bpService.getLearners(this.batchData.batchId, this.userProfile.channel).subscribe((res: any) => {
+  getAllLearner() {
+    this.bpService.getLearnersWithoutOrg(this.batchData.batchId).subscribe((res: any) => {
       if (res && res.length > 0) {
         this.learnerCount = res.length
       }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
index 753586413..b6bd2b19c 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
@@ -34,6 +34,11 @@ export class BlendedApporvalService {
     return this.http.get<any>(url)
   }
 
+  getLearnersWithoutOrg(batchId: any): Observable<any> {
+    const url = `${API_END_POINTS.GET_LERANERS}/${batchId}`
+    return this.http.get<any>(url)
+  }
+
   getRequests(req: any) {
     return this.http.post<any>(`${API_END_POINTS.GET_REQUESTS}`, req)
   }

From 8f99e07760a51e222fcc7c3d2faa64b59c558439 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Fri, 13 Oct 2023 00:30:26 +0530
Subject: [PATCH 253/887] pagination implemented

---
 .../nominate-users-dialog.component.ts        |   8 +-
 .../users-view/users-view.component.html      |  22 +-
 .../routes/users-view/users-view.component.ts | 274 ++++++++++++------
 .../routes/users/services/users.service.ts    |  41 +--
 4 files changed, 218 insertions(+), 127 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
index abbee1226..24fd9fd05 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
@@ -33,9 +33,9 @@ export class NominateUsersDialogComponent implements OnInit {
   ]
 
   constructor(public dialogRef: MatDialogRef<NominateUsersDialogComponent>,
-    private usersService: UsersService,
-    @Inject(MAT_DIALOG_DATA) public data: any, private bpService: BlendedApporvalService,
-    private snackBar: MatSnackBar) { }
+              private usersService: UsersService,
+              @Inject(MAT_DIALOG_DATA) public data: any, private bpService: BlendedApporvalService,
+              private snackBar: MatSnackBar) { }
 
   ngOnInit() {
     const filterObj = {
@@ -124,7 +124,7 @@ export class NominateUsersDialogComponent implements OnInit {
           }
         }
         this.dialogRef.close('done')
-      }, (err: { error: any }) => {
+      },                                                        (err: { error: any }) => {
         // tslint:disable-next-line:no-console
         console.log(err)
         this.openSnackbar('some thing went wrong, Please try after sometime.')
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index 34b3ca2ed..af2b13a27 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -34,22 +34,24 @@
         </div>
       </div>
       <ng-container *ngIf="usersData && currentFilter !== 'upload'">
-        <ws-widget-org-user-table [userId]="currentUser" [tableData]="tabledata" [data]="dataForTable" [isUpload]=false
+        <!-- <ws-widget-user-table-v2 [userId]="currentUser" [tableData]="tabledata" [data]="dataForTable" [isUpload]=false
           [isCreate]=true (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuActions($event)"
-          (searchByEnterKey)="onEnterkySearch($event)" [showEditOnCondition]=true>
-        </ws-widget-org-user-table>
-        <div style="float: right;display: flex;">
+          (searchByEnterKey)="onEnterkySearch($event)" (pageChangeClick)="onPaginateChange($event)"
+          [showEditOnCondition]=true [totalRecords]="userDataTotalCount">
+        </ws-widget-user-table-v2> -->
+        <ws-widget-org-user-table-v2 [userId]="currentUser" [tableData]="tabledata" [data]="dataForTable"
+          [isUpload]=false [isCreate]=true (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuActions($event)"
+          (searchByEnterKey)="onEnterkySearch($event)" (pageChangeClick)="onPaginateChange($event)"
+          [showEditOnCondition]=true [totalRecords]="userDataTotalCount">
+        </ws-widget-org-user-table-v2>
+
+        <!-- <div style="float: right;display: flex;">
           <button class="mr-5 move-button" matTooltip="display prev 250 data"
             [disabled]="(currentOffset > 0)? false :true" (click)="getAllUsers(250,'prev')">Prev </button>
           <button class="move-button" matTooltip=" display next 250 data"
             [disabled]="(currentOffset >= userDataTotalCount)? true :false" (click)="getAllUsers(250,'next')">Next
           </button>
-        </div>
-
-        <!-- <ws-widget-org-user-table [tableData]="tabledata" [data]="dataForTable" [isUpload]=true [isCreate]=true
-          (eOnButtonClick)="clickHandler($event)" (eOnRowClick)="onRoleClick($event)" (actionsClick)="menuActions($event)"
-          (searchByEnterKey)="onEnterkySearch($event)">
-        </ws-widget-org-user-table> -->
+        </div> -->
       </ng-container>
       <ng-container *ngIf="currentFilter === 'upload'">
         <ws-app-users-upload></ws-app-users-upload>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 2351e93f7..fa5511f19 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -8,7 +8,7 @@ import _ from 'lodash'
 /* tslint:enable */
 import { environment } from 'src/environments/environment'
 import { ITableData } from '@sunbird-cb/collection/lib/ui-org-table/interface/interfaces'
-import { MatSnackBar } from '@angular/material'
+import { MatSnackBar, PageEvent } from '@angular/material'
 import { EventService } from '@sunbird-cb/utils'
 import { NsContent } from '@sunbird-cb/collection'
 import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
@@ -63,7 +63,10 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     needUserMenus: true,
   }
   currentOffset = 0
-  userDataTotalCount = 0
+  userDataTotalCount?: number | 0
+  limit = 20
+  pageIndex = 0
+  searchQuery = ''
   constructor(
     public dialog: MatDialog,
     private route: ActivatedRoute,
@@ -88,8 +91,6 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     // this.filterData()
   }
 
-  // decideAPICall() {
-  // }
   ngOnDestroy() {
     // if (this.tabs) {
     //   this.tabs.unsubscribe()
@@ -97,15 +98,20 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   }
   ngOnInit() {
     this.currentFilter = this.route.snapshot.params['tab'] || 'active'
+    this.searchQuery = ''
     if (this.configSvc.unMappedUser && this.configSvc.unMappedUser.roles) {
       this.isMdoAdmin = this.configSvc.unMappedUser.roles.includes('MDO_ADMIN')
     }
-    this.getAllUsers()
+    this.filterData('')
   }
 
   filter(filter: string) {
     this.currentFilter = filter
-
+    this.pageIndex = 0
+    this.currentOffset = 0
+    this.limit = 20
+    this.searchQuery = ''
+    this.filterData(this.searchQuery)
   }
 
   public tabTelemetry(label: string, index: number) {
@@ -132,59 +138,124 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     }
 
   }
-  filterData() {
-    this.activeUsersData = this.activeUsers
-    this.inactiveUsersData = this.inActiveUsers
+  filterData(query: string) {
+    if (this.currentFilter === 'active') {
+      this.activeUsers(query)
+    } else if (this.currentFilter === 'inactive') {
+      this.inActiveUsers(query)
+    }
   }
-  get activeUsers() {
+
+  activeUsers(query: string) {
     this.loaderService.changeLoad.next(true)
+    const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
     const activeUsersData: any[] = []
-    if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
-      _.filter(this.usersData.content, { isDeleted: false }).forEach((user: any) => {
-        // tslint:disable-next-line
-        const org = { roles: _.get(_.first(_.filter(user.organisations, { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') }
-        activeUsersData.push({
-          fullname: user ? `${user.firstName}` : null,
-          // fullname: user ? `${user.firstName} ${user.lastName}` : null,
-          email: user.personalDetails && user.personalDetails.primaryEmail ?
-            this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
-          role: org.roles || [],
-          userId: user.id,
-          active: !user.isDeleted,
-          blocked: user.blocked,
-          roles: _.join(_.map((org.roles || []), i => `<li>${i}</li>`), ''),
-          orgId: user.rootOrgId,
-          orgName: user.rootOrgName,
-          allowEditUser: this.showEditUser(org.roles),
+    const status = this.currentFilter === 'active' ? 1 : 0
+    this.currentOffset = this.limit * ((this.pageIndex + 1) - 1)
+    this.usersService.getAllKongUsers(rootOrgId, status, this.limit, this.currentOffset, query).subscribe(data => {
+      this.userDataTotalCount = data.result.response.count
+      this.usersData = data.result.response
+      if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
+        _.filter(this.usersData.content, { isDeleted: false }).forEach((user: any) => {
+          // tslint:disable-next-line
+          const org = { roles: _.get(_.first(_.filter(user.organisations, { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') }
+          activeUsersData.push({
+            fullname: user ? `${user.firstName}` : null,
+            // fullname: user ? `${user.firstName} ${user.lastName}` : null,
+            email: user.personalDetails && user.personalDetails.primaryEmail ?
+              this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
+            role: org.roles || [],
+            userId: user.id,
+            active: !user.isDeleted,
+            blocked: user.blocked,
+            roles: _.join(_.map((org.roles || []), i => `<li>${i}</li>`), ''),
+            orgId: user.rootOrgId,
+            orgName: user.rootOrgName,
+            allowEditUser: this.showEditUser(org.roles),
+          })
         })
-      })
-    }
-    return activeUsersData
+
+      }
+      this.activeUsersData = activeUsersData
+      return this.activeUsersData
+    })
+    // if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
+    //   _.filter(this.usersData.content, { isDeleted: false }).forEach((user: any) => {
+    //     // tslint:disable-next-line
+    //     const org = { roles: _.get(_.first(_.filter(user.organisations,
+    //   { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') }
+    //     activeUsersData.push({
+    //       fullname: user ? `${user.firstName}` : null,
+    //       // fullname: user ? `${user.firstName} ${user.lastName}` : null,
+    //       email: user.personalDetails && user.personalDetails.primaryEmail ?
+    //         this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
+    //       role: org.roles || [],
+    //       userId: user.id,
+    //       active: !user.isDeleted,
+    //       blocked: user.blocked,
+    //       roles: _.join(_.map((org.roles || []), i => `<li>${i}</li>`), ''),
+    //       orgId: user.rootOrgId,
+    //       orgName: user.rootOrgName,
+    //       allowEditUser: this.showEditUser(org.roles),
+    //     })
+    //   })
+    // }
   }
-  get inActiveUsers() {
+  inActiveUsers(query: string) {
     this.loaderService.changeLoad.next(true)
+    const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
     const inactiveUsersData: any[] = []
-    if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
-      _.filter(this.usersData.content, { isDeleted: true }).forEach((user: any) => {
-        // tslint:disable-next-line
-        const org = { roles: _.get(_.first(_.filter(user.organisations, { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') || [] }
-        inactiveUsersData.push({
-          fullname: user ? `${user.firstName} ` : null,
-          // fullname: user ? `${user.firstName} ${user.lastName}` : null,
-          email: user.personalDetails && user.personalDetails.primaryEmail ?
-            this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
-          role: org.roles || [],
-          userId: user.id,
-          active: !user.isDeleted,
-          blocked: user.blocked,
-          roles: _.join(_.map((org.roles || []), i => `<li>${i}</li>`), ''),
-          orgId: user.rootOrgId,
-          orgName: user.rootOrgName,
-          allowEditUser: this.showEditUser(org.roles),
-        })
+    const status = this.currentFilter === 'active' ? 1 : 0
+    this.currentOffset = this.limit * ((this.pageIndex + 1) - 1)
+    this.usersService.getAllKongUsers(rootOrgId, status, this.limit, this.currentOffset, query).subscribe(
+      data => {
+        this.userDataTotalCount = data.result.response.count
+        this.usersData = data.result.response
+        if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
+          _.filter(this.usersData.content, { isDeleted: true }).forEach((user: any) => {
+            // tslint:disable-next-line
+            const org = { roles: _.get(_.first(_.filter(user.organisations, { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') }
+            inactiveUsersData.push({
+              fullname: user ? `${user.firstName}` : null,
+              // fullname: user ? `${user.firstName} ${user.lastName}` : null,
+              email: user.personalDetails && user.personalDetails.primaryEmail ?
+                this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
+              role: org.roles || [],
+              userId: user.id,
+              active: !user.isDeleted,
+              blocked: user.blocked,
+              roles: _.join(_.map((org.roles || []), i => `<li>${i}</li>`), ''),
+              orgId: user.rootOrgId,
+              orgName: user.rootOrgName,
+              allowEditUser: this.showEditUser(org.roles),
+            })
+          })
+        }
+        this.inactiveUsersData = inactiveUsersData
+        return this.inactiveUsersData
       })
-    }
-    return inactiveUsersData
+    // if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
+    //   _.filter(this.usersData.content, { isDeleted: true }).forEach((user: any) => {
+    //     // tslint:disable-next-line
+    //     const org = { roles: _.get(_.first(_.filter(user.organisations,
+    //{ organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') || [] }
+    //     inactiveUsersData.push({
+    //       fullname: user ? `${user.firstName} ` : null,
+    //       // fullname: user ? `${user.firstName} ${user.lastName}` : null,
+    //       email: user.personalDetails && user.personalDetails.primaryEmail ?
+    //         this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
+    //       role: org.roles || [],
+    //       userId: user.id,
+    //       active: !user.isDeleted,
+    //       blocked: user.blocked,
+    //       roles: _.join(_.map((org.roles || []), i => `<li>${i}</li>`), ''),
+    //       orgId: user.rootOrgId,
+    //       orgName: user.rootOrgName,
+    //       allowEditUser: this.showEditUser(org.roles),
+    //     })
+    //   })
+    // }
+    // return inactiveUsersData
   }
 
   showEditUser(roles: any): boolean {
@@ -217,40 +288,41 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     return blockedUsersData
   }
 
-  getAllUsers(offset?: number, functionality?: string) {
-    this.loaderService.changeLoad.next(true)
-    const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
-    // const filterObj = {
-    //   request: {
-    //     query: '',
-    //     filters: {
-    //       rootOrgId: this.configSvc,
-    //     },
-    //   },
-    // }
-    // this.usersService.getAllUsers(filterObj).subscribe(data => {
-    //   this.usersData = data
-    //   this.filterData()
-    // })
-
-    if (functionality !== undefined && offset !== undefined) {
-      if (functionality === 'next') {
-        this.currentOffset = this.currentOffset + offset
-      } else { this.currentOffset = this.currentOffset - offset }
-
-      this.usersService.getAllKongUsers(rootOrgId, this.currentOffset).subscribe(data => {
-        this.userDataTotalCount = data.result.response.count
-        this.usersData = data.result.response
-        this.filterData()
-      })
-    } else {
-      this.usersService.getAllKongUsers(rootOrgId).subscribe(data => {
-        this.userDataTotalCount = data.result.response.count
-        this.usersData = data.result.response
-        this.filterData()
-      })
-    }
-  }
+  // getAllUsers(offset?: number, functionality?: string) {
+  //   this.loaderService.changeLoad.next(true)
+  //   const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
+  //   // const filterObj = {
+  //   //   request: {
+  //   //     query: '',
+  //   //     filters: {
+  //   //       rootOrgId: this.configSvc,
+  //   //     },
+  //   //   },
+  //   // }
+  //   // this.usersService.getAllUsers(filterObj).subscribe(data => {
+  //   //   this.usersData = data
+  //   //   this.filterData()
+  //   // })
+  //   let status: number
+  //   if (functionality !== undefined && offset !== undefined) {
+  //     if (functionality === 'next') {
+  //       this.currentOffset = this.currentOffset + offset
+  //     } else { this.currentOffset = this.currentOffset - offset }
+  //     status = this.currentFilter == 'active' ? 1 : 0
+  //     this.usersService.getAllKongUsers(rootOrgId, status, this.currentOffset,).subscribe(data => {
+  //       this.userDataTotalCount = data.result.response.count
+  //       this.usersData = data.result.response
+  //       this.filterData('')
+  //     })
+  //   } else {
+  //     status = this.currentFilter == 'active' ? 1 : 0
+  //     this.usersService.getAllKongUsers(rootOrgId, status).subscribe(data => {
+  //       this.userDataTotalCount = data.result.response.count
+  //       this.usersData = data.result.response
+  //       this.filterData('')
+  //     })
+  //   }
+  // }
 
   clickHandler(event: any) {
     // tslint:disable-next-line: no-console
@@ -323,7 +395,8 @@ export class UsersViewComponent implements OnInit, OnDestroy {
         _.set(user, 'roles', _.map(_.get($event.row, 'role'), i => i))
         this.usersService.blockUser(user).subscribe(response => {
           if (response) {
-            this.getAllUsers()
+            // this.getAllUsers()
+            this.filterData('')
             this.snackBar.open(response.result.response)
           }
         })
@@ -333,7 +406,8 @@ export class UsersViewComponent implements OnInit, OnDestroy {
         _.set(user, 'roles', _.map(_.get($event.row, 'role'), i => i))
         this.usersService.blockUser(user).subscribe(response => {
           if (response) {
-            this.getAllUsers()
+            // this.getAllUsers()
+            this.filterData('')
             this.snackBar.open('Updated successfully !')
           }
         })
@@ -345,7 +419,9 @@ export class UsersViewComponent implements OnInit, OnDestroy {
         this.usersService.newBlockUser(loggedInUserId, user.request.userId).subscribe(response => {
           if (_.toUpper(response.params.status) === 'SUCCESS') {
             setTimeout(() => {
-              this.getAllUsers()
+              // this.getAllUsers()
+              // this.activeUsers('')
+              this.filterData('')
 
               this.snackBar.open('Deactivated successfully!')
             },
@@ -375,7 +451,8 @@ export class UsersViewComponent implements OnInit, OnDestroy {
         this.usersService.newUnBlockUser(loggedInUserId, user.request.userId).subscribe(response => {
           if (_.toUpper(response.params.status) === 'SUCCESS') {
             setTimeout(() => {
-              this.getAllUsers()
+              // this.getAllUsers()
+              this.filterData('')
               this.snackBar.open('Activated successfully!')
               // tslint:disable-next-line: align
             }, 1500)
@@ -393,11 +470,20 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   }
 
   onEnterkySearch(enterValue: any) {
-    const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
+    // const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
+    // this.usersService.searchUserByenter(enterValue, rootOrgId).subscribe(data => {
+    //   this.usersData = data.result.response
+    //   this.filterData(enterValue)
+    // })
+    this.searchQuery = enterValue
+    this.currentOffset = 0
+    this.pageIndex = 0
+    this.filterData(this.searchQuery)
+  }
 
-    this.usersService.searchUserByenter(enterValue, rootOrgId).subscribe(data => {
-      this.usersData = data.result.response
-      this.filterData()
-    })
+  onPaginateChange(event: PageEvent) {
+    this.pageIndex = event.pageIndex
+    this.limit = event.pageSize
+    this.filterData(this.searchQuery)
   }
 }
diff --git a/project/ws/app/src/lib/routes/users/services/users.service.ts b/project/ws/app/src/lib/routes/users/services/users.service.ts
index 03666899e..b035591ae 100644
--- a/project/ws/app/src/lib/routes/users/services/users.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/users.service.ts
@@ -108,28 +108,31 @@ export class UsersService {
     return this.http.post<any>(`${API_END_POINTS.NEW_USER_UN_BLOCK_API}`, org)
   }
 
-  getAllKongUsers(depId: string, offsetNum?: number): Observable<any> {
+  getAllKongUsers(depId: string, userStatus: number, pageLimit: number = 20, offsetNum: number = 0, searchText?: string): Observable<any> {
     let reqBody
-    if (offsetNum !== undefined) {
-      reqBody = {
-        request: {
-          filters: {
-            rootOrgId: depId,
-          },
-          limit: 250,
-          offset: offsetNum,
-        },
-      }
-    } else {
-      reqBody = {
-        request: {
-          filters: {
-            rootOrgId: depId,
-          },
+    // if (offsetNum !== undefined) {
+    reqBody = {
+      request: {
+        filters: {
+          rootOrgId: depId,
+          status: userStatus,
         },
-      }
+        limit: pageLimit,
+        offset: offsetNum,
+        query: searchText,
+      },
     }
-
+    // }
+    // else {
+    //   reqBody = {
+    //     request: {
+    //       filters: {
+    //         rootOrgId: depId,
+    //         status: status
+    //       },
+    //     },
+    //   }
+    // }
     return this.http.post<any>(`${API_END_POINTS.GET_ALL_USERS}`, reqBody)
   }
   // getAllRoleUsers(depId: string, role: {}): Observable<any> {

From 4c0a5d73d4f93ebf2c6ffedcab9309d8c8e10062 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Fri, 13 Oct 2023 10:26:00 +0530
Subject: [PATCH 254/887] lint fix

---
 .../home/routes/users-view/users-view.component.ts     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index fa5511f19..24aab5ca5 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -67,6 +67,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   limit = 20
   pageIndex = 0
   searchQuery = ''
+  rootOrgId: any
   constructor(
     public dialog: MatDialog,
     private route: ActivatedRoute,
@@ -97,6 +98,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     // }
   }
   ngOnInit() {
+    this.rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
     this.currentFilter = this.route.snapshot.params['tab'] || 'active'
     this.searchQuery = ''
     if (this.configSvc.unMappedUser && this.configSvc.unMappedUser.roles) {
@@ -148,11 +150,10 @@ export class UsersViewComponent implements OnInit, OnDestroy {
 
   activeUsers(query: string) {
     this.loaderService.changeLoad.next(true)
-    const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
     const activeUsersData: any[] = []
     const status = this.currentFilter === 'active' ? 1 : 0
     this.currentOffset = this.limit * ((this.pageIndex + 1) - 1)
-    this.usersService.getAllKongUsers(rootOrgId, status, this.limit, this.currentOffset, query).subscribe(data => {
+    this.usersService.getAllKongUsers(this.rootOrgId, status, this.limit, this.currentOffset, query).subscribe(data => {
       this.userDataTotalCount = data.result.response.count
       this.usersData = data.result.response
       if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
@@ -203,11 +204,10 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   }
   inActiveUsers(query: string) {
     this.loaderService.changeLoad.next(true)
-    const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
     const inactiveUsersData: any[] = []
     const status = this.currentFilter === 'active' ? 1 : 0
     this.currentOffset = this.limit * ((this.pageIndex + 1) - 1)
-    this.usersService.getAllKongUsers(rootOrgId, status, this.limit, this.currentOffset, query).subscribe(
+    this.usersService.getAllKongUsers(this.rootOrgId, status, this.limit, this.currentOffset, query).subscribe(
       data => {
         this.userDataTotalCount = data.result.response.count
         this.usersData = data.result.response
@@ -238,7 +238,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     //   _.filter(this.usersData.content, { isDeleted: true }).forEach((user: any) => {
     //     // tslint:disable-next-line
     //     const org = { roles: _.get(_.first(_.filter(user.organisations,
-    //{ organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') || [] }
+    // { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') || [] }
     //     inactiveUsersData.push({
     //       fullname: user ? `${user.firstName} ` : null,
     //       // fullname: user ? `${user.firstName} ${user.lastName}` : null,

From a6a260e047f5d919cf7899f65f3389c252dff047 Mon Sep 17 00:00:00 2001
From: garima468 <115453503+garima468@users.noreply.github.com>
Date: Fri, 13 Oct 2023 10:46:49 +0530
Subject: [PATCH 255/887] Revert "Implemented server side pagination for User
 list"

---
 .../users-view/users-view.component.html      |  22 +-
 .../routes/users-view/users-view.component.ts | 274 ++++++------------
 .../routes/users/services/users.service.ts    |  41 ++-
 3 files changed, 123 insertions(+), 214 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index af2b13a27..34b3ca2ed 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -34,24 +34,22 @@
         </div>
       </div>
       <ng-container *ngIf="usersData && currentFilter !== 'upload'">
-        <!-- <ws-widget-user-table-v2 [userId]="currentUser" [tableData]="tabledata" [data]="dataForTable" [isUpload]=false
+        <ws-widget-org-user-table [userId]="currentUser" [tableData]="tabledata" [data]="dataForTable" [isUpload]=false
           [isCreate]=true (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuActions($event)"
-          (searchByEnterKey)="onEnterkySearch($event)" (pageChangeClick)="onPaginateChange($event)"
-          [showEditOnCondition]=true [totalRecords]="userDataTotalCount">
-        </ws-widget-user-table-v2> -->
-        <ws-widget-org-user-table-v2 [userId]="currentUser" [tableData]="tabledata" [data]="dataForTable"
-          [isUpload]=false [isCreate]=true (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuActions($event)"
-          (searchByEnterKey)="onEnterkySearch($event)" (pageChangeClick)="onPaginateChange($event)"
-          [showEditOnCondition]=true [totalRecords]="userDataTotalCount">
-        </ws-widget-org-user-table-v2>
-
-        <!-- <div style="float: right;display: flex;">
+          (searchByEnterKey)="onEnterkySearch($event)" [showEditOnCondition]=true>
+        </ws-widget-org-user-table>
+        <div style="float: right;display: flex;">
           <button class="mr-5 move-button" matTooltip="display prev 250 data"
             [disabled]="(currentOffset > 0)? false :true" (click)="getAllUsers(250,'prev')">Prev </button>
           <button class="move-button" matTooltip=" display next 250 data"
             [disabled]="(currentOffset >= userDataTotalCount)? true :false" (click)="getAllUsers(250,'next')">Next
           </button>
-        </div> -->
+        </div>
+
+        <!-- <ws-widget-org-user-table [tableData]="tabledata" [data]="dataForTable" [isUpload]=true [isCreate]=true
+          (eOnButtonClick)="clickHandler($event)" (eOnRowClick)="onRoleClick($event)" (actionsClick)="menuActions($event)"
+          (searchByEnterKey)="onEnterkySearch($event)">
+        </ws-widget-org-user-table> -->
       </ng-container>
       <ng-container *ngIf="currentFilter === 'upload'">
         <ws-app-users-upload></ws-app-users-upload>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 24aab5ca5..2351e93f7 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -8,7 +8,7 @@ import _ from 'lodash'
 /* tslint:enable */
 import { environment } from 'src/environments/environment'
 import { ITableData } from '@sunbird-cb/collection/lib/ui-org-table/interface/interfaces'
-import { MatSnackBar, PageEvent } from '@angular/material'
+import { MatSnackBar } from '@angular/material'
 import { EventService } from '@sunbird-cb/utils'
 import { NsContent } from '@sunbird-cb/collection'
 import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
@@ -63,11 +63,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     needUserMenus: true,
   }
   currentOffset = 0
-  userDataTotalCount?: number | 0
-  limit = 20
-  pageIndex = 0
-  searchQuery = ''
-  rootOrgId: any
+  userDataTotalCount = 0
   constructor(
     public dialog: MatDialog,
     private route: ActivatedRoute,
@@ -92,28 +88,24 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     // this.filterData()
   }
 
+  // decideAPICall() {
+  // }
   ngOnDestroy() {
     // if (this.tabs) {
     //   this.tabs.unsubscribe()
     // }
   }
   ngOnInit() {
-    this.rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
     this.currentFilter = this.route.snapshot.params['tab'] || 'active'
-    this.searchQuery = ''
     if (this.configSvc.unMappedUser && this.configSvc.unMappedUser.roles) {
       this.isMdoAdmin = this.configSvc.unMappedUser.roles.includes('MDO_ADMIN')
     }
-    this.filterData('')
+    this.getAllUsers()
   }
 
   filter(filter: string) {
     this.currentFilter = filter
-    this.pageIndex = 0
-    this.currentOffset = 0
-    this.limit = 20
-    this.searchQuery = ''
-    this.filterData(this.searchQuery)
+
   }
 
   public tabTelemetry(label: string, index: number) {
@@ -140,122 +132,59 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     }
 
   }
-  filterData(query: string) {
-    if (this.currentFilter === 'active') {
-      this.activeUsers(query)
-    } else if (this.currentFilter === 'inactive') {
-      this.inActiveUsers(query)
-    }
+  filterData() {
+    this.activeUsersData = this.activeUsers
+    this.inactiveUsersData = this.inActiveUsers
   }
-
-  activeUsers(query: string) {
+  get activeUsers() {
     this.loaderService.changeLoad.next(true)
     const activeUsersData: any[] = []
-    const status = this.currentFilter === 'active' ? 1 : 0
-    this.currentOffset = this.limit * ((this.pageIndex + 1) - 1)
-    this.usersService.getAllKongUsers(this.rootOrgId, status, this.limit, this.currentOffset, query).subscribe(data => {
-      this.userDataTotalCount = data.result.response.count
-      this.usersData = data.result.response
-      if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
-        _.filter(this.usersData.content, { isDeleted: false }).forEach((user: any) => {
-          // tslint:disable-next-line
-          const org = { roles: _.get(_.first(_.filter(user.organisations, { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') }
-          activeUsersData.push({
-            fullname: user ? `${user.firstName}` : null,
-            // fullname: user ? `${user.firstName} ${user.lastName}` : null,
-            email: user.personalDetails && user.personalDetails.primaryEmail ?
-              this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
-            role: org.roles || [],
-            userId: user.id,
-            active: !user.isDeleted,
-            blocked: user.blocked,
-            roles: _.join(_.map((org.roles || []), i => `<li>${i}</li>`), ''),
-            orgId: user.rootOrgId,
-            orgName: user.rootOrgName,
-            allowEditUser: this.showEditUser(org.roles),
-          })
+    if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
+      _.filter(this.usersData.content, { isDeleted: false }).forEach((user: any) => {
+        // tslint:disable-next-line
+        const org = { roles: _.get(_.first(_.filter(user.organisations, { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') }
+        activeUsersData.push({
+          fullname: user ? `${user.firstName}` : null,
+          // fullname: user ? `${user.firstName} ${user.lastName}` : null,
+          email: user.personalDetails && user.personalDetails.primaryEmail ?
+            this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
+          role: org.roles || [],
+          userId: user.id,
+          active: !user.isDeleted,
+          blocked: user.blocked,
+          roles: _.join(_.map((org.roles || []), i => `<li>${i}</li>`), ''),
+          orgId: user.rootOrgId,
+          orgName: user.rootOrgName,
+          allowEditUser: this.showEditUser(org.roles),
         })
-
-      }
-      this.activeUsersData = activeUsersData
-      return this.activeUsersData
-    })
-    // if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
-    //   _.filter(this.usersData.content, { isDeleted: false }).forEach((user: any) => {
-    //     // tslint:disable-next-line
-    //     const org = { roles: _.get(_.first(_.filter(user.organisations,
-    //   { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') }
-    //     activeUsersData.push({
-    //       fullname: user ? `${user.firstName}` : null,
-    //       // fullname: user ? `${user.firstName} ${user.lastName}` : null,
-    //       email: user.personalDetails && user.personalDetails.primaryEmail ?
-    //         this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
-    //       role: org.roles || [],
-    //       userId: user.id,
-    //       active: !user.isDeleted,
-    //       blocked: user.blocked,
-    //       roles: _.join(_.map((org.roles || []), i => `<li>${i}</li>`), ''),
-    //       orgId: user.rootOrgId,
-    //       orgName: user.rootOrgName,
-    //       allowEditUser: this.showEditUser(org.roles),
-    //     })
-    //   })
-    // }
+      })
+    }
+    return activeUsersData
   }
-  inActiveUsers(query: string) {
+  get inActiveUsers() {
     this.loaderService.changeLoad.next(true)
     const inactiveUsersData: any[] = []
-    const status = this.currentFilter === 'active' ? 1 : 0
-    this.currentOffset = this.limit * ((this.pageIndex + 1) - 1)
-    this.usersService.getAllKongUsers(this.rootOrgId, status, this.limit, this.currentOffset, query).subscribe(
-      data => {
-        this.userDataTotalCount = data.result.response.count
-        this.usersData = data.result.response
-        if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
-          _.filter(this.usersData.content, { isDeleted: true }).forEach((user: any) => {
-            // tslint:disable-next-line
-            const org = { roles: _.get(_.first(_.filter(user.organisations, { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') }
-            inactiveUsersData.push({
-              fullname: user ? `${user.firstName}` : null,
-              // fullname: user ? `${user.firstName} ${user.lastName}` : null,
-              email: user.personalDetails && user.personalDetails.primaryEmail ?
-                this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
-              role: org.roles || [],
-              userId: user.id,
-              active: !user.isDeleted,
-              blocked: user.blocked,
-              roles: _.join(_.map((org.roles || []), i => `<li>${i}</li>`), ''),
-              orgId: user.rootOrgId,
-              orgName: user.rootOrgName,
-              allowEditUser: this.showEditUser(org.roles),
-            })
-          })
-        }
-        this.inactiveUsersData = inactiveUsersData
-        return this.inactiveUsersData
+    if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
+      _.filter(this.usersData.content, { isDeleted: true }).forEach((user: any) => {
+        // tslint:disable-next-line
+        const org = { roles: _.get(_.first(_.filter(user.organisations, { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') || [] }
+        inactiveUsersData.push({
+          fullname: user ? `${user.firstName} ` : null,
+          // fullname: user ? `${user.firstName} ${user.lastName}` : null,
+          email: user.personalDetails && user.personalDetails.primaryEmail ?
+            this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
+          role: org.roles || [],
+          userId: user.id,
+          active: !user.isDeleted,
+          blocked: user.blocked,
+          roles: _.join(_.map((org.roles || []), i => `<li>${i}</li>`), ''),
+          orgId: user.rootOrgId,
+          orgName: user.rootOrgName,
+          allowEditUser: this.showEditUser(org.roles),
+        })
       })
-    // if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
-    //   _.filter(this.usersData.content, { isDeleted: true }).forEach((user: any) => {
-    //     // tslint:disable-next-line
-    //     const org = { roles: _.get(_.first(_.filter(user.organisations,
-    // { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') || [] }
-    //     inactiveUsersData.push({
-    //       fullname: user ? `${user.firstName} ` : null,
-    //       // fullname: user ? `${user.firstName} ${user.lastName}` : null,
-    //       email: user.personalDetails && user.personalDetails.primaryEmail ?
-    //         this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
-    //       role: org.roles || [],
-    //       userId: user.id,
-    //       active: !user.isDeleted,
-    //       blocked: user.blocked,
-    //       roles: _.join(_.map((org.roles || []), i => `<li>${i}</li>`), ''),
-    //       orgId: user.rootOrgId,
-    //       orgName: user.rootOrgName,
-    //       allowEditUser: this.showEditUser(org.roles),
-    //     })
-    //   })
-    // }
-    // return inactiveUsersData
+    }
+    return inactiveUsersData
   }
 
   showEditUser(roles: any): boolean {
@@ -288,41 +217,40 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     return blockedUsersData
   }
 
-  // getAllUsers(offset?: number, functionality?: string) {
-  //   this.loaderService.changeLoad.next(true)
-  //   const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
-  //   // const filterObj = {
-  //   //   request: {
-  //   //     query: '',
-  //   //     filters: {
-  //   //       rootOrgId: this.configSvc,
-  //   //     },
-  //   //   },
-  //   // }
-  //   // this.usersService.getAllUsers(filterObj).subscribe(data => {
-  //   //   this.usersData = data
-  //   //   this.filterData()
-  //   // })
-  //   let status: number
-  //   if (functionality !== undefined && offset !== undefined) {
-  //     if (functionality === 'next') {
-  //       this.currentOffset = this.currentOffset + offset
-  //     } else { this.currentOffset = this.currentOffset - offset }
-  //     status = this.currentFilter == 'active' ? 1 : 0
-  //     this.usersService.getAllKongUsers(rootOrgId, status, this.currentOffset,).subscribe(data => {
-  //       this.userDataTotalCount = data.result.response.count
-  //       this.usersData = data.result.response
-  //       this.filterData('')
-  //     })
-  //   } else {
-  //     status = this.currentFilter == 'active' ? 1 : 0
-  //     this.usersService.getAllKongUsers(rootOrgId, status).subscribe(data => {
-  //       this.userDataTotalCount = data.result.response.count
-  //       this.usersData = data.result.response
-  //       this.filterData('')
-  //     })
-  //   }
-  // }
+  getAllUsers(offset?: number, functionality?: string) {
+    this.loaderService.changeLoad.next(true)
+    const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
+    // const filterObj = {
+    //   request: {
+    //     query: '',
+    //     filters: {
+    //       rootOrgId: this.configSvc,
+    //     },
+    //   },
+    // }
+    // this.usersService.getAllUsers(filterObj).subscribe(data => {
+    //   this.usersData = data
+    //   this.filterData()
+    // })
+
+    if (functionality !== undefined && offset !== undefined) {
+      if (functionality === 'next') {
+        this.currentOffset = this.currentOffset + offset
+      } else { this.currentOffset = this.currentOffset - offset }
+
+      this.usersService.getAllKongUsers(rootOrgId, this.currentOffset).subscribe(data => {
+        this.userDataTotalCount = data.result.response.count
+        this.usersData = data.result.response
+        this.filterData()
+      })
+    } else {
+      this.usersService.getAllKongUsers(rootOrgId).subscribe(data => {
+        this.userDataTotalCount = data.result.response.count
+        this.usersData = data.result.response
+        this.filterData()
+      })
+    }
+  }
 
   clickHandler(event: any) {
     // tslint:disable-next-line: no-console
@@ -395,8 +323,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
         _.set(user, 'roles', _.map(_.get($event.row, 'role'), i => i))
         this.usersService.blockUser(user).subscribe(response => {
           if (response) {
-            // this.getAllUsers()
-            this.filterData('')
+            this.getAllUsers()
             this.snackBar.open(response.result.response)
           }
         })
@@ -406,8 +333,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
         _.set(user, 'roles', _.map(_.get($event.row, 'role'), i => i))
         this.usersService.blockUser(user).subscribe(response => {
           if (response) {
-            // this.getAllUsers()
-            this.filterData('')
+            this.getAllUsers()
             this.snackBar.open('Updated successfully !')
           }
         })
@@ -419,9 +345,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
         this.usersService.newBlockUser(loggedInUserId, user.request.userId).subscribe(response => {
           if (_.toUpper(response.params.status) === 'SUCCESS') {
             setTimeout(() => {
-              // this.getAllUsers()
-              // this.activeUsers('')
-              this.filterData('')
+              this.getAllUsers()
 
               this.snackBar.open('Deactivated successfully!')
             },
@@ -451,8 +375,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
         this.usersService.newUnBlockUser(loggedInUserId, user.request.userId).subscribe(response => {
           if (_.toUpper(response.params.status) === 'SUCCESS') {
             setTimeout(() => {
-              // this.getAllUsers()
-              this.filterData('')
+              this.getAllUsers()
               this.snackBar.open('Activated successfully!')
               // tslint:disable-next-line: align
             }, 1500)
@@ -470,20 +393,11 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   }
 
   onEnterkySearch(enterValue: any) {
-    // const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
-    // this.usersService.searchUserByenter(enterValue, rootOrgId).subscribe(data => {
-    //   this.usersData = data.result.response
-    //   this.filterData(enterValue)
-    // })
-    this.searchQuery = enterValue
-    this.currentOffset = 0
-    this.pageIndex = 0
-    this.filterData(this.searchQuery)
-  }
+    const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
 
-  onPaginateChange(event: PageEvent) {
-    this.pageIndex = event.pageIndex
-    this.limit = event.pageSize
-    this.filterData(this.searchQuery)
+    this.usersService.searchUserByenter(enterValue, rootOrgId).subscribe(data => {
+      this.usersData = data.result.response
+      this.filterData()
+    })
   }
 }
diff --git a/project/ws/app/src/lib/routes/users/services/users.service.ts b/project/ws/app/src/lib/routes/users/services/users.service.ts
index b035591ae..03666899e 100644
--- a/project/ws/app/src/lib/routes/users/services/users.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/users.service.ts
@@ -108,31 +108,28 @@ export class UsersService {
     return this.http.post<any>(`${API_END_POINTS.NEW_USER_UN_BLOCK_API}`, org)
   }
 
-  getAllKongUsers(depId: string, userStatus: number, pageLimit: number = 20, offsetNum: number = 0, searchText?: string): Observable<any> {
+  getAllKongUsers(depId: string, offsetNum?: number): Observable<any> {
     let reqBody
-    // if (offsetNum !== undefined) {
-    reqBody = {
-      request: {
-        filters: {
-          rootOrgId: depId,
-          status: userStatus,
+    if (offsetNum !== undefined) {
+      reqBody = {
+        request: {
+          filters: {
+            rootOrgId: depId,
+          },
+          limit: 250,
+          offset: offsetNum,
         },
-        limit: pageLimit,
-        offset: offsetNum,
-        query: searchText,
-      },
+      }
+    } else {
+      reqBody = {
+        request: {
+          filters: {
+            rootOrgId: depId,
+          },
+        },
+      }
     }
-    // }
-    // else {
-    //   reqBody = {
-    //     request: {
-    //       filters: {
-    //         rootOrgId: depId,
-    //         status: status
-    //       },
-    //     },
-    //   }
-    // }
+
     return this.http.post<any>(`${API_END_POINTS.GET_ALL_USERS}`, reqBody)
   }
   // getAllRoleUsers(depId: string, role: {}): Observable<any> {

From 7e2f5df0eea78f54d36fb219bd361b9dee00f68e Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Fri, 13 Oct 2023 11:47:58 +0530
Subject: [PATCH 256/887] updated package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e678c5c6c..ab30f9e40 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@angular/router": "~8.2.1",
     "@angular/service-worker": "~8.2.1",
     "@project-sunbird/telemetry-sdk": "0.0.26",
-    "@sunbird-cb/collection": "^1.0.32",
+    "@sunbird-cb/collection": "^1.0.33",
     "@sunbird-cb/design-system": "0.0.1",
     "@sunbird-cb/rain-dashboards": "0.4.22-rc.1",
     "@sunbird-cb/resolver": "^1.0.0",

From f5fbf942b958765114edd10f954dc23fd76edc38 Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Tue, 17 Oct 2023 15:56:33 +0530
Subject: [PATCH 257/887] Task #KBE-528: Assets configuration for the icons

---
 angular.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/angular.json b/angular.json
index b411a5367..8c05c3685 100644
--- a/angular.json
+++ b/angular.json
@@ -18,7 +18,9 @@
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
             "assets": [
-              "src/favicon.png"
+              "src/favicon.png",
+              "src/mdo-assets/icons/",
+              "src/mdo-assets/images/"
             ],
             "stylePreprocessorOptions": {
               "includePaths": [

From 362fa824268e46404dcfc6703e5693337268ff5b Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Tue, 17 Oct 2023 15:58:16 +0530
Subject: [PATCH 258/887] Task #KBE-528: OTP for users file upload

---
 .../lib/routes/home/home.rounting.module.ts   |   2 +
 .../users-upload/users-upload.component.html  | 211 +++++++++++-
 .../users-upload/users-upload.component.scss  |  13 +
 .../users-upload/users-upload.component.ts    | 301 +++++++++++++++++-
 .../routes/users/services/users.service.ts    |  35 +-
 .../app/src/lib/routes/users/users.module.ts  |   3 +-
 src/environments/environment.ts               |   4 +-
 7 files changed, 545 insertions(+), 24 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/home.rounting.module.ts b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
index 3ebc801ee..d349adc8b 100644
--- a/project/ws/app/src/lib/routes/home/home.rounting.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
@@ -48,6 +48,7 @@ const routes: Routes = [
         resolve: {
           usersList: UsersListResolve,
           pageData: PageResolve,
+          configService: ConfigResolveService,
         },
         data: {
           pageId: 'users',
@@ -63,6 +64,7 @@ const routes: Routes = [
         resolve: {
           usersList: UsersListResolve,
           pageData: PageResolve,
+          configService: ConfigResolveService,
         },
         data: {
           pageId: 'users',
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
index 2549c579a..c5b0c6b5c 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
@@ -5,7 +5,7 @@
   <div class="flex flex-row fle-wrap w-full">
     <mat-card class="my-5 flex-custom ws-mat-accent-border mat-card w-full">
       <div class="flex flex-row">
-        <form [formGroup]="formGroup" #form class="flex">
+        <form [formGroup]="formGroup" #form class="">
           <button *ngIf="!fileName" type="button" (click)="fileInput.click()" (dblclick)="$event.preventDefault();"
             class="download-btn mat-accent-border mat-button mat-button-base">Choose file</button>
           <label class="file-name mr-5" *ngIf="fileName">Selected file : <b>{{fileName}}</b></label>
@@ -14,26 +14,203 @@
             accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel, .xlsx, .xls" />
           <!-- <input type="submit" [disabled]="formGroup.invalid" value="upload" /> -->
           <mat-error *ngIf="showFileError">Only .xlsx or .csv files are accepted</mat-error>
+          <form *ngIf="fileName" [formGroup]="registrationForm" class="mobile-wrapper">
+            <ng-container *ngIf="fileName">
+              <label class="file-name mr-5" aria-label="Send OTP to">Send OTP to </label>
+              <div>
+                <mat-radio-group aria-label="Select an option" formControlName='otpType' #otpType
+                  (change)="radioChange($event)">
+                  <mat-radio-button [value]="'email'" color="accent" class="radio-btn">Email</mat-radio-button>
+                  <mat-radio-button [value]="'mobile'" color="accent" class="radio-btn">Mobile</mat-radio-button>
+                </mat-radio-group>
+              </div>
+            </ng-container>
+            <ng-container *ngIf="fileName && registrationForm.value.otpType==='email'">
+              <ng-container *ngIf="userEmail && !otpEmailSend">
+                <p for="email" class=" margin-remove-bottom margin-top-s" i18n-aria-label aria-label="Email label">
+                  OTP will be sent your registered email
+                </p>
+              </ng-container>
+              <ng-container *ngIf="!userEmail">
+                <p for="email" class=" margin-remove-bottom margin-top-s" i18n-aria-label aria-label="Email label">
+                  No email associated with your account
+                </p>
+              </ng-container>
+            </ng-container>
+            <ng-container *ngIf="fileName && registrationForm.value.otpType==='mobile'">
+              <ng-container *ngIf="userMobile">
+                <p for="email" class=" margin-remove-bottom margin-top-s" i18n-aria-label aria-label="Email label">
+                  OTP will be sent your registered mobile number
+                </p>
+              </ng-container>
+              <ng-container *ngIf="!userMobile">
+                <p for="email" class=" margin-remove-bottom margin-top-s" i18n-aria-label aria-label="Email label">
+                  No mobile number associated with your account
+                </p>
+              </ng-container>
+            </ng-container>
 
-          <div class="text-left mr-5">
-            <div *ngIf="displayLoader | async" class="pr-4 flex items-center justify-center">
-              <mat-spinner [diameter]="30"></mat-spinner>
+            <ng-container *ngIf="fileName && registrationForm.value.otpType==='email' && userEmail">
+              <div class="input-wrapper margin-top-l">
+                <p class="flex items-center margin-remove-bottom form-label" i18n-aria-label aria-label="Email label"
+                  [hidden]="!isEmailVerified">
+                  OTP has been verified
+                  <mat-icon class="ws-mat-green-text margin-xs" svgIcon="verified"></mat-icon>
+                </p>
+                <!-- <div class="flex flex-1">
+                  <mat-form-field appearance="outline" class="margin-top-s" id="email">
+                    <input id="email" name="emailField" autocomplete="off" type="email" maxlength="320" matInput
+                      placeholder="Enter your email id" #email formControlName="email" i18n-aria-label
+                      aria-label="Email input">
+                    <mat-icon matSuffix class="ws-mat-green-text margin-xs" svgIcon="verified"
+                      [hidden]="!isEmailVerified"></mat-icon>
+                    <mat-error [hidden]="false" *ngIf="registrationForm?.controls['email'].errors?.required"
+                      i18n="Email Error|Explains name is required">
+                      Please enter your email ID one
+                    </mat-error>
+                    <mat-error [hidden]="false"
+                      *ngIf="registrationForm.controls['email'].touched && registrationForm?.controls['email'].errors?.pattern"
+                      i18n-aria-label aria-label="Please enter a valid email ID">
+                      Please enter a valid email ID tow
+                    </mat-error>
+                    <div *ngIf="registrationForm.controls['email'].touched " class="email-error"
+                      i18n="Email Error|Explains character validation">
+                      Max 64 characters before "@" & 255 characters after "@" are valid.
+                    </div>
+                  </mat-form-field>
+                </div> -->
+
+                <div *ngIf="!isEmailVerified" class="flex flex-1  justify-end">
+                  <button *ngIf="!otpEmailSend" mat-raised-button type="button" (click)="sendOtpEmail()"
+                    class="submitBtnSmall text-white ws-mat-primary-background ws-mat-white-text btn-responsive"
+                    [disabled]="registrationForm?.email?.invalid">
+                    <a class="text-white" i18n>
+                      Send OTP
+                    </a>
+                  </button>
+                  <div *ngIf="otpEmailSend" class="flex flex-1 flex-column">
+                    <!-- <div class="flex flex-1 flex-row"> -->
+                    <mat-form-field appearance="outline" class="margin-top-xs w-full">
+                      <input id="emailOTP" #emailotp type="password" minlength="4" maxlength="6" matInput
+                        placeholder="Enter OTP" i18n-aria-label aria-label="OTP input"
+                        onKeyPress="if(this.value.length === 8) return false;" autocomplete="new-password">
+                      <mat-hint *ngIf="timeLeftforOTPEmail > 0 ">
+                        <span>Resend OTP after {{timeLeftforOTPEmail | pipeDurationTransform: 'hms2M'}}</span>
+                      </mat-hint>
+                      <mat-hint *ngIf="timeLeftforOTPEmail <= 0 ">
+                        <span class="cursor-pointer ws-mat-default-text" (click)="resendOTPEmail()">Resend
+                          OTP</span>
+                      </mat-hint>
+                    </mat-form-field>
+                    <div class="flex flex-1 margin-top-s justify-end">
+                      <button mat-raised-button type="button" (click)="verifyOtpEmail(emailotp)"
+                        class="submitBtnSmall text-white ws-mat-primary-background ws-mat-white-text margin-top-s otp"
+                        [disabled]="registrationForm?.email?.invalid || disableEmailVerifyBtn">
+                        <span class="text-white" i18n>
+                          Verify OTP
+                        </span>
+                      </button>
+                    </div>
+                    <!-- </div> -->
+                  </div>
+                </div>
+
+              </div>
+            </ng-container>
+            <ng-container *ngIf="fileName && registrationForm.value.otpType==='mobile' && userMobile">
+              <div class="input-wrapper margin-top-l">
+                <p class="flex items-center margin-remove-bottom form-label" i18n-aria-label aria-label="Email label"
+                  [hidden]="!isMobileVerified">
+                  OTP has been verified
+                  <mat-icon class="ws-mat-green-text margin-xs" svgIcon="verified"></mat-icon>
+                </p>
+                <!-- <div class="flex flex-1">
+
+                  <mat-form-field appearance="outline" class="margin-top-s w-full">
+                    <input [readonly]="otpSend && !otpVerified" id="mobileNumber" #mobile type="number" matInput
+                                    placeholder="Mobile Number" formControlName="mobile" i18n-aria-label
+                                    aria-label="Mobile Number input" maxlength="12">
+                    <input id="mobileNumber" #mobile matInput type="text" maxlength="10"
+                      (keypress)="numericOnly($event)" (paste)="numericOnly($event)" placeholder="Mobile Number"
+                      formControlName="mobile" i18n-aria-label aria-label="Mobile Number input">
+                    <mat-icon matSuffix class="ws-mat-green-text margin-xs" svgIcon="verified"
+                      [hidden]="!isMobileVerified"></mat-icon>
+                    <mat-error [hidden]="false" i18n="Mobile Number Error|Explains Mobile no is required"
+                      *ngIf="registrationForm?.controls['mobile'].errors?.required" i18n-aria-label
+                      aria-label="Please enter your mobile number">
+                      Please enter your mobile number
+                    </mat-error>
+                    <mat-error [hidden]="false" *ngIf="registrationForm?.controls['mobile'].errors?.pattern"
+                      i18n-aria-label aria-label="Please enter a valid 10 digit mobile number">
+                      Please enter a valid 10 digit mobile number
+                    </mat-error>
+                  </mat-form-field>
+                </div> -->
+                <div *ngIf="!isMobileVerified" class="flex flex-1 justify-end">
+                  <button *ngIf="!otpSend" mat-raised-button type="button" (click)="sendOtp()"
+                    class="submitBtnSmall text-white ws-mat-primary-background ws-mat-white-text btn-responsive"
+                    [disabled]="registrationForm?.mobile?.invalid">
+                    <a class="text-white" i18n>
+                      Send OTP
+                    </a>
+                  </button>
+                  <div *ngIf="otpSend" class="flex flex-1 flex-column">
+                    <!-- <div class="flex flex-1 flex-row"> -->
+                    <mat-form-field appearance="outline" class="margin-top-xs w-full">
+                      <input id="mobileNumber" #otp type="password" minlength="4" maxlength="6" matInput
+                        placeholder="Enter OTP" i18n-aria-label aria-label="OTP input"
+                        onKeyPress="if(this.value.length === 8) return false;" autocomplete="new-password">
+                      <mat-hint *ngIf="timeLeftforOTP > 0 ">
+                        <span>Resend OTP after {{timeLeftforOTP | pipeDurationTransform: 'hms2M'}}</span>
+                      </mat-hint>
+                      <mat-hint *ngIf="timeLeftforOTP <= 0 ">
+                        <span class="cursor-pointer ws-mat-default-text" (click)="resendOTP()">Resend
+                          OTP</span>
+                      </mat-hint>
+                      {{otp.errors}}
+                      <mat-error [hidden]="false" *ngIf="otp.errors?.minlength">
+                        Mobile otp is required
+                      </mat-error>
+                    </mat-form-field>
+                    <div class="flex flex-1 margin-top-s justify-end">
+                      <button mat-raised-button type="button" (click)="verifyOtp(otp)"
+                        class="submitBtnSmall text-white ws-mat-primary-background ws-mat-white-text margin-top-s otp"
+                        [disabled]="registrationForm?.mobile?.invalid || disableVerifyBtn">
+                        <span class="text-white" i18n>
+                          Verify OTP
+                        </span>
+                      </button>
+                    </div>
+                    <!-- </div> -->
+                  </div>
+                </div>
+              </div>
+            </ng-container>
+          </form>
+
+          <ng-container *ngIf="fileName && (isEmailVerified || isMobileVerified)">
+            <div class="flex mt-5 items-end justify-end">
+              <div class="text-left mr-5">
+                <button mat-button class="download-btn mat-accent-border mat-button mat-button-base" type="button" i18n
+                  (click)="cancelSelected()" (dblclick)="$event.preventDefault();" *ngIf="fileName">
+                  <ng-container i18n>Cancel</ng-container>
+                </button>
+              </div>
+              <div class="text-left ">
+                <div *ngIf="displayLoader | async" class="pr-4 flex items-center justify-center">
+                  <mat-spinner [diameter]="30"></mat-spinner>
+                </div>
+                <button mat-button class="upload-btn mat-button mat-button-base mr-5" type="submit" i18n
+                  [disabled]="formGroup.invalid || (displayLoader | async)" (click)="onSubmit(form)"
+                  (dblclick)="$event.preventDefault();" *ngIf="fileName">
+                  <ng-container i18n>Upload</ng-container>
+                </button>
+              </div>
             </div>
-            <button mat-button class="upload-btn mat-button mat-button-base mr-5" type="submit" i18n
-              [disabled]="formGroup.invalid || (displayLoader | async)" (click)="onSubmit(form)"
-              (dblclick)="$event.preventDefault();" *ngIf="fileName">
-              <ng-container i18n>Upload</ng-container>
-            </button>
-          </div>
-          <div class="text-left">
-            <button mat-button class="download-btn mat-accent-border mat-button mat-button-base" type="button" i18n
-              (click)="cancelSelected()" (dblclick)="$event.preventDefault();" *ngIf="fileName">
-              <ng-container i18n>Cancel</ng-container>
-            </button>
-          </div>
+          </ng-container>
 
         </form>
-        <div class="flex-1 inline-flex items-end justify-end">
+        <div class="flex-1 inline-flex items-start justify-end">
           <!-- <span class="mat-body-1 mr-5 pl-1">Download the sample file</span> -->
           <button class="download-btn mat-accent-border mat-button mat-button-base" i18n (click)="downloadFile()">
             <ng-container i18n>Download sample file</ng-container>
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
index 3d067a83a..158330da8 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.scss
@@ -77,6 +77,19 @@ td, th {
   line-height: 2;
 }
 
+.mobile-wrapper {
+  border: 1px dashed rgba(0,0,0,.40);
+  padding: 16px;
+  border-radius: 8px;
+}
+
+.radio-btn{
+  border: 1px solid #ddd;
+  padding: 5px 15px;
+  border-radius: 4px;
+  margin-right: 15px;
+}
+
 ::ng-deep .bulkupload-table .mat-column-dateCreatedOn,
 ::ng-deep .bulkupload-table .mat-column-dateUpdatedOn {
   flex: 0 0 14% !important;
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
index 200a647dd..e148ef991 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
@@ -1,8 +1,9 @@
 import { Component, OnInit, ViewChild, ElementRef, AfterViewInit, OnDestroy } from '@angular/core'
-import { FormBuilder, Validators } from '@angular/forms'
+import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'
 import { FileService } from '../../services/upload.service'
-import { Observable } from 'rxjs'
-import { MatSnackBar, MatSort } from '@angular/material'
+import { Observable, Subscription, interval } from 'rxjs'
+import { startWith, map, pairwise } from 'rxjs/operators'
+import { MatRadioChange, MatSnackBar, MatSort } from '@angular/material'
 import { MatPaginator } from '@angular/material/paginator'
 import { MatTableDataSource } from '@angular/material/table'
 import { environment } from 'src/environments/environment'
@@ -11,6 +12,7 @@ import { ActivatedRoute } from '@angular/router'
 import _ from 'lodash'
 import { ITableData } from '@sunbird-cb/collection/lib/ui-org-table/interface/interfaces'
 import { DatePipe } from '@angular/common'
+import { UsersService } from '../../services/users.service'
 
 @Component({
   selector: 'ws-app-users-upload',
@@ -42,6 +44,27 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
   downloadSampleFilePath = ''
   downloadAsFileName = ''
   rootOrgId!: any
+  phoneNumberPattern = '^((\\+91-?)|0)?[0-9]{10}$'
+  emailPattern = `^[\\w\-\\.]+@([\\w-]+\\.)+[\\w-]{2,4}$`
+  emailLengthVal = false
+  isMobileVerified = false
+  isEmailVerified = false
+  otpSend = false
+  otpEmailSend = false
+  otpVerified = false
+  OTP_TIMER = environment.resendOTPTIme
+  timerSubscription: Subscription | null = null
+  timeLeftforOTP = 0
+  timeLeftforOTPEmail = 0
+  timerSubscriptionEmail: Subscription | null = null
+  OTP_TIMER_EMAIL = environment.resendOTPTIme
+  registrationForm!: FormGroup
+  disableBtn = false
+  disableVerifyBtn = false
+  disableEmailVerifyBtn = false
+  userEmail = ''
+  userMobile = ''
+  userProfileV2!: any
 
   objDataSource = new MatTableDataSource<any>()
   @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | null = null
@@ -59,9 +82,11 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
     private fileService: FileService,
     private snackBar: MatSnackBar,
     private route: ActivatedRoute,
-    public datepipe: DatePipe
+    public datepipe: DatePipe,
+    private usersSvc: UsersService,
   ) {
     this.rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
+    this.userProfileV2 = _.get(this.route.snapshot.parent, 'data.configService.userProfileV2')
     this.dataSource = new MatTableDataSource(this.bulkUploadData)
     this.dataSource.paginator = this.paginator
 
@@ -71,9 +96,27 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
         this.downloadAsFileName = data.pageData.data.downloadAsFileName
       }
     })
+
+    this.registrationForm = new FormGroup({
+      otpType: new FormControl('email', [Validators.pattern(this.emailPattern)]),
+      // tslint:disable-next-line:max-line-length
+      email: new FormControl({ value: '', disabled: true }, [Validators.pattern(this.emailPattern)]),
+      // department: new FormControl('', [Validators.required, forbiddenNamesValidator(this.masterDepartments)]),
+      mobile: new FormControl('', [Validators.pattern(this.phoneNumberPattern), Validators.maxLength(12)]),
+    })
   }
 
   ngOnInit() {
+    if (this.userProfileV2) {
+      this.userEmail = this.userProfileV2.email || ''
+      this.registrationForm.patchValue({ email: this.userEmail })
+      this.registrationForm.updateValueAndValidity()
+    }
+    if (this.userProfileV2) {
+      this.userMobile = this.userProfileV2.mobile || 7795317335
+      this.registrationForm.patchValue({ mobile: this.userMobile })
+      this.registrationForm.updateValueAndValidity()
+    }
     this.displayLoader = this.fileService.isLoading()
     this.contactUsUrl = `${environment.karmYogiPath}/public/contact `
     this.tabledata = {
@@ -96,6 +139,9 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
       actionColumnName: 'Download file',
     }
     this.getBulkUploadData()
+    this.onPhoneChange()
+    this.onEmailChange()
+
   }
   ngAfterViewInit() {
     this.dataSource.paginator = this.paginator
@@ -105,6 +151,15 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
     })
   }
 
+  radioChange(_event: MatRadioChange) {
+    // console.log(_event.source.name, _event.value)
+    this.isEmailVerified = false
+    this.otpEmailSend = false
+    this.isMobileVerified = false
+    this.otpSend = false
+    this.disableVerifyBtn = false
+  }
+
   getBulkUploadData() {
     this.fileService.getBulkUploadDataV1(this.rootOrgId).subscribe((res: any) => {
       this.tableList = []
@@ -223,4 +278,242 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
     const url = `/apis/proxies/v8/user/v1/bulkuser/download/${event.row.fileName}`
     window.open(url, '_blank')
   }
+
+  emailVerification(emailId: string) {
+    this.emailLengthVal = false
+    if (emailId && emailId.length > 0) {
+      const email = emailId.split('@')
+      if (email && email.length === 2) {
+        if ((email[0] && email[0].length > 64) || (email[1] && email[1].length > 255)) {
+          this.emailLengthVal = true
+        }
+      } else {
+        this.emailLengthVal = false
+      }
+    }
+  }
+
+  onPhoneChange() {
+    const ctrl = this.registrationForm.get('mobile')
+    if (ctrl) {
+      ctrl
+        .valueChanges
+        .pipe(startWith(null), pairwise())
+        .subscribe(([prev, next]: [any, any]) => {
+          if (!(prev == null && next)) {
+            this.isMobileVerified = false
+            this.otpSend = false
+            this.disableVerifyBtn = false
+          }
+        })
+    }
+  }
+
+  onEmailChange() {
+    const ctrl = this.registrationForm.get('email')
+    if (ctrl) {
+      ctrl
+        .valueChanges
+        .pipe(startWith(null), pairwise())
+        .subscribe(([prev, next]: [any, any]) => {
+          if (!(prev == null && next)) {
+            this.isEmailVerified = false
+            this.otpEmailSend = false
+            this.disableEmailVerifyBtn = false
+          }
+        })
+    }
+  }
+
+  sendOtp() {
+    // const mob = this.registrationForm.get('mobile')
+    if (this.userMobile) {
+      this.usersSvc.sendOtp(this.userMobile, 'phone').subscribe(() => {
+        this.otpSend = true
+        alert('An OTP has been sent to your mobile number (valid for 15 minutes)')
+        this.startCountDown()
+        // tslint:disable-next-line: align
+      }, (error: any) => {
+        this.snackBar.open(_.get(error, 'error.params.errmsg') || 'Please try again later')
+      })
+    } else {
+      this.snackBar.open('Please enter a valid mobile number',)
+    }
+  }
+
+  resendOTP() {
+    // const mob = this.registrationForm.get('mobile')
+    if (this.userMobile) {
+      this.usersSvc.resendOtp(this.userMobile, 'phone').subscribe((res: any) => {
+        if ((_.get(res, 'result.response')).toUpperCase() === 'SUCCESS') {
+          this.otpSend = true
+          this.disableVerifyBtn = false
+          alert('An OTP has been sent to your mobile number (valid for 15 minutes)')
+          this.startCountDown()
+        }
+        // tslint:disable-next-line: align
+      }, (error: any) => {
+        this.snackBar.open(_.get(error, 'error.params.errmsg') || 'Please try again later')
+      })
+    } else {
+      this.snackBar.open('Please enter a valid mobile number')
+    }
+  }
+
+  verifyOtp(otp: any) {
+    // console.log(otp)
+    // const mob = this.registrationForm.get('mobile')
+
+    if (otp && otp.value) {
+      if (otp && otp.value.length < 4) {
+        this.snackBar.open('Please enter a valid OTP.')
+      } else if (this.userMobile) {
+        this.usersSvc.verifyOTP(otp.value, this.userMobile, 'phone').subscribe((res: any) => {
+          if ((_.get(res, 'result.response')).toUpperCase() === 'SUCCESS') {
+            this.otpVerified = true
+            this.isMobileVerified = true
+            this.disableBtn = false
+            // const reqUpdates = {
+            //   request: {
+            //     userId: this.configSvc.unMappedUser.id,
+            //     profileDetails: {
+            //       personalDetails: {
+            //         mobile: mob.value,
+            //         phoneVerified: true,
+            //       },
+            //     },
+            //   },
+            // }
+            // this.userProfileSvc.editProfileDetails(reqUpdates).subscribe((updateRes: any) => {
+            //   if (updateRes) {
+            //     this.isMobileVerified = true
+            //   }
+            // })
+          }
+          // tslint:disable-next-line: align
+        }, (error: any) => {
+          this.snackBar.open(_.get(error, 'error.params.errmsg') || 'Please try again later')
+          if (error.error && error.error.result) {
+            this.disableVerifyBtn = error.error.result.remainingAttempt === 0 ? true : false
+          }
+        })
+      }
+    } else {
+      this.snackBar.open('Please enter a valid OTP.')
+    }
+  }
+  startCountDown() {
+    const startTime = Date.now()
+    this.timeLeftforOTP = this.OTP_TIMER
+    // && this.primaryCategory !== this.ePrimaryCategory.PRACTICE_RESOURCE
+    if (this.OTP_TIMER > 0
+    ) {
+      this.timerSubscription = interval(1000)
+        .pipe(
+          map(
+            () =>
+              startTime + this.OTP_TIMER - Date.now(),
+          ),
+        )
+        .subscribe((_timeRemaining: any) => {
+          this.timeLeftforOTP -= 1
+          if (this.timeLeftforOTP < 0) {
+            this.timeLeftforOTP = 0
+            if (this.timerSubscription) {
+              this.timerSubscription.unsubscribe()
+            }
+            // this.submitQuiz()
+          }
+        })
+    }
+  }
+
+  sendOtpEmail() {
+    // const email = this.registrationForm.get('email')
+    if (this.userEmail) {
+      this.usersSvc.sendOtp(this.userEmail, 'email').subscribe(() => {
+        this.otpEmailSend = true
+        alert('An OTP has been sent to your email (valid for 15 minutes)')
+        this.startCountDownEmail()
+        // tslint:disable-next-line: align
+      }, (error: any) => {
+        this.snackBar.open(_.get(error, 'error.params.errmsg') || 'Please try again later')
+      })
+    }
+    // else {
+    //   this.snackBar.open('Please enter a valid email address.')
+    // }
+  }
+
+  resendOTPEmail() {
+    // const email = this.registrationForm.get('email')
+    if (this.userEmail) {
+      this.usersSvc.resendOtp(this.userEmail, 'email').subscribe((res: any) => {
+        if ((_.get(res, 'result.response')).toUpperCase() === 'SUCCESS') {
+          this.otpEmailSend = true
+          this.disableEmailVerifyBtn = false
+          alert('An OTP has been sent to your email (valid for 15 minutes)')
+          this.startCountDownEmail()
+        }
+        // tslint:disable-next-line: align
+      }, (error: any) => {
+        this.snackBar.open(_.get(error, 'error.params.errmsg') || 'Please try again later')
+      })
+    }
+    // else {
+    //   this.snackBar.open('Please enter a valid email address.')
+    // }
+  }
+
+  verifyOtpEmail(otp: any) {
+    console.log(otp)
+    // const email = this.registrationForm.get('email')
+    if (otp && otp.value) {
+      if (otp && otp.value.length < 4) {
+        this.snackBar.open('Please enter a valid OTP.')
+      } else if (this.userEmail) {
+        this.usersSvc.verifyOTP(otp.value, this.userEmail, 'email').subscribe((res: any) => {
+          if ((_.get(res, 'result.response')).toUpperCase() === 'SUCCESS') {
+            this.otpEmailSend = true
+            this.isEmailVerified = true
+            this.disableBtn = false
+          }
+          // tslint:disable-next-line: align
+        }, (error: any) => {
+          this.snackBar.open(_.get(error, 'error.params.errmsg') || 'Please try again later')
+          if (error.error && error.error.result) {
+            this.disableEmailVerifyBtn = error.error.result.remainingAttempt === 0 ? true : false
+          }
+        })
+      }
+    } else {
+      this.snackBar.open('Please enter a valid OTP.')
+    }
+  }
+  startCountDownEmail() {
+    const startTime = Date.now()
+    this.timeLeftforOTPEmail = this.OTP_TIMER_EMAIL
+    // && this.primaryCategory !== this.ePrimaryCategory.PRACTICE_RESOURCE
+    if (this.OTP_TIMER_EMAIL > 0
+    ) {
+      this.timerSubscriptionEmail = interval(1000)
+        .pipe(
+          map(
+            () =>
+              startTime + this.OTP_TIMER_EMAIL - Date.now(),
+          ),
+        )
+        .subscribe(_timeRemaining => {
+          this.timeLeftforOTPEmail -= 1
+          if (this.timeLeftforOTPEmail < 0) {
+            this.timeLeftforOTPEmail = 0
+            if (this.timerSubscriptionEmail) {
+              this.timerSubscriptionEmail.unsubscribe()
+            }
+            // this.submitQuiz()
+          }
+        })
+    }
+  }
+
 }
diff --git a/project/ws/app/src/lib/routes/users/services/users.service.ts b/project/ws/app/src/lib/routes/users/services/users.service.ts
index 03666899e..650cbf879 100644
--- a/project/ws/app/src/lib/routes/users/services/users.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/users.service.ts
@@ -24,7 +24,9 @@ const API_END_POINTS = {
   NEW_USER_BLOCK_API: '/apis/proxies/v8/user/v1/block',
   NEW_USER_UN_BLOCK_API: '/apis/proxies/v8/user/v1/unblock',
   SEARCH_USER_TABLE: '/apis/proxies/v8/user/v1/search',
-
+  SEND_OTP: '/apis/proxies/v8/otp/v1/generate',
+  RESEND_OTP: '/apis/proxies/v8/otp/v1/generate',
+  VERIFY_OTP: '/apis/proxies/v8/otp/v1/verify',
   // GET_BULKUPLOAD_DATA: '/apis/protected/v8/admin/userRegistration/bulkUploadData',
 }
 
@@ -186,4 +188,35 @@ export class UsersService {
   checkForUserReport(url: string) {
     return this.http.get<any>(url)
   }
+
+  sendOtp(value: any, type: string): Observable<any> {
+    const reqObj = {
+      request: {
+        type: `${type}`,
+        key: `${value}`,
+      },
+    }
+    return this.http.post(API_END_POINTS.SEND_OTP, reqObj)
+  }
+  resendOtp(value: any, type: string) {
+    const reqObj = {
+      request: {
+        type: `${type}`,
+        key: `${value}`,
+      },
+    }
+    return this.http.post(API_END_POINTS.RESEND_OTP, reqObj)
+
+  }
+  verifyOTP(otp: number, value: any, type: string) {
+    const reqObj = {
+      request: {
+        otp,
+        type: `${type}`,
+        key: `${value}`,
+      },
+    }
+    return this.http.post(API_END_POINTS.VERIFY_OTP, reqObj)
+
+  }
 }
diff --git a/project/ws/app/src/lib/routes/users/users.module.ts b/project/ws/app/src/lib/routes/users/users.module.ts
index 02fb1ffdc..4b806e818 100644
--- a/project/ws/app/src/lib/routes/users/users.module.ts
+++ b/project/ws/app/src/lib/routes/users/users.module.ts
@@ -18,6 +18,7 @@ import { RolesService } from './services/roles.service'
 import { FileService } from './services/upload.service'
 import { UsersUploadComponent } from './components/users-upload/users-upload.component'
 import { PipeEmailModule } from '../pipes/pipe-email/pipe-email.module'
+import { PipeDurationTransformModule } from '@sunbird-cb/utils'
 
 @NgModule({
   declarations: [CreateUserComponent, ViewUserComponent, UsersUploadComponent],
@@ -27,7 +28,7 @@ import { PipeEmailModule } from '../pipes/pipe-email/pipe-email.module'
     MatFormFieldModule, MatInputModule, MatButtonModule, MatIconModule, MatGridListModule,
     MatRadioModule, MatDialogModule, ReactiveFormsModule, MatSelectModule, MatProgressSpinnerModule,
     MatExpansionModule, MatDividerModule, MatPaginatorModule, MatTableModule, WidgetResolverModule, MatSortModule, PipeEmailModule,
-    UIORGTableModule,
+    UIORGTableModule, PipeDurationTransformModule,
   ],
   providers: [RolesService, FileService, DatePipe],
   exports: [UsersUploadComponent],
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index d38f3f022..1cc19b900 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -14,6 +14,7 @@ export const environment: IEnvironment = {
   userBucket: (window as { [key: string]: any })['env']['userBucket'] || '',
   domainName: (window as { [key: string]: any })['env']['domainName'] || '',
   mdoPath: (window as { [key: string]: any })['env']['mdoPath'] || '',
+  resendOTPTIme: (window as { [key: string]: any })['env']['resendOTPTIme'] || 120,
 }
 interface IEnvironment {
   name: null | string
@@ -26,7 +27,8 @@ interface IEnvironment {
   contentBucket?: string
   userBucket?: string
   domainName?: string
-  mdoPath: string
+  mdoPath: string,
+  resendOTPTIme: number,
 }
 
 /*

From e881b89ba5858f38fa33098e55f2277233c85efc Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Tue, 17 Oct 2023 15:58:39 +0530
Subject: [PATCH 259/887] Task #KBE-528: Verified svg image added

---
 src/app/services/init.service.ts  | 5 +++++
 src/mdo-assets/icons/verified.svg | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 src/mdo-assets/icons/verified.svg

diff --git a/src/app/services/init.service.ts b/src/app/services/init.service.ts
index ee7457ad5..ff3f1e6ee 100644
--- a/src/app/services/init.service.ts
+++ b/src/app/services/init.service.ts
@@ -93,6 +93,10 @@ export class InitService {
       'hubs',
       domSanitizer.bypassSecurityTrustResourceUrl('mdo-assets/icons/hubs.svg'),
     )
+    iconRegistry.addSvgIcon(
+      'verified',
+      domSanitizer.bypassSecurityTrustResourceUrl('mdo-assets/icons/verified.svg'),
+    )
   }
 
   async init() {
@@ -298,6 +302,7 @@ export class InitService {
             userId: _.get(profileV2, 'userId') || completeProdata.userId,
             email: _.get(profileV2, 'personalDetails.primaryEmail') || completeProdata.email,
             firstName: _.get(profileV2, 'personalDetails.firstname') || completeProdata.firstName,
+            mobile: _.get(completeProdata, 'profileDetails.personalDetails.mobile ') || '',
             // surName: _.get(profileV2, 'personalDetails.surname') || completeProdata.lastName,
             // middleName: _.get(profileV2, 'personalDetails.middlename') || '',
             departmentName: _.get(profileV2, 'employmentDetails.departmentName') || completeProdata.channel,
diff --git a/src/mdo-assets/icons/verified.svg b/src/mdo-assets/icons/verified.svg
new file mode 100644
index 000000000..d69336806
--- /dev/null
+++ b/src/mdo-assets/icons/verified.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24"><path d="M8.225 23.6 6.15 20.075l-4-.9.4-4.1L-.15 12l2.7-3.075-.4-4.1 4-.9L8.225.4 12 2 15.775.4l2.075 3.525 4 .9-.4 4.1L24.15 12l-2.7 3.075.4 4.1-4 .9-2.075 3.525L12 22Zm2.725-7.55 6.175-6.2-1.875-1.875-4.3 4.325-2.175-2.175L6.9 12Z"/></svg>
\ No newline at end of file

From b6c38b1eac810b69da0f32f523149ce90e00b5bb Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Tue, 17 Oct 2023 16:16:23 +0530
Subject: [PATCH 260/887] Task #KBE-528: lint fixes

---
 .../users/components/users-upload/users-upload.component.ts    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
index e148ef991..85879cc00 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
@@ -337,7 +337,7 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
         this.snackBar.open(_.get(error, 'error.params.errmsg') || 'Please try again later')
       })
     } else {
-      this.snackBar.open('Please enter a valid mobile number',)
+      this.snackBar.open('Please enter a valid mobile number')
     }
   }
 
@@ -466,7 +466,6 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   verifyOtpEmail(otp: any) {
-    console.log(otp)
     // const email = this.registrationForm.get('email')
     if (otp && otp.value) {
       if (otp && otp.value.length < 4) {

From 34838dd11addf3825393248b2bcb37e58fa36e72 Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Tue, 17 Oct 2023 16:17:13 +0530
Subject: [PATCH 261/887] Task #KBE-528: new variable added in environment file

---
 src/environments/environment.bm.ts      | 1 +
 src/environments/environment.dev.ts     | 1 +
 src/environments/environment.np.ts      | 1 +
 src/environments/environment.preprod.ts | 1 +
 src/environments/environment.prod.ts    | 1 +
 5 files changed, 5 insertions(+)

diff --git a/src/environments/environment.bm.ts b/src/environments/environment.bm.ts
index 6cf3303fc..496df9181 100644
--- a/src/environments/environment.bm.ts
+++ b/src/environments/environment.bm.ts
@@ -10,4 +10,5 @@ export const environment = {
   userBucket: (window as { [key: string]: any })['env']['userBucket'] || '',
   domainName: (window as { [key: string]: any })['env']['domainName'] || '',
   mdoPath: (window as { [key: string]: any })['env']['mdoPath'] || '',
+  resendOTPTIme: (window as { [key: string]: any })['env']['resendOTPTIme'] || 120,
 }
diff --git a/src/environments/environment.dev.ts b/src/environments/environment.dev.ts
index bc5b41814..1c49c9b76 100644
--- a/src/environments/environment.dev.ts
+++ b/src/environments/environment.dev.ts
@@ -10,4 +10,5 @@ export const environment = {
   userBucket: (window as { [key: string]: any })['env']['userBucket'] || '',
   domainName: (window as { [key: string]: any })['env']['domainName'] || '',
   mdoPath: (window as { [key: string]: any })['env']['mdoPath'] || '',
+  resendOTPTIme: (window as { [key: string]: any })['env']['resendOTPTIme'] || 120,
 }
diff --git a/src/environments/environment.np.ts b/src/environments/environment.np.ts
index 5e517edb3..9ade53d15 100644
--- a/src/environments/environment.np.ts
+++ b/src/environments/environment.np.ts
@@ -10,4 +10,5 @@ export const environment = {
   userBucket: (window as { [key: string]: any })['env']['userBucket'] || '',
   domainName: (window as { [key: string]: any })['env']['domainName'] || '',
   mdoPath: (window as { [key: string]: any })['env']['mdoPath'] || '',
+  resendOTPTIme: (window as { [key: string]: any })['env']['resendOTPTIme'] || 120,
 }
diff --git a/src/environments/environment.preprod.ts b/src/environments/environment.preprod.ts
index bc5b41814..1c49c9b76 100644
--- a/src/environments/environment.preprod.ts
+++ b/src/environments/environment.preprod.ts
@@ -10,4 +10,5 @@ export const environment = {
   userBucket: (window as { [key: string]: any })['env']['userBucket'] || '',
   domainName: (window as { [key: string]: any })['env']['domainName'] || '',
   mdoPath: (window as { [key: string]: any })['env']['mdoPath'] || '',
+  resendOTPTIme: (window as { [key: string]: any })['env']['resendOTPTIme'] || 120,
 }
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index bc5b41814..1c49c9b76 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -10,4 +10,5 @@ export const environment = {
   userBucket: (window as { [key: string]: any })['env']['userBucket'] || '',
   domainName: (window as { [key: string]: any })['env']['domainName'] || '',
   mdoPath: (window as { [key: string]: any })['env']['mdoPath'] || '',
+  resendOTPTIme: (window as { [key: string]: any })['env']['resendOTPTIme'] || 120,
 }

From 94bfcf7d59a97200e92ea0c82aed3db77cc75ff7 Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Tue, 17 Oct 2023 18:42:17 +0530
Subject: [PATCH 262/887] Task #KBE-528: Removed hardcoded data

---
 .../users/components/users-upload/users-upload.component.ts     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
index 85879cc00..889a516a5 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
@@ -113,7 +113,7 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
       this.registrationForm.updateValueAndValidity()
     }
     if (this.userProfileV2) {
-      this.userMobile = this.userProfileV2.mobile || 7795317335
+      this.userMobile = this.userProfileV2.mobile || ''
       this.registrationForm.patchValue({ mobile: this.userMobile })
       this.registrationForm.updateValueAndValidity()
     }

From 53fbf5b5c16c564d32bffad89109bc0390f23ad3 Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Tue, 17 Oct 2023 19:25:50 +0530
Subject: [PATCH 263/887] Task #KBE-528: Updated utils lib version, for
 Iuserprofile model change

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e678c5c6c..631c46b21 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "@sunbird-cb/design-system": "0.0.1",
     "@sunbird-cb/rain-dashboards": "0.4.22-rc.1",
     "@sunbird-cb/resolver": "^1.0.0",
-    "@sunbird-cb/utils": "^1.0.13",
+    "@sunbird-cb/utils": "^1.0.14",
     "@types/file-saver": "^2.0.1",
     "@sunbird-cb/micro-surveys": "2.0.13",
     "brace": "^0.11.1",

From 3a6c45a4a9f3590bef1b819041760a56bc74f8a0 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Wed, 18 Oct 2023 14:03:50 +0530
Subject: [PATCH 264/887] pageindex fixes on tab change

---
 package.json                                                    | 2 +-
 .../lib/routes/home/routes/users-view/users-view.component.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index ab30f9e40..b2df8c3f2 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@angular/router": "~8.2.1",
     "@angular/service-worker": "~8.2.1",
     "@project-sunbird/telemetry-sdk": "0.0.26",
-    "@sunbird-cb/collection": "^1.0.33",
+    "@sunbird-cb/collection": "^1.0.34",
     "@sunbird-cb/design-system": "0.0.1",
     "@sunbird-cb/rain-dashboards": "0.4.22-rc.1",
     "@sunbird-cb/resolver": "^1.0.0",
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index af2b13a27..52f19d9e2 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -42,7 +42,7 @@
         <ws-widget-org-user-table-v2 [userId]="currentUser" [tableData]="tabledata" [data]="dataForTable"
           [isUpload]=false [isCreate]=true (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuActions($event)"
           (searchByEnterKey)="onEnterkySearch($event)" (pageChangeClick)="onPaginateChange($event)"
-          [showEditOnCondition]=true [totalRecords]="userDataTotalCount">
+          [showEditOnCondition]=true [totalRecords]="userDataTotalCount" [tabChangeIndex]="pageIndex">
         </ws-widget-org-user-table-v2>
 
         <!-- <div style="float: right;display: flex;">

From 1d39d7617dd16ccbd68a3214ef8b5d17e07c53ba Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Thu, 19 Oct 2023 12:12:28 +0530
Subject: [PATCH 265/887] Added designation & tags field in user edit

---
 .../routes/view-user/view-user.component.html | 288 ++++++++++--------
 .../routes/view-user/view-user.component.ts   | 134 ++++++--
 .../routes/users/services/users.service.ts    |  11 +-
 .../app/src/lib/routes/users/users.module.ts  |   4 +-
 4 files changed, 292 insertions(+), 145 deletions(-)

diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
index bab09ca75..f5b6e7fcd 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
@@ -2,8 +2,6 @@
   <div class="flex flex-1 custom">
     <div class="flex-3">
       <div class="flex flex-1 margin-left-xl">
-
-
         <ws-widget-breadcrumbs-org [widgetData]="{url: 'home',titles: breadcrumbs}">
         </ws-widget-breadcrumbs-org>
       </div>
@@ -42,15 +40,15 @@
                               </mat-grid-tile>
 
                               <!-- <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                              <label class="appr-text-label">Middle Name</label>
-                              <input type="text" [disabled]="true" [value]="basicInfo.middlename" class="appr-text-field">
-                            </mat-grid-tile> -->
+                                <label class="appr-text-label">Middle Name</label>
+                                <input type="text" [disabled]="true" [value]="basicInfo.middlename" class="appr-text-field">
+                              </mat-grid-tile> -->
 
                               <!-- <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                                <label class="appr-text-label">Last name</label>
-                                <input type="text" [disabled]="true" [value]="basicInfo.surname"
-                                  class="appr-text-field">
-                              </mat-grid-tile> -->
+                                  <label class="appr-text-label">Last name</label>
+                                  <input type="text" [disabled]="true" [value]="basicInfo.surname"
+                                    class="appr-text-field">
+                                </mat-grid-tile> -->
 
                               <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                                 <label class="appr-text-label">Date of birth (dd-mm-yy)</label>
@@ -146,7 +144,6 @@
                                 <input type="text" [disabled]="true"
                                   [value]="basicInfo.pincode ? basicInfo.pincode : ''" class="appr-text-field">
                               </mat-grid-tile>
-
                             </mat-grid-list>
                           </ng-container>
                         </div>
@@ -277,118 +274,169 @@
                       <div class="flex flex-wrap mobile-break">
                         <div class="w-full profile-cols-full bg-grey">
                           <ng-container>
-                            <mat-grid-list cols="1" rowHeight="100px">
-                              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                                <label class="appr-text-label">Type of organisation</label>
-                                <mat-radio-group [value]="professionalDetails.organisationType" [disabled]="true"
-                                  aria-label="Select an option">
-                                  <mat-radio-button value="Government" class="radio-btn">Government organisation
-                                  </mat-radio-button>
-                                  <mat-radio-button value="Non-Government" class="radio-btn">Non-government
-                                    organisation
-                                  </mat-radio-button>
-                                </mat-radio-group>
-                              </mat-grid-tile>
+                            <form [formGroup]="updateProfessionalForm">
+                              <mat-grid-list cols="1" rowHeight="100px">
+                                <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                                  <label class="appr-text-label">Type of organisation</label>
+                                  <mat-radio-group [value]="professionalDetails.organisationType" [disabled]="true"
+                                    aria-label="Select an option">
+                                    <mat-radio-button value="Government" class="radio-btn">Government organisation
+                                    </mat-radio-button>
+                                    <mat-radio-button value="Non-Government" class="radio-btn">Non-government
+                                      organisation
+                                    </mat-radio-button>
+                                  </mat-radio-group>
+                                </mat-grid-tile>
 
-                              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                                <label class="appr-text-label">MDO</label>
-                                <input type="text" [disabled]="true" class="appr-text-field"
-                                  [value]="professionalDetails.name || professionalDetails.nameOther || ''">
-                              </mat-grid-tile>
-                              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                                <label class="appr-text-label">Industry</label>
-                                <input type="text" [disabled]="true"
-                                  [value]="professionalDetails.industry || professionalDetails.industryOther || ''"
-                                  class="appr-text-field">
-                              </mat-grid-tile>
-                              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                                <label class="appr-text-label">Designation</label>
-                                <input type="text" [disabled]="true"
-                                  [value]="professionalDetails.designation || professionalDetails.designationOther || ''"
-                                  class="appr-text-field">
-                              </mat-grid-tile>
-                              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                                <label class="appr-text-label">Location</label>
-                                <input type="text" [disabled]="true"
-                                  [value]="professionalDetails.location ? professionalDetails.location : ''"
-                                  class="appr-text-field">
-                              </mat-grid-tile>
-                              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                                <label class="appr-text-label">Description</label>
-                                <textarea [disabled]="true" rows="3"
-                                  [value]="professionalDetails.description ? professionalDetails.description : ''"
-                                  class="appr-text-field"></textarea>
-                              </mat-grid-tile>
-                            </mat-grid-list>
+                                <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                                  <label class="appr-text-label">MDO</label>
+                                  <input type="text" [disabled]="true" class="appr-text-field"
+                                    [value]="professionalDetails.name || professionalDetails.nameOther || ''">
+                                </mat-grid-tile>
+                                <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                                  <label class="appr-text-label">Industry</label>
+                                  <input type="text" [disabled]="true"
+                                    [value]="professionalDetails.industry || professionalDetails.industryOther || ''"
+                                    class="appr-text-field">
+                                </mat-grid-tile>
+                                <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                                  <label class="appr-text-label">Designation</label>
+                                  <!-- <input type="text" [disabled]="true"
+                                    [value]="professionalDetails.designation || professionalDetails.designationOther || ''"
+                                    class="appr-text-field"> -->
+                                  <mat-form-field appearance="outline" class="margin-top-xs">
+                                    <mat-select #designation formControlName="designation" i18n-placeholder
+                                      placeholder="--Select--"
+                                      (selectionChange)="otherDropDownChange(designation.value, 'designation')">
+                                      <mat-option [value]="designation.name"
+                                        *ngFor="let designation of designationsMeta">
+                                        {{designation.name}}
+                                      </mat-option>
+                                      <mat-option [value]="'Other'">Other</mat-option>
+                                    </mat-select>
+                                  </mat-form-field>
+                                </mat-grid-tile>
+                                <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                                  <label class="appr-text-label">Tags</label>
+                                  <div class="left-input-div">
+                                    <mat-form-field appearance="outline" class="margin-top-xs full-width flex flex-1">
+                                      <input #tags matInput i18n-placeholder="Type the tag and press enter" rows="5"
+                                        placeholder="Type the tag and press enter" formControlName="tags"
+                                        i18n-aria-label aria-label="Enter tag" [matChipInputFor]="chipListTags"
+                                        maxlength="100" [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
+                                        (matChipInputTokenEnd)="addActivity($event)" class="w-full-imp" />
+                                    </mat-form-field>
+                                  </div>
+                                  <div class="right-input-div">
+                                    <button mat-raised-button type="button"
+                                      (click)="addActivity({input: tags, value: tags.value})"
+                                      class="text-white btn-add-activity btn-responsive">
+                                      <span class="text-white" i18n>Add tag</span>
+                                    </button>
+                                  </div>
+                                  <div class="flex flex-row justify-between margin-top-s">
+                                    <mat-hint class="text-left text_hint mat-body-2">Start adding the tags.</mat-hint>
+                                  </div>
+                                  <mat-chip-list #chipListTags>
+                                    <mat-chip *ngFor="let tag of selectedtags" [selectable]="true" [removable]="true"
+                                      (removed)="removeActivity(tag)">
+                                      {{ tag }}
+                                      <mat-icon matChipRemove>cancel</mat-icon>
+                                    </mat-chip>
+                                  </mat-chip-list>
+                                </mat-grid-tile>
+                                <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                                  <label class="appr-text-label">Location</label>
+                                  <input type="text" [disabled]="true"
+                                    [value]="professionalDetails.location ? professionalDetails.location : ''"
+                                    class="appr-text-field">
+                                </mat-grid-tile>
+                                <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                                  <label class="appr-text-label">Description</label>
+                                  <textarea [disabled]="true" rows="3"
+                                    [value]="professionalDetails.description ? professionalDetails.description : ''"
+                                    class="appr-text-field"></textarea>
+                                </mat-grid-tile>
+                              </mat-grid-list>
 
-                            <mat-grid-list cols="1" rowHeight="50px" class="margin-top-xl">
-                              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                                <label class="middle-heading">Other details for government employess (If
-                                  applicable)</label>
-                              </mat-grid-tile>
-                            </mat-grid-list>
+                              <mat-grid-list cols="1" rowHeight="50px" class="margin-top-xl">
+                                <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                                  <label class="middle-heading">Other details for government employess (If
+                                    applicable)</label>
+                                </mat-grid-tile>
+                              </mat-grid-list>
 
-                            <mat-grid-list cols="2" rowHeight="100px">
-                              <mat-grid-tile [colspan]="2" [rowspan]="1" class="input-wrapper">
-                                <label class="appr-text-label">Pay band (grade pay)</label>
-                                <input type="text" [disabled]="true"
-                                  [value]="employmentDetails && employmentDetails.payType ? employmentDetails.payType : ''"
-                                  class="appr-text-field">
-                              </mat-grid-tile>
-                              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                                <label class="appr-text-label">Service</label>
-                                <input type="text" [disabled]="true"
-                                  [value]="employmentDetails && employmentDetails.service ? employmentDetails.service : ''"
-                                  class="appr-text-field">
-                              </mat-grid-tile>
-                              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                                <label class="appr-text-label">Cadre</label>
-                                <input type="text" [disabled]="true"
-                                  [value]="employmentDetails && employmentDetails.cadre ? employmentDetails.cadre : ''"
-                                  class="appr-text-field">
-                              </mat-grid-tile>
-                              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                                <label class="appr-text-label">Allotment year of service</label>
-                                <input type="text" [disabled]="true"
-                                  [value]="employmentDetails && employmentDetails.allotmentYearOfService ? employmentDetails.allotmentYearOfService : ''"
-                                  class="appr-text-field">
-                              </mat-grid-tile>
-                              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                                <label class="appr-text-label">Date of joining</label>
-                                <input type="text" [disabled]="true"
-                                  [value]="employmentDetails && employmentDetails.dojOfService ? employmentDetails.dojOfService : ''"
-                                  class="appr-text-field">
-                              </mat-grid-tile>
-                              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                                <label class="appr-text-label">Civil list number</label>
-                                <input type="text" [disabled]="true"
-                                  [value]="employmentDetails && employmentDetails.civilListNo ? employmentDetails.civilListNo : ''"
-                                  class="appr-text-field">
-                              </mat-grid-tile>
-                              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                                <label class="appr-text-label">Emplyee code</label>
-                                <input type="text" [disabled]="true"
-                                  [value]="employmentDetails && employmentDetails.employeeCode ? employmentDetails.employeeCode : ''"
-                                  class="appr-text-field">
-                              </mat-grid-tile>
-                              <!-- <mat-grid-tile [colspan]="2" [rowspan]="1" class="input-wrapper">
-                                <label class="appr-text-label">Location</label>
-                                <input type="text" [disabled]="true" [value]="professionalDetails.location"
-                                  class="appr-text-field">
-                              </mat-grid-tile> -->
-                              <mat-grid-tile [colspan]="2" [rowspan]="1" class="input-wrapper">
-                                <label class="appr-text-label">Official postal address</label>
-                                <textarea [disabled]="true" rows="3"
-                                  [value]="employmentDetails && employmentDetails.officialPostalAddress ? employmentDetails.officialPostalAddress : ''"
-                                  class="appr-text-field"></textarea>
-                              </mat-grid-tile>
-                              <mat-grid-tile [colspan]="2" [rowspan]="1" class="input-wrapper">
-                                <label class="appr-text-label">Pin code</label>
-                                <input type="text" [disabled]="true"
-                                  [value]="employmentDetails && employmentDetails.pinCode ? employmentDetails.pinCode : ''"
-                                  class="appr-text-field">
-                              </mat-grid-tile>
-                            </mat-grid-list>
+                              <mat-grid-list cols="2" rowHeight="100px">
+                                <mat-grid-tile [colspan]="2" [rowspan]="1" class="input-wrapper">
+                                  <label class="appr-text-label">Pay band (grade pay)</label>
+                                  <input type="text" [disabled]="true"
+                                    [value]="employmentDetails && employmentDetails.payType ? employmentDetails.payType : ''"
+                                    class="appr-text-field">
+                                </mat-grid-tile>
+                                <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                                  <label class="appr-text-label">Service</label>
+                                  <input type="text" [disabled]="true"
+                                    [value]="employmentDetails && employmentDetails.service ? employmentDetails.service : ''"
+                                    class="appr-text-field">
+                                </mat-grid-tile>
+                                <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                                  <label class="appr-text-label">Cadre</label>
+                                  <input type="text" [disabled]="true"
+                                    [value]="employmentDetails && employmentDetails.cadre ? employmentDetails.cadre : ''"
+                                    class="appr-text-field">
+                                </mat-grid-tile>
+                                <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                                  <label class="appr-text-label">Allotment year of service</label>
+                                  <input type="text" [disabled]="true"
+                                    [value]="employmentDetails && employmentDetails.allotmentYearOfService ? employmentDetails.allotmentYearOfService : ''"
+                                    class="appr-text-field">
+                                </mat-grid-tile>
+                                <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                                  <label class="appr-text-label">Date of joining</label>
+                                  <input type="text" [disabled]="true"
+                                    [value]="employmentDetails && employmentDetails.dojOfService ? employmentDetails.dojOfService : ''"
+                                    class="appr-text-field">
+                                </mat-grid-tile>
+                                <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                                  <label class="appr-text-label">Civil list number</label>
+                                  <input type="text" [disabled]="true"
+                                    [value]="employmentDetails && employmentDetails.civilListNo ? employmentDetails.civilListNo : ''"
+                                    class="appr-text-field">
+                                </mat-grid-tile>
+                                <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                                  <label class="appr-text-label">Emplyee code</label>
+                                  <input type="text" [disabled]="true"
+                                    [value]="employmentDetails && employmentDetails.employeeCode ? employmentDetails.employeeCode : ''"
+                                    class="appr-text-field">
+                                </mat-grid-tile>
+                                <!-- <mat-grid-tile [colspan]="2" [rowspan]="1" class="input-wrapper">
+                                  <label class="appr-text-label">Location</label>
+                                  <input type="text" [disabled]="true" [value]="professionalDetails.location"
+                                    class="appr-text-field">
+                                </mat-grid-tile> -->
+                                <mat-grid-tile [colspan]="2" [rowspan]="1" class="input-wrapper">
+                                  <label class="appr-text-label">Official postal address</label>
+                                  <textarea [disabled]="true" rows="3"
+                                    [value]="employmentDetails && employmentDetails.officialPostalAddress ? employmentDetails.officialPostalAddress : ''"
+                                    class="appr-text-field"></textarea>
+                                </mat-grid-tile>
+                                <mat-grid-tile [colspan]="2" [rowspan]="1" class="input-wrapper">
+                                  <label class="appr-text-label">Pin code</label>
+                                  <input type="text" [disabled]="true"
+                                    [value]="employmentDetails && employmentDetails.pinCode ? employmentDetails.pinCode : ''"
+                                    class="appr-text-field">
+                                </mat-grid-tile>
+                              </mat-grid-list>
+
+                              <button mat-raised-button type="submit"
+                                (click)="onSubmit(updateProfessionalForm, 'Professional')"
+                                class="margin-top-m text-white btn-success btn-responsive"
+                                [disabled]="updateProfessionalForm?.invalid">
+                                <span class="text-white" i18n>
+                                  Update
+                                </span>
+                              </button>
+                            </form>
                           </ng-container>
                         </div>
                       </div>
@@ -482,7 +530,7 @@
                                   </mat-list-option>
                                 </mat-selection-list>
                               </div>
-                              <button mat-raised-button type="submit" (click)="onSubmit(updateUserRoleForm)"
+                              <button mat-raised-button type="submit" (click)="onSubmit(updateUserRoleForm, 'Roles')"
                                 class="margin-top-m text-white btn-success btn-responsive"
                                 [disabled]="updateUserRoleForm?.invalid">
                                 <span class="text-white" i18n>
diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
index fe121b124..7d90ac10d 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
@@ -3,7 +3,7 @@ import { ActivatedRoute, Router, Event, NavigationEnd } from '@angular/router'
 import moment from 'moment'
 import { FormGroup, FormControl, Validators } from '@angular/forms'
 import { UsersService } from '../../services/users.service'
-import { MatSnackBar } from '@angular/material'
+import { MatChipInputEvent, MatSnackBar } from '@angular/material'
 // tslint:disable-next-line
 import _ from 'lodash'
 import { EventService } from '@sunbird-cb/utils'
@@ -48,6 +48,9 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
   breadcrumbs: any
   isMdoAdmin = false
   isMdoLeader = false
+  designationsMeta!: any
+  updateProfessionalForm: FormGroup
+  public selectedtags: any[] = []
 
   @HostListener('window:scroll', ['$event'])
   handleScroll() {
@@ -70,6 +73,7 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
         // console.log(this.activeRoute.snapshot.data.profileData.data, 'this.activeRoute.snapshot.data.profileData.data')
         this.configSvc = this.activeRoute.snapshot.data.configService || {}
         const profileDataAll = this.activeRoute.snapshot.data.profileData.data || {}
+        console.log('profileDataAll', profileDataAll)
         const profileData = profileDataAll.profileDetails
         if (profileData) {
           this.userID = profileData.id || profileData.userId || profileDataAll.id
@@ -243,9 +247,15 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
     this.updateUserRoleForm = new FormGroup({
       roles: new FormControl('', [Validators.required]),
     })
+
+    this.updateProfessionalForm = new FormGroup({
+      designation: new FormControl('', [Validators.required]),
+      tags: new FormControl('', []),
+    })
   }
 
   ngOnInit() {
+    this.init()
     this.tabsData = [
       {
         name: 'Personal details',
@@ -279,6 +289,27 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
       }]
   }
 
+  async init() {
+    await this.loadDesignations()
+  }
+
+  async loadDesignations() {
+    await this.usersSvc.getDesignations({}).subscribe(
+      (data: any) => {
+        this.designationsMeta = data.responseData
+      },
+      (_err: any) => {
+      })
+  }
+
+  otherDropDownChange(value: any, field: string) {
+    if (field === 'designation' && value !== 'Other') {
+      console.log('value', value)
+      // this.showDesignationOther = false
+      // this.createUserForm.controls['designationOther'].setValue('')
+    }
+  }
+
   ngAfterViewInit() {
     this.elementPosition = this.menuElement.nativeElement.parentElement.offsetTop
   }
@@ -320,31 +351,90 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
     this.updateUserRoleForm.controls['roles'].setValue(this.orguserRoles)
   }
 
-  onSubmit(form: any) {
-    if (form.value.roles !== this.orguserRoles) {
-      const dreq = {
-        request: {
-          organisationId: this.department,
-          userId: this.userID,
-          roles: form.value.roles,
-        },
-      }
+  addActivity(event: MatChipInputEvent) {
+    const input = event.input
+    const value = event.value as unknown
+    if ((value || '')) {
+      this.selectedtags.push(value)
+      console.log('this.selectedtags', this.selectedtags)
+    }
+    if (input) {
+      input.value = ''
+    }
+    if (this.updateProfessionalForm.get('tags')) {
+      // tslint:disable-next-line: no-non-null-assertion
+      this.updateProfessionalForm.get('tags')!.setValue(null)
+    }
+    this.updateProfessionalForm.controls['tags'].reset()
+    this.updateProfessionalForm.controls['tags'].markAsPristine()
+    this.updateProfessionalForm.controls['tags'].markAsUntouched()
+  }
 
-      this.usersSvc.addUserToDepartment(dreq).subscribe(dres => {
-        if (dres) {
-          this.updateUserRoleForm.reset({ roles: '' })
-          this.openSnackbar('User role updated Successfully')
-          if (this.qpParam === 'MDOinfo') {
-            this.router.navigate(['/app/home/mdoinfo/leadership'])
-          } else {
-            this.router.navigate(['/app/home/users'])
-          }
+  removeActivity(interest: any) {
+    const index = this.selectedtags.indexOf(interest)
+    if (index >= 0) {
+      this.selectedtags.splice(index, 1)
+      console.log('this.selectedtags', this.selectedtags)
+    }
+
+    checkForChange(activityList: any) {
+      const newobj: any = []
+      activityList.forEach((val: any) => {
+        const reqObj = {
+          name: val,
         }
+        newobj.push(reqObj)
       })
-    } else {
-      this.openSnackbar('Select new roles')
     }
-  }
+
+    onSubmit(form: any, ftype: any) {
+      if (ftype === 'Professional') {
+        const dreq = {
+          request: {
+            organisationId: this.department,
+            userId: this.userID,
+            roles: form.value.roles,
+          },
+        }
+
+        this.usersSvc.addUserToDepartment(dreq).subscribe(dres => {
+          if (dres) {
+            this.updateUserRoleForm.reset({ roles: '' })
+            this.openSnackbar('User role updated Successfully')
+            if (this.qpParam === 'MDOinfo') {
+              this.router.navigate(['/app/home/mdoinfo/leadership'])
+            } else {
+              this.router.navigate(['/app/home/users'])
+            }
+          }
+        })
+      } else {
+        if (form.value.roles !== this.orguserRoles) {
+          const dreq = {
+            request: {
+              organisationId: this.department,
+              userId: this.userID,
+              roles: form.value.roles,
+            },
+          }
+
+          this.usersSvc.addUserToDepartment(dreq).subscribe(dres => {
+            if (dres) {
+              this.updateUserRoleForm.reset({ roles: '' })
+              this.openSnackbar('User role updated Successfully')
+              if (this.qpParam === 'MDOinfo') {
+                this.router.navigate(['/app/home/mdoinfo/leadership'])
+              } else {
+                this.router.navigate(['/app/home/users'])
+              }
+            }
+          })
+        } else {
+          this.openSnackbar('Select new roles')
+        }
+      }
+
+    }
 
   private openSnackbar(primaryMsg: string, duration: number = 5000) {
     this.snackBar.open(primaryMsg, 'X', {
diff --git a/project/ws/app/src/lib/routes/users/services/users.service.ts b/project/ws/app/src/lib/routes/users/services/users.service.ts
index 03666899e..32e4d0f89 100644
--- a/project/ws/app/src/lib/routes/users/services/users.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/users.service.ts
@@ -24,7 +24,8 @@ const API_END_POINTS = {
   NEW_USER_BLOCK_API: '/apis/proxies/v8/user/v1/block',
   NEW_USER_UN_BLOCK_API: '/apis/proxies/v8/user/v1/unblock',
   SEARCH_USER_TABLE: '/apis/proxies/v8/user/v1/search',
-
+  getDesignation: '/apis/proxies/v8/user/v1/positions',
+  updateUserDetails: '/apis/proxies/v8/user/v1/extPatch',
   // GET_BULKUPLOAD_DATA: '/apis/protected/v8/admin/userRegistration/bulkUploadData',
 }
 
@@ -186,4 +187,12 @@ export class UsersService {
   checkForUserReport(url: string) {
     return this.http.get<any>(url)
   }
+
+  getDesignations(_req: any) {
+    return this.http.get<any>(API_END_POINTS.getDesignation)
+  }
+
+  updateUserDetails(reqBody: any) {
+    return this.http.post<any>(`${API_END_POINTS.updateUserDetails}`, reqBody)
+  }
 }
diff --git a/project/ws/app/src/lib/routes/users/users.module.ts b/project/ws/app/src/lib/routes/users/users.module.ts
index 02fb1ffdc..16c085949 100644
--- a/project/ws/app/src/lib/routes/users/users.module.ts
+++ b/project/ws/app/src/lib/routes/users/users.module.ts
@@ -8,7 +8,7 @@ import { BreadcrumbsOrgModule, ScrollspyLeftMenuModule, UIORGTableModule } from
 import {
   MatSidenavModule, MatGridListModule, MatListModule, MatCardModule, MatFormFieldModule, MatInputModule,
   MatIconModule, MatButtonModule, MatRadioModule, MatDialogModule, MatSelectModule, MatProgressSpinnerModule,
-  MatPaginatorModule, MatTableModule, MatSortModule,
+  MatPaginatorModule, MatTableModule, MatSortModule, MatChipsModule,
 } from '@angular/material'
 import { MatExpansionModule } from '@angular/material/expansion'
 import { MatDividerModule } from '@angular/material/divider'
@@ -27,7 +27,7 @@ import { PipeEmailModule } from '../pipes/pipe-email/pipe-email.module'
     MatFormFieldModule, MatInputModule, MatButtonModule, MatIconModule, MatGridListModule,
     MatRadioModule, MatDialogModule, ReactiveFormsModule, MatSelectModule, MatProgressSpinnerModule,
     MatExpansionModule, MatDividerModule, MatPaginatorModule, MatTableModule, WidgetResolverModule, MatSortModule, PipeEmailModule,
-    UIORGTableModule,
+    UIORGTableModule, MatChipsModule,
   ],
   providers: [RolesService, FileService, DatePipe],
   exports: [UsersUploadComponent],

From bf695596b3c853a25f8bc23fd79bdd9887e206c5 Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Thu, 19 Oct 2023 15:56:07 +0530
Subject: [PATCH 266/887] lint error resolved

---
 .../src/lib/routes/access/routes/home/home.component.ts  | 2 +-
 .../components/batch-details/batch-details.component.ts  | 6 +++---
 .../components/blended-home/blended-home.component.ts    | 2 +-
 .../users/routes/create-user/create-user.component.ts    | 9 ++++++---
 .../routes/users/routes/view-user/view-user.component.ts | 2 +-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/project/ws/app/src/lib/routes/access/routes/home/home.component.ts b/project/ws/app/src/lib/routes/access/routes/home/home.component.ts
index bdbfaef11..efab2b097 100644
--- a/project/ws/app/src/lib/routes/access/routes/home/home.component.ts
+++ b/project/ws/app/src/lib/routes/access/routes/home/home.component.ts
@@ -36,7 +36,7 @@ export class HomeComponent implements OnInit, OnDestroy {
       if (event instanceof NavigationEnd) {
         this.bindUrl(event.urlAfterRedirects.replace('/app/roles-access/', ''))
         const fullProfile = _.get(this.activeRoute.snapshot, 'data.configService')
-        const departmentName = fullProfile ? fullProfile.unMappedUser.channel : ''
+        const departmentName = fullProfile ? fullProfile.unMappedUser.rootOrg.orgName : ''
         // if (this.activeRoute.snapshot.data.department.data) {
         if (fullProfile) {
           const leftData = this.activeRoute.snapshot.data.pageData.data.menus
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index ceb07dcdc..90e1a5dcc 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -136,7 +136,7 @@ export class BatchDetailsComponent implements OnInit {
       applicationIds: [this.batchData.batchId],
       limit: 100,
       offset: 0,
-      deptName: this.userProfile.channel,
+      deptName: this.userProfile.rootOrg.orgName,
     }
     this.bpService.getRequests(request).subscribe((res: any) => {
       if (res) {
@@ -165,7 +165,7 @@ export class BatchDetailsComponent implements OnInit {
       applicationIds: [this.batchData.batchId],
       limit: 100,
       offset: 0,
-      deptName: this.userProfile.channel,
+      deptName: this.userProfile.rootOrg.orgName,
     }
     this.bpService.getRequests(request).subscribe((res: any) => {
       if (res) {
@@ -182,7 +182,7 @@ export class BatchDetailsComponent implements OnInit {
       applicationIds: [this.batchData.batchId],
       limit: 100,
       offset: 0,
-      deptName: [this.userProfile.channel],
+      deptName: [this.userProfile.rootOrg.orgName],
     }
     this.bpService.getSerchRequests(request).subscribe((res: any) => {
       if (res) {
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.ts
index 65f5fcfd0..6072816b9 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.ts
@@ -30,7 +30,7 @@ export class BlendedHomeComponent implements OnInit {
       if (event instanceof NavigationEnd) {
         this.bindUrl(event.urlAfterRedirects.replace('/app/blended-approvals/', ''))
         const fullProfile = _.get(this.activeRoute.snapshot, 'data.configService')
-        const departmentName = fullProfile ? fullProfile.unMappedUser.channel : ''
+        const departmentName = fullProfile ? fullProfile.unMappedUser.rootOrg.orgName : ''
         if (fullProfile) {
           const leftData = this.activeRoute.snapshot.data.pageData.data.menus
           _.set(leftData, 'widgetData.logo', true)
diff --git a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
index 69e863cfe..74504180e 100644
--- a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
@@ -30,6 +30,7 @@ export class CreateUserComponent implements OnInit, OnDestroy {
   namePatern = `^[a-zA-Z\\s\\']{1,32}$`
   department: any = {}
   departmentName = ''
+  channelName = ''
   toastSuccess: any
   rolesList: any = []
   rolesObject: any = []
@@ -70,6 +71,7 @@ export class CreateUserComponent implements OnInit, OnDestroy {
       if (event instanceof NavigationEnd) {
         this.bindUrl(event.urlAfterRedirects.replace('/app/home/', ''))
         if (_.get(this.activeRoute.snapshot, 'data.profileData.data')) {
+
           const leftData = this.activeRoute.snapshot.data.pageData.data.menus
           _.set(leftData, 'widgetData.logo', true)
           _.set(leftData, 'widgetData.logoPath', _.get(this.activeRoute, 'snapshot.data.profileData.data.rootOrg.imgUrl'))
@@ -80,7 +82,7 @@ export class CreateUserComponent implements OnInit, OnDestroy {
         } else {
           const leftData = this.activeRoute.snapshot.data.pageData.data.menus
           const fullProfile = _.get(this.activeRoute.snapshot, 'data.configService')
-          _.set(leftData, 'widgetData.name', fullProfile ? fullProfile.unMappedUser.channel : '')
+          _.set(leftData, 'widgetData.name', fullProfile ? fullProfile.unMappedUser.rootOrg.orgName : '')
           this.widgetData = leftData
         }
       }
@@ -89,7 +91,8 @@ export class CreateUserComponent implements OnInit, OnDestroy {
       if (event instanceof NavigationEnd) {
         const fullProfile = _.get(this.activeRoute.snapshot, 'data.configService')
         this.department = fullProfile.unMappedUser.rootOrgId
-        this.departmentName = fullProfile ? fullProfile.unMappedUser.channel : ''
+        this.channelName = fullProfile ? fullProfile.unMappedUser.channel : ''
+        this.departmentName = fullProfile ? fullProfile.unMappedUser.rootOrg.orgName : ''
         const orgLst = _.get(this.activeRoute.snapshot, 'data.rolesList.data.orgTypeList')
 
         if (this.configService.unMappedUser && this.configService.unMappedUser.roles) {
@@ -206,7 +209,7 @@ export class CreateUserComponent implements OnInit, OnDestroy {
         userName: form.value.fname,
         firstName: form.value.fname,
         // lastName: form.value.lname,
-        channel: this.departmentName ? this.departmentName : null,
+        channel: this.channelName ? this.channelName : null,
         roles: form.value.roles,
       },
     }
diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
index fe121b124..742eefd19 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
@@ -88,7 +88,7 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
         }
         const fullProfile = _.get(this.activeRoute.snapshot, 'data.configService')
         this.department = fullProfile.unMappedUser.rootOrgId
-        this.departmentName = fullProfile ? fullProfile.unMappedUser.channel : ''
+        this.departmentName = fullProfile ? fullProfile.unMappedUser.rootOrg.orgName : ''
         const orgLst = _.get(this.activeRoute.snapshot, 'data.rolesList.data.orgTypeList')
 
         if (fullProfile.unMappedUser && fullProfile.unMappedUser.roles) {

From d00dd92c260f458098501d58a0e966c9604df9d3 Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Fri, 20 Oct 2023 18:51:12 +0530
Subject: [PATCH 267/887] Updated designation & tags field in user edit page

---
 .../routes/view-user/view-user.component.html |  79 +++++++-------
 .../routes/view-user/view-user.component.scss |  29 +++++
 .../routes/view-user/view-user.component.ts   | 100 +++++++++++-------
 .../routes/users/services/users.service.ts    |   2 +-
 4 files changed, 127 insertions(+), 83 deletions(-)

diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
index f5b6e7fcd..1eb4b1d51 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
@@ -299,52 +299,23 @@
                                     [value]="professionalDetails.industry || professionalDetails.industryOther || ''"
                                     class="appr-text-field">
                                 </mat-grid-tile>
+
+                                <!-- designation -->
                                 <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                                   <label class="appr-text-label">Designation</label>
                                   <!-- <input type="text" [disabled]="true"
                                     [value]="professionalDetails.designation || professionalDetails.designationOther || ''"
                                     class="appr-text-field"> -->
-                                  <mat-form-field appearance="outline" class="margin-top-xs">
-                                    <mat-select #designation formControlName="designation" i18n-placeholder
-                                      placeholder="--Select--"
-                                      (selectionChange)="otherDropDownChange(designation.value, 'designation')">
-                                      <mat-option [value]="designation.name"
-                                        *ngFor="let designation of designationsMeta">
-                                        {{designation.name}}
-                                      </mat-option>
-                                      <mat-option [value]="'Other'">Other</mat-option>
-                                    </mat-select>
-                                  </mat-form-field>
-                                </mat-grid-tile>
-                                <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                                  <label class="appr-text-label">Tags</label>
-                                  <div class="left-input-div">
-                                    <mat-form-field appearance="outline" class="margin-top-xs full-width flex flex-1">
-                                      <input #tags matInput i18n-placeholder="Type the tag and press enter" rows="5"
-                                        placeholder="Type the tag and press enter" formControlName="tags"
-                                        i18n-aria-label aria-label="Enter tag" [matChipInputFor]="chipListTags"
-                                        maxlength="100" [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
-                                        (matChipInputTokenEnd)="addActivity($event)" class="w-full-imp" />
-                                    </mat-form-field>
-                                  </div>
-                                  <div class="right-input-div">
-                                    <button mat-raised-button type="button"
-                                      (click)="addActivity({input: tags, value: tags.value})"
-                                      class="text-white btn-add-activity btn-responsive">
-                                      <span class="text-white" i18n>Add tag</span>
-                                    </button>
-                                  </div>
-                                  <div class="flex flex-row justify-between margin-top-s">
-                                    <mat-hint class="text-left text_hint mat-body-2">Start adding the tags.</mat-hint>
-                                  </div>
-                                  <mat-chip-list #chipListTags>
-                                    <mat-chip *ngFor="let tag of selectedtags" [selectable]="true" [removable]="true"
-                                      (removed)="removeActivity(tag)">
-                                      {{ tag }}
-                                      <mat-icon matChipRemove>cancel</mat-icon>
-                                    </mat-chip>
-                                  </mat-chip-list>
+                                  <mat-select class="appr-text-field" #designation formControlName="designation"
+                                    i18n-placeholder placeholder="--Select--"
+                                    (selectionChange)="otherDropDownChange(designation.value, 'designation')">
+                                    <mat-option [value]="designation.name" *ngFor="let designation of designationsMeta">
+                                      {{designation.name}}
+                                    </mat-option>
+                                    <mat-option [value]="'Other'">Other</mat-option>
+                                  </mat-select>
                                 </mat-grid-tile>
+
                                 <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                                   <label class="appr-text-label">Location</label>
                                   <input type="text" [disabled]="true"
@@ -428,10 +399,36 @@
                                 </mat-grid-tile>
                               </mat-grid-list>
 
+                              <div class="margin-bottom-l">
+                                <label class="appr-text-label">Tags</label>
+                                <div class="left-input-div">
+                                  <input class="appr-text-field w-full-imp" #tags matInput
+                                    i18n-placeholder="Type tag here" placeholder="Type tag here" formControlName="tags"
+                                    i18n-aria-label aria-label="Enter tag" [matChipInputFor]="chipListTags"
+                                    autocomplete="off" maxlength="100"
+                                    [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
+                                    (matChipInputTokenEnd)="addActivity($event)" />
+                                </div>
+                                <div class="right-input-div">
+                                  <button mat-raised-button type="button"
+                                    (click)="addActivity({input: tags, value: tags.value})"
+                                    class="text-white btn-add-activity btn-responsive">
+                                    <span class="text-white" i18n>Add tag</span>
+                                  </button>
+                                </div>
+                                <mat-chip-list #chipListTags>
+                                  <mat-chip *ngFor="let tag of selectedtags" [selectable]="true" [removable]="true"
+                                    (removed)="removeActivity(tag)">
+                                    {{ tag }}
+                                    <mat-icon matChipRemove>cancel</mat-icon>
+                                  </mat-chip>
+                                </mat-chip-list>
+                              </div>
+
                               <button mat-raised-button type="submit"
                                 (click)="onSubmit(updateProfessionalForm, 'Professional')"
                                 class="margin-top-m text-white btn-success btn-responsive"
-                                [disabled]="updateProfessionalForm?.invalid">
+                                [disabled]="!updateProfessionalForm.dirty">
                                 <span class="text-white" i18n>
                                   Update
                                 </span>
diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.scss b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.scss
index 051147cc4..ad7e47591 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.scss
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.scss
@@ -487,3 +487,32 @@ textarea {
   height: 30px;
   width: 30px
 }
+
+.text_hint {
+  margin-top: -20px;
+  color: rgba($color: #000000, $alpha: .4);
+}
+
+.left-input-div {
+  width: 40%;
+  display: inline-flex;
+}
+.right-input-div {
+  width: 14%;
+  display: inline-flex;
+  vertical-align: middle;
+}
+
+.btn-add-activity {
+  width: 70%;
+  background: no-repeat padding-box #0074b6 !important;
+  border-radius: 4px;
+  padding: 0px 0;
+  box-sizing: border-box;
+  margin: 0 12px;
+  line-height: 30px;
+}
+.mat-chip-list {
+  margin-top: 2px;
+  display: flex;
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
index ce07d5aa1..210886c83 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
@@ -51,6 +51,7 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
   designationsMeta!: any
   updateProfessionalForm: FormGroup
   public selectedtags: any[] = []
+  reqbody: any
 
   @HostListener('window:scroll', ['$event'])
   handleScroll() {
@@ -73,7 +74,6 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
         // console.log(this.activeRoute.snapshot.data.profileData.data, 'this.activeRoute.snapshot.data.profileData.data')
         this.configSvc = this.activeRoute.snapshot.data.configService || {}
         const profileDataAll = this.activeRoute.snapshot.data.profileData.data || {}
-        console.log('profileDataAll', profileDataAll)
         const profileData = profileDataAll.profileDetails
         if (profileData) {
           this.userID = profileData.id || profileData.userId || profileDataAll.id
@@ -89,6 +89,11 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
           this.interests = profileData.interests
           this.userStatus = profileDataAll.isDeleted ? 'Inactive' : 'Active'
 
+          if (this.professionalDetails) {
+            const value = this.professionalDetails.designation || this.professionalDetails.designationOther || ''
+            this.updateProfessionalForm.controls['designation'].setValue(value)
+          }
+
         }
         const fullProfile = _.get(this.activeRoute.snapshot, 'data.configService')
         this.department = fullProfile.unMappedUser.rootOrgId
@@ -249,7 +254,7 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
     })
 
     this.updateProfessionalForm = new FormGroup({
-      designation: new FormControl('', [Validators.required]),
+      designation: new FormControl('', []),
       tags: new FormControl('', []),
     })
   }
@@ -304,9 +309,7 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
 
   otherDropDownChange(value: any, field: string) {
     if (field === 'designation' && value !== 'Other') {
-      console.log('value', value)
-      // this.showDesignationOther = false
-      // this.createUserForm.controls['designationOther'].setValue('')
+      this.updateProfessionalForm.controls['designation'].setValue(value)
     }
   }
 
@@ -356,7 +359,6 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
     const value = event.value as unknown
     if ((value || '')) {
       this.selectedtags.push(value)
-      console.log('this.selectedtags', this.selectedtags)
     }
     if (input) {
       input.value = ''
@@ -374,21 +376,58 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
     const index = this.selectedtags.indexOf(interest)
     if (index >= 0) {
       this.selectedtags.splice(index, 1)
-      console.log('this.selectedtags', this.selectedtags)
     }
+  }
 
-    checkForChange(activityList: any) {
-      const newobj: any = []
-      activityList.forEach((val: any) => {
-        const reqObj = {
-          name: val,
+  checkForChange(activityList: any) {
+    const newobj: any = []
+    activityList.forEach((val: any) => {
+      const reqObj = {
+        name: val,
+      }
+      newobj.push(reqObj)
+    })
+  }
+
+  onSubmit(form: any, ftype: any) {
+    if (ftype === 'Professional') {
+      const tags = this.professionalDetails.tags
+      if (tags !== this.selectedtags) {
+        this.reqbody = {
+          request: {
+            userId: this.userID,
+            profileDetails: {
+              professionalDetails: {
+                designation: this.updateProfessionalForm.controls['designation'].value,
+                tags: this.selectedtags,
+              },
+            },
+          },
+        }
+      } else {
+        this.reqbody = {
+          request: {
+            userId: this.userID,
+            profileDetails: {
+              professionalDetails: {
+                designation: this.updateProfessionalForm.controls['designation'].value,
+              },
+            },
+          },
+        }
+      }
+      this.usersSvc.updateUserDetails(this.reqbody).subscribe(dres => {
+        if (dres) {
+          this.openSnackbar('User updated Successfully')
+          if (this.qpParam === 'MDOinfo') {
+            this.router.navigate(['/app/home/mdoinfo/leadership'])
+          } else {
+            this.router.navigate(['/app/home/users'])
+          }
         }
-        newobj.push(reqObj)
       })
-    }
-
-    onSubmit(form: any, ftype: any) {
-      if (ftype === 'Professional') {
+    } else {
+      if (form.value.roles !== this.orguserRoles) {
         const dreq = {
           request: {
             organisationId: this.department,
@@ -409,33 +448,12 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
           }
         })
       } else {
-        if (form.value.roles !== this.orguserRoles) {
-          const dreq = {
-            request: {
-              organisationId: this.department,
-              userId: this.userID,
-              roles: form.value.roles,
-            },
-          }
-
-          this.usersSvc.addUserToDepartment(dreq).subscribe(dres => {
-            if (dres) {
-              this.updateUserRoleForm.reset({ roles: '' })
-              this.openSnackbar('User role updated Successfully')
-              if (this.qpParam === 'MDOinfo') {
-                this.router.navigate(['/app/home/mdoinfo/leadership'])
-              } else {
-                this.router.navigate(['/app/home/users'])
-              }
-            }
-          })
-        } else {
-          this.openSnackbar('Select new roles')
-        }
+        this.openSnackbar('Select new roles')
       }
-
     }
 
+  }
+
   private openSnackbar(primaryMsg: string, duration: number = 5000) {
     this.snackBar.open(primaryMsg, 'X', {
       duration,
diff --git a/project/ws/app/src/lib/routes/users/services/users.service.ts b/project/ws/app/src/lib/routes/users/services/users.service.ts
index 8c722496e..5934fdf66 100644
--- a/project/ws/app/src/lib/routes/users/services/users.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/users.service.ts
@@ -25,7 +25,7 @@ const API_END_POINTS = {
   NEW_USER_UN_BLOCK_API: '/apis/proxies/v8/user/v1/unblock',
   SEARCH_USER_TABLE: '/apis/proxies/v8/user/v1/search',
   getDesignation: '/apis/proxies/v8/user/v1/positions',
-  updateUserDetails: '/apis/proxies/v8/user/v1/extPatch',
+  updateUserDetails: '/apis/proxies/v8/user/v1/admin/extPatch',
   SEND_OTP: '/apis/proxies/v8/otp/v1/generate',
   RESEND_OTP: '/apis/proxies/v8/otp/v1/generate',
   VERIFY_OTP: '/apis/proxies/v8/otp/v1/verify',

From 5f6c5f855cbc0e5f3d2ff1c5e7bbbd9ab5b7108d Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Fri, 20 Oct 2023 18:54:42 +0530
Subject: [PATCH 268/887] Verifiy Karmayogi badge changes

---
 .../approvals/routes/basic-info/basic-info.component.html  | 7 ++++++-
 .../approvals/routes/basic-info/basic-info.component.ts    | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.html b/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.html
index eb03b666a..16ef60d3a 100644
--- a/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.html
+++ b/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.html
@@ -103,7 +103,7 @@
 
                 <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                   <label class="appr-text-label">Postal address</label>
-                  <textarea [disabled]="true" rows="3" [value]="basicInfo.postalAddress"
+                  <textarea [disabled]="true" rows="2" [value]="basicInfo.postalAddress"
                     class="appr-text-field"></textarea>
                 </mat-grid-tile>
 
@@ -112,6 +112,11 @@
                   <input type="text" [disabled]="true" [value]="basicInfo.pincode" class="appr-text-field">
                 </mat-grid-tile>
 
+                <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                  <label class="appr-text-label">Earn your Karmayogi Badge today</label>
+                  <input type="checkbox" [disabled]="true" [checked]="verifiedKarmayogi">
+                </mat-grid-tile>
+
               </mat-grid-list>
             </ng-container>
           </div>
diff --git a/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.ts b/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.ts
index 7b21aa1ae..b53e15d58 100644
--- a/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.ts
+++ b/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.ts
@@ -13,6 +13,7 @@ import _ from 'lodash'
 export class BasicInfoComponent implements OnInit {
   basicInfo: any
   imagePath: any
+  verifiedKarmayogi: boolean = false
   constructor(private activeRoute: ActivatedRoute, private router: Router) {
     this.router.events.subscribe((event: Event) => {
       if (event instanceof NavigationEnd) {
@@ -24,6 +25,7 @@ export class BasicInfoComponent implements OnInit {
         // console.log(this.activeRoute.snapshot, 'this.activeRoute.snapshot====')
         this.basicInfo = profileData.personalDetails
         this.imagePath = profileData.photo
+        this.verifiedKarmayogi = profileData.verifiedKarmayogi
       }
     })
   }

From feb30e070cb3b611e4f0a1186220e18eb458282c Mon Sep 17 00:00:00 2001
From: NandiniAV <nandini.achutha@tarento.com>
Date: Fri, 20 Oct 2023 19:06:56 +0530
Subject: [PATCH 269/887] Updated update button condition

---
 .../users/routes/view-user/view-user.component.html      | 9 ++++++++-
 .../routes/users/routes/view-user/view-user.component.ts | 5 +++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
index 1eb4b1d51..d05bd8eb9 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
@@ -428,7 +428,14 @@
                               <button mat-raised-button type="submit"
                                 (click)="onSubmit(updateProfessionalForm, 'Professional')"
                                 class="margin-top-m text-white btn-success btn-responsive"
-                                [disabled]="!updateProfessionalForm.dirty">
+                                [disabled]="!updateProfessionalForm.dirty" *ngIf="!isTagsEdited">
+                                <span class="text-white" i18n>
+                                  Update
+                                </span>
+                              </button>
+                              <button mat-raised-button type="submit"
+                                (click)="onSubmit(updateProfessionalForm, 'Professional')"
+                                class="margin-top-m text-white btn-success btn-responsive" *ngIf="isTagsEdited">
                                 <span class="text-white" i18n>
                                   Update
                                 </span>
diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
index 210886c83..9852910f9 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
@@ -52,6 +52,7 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
   updateProfessionalForm: FormGroup
   public selectedtags: any[] = []
   reqbody: any
+  isTagsEdited = false
 
   @HostListener('window:scroll', ['$event'])
   handleScroll() {
@@ -358,6 +359,7 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
     const input = event.input
     const value = event.value as unknown
     if ((value || '')) {
+      this.isTagsEdited = true
       this.selectedtags.push(value)
     }
     if (input) {
@@ -368,14 +370,13 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
       this.updateProfessionalForm.get('tags')!.setValue(null)
     }
     this.updateProfessionalForm.controls['tags'].reset()
-    this.updateProfessionalForm.controls['tags'].markAsPristine()
-    this.updateProfessionalForm.controls['tags'].markAsUntouched()
   }
 
   removeActivity(interest: any) {
     const index = this.selectedtags.indexOf(interest)
     if (index >= 0) {
       this.selectedtags.splice(index, 1)
+      this.isTagsEdited = true
     }
   }
 

From e4b82e5dcc7402b051cecc892fc80b05d94a40a2 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Mon, 23 Oct 2023 16:25:22 +0530
Subject: [PATCH 270/887] Update Postion with Designation

---
 .../components/officer/officer.component.html               | 6 +++---
 .../create-workallocation.component.html                    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/workallocation-v2/components/officer/officer.component.html b/project/ws/app/src/lib/routes/workallocation-v2/components/officer/officer.component.html
index 96ba4952f..0424f6248 100644
--- a/project/ws/app/src/lib/routes/workallocation-v2/components/officer/officer.component.html
+++ b/project/ws/app/src/lib/routes/workallocation-v2/components/officer/officer.component.html
@@ -63,7 +63,7 @@
     </div>
     <div class="flex flex-column">
       <div class="ws-mat-black040-bg padding-left-m padding-xs mat-body-2 font-bold-i">
-        Position
+        Designation
       </div>
       <div class="flex flex-1 control ws-mat-accent-b">
         <mat-form-field appearance="outline" class="flex-1 full-width no-pb square outline-color">
@@ -74,7 +74,7 @@
             maxlength="250">
             </textarea>
           <mat-autocomplete #positionAuto="matAutocomplete" (optionSelected)="postionClicked($event)">
-            <div class="mat-body-4 ws-mat-accent-text padding-s">From position dictionary</div>
+            <div class="mat-body-4 ws-mat-accent-text padding-s">From designation dictionary</div>
             <mat-option *ngFor="let pos of filteredPositionlist | async" [value]="pos">
               <div class="ws-mat-accent-border-bottom padding-m padding-left-s padding-bottom-xs">
                 <div class="mat-body-2 font-bold-i margin-bottom-xxs">{{pos.name}}</div>
@@ -87,7 +87,7 @@
     </div>
     <div class="col-span-2 flex flex-column">
       <div class="ws-mat-black040-bg padding-left-m padding-xs mat-body-2 ws-mat-black40-text">
-        Position description
+        Designation description
       </div>
       <div class=" flex flex-1 control">
         <mat-form-field appearance="outline" class="flex-1 full-width no-pb square outline-color">
diff --git a/project/ws/app/src/lib/routes/workallocation/routes/create-workallocation/create-workallocation.component.html b/project/ws/app/src/lib/routes/workallocation/routes/create-workallocation/create-workallocation.component.html
index 22935e249..041e189e9 100644
--- a/project/ws/app/src/lib/routes/workallocation/routes/create-workallocation/create-workallocation.component.html
+++ b/project/ws/app/src/lib/routes/workallocation/routes/create-workallocation/create-workallocation.component.html
@@ -126,7 +126,7 @@
                                                         <label for="position" class="margin-remove-bottom form-label"
                                                             i18n="Position label|Label which explains the user to enter position"
                                                             i18n-aria-label aria-label="Position label">
-                                                            Position
+                                                            Designation
                                                         </label>
                                                         <mat-form-field appearance="outline" class="margin-top-xs">
                                                             <input type="text" id="position" matInput #position
@@ -140,7 +140,7 @@
                                                                 i18n-aria-label
                                                                 aria-label="Position Error|Explains position is required "
                                                                 *ngIf="newAllocationForm?.controls['position']?.touched && newAllocationForm?.controls['position'].errors?.required">
-                                                                Position is mandatory
+                                                                Designation is mandatory
                                                             </mat-error>
                                                         </mat-form-field>
                                                     </div>
@@ -355,7 +355,7 @@ <h3>Associated activities</h3>
                             will recommend similar items to avoid duplication</label>
                         <label *ngIf="nosimilarUsers && similarUsers.length === 0">No users found</label>
                         <label *ngIf="nosimilarRoles && similarRoles.length === 0">No roles found</label>
-                        <label *ngIf="nosimilarPositions && similarPositions.length === 0">No position found</label>
+                        <label *ngIf="nosimilarPositions && similarPositions.length === 0">No designation found</label>
                         <label *ngIf="nosimilarActivities && similarActivities.length === 0">No activity found</label>
                     </div>
                 </div>

From fe802d20cc783d86ca6dbc5cc6a9b281a92bc853 Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Wed, 25 Oct 2023 18:18:00 +0530
Subject: [PATCH 271/887] Fixed user tags display on load

---
 .../users-upload/users-upload.component.html  |  4 ++--
 .../users-upload/users-upload.component.ts    |  2 ++
 .../routes/view-user/view-user.component.ts   | 23 +++++++++++++------
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
index c5b0c6b5c..5183756f7 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
@@ -28,7 +28,7 @@
             <ng-container *ngIf="fileName && registrationForm.value.otpType==='email'">
               <ng-container *ngIf="userEmail && !otpEmailSend">
                 <p for="email" class=" margin-remove-bottom margin-top-s" i18n-aria-label aria-label="Email label">
-                  OTP will be sent your registered email
+                  OTP will be sent to your registered email
                 </p>
               </ng-container>
               <ng-container *ngIf="!userEmail">
@@ -40,7 +40,7 @@
             <ng-container *ngIf="fileName && registrationForm.value.otpType==='mobile'">
               <ng-container *ngIf="userMobile">
                 <p for="email" class=" margin-remove-bottom margin-top-s" i18n-aria-label aria-label="Email label">
-                  OTP will be sent your registered mobile number
+                  OTP will be sent to your registered mobile number
                 </p>
               </ng-container>
               <ng-container *ngIf="!userMobile">
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
index 889a516a5..68be78d48 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
@@ -87,6 +87,7 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
   ) {
     this.rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
     this.userProfileV2 = _.get(this.route.snapshot.parent, 'data.configService.userProfileV2')
+    console.log('userProfileV2 ', this.userProfileV2)
     this.dataSource = new MatTableDataSource(this.bulkUploadData)
     this.dataSource.paginator = this.paginator
 
@@ -113,6 +114,7 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
       this.registrationForm.updateValueAndValidity()
     }
     if (this.userProfileV2) {
+      console.log('userProfileV2 ', this.userProfileV2)
       this.userMobile = this.userProfileV2.mobile || ''
       this.registrationForm.patchValue({ mobile: this.userMobile })
       this.registrationForm.updateValueAndValidity()
diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
index 9852910f9..2b8f60be3 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
@@ -76,6 +76,7 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
         this.configSvc = this.activeRoute.snapshot.data.configService || {}
         const profileDataAll = this.activeRoute.snapshot.data.profileData.data || {}
         const profileData = profileDataAll.profileDetails
+        this.updateTags(profileData)
         if (profileData) {
           this.userID = profileData.id || profileData.userId || profileDataAll.id
           this.basicInfo = profileData.personalDetails
@@ -355,6 +356,10 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
     this.updateUserRoleForm.controls['roles'].setValue(this.orguserRoles)
   }
 
+  updateTags(profileData: any) {
+    this.selectedtags = _.get(profileData, 'additionalProperties.tag')
+  }
+
   addActivity(event: MatChipInputEvent) {
     const input = event.input
     const value = event.value as unknown
@@ -398,10 +403,12 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
           request: {
             userId: this.userID,
             profileDetails: {
-              professionalDetails: {
-                designation: this.updateProfessionalForm.controls['designation'].value,
-                tags: this.selectedtags,
-              },
+              professionalDetails: [
+                {
+                  designation: this.updateProfessionalForm.controls['designation'].value,
+                  tags: this.selectedtags,
+                }
+              ],
             },
           },
         }
@@ -410,9 +417,11 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
           request: {
             userId: this.userID,
             profileDetails: {
-              professionalDetails: {
-                designation: this.updateProfessionalForm.controls['designation'].value,
-              },
+              professionalDetails: [
+                {
+                  designation: this.updateProfessionalForm.controls['designation'].value,
+                }
+              ],
             },
           },
         }

From 78b0a19905899eeafd8af6ba850f55c4f48f4ee4 Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Wed, 25 Oct 2023 18:18:36 +0530
Subject: [PATCH 272/887] Task #KBE-528:  Fixed mobile number in OTP bug

---
 src/app/services/init.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/services/init.service.ts b/src/app/services/init.service.ts
index ff3f1e6ee..dd7cd2969 100644
--- a/src/app/services/init.service.ts
+++ b/src/app/services/init.service.ts
@@ -302,7 +302,7 @@ export class InitService {
             userId: _.get(profileV2, 'userId') || completeProdata.userId,
             email: _.get(profileV2, 'personalDetails.primaryEmail') || completeProdata.email,
             firstName: _.get(profileV2, 'personalDetails.firstname') || completeProdata.firstName,
-            mobile: _.get(completeProdata, 'profileDetails.personalDetails.mobile ') || '',
+            mobile: _.get(completeProdata, 'profileDetails.personalDetails.mobile') || '',
             // surName: _.get(profileV2, 'personalDetails.surname') || completeProdata.lastName,
             // middleName: _.get(profileV2, 'personalDetails.middlename') || '',
             departmentName: _.get(profileV2, 'employmentDetails.departmentName') || completeProdata.channel,

From be9bb5099a1c7cfa81362e331ce202d06674bb4e Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Wed, 25 Oct 2023 18:57:06 +0530
Subject: [PATCH 273/887] Task #0000: Fixed the user tags edit feature

---
 .../users/components/users-upload/users-upload.component.ts   | 2 --
 .../lib/routes/users/routes/view-user/view-user.component.ts  | 4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
index 68be78d48..889a516a5 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
@@ -87,7 +87,6 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
   ) {
     this.rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
     this.userProfileV2 = _.get(this.route.snapshot.parent, 'data.configService.userProfileV2')
-    console.log('userProfileV2 ', this.userProfileV2)
     this.dataSource = new MatTableDataSource(this.bulkUploadData)
     this.dataSource.paginator = this.paginator
 
@@ -114,7 +113,6 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
       this.registrationForm.updateValueAndValidity()
     }
     if (this.userProfileV2) {
-      console.log('userProfileV2 ', this.userProfileV2)
       this.userMobile = this.userProfileV2.mobile || ''
       this.registrationForm.patchValue({ mobile: this.userMobile })
       this.registrationForm.updateValueAndValidity()
diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
index 2b8f60be3..92701770c 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
@@ -406,9 +406,11 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
               professionalDetails: [
                 {
                   designation: this.updateProfessionalForm.controls['designation'].value,
-                  tags: this.selectedtags,
                 }
               ],
+              additionalProperties: {
+                tag: this.selectedtags,
+              }
             },
           },
         }

From c61e0886dabe88e6b3b443f4f151f0f32b660bf6 Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Thu, 26 Oct 2023 12:34:54 +0530
Subject: [PATCH 274/887] Task #KBE-528:  Added link to update mobile number in
 learner portal

---
 .../users-upload/users-upload.component.html          |  5 ++++-
 .../components/users-upload/users-upload.component.ts | 11 +++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
index 5183756f7..ab74caaf6 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
@@ -45,7 +45,10 @@
               </ng-container>
               <ng-container *ngIf="!userMobile">
                 <p for="email" class=" margin-remove-bottom margin-top-s" i18n-aria-label aria-label="Email label">
-                  No mobile number associated with your account
+                  No mobile number associated with your account.
+                  <a *ngIf="getKarmayogiLink" [href]="getKarmayogiLink">
+                    <span i18n>Click here to update</span>
+                  </a>
                 </p>
               </ng-container>
             </ng-container>
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
index 889a516a5..8433e64e9 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
@@ -65,6 +65,7 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
   userEmail = ''
   userMobile = ''
   userProfileV2!: any
+  myRoles: any = []
 
   objDataSource = new MatTableDataSource<any>()
   @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | null = null
@@ -87,6 +88,9 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
   ) {
     this.rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
     this.userProfileV2 = _.get(this.route.snapshot.parent, 'data.configService.userProfileV2')
+    if (_.get(this.route.snapshot.parent, 'data.configService.userRoles')) {
+      this.myRoles = _.get(this.route.snapshot.parent, 'data.configService.userRoles')
+    }
     this.dataSource = new MatTableDataSource(this.bulkUploadData)
     this.dataSource.paginator = this.paginator
 
@@ -515,4 +519,11 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
     }
   }
 
+  get getKarmayogiLink() {
+    if (this.myRoles && this.myRoles.has('public')) {
+      return `${environment.karmYogiPath}/app/user-profile/details`
+    }
+    return ''
+  }
+
 }

From f41fa57d24d947b61bb74bf18f8f066bd08658c7 Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Thu, 26 Oct 2023 13:31:45 +0530
Subject: [PATCH 275/887] Task #KBE-528:  Fixed error in tags & lint issues

---
 .../home/routes/users-view/users-view.component.ts     |  2 +-
 .../users/routes/view-user/view-user.component.ts      | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 6d579e048..24aab5ca5 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -486,4 +486,4 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     this.limit = event.pageSize
     this.filterData(this.searchQuery)
   }
-}
\ No newline at end of file
+}
diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
index 92701770c..628c7e423 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
@@ -50,7 +50,7 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
   isMdoLeader = false
   designationsMeta!: any
   updateProfessionalForm: FormGroup
-  public selectedtags: any[] = []
+  selectedtags: any[] = []
   reqbody: any
   isTagsEdited = false
 
@@ -357,7 +357,7 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
   }
 
   updateTags(profileData: any) {
-    this.selectedtags = _.get(profileData, 'additionalProperties.tag')
+    this.selectedtags = _.get(profileData, 'additionalProperties.tag') || []
   }
 
   addActivity(event: MatChipInputEvent) {
@@ -406,11 +406,11 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
               professionalDetails: [
                 {
                   designation: this.updateProfessionalForm.controls['designation'].value,
-                }
+                },
               ],
               additionalProperties: {
                 tag: this.selectedtags,
-              }
+              },
             },
           },
         }
@@ -422,7 +422,7 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
               professionalDetails: [
                 {
                   designation: this.updateProfessionalForm.controls['designation'].value,
-                }
+                },
               ],
             },
           },

From 9fdfff434e81c76d5b076d38efa17b194cfea9b0 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Fri, 27 Oct 2023 14:19:04 +0530
Subject: [PATCH 276/887] update position with designation

---
 .../assistant-message-card.component.ts                       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/workallocation-v2/components/assistant-message-card/assistant-message-card.component.ts b/project/ws/app/src/lib/routes/workallocation-v2/components/assistant-message-card/assistant-message-card.component.ts
index 0da412616..2e56dc648 100644
--- a/project/ws/app/src/lib/routes/workallocation-v2/components/assistant-message-card/assistant-message-card.component.ts
+++ b/project/ws/app/src/lib/routes/workallocation-v2/components/assistant-message-card/assistant-message-card.component.ts
@@ -150,10 +150,10 @@ export class AssistantMessageCardComponent implements OnInit, OnDestroy {
       result.push({ _type: 'error', type: 'officer', counts: 0, label: 'Officer name is empty' })
     }
     if (data && data.position === '' && (data.officerName !== '' || data.positionDescription !== '')) {
-      result.push({ _type: 'error', type: 'officer', counts: 0, label: 'Postion missing' })
+      result.push({ _type: 'error', type: 'officer', counts: 0, label: 'Designation missing' })
     }
     if (data && data.positionDescription === '') {
-      result.push({ _type: 'warning', type: 'officer', counts: 0, label: 'Position description missing' })
+      result.push({ _type: 'warning', type: 'officer', counts: 0, label: 'Designation description missing' })
     }
     return result
   }

From 391c680c918de3c7427865b3724a91c82ab0e296 Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Fri, 27 Oct 2023 16:22:13 +0530
Subject: [PATCH 277/887] Task #KBE623: Tags display in approvals, validation
 added for tags field

---
 .../lib/routes/approvals/approvals.module.ts  |  4 ++--
 .../routes/position/position.component.html   | 11 +++++++++
 .../routes/position/position.component.ts     |  6 +++++
 .../routes/view-user/view-user.component.html | 23 ++++++++++++++-----
 .../routes/view-user/view-user.component.scss |  2 +-
 .../routes/view-user/view-user.component.ts   |  9 +++++---
 6 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/project/ws/app/src/lib/routes/approvals/approvals.module.ts b/project/ws/app/src/lib/routes/approvals/approvals.module.ts
index a35363ae9..4df34b4b8 100644
--- a/project/ws/app/src/lib/routes/approvals/approvals.module.ts
+++ b/project/ws/app/src/lib/routes/approvals/approvals.module.ts
@@ -7,7 +7,7 @@ import { ApprovalsRoutingModule } from './approvals.routing.module'
 import { BreadcrumbsOrgModule, ScrollspyLeftMenuModule } from '@sunbird-cb/collection'
 import {
   MatSidenavModule, MatGridListModule, MatListModule, MatCardModule, MatFormFieldModule, MatInputModule,
-  MatIconModule, MatButtonModule, MatRadioModule, MatDialogModule,
+  MatIconModule, MatButtonModule, MatRadioModule, MatDialogModule, MatChipsModule,
 } from '@angular/material'
 import { NeedsApprovalComponent } from './routes/needs-approval/needs-approval.component'
 import { BasicInfoComponent } from './routes/basic-info/basic-info.component'
@@ -22,7 +22,7 @@ import { CertificationAndSkillsComponent } from './routes/certification-and-skil
     CommonModule, RouterModule, ApprovalsRoutingModule, BreadcrumbsOrgModule,
     MatSidenavModule, MatListModule, ScrollspyLeftMenuModule, MatCardModule, FormsModule,
     MatFormFieldModule, MatInputModule, MatButtonModule, MatIconModule, MatGridListModule,
-    MatRadioModule, MatDialogModule,
+    MatRadioModule, MatDialogModule, MatChipsModule,
   ],
 })
 export class ApprovalsModule { }
diff --git a/project/ws/app/src/lib/routes/approvals/routes/position/position.component.html b/project/ws/app/src/lib/routes/approvals/routes/position/position.component.html
index 6e3fa1a8d..bac8ecbbe 100644
--- a/project/ws/app/src/lib/routes/approvals/routes/position/position.component.html
+++ b/project/ws/app/src/lib/routes/approvals/routes/position/position.component.html
@@ -108,6 +108,17 @@
                   <input type="text" [disabled]="true"
                     [value]="professionalDetails.industry ? professionalDetails.industry : ''" class="appr-text-field">
                 </mat-grid-tile>
+                <mat-grid-tile [colspan]="2" [rowspan]="1" class="input-wrapper">
+                  <label class="appr-text-label">Tags</label>
+                  <mat-chip-list #chipListTags *ngIf="selectedtags && selectedtags.length">
+                    <mat-chip *ngFor="let tag of selectedtags" [selectable]="true" [removable]="true"
+                      (removed)="removeActivity(tag)">
+                      {{ tag }}
+                      <!-- <mat-icon matChipRemove>cancel</mat-icon> -->
+                    </mat-chip>
+                  </mat-chip-list>
+                  <p *ngIf="!selectedtags || !selectedtags.length">No tags available</p>
+                </mat-grid-tile>
               </mat-grid-list>
             </ng-container>
           </div>
diff --git a/project/ws/app/src/lib/routes/approvals/routes/position/position.component.ts b/project/ws/app/src/lib/routes/approvals/routes/position/position.component.ts
index 20afab468..089b27a02 100644
--- a/project/ws/app/src/lib/routes/approvals/routes/position/position.component.ts
+++ b/project/ws/app/src/lib/routes/approvals/routes/position/position.component.ts
@@ -9,6 +9,8 @@ import { ActivatedRoute, Router, NavigationEnd, Event } from '@angular/router'
 export class PositionComponent implements OnInit {
   professionalDetails: any
   employmentDetails: any
+  additionalProperties: any
+  selectedtags: any[] = []
   constructor(private activeRoute: ActivatedRoute, private router: Router) {
     this.router.events.subscribe((event: Event) => {
       if (event instanceof NavigationEnd) {
@@ -16,6 +18,10 @@ export class PositionComponent implements OnInit {
         const profileData = this.activeRoute.snapshot.data.profileData.data.result.response.profileDetails || {}
         this.professionalDetails = profileData.professionalDetails[0]
         this.employmentDetails = profileData.employmentDetails
+        this.additionalProperties = profileData.additionalProperties
+        if (this.additionalProperties && this.additionalProperties.tag) {
+          this.selectedtags = this.additionalProperties.tag
+        }
       }
     })
   }
diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
index d05bd8eb9..15f3ba361 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
@@ -402,16 +402,27 @@
                               <div class="margin-bottom-l">
                                 <label class="appr-text-label">Tags</label>
                                 <div class="left-input-div">
-                                  <input class="appr-text-field w-full-imp" #tags matInput
-                                    i18n-placeholder="Type tag here" placeholder="Type tag here" formControlName="tags"
-                                    i18n-aria-label aria-label="Enter tag" [matChipInputFor]="chipListTags"
-                                    autocomplete="off" maxlength="100"
-                                    [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
-                                    (matChipInputTokenEnd)="addActivity($event)" />
+                                  <div class="flex-col">
+                                    <input class="appr-text-field w-full-imp" #tags matInput
+                                      i18n-placeholder="Type tag here" placeholder="Type tag here"
+                                      formControlName="tags" i18n-aria-label aria-label="Enter tag"
+                                      [matChipInputFor]="chipListTags" autocomplete="off" maxlength="100"
+                                      [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
+                                      (matChipInputTokenEnd)="addActivity($event)" />
+                                    <p class="margin-left-xs">
+                                      <mat-error class="hintErr"
+                                        *ngIf="updateProfessionalForm.controls['tags'].errors?.pattern"
+                                        i18n="name Error|Explains name is required">
+                                        Only space and alphabets are supported
+                                      </mat-error>
+                                    </p>
+                                  </div>
                                 </div>
                                 <div class="right-input-div">
                                   <button mat-raised-button type="button"
+                                    [disabled]="!tags.value || !updateProfessionalForm.valid"
                                     (click)="addActivity({input: tags, value: tags.value})"
+                                    [ngStyle]="{'opacity': updateProfessionalForm.valid? 1: 0.7}"
                                     class="text-white btn-add-activity btn-responsive">
                                     <span class="text-white" i18n>Add tag</span>
                                   </button>
diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.scss b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.scss
index ad7e47591..d6f9b188f 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.scss
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.scss
@@ -494,7 +494,7 @@ textarea {
 }
 
 .left-input-div {
-  width: 40%;
+  width: auto;
   display: inline-flex;
 }
 .right-input-div {
diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
index 628c7e423..1471099c1 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
@@ -9,6 +9,7 @@ import _ from 'lodash'
 import { EventService } from '@sunbird-cb/utils'
 import { Subscription } from 'rxjs'
 import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
+import { COMMA, ENTER } from '@angular/cdk/keycodes'
 
 @Component({
   selector: 'ws-app-view-user',
@@ -53,6 +54,8 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
   selectedtags: any[] = []
   reqbody: any
   isTagsEdited = false
+  separatorKeysCodes: number[] = [ENTER, COMMA]
+  namePatern = `^[a-zA-Z ]*$`
 
   @HostListener('window:scroll', ['$event'])
   handleScroll() {
@@ -257,7 +260,7 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
 
     this.updateProfessionalForm = new FormGroup({
       designation: new FormControl('', []),
-      tags: new FormControl('', []),
+      tags: new FormControl('', [Validators.pattern(this.namePatern)]),
     })
   }
 
@@ -362,8 +365,8 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
 
   addActivity(event: MatChipInputEvent) {
     const input = event.input
-    const value = event.value as unknown
-    if ((value || '')) {
+    const value = event.value as string
+    if ((value && value.trim()) && this.updateProfessionalForm.valid) {
       this.isTagsEdited = true
       this.selectedtags.push(value)
     }

From 0a706c171cf2d630f52666ba5c1c6b9a8d7805c3 Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Fri, 27 Oct 2023 16:23:06 +0530
Subject: [PATCH 278/887] Task #0000: FIle upload UI fixes and suggestions
 implemented

---
 .../users-upload/users-upload.component.html  | 11 ++++++-----
 .../users-upload/users-upload.component.ts    | 19 ++++++++++++-------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
index ab74caaf6..0741977ae 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
@@ -192,22 +192,23 @@
           </form>
 
           <ng-container *ngIf="fileName && (isEmailVerified || isMobileVerified)">
-            <div class="flex mt-5 items-end justify-end">
+            <div class="flex mt-5 items-end justify-start">
               <div class="text-left mr-5">
                 <button mat-button class="download-btn mat-accent-border mat-button mat-button-base" type="button" i18n
                   (click)="cancelSelected()" (dblclick)="$event.preventDefault();" *ngIf="fileName">
                   <ng-container i18n>Cancel</ng-container>
                 </button>
               </div>
-              <div class="text-left ">
-                <div *ngIf="displayLoader | async" class="pr-4 flex items-center justify-center">
-                  <mat-spinner [diameter]="30"></mat-spinner>
-                </div>
+              <div class="text-left flex">
+
                 <button mat-button class="upload-btn mat-button mat-button-base mr-5" type="submit" i18n
                   [disabled]="formGroup.invalid || (displayLoader | async)" (click)="onSubmit(form)"
                   (dblclick)="$event.preventDefault();" *ngIf="fileName">
                   <ng-container i18n>Upload</ng-container>
                 </button>
+                <div *ngIf="displayLoader | async" class="pr-4 ml-4 flex items-center justify-center">
+                  <mat-spinner [diameter]="30"></mat-spinner>
+                </div>
               </div>
             </div>
           </ng-container>
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
index 8433e64e9..4ba598334 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
@@ -157,11 +157,7 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
 
   radioChange(_event: MatRadioChange) {
     // console.log(_event.source.name, _event.value)
-    this.isEmailVerified = false
-    this.otpEmailSend = false
-    this.isMobileVerified = false
-    this.otpSend = false
-    this.disableVerifyBtn = false
+    this.resetOTPFields()
   }
 
   getBulkUploadData() {
@@ -233,13 +229,14 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
           .subscribe(
             _res => {
               // this.uplaodSuccessMsg = res
-              this.openSnackbar('File uploaded successfully..!')
+              this.openSnackbar('File uploaded successfully!')
               this.cancelSelected()
               // // tslint:disable-next-line: no-non-null-assertion
               // this.formGroup!.get('file')!.setValue(['', Validators.required])
               if (form && form.file) {
                 form.file.value = ''
               }
+              this.resetOTPFields()
               this.formGroup.reset()
               this.getBulkUploadData()
             },
@@ -255,6 +252,14 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
     }
   }
 
+  resetOTPFields() {
+    this.isEmailVerified = false
+    this.otpEmailSend = false
+    this.isMobileVerified = false
+    this.otpSend = false
+    this.disableVerifyBtn = false
+  }
+
   public refreshTable() {
     this.getBulkUploadData()
   }
@@ -437,7 +442,7 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
     if (this.userEmail) {
       this.usersSvc.sendOtp(this.userEmail, 'email').subscribe(() => {
         this.otpEmailSend = true
-        alert('An OTP has been sent to your email (valid for 15 minutes)')
+        alert('An OTP has been sent to your email address (valid for 15 minutes)')
         this.startCountDownEmail()
         // tslint:disable-next-line: align
       }, (error: any) => {

From 259ee72bcf9291db7a645269e0d1b811e3ecdd05 Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Fri, 27 Oct 2023 17:14:40 +0530
Subject: [PATCH 279/887] Task #0000: CSS fix

---
 .../users/routes/view-user/view-user.component.scss  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.scss b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.scss
index d6f9b188f..1d9fedcfb 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.scss
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.scss
@@ -498,20 +498,20 @@ textarea {
   display: inline-flex;
 }
 .right-input-div {
-  width: 14%;
+  // width: 14%;
   display: inline-flex;
-  vertical-align: middle;
+  vertical-align: top;
 }
 
 .btn-add-activity {
-  width: 70%;
   background: no-repeat padding-box #0074b6 !important;
   border-radius: 4px;
-  padding: 0px 0;
   box-sizing: border-box;
-  margin: 0 12px;
-  line-height: 30px;
+  margin: 4px 16px 0 16px !important;
+  line-height: 28px;
+  height: 36px;
 }
+
 .mat-chip-list {
   margin-top: 2px;
   display: flex;

From 7df9c240ed26a4a8cdad8f56dd821ebedd2f9773 Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Mon, 30 Oct 2023 12:38:34 +0530
Subject: [PATCH 280/887] Task #KBE-528:  Fixed issue after click on cancel,
 OTP was not reset

---
 .../users/components/users-upload/users-upload.component.ts      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
index 4ba598334..3dc254ed3 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
@@ -216,6 +216,7 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
     this.fileName = ''
     this.fileSelected = ''
     this.formGroup.controls['file'].setValue('')
+    this.resetOTPFields()
   }
 
   public onSubmit(form: any): void {

From 83a9d4a353a7e87e87fa2f4319d16caad56747f1 Mon Sep 17 00:00:00 2001
From: Bharath Kumar <bharathkumar@TI-MAC-087.local>
Date: Wed, 1 Nov 2023 17:56:47 +0530
Subject: [PATCH 281/887] changes in the nominate learners

---
 .../batch-details/batch-details.component.ts  | 110 ++++++++++++----
 .../nominate-users-dialog.component.html      |   4 +-
 .../nominate-users-dialog.component.ts        | 118 +++++++++++++-----
 .../services/blended-approval.service.ts      |   7 ++
 .../routes/users-view/users-view.component.ts |   2 +-
 5 files changed, 179 insertions(+), 62 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index 90e1a5dcc..2ff3755a8 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -9,6 +9,7 @@ import { EventService } from '@sunbird-cb/utils'
 import { NominateUsersDialogComponent } from '../nominate-users-dialog/nominate-users-dialog.component'
 import moment from 'moment'
 import { NsContent } from '../../../../head/_services/widget-content.model'
+import { DialogConfirmComponent } from '../../../../../../../../../src/app/component/dialog-confirm/dialog-confirm.component'
 @Component({
   selector: 'ws-app-batch-details',
   templateUrl: './batch-details.component.html',
@@ -33,6 +34,7 @@ export class BatchDetailsComponent implements OnInit {
   clonedApprovedUsers: any = []
   learnerCount = 0
   clonedApprovalStatusUsers: any = []
+  userscount: any
 
   constructor(private router: Router, private activeRouter: ActivatedRoute,
     // tslint:disable-next-line:align
@@ -90,6 +92,36 @@ export class BatchDetailsComponent implements OnInit {
     this.raiseTelemetry(this.currentFilter, TelemetryEvents.EnumInteractSubTypes.TAB_CONTENT)
   }
 
+  async getUsersCount() {
+    if (this.batchData && this.batchData.batchId) {
+      const req = {
+        serviceName: 'blendedprogram',
+        applicationStatus: '',
+        applicationIds: [
+          this.batchData.batchId,
+        ],
+        limit: 100,
+        offset: 0,
+      }
+      this.userscount = {
+        enrolled: 0,
+        totalApplied: 0,
+        rejected: 0,
+      }
+      await this.bpService.fetchBlendedUserCount(req).then(async (res: any) => {
+        if (res.result && res.result.data) {
+          const statusToNegate = ['WITHDRAWN', 'REMOVED', 'REJECTED']
+          await res.result.data.forEach((ele: any) => {
+            if (!statusToNegate.includes(ele.currentStatus)) {
+              this.userscount.totalApplied = this.userscount.totalApplied + ele.statusCount
+            }
+          })
+          return this.userscount
+        }
+      })
+    }
+  }
+
   getBPDetails(programID: any) {
     this.bpService.getBlendedProgramsDetails(programID).subscribe((res: any) => {
       this.programData = res.result.content
@@ -237,7 +269,7 @@ export class BatchDetailsComponent implements OnInit {
         this.openSnackbar('Request is removed successfully.')
         this.filter('rejected')
       }
-    },                                                      (error: any) => {
+    }, (error: any) => {
       this.openSnackbar(_.get(error, 'error.params.errmsg') ||
         _.get(error, 'error.result.errmsg') ||
         'Something went wrong, please try again later!')
@@ -298,27 +330,51 @@ export class BatchDetailsComponent implements OnInit {
     )
   }
 
-  onNominateUsersClick(name: string) {
+  async onNominateUsersClick(name: string) {
     this.raiseTelemetry(name, TelemetryEvents.EnumInteractSubTypes.NOMINATE_BTN)
-    const dialogRef = this.dialogue.open(NominateUsersDialogComponent, {
-      width: '950px',
-      data: {
-        orgId: this.userProfile.rootOrgId,
-        courseId: this.programID,
-        applicationId: this.batchData.batchId,
-        learners: this.approvedUsers,
-        wfApprovalType: this.programData.wfApprovalType,
-      },
-      disableClose: true,
-      autoFocus: false,
-    })
-
-    dialogRef.afterClosed().subscribe((response: any) => {
-      if (response && response === 'done') {
-        this.getLearnersList()
-      }
-    })
 
+    const batchSize = Number(this.batchData.batchAttributes.currentBatchSize)
+    const twentPercent = Math.floor(batchSize * 20 / 100)
+    const totalBatchCount = batchSize + twentPercent
+    await this.getUsersCount()
+    if (this.userscount.totalApplied < totalBatchCount) {
+      const dialogRef = this.dialogue.open(NominateUsersDialogComponent, {
+        width: '950px',
+        data: {
+          totalBatchCount,
+          orgId: this.userProfile.rootOrgId,
+          courseId: this.programID,
+          applicationId: this.batchData.batchId,
+          learners: this.approvedUsers,
+          wfApprovalType: this.programData.wfApprovalType
+        },
+        disableClose: true,
+        autoFocus: false,
+      })
+      dialogRef.afterClosed().subscribe((response: any) => {
+        if (response && response === 'done') {
+          this.getLearnersList()
+        }
+      })
+    } else {
+      const confirmDialog = this.dialogue.open(DialogConfirmComponent, {
+        width: '35vw',
+        data: {
+          title: 'Batch Enrollment Full',
+          // tslint:disable-next-line
+          body: `This batch has currently reached its maximum enrollment limit. You can't nominate a new learner at this time.`,
+          ok: 'OK',
+          cancel: 'hide',
+        },
+        disableClose: true,
+        autoFocus: false,
+      })
+      confirmDialog.afterClosed().subscribe((response: any) => {
+        if (response && response === 'done') {
+          this.getLearnersList()
+        }
+      })
+    }
   }
 
   private openSnackbar(primaryMsg: string, duration: number = 5000) {
@@ -344,8 +400,9 @@ export class BatchDetailsComponent implements OnInit {
   filterNewUsers(searchText: string) {
     if (searchText.length > 0) {
       this.newUsers = this.newUsers.filter((result: any) => {
-        if (result.userInfo) {
-          return result.userInfo.first_name.toLowerCase().includes(searchText.toLowerCase())
+        if (result.userInfo && result.wfInfo) {
+          return result.userInfo.first_name.toLowerCase().includes(searchText.toLowerCase()) ||
+            result.wfInfo[0].deptName.toLowerCase().includes(searchText.toLowerCase())
         }
       })
     } else {
@@ -357,7 +414,8 @@ export class BatchDetailsComponent implements OnInit {
     if (searchText.length > 0) {
       this.approvedUsers = this.approvedUsers.filter((result: any) => {
         if (result.first_name) {
-          return result.first_name.toLowerCase().includes(searchText.toLowerCase())
+          return result.first_name.toLowerCase().includes(searchText.toLowerCase()) ||
+            result.department.toLowerCase().includes(searchText.toLowerCase())
         }
       })
     } else {
@@ -379,9 +437,11 @@ export class BatchDetailsComponent implements OnInit {
 
   filterApprovalStatusUsers(searchText: string) {
     if (searchText.length > 0) {
+      this.approvalStatus = this.clonedApprovalStatusUsers
       this.approvalStatus = this.approvalStatus.filter((result: any) => {
-        if (result.userInfo) {
-          return result.userInfo.first_name.toLowerCase().includes(searchText.toLowerCase())
+        if (result.userInfo && result.wfInfo) {
+          return result.userInfo.first_name.toLowerCase().includes(searchText.toLowerCase()) ||
+            result.wfInfo[0].deptName.toLowerCase().includes(searchText.toLowerCase())
         }
       })
     } else {
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.html
index 8f1f52934..da6c7695a 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.html
@@ -24,7 +24,7 @@ <h2 mat-dialog-title>Nominate learners</h2>
     </div>
     <div class="users-data">
       <table mat-table [dataSource]="dataSource" class="nominate-learners  margin-top-s" matSort matSortActive="name"
-        matSortDirection="asc" matSortDisableClear *ngIf="dataSource.filteredData.length > 0">
+        matSortDisableClear *ngIf="dataSource.filteredData.length > 0">
 
         <ng-container matColumnDef="select">
           <th mat-header-cell *matHeaderCellDef class="header-row">
@@ -39,7 +39,7 @@ <h2 mat-dialog-title>Nominate learners</h2>
 
         <ng-container matColumnDef="{{colname.name}}" *ngFor="let colname of tableColumns">
           <th mat-header-cell *matHeaderCellDef class="header-row" mat-sort-header> {{colname.dispalyName}} </th>
-          <td mat-cell *matCellDef="let element"> {{element[colname.name]}}</td>
+          <td mat-cell class="break-words" *matCellDef="let element"> {{element[colname.name]}}</td>
         </ng-container>
 
         <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
index 24fd9fd05..82f1e75d6 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
@@ -1,9 +1,10 @@
 import { SelectionModel } from '@angular/cdk/collections'
 import { Component, Inject, OnInit, ViewChild } from '@angular/core'
-import { MAT_DIALOG_DATA, MatDialogRef, MatSnackBar, MatTableDataSource } from '@angular/material'
+import { MAT_DIALOG_DATA, MatDialog, MatDialogRef, MatSnackBar, MatTableDataSource } from '@angular/material'
 import { UsersService } from '../../../users/services/users.service'
 import { MatSort } from '@angular/material/sort'
 import { BlendedApporvalService } from '../../services/blended-approval.service'
+import { DialogConfirmComponent } from '../../../../../../../../../src/app/component/dialog-confirm/dialog-confirm.component'
 
 @Component({
   selector: 'ws-app-nominate-users-dialog',
@@ -20,6 +21,7 @@ export class NominateUsersDialogComponent implements OnInit {
   dataSource = new MatTableDataSource<any>()
   displayLoader = false
   learners: any = []
+  userscount: any
 
   @ViewChild(MatSort, { static: false }) set matSort(sort: MatSort) {
     if (!this.dataSource.sort) {
@@ -33,9 +35,10 @@ export class NominateUsersDialogComponent implements OnInit {
   ]
 
   constructor(public dialogRef: MatDialogRef<NominateUsersDialogComponent>,
-              private usersService: UsersService,
-              @Inject(MAT_DIALOG_DATA) public data: any, private bpService: BlendedApporvalService,
-              private snackBar: MatSnackBar) { }
+    private usersService: UsersService,
+    private dialogue: MatDialog,
+    @Inject(MAT_DIALOG_DATA) public data: any, private bpService: BlendedApporvalService,
+    private snackBar: MatSnackBar) { }
 
   ngOnInit() {
     const filterObj = {
@@ -44,6 +47,8 @@ export class NominateUsersDialogComponent implements OnInit {
         filters: {
           rootOrgId: this.data.orgId,
         },
+        limit: 100,
+        offset: 0,
       },
     }
     this.getAllUsers(filterObj)
@@ -96,41 +101,57 @@ export class NominateUsersDialogComponent implements OnInit {
     this.getAllUsers(filterObj)
   }
 
-  addLearners() {
+  async addLearners() {
+    await this.getUsersCount()
     const seletedLearner: any = []
     if (this.selection.selected.length > 0) {
-      this.selection.selected.map((user: any) => {
-        const obj = {
-          userId: user.userId,
-          rootOrgId: this.data.orgId,
-          actorUserId: user.userId,
-          state: 'INITIATE',
-          serviceName: 'blendedprogram',
-          deptName: user.deptName,
-          courseId: this.data.courseId, // blended program course ID
-          applicationId: this.data.applicationId, // blended program batch ID
-          updateFieldValues: user.updateFieldValues,
-        }
-        seletedLearner.push(obj)
-      })
-      this.bpService.nominateLearners(seletedLearner).subscribe((_res: any) => {
-        if (this.data.wfApprovalType === 'twoStepMDOAndPCApproval') {
-          this.openSnackbar('Request sent to Program coordinator for approval.')
-        } else {
-          if (_res[0] && _res[0].result && _res[0].result.status === 'BAD_REQUEST') {
-            this.openSnackbar(_res[0].result.errmsg)
+      const differenceCount = this.data.totalBatchCount - this.userscount.totalApplied
+      if (this.selection.selected.length <= differenceCount) {
+        this.selection.selected.map((user: any) => {
+          const obj = {
+            userId: user.userId,
+            rootOrgId: this.data.orgId,
+            actorUserId: user.userId,
+            state: 'INITIATE',
+            serviceName: 'blendedprogram',
+            deptName: user.deptName,
+            courseId: this.data.courseId, // blended program course ID
+            applicationId: this.data.applicationId, // blended program batch ID
+            updateFieldValues: user.updateFieldValues,
+          }
+          seletedLearner.push(obj)
+        })
+        this.bpService.nominateLearners(seletedLearner).subscribe((_res: any) => {
+          if (this.data.wfApprovalType === 'twoStepMDOAndPCApproval') {
+            this.openSnackbar('Request sent to Program coordinator for approval.')
           } else {
-            this.openSnackbar('User(s) nominated successfully!')
+            if (_res[0] && _res[0].result && _res[0].result.status === 'BAD_REQUEST') {
+              this.openSnackbar(_res[0].result.errmsg)
+            } else {
+              this.openSnackbar('User(s) nominated successfully!')
+            }
           }
-        }
-        this.dialogRef.close('done')
-      },                                                        (err: { error: any }) => {
-        // tslint:disable-next-line:no-console
-        console.log(err)
-        this.openSnackbar('some thing went wrong, Please try after sometime.')
-      })
+          this.dialogRef.close('done')
+        }, (err: { error: any }) => {
+          // tslint:disable-next-line:no-console
+          console.log(err)
+          this.openSnackbar('some thing went wrong, Please try after sometime.')
+        })
+      } else {
+        this.dialogue.open(DialogConfirmComponent, {
+          width: '35vw',
+          data: {
+            title: 'Nomination Limit Exceeded',
+            // tslint:disable-next-line
+            body: `The maximum number of learners you can nominate for this batch, based on the current batch enrollment availability, is <b>${differenceCount}</b>. <br>Please review and adjust your nominations accordingly, and then submit.`,
+            ok: 'OK',
+            cancel: 'hide',
+          },
+          disableClose: true,
+          autoFocus: false,
+        })
+      }
     }
-
   }
 
   closeDiaogBox() {
@@ -142,4 +163,33 @@ export class NominateUsersDialogComponent implements OnInit {
       duration,
     })
   }
+  async getUsersCount() {
+    if (this.data && this.data.applicationId) {
+      const req = {
+        serviceName: 'blendedprogram',
+        applicationStatus: '',
+        applicationIds: [
+          this.data.applicationId,
+        ],
+        limit: 100,
+        offset: 0,
+      }
+      this.userscount = {
+        enrolled: 0,
+        totalApplied: 0,
+        rejected: 0,
+      }
+      await this.bpService.fetchBlendedUserCount(req).then(async (res: any) => {
+        if (res.result && res.result.data) {
+          const statusToNegate = ['WITHDRAWN', 'REMOVED', 'REJECTED']
+          await res.result.data.forEach((ele: any) => {
+            if (!statusToNegate.includes(ele.currentStatus)) {
+              this.userscount.totalApplied = this.userscount.totalApplied + ele.statusCount
+            }
+          })
+          return this.userscount
+        }
+      })
+    }
+  }
 }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
index b6bd2b19c..52be43840 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/services/blended-approval.service.ts
@@ -17,6 +17,7 @@ const API_END_POINTS = {
   SEARCH_FORM_WITH_USERID: 'apis/proxies/v8/forms/searchForms',
   NOMINATE_LEARNERS: '/apis/proxies/v8/workflow/blendedprogram/admin/enrol',
   REMOVE_LEARNER: '/apis/proxies/v8/workflow/blendedprogram/remove/mdo',
+  BLENDED_USER_COUNT: `apis/proxies/v8/workflow/blendedprogram/enrol/status/count`,
 }
 
 @Injectable({
@@ -74,4 +75,10 @@ export class BlendedApporvalService {
   removeLearner(req: any) {
     return this.http.post<any>(`${API_END_POINTS.REMOVE_LEARNER}`, req)
   }
+
+  fetchBlendedUserCount(req: any) {
+    return this.http
+      .post(API_END_POINTS.BLENDED_USER_COUNT, req)
+      .toPromise()
+  }
 }
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 6d579e048..24aab5ca5 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -486,4 +486,4 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     this.limit = event.pageSize
     this.filterData(this.searchQuery)
   }
-}
\ No newline at end of file
+}

From aeed104f8b828fa9ff4068da8b88e7a04e3bcbba Mon Sep 17 00:00:00 2001
From: Bharath Kumar <bharathkumar@TI-MAC-087.local>
Date: Wed, 1 Nov 2023 17:57:45 +0530
Subject: [PATCH 282/887] changes in the nominate learners

---
 .../batch-details/batch-details.component.ts           |  4 ++--
 .../nominate-users-dialog.component.ts                 | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index 2ff3755a8..6c45c2062 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -269,7 +269,7 @@ export class BatchDetailsComponent implements OnInit {
         this.openSnackbar('Request is removed successfully.')
         this.filter('rejected')
       }
-    }, (error: any) => {
+    },                                                      (error: any) => {
       this.openSnackbar(_.get(error, 'error.params.errmsg') ||
         _.get(error, 'error.result.errmsg') ||
         'Something went wrong, please try again later!')
@@ -346,7 +346,7 @@ export class BatchDetailsComponent implements OnInit {
           courseId: this.programID,
           applicationId: this.batchData.batchId,
           learners: this.approvedUsers,
-          wfApprovalType: this.programData.wfApprovalType
+          wfApprovalType: this.programData.wfApprovalType,
         },
         disableClose: true,
         autoFocus: false,
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
index 82f1e75d6..9d16ebd65 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
@@ -35,10 +35,10 @@ export class NominateUsersDialogComponent implements OnInit {
   ]
 
   constructor(public dialogRef: MatDialogRef<NominateUsersDialogComponent>,
-    private usersService: UsersService,
-    private dialogue: MatDialog,
-    @Inject(MAT_DIALOG_DATA) public data: any, private bpService: BlendedApporvalService,
-    private snackBar: MatSnackBar) { }
+              private usersService: UsersService,
+              private dialogue: MatDialog,
+              @Inject(MAT_DIALOG_DATA) public data: any, private bpService: BlendedApporvalService,
+              private snackBar: MatSnackBar) { }
 
   ngOnInit() {
     const filterObj = {
@@ -132,7 +132,7 @@ export class NominateUsersDialogComponent implements OnInit {
             }
           }
           this.dialogRef.close('done')
-        }, (err: { error: any }) => {
+        },                                                        (err: { error: any }) => {
           // tslint:disable-next-line:no-console
           console.log(err)
           this.openSnackbar('some thing went wrong, Please try after sometime.')

From 5e0d0f9187275b0c6689aae85d7cf47d24f99c94 Mon Sep 17 00:00:00 2001
From: Bharath Kumar <bharathkumar@TI-MAC-087.local>
Date: Wed, 1 Nov 2023 18:05:37 +0530
Subject: [PATCH 283/887] changes in the nominate learners

---
 .../nominate-users-dialog.component.ts               | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
index 9d16ebd65..0b1db3b0d 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
@@ -35,10 +35,10 @@ export class NominateUsersDialogComponent implements OnInit {
   ]
 
   constructor(public dialogRef: MatDialogRef<NominateUsersDialogComponent>,
-              private usersService: UsersService,
-              private dialogue: MatDialog,
-              @Inject(MAT_DIALOG_DATA) public data: any, private bpService: BlendedApporvalService,
-              private snackBar: MatSnackBar) { }
+    private usersService: UsersService,
+    private dialogue: MatDialog,
+    @Inject(MAT_DIALOG_DATA) public data: any, private bpService: BlendedApporvalService,
+    private snackBar: MatSnackBar) { }
 
   ngOnInit() {
     const filterObj = {
@@ -132,7 +132,7 @@ export class NominateUsersDialogComponent implements OnInit {
             }
           }
           this.dialogRef.close('done')
-        },                                                        (err: { error: any }) => {
+        }, (err: { error: any }) => {
           // tslint:disable-next-line:no-console
           console.log(err)
           this.openSnackbar('some thing went wrong, Please try after sometime.')
@@ -143,7 +143,7 @@ export class NominateUsersDialogComponent implements OnInit {
           data: {
             title: 'Nomination Limit Exceeded',
             // tslint:disable-next-line
-            body: `The maximum number of learners you can nominate for this batch, based on the current batch enrollment availability, is <b>${differenceCount}</b>. <br>Please review and adjust your nominations accordingly, and then submit.`,
+            body: `You can nominate up to <b> ${differenceCount} </b> learners for this batch, based on the current batch enrollment availability.Please review and adjust your nominations accordingly, and then submit.`,
             ok: 'OK',
             cancel: 'hide',
           },

From b33bd8bf3adba574399dc3acc2ac08b779029575 Mon Sep 17 00:00:00 2001
From: Bharath Kumar <bharathkumar@TI-MAC-087.local>
Date: Thu, 2 Nov 2023 14:41:19 +0530
Subject: [PATCH 284/887] changes in the pop up

---
 .../components/batch-details/batch-details.component.html  | 7 ++++---
 .../component/dialog-confirm/dialog-confirm.component.html | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
index 89ded89c9..f1ae7e888 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
@@ -65,7 +65,7 @@
             </div>
           </div>
           <p class="new-request-count" *ngIf="newUsers.length > 0"> {{newUsers.length}} New
-            requests</p>
+            request(s)</p>
           <div class="b-c box" *ngIf="newUsers && newUsers.length > 0">
             <div *ngFor="let user of newUsers">
               <ws-app-users-card [user]="user" [actions]="true" [programData]="linkData" (userClick)="onSubmit($event)"
@@ -88,7 +88,8 @@
               </div>
             </div>
           </div>
-          <p class="font-bold" *ngIf="approvedUsers.length > 0"> {{approvedUsers.length}} learners in this batch
+          <p class="font-bold" *ngIf="approvedUsers.length > 0"> {{approvedUsers.length}} earner(s) in this batch from
+            your MDO
           </p>
           <div class="b-c box" *ngIf="approvedUsers && approvedUsers.length > 0">
             <div *ngFor="let user of approvedUsers">
@@ -97,7 +98,7 @@
             </div>
           </div>
           <div class="b-c box" *ngIf="approvedUsers && approvedUsers.length == 0">
-            <p class="padding-m">No learners yet</p>
+            <p class="padding-m">No learner(s) yet</p>
           </div>
         </ng-container>
         <ng-container *ngIf="currentFilter === 'approvalStatus'">
diff --git a/src/app/component/dialog-confirm/dialog-confirm.component.html b/src/app/component/dialog-confirm/dialog-confirm.component.html
index e4e6c58c9..8d0418dd0 100644
--- a/src/app/component/dialog-confirm/dialog-confirm.component.html
+++ b/src/app/component/dialog-confirm/dialog-confirm.component.html
@@ -3,11 +3,11 @@ <h1 mat-dialog-title class="mat-title">{{ data.title }}</h1>
 </div>
 <mat-divider class="margin-top-l margin-bottom-l"></mat-divider>
 <div mat-dialog-actions class="flex-row-reverse">
-  <button *ngIf="data.ok !== 'hide'" mat-flat-button class="ws-mat-accent-border-active"
+  <button *ngIf="data.ok !== 'hide'" mat-flat-button class="ws-mat-accent-border-active" cdkFocusInitial
     [color]="(data.ok === 'delete' || data.ok === 'Delete'  ) ? 'warn': 'blue'" (click)="confirmed()" i18n>
     {{data.ok}}
   </button>
   <button *ngIf="data.cancel !== 'hide'" mat-button
     [ngClass]="{'ws-mat-accent-text ws-mat-accent-border-active margin-right-xs': true}" [mat-dialog-close]
-    cdkFocusInitial i18n>{{data.cancel}}</button>
+    i18n>{{data.cancel}}</button>
 </div>
\ No newline at end of file

From 6670f1e9493685cc7da6794b43683a2188eaa45e Mon Sep 17 00:00:00 2001
From: Bharath Kumar <bharathkumar@TI-MAC-087.local>
Date: Thu, 2 Nov 2023 14:45:04 +0530
Subject: [PATCH 285/887] changes in the pop up

---
 .../components/batch-details/batch-details.component.html | 2 +-
 .../dialog-confirm/dialog-confirm.component.html          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
index f1ae7e888..7c91f9e0d 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.html
@@ -88,7 +88,7 @@
               </div>
             </div>
           </div>
-          <p class="font-bold" *ngIf="approvedUsers.length > 0"> {{approvedUsers.length}} earner(s) in this batch from
+          <p class="font-bold" *ngIf="approvedUsers.length > 0"> {{approvedUsers.length}} learner(s) in this batch from
             your MDO
           </p>
           <div class="b-c box" *ngIf="approvedUsers && approvedUsers.length > 0">
diff --git a/src/app/component/dialog-confirm/dialog-confirm.component.html b/src/app/component/dialog-confirm/dialog-confirm.component.html
index 8d0418dd0..02d284e41 100644
--- a/src/app/component/dialog-confirm/dialog-confirm.component.html
+++ b/src/app/component/dialog-confirm/dialog-confirm.component.html
@@ -3,11 +3,11 @@ <h1 mat-dialog-title class="mat-title">{{ data.title }}</h1>
 </div>
 <mat-divider class="margin-top-l margin-bottom-l"></mat-divider>
 <div mat-dialog-actions class="flex-row-reverse">
-  <button *ngIf="data.ok !== 'hide'" mat-flat-button class="ws-mat-accent-border-active" cdkFocusInitial
+  <button *ngIf="data.cancel !== 'hide'" mat-button [mat-dialog-close] i18n>{{data.cancel}}</button>
+  <button *ngIf="data.ok !== 'hide'"
+    [ngClass]="{'ws-mat-accent-text ws-mat-accent-border-active margin-right-xs': true}" mat-flat-button
+    class="ws-mat-accent-border-active" cdkFocusInitial
     [color]="(data.ok === 'delete' || data.ok === 'Delete'  ) ? 'warn': 'blue'" (click)="confirmed()" i18n>
     {{data.ok}}
   </button>
-  <button *ngIf="data.cancel !== 'hide'" mat-button
-    [ngClass]="{'ws-mat-accent-text ws-mat-accent-border-active margin-right-xs': true}" [mat-dialog-close]
-    i18n>{{data.cancel}}</button>
 </div>
\ No newline at end of file

From b837562c28d893468703bc7c9adef9c5a9f91cfa Mon Sep 17 00:00:00 2001
From: Bharath Kumar <bharathkumar@TI-MAC-087.local>
Date: Thu, 2 Nov 2023 14:50:50 +0530
Subject: [PATCH 286/887] changes in the pop up

---
 .../nominate-users-dialog/nominate-users-dialog.component.ts     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
index 0b1db3b0d..be7123646 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
@@ -46,6 +46,7 @@ export class NominateUsersDialogComponent implements OnInit {
         query: '',
         filters: {
           rootOrgId: this.data.orgId,
+          status: 1
         },
         limit: 100,
         offset: 0,

From b998157b07f23e7e62a43faef24b242495cd062e Mon Sep 17 00:00:00 2001
From: Bharath Kumar <bharathkumar@TI-MAC-087.local>
Date: Thu, 2 Nov 2023 14:51:35 +0530
Subject: [PATCH 287/887] changes in the pop up

---
 .../nominate-users-dialog/nominate-users-dialog.component.ts   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
index be7123646..972c6aebb 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
@@ -95,7 +95,8 @@ export class NominateUsersDialogComponent implements OnInit {
       request: {
         query: filterValue.value ? filterValue.value.trim().toLowerCase() : '',
         filters: {
-          rootOrgId: this.data.orgId,
+          rootOrgId: this.data.orgId,,
+          status: 1
         },
       },
     }

From 18e89f7476551c7f711a663041e86d4c40413336 Mon Sep 17 00:00:00 2001
From: Bharath Kumar <bharathkumar@TI-MAC-087.local>
Date: Thu, 2 Nov 2023 14:52:04 +0530
Subject: [PATCH 288/887] changes in the pop up

---
 .../nominate-users-dialog/nominate-users-dialog.component.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
index 972c6aebb..d93c64ffb 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
@@ -95,7 +95,7 @@ export class NominateUsersDialogComponent implements OnInit {
       request: {
         query: filterValue.value ? filterValue.value.trim().toLowerCase() : '',
         filters: {
-          rootOrgId: this.data.orgId,,
+          rootOrgId: this.data.orgId,
           status: 1
         },
       },

From 670578f93f62d998889383349bd5bab62a445882 Mon Sep 17 00:00:00 2001
From: Bharath Kumar <bharathkumar@TI-MAC-087.local>
Date: Thu, 2 Nov 2023 15:19:45 +0530
Subject: [PATCH 289/887] changes in the pop up

---
 .../components/batch-details/batch-details.component.scss       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss
index 55767e12e..0033a5f8b 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.scss
@@ -81,7 +81,7 @@
   font: 700 14px Lato !important;
 }
 .new-request-count {
-  color: red;
+  color: #D13924;
   font-weight: bold;
 }
 

From 9c28909588fb4fc5ad5b25207ac0c4c14ed29ead Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Sun, 5 Nov 2023 18:47:42 +0530
Subject: [PATCH 290/887] bug fix

---
 .../nominate-users-dialog/nominate-users-dialog.component.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
index d93c64ffb..9f508f4f0 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
@@ -124,8 +124,11 @@ export class NominateUsersDialogComponent implements OnInit {
           seletedLearner.push(obj)
         })
         this.bpService.nominateLearners(seletedLearner).subscribe((_res: any) => {
-          if (this.data.wfApprovalType === 'twoStepMDOAndPCApproval') {
+          if (_res[0] && _res[0].result && _res[0].result.status === 'OK' &&
+            this.data.wfApprovalType === 'twoStepMDOAndPCApproval') {
             this.openSnackbar('Request sent to Program coordinator for approval.')
+          } else if (_res[0] && _res[0].result && _res[0].result.status === 'NOT_ACCEPTABLE') {
+            this.openSnackbar(`Learner is already a part of batch. It can't be added here.`)
           } else {
             if (_res[0] && _res[0].result && _res[0].result.status === 'BAD_REQUEST') {
               this.openSnackbar(_res[0].result.errmsg)

From d397acd17e55ae610ef873db654811b5f853331e Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Mon, 6 Nov 2023 18:17:47 +0530
Subject: [PATCH 291/887] bug fix for nominating users

---
 .../batch-details/batch-details.component.ts  |  3 +-
 .../nominate-users-dialog.component.ts        | 53 ++++++++++++-------
 2 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index 6c45c2062..89aff4698 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -269,7 +269,7 @@ export class BatchDetailsComponent implements OnInit {
         this.openSnackbar('Request is removed successfully.')
         this.filter('rejected')
       }
-    },                                                      (error: any) => {
+    }, (error: any) => {
       this.openSnackbar(_.get(error, 'error.params.errmsg') ||
         _.get(error, 'error.result.errmsg') ||
         'Something went wrong, please try again later!')
@@ -347,6 +347,7 @@ export class BatchDetailsComponent implements OnInit {
           applicationId: this.batchData.batchId,
           learners: this.approvedUsers,
           wfApprovalType: this.programData.wfApprovalType,
+          departmentName: this.userProfile.rootOrg.orgName
         },
         disableClose: true,
         autoFocus: false,
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
index 9f508f4f0..908d51e20 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
@@ -170,31 +170,44 @@ export class NominateUsersDialogComponent implements OnInit {
   }
   async getUsersCount() {
     if (this.data && this.data.applicationId) {
-      const req = {
-        serviceName: 'blendedprogram',
-        applicationStatus: '',
-        applicationIds: [
-          this.data.applicationId,
-        ],
-        limit: 100,
-        offset: 0,
-      }
+      // const req = {
+      //   serviceName: 'blendedprogram',
+      //   applicationStatus: '',
+      //   applicationIds: [
+      //     this.data.applicationId,
+      //   ],
+      //   limit: 100,
+      //   offset: 0,
+      // }
       this.userscount = {
         enrolled: 0,
         totalApplied: 0,
         rejected: 0,
       }
-      await this.bpService.fetchBlendedUserCount(req).then(async (res: any) => {
-        if (res.result && res.result.data) {
-          const statusToNegate = ['WITHDRAWN', 'REMOVED', 'REJECTED']
-          await res.result.data.forEach((ele: any) => {
-            if (!statusToNegate.includes(ele.currentStatus)) {
-              this.userscount.totalApplied = this.userscount.totalApplied + ele.statusCount
-            }
-          })
-          return this.userscount
-        }
-      })
+
+      const request = {
+        serviceName: ['blendedprogram'],
+        applicationStatus: ['SEND_FOR_PC_APPROVAL', 'SEND_FOR_MDO_APPROVAL', 'APPROVED'],
+        applicationIds: [this.data.applicationId],
+        limit: 100,
+        offset: 0,
+      }
+      const resData: any = await this.bpService.getSerchRequests(request).toPromise().catch(_error => { })
+      if (resData && resData.result && resData.result.data && resData.result.data.length > 0) {
+        this.userscount.totalApplied = this.userscount.totalApplied + resData.result.data.length
+      }
+      return this.userscount
+      //  this.bpService.fetchBlendedUserCount(req).then(async (res: any) => {
+      //   if (res.result && res.result.data) {
+      //     const statusToNegate = ['WITHDRAWN', 'REMOVED', 'REJECTED', 'ADMIN_ENROLL_IS_IN_PROGRESS']
+      //     await res.result.data.forEach((ele: any) => {
+      //       if (!statusToNegate.includes(ele.currentStatus)) {
+      //         this.userscount.totalApplied = this.userscount.totalApplied + ele.statusCount
+      //       }
+      //     })
+      //
+      //   }
+      // })
     }
   }
 }

From 065bae50287de5984ca848e2692f6be8898b53d6 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Mon, 6 Nov 2023 20:17:25 +0530
Subject: [PATCH 292/887] bug fix for nomination

---
 .../batch-details/batch-details.component.ts  | 53 ++++++++++++-------
 .../nominate-users-dialog.component.ts        | 43 +++++++++++----
 2 files changed, 65 insertions(+), 31 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index 89aff4698..535ee0d50 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -94,31 +94,44 @@ export class BatchDetailsComponent implements OnInit {
 
   async getUsersCount() {
     if (this.batchData && this.batchData.batchId) {
-      const req = {
-        serviceName: 'blendedprogram',
-        applicationStatus: '',
-        applicationIds: [
-          this.batchData.batchId,
-        ],
-        limit: 100,
-        offset: 0,
-      }
+      // const req = {
+      //   serviceName: 'blendedprogram',
+      //   applicationStatus: '',
+      //   applicationIds: [
+      //     this.batchData.batchId,
+      //   ],
+      //   limit: 100,
+      //   offset: 0,
+      // }
       this.userscount = {
         enrolled: 0,
         totalApplied: 0,
         rejected: 0,
       }
-      await this.bpService.fetchBlendedUserCount(req).then(async (res: any) => {
-        if (res.result && res.result.data) {
-          const statusToNegate = ['WITHDRAWN', 'REMOVED', 'REJECTED']
-          await res.result.data.forEach((ele: any) => {
-            if (!statusToNegate.includes(ele.currentStatus)) {
-              this.userscount.totalApplied = this.userscount.totalApplied + ele.statusCount
-            }
-          })
-          return this.userscount
-        }
-      })
+
+      const request = {
+        serviceName: ['blendedprogram'],
+        applicationStatus: ['SEND_FOR_PC_APPROVAL', 'SEND_FOR_MDO_APPROVAL', 'APPROVED'],
+        applicationIds: [this.batchData.batchId],
+        limit: 100,
+        offset: 0,
+      }
+      const resData: any = await this.bpService.getSerchRequests(request).toPromise().catch(_error => { })
+      if (resData && resData.result && resData.result.data && resData.result.data.length > 0) {
+        this.userscount.totalApplied = this.userscount.totalApplied + resData.result.data.length
+      }
+      return this.userscount
+      // await this.bpService.fetchBlendedUserCount(req).then(async (res: any) => {
+      //   if (res.result && res.result.data) {
+      //     const statusToNegate = ['WITHDRAWN', 'REMOVED', 'REJECTED']
+      //     await res.result.data.forEach((ele: any) => {
+      //       if (!statusToNegate.includes(ele.currentStatus)) {
+      //         this.userscount.totalApplied = this.userscount.totalApplied + ele.statusCount
+      //       }
+      //     })
+      //     return this.userscount
+      //   }
+      // })
     }
   }
 
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
index 908d51e20..0e296bf61 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
@@ -124,18 +124,39 @@ export class NominateUsersDialogComponent implements OnInit {
           seletedLearner.push(obj)
         })
         this.bpService.nominateLearners(seletedLearner).subscribe((_res: any) => {
-          if (_res[0] && _res[0].result && _res[0].result.status === 'OK' &&
-            this.data.wfApprovalType === 'twoStepMDOAndPCApproval') {
-            this.openSnackbar('Request sent to Program coordinator for approval.')
-          } else if (_res[0] && _res[0].result && _res[0].result.status === 'NOT_ACCEPTABLE') {
-            this.openSnackbar(`Learner is already a part of batch. It can't be added here.`)
-          } else {
-            if (_res[0] && _res[0].result && _res[0].result.status === 'BAD_REQUEST') {
-              this.openSnackbar(_res[0].result.errmsg)
-            } else {
-              this.openSnackbar('User(s) nominated successfully!')
-            }
+          let successCount = 0
+          let failedCount = 0
+          if (_res && _res.length > 0) {
+            _res.forEach((ele: any) => {
+              if (ele.status === 'OK') {
+                successCount = successCount + 1
+              } else {
+                failedCount = failedCount + 1
+              }
+            })
           }
+          if (successCount > 0 || failedCount > 0) {
+            this.openSnackbar(`${successCount} learner(s) nominated successfully,
+            while ${failedCount} failed to nominate as it is part of the program.`)
+          }
+          if (successCount === _res.length) {
+            this.openSnackbar(`${successCount} learner(s) nominated successfully.`)
+          }
+          if (failedCount === _res.length) {
+            this.openSnackbar(`${failedCount} failed to nominate as it is part of the program.`)
+          }
+          // if (_res[0] && _res[0].result && _res[0].result.status === 'OK' &&
+          //   this.data.wfApprovalType === 'twoStepMDOAndPCApproval') {
+          //   this.openSnackbar('Request sent to Program coordinator for approval.')
+          // } else if (_res[0] && _res[0].result && _res[0].result.status === 'NOT_ACCEPTABLE') {
+          //   this.openSnackbar(`Learner is already a part of another batch. It can't be added here.`)
+          // } else {
+          //   if (_res[0] && _res[0].result && _res[0].result.status === 'BAD_REQUEST') {
+          //     this.openSnackbar(_res[0].result.errmsg)
+          //   } else {
+          //     this.openSnackbar('User(s) nominated successfully!')
+          //   }
+          // }
           this.dialogRef.close('done')
         }, (err: { error: any }) => {
           // tslint:disable-next-line:no-console

From dce86828712f8e9491dfd18fbf45f7ab91179b97 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Tue, 7 Nov 2023 10:37:49 +0530
Subject: [PATCH 293/887] bug fix

---
 .../nominate-users-dialog.component.ts                      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
index 0e296bf61..b20e38986 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
@@ -46,7 +46,7 @@ export class NominateUsersDialogComponent implements OnInit {
         query: '',
         filters: {
           rootOrgId: this.data.orgId,
-          status: 1
+          status: 1,
         },
         limit: 100,
         offset: 0,
@@ -96,7 +96,7 @@ export class NominateUsersDialogComponent implements OnInit {
         query: filterValue.value ? filterValue.value.trim().toLowerCase() : '',
         filters: {
           rootOrgId: this.data.orgId,
-          status: 1
+          status: 1,
         },
       },
     }
@@ -128,7 +128,7 @@ export class NominateUsersDialogComponent implements OnInit {
           let failedCount = 0
           if (_res && _res.length > 0) {
             _res.forEach((ele: any) => {
-              if (ele.status === 'OK') {
+              if (ele.result.status === 'OK') {
                 successCount = successCount + 1
               } else {
                 failedCount = failedCount + 1

From cd927e2ac06278c98dc9dd088d1c35b04e8055e0 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Thu, 9 Nov 2023 20:20:49 +0530
Subject: [PATCH 294/887] Event publish API changes

---
 .../create-event/create-event.component.ts     | 18 ++++++++++++++----
 .../routes/events/services/events.service.ts   |  6 +++---
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
index 5ace5af09..6d38239e2 100644
--- a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
+++ b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
@@ -360,7 +360,7 @@ export class CreateEventComponent implements OnInit {
     this.eventsSvc.updateEvent(formJson).subscribe(
       res => {
         if (res || !res) {
-          this.publishEvent(identifier)
+          this.publishEvent(identifier, '')
         }
       },
       (err: any) => {
@@ -508,8 +508,9 @@ export class CreateEventComponent implements OnInit {
           this.displayLoader = false
           this.disableCreateButton = false
           const identifier = res.result.identifier
+          const versionKey = res.result.versionKey
           // this.fileSubmit(identifier)
-          this.publishEvent(identifier)
+          this.publishEvent(identifier, versionKey)
         },
         (err: any) => {
           this.displayLoader = false
@@ -538,8 +539,17 @@ export class CreateEventComponent implements OnInit {
     return minutes
   }
 
-  publishEvent(identifierkey: any) {
-    this.eventsSvc.publishEvent(identifierkey).subscribe(
+  publishEvent(identifierkey: any, versionKey: any) {
+    const reqestBody = {
+      request: {
+        event: {
+          status: "Live",
+          versionKey: versionKey,
+          identifier: identifierkey
+        }
+      }
+    }
+    this.eventsSvc.publishEvent(identifierkey, reqestBody).subscribe(
       res => {
         this.showSuccess(res)
       },
diff --git a/project/ws/app/src/lib/routes/events/services/events.service.ts b/project/ws/app/src/lib/routes/events/services/events.service.ts
index 21665eb50..ca6268f2d 100644
--- a/project/ws/app/src/lib/routes/events/services/events.service.ts
+++ b/project/ws/app/src/lib/routes/events/services/events.service.ts
@@ -29,7 +29,7 @@ const API_END_POINTS = {
 })
 export class EventsService {
 
-  constructor(private http: HttpClient) {}
+  constructor(private http: HttpClient) { }
 
   crreateAsset(req: any): Observable<any> {
     return this.http.post<any>(`${API_END_POINTS.CREATE_ASSET}`, req)
@@ -52,8 +52,8 @@ export class EventsService {
     return this.http.post<any>(API_END_POINTS.UPDATE_EVENT, req)
   }
 
-  publishEvent(eventId: string): Observable<any> {
-    return this.http.post<any>(`${API_END_POINTS.PUBLISH_EVENT}/${eventId}`, '')
+  publishEvent(eventId: string, req: any): Observable<any> {
+    return this.http.post<any>(`${API_END_POINTS.PUBLISH_EVENT}/${eventId}`, req)
   }
 
   searchEvent(req: any) {

From 967c47bdf7e8523b9de45df9b2685ef034570b2e Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Mon, 13 Nov 2023 10:23:35 +0530
Subject: [PATCH 295/887] Updated edit user config for mdoadmin role

---
 .../routes/users-view/users-view.component.ts |  5 +-
 .../routes/view-user/view-user.component.html | 24 ++++-
 .../routes/view-user/view-user.component.scss |  5 +
 .../routes/view-user/view-user.component.ts   | 97 +++++++++++++------
 4 files changed, 97 insertions(+), 34 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 24aab5ca5..9c2ea9bff 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -261,9 +261,10 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   showEditUser(roles: any): boolean {
     if (this.isMdoAdmin) {
       if (roles && roles.length > 0) {
-        return (roles.includes('PUBLIC') && roles.length === 1)
+        return true
+        //   return (roles.includes('PUBLIC') && roles.length === 1)
       }
-      return false
+      // return false
     }
     return true
   }
diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
index 15f3ba361..e7783c603 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
@@ -519,7 +519,7 @@
               </mat-card>
 
               <!-- Roles Update card -->
-              <mat-card id="roles"
+              <mat-card id="roles" *ngIf="!isMdoAdmin"
                 class="flex flex-1 flex-column margin-top-m margin-bottom-m margin-left-m margin-right-m ws-mat-accent-border">
                 <div class="flex-custom">
                   <mat-card-content class="margin-top-m margin-bottom-m margin-left-m margin-right-m">
@@ -567,6 +567,28 @@
                   </mat-card-content>
                 </div>
               </mat-card>
+
+              <mat-card id="roles" *ngIf="isMdoAdmin"
+                class="flex flex-1 flex-column margin-top-m margin-bottom-m margin-left-m margin-right-m ws-mat-accent-border">
+                <div class="flex-custom">
+                  <mat-card-content class="margin-top-m margin-bottom-m margin-left-m margin-right-m">
+                    <span class="mat-subheading-1 flex-4 mobile-margin appr-section-heading" role="link" tabindex="0">
+                      Roles
+                    </span>
+                    <div class="margin-top-l new-mobile">
+                      <div class="flex flex-wrap mobile-break">
+                        <div class="w-full profile-cols-full bg-grey">
+                          <ng-container>
+                            <ul class="roles-list margin-0">
+                              <li *ngFor="let role of orguserRoles" class="margin-bottom-s">{{role}}</li>
+                            </ul>
+                          </ng-container>
+                        </div>
+                      </div>
+                    </div>
+                  </mat-card-content>
+                </div>
+              </mat-card>
             </div>
           </div>
         </div>
diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.scss b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.scss
index 1d9fedcfb..1da967128 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.scss
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.scss
@@ -515,4 +515,9 @@ textarea {
 .mat-chip-list {
   margin-top: 2px;
   display: flex;
+}
+
+.roles-list {
+  list-style: none;
+  padding: 0;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
index 1471099c1..c7cb46b6f 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
@@ -108,6 +108,71 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
         if (fullProfile.unMappedUser && fullProfile.unMappedUser.roles) {
           this.isMdoAdmin = fullProfile.unMappedUser.roles.includes('MDO_ADMIN')
           this.isMdoLeader = fullProfile.unMappedUser.roles.includes('MDO_LEADER')
+          if (this.isMdoAdmin) {
+            this.tabsData = [
+              {
+                name: 'Personal details',
+                key: 'personalInfo',
+                render: true,
+                enabled: true,
+              },
+              {
+                name: 'Academics',
+                key: 'academics',
+                render: true,
+                enabled: true,
+              },
+              {
+                name: 'Professional details',
+                key: 'profdetails',
+                render: true,
+                enabled: true,
+              },
+              {
+                name: 'Certification and skills',
+                key: 'skills',
+                render: true,
+                enabled: true,
+              },
+              {
+                name: 'Roles',
+                key: 'roles',
+                render: true,
+                enabled: true,
+              }]
+          } else {
+            this.tabsData = [
+              {
+                name: 'Personal details',
+                key: 'personalInfo',
+                render: true,
+                enabled: true,
+              },
+              {
+                name: 'Academics',
+                key: 'academics',
+                render: true,
+                enabled: true,
+              },
+              {
+                name: 'Professional details',
+                key: 'profdetails',
+                render: true,
+                enabled: true,
+              },
+              {
+                name: 'Certification and skills',
+                key: 'skills',
+                render: true,
+                enabled: true,
+              },
+              {
+                name: 'Update roles',
+                key: 'roles',
+                render: true,
+                enabled: true,
+              }]
+          }
         }
 
         // New code for roles
@@ -165,6 +230,7 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
         const usrRoles = profileDataAll.roles
         usrRoles.forEach((role: any) => {
           this.orguserRoles.push(role)
+          // console.log('orguserRoles', this.orguserRoles)
           this.modifyUserRoles(role)
         })
 
@@ -266,37 +332,6 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
 
   ngOnInit() {
     this.init()
-    this.tabsData = [
-      {
-        name: 'Personal details',
-        key: 'personalInfo',
-        render: true,
-        enabled: true,
-      },
-      {
-        name: 'Academics',
-        key: 'academics',
-        render: true,
-        enabled: true,
-      },
-      {
-        name: 'Professional details',
-        key: 'profdetails',
-        render: true,
-        enabled: true,
-      },
-      {
-        name: 'Certification and skills',
-        key: 'skills',
-        render: true,
-        enabled: true,
-      },
-      {
-        name: 'Update roles',
-        key: 'roles',
-        render: true,
-        enabled: true,
-      }]
   }
 
   async init() {

From a9f15c64a1137dfb514e563d3578629c84b72e8d Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Tue, 21 Nov 2023 12:43:08 +0530
Subject: [PATCH 296/887] Lint fix

---
 .../routes/events/routes/create-event/create-event.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
index 6d38239e2..5a50c6573 100644
--- a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
+++ b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
@@ -543,8 +543,8 @@ export class CreateEventComponent implements OnInit {
     const reqestBody = {
       request: {
         event: {
+          versionKey,
           status: "Live",
-          versionKey: versionKey,
           identifier: identifierkey
         }
       }

From bd14a345590ea9943ce329a9e3c238171570aeb0 Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Tue, 28 Nov 2023 16:04:05 +0530
Subject: [PATCH 297/887] add user btn removed from leadership tab

---
 .../components/leadershiptable/leadershiptable.component.scss    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.scss b/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.scss
index cf637d7de..bc791398e 100644
--- a/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.scss
@@ -85,6 +85,7 @@ mat-header-row {
     font-family: 'Lato';
     font-weight: 700;
     font-size: 14px;
+    display: none;
 }
 
 .search-icon {

From 92aaa7300f8c8568e9f1690c23bc05ec95b13870 Mon Sep 17 00:00:00 2001
From: dakshayini-krishnappa <dakshayini.krishnappa@tarento.com>
Date: Tue, 28 Nov 2023 23:59:44 +0530
Subject: [PATCH 298/887] phone number added

---
 .../create-user/create-user.component.html    | 20 +++++++++++++++++++
 .../create-user/create-user.component.ts      |  3 +++
 2 files changed, 23 insertions(+)

diff --git a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html
index 50503caef..0c101b97f 100644
--- a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html
+++ b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html
@@ -87,6 +87,26 @@
                     </div>
                   </mat-form-field>
 
+                  <!--Mobile Number field-->
+                  <label for="mobileNumber" class="margin-remove-bottom margin-top-xs form-label required"
+                    i18n="Mobile Number label|Label which explains the user to enter email" i18n-aria-label
+                    aria-label="Mobile Number label">
+                    Mobile Number
+                  </label>
+                  <mat-form-field appearance="outline" class="margin-top-xs">
+                    <input id="mobileNumber" #mobile matInput type="text" maxlength="10" autocomplete="off"
+                      (keypress)="numericOnly($event)" (paste)="numericOnly($event)" placeholder="Mobile Number"
+                      formControlName="mobileNumber" i18n-aria-label aria-label="Mobile Number input">
+                    <mat-error [hidden]="false" i18n="Mobile Number Error|Explains Mobile no is required"
+                      *ngIf="createUserForm?.controls['mobileNumber']?.touched && createUserForm?.controls['mobileNumber'].errors?.required"
+                      i18n-aria-label aria-label="Please enter your mobile number">Please enter your mobile number
+                    </mat-error>
+                    <mat-error [hidden]="false" *ngIf="createUserForm?.controls['mobileNumber'].errors?.pattern"
+                      i18n-aria-label aria-label="Please enter a valid 10 digit mobile number">
+                      Please enter a valid 10 digit mobile number
+                    </mat-error>
+                  </mat-form-field>
+
                   <div class="input-wrapper margin-top-s">
                     <label for="department" class="margin-remove-bottom form-label required" i18n-aria-label
                       aria-label="Department label"
diff --git a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
index 74504180e..963e1819a 100644
--- a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
@@ -46,6 +46,7 @@ export class CreateUserComponent implements OnInit, OnDestroy {
   emailLengthVal = false
   isMdoAdmin = false
   isMdoLeader = false
+  phoneNumberPattern = '^((\\+91-?)|0)?[0-9]{10}$'
 
   @HostListener('window:scroll', ['$event'])
   handleScroll() {
@@ -174,6 +175,7 @@ export class CreateUserComponent implements OnInit, OnDestroy {
       fname: new FormControl('', [Validators.required]),
       // lname: new FormControl('', [Validators.required]),
       email: new FormControl('', [Validators.required, Validators.email]),
+      mobileNumber: new FormControl('', [Validators.required, Validators.pattern(this.phoneNumberPattern), Validators.maxLength(12)]),
       department: new FormControl(''),
       roles: new FormControl('', [Validators.required]),
     })
@@ -206,6 +208,7 @@ export class CreateUserComponent implements OnInit, OnDestroy {
     const newobj = {
       personalDetails: {
         email: form.value.email,
+        phone: form.value.mobileNumber,
         userName: form.value.fname,
         firstName: form.value.fname,
         // lastName: form.value.lname,

From 85b57fce5cf565fbc76a6d68f44b134102f2b95e Mon Sep 17 00:00:00 2001
From: dakshayini-krishnappa <dakshayini.krishnappa@tarento.com>
Date: Wed, 29 Nov 2023 00:06:30 +0530
Subject: [PATCH 299/887] error fix

---
 .../routes/basic-info/basic-info.component.ts          |  2 +-
 .../batch-details/batch-details.component.ts           |  4 ++--
 .../nominate-users-dialog.component.ts                 | 10 +++++-----
 .../users/routes/create-user/create-user.component.ts  |  6 ++++++
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.ts b/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.ts
index b53e15d58..4e865ce45 100644
--- a/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.ts
+++ b/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.ts
@@ -13,7 +13,7 @@ import _ from 'lodash'
 export class BasicInfoComponent implements OnInit {
   basicInfo: any
   imagePath: any
-  verifiedKarmayogi: boolean = false
+  verifiedKarmayogi = false
   constructor(private activeRoute: ActivatedRoute, private router: Router) {
     this.router.events.subscribe((event: Event) => {
       if (event instanceof NavigationEnd) {
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index 535ee0d50..1e7ec27f1 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -282,7 +282,7 @@ export class BatchDetailsComponent implements OnInit {
         this.openSnackbar('Request is removed successfully.')
         this.filter('rejected')
       }
-    }, (error: any) => {
+    },                                                      (error: any) => {
       this.openSnackbar(_.get(error, 'error.params.errmsg') ||
         _.get(error, 'error.result.errmsg') ||
         'Something went wrong, please try again later!')
@@ -360,7 +360,7 @@ export class BatchDetailsComponent implements OnInit {
           applicationId: this.batchData.batchId,
           learners: this.approvedUsers,
           wfApprovalType: this.programData.wfApprovalType,
-          departmentName: this.userProfile.rootOrg.orgName
+          departmentName: this.userProfile.rootOrg.orgName,
         },
         disableClose: true,
         autoFocus: false,
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
index b20e38986..9c6f96b1a 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
@@ -35,10 +35,10 @@ export class NominateUsersDialogComponent implements OnInit {
   ]
 
   constructor(public dialogRef: MatDialogRef<NominateUsersDialogComponent>,
-    private usersService: UsersService,
-    private dialogue: MatDialog,
-    @Inject(MAT_DIALOG_DATA) public data: any, private bpService: BlendedApporvalService,
-    private snackBar: MatSnackBar) { }
+              private usersService: UsersService,
+              private dialogue: MatDialog,
+              @Inject(MAT_DIALOG_DATA) public data: any, private bpService: BlendedApporvalService,
+              private snackBar: MatSnackBar) { }
 
   ngOnInit() {
     const filterObj = {
@@ -158,7 +158,7 @@ export class NominateUsersDialogComponent implements OnInit {
           //   }
           // }
           this.dialogRef.close('done')
-        }, (err: { error: any }) => {
+        },                                                        (err: { error: any }) => {
           // tslint:disable-next-line:no-console
           console.log(err)
           this.openSnackbar('some thing went wrong, Please try after sometime.')
diff --git a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
index 963e1819a..323d6f020 100644
--- a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
@@ -287,4 +287,10 @@ export class CreateUserComponent implements OnInit, OnDestroy {
       this.defaultSideNavBarOpenedSubscription.unsubscribe()
     }
   }
+
+  numericOnly(event: any): boolean {
+    const pattren = /^([0-9])$/
+    const result = pattren.test(event.key)
+    return result
+  }
 }

From 2664b891c5c5db4b40832d09aadb886c9f7f793d Mon Sep 17 00:00:00 2001
From: dakshayini-krishnappa <dakshayini.krishnappa@tarento.com>
Date: Wed, 29 Nov 2023 14:25:48 +0530
Subject: [PATCH 300/887] error msg display

---
 .../routes/create-user/create-user.component.ts     | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
index 323d6f020..879a32efd 100644
--- a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
@@ -258,7 +258,18 @@ export class CreateUserComponent implements OnInit, OnDestroy {
       // tslint:disable-next-line
       (err: any) => {
         this.displayLoader = false
-        this.openSnackbar(err.error || err || 'Some error occurred while creating user, Please try again later!')
+        if (err.error.params.errmsg) {
+          if (err.error.params.errmsg === 'phone already exists')
+            this.openSnackbar('Phone Number already exists')
+          else if (err.error.params.errmsg === 'email already exists')
+            this.openSnackbar('Email Id already exists')
+          else if (err.error.params.errmsg === 'Invalid format for given phone.')
+            this.openSnackbar('Please enter valid phone number')
+          else
+            this.openSnackbar('Some error occurred while creating user, Please try again later!')
+        }
+        else
+          this.openSnackbar('Some error occurred while creating user, Please try again later!')
       })
   }
 

From e0f21843ff683223cb2408804a9a116e84f94a39 Mon Sep 17 00:00:00 2001
From: dakshayini-krishnappa <dakshayini.krishnappa@tarento.com>
Date: Wed, 29 Nov 2023 14:30:22 +0530
Subject: [PATCH 301/887] display error msg

---
 .../routes/create-user/create-user.component.ts     | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
index 879a32efd..3d590b1e1 100644
--- a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
@@ -259,17 +259,18 @@ export class CreateUserComponent implements OnInit, OnDestroy {
       (err: any) => {
         this.displayLoader = false
         if (err.error.params.errmsg) {
-          if (err.error.params.errmsg === 'phone already exists')
+          if (err.error.params.errmsg === 'phone already exists') {
             this.openSnackbar('Phone Number already exists')
-          else if (err.error.params.errmsg === 'email already exists')
+          } else if (err.error.params.errmsg === 'email already exists') {
             this.openSnackbar('Email Id already exists')
-          else if (err.error.params.errmsg === 'Invalid format for given phone.')
+ } else if (err.error.params.errmsg === 'Invalid format for given phone.') {
             this.openSnackbar('Please enter valid phone number')
-          else
+ } else {
             this.openSnackbar('Some error occurred while creating user, Please try again later!')
-        }
-        else
+ }
+        } else {
           this.openSnackbar('Some error occurred while creating user, Please try again later!')
+        }
       })
   }
 

From c8f9dcf9c0210550aefcd72ec55955f73fc46990 Mon Sep 17 00:00:00 2001
From: Afzal84 <mohd.afzal@tarento.com>
Date: Thu, 30 Nov 2023 13:13:35 +0530
Subject: [PATCH 302/887] Fixed- disable button

---
 .../users/routes/create-user/create-user.component.ts      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
index 3d590b1e1..5989e20c8 100644
--- a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
@@ -258,16 +258,17 @@ export class CreateUserComponent implements OnInit, OnDestroy {
       // tslint:disable-next-line
       (err: any) => {
         this.displayLoader = false
+        this.disableCreateButton = false
         if (err.error.params.errmsg) {
           if (err.error.params.errmsg === 'phone already exists') {
             this.openSnackbar('Phone Number already exists')
           } else if (err.error.params.errmsg === 'email already exists') {
             this.openSnackbar('Email Id already exists')
- } else if (err.error.params.errmsg === 'Invalid format for given phone.') {
+          } else if (err.error.params.errmsg === 'Invalid format for given phone.') {
             this.openSnackbar('Please enter valid phone number')
- } else {
+          } else {
             this.openSnackbar('Some error occurred while creating user, Please try again later!')
- }
+          }
         } else {
           this.openSnackbar('Some error occurred while creating user, Please try again later!')
         }

From 3899180fc63022f1731c294e0523e2f1987c1e69 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Tue, 5 Dec 2023 10:17:17 +0530
Subject: [PATCH 303/887] added cancel button

---
 .../routes/create-user/create-user.component.html    | 12 +++++++++++-
 .../routes/create-user/create-user.component.scss    |  9 ++++++++-
 .../routes/create-user/create-user.component.ts      | 12 ++++++++----
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html
index 0c101b97f..9062d9049 100644
--- a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html
+++ b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.html
@@ -134,12 +134,22 @@
                   </div>
                 </div>
               </div>
-              <button mat-raised-button type="submit" (click)="onSubmit(createUserForm)"
+              <!-- <button mat-raised-button type="submit" (click)="onSubmit(createUserForm)"
                 class="text-white btn-success btn-responsive"
                 [disabled]="createUserForm?.invalid || disableCreateButton">
                 <span class="text-white" i18n>
                   Create user
                 </span>
+              </button> -->
+
+              <button mat-raised-button type="submit" (click)="onSubmit(createUserForm)" class="text-white btn-success"
+                [disabled]="createUserForm?.invalid || disableCreateButton">
+                <span class="text-white" i18n>
+                  Create user
+                </span>
+              </button>
+              <button mat-raised-button type="button" class="flex-auto-display mar" (click)="navigateTo()">
+                <span class="ws-mat-default-text" i18n>Cancel</span>
               </button>
               <div *ngIf="displayLoader" class="mt-5 pr-4 flex items-center justify-center">
                 <mat-spinner [diameter]="30"></mat-spinner>
diff --git a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.scss b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.scss
index 1d0c1faba..1c1cfaf26 100644
--- a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.scss
+++ b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.scss
@@ -197,7 +197,8 @@ input[type=number] {
   .btn-success {
     background-color: #0075B7!important;
     border-radius: 4px;
-    width: 240px;
+   // width: 240px;
+    width: 160px;
     box-shadow: none;
     margin-right: 16px;
 
@@ -210,6 +211,7 @@ input[type=number] {
   .btn-success:disabled,
   .btn-success[disabled] {
     opacity: 0.6;
+    width: 160px;
   }
 
   .btn-danger {
@@ -566,3 +568,8 @@ input.mat-input-element {
   color: #f44336;
   top: 35px;
 }
+
+.mar{
+    margin-left: 16px;
+    min-width: 160px;
+  }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
index 3d590b1e1..ffca0e16d 100644
--- a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
@@ -263,11 +263,11 @@ export class CreateUserComponent implements OnInit, OnDestroy {
             this.openSnackbar('Phone Number already exists')
           } else if (err.error.params.errmsg === 'email already exists') {
             this.openSnackbar('Email Id already exists')
- } else if (err.error.params.errmsg === 'Invalid format for given phone.') {
+          } else if (err.error.params.errmsg === 'Invalid format for given phone.') {
             this.openSnackbar('Please enter valid phone number')
- } else {
+          } else {
             this.openSnackbar('Some error occurred while creating user, Please try again later!')
- }
+          }
         } else {
           this.openSnackbar('Some error occurred while creating user, Please try again later!')
         }
@@ -305,4 +305,8 @@ export class CreateUserComponent implements OnInit, OnDestroy {
     const result = pattren.test(event.key)
     return result
   }
-}
+
+  navigateTo() {
+    this.router.navigate([`/app/home/users`])
+  }
+}
\ No newline at end of file

From e76a8ba94d966d4e1a47832a1001369093494b30 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Tue, 5 Dec 2023 10:20:17 +0530
Subject: [PATCH 304/887] lint fix

---
 .../events/routes/create-event/create-event.component.ts  | 8 ++++----
 .../users/routes/create-user/create-user.component.ts     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
index 5a50c6573..4d6010b66 100644
--- a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
+++ b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
@@ -544,10 +544,10 @@ export class CreateEventComponent implements OnInit {
       request: {
         event: {
           versionKey,
-          status: "Live",
-          identifier: identifierkey
-        }
-      }
+          status: 'Live',
+          identifier: identifierkey,
+        },
+      },
     }
     this.eventsSvc.publishEvent(identifierkey, reqestBody).subscribe(
       res => {
diff --git a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
index ffca0e16d..1a9214434 100644
--- a/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/create-user/create-user.component.ts
@@ -309,4 +309,4 @@ export class CreateUserComponent implements OnInit, OnDestroy {
   navigateTo() {
     this.router.navigate([`/app/home/users`])
   }
-}
\ No newline at end of file
+}

From ed392caefc8aeceeda2ec8441662160c86cace8a Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Wed, 6 Dec 2023 12:32:13 +0530
Subject: [PATCH 305/887] added few changes

---
 .../ws/app/src/lib/routes/home/home.module.ts |   2 +
 .../lib/routes/home/home.rounting.module.ts   |   9 ++
 .../training-plan.component.html              |  27 ++++
 .../training-plan.component.scss              |  28 ++++
 .../training-plan/training-plan.component.ts  | 125 ++++++++++++++++++
 5 files changed, 191 insertions(+)
 create mode 100644 project/ws/app/src/lib/routes/home/routes/training-plan/training-plan.component.html
 create mode 100644 project/ws/app/src/lib/routes/home/routes/training-plan/training-plan.component.scss
 create mode 100644 project/ws/app/src/lib/routes/home/routes/training-plan/training-plan.component.ts

diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index 53d8265a9..b06f6851d 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -62,6 +62,7 @@ import { AdmintableComponent } from './components/admintable/admintable.componen
 import { UsersModule } from '../users/users.module'
 import { BlendedApprovalsComponent } from './routes/blended-approvals/blended-approvals.component'
 import { ReportsSectionComponent } from './routes/reports-section/reports-section.component'
+import { TrainingPlanComponent } from './routes/training-plan/training-plan.component'
 @NgModule({
   declarations: [
     HomeComponent,
@@ -85,6 +86,7 @@ import { ReportsSectionComponent } from './routes/reports-section/reports-sectio
     BudgetproofspopupComponent,
     BlendedApprovalsComponent,
     ReportsSectionComponent,
+    TrainingPlanComponent
   ],
   imports: [
     CommonModule,
diff --git a/project/ws/app/src/lib/routes/home/home.rounting.module.ts b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
index d349adc8b..624fc57bf 100644
--- a/project/ws/app/src/lib/routes/home/home.rounting.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
@@ -19,6 +19,7 @@ import { MdoinfoComponent } from './routes/mdoinfo/mdoinfo.component'
 import { PageResolve } from '@sunbird-cb/utils'
 import { BlendedApprovalsComponent } from './routes/blended-approvals/blended-approvals.component'
 import { ReportsSectionComponent } from './routes/reports-section/reports-section.component'
+import { TrainingPlanComponent } from './routes/training-plan/training-plan.component'
 const routes: Routes = [
   {
     path: '',
@@ -133,6 +134,14 @@ const routes: Routes = [
           module: 'Home',
         },
       },
+      {
+        path: 'training-plan',
+        component: TrainingPlanComponent,
+        data: {
+          pageId: 'training-plan',
+          module: 'Training Plan',
+        },
+      },
     ],
   },
   {
diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan/training-plan.component.html b/project/ws/app/src/lib/routes/home/routes/training-plan/training-plan.component.html
new file mode 100644
index 000000000..86d3c5f8b
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan/training-plan.component.html
@@ -0,0 +1,27 @@
+<div class="flex flex-4 flex-column">
+  <mat-card>
+    <div class="flex flex-between mat-h2 margin-remove">Training plan
+      <button mat-button type="button" class="create-cbp-btn">Create CBP</button>
+    </div>
+    <mat-card-content>
+      <div class="flex flex-1 flex-column margin-fix">
+        <div class="flex flex-1 filter max-height-60">
+          <a routerLinkActive="router-link-active" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'live',
+                    'ws-mat-accent-border font-medium':currentFilter !== 'live'}" mat-button
+            (click)="filter('live'); tabTelemetry('live', 0)" role="button">Live</a>
+          <a routerLinkActive="router-link-active" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'draft',
+                                'ws-mat-accent-border font-medium':currentFilter !== 'draft'}" mat-button
+            (click)="filter('draft'); tabTelemetry('draft', 1)" role="button">Draft</a>
+        </div>
+      </div>
+      <ng-container class="margin-top-l">
+        <ws-widget-org-user-table [tableData]="tabledata" [data]="trainingPlanData" [isTrainingPlan]="true"
+          [trainingTagList]="tagListData" *ngIf="currentFilter === 'live'">
+        </ws-widget-org-user-table>
+        <ws-widget-org-user-table [tableData]="tabledata" [data]="trainingPlanData" [isTrainingPlan]="true"
+          [trainingTagList]="tagListData" *ngIf="currentFilter === 'draft'">
+        </ws-widget-org-user-table>
+      </ng-container>
+    </mat-card-content>
+  </mat-card>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan/training-plan.component.scss b/project/ws/app/src/lib/routes/home/routes/training-plan/training-plan.component.scss
new file mode 100644
index 000000000..a1997a92f
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan/training-plan.component.scss
@@ -0,0 +1,28 @@
+@import 'ws-common';
+@import 'ws-vars';
+@import 'ws-mixins';
+
+.filter {
+  .filter-option {
+    margin: $size-xs $size-m;
+    /* border-bottom: darkslateblue; */
+    border-radius: 0;
+    border-bottom-width: 2px;
+    border-top-width: 0;
+    border-left-width: 0;
+    border-right-width: 0;
+  }
+
+  .filter-option:first-child {
+    margin-left: 0;
+  }
+}
+
+.create-cbp-btn {
+  width: 109px;
+  background: #0075B7 !important;
+  color: white !important;
+  font-family: 'Lato';
+  font-weight: 700;
+  font-size: 14px;
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan/training-plan.component.ts b/project/ws/app/src/lib/routes/home/routes/training-plan/training-plan.component.ts
new file mode 100644
index 000000000..15d64fc2b
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan/training-plan.component.ts
@@ -0,0 +1,125 @@
+import { Component, OnInit } from '@angular/core'
+// import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
+// import { EventService } from '@sunbird-cb/utils'
+import { ITableData } from '@sunbird-cb/collection/lib/ui-org-table/interface/interfaces'
+
+@Component({
+  selector: 'ws-app-training-plan',
+  templateUrl: './training-plan.component.html',
+  styleUrls: ['./training-plan.component.scss'],
+})
+export class TrainingPlanComponent implements OnInit {
+
+  currentFilter = 'live'
+  pageIndex: number = 0
+  currentOffset: number = 0
+  limit: number = 20
+  searchQuery: string = ''
+  tabledata!: ITableData
+  trainingPlanData: any = []
+  tagListData: any = ['Designation', 'All users', 'Custom users']
+
+  constructor(
+    // private events: EventService,
+  ) {
+
+  }
+
+  ngOnInit() {
+    this.tabledata = {
+      columns: [
+        // { displayName: 'Id', key: 'identifier' },
+        { displayName: 'Plan name', key: 'planName' },
+        { displayName: 'Assignee', key: 'assignee' },
+        { displayName: 'Total content', key: 'totalContent' },
+        { displayName: 'Timeline', key: 'timeline' },
+        { displayName: 'Content type', key: 'contentType' },
+        { displayName: 'Created by', key: 'CreatedBy' },
+        { displayName: 'Created on', key: 'CreatedOn' },
+      ],
+      needCheckBox: false,
+      needHash: false,
+      sortColumn: 'dateCreatedOn',
+      sortState: 'desc',
+      needUserMenus: false,
+      actions: [],
+      actionColumnName: 'Action',
+    }
+    this.filter('live')
+  }
+
+  tabSelected(item: string) {
+    this.currentFilter = item
+  }
+
+  onEnterkySearch(enterValue: any) {
+    this.searchQuery = enterValue
+    this.currentOffset = 0
+    this.pageIndex = 0
+    this.filterData(this.searchQuery)
+  }
+
+  filter(filter: string) {
+    this.currentFilter = filter
+    this.pageIndex = 0
+    this.currentOffset = 0
+    this.limit = 20
+    this.searchQuery = ''
+    this.filterData(this.searchQuery)
+  }
+
+  filterData(query: string) {
+    if (this.currentFilter === 'live') {
+      this.getLiveData(query)
+    } else if (this.currentFilter === 'draft') {
+      this.getDraftData(query)
+    }
+  }
+
+  public tabTelemetry(_label: string, _index: number) {
+    // const data: TelemetryEvents.ITelemetryTabData = {
+    //   label,
+    //   index,
+    // }
+    // this.events.handleTabTelemetry(
+    //   TelemetryEvents.EnumInteractSubTypes.USER_TAB,
+    //   data,
+    // )
+  }
+
+  getLiveData(_searchText: string) {
+    this.trainingPlanData = []
+    this.trainingPlanData.push({
+      planName: 'planName live',
+      assignee: 'assignee live',
+      totalContent: 'totalContent live',
+      timeline: 'timeline live',
+      contentType: 'contentType live',
+      CreatedBy: 'CreatedBy live',
+      CreatedOn: 'CreatedOn live',
+    }, {
+      planName: 'check live',
+      assignee: 'assignee live',
+      totalContent: 'totalContent live',
+      timeline: 'timeline live',
+      contentType: 'contentType live',
+      CreatedBy: 'CreatedBy live',
+      CreatedOn: 'CreatedOn live',
+    })
+  }
+
+  getDraftData(_searchText: string) {
+    this.trainingPlanData = []
+    this.trainingPlanData.push({
+      planName: 'planName draft',
+      assignee: 'assignee draft',
+      totalContent: 'totalContent draft',
+      timeline: 'timeline draft',
+      contentType: 'contentType draft',
+      CreatedBy: 'CreatedBy draft',
+      CreatedOn: 'CreatedOn draft',
+    })
+  }
+
+
+}

From 048830cf12975fe87697356cf63a3e40d371bc84 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Wed, 6 Dec 2023 18:23:47 +0530
Subject: [PATCH 306/887] added the training-plan module and routings

---
 .../ws/app/src/lib/routes/home/home.module.ts |   4 +-
 .../lib/routes/home/home.rounting.module.ts   |   7 +-
 .../training-plan-dashboard.component.html}   |   2 +-
 .../training-plan-dashboard.component.scss}   |   0
 .../training-plan-dashboard.component.ts}     |  15 ++-
 .../resolvers/config-resolve.service.ts       |  17 +++
 .../resolvers/init-resolve.service.ts         |  43 ++++++++
 .../create-plan/create-plan.component.html    |   1 +
 .../create-plan/create-plan.component.scss    |   0
 .../create-plan/create-plan.component.ts      |  23 ++++
 .../training-plan-home.component.html         |   3 +
 .../training-plan-home.component.scss         |   0
 .../training-plan-home.component.ts           |  30 +++++
 .../training-plan/training-plan.module.ts     | 103 ++++++++++++++++++
 .../training-plan.routing.module.ts           |  39 +++++++
 src/app/app-routing.module.ts                 |  12 ++
 src/app/routes/route-training-plan.module.ts  |  15 +++
 17 files changed, 303 insertions(+), 11 deletions(-)
 rename project/ws/app/src/lib/routes/home/routes/{training-plan/training-plan.component.html => training-plan-dashboard/training-plan-dashboard.component.html} (93%)
 rename project/ws/app/src/lib/routes/home/routes/{training-plan/training-plan.component.scss => training-plan-dashboard/training-plan-dashboard.component.scss} (100%)
 rename project/ws/app/src/lib/routes/home/routes/{training-plan/training-plan.component.ts => training-plan-dashboard/training-plan-dashboard.component.ts} (89%)
 create mode 100644 project/ws/app/src/lib/routes/training-plan/resolvers/config-resolve.service.ts
 create mode 100644 project/ws/app/src/lib/routes/training-plan/resolvers/init-resolve.service.ts
 create mode 100644 project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
 create mode 100644 project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.scss
 create mode 100644 project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
 create mode 100644 project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.html
 create mode 100644 project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.scss
 create mode 100644 project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.ts
 create mode 100644 project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
 create mode 100644 project/ws/app/src/lib/routes/training-plan/training-plan.routing.module.ts
 create mode 100644 src/app/routes/route-training-plan.module.ts

diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index b06f6851d..a98b4e9d5 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -62,7 +62,7 @@ import { AdmintableComponent } from './components/admintable/admintable.componen
 import { UsersModule } from '../users/users.module'
 import { BlendedApprovalsComponent } from './routes/blended-approvals/blended-approvals.component'
 import { ReportsSectionComponent } from './routes/reports-section/reports-section.component'
-import { TrainingPlanComponent } from './routes/training-plan/training-plan.component'
+import { TrainingPlanDashboardComponent } from './routes/training-plan-dashboard/training-plan-dashboard.component'
 @NgModule({
   declarations: [
     HomeComponent,
@@ -86,7 +86,7 @@ import { TrainingPlanComponent } from './routes/training-plan/training-plan.comp
     BudgetproofspopupComponent,
     BlendedApprovalsComponent,
     ReportsSectionComponent,
-    TrainingPlanComponent
+    TrainingPlanDashboardComponent,
   ],
   imports: [
     CommonModule,
diff --git a/project/ws/app/src/lib/routes/home/home.rounting.module.ts b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
index 624fc57bf..90c920bf7 100644
--- a/project/ws/app/src/lib/routes/home/home.rounting.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
@@ -19,7 +19,8 @@ import { MdoinfoComponent } from './routes/mdoinfo/mdoinfo.component'
 import { PageResolve } from '@sunbird-cb/utils'
 import { BlendedApprovalsComponent } from './routes/blended-approvals/blended-approvals.component'
 import { ReportsSectionComponent } from './routes/reports-section/reports-section.component'
-import { TrainingPlanComponent } from './routes/training-plan/training-plan.component'
+import { TrainingPlanDashboardComponent } from './routes/training-plan-dashboard/training-plan-dashboard.component'
+
 const routes: Routes = [
   {
     path: '',
@@ -135,8 +136,8 @@ const routes: Routes = [
         },
       },
       {
-        path: 'training-plan',
-        component: TrainingPlanComponent,
+        path: 'training-plan-dashboard',
+        component: TrainingPlanDashboardComponent,
         data: {
           pageId: 'training-plan',
           module: 'Training Plan',
diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan/training-plan.component.html b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html
similarity index 93%
rename from project/ws/app/src/lib/routes/home/routes/training-plan/training-plan.component.html
rename to project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html
index 86d3c5f8b..7c71079fe 100644
--- a/project/ws/app/src/lib/routes/home/routes/training-plan/training-plan.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html
@@ -1,7 +1,7 @@
 <div class="flex flex-4 flex-column">
   <mat-card>
     <div class="flex flex-between mat-h2 margin-remove">Training plan
-      <button mat-button type="button" class="create-cbp-btn">Create CBP</button>
+      <button mat-button type="button" class="create-cbp-btn" (click)="createCbp()">Create CBP</button>
     </div>
     <mat-card-content>
       <div class="flex flex-1 flex-column margin-fix">
diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan/training-plan.component.scss b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.scss
similarity index 100%
rename from project/ws/app/src/lib/routes/home/routes/training-plan/training-plan.component.scss
rename to project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.scss
diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan/training-plan.component.ts b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
similarity index 89%
rename from project/ws/app/src/lib/routes/home/routes/training-plan/training-plan.component.ts
rename to project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
index 15d64fc2b..36f092169 100644
--- a/project/ws/app/src/lib/routes/home/routes/training-plan/training-plan.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
@@ -1,14 +1,15 @@
 import { Component, OnInit } from '@angular/core'
+import { Router } from '@angular/router'
 // import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
 // import { EventService } from '@sunbird-cb/utils'
 import { ITableData } from '@sunbird-cb/collection/lib/ui-org-table/interface/interfaces'
 
 @Component({
-  selector: 'ws-app-training-plan',
-  templateUrl: './training-plan.component.html',
-  styleUrls: ['./training-plan.component.scss'],
+  selector: 'ws-app-training-plan-dashboard',
+  templateUrl: './training-plan-dashboard.component.html',
+  styleUrls: ['./training-plan-dashboard.component.scss'],
 })
-export class TrainingPlanComponent implements OnInit {
+export class TrainingPlanDashboardComponent implements OnInit {
 
   currentFilter = 'live'
   pageIndex: number = 0
@@ -21,6 +22,7 @@ export class TrainingPlanComponent implements OnInit {
 
   constructor(
     // private events: EventService,
+    private router: Router
   ) {
 
   }
@@ -32,8 +34,8 @@ export class TrainingPlanComponent implements OnInit {
         { displayName: 'Plan name', key: 'planName' },
         { displayName: 'Assignee', key: 'assignee' },
         { displayName: 'Total content', key: 'totalContent' },
-        { displayName: 'Timeline', key: 'timeline' },
         { displayName: 'Content type', key: 'contentType' },
+        { displayName: 'Timeline', key: 'timeline' },
         { displayName: 'Created by', key: 'CreatedBy' },
         { displayName: 'Created on', key: 'CreatedOn' },
       ],
@@ -121,5 +123,8 @@ export class TrainingPlanComponent implements OnInit {
     })
   }
 
+  createCbp() {
+    this.router.navigate(['app', 'training-plan', 'create-plan'])
+  }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/resolvers/config-resolve.service.ts b/project/ws/app/src/lib/routes/training-plan/resolvers/config-resolve.service.ts
new file mode 100644
index 000000000..caaea4750
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/resolvers/config-resolve.service.ts
@@ -0,0 +1,17 @@
+import { Injectable, SkipSelf } from '@angular/core'
+import { Resolve } from '@angular/router'
+import { Observable, of } from 'rxjs'
+import { ConfigurationsService } from '@sunbird-cb/utils'
+@Injectable()
+export class ConfigResolveService
+  implements
+  Resolve<Observable<any>> {
+  constructor(
+    @SkipSelf() private confService: ConfigurationsService,
+  ) { }
+  resolve(
+  ): Observable<any> {
+
+    return of({ ...this.confService })
+  }
+}
diff --git a/project/ws/app/src/lib/routes/training-plan/resolvers/init-resolve.service.ts b/project/ws/app/src/lib/routes/training-plan/resolvers/init-resolve.service.ts
new file mode 100644
index 000000000..1a0434d41
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/resolvers/init-resolve.service.ts
@@ -0,0 +1,43 @@
+import { Injectable } from '@angular/core'
+import { ActivatedRouteSnapshot, Resolve } from '@angular/router'
+
+// import { CKEditorService } from 'library/ws-widget/collection/src/lib/_common/ck-editor/ck-editor.service'
+import { Observable, forkJoin, of } from 'rxjs'
+// import { tap } from 'rxjs/operators'
+// import { AuthInitService } from '@ws/author/src/lib/services/init.service'
+
+@Injectable()
+export class InitResolver implements Resolve<any> {
+  constructor(
+    // private apiService: ApiService,
+    // private router: Router,
+    // private ckEditorInject: CKEditorService,
+    // private configurationsService: ConfigurationsService,
+    // private accessService: AccessControlService,
+    // private authInitService: AuthInitService,
+    // private zipJSInject: ZipJSResolverService,
+  ) { }
+
+  resolve(route: ActivatedRouteSnapshot): Observable<any> {
+    const forkProcess: Observable<any>[] = [of(undefined)]
+    // const pushedJobs: string[] = ['']
+    const data: string[] = route.data ? route.data.load || [] : []
+
+    if (data.includes('ckeditor')) {
+      // forkProcess.push(this.ckEditorInject.inject())
+      // forkProcess.push(this.zipJSInject.inject())
+    }
+    return forkJoin(forkProcess).pipe()
+    // tap(v => {
+    // if (pushedJobs.includes('config')) {
+    //   this.authInitService.ownerDetails = v[pushedJobs.indexOf('config')].ownerDetails
+    // }
+    // })
+    // ),
+    // catchError((v: any) => {
+    //   this.router.navigateByUrl('/error-somethings-wrong')
+    //   return of(v)
+    // }),
+
+  }
+}
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
new file mode 100644
index 000000000..04108c4c5
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
@@ -0,0 +1 @@
+<h1>Create Plan</h1>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.scss b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
new file mode 100644
index 000000000..9299466e0
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
@@ -0,0 +1,23 @@
+
+import { AfterViewInit, Component, OnDestroy, OnInit } from '@angular/core'
+/* tslint:disable */
+import _ from 'lodash'
+/* tslint:enable */
+@Component({
+  selector: 'ws-app-create-plan',
+  templateUrl: './create-plan.component.html',
+  styleUrls: ['./create-plan.component.scss'],
+})
+
+export class CreatePlanComponent implements OnInit, AfterViewInit, OnDestroy {
+
+  constructor() {
+  }
+  ngOnDestroy() {
+
+  }
+  ngOnInit() {
+  }
+  ngAfterViewInit() {
+  }
+}
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.html b/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.html
new file mode 100644
index 000000000..d2b776c56
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.html
@@ -0,0 +1,3 @@
+<div class="container-balanced">
+  <router-outlet></router-outlet>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.scss b/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.ts
new file mode 100644
index 000000000..22489a692
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.ts
@@ -0,0 +1,30 @@
+import { Component, OnInit, OnDestroy, AfterViewInit } from '@angular/core'
+/* tslint:disable */
+import _ from 'lodash'
+/* tslint:enable */
+
+@Component({
+  selector: 'ws-app-training-plan-home',
+  templateUrl: './training-plan-home.component.html',
+  styleUrls: ['./training-plan-home.component.scss'],
+  /* tslint:disable */
+  host: { class: 'margin-top-l' },
+  /* tslint:enable */
+})
+export class TrainingPlanHomeComponent implements OnInit, AfterViewInit, OnDestroy {
+
+  constructor(
+  ) {
+
+  }
+  ngOnInit() {
+
+  }
+
+  ngAfterViewInit() {
+  }
+
+  ngOnDestroy() {
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
new file mode 100644
index 000000000..d313af29d
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
@@ -0,0 +1,103 @@
+import { NgModule } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { PipeFilterModule, PipeHtmlTagRemovalModule, PipeOrderByModule, PipeRelativeTimeModule } from '@sunbird-cb/utils'
+import { MatGridListModule } from '@angular/material/grid-list'
+import { MatExpansionModule } from '@angular/material/expansion'
+import { MatDividerModule } from '@angular/material/divider'
+import { WidgetResolverModule } from '@sunbird-cb/resolver'
+import {
+  MatIconModule,
+  MatListModule,
+  MatFormFieldModule,
+  MatDialogModule,
+  MatSelectModule,
+  MatInputModule,
+  MatButtonModule,
+  MatSidenavModule,
+  MatChipsModule,
+  MatProgressSpinnerModule,
+  MatProgressBarModule,
+  MatRadioModule,
+  MatTabsModule,
+  MatCheckboxModule,
+} from '@angular/material'
+import { MatMenuModule } from '@angular/material/menu'
+import { MatPaginatorModule } from '@angular/material/paginator'
+import { MatCardModule } from '@angular/material/card'
+import { ReactiveFormsModule, FormsModule } from '@angular/forms'
+import { InitResolver } from './resolvers/init-resolve.service'
+import { RouterModule } from '@angular/router'
+import { AvatarPhotoModule, BreadcrumbsOrgModule, LeftMenuModule, UIORGTableModule, ScrollspyLeftMenuModule } from '@sunbird-cb/collection'
+import { Ng2SearchPipeModule } from 'ng2-search-filter'
+import { ExportAsModule } from 'ngx-export-as'
+import { WorkallocationModule } from '../workallocation/workallocation.module'
+import { NgxPaginationModule } from 'ngx-pagination'
+import { UIAdminTableModule } from '../../head/work-allocation-table/ui-admin-table.module'
+import { MatTableModule } from '@angular/material/table'
+import { MatTooltipModule } from '@angular/material/tooltip'
+import { MatSortModule } from '@angular/material/sort'
+import { TrainingPlanRoutingModule } from './training-plan.routing.module'
+import { TrainingPlanHomeComponent } from './routes/training-plan-home/training-plan-home.component'
+import { CreatePlanComponent } from './routes/create-plan/create-plan.component'
+@NgModule({
+  declarations: [
+    TrainingPlanHomeComponent,
+    CreatePlanComponent
+  ],
+  imports: [
+    CommonModule,
+    Ng2SearchPipeModule,
+    UIORGTableModule,
+    WidgetResolverModule,
+    ReactiveFormsModule,
+    TrainingPlanRoutingModule,
+    LeftMenuModule,
+    FormsModule,
+    RouterModule,
+    MatGridListModule,
+    MatExpansionModule,
+    MatFormFieldModule,
+    MatDividerModule,
+    MatIconModule,
+    MatCardModule,
+    MatChipsModule,
+    MatListModule,
+    MatSelectModule,
+    MatCheckboxModule,
+    FormsModule,
+    ReactiveFormsModule,
+    MatInputModule,
+    MatDialogModule,
+    MatButtonModule,
+    MatSidenavModule,
+    MatMenuModule,
+    MatPaginatorModule,
+    MatProgressSpinnerModule,
+    MatProgressBarModule,
+    PipeFilterModule,
+    PipeHtmlTagRemovalModule,
+    PipeRelativeTimeModule,
+    AvatarPhotoModule,
+    PipeOrderByModule,
+    BreadcrumbsOrgModule,
+    WidgetResolverModule,
+    ScrollspyLeftMenuModule,
+    MatRadioModule,
+    ExportAsModule,
+    WorkallocationModule,
+    NgxPaginationModule,
+    UIAdminTableModule,
+    MatTabsModule,
+    MatTableModule,
+    MatTooltipModule,
+    MatSortModule,
+  ],
+  entryComponents: [
+  ],
+  providers: [
+    InitResolver,
+  ],
+})
+export class TrainingPlanModule {
+
+}
diff --git a/project/ws/app/src/lib/routes/training-plan/training-plan.routing.module.ts b/project/ws/app/src/lib/routes/training-plan/training-plan.routing.module.ts
new file mode 100644
index 000000000..6d6cf1097
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/training-plan.routing.module.ts
@@ -0,0 +1,39 @@
+import { NgModule } from '@angular/core'
+import { Routes, RouterModule } from '@angular/router'
+import { ConfigResolveService } from './resolvers/config-resolve.service'
+import { TrainingPlanHomeComponent } from './routes/training-plan-home/training-plan-home.component'
+import { CreatePlanComponent } from './routes/create-plan/create-plan.component'
+
+const routes: Routes = [
+  {
+    path: '',
+    pathMatch: 'full',
+    redirectTo: 'create-plan',
+  },
+  {
+    path: '',
+    component: TrainingPlanHomeComponent,
+    resolve: {
+      configService: ConfigResolveService,
+    },
+    children: [
+      {
+        path: 'create-plan',
+        component: CreatePlanComponent,
+        data: {
+          pageId: 'create-plan',
+          module: 'Create Plan',
+        },
+      },
+    ],
+  },
+]
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+  providers: [
+    ConfigResolveService,
+  ],
+})
+export class TrainingPlanRoutingModule { }
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 68b48f36e..bf318a755 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -51,6 +51,18 @@ const routes: Routes = [
       pageData: PageResolve,
     },
   },
+  {
+    path: 'app/training-plan',
+    loadChildren: () => import('./routes/route-training-plan.module').then(u => u.RouteTrainingPlanAppModule),
+    canActivate: [GeneralGuard],
+    data: {
+      pageType: 'feature',
+      pageKey: 'training-plan-home',
+    },
+    resolve: {
+      pageData: PageResolve,
+    },
+  },
   {
     path: 'app/roles',
     loadChildren: () => import('./routes/route-roles-access.module').then(u => u.RouteAccessAppModule),
diff --git a/src/app/routes/route-training-plan.module.ts b/src/app/routes/route-training-plan.module.ts
new file mode 100644
index 000000000..6809ade86
--- /dev/null
+++ b/src/app/routes/route-training-plan.module.ts
@@ -0,0 +1,15 @@
+import { NgModule } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { TrainingPlanModule } from '../../../project/ws/app/src/lib/routes/training-plan/training-plan.module'
+
+@NgModule({
+  declarations: [],
+  imports: [
+    CommonModule,
+    TrainingPlanModule,
+  ],
+  exports: [
+    TrainingPlanModule
+  ],
+})
+export class RouteTrainingPlanAppModule { }

From c9c1b94eaf37a820b8c9e3b75537bdc697c2657d Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Wed, 6 Dec 2023 19:24:29 +0530
Subject: [PATCH 307/887] updated the package json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fe9c278bc..d939e7193 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@angular/router": "~8.2.1",
     "@angular/service-worker": "~8.2.1",
     "@project-sunbird/telemetry-sdk": "0.0.26",
-    "@sunbird-cb/collection": "^1.0.34",
+    "@sunbird-cb/collection": "^1.0.35",
     "@sunbird-cb/design-system": "0.0.1",
     "@sunbird-cb/rain-dashboards": "0.4.22-rc.1",
     "@sunbird-cb/resolver": "^1.0.0",

From c4962c81e406e4b8557679a7157846d629a90d63 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Thu, 7 Dec 2023 10:53:45 +0530
Subject: [PATCH 308/887] added new component for breadcrumb, search, user
 card, standard card , competencey summary etc

---
 .../create-event/create-event.component.ts    |   8 +-
 .../training-plan-dashboard.component.ts      |  10 +-
 .../breadcrumb/breadcrumb.component.html      |  20 +
 .../breadcrumb/breadcrumb.component.scss      |  57 ++
 .../breadcrumb/breadcrumb.component.spec.ts   |  25 +
 .../breadcrumb/breadcrumb.component.ts        |  15 +
 .../components/chip/chip.component.html       |  27 +
 .../components/chip/chip.component.scss       |  46 ++
 .../components/chip/chip.component.spec.ts    |  25 +
 .../components/chip/chip.component.ts         |  15 +
 .../competency-summary.component.html         |  74 +++
 .../competency-summary.component.scss         |  34 ++
 .../competency-summary.component.spec.ts      |  25 +
 .../competency-summary.component.ts           |  15 +
 .../components/filter/filter.component.html   |  17 +
 .../components/filter/filter.component.scss   |  45 ++
 .../filter/filter.component.spec.ts           |  25 +
 .../components/filter/filter.component.ts     |  15 +
 .../components/search/search.component.html   |  18 +
 .../components/search/search.component.scss   |  67 +++
 .../search/search.component.spec.ts           |  25 +
 .../components/search/search.component.ts     |  15 +
 .../standard-card.component.html              | 150 +++++
 .../standard-card.component.scss              | 534 ++++++++++++++++++
 .../standard-card.component.spec.ts           |  25 +
 .../standard-card/standard-card.component.ts  |  15 +
 .../components/stepper/stepper.component.html |  27 +
 .../components/stepper/stepper.component.scss | 136 +++++
 .../stepper/stepper.component.spec.ts         |  25 +
 .../components/stepper/stepper.component.ts   |  15 +
 .../user-card/user-card.component.html        |  50 ++
 .../user-card/user-card.component.scss        |  42 ++
 .../user-card/user-card.component.spec.ts     |  25 +
 .../user-card/user-card.component.ts          |  15 +
 .../create-plan/create-plan.component.html    |   5 +-
 .../training-plan/training-plan.module.ts     |  12 +-
 src/app/routes/route-training-plan.module.ts  |   2 +-
 37 files changed, 1689 insertions(+), 12 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.scss
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.scss
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.html
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.scss
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.scss
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/search/search.component.scss
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/search/search.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.scss
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts

diff --git a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
index 5a50c6573..4d6010b66 100644
--- a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
+++ b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
@@ -544,10 +544,10 @@ export class CreateEventComponent implements OnInit {
       request: {
         event: {
           versionKey,
-          status: "Live",
-          identifier: identifierkey
-        }
-      }
+          status: 'Live',
+          identifier: identifierkey,
+        },
+      },
     }
     this.eventsSvc.publishEvent(identifierkey, reqestBody).subscribe(
       res => {
diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
index 36f092169..385089fc4 100644
--- a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
@@ -12,10 +12,10 @@ import { ITableData } from '@sunbird-cb/collection/lib/ui-org-table/interface/in
 export class TrainingPlanDashboardComponent implements OnInit {
 
   currentFilter = 'live'
-  pageIndex: number = 0
-  currentOffset: number = 0
-  limit: number = 20
-  searchQuery: string = ''
+  pageIndex = 0
+  currentOffset = 0
+  limit = 20
+  searchQuery = ''
   tabledata!: ITableData
   trainingPlanData: any = []
   tagListData: any = ['Designation', 'All users', 'Custom users']
@@ -99,7 +99,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
       contentType: 'contentType live',
       CreatedBy: 'CreatedBy live',
       CreatedOn: 'CreatedOn live',
-    }, {
+    },                         {
       planName: 'check live',
       assignee: 'assignee live',
       totalContent: 'totalContent live',
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
new file mode 100644
index 000000000..0fab42c44
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
@@ -0,0 +1,20 @@
+<div class="flex flex-1 flex-row">
+    <div class="flex flex-2 flex-row left-breadcrumb">
+        <div class="home">Training Plans
+            <img src="/assets/icons/arrow-forward_small.svg" />
+        </div>
+        <div class="home">Create CBP Plan
+            <img src="/assets/icons/arrow-forward_small.svg" />
+        </div>
+        <div class="action">Note taking - Shortand
+        </div>
+    </div>
+    <div class="flex flex-1 flex-row right-breadcrumb">
+        <div class="cancel">
+            <span>Cancel</span>
+        </div>
+        <div class="next active">
+            <span>Next: Add Content</span>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.scss b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.scss
new file mode 100644
index 000000000..d5e2429c1
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.scss
@@ -0,0 +1,57 @@
+.home {
+    color: rgba(0, 0, 0, 0.6);
+    vertical-align: middle;
+    font-size: 16px;
+    font-weight: 600;
+    line-height: 24px;
+    font-family: 'Montserrat';
+    letter-spacing: 0.12;
+}
+
+.home img {
+    vertical-align: middle;
+}
+
+.action {
+    color: rgba(0, 0, 0, 0.87);
+    vertical-align: middle;
+    font-size: 16px;
+    font-weight: 600;
+    line-height: 24px;
+    font-family: 'Montserrat';
+    letter-spacing: 0.12;
+}
+
+.cancel {
+    color: rgb(27, 76, 161);
+    border: 1px solid rgb(27, 76, 161);
+    border-radius: 4px;
+    width: 174px;
+    text-align: center;
+    padding: 10px 0;
+}
+
+
+.next {
+    color: rgba(255, 255, 255, 0.7);
+    border: 1px solid rgb(27, 76, 161);
+    border-radius: 4px;
+    width: 174px;
+    text-align: center;
+    padding: 10px 0;
+    background-color: rgb(153, 153, 153);
+    margin-left: 10px;
+}
+
+.next.active {
+    background-color: rgb(61, 81, 174);
+    color: rgba(255, 255, 255)
+}
+
+.left-breadcrumb {
+    width: 75%
+}
+
+.right-breaddrumb {
+    width: 25%
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.spec.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.spec.ts
new file mode 100644
index 000000000..1fddbf835
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { BreadcrumbComponent } from './breadcrumb.component';
+
+describe('BreadcrumbComponent', () => {
+  let component: BreadcrumbComponent;
+  let fixture: ComponentFixture<BreadcrumbComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ BreadcrumbComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(BreadcrumbComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
new file mode 100644
index 000000000..a344c1674
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'ws-app-breadcrumb',
+  templateUrl: './breadcrumb.component.html',
+  styleUrls: ['./breadcrumb.component.scss']
+})
+export class BreadcrumbComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
new file mode 100644
index 000000000..79b09083a
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
@@ -0,0 +1,27 @@
+<div class="flex flex-row">
+    <div class="flex flex-2 left-section">
+        <div class="selected-item-label">Selected items - </div>
+        <div class="chips">
+            <div class="chips-content">
+                <span class="color-60">Himanshu Gupta</span><img src="assets/icons/close.svg" />
+            </div>
+        </div>
+        <div class="chips">
+            <div class="chips-content">
+                <span class="color-60">Himanshu Gupta</span><img src="assets/icons/close.svg" />
+            </div>
+        </div>
+        <div class="chips">
+            <div class="chips-content">
+                <span class="color-60">Himanshu Gupta</span><img src="assets/icons/close.svg" />
+            </div>
+        </div>
+        <div class="select-more-link"><span>+3 more</span></div>
+    </div>
+    <div class="flex flex-1 flex-row right-section">
+        <div class="select-more-link">
+            <span>Clear all</span>
+        </div>
+
+    </div>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.scss b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.scss
new file mode 100644
index 000000000..f6b4514d1
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.scss
@@ -0,0 +1,46 @@
+.chips {
+    border-radius: 63px;
+    width: 178px;
+    border: 1px solid rgba(0, 0, 0, 0.16);
+    margin-left: 12px;
+}
+
+.chips-content {
+    margin: 10px 16px;
+}
+
+.chips-content img {
+    vertical-align: middle;
+    margin-left: 8px;
+}
+
+.chips span {
+    font-size: 14px;
+    letter-spacing: 0.25px;
+}
+
+.selected-item-label {
+    margin: 10px 0px;
+    font-size: 14px;
+    color: rgb(0, 0, 0, 0.87);
+    font-weight: 400;
+    letter-spacing: 0.25px;
+}
+
+.select-more-link {
+    margin: 10px 12px;
+    color: #1B4CA1;
+    font-weight: 700;
+    letter-spacing: 0.25px;
+    font-family: 'Lato';
+}
+
+.clear-all {}
+
+.left-section {
+    width: 90%;
+}
+
+.right-section {
+    width: 10%;
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.spec.ts b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.spec.ts
new file mode 100644
index 000000000..d0a506763
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ChipComponent } from './chip.component';
+
+describe('ChipComponent', () => {
+  let component: ChipComponent;
+  let fixture: ComponentFixture<ChipComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ChipComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ChipComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
new file mode 100644
index 000000000..54905fea6
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'ws-app-chip',
+  templateUrl: './chip.component.html',
+  styleUrls: ['./chip.component.scss']
+})
+export class ChipComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.html b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.html
new file mode 100644
index 000000000..4c2b39461
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.html
@@ -0,0 +1,74 @@
+<div class="flex flex-1 flex-row">
+    <div class="competency-summary">
+        <div class="competency-summary-header">Competency summary</div>
+        <div class="competency-tabs">
+            <mat-tab-group [selectedIndex]="0" class="margin-top-m">
+                <mat-tab>
+                    <ng-template mat-tab-label>
+                        Behavioural(0)
+                    </ng-template>
+                    <ng-template matTabContent>
+                        <div class="category-card flex flex-row">
+                            <div class="label">
+                                Seeking Information
+                            </div>
+                            <div>
+                                (02)
+                            </div>
+                        </div>
+                        <div class="category-card flex flex-row">
+                            <div class="label">
+                                Seeking Information
+                            </div>
+                            <div>
+                                (02)
+                            </div>
+                        </div>
+                        <div class="category-card flex flex-row">
+                            <div class="label">
+                                Seeking Information
+                            </div>
+                            <div>
+                                (02)
+                            </div>
+                        </div>
+                        <div class="category-card flex flex-row">
+                            <div class="label">
+                                Seeking Information
+                            </div>
+                            <div>
+                                (02)
+                            </div>
+                        </div>
+                        <div class="category-card flex flex-row">
+                            <div class="label">
+                                Seeking Information
+                            </div>
+                            <div>
+                                (02)
+                            </div>
+                        </div>
+                    </ng-template>
+                </mat-tab>
+                <mat-tab>
+                    <ng-template mat-tab-label>
+                        <span>Functional(0)
+                        </span>
+                    </ng-template>
+                    <ng-template matTabContent>
+                        <div class="default-tab-content">There are no competency added yet</div>
+                    </ng-template>
+                </mat-tab>
+                <mat-tab>
+                    <ng-template mat-tab-label>
+                        <span>Domain(0)</span>
+                    </ng-template>
+                    <ng-template matTabContent>
+                    </ng-template>
+                </mat-tab>
+
+            </mat-tab-group>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.scss b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.scss
new file mode 100644
index 000000000..c4bf14e40
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.scss
@@ -0,0 +1,34 @@
+
+.competency-summary {
+    margin-top: 24px;
+    width: 494px;
+    border: 1px solid rgb(0,0,0,0.8);
+    min-height: 300px;
+    margin-left: 25px;
+    border-radius: 12px;
+    
+}
+.competency-summary-header {
+    font-size: 14px;
+    font-weight: 700;
+    font-family: 'Lato';
+    letter-spacing: 0.25px;
+    color: rgb(0,0,0,0.87);
+    margin: 18px 16px 20px 16px;
+}
+
+.default-tab-content {
+    margin: 319px 65px;
+    color: rgba(0,0,0,0.6)
+}
+
+.category-card {
+    margin: 16px;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    padding: 16px;
+}
+
+.category-card label {
+    width:270px
+}
diff --git a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.spec.ts b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.spec.ts
new file mode 100644
index 000000000..fc60f309f
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CompetencySummaryComponent } from './competency-summary.component';
+
+describe('CompetencySummaryComponent', () => {
+  let component: CompetencySummaryComponent;
+  let fixture: ComponentFixture<CompetencySummaryComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ CompetencySummaryComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CompetencySummaryComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
new file mode 100644
index 000000000..277a21502
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'ws-app-competency-summary',
+  templateUrl: './competency-summary.component.html',
+  styleUrls: ['./competency-summary.component.scss']
+})
+export class CompetencySummaryComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
new file mode 100644
index 000000000..ee607a5cc
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
@@ -0,0 +1,17 @@
+<div class=" filter">
+    <div class="filter-header flex flex-1">
+        <div class="flex flex-2 flex-row">
+            <div class="label">Filters</div>
+            <div class="cross-filter"><img src="assets/icons/close.svg"></div>
+        </div>
+    </div>
+    <div class="filter-footer flex flex-1">
+        <div class="flex flex-2 flex-row">
+            <div class="filter-clear">
+                Clear
+            </div>
+            <div class="filter-apply">
+                Apply
+            </div>
+        </div>
+    </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.scss b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.scss
new file mode 100644
index 000000000..d9d919494
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.scss
@@ -0,0 +1,45 @@
+
+.filter {
+    width: 363px;
+    height: auto;
+    border: 1px solid #ccc;
+    position: absolute;
+    right: 0;
+    top: 0;
+    background: #fff;
+    z-index: 1000;
+}
+
+.filter-header {
+    margin:26px 12px;
+}
+
+.filter-footer {
+    margin:26px 12px;
+}
+
+.filter-header .label {
+    width:275px;
+    font-weight: 700;
+}
+
+.filter-clear {
+    width: 142px;
+    text-align: center;
+    /* height: 40px; */
+    border: 1px solid #1B4CA1;
+    padding: 10px;
+    border-radius: 4px;
+    color: #1B4CA1;
+}
+
+.filter-apply {
+    width: 142px;
+    text-align: center;
+    /* height: 40px; */
+    background-color: #1B4CA1;
+    color: #fff;
+    padding: 10px;
+    border-radius: 4px;
+    margin-left: 15px;
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.spec.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.spec.ts
new file mode 100644
index 000000000..fc3004943
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { FilterComponent } from './filter.component';
+
+describe('FilterComponent', () => {
+  let component: FilterComponent;
+  let fixture: ComponentFixture<FilterComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ FilterComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(FilterComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
new file mode 100644
index 000000000..7d4e1fab8
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'ws-app-filter',
+  templateUrl: './filter.component.html',
+  styleUrls: ['./filter.component.scss']
+})
+export class FilterComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
new file mode 100644
index 000000000..6231761c6
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
@@ -0,0 +1,18 @@
+<div class="flex flex-1 flex-row">
+    <div class="selectWrapper">
+        <select class="selectBox">
+            <option>Designation</option>
+        </select>
+    </div>
+    <div class="search">
+        <div class="rsearch"><mat-icon
+                class="color-60 search-icon mat-icon notranslate material-icons mat-icon-no-color">search</mat-icon>
+            <input class="sinput color-60" label="" placeholder="Select" type="Standard">
+        </div>
+    </div>
+    <div class="filter-section">
+        <img src="/assets/icons/filter.svg" />
+        <span>Apply Filters</span>
+    </div>
+</div>
+<div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.scss b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.scss
new file mode 100644
index 000000000..0a5dd1b1e
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.scss
@@ -0,0 +1,67 @@
+.selectWrapper {
+    border-radius: 4px;
+    display: inline-block;
+    overflow: hidden;
+}
+
+.selectBox {
+    width: 192px;
+    height: 48px;
+    border: 0px;
+    outline: none;
+    background: none;
+}
+
+select {
+    -webkit-appearance: none;
+    -moz-appearance: none;
+    background: transparent !important;
+    background-image: url("data:image/svg+xml;utf8,<svg fill='black' height='24' viewBox='0 0 24 24' width='24' xmlns='http://www.w3.org/2000/svg'><path d='M7 10l5 5 5-5z'/><path d='M0 0h24v24H0z' fill='none'/></svg>") !important;
+    background-repeat: no-repeat !important;
+    background-position-x: 100% !important;
+    background-position-y: 10px !important;
+    border: 1px solid rgba(0, 0, 0, 0.16) !important;
+    border-radius: 2px !important;
+    padding: 1rem !important;
+}
+
+.rsearch {
+    position: relative;
+}
+
+.search {
+    margin-left: 16px;
+
+}
+
+.search-icon {
+    position: absolute;
+    top: 16px;
+    font-size: 20px;
+    left: 10px;
+}
+
+.sinput {
+    border-radius: 4px;
+    border: 1px solid #d5d0d0;
+    padding: 15px 36px;
+    font: 400 14px Lato;
+    width: 995px;
+}
+
+.filter-section {
+    margin-left: 20px;
+    margin-top: 10px;
+}
+
+.filter-section img {
+    vertical-align: middle;
+}
+
+.filter-section span {
+    vertical-align: middle;
+    margin-left: 24px;
+    color: rgba(0, 0, 0, 0.87);
+    font-size: 16px;
+    font-weight: 600;
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.spec.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.spec.ts
new file mode 100644
index 000000000..43729199b
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { SearchComponent } from './search.component';
+
+describe('SearchComponent', () => {
+  let component: SearchComponent;
+  let fixture: ComponentFixture<SearchComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ SearchComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SearchComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
new file mode 100644
index 000000000..a0098557c
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'ws-app-search',
+  templateUrl: './search.component.html',
+  styleUrls: ['./search.component.scss']
+})
+export class SearchComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
new file mode 100644
index 000000000..0054b20bb
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
@@ -0,0 +1,150 @@
+<div class="flex flex-4 flex-row">
+    <div class="flex flex-3 flex-row">
+        <div class="flex flex-1 course-card">
+            <mat-card class="card-standard-container mr-5 padding-remove">
+                <div class="display-contents">
+                    <ng-container>
+                        <a>
+                            <ng-container>
+                                <mat-card-content class="min-top">
+                                    <div style="position: relative; z-index: 1;">
+                                        <ng-container>
+                                            <div class="card-select-box">
+                                                <mat-checkbox class="card-select-check"></mat-checkbox>
+                                            </div>
+                                            <img mat-card-image loading="lazy"
+                                                class="card-img ws-mat-primary-lite-background margin-remove" />
+                                        </ng-container>
+                                    </div>
+                                    <div class="padding-m">
+                                        <div class="course_widget flex margin-remove">
+                                            <div class="flex flex-end course_v2">
+                                                <mat-icon
+                                                    class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                Course
+                                            </div>
+                                        </div>
+                                        <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                            BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                        </div>
+                                        <div class="flex w-full flex-wrap flex-middle">
+                                            <div class="course_logo_box">
+                                                <img class="source-icon" />
+                                            </div>
+                                            <span class="org-text">By Karmayogi Bharat</span>
+                                        </div>
+                                        <div class="flex flex-middle rating-session margin-top-m">
+                                            <div class="flex flex-middle">
+                                                <mat-icon class="mr-1">star</mat-icon>
+                                                <span>4.5</span>
+                                            </div>
+                                            <ng-container>
+                                                <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                            </ng-container>
+                                        </div>
+                                    </div>
+                                </mat-card-content>
+                            </ng-container>
+                        </a>
+                    </ng-container>
+                </div>
+            </mat-card>
+        </div>
+        <div class="flex flex-1 course-card">
+            <mat-card class="card-standard-container mr-5 padding-remove">
+                <div class="display-contents">
+                    <ng-container>
+                        <a>
+                            <ng-container>
+                                <mat-card-content class="min-top">
+                                    <div style="position: relative; z-index: 1;">
+                                        <ng-container>
+                                            <img mat-card-image loading="lazy"
+                                                class="card-img ws-mat-primary-lite-background margin-remove" />
+                                        </ng-container>
+                                    </div>
+                                    <div class="padding-m">
+                                        <div class="course_widget flex margin-remove">
+                                            <div class="flex flex-end course_v2">
+                                                <mat-icon
+                                                    class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                Course
+                                            </div>
+                                        </div>
+                                        <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                            BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                        </div>
+                                        <div class="flex w-full flex-wrap flex-middle">
+                                            <div class="course_logo_box">
+                                                <img class="source-icon" />
+                                            </div>
+                                            <span class="org-text">By Karmayogi Bharat</span>
+                                        </div>
+                                        <div class="flex flex-middle rating-session margin-top-m">
+                                            <div class="flex flex-middle">
+                                                <mat-icon class="mr-1">star</mat-icon>
+                                                <span>4.5</span>
+                                            </div>
+                                            <ng-container>
+                                                <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                            </ng-container>
+                                        </div>
+                                    </div>
+                                </mat-card-content>
+                            </ng-container>
+                        </a>
+                    </ng-container>
+                </div>
+            </mat-card>
+        </div>
+        <div class="flex flex-1 course-card">
+            <mat-card class="card-standard-container mr-5 padding-remove">
+                <div class="display-contents">
+                    <ng-container>
+                        <a>
+                            <ng-container>
+                                <mat-card-content class="min-top">
+                                    <div style="position: relative; z-index: 1;">
+                                        <ng-container>
+                                            <img mat-card-image loading="lazy"
+                                                class="card-img ws-mat-primary-lite-background margin-remove" />
+                                        </ng-container>
+                                    </div>
+                                    <div class="padding-m">
+                                        <div class="course_widget flex margin-remove">
+                                            <div class="flex flex-end course_v2">
+                                                <mat-icon
+                                                    class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                Course
+                                            </div>
+                                        </div>
+                                        <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                            BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                        </div>
+                                        <div class="flex w-full flex-wrap flex-middle">
+                                            <div class="course_logo_box">
+                                                <img class="source-icon" />
+                                            </div>
+                                            <span class="org-text">By Karmayogi Bharat</span>
+                                        </div>
+                                        <div class="flex flex-middle rating-session margin-top-m">
+                                            <div class="flex flex-middle">
+                                                <mat-icon class="mr-1">star</mat-icon>
+                                                <span>4.5</span>
+                                            </div>
+                                            <ng-container>
+                                                <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                            </ng-container>
+                                        </div>
+                                    </div>
+                                </mat-card-content>
+                            </ng-container>
+                        </a>
+                    </ng-container>
+                </div>
+            </mat-card>
+        </div>
+    </div>
+   <ws-app-competency-summary></ws-app-competency-summary>
+
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
new file mode 100644
index 000000000..ee85f06d9
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
@@ -0,0 +1,534 @@
+@import '~@sunbird-cb/design-system/src/styles/ws-common';
+// @import '~@sunbird-cb/design-system/src/styles/ws-vars';
+@import '~@sunbird-cb/design-system/src/styles/ws-mixins';
+@import 'ws-vars';
+
+$secondary-color: #EF951E;
+
+
+.card-standard-container {
+  $card-padding: $size-m;
+  $action-btn-size: 2.5 * $size-m;
+  // $card-standard-width-: 331px;
+  position: relative;
+  width: 307px;
+  height: 345px;
+  border-radius: 8px;
+  box-sizing: border-box;
+  box-shadow: 0px 10px 30px #99999933;
+  overflow: hidden;
+  margin: 20px 8px;
+  .progress-bar {
+    // display: block;
+    // width: calc(100% + #{2 * $card-padding - 2});
+    width: 101%;
+    margin-left: -#{$card-padding - 1};
+    // margin-top: -$card-padding;
+    display: flex;
+    // width: calc(100% + 30px);
+    // margin-left: -15px;
+    // margin-top: 62px;
+    margin-top: 0;
+    background: bisque;
+    position: absolute;
+    bottom: 0;
+    // margin-left: 0;
+
+
+  }
+
+
+
+  ::ng-deep .mat-progress-bar {
+    height: 8px!important;
+  }
+
+  .icon_text {
+    font-size: 12px;
+    line-height: 16px;
+    text-transform: uppercase;
+  }
+
+
+  .title-text {
+    margin: 12px 0;
+    position: relative;
+    overflow: hidden;
+}
+
+.description-text {
+  position: relative;
+  overflow: hidden;
+  height: 63px;
+}
+
+.course_logo_box {
+  width: 38px;
+  height: 38px;
+  background: #fff;
+  border-radius: 8px 8px;
+  box-sizing: border-box;
+  box-shadow: 0px 2px 1px -1px rgb(0 0 0 / 20%), 0px 1px 1px 0px rgb(0 0 0 / 14%), 0px 1px 3px 0px rgb(0 0 0 / 12%);
+  img {
+    height: 28px;
+    width: 28px;
+    padding: 5px;
+    display: inline-block;
+  }
+  p {
+    display: inline-block;
+    vertical-align: top;
+  }
+ }
+ .org-text {
+  font-size: 12px;
+  font-weight: normal;
+  width: 75%;
+  padding-left: 10px;
+  overflow: hidden;
+  word-break: break-all;
+  white-space: initial;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 1;
+  -webkit-box-orient: vertical;
+}
+
+  .source-div {
+    position: relative;
+    top: 100px;
+    background: white;
+    z-index: 3;
+    border: 1px solid #DEDFE0;
+    min-width: 72px;
+    min-height: 72px;
+    max-width: 72px;
+    max-height: 72px;
+    display: flex;
+    border-radius: 8px;
+
+    .source-icon {
+      border-radius: 8px;
+      margin-right: auto;
+      margin-left: auto;
+      display: block;
+      margin: auto;
+      max-width: 58px;
+      max-height: -webkit-fill-available;
+    }
+  }
+
+  mat-card-content {
+    // margin: 0 -0.25 * $card-padding;
+    background: #fff;
+  }
+
+  .card-img {
+    min-width: 307px;
+    max-width: 307px;
+    max-height: 140px;
+    min-height: 140px;
+    display: block;
+    object-fit: fill;
+    /* border-top: 1px solid red; */
+    border-top-left-radius: 8px;
+    border-top-right-radius: 8px;
+  }
+  .mat-subheading-1 {
+    font: 600 14px/24px Montserrat;
+  }
+
+  .complexity {
+    padding-top: 70px;
+    display: flex;
+    font-size: 14px;
+    line-height: 21px;
+    padding-bottom: 10px;
+
+    .mode-tag {
+      border-radius: 5px;
+      order: 2;
+      margin-left: auto;
+      color: white;
+      font-size: 10px;
+    }
+
+    .duration {
+      display: flex;
+      margin-left: auto;
+      order: 3;
+      font-weight: 700;
+    }
+
+    .time-text {
+      margin: 0px 5px 0px 6px;
+      font-weight: 700;
+    }
+  }
+
+  .basic {
+    margin: auto 0;
+  }
+
+  $title-line-count: 2;
+  $title-line-height: 24px;
+
+
+  .title-text {
+    // font-size: 18px;
+    // margin: $size-s 0;
+    // position: relative;
+    // overflow: hidden;
+    // height: $title-line-count * $title-line-height;
+    // line-height: $title-line-height;
+
+    word-break: break-all;
+    white-space: initial;
+    margin: 8px 0;
+    position: relative;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: $title-line-count;
+    -webkit-box-orient: vertical;
+    min-height: $title-line-count * $title-line-height;
+    font-family: 'Lato';
+  }
+
+  $description-line-count: 2;
+  $description-line-height: 21px;
+
+  .description-text {
+    // font-size: 15px;
+    position: relative;
+    overflow: hidden;
+    height: $description-line-count * $description-line-height;
+    white-space: normal;
+    text-overflow: ellipsis;
+    // line-height: $description-line-height;
+  }
+}
+
+.card-standard-container:hover {
+  transform: scale(1.02);
+}
+.card-discussions-container {
+  $card-padding: $size-m;
+  $action-btn-size: 2.5 * $size-m;
+  // $card-width: 270px;
+  flex: 1;
+  display: flex;
+  position: relative;
+  // width: $card-width;
+  height: 100%;
+  min-height: 140px;
+  border-radius: 8px;
+  box-sizing: border-box;
+  box-shadow: 0px 10px 30px #99999933;
+
+  .progress-bar {
+    display: block;
+    width: calc(100% + #{2 * $card-padding - 2});
+    margin-left: -#{$card-padding - 1};
+    display: flex;
+    margin-top: 62px;
+    background: bisque;
+  }
+
+
+
+  .source-div {
+    position: relative;
+    top: 100px;
+    background: white;
+    z-index: 3;
+    border: 1px solid #DEDFE0;
+    min-width: 72px;
+    min-height: 72px;
+    max-width: 72px;
+    max-height: 72px;
+    display: flex;
+    border-radius: 8px;
+
+    .source-icon {
+      border-radius: 8px;
+      margin-right: auto;
+      margin-left: auto;
+      display: block;
+      margin: auto;
+      max-width: 58px;
+      max-height: -webkit-fill-available;
+    }
+  }
+
+  mat-card-content {
+    margin: 0 -0.25 * $card-padding;
+    flex: 1;
+  }
+
+  .card-img {
+    min-width: 269px;
+    max-width: 269px;
+    /* max-height: 148px; */
+    display: block;
+    object-fit: contain;
+    /* border-top: 1px solid red; */
+    border-top-left-radius: 8px;
+    border-top-right-radius: 8px;
+  }
+
+  .complexity {
+    padding-top: 7px;
+    display: flex;
+    font-size: 14px;
+    line-height: 27px;
+    padding-bottom: 10px;
+
+    .mode-tag {
+      border-radius: 5px;
+      order: 2;
+      margin-left: auto;
+      color: white;
+      font-size: 10px;
+    }
+
+    .duration {
+      display: flex;
+      margin-left: auto;
+      order: 3;
+    }
+
+    .time-text {
+      margin: 0px 5px 0px 6px;
+    }
+  }
+
+  .basic {
+    margin: auto 0;
+  }
+
+  $title-line-count: 2;
+  $title-line-height: 1.89em;
+
+  .title-text {
+    // font-size: 18px;
+    // margin: $size-s 0;
+    // position: relative;
+    overflow: hidden;
+    // height: $title-line-count * $title-line-height;
+    // line-height: $title-line-height;
+  }
+
+  $description-line-count: 3;
+  $description-line-height: 1.9em;
+
+  .description-text {
+    // font-size: 15px;
+    position: relative;
+    overflow: hidden;
+    height: auto;
+    // $description-line-count * $description-line-height;
+    line-height: $description-line-height;
+  }
+}
+
+.card-basic-infomartion-container {
+  $card-padding: $size-m;
+  $card-width: 265px;
+  position: relative;
+  width: $card-width;
+  height: 100%;
+  box-sizing: border-box;
+  min-height: 300px;
+
+  .card-img {
+    height: 150px;
+    display: block;
+    margin-bottom: 0px !important;
+    object-fit: contain;
+  }
+
+  .source-name {
+    margin-bottom: 0;
+    font-weight: 400;
+    line-height: 1.25rem !important;
+  }
+
+  $title-line-count: 2;
+  $title-line-height: 1.3em;
+
+  .title-text {
+    margin: $size-s 0 0 0;
+    position: relative;
+    overflow: hidden;
+    height: $title-line-count * $title-line-height;
+    line-height: $title-line-height;
+  }
+
+  .source-image {
+    object-fit: contain;
+    height: 35px;
+    width: 55px;
+    overflow: auto;
+  }
+}
+
+.card-with-user-details-container {
+  $card-padding: $size-m;
+  $card-width: 265px;
+  position: relative;
+  width: $card-width;
+  height: 100%;
+  box-sizing: border-box;
+  min-height: 270px;
+
+  .card-img {
+    height: 150px;
+    display: block;
+    margin-bottom: 0px !important;
+    object-fit: contain;
+  }
+
+  .source-name {
+    margin-bottom: 0;
+    font-weight: 400;
+  }
+
+  $title-line-count: 2;
+  $title-line-height: 1.3em;
+
+  .title-text {
+    margin: $size-s 0 0 0;
+    position: relative;
+    overflow: hidden;
+    height: $title-line-count * $title-line-height;
+    line-height: $title-line-height;
+  }
+
+  .author-image {
+    margin-right: $size-s;
+    $size: 44px;
+    height: $size;
+    width: $size;
+  }
+
+  .back-color {
+    background-color: #7e0a80;
+  }
+
+  .space-0 {
+    margin-top: 0px !important;
+    padding-top: 0px !important;
+    margin-bottom: 0px !important;
+  }
+}
+
+.detail-button {
+  position: absolute;
+  top: $size-s;
+  right: $size-s;
+  z-index: 1;
+}
+
+.greyOut {
+  filter: grayscale(1);
+  opacity: 0.7;
+  cursor: auto !important;
+}
+
+.disableClick {
+  pointer-events: none;
+}
+
+.display-contents {
+  display: contents;
+}
+
+$title-line-count: 2;
+
+.title-truncate {
+  display: -webkit-box;
+  -webkit-line-clamp: $title-line-count;
+  -webkit-box-orient: vertical;
+}
+
+.typeofc {
+  width: 101px;
+  height: 30px;
+  border: 1px solid;
+  border-radius: 8px;
+  opacity: 0.4;
+  align-items: center;
+  justify-content: center;
+  display: flex;
+}
+
+.flex-9 {
+  flex: 9;
+}
+
+.center-right {
+  align-items: center;
+  justify-content: flex-end;
+
+}
+
+.no-box {
+  box-shadow: none !important;
+
+}
+
+.rating-session {
+  mat-icon {
+    font-size: 16px;
+    height: 16px;
+    width: 12px;
+    padding-right: 3px;
+    color: $secondary-color;
+  }
+  span {
+    font-size: 11px;
+  }
+  .most-enrolled-text {
+    padding: 0px 8px;
+    background: #ffea9e;
+    border-radius: 4px;
+  }
+}
+
+.course_widget .course_v2 {
+    border: 1px solid #ef951e;
+    padding: 4px 8px;
+    align-items: end;
+    border-radius: 16px;
+    font-size: 12px;
+}
+
+.course_widget .mat-icon {
+    vertical-align: middle;
+    color: #ef951e!important;
+}
+
+.course-card {
+    margin-left: 25px;
+}
+
+.course-card:first-child {
+    margin-left: 0;
+}
+
+.card-select-box {
+    position: absolute;
+    background: gray;
+    border-radius: 4px;
+    height: 32px;
+    width: 32px;
+    margin: 18px;
+}
+
+.card-select-check {
+    padding:6px;
+    height: 20px;
+    width: 20px;
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.spec.ts b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.spec.ts
new file mode 100644
index 000000000..7b3885da6
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { StandardCardComponent } from './standard-card.component';
+
+describe('StandardCardComponent', () => {
+  let component: StandardCardComponent;
+  let fixture: ComponentFixture<StandardCardComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ StandardCardComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(StandardCardComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
new file mode 100644
index 000000000..fd640a8ac
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'ws-app-standard-card',
+  templateUrl: './standard-card.component.html',
+  styleUrls: ['./standard-card.component.scss']
+})
+export class StandardCardComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
new file mode 100644
index 000000000..33187212b
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
@@ -0,0 +1,27 @@
+<div>
+    <mat-tab-group #tabGroup [disableRipple]=true [selectedIndex]="0" class="margin-top-m">
+        <mat-tab>
+            <ng-template mat-tab-label>
+                1. Create a plan
+            </ng-template>
+        </mat-tab>
+        <mat-tab>
+            <ng-template mat-tab-label>
+                <span>2. Add Content
+                </span>
+            </ng-template>
+        </mat-tab>
+        <mat-tab>
+            <ng-template mat-tab-label>
+                <span>3. Add Assignee</span>
+            </ng-template>
+            <ng-template matTabContent>
+            </ng-template>
+        </mat-tab>
+        <mat-tab>
+            <ng-template mat-tab-label>
+                <span>4. Add Timeline</span>
+            </ng-template>
+        </mat-tab>
+    </mat-tab-group>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.scss b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.scss
new file mode 100644
index 000000000..052a9aff8
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.scss
@@ -0,0 +1,136 @@
+@import 'ws-vars';
+@import 'ws-mixins';
+
+.relative {
+    /* min-height: auto; */
+    position: absolute;
+    display: block !important;
+    top: 70px;
+    right: 50px;
+    /* background: red; */
+    /* border: 24px solid black; */
+
+}
+
+.sticky {
+    position: sticky;
+    // top: 50px;
+}
+
+.close-preview {
+    position: fixed;
+    top: 15px;
+    left: 15px;
+    z-index: 1;
+    font-size: 30px;
+    cursor: pointer;
+    z-index: 1001;
+}
+
+.hidden {
+    display: none;
+}
+
+.transitionD {
+    transition: all 0.5s;
+}
+
+.ui {
+    border: 1px solid rgb(26, 25, 25);
+    border-top-left-radius: 0px;
+    border-left-color: white;
+    border-bottom-left-radius: 0px;
+    border-top-right-radius: 50%;
+    border-bottom-right-radius: 50%;
+    box-shadow: 0.1px 2px 8px grey;
+    width: 42px;
+}
+
+.toHide {
+    visibility: hidden;
+}
+
+
+
+::ng-deep .mat-ink-bar {
+    display: none;
+}
+
+
+
+::ng-deep .mat-tab-label {
+    flex: 1;
+    color: black;
+    opacity: 1 !important;
+    padding: 0 24px 0 46px !important;
+
+    ::ng-deep .mat-tab-label-content {
+        background-color: #F5F5F5;
+        color: black;
+        width: 100%;
+        height: 100%;
+    }
+}
+
+::ng-deep .mat-tab-label::after {
+    content: " ";
+    position: absolute;
+    width: 0px;
+    height: 0;
+    left: auto;
+    right: -24px;
+    top: 0;
+    border: 24px solid;
+    border-color: transparent transparent transparent #F5F5F5;
+}
+
+::ng-deep .mat-tab-label::before {
+    content: " ";
+    position: absolute;
+    width: 0px;
+    height: 0;
+    left: -0;
+    top: 0;
+    border: 24px solid;
+    border-color: #F5F5F5 #F5F5F5 #F5F5F5 transparent;
+}
+
+
+::ng-deep .mat-tab-label-active {
+    flex: 1;
+    opacity: 1 !important;
+
+    .mat-tab-label-content {
+        background-color: #373434;
+        color: white;
+        width: 100%;
+        height: 100%;
+    }
+}
+
+::ng-deep .mat-tab-label-active::after {
+    content: " ";
+    position: absolute;
+    width: 0px;
+    height: 0;
+    left: auto;
+    right: -24px;
+    top: 0;
+    border: 24px solid;
+    border-color: transparent transparent transparent #373434;
+}
+
+::ng-deep .mat-tab-label-active::before {
+    content: " ";
+    position: absolute;
+    width: 0px;
+    height: 0;
+    left: -0;
+    top: 0;
+    border: 24px solid;
+    border-color: #373434 #373434 #373434 transparent;
+}
+
+.overflow-none {
+    overflow: unset !important;
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.spec.ts b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.spec.ts
new file mode 100644
index 000000000..4bf2213a2
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { StepperComponent } from './stepper.component';
+
+describe('StepperComponent', () => {
+  let component: StepperComponent;
+  let fixture: ComponentFixture<StepperComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ StepperComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(StepperComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
new file mode 100644
index 000000000..425ad4a78
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'ws-app-stepper',
+  templateUrl: './stepper.component.html',
+  styleUrls: ['./stepper.component.scss']
+})
+export class StepperComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
new file mode 100644
index 000000000..7fe0c3927
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
@@ -0,0 +1,50 @@
+<div class="flex flex-4 flex-row">
+    <div class="flex flex-1 assignee-card">
+        <div class="avatar">
+            <div>HG</div>
+        </div>
+        <div class="assignee-desc">
+            <p>Heading</p>
+            <p>Subheading</p>
+        </div>
+        <div class="check-action">
+            <mat-checkbox class="example-margin"></mat-checkbox>
+        </div>
+    </div>
+    <div class="flex flex-1 assignee-card">
+        <div class="avatar">
+            <div>HG</div>
+        </div>
+        <div class="assignee-desc">
+            <p>Heading</p>
+            <p>Subheading</p>
+        </div>
+        <div class="check-action">
+            <mat-checkbox class="example-margin"></mat-checkbox>
+        </div>
+    </div>
+    <div class="flex flex-1 assignee-card">
+        <div class="avatar">
+            <div>HG</div>
+        </div>
+        <div class="assignee-desc">
+            <p>Heading</p>
+            <p>Subheading</p>
+        </div>
+        <div class="check-action">
+            <mat-checkbox class="example-margin"></mat-checkbox>
+        </div>
+    </div>
+    <div class="flex flex-1 assignee-card">
+        <div class="avatar">
+            <div>HG</div>
+        </div>
+        <div class="assignee-desc">
+            <p>Heading</p>
+            <p>Subheading</p>
+        </div>
+        <div class="check-action">
+            <mat-checkbox class="example-margin"></mat-checkbox>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
new file mode 100644
index 000000000..d5157684c
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
@@ -0,0 +1,42 @@
+.assignee-card {
+    width: 325px;
+    border: 1px solid rgba(0, 0, 0, 0.16);
+    border-radius: 4px;
+    padding: 16px;
+    margin-left: 20px;
+}
+
+.assignee-card:first-child {
+    margin-left: 0;
+}
+
+.avatar {
+    height: 48px;
+    width: 49px;
+    border-radius: 4px;
+    background: #306933;
+    color: #fff;
+}
+
+.avatar div {
+    padding: 14px 13.5px;
+}
+
+.assignee-desc {
+    display: flex;
+    flex-direction: column;
+    padding: 0 16px;
+    width: 230px;
+}
+
+
+.assignee-desc p {
+    padding: 0;
+    margin: 0;
+}
+
+.check-action {
+    margin-top: 12px;
+    margin-right: 16px;
+
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.spec.ts b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.spec.ts
new file mode 100644
index 000000000..ae72e5e4f
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { UserCardComponent } from './user-card.component';
+
+describe('UserCardComponent', () => {
+  let component: UserCardComponent;
+  let fixture: ComponentFixture<UserCardComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ UserCardComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(UserCardComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
new file mode 100644
index 000000000..20bd93198
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'ws-app-user-card',
+  templateUrl: './user-card.component.html',
+  styleUrls: ['./user-card.component.scss']
+})
+export class UserCardComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
index 04108c4c5..8bd5f736c 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
@@ -1 +1,4 @@
-<h1>Create Plan</h1>
\ No newline at end of file
+<ws-app-breadcrumb></ws-app-breadcrumb>
+<ws-app-stepper></ws-app-stepper>
+<ws-app-search></ws-app-search>
+<ws-app-standard-card></ws-app-standard-card>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
index d313af29d..8d37f4ed1 100644
--- a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
+++ b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
@@ -39,10 +39,20 @@ import { MatSortModule } from '@angular/material/sort'
 import { TrainingPlanRoutingModule } from './training-plan.routing.module'
 import { TrainingPlanHomeComponent } from './routes/training-plan-home/training-plan-home.component'
 import { CreatePlanComponent } from './routes/create-plan/create-plan.component'
+import { BreadcrumbComponent } from './components/breadcrumb/breadcrumb.component'
+import { StepperComponent } from './components/stepper/stepper.component'
+import { SearchComponent } from './components/search/search.component'
+import { StandardCardComponent } from './components/standard-card/standard-card.component'
+import { CompetencySummaryComponent } from './components/competency-summary/competency-summary.component'
 @NgModule({
   declarations: [
     TrainingPlanHomeComponent,
-    CreatePlanComponent
+    CreatePlanComponent,
+    BreadcrumbComponent,
+    StepperComponent,
+    SearchComponent,
+    StandardCardComponent,
+    CompetencySummaryComponent
   ],
   imports: [
     CommonModule,
diff --git a/src/app/routes/route-training-plan.module.ts b/src/app/routes/route-training-plan.module.ts
index 6809ade86..2f17fa3c4 100644
--- a/src/app/routes/route-training-plan.module.ts
+++ b/src/app/routes/route-training-plan.module.ts
@@ -9,7 +9,7 @@ import { TrainingPlanModule } from '../../../project/ws/app/src/lib/routes/train
     TrainingPlanModule,
   ],
   exports: [
-    TrainingPlanModule
+    TrainingPlanModule,
   ],
 })
 export class RouteTrainingPlanAppModule { }

From 8ce450538304f5659c89c271ee64b6cc8fdb588e Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Thu, 7 Dec 2023 10:57:01 +0530
Subject: [PATCH 309/887] added new component for breadcrumb, search, user
 card, standard card , competencey summary etc

---
 .../breadcrumb/breadcrumb.component.spec.ts   | 28 +++++++++----------
 .../breadcrumb/breadcrumb.component.ts        |  4 +--
 .../components/chip/chip.component.spec.ts    | 28 +++++++++----------
 .../components/chip/chip.component.ts         |  4 +--
 .../competency-summary.component.spec.ts      | 28 +++++++++----------
 .../competency-summary.component.ts           |  4 +--
 .../filter/filter.component.spec.ts           | 28 +++++++++----------
 .../components/filter/filter.component.ts     |  4 +--
 .../search/search.component.spec.ts           | 28 +++++++++----------
 .../components/search/search.component.ts     |  4 +--
 .../standard-card.component.spec.ts           | 28 +++++++++----------
 .../standard-card/standard-card.component.ts  |  4 +--
 .../stepper/stepper.component.spec.ts         | 28 +++++++++----------
 .../components/stepper/stepper.component.ts   |  4 +--
 .../user-card/user-card.component.spec.ts     | 28 +++++++++----------
 .../user-card/user-card.component.ts          |  4 +--
 .../training-plan/training-plan.module.ts     |  2 +-
 17 files changed, 129 insertions(+), 129 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.spec.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.spec.ts
index 1fddbf835..51ad5e4ee 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.spec.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.spec.ts
@@ -1,25 +1,25 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
 
-import { BreadcrumbComponent } from './breadcrumb.component';
+import { BreadcrumbComponent } from './breadcrumb.component'
 
 describe('BreadcrumbComponent', () => {
-  let component: BreadcrumbComponent;
-  let fixture: ComponentFixture<BreadcrumbComponent>;
+  let component: BreadcrumbComponent
+  let fixture: ComponentFixture<BreadcrumbComponent>
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ BreadcrumbComponent ]
+      declarations: [BreadcrumbComponent],
     })
-    .compileComponents();
-  }));
+    .compileComponents()
+  }))
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(BreadcrumbComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+    fixture = TestBed.createComponent(BreadcrumbComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
 
   it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
index a344c1674..0ca3edec4 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
@@ -1,9 +1,9 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit } from '@angular/core'
 
 @Component({
   selector: 'ws-app-breadcrumb',
   templateUrl: './breadcrumb.component.html',
-  styleUrls: ['./breadcrumb.component.scss']
+  styleUrls: ['./breadcrumb.component.scss'],
 })
 export class BreadcrumbComponent implements OnInit {
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.spec.ts b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.spec.ts
index d0a506763..bfd74b5b9 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.spec.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.spec.ts
@@ -1,25 +1,25 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
 
-import { ChipComponent } from './chip.component';
+import { ChipComponent } from './chip.component'
 
 describe('ChipComponent', () => {
-  let component: ChipComponent;
-  let fixture: ComponentFixture<ChipComponent>;
+  let component: ChipComponent
+  let fixture: ComponentFixture<ChipComponent>
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ ChipComponent ]
+      declarations: [ChipComponent],
     })
-    .compileComponents();
-  }));
+    .compileComponents()
+  }))
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(ChipComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+    fixture = TestBed.createComponent(ChipComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
 
   it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
index 54905fea6..4a1757b0f 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
@@ -1,9 +1,9 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit } from '@angular/core'
 
 @Component({
   selector: 'ws-app-chip',
   templateUrl: './chip.component.html',
-  styleUrls: ['./chip.component.scss']
+  styleUrls: ['./chip.component.scss'],
 })
 export class ChipComponent implements OnInit {
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.spec.ts b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.spec.ts
index fc60f309f..b9c91f865 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.spec.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.spec.ts
@@ -1,25 +1,25 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
 
-import { CompetencySummaryComponent } from './competency-summary.component';
+import { CompetencySummaryComponent } from './competency-summary.component'
 
 describe('CompetencySummaryComponent', () => {
-  let component: CompetencySummaryComponent;
-  let fixture: ComponentFixture<CompetencySummaryComponent>;
+  let component: CompetencySummaryComponent
+  let fixture: ComponentFixture<CompetencySummaryComponent>
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ CompetencySummaryComponent ]
+      declarations: [CompetencySummaryComponent],
     })
-    .compileComponents();
-  }));
+    .compileComponents()
+  }))
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(CompetencySummaryComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+    fixture = TestBed.createComponent(CompetencySummaryComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
 
   it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
index 277a21502..3a29411d8 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
@@ -1,9 +1,9 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit } from '@angular/core'
 
 @Component({
   selector: 'ws-app-competency-summary',
   templateUrl: './competency-summary.component.html',
-  styleUrls: ['./competency-summary.component.scss']
+  styleUrls: ['./competency-summary.component.scss'],
 })
 export class CompetencySummaryComponent implements OnInit {
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.spec.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.spec.ts
index fc3004943..91880a6f9 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.spec.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.spec.ts
@@ -1,25 +1,25 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
 
-import { FilterComponent } from './filter.component';
+import { FilterComponent } from './filter.component'
 
 describe('FilterComponent', () => {
-  let component: FilterComponent;
-  let fixture: ComponentFixture<FilterComponent>;
+  let component: FilterComponent
+  let fixture: ComponentFixture<FilterComponent>
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ FilterComponent ]
+      declarations: [FilterComponent],
     })
-    .compileComponents();
-  }));
+    .compileComponents()
+  }))
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(FilterComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+    fixture = TestBed.createComponent(FilterComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
 
   it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index 7d4e1fab8..7d56a904e 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -1,9 +1,9 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit } from '@angular/core'
 
 @Component({
   selector: 'ws-app-filter',
   templateUrl: './filter.component.html',
-  styleUrls: ['./filter.component.scss']
+  styleUrls: ['./filter.component.scss'],
 })
 export class FilterComponent implements OnInit {
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.spec.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.spec.ts
index 43729199b..89a8e59ab 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.spec.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.spec.ts
@@ -1,25 +1,25 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
 
-import { SearchComponent } from './search.component';
+import { SearchComponent } from './search.component'
 
 describe('SearchComponent', () => {
-  let component: SearchComponent;
-  let fixture: ComponentFixture<SearchComponent>;
+  let component: SearchComponent
+  let fixture: ComponentFixture<SearchComponent>
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ SearchComponent ]
+      declarations: [SearchComponent],
     })
-    .compileComponents();
-  }));
+    .compileComponents()
+  }))
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(SearchComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+    fixture = TestBed.createComponent(SearchComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
 
   it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index a0098557c..9fd73a359 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -1,9 +1,9 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit } from '@angular/core'
 
 @Component({
   selector: 'ws-app-search',
   templateUrl: './search.component.html',
-  styleUrls: ['./search.component.scss']
+  styleUrls: ['./search.component.scss'],
 })
 export class SearchComponent implements OnInit {
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.spec.ts b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.spec.ts
index 7b3885da6..19a41acb6 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.spec.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.spec.ts
@@ -1,25 +1,25 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
 
-import { StandardCardComponent } from './standard-card.component';
+import { StandardCardComponent } from './standard-card.component'
 
 describe('StandardCardComponent', () => {
-  let component: StandardCardComponent;
-  let fixture: ComponentFixture<StandardCardComponent>;
+  let component: StandardCardComponent
+  let fixture: ComponentFixture<StandardCardComponent>
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ StandardCardComponent ]
+      declarations: [StandardCardComponent],
     })
-    .compileComponents();
-  }));
+    .compileComponents()
+  }))
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(StandardCardComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+    fixture = TestBed.createComponent(StandardCardComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
 
   it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
index fd640a8ac..341e8231a 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
@@ -1,9 +1,9 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit } from '@angular/core'
 
 @Component({
   selector: 'ws-app-standard-card',
   templateUrl: './standard-card.component.html',
-  styleUrls: ['./standard-card.component.scss']
+  styleUrls: ['./standard-card.component.scss'],
 })
 export class StandardCardComponent implements OnInit {
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.spec.ts b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.spec.ts
index 4bf2213a2..6f5e628eb 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.spec.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.spec.ts
@@ -1,25 +1,25 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
 
-import { StepperComponent } from './stepper.component';
+import { StepperComponent } from './stepper.component'
 
 describe('StepperComponent', () => {
-  let component: StepperComponent;
-  let fixture: ComponentFixture<StepperComponent>;
+  let component: StepperComponent
+  let fixture: ComponentFixture<StepperComponent>
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ StepperComponent ]
+      declarations: [StepperComponent],
     })
-    .compileComponents();
-  }));
+    .compileComponents()
+  }))
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(StepperComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+    fixture = TestBed.createComponent(StepperComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
 
   it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
index 425ad4a78..be86d9549 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
@@ -1,9 +1,9 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit } from '@angular/core'
 
 @Component({
   selector: 'ws-app-stepper',
   templateUrl: './stepper.component.html',
-  styleUrls: ['./stepper.component.scss']
+  styleUrls: ['./stepper.component.scss'],
 })
 export class StepperComponent implements OnInit {
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.spec.ts b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.spec.ts
index ae72e5e4f..e9a1b6f5b 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.spec.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.spec.ts
@@ -1,25 +1,25 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
 
-import { UserCardComponent } from './user-card.component';
+import { UserCardComponent } from './user-card.component'
 
 describe('UserCardComponent', () => {
-  let component: UserCardComponent;
-  let fixture: ComponentFixture<UserCardComponent>;
+  let component: UserCardComponent
+  let fixture: ComponentFixture<UserCardComponent>
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ UserCardComponent ]
+      declarations: [UserCardComponent],
     })
-    .compileComponents();
-  }));
+    .compileComponents()
+  }))
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(UserCardComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+    fixture = TestBed.createComponent(UserCardComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
 
   it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
index 20bd93198..823c9334b 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
@@ -1,9 +1,9 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit } from '@angular/core'
 
 @Component({
   selector: 'ws-app-user-card',
   templateUrl: './user-card.component.html',
-  styleUrls: ['./user-card.component.scss']
+  styleUrls: ['./user-card.component.scss'],
 })
 export class UserCardComponent implements OnInit {
 
diff --git a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
index 8d37f4ed1..968330f00 100644
--- a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
+++ b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
@@ -52,7 +52,7 @@ import { CompetencySummaryComponent } from './components/competency-summary/comp
     StepperComponent,
     SearchComponent,
     StandardCardComponent,
-    CompetencySummaryComponent
+    CompetencySummaryComponent,
   ],
   imports: [
     CommonModule,

From ee302a19e2f547bbc5af0d3f9cbbab7600ac9c5d Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Thu, 7 Dec 2023 11:43:56 +0530
Subject: [PATCH 310/887] style changes as per page layout

---
 .../breadcrumb/breadcrumb.component.html        |  2 +-
 .../breadcrumb/breadcrumb.component.scss        |  7 +++++--
 .../competency-summary.component.scss           |  6 +++---
 .../components/search/search.component.scss     |  5 +++--
 .../standard-card/standard-card.component.html  |  4 ++--
 .../standard-card/standard-card.component.scss  | 10 +++++++++-
 .../components/stepper/stepper.component.html   |  2 +-
 .../components/stepper/stepper.component.scss   | 17 ++++++++++-------
 .../create-plan/create-plan.component.html      | 10 ++++++----
 .../create-plan/create-plan.component.scss      |  3 +++
 10 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
index 0fab42c44..2d8c671dc 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
@@ -1,4 +1,4 @@
-<div class="flex flex-1 flex-row">
+<div class="flex flex-1 flex-row breadcrumb">
     <div class="flex flex-2 flex-row left-breadcrumb">
         <div class="home">Training Plans
             <img src="/assets/icons/arrow-forward_small.svg" />
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.scss b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.scss
index d5e2429c1..4686e86ef 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.scss
@@ -1,3 +1,6 @@
+.breadcrumb {
+    width: 100%;
+}
 .home {
     color: rgba(0, 0, 0, 0.6);
     vertical-align: middle;
@@ -49,9 +52,9 @@
 }
 
 .left-breadcrumb {
-    width: 75%
+    width: 80%
 }
 
 .right-breaddrumb {
-    width: 25%
+    width: 20%
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.scss b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.scss
index c4bf14e40..ccd619ae5 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.scss
@@ -2,7 +2,7 @@
 .competency-summary {
     margin-top: 24px;
     width: 494px;
-    border: 1px solid rgb(0,0,0,0.8);
+    border: 1px solid rgb(0,0,0,0.16);
     min-height: 300px;
     margin-left: 25px;
     border-radius: 12px;
@@ -29,6 +29,6 @@
     padding: 16px;
 }
 
-.category-card label {
-    width:270px
+.category-card .label {
+    width:90%;
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.scss b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.scss
index 0a5dd1b1e..4fdeb1e04 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.scss
@@ -2,6 +2,7 @@
     border-radius: 4px;
     display: inline-block;
     overflow: hidden;
+    width: 11%;
 }
 
 .selectBox {
@@ -31,7 +32,7 @@ select {
 
 .search {
     margin-left: 16px;
-
+    width: 78%;
 }
 
 .search-icon {
@@ -46,7 +47,7 @@ select {
     border: 1px solid #d5d0d0;
     padding: 15px 36px;
     font: 400 14px Lato;
-    width: 995px;
+    width: 95%;
 }
 
 .filter-section {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
index 0054b20bb..99fcf3582 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
@@ -1,5 +1,5 @@
-<div class="flex flex-4 flex-row">
-    <div class="flex flex-3 flex-row">
+<div class="flex flex-4 flex-row card-grid">
+    <div class="flex flex-3 flex-row card-grid-container">
         <div class="flex flex-1 course-card">
             <mat-card class="card-standard-container mr-5 padding-remove">
                 <div class="display-contents">
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
index ee85f06d9..d5f1c683d 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
@@ -5,6 +5,14 @@
 
 $secondary-color: #EF951E;
 
+.card-grid {
+    width:100%;
+}
+
+
+.card-grid-container {
+    width: 100%;
+}
 
 .card-standard-container {
   $card-padding: $size-m;
@@ -17,7 +25,7 @@ $secondary-color: #EF951E;
   box-sizing: border-box;
   box-shadow: 0px 10px 30px #99999933;
   overflow: hidden;
-  margin: 20px 8px;
+  margin: 20px 0;
   .progress-bar {
     // display: block;
     // width: calc(100% + #{2 * $card-padding - 2});
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
index 33187212b..c94ff7f51 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
@@ -1,4 +1,4 @@
-<div>
+<div class="stepper">
     <mat-tab-group #tabGroup [disableRipple]=true [selectedIndex]="0" class="margin-top-m">
         <mat-tab>
             <ng-template mat-tab-label>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.scss b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.scss
index 052a9aff8..4f2c4f61c 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.scss
@@ -1,6 +1,9 @@
 @import 'ws-vars';
 @import 'ws-mixins';
 
+.stepper {
+    margin:20px 0;
+}
 .relative {
     /* min-height: auto; */
     position: absolute;
@@ -52,13 +55,13 @@
 
 
 
-::ng-deep .mat-ink-bar {
+::ng-deep .stepper .mat-ink-bar {
     display: none;
 }
 
 
 
-::ng-deep .mat-tab-label {
+::ng-deep .stepper .mat-tab-label {
     flex: 1;
     color: black;
     opacity: 1 !important;
@@ -72,7 +75,7 @@
     }
 }
 
-::ng-deep .mat-tab-label::after {
+::ng-deep .stepper .mat-tab-label::after {
     content: " ";
     position: absolute;
     width: 0px;
@@ -84,7 +87,7 @@
     border-color: transparent transparent transparent #F5F5F5;
 }
 
-::ng-deep .mat-tab-label::before {
+::ng-deep .stepper .mat-tab-label::before {
     content: " ";
     position: absolute;
     width: 0px;
@@ -96,7 +99,7 @@
 }
 
 
-::ng-deep .mat-tab-label-active {
+::ng-deep .stepper .mat-tab-label-active {
     flex: 1;
     opacity: 1 !important;
 
@@ -108,7 +111,7 @@
     }
 }
 
-::ng-deep .mat-tab-label-active::after {
+::ng-deep .stepper .mat-tab-label-active::after {
     content: " ";
     position: absolute;
     width: 0px;
@@ -120,7 +123,7 @@
     border-color: transparent transparent transparent #373434;
 }
 
-::ng-deep .mat-tab-label-active::before {
+::ng-deep .stepper .mat-tab-label-active::before {
     content: " ";
     position: absolute;
     width: 0px;
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
index 8bd5f736c..051893885 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
@@ -1,4 +1,6 @@
-<ws-app-breadcrumb></ws-app-breadcrumb>
-<ws-app-stepper></ws-app-stepper>
-<ws-app-search></ws-app-search>
-<ws-app-standard-card></ws-app-standard-card>
\ No newline at end of file
+<div class="plan-container">
+    <ws-app-breadcrumb></ws-app-breadcrumb>
+    <ws-app-stepper></ws-app-stepper>
+    <ws-app-search></ws-app-search>
+    <ws-app-standard-card></ws-app-standard-card>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.scss b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.scss
index e69de29bb..a70b50894 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.scss
@@ -0,0 +1,3 @@
+.plan-container {
+    margin: 20px 40px;
+}
\ No newline at end of file

From 078871f068370a462bbfcb38ab2b70e72de80173 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Thu, 7 Dec 2023 18:20:33 +0530
Subject: [PATCH 311/887] update for add assignee, filter, add content, add
 timeline, dialogbox, previewpage

---
 .../add-timeline-form.component.html          |  18 ++++
 .../add-timeline-form.component.scss          |  37 +++++++
 .../add-timeline-form.component.spec.ts       |  25 +++++
 .../add-timeline-form.component.ts            |  15 +++
 .../breadcrumb/breadcrumb.component.html      |   8 +-
 .../breadcrumb/breadcrumb.component.ts        |   4 +-
 .../components/chip/chip.component.html       |   2 +-
 .../components/chip/chip.component.scss       |   3 +
 .../competency-summary.component.scss         |  55 +++++++++-
 .../competency-summary.component.ts           |   2 +-
 .../confirmation-box.component.html           |  51 +++++++++
 .../confirmation-box.component.scss           |  75 +++++++++++++
 .../confirmation-box.component.spec.ts        |  25 +++++
 .../confirmation.box.component.ts             |  16 +++
 .../components/filter/filter.component.html   | 101 +++++++++++++++---
 .../components/filter/filter.component.scss   |  82 ++++++++++++--
 .../components/filter/filter.component.ts     |   8 +-
 .../components/search/search.component.html   |  12 ++-
 .../components/search/search.component.scss   |   5 +
 .../components/search/search.component.ts     |  41 ++++++-
 .../standard-card.component.html              |   4 +-
 .../standard-card.component.scss              |   2 +-
 .../components/stepper/stepper.component.html |   7 ++
 .../user-card/user-card.component.html        |   2 +-
 .../user-card/user-card.component.scss        |   3 +
 .../create-assignee.component.html            |   9 ++
 .../create-assignee.component.scss            |   0
 .../create-assignee.component.spec.ts         |  25 +++++
 .../create-assignee.component.ts              |  15 +++
 .../create-content.component.html             |  17 +++
 .../create-content.component.scss             |   0
 .../create-content.component.spec.ts          |  25 +++++
 .../create-content.component.ts               |  15 +++
 .../create-plan/create-plan.component.html    |  16 ++-
 .../create-plan/create-plan.component.scss    |   3 -
 .../create-timeline.component.html            |  22 ++++
 .../create-timeline.component.scss            |  15 +++
 .../create-timeline.component.spec.ts         |  25 +++++
 .../create-timeline.component.ts              |  15 +++
 .../preview-plan/preview-plan.component.html  |   6 ++
 .../preview-plan/preview-plan.component.scss  |  12 +++
 .../preview-plan.component.spec.ts            |  25 +++++
 .../preview-plan/preview-plan.component.ts    |  15 +++
 .../training-plan-home.component.html         |   6 +-
 .../training-plan-home.component.scss         |   3 +
 .../training-plan/training-plan.module.ts     |  22 ++++
 src/app/component/root/root.component.html    |   2 +-
 47 files changed, 844 insertions(+), 52 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.scss
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.html
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.scss
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation.box.component.ts
 create mode 100644 project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
 create mode 100644 project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.scss
 create mode 100644 project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
 create mode 100644 project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
 create mode 100644 project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.scss
 create mode 100644 project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
 create mode 100644 project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
 create mode 100644 project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.scss
 create mode 100644 project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
 create mode 100644 project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
 create mode 100644 project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.scss
 create mode 100644 project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts

diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html
new file mode 100644
index 000000000..887f762fb
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html
@@ -0,0 +1,18 @@
+<div class="flex flex-1 flex-column form-container">
+    <div class="label">
+        Add timeline
+    </div>
+    <div class="form-element">
+        <div class="fonm-element-label">Timeline <span class="required"></span></div>
+        <div class="calender">
+        <mat-form-field appearance="outline">
+            <mat-label>Select date</mat-label>
+            <input matInput [matDatepicker]="picker">
+            <mat-datepicker-toggle matSuffix [for]="picker">
+                <mat-icon matDatepickerToggleIcon>calendar_today</mat-icon>
+            </mat-datepicker-toggle>
+            <mat-datepicker #picker></mat-datepicker>
+          </mat-form-field>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.scss b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.scss
new file mode 100644
index 000000000..ab002076a
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.scss
@@ -0,0 +1,37 @@
+::ng-deep .mat-form-field-appearance-outline .mat-form-field-flex {
+    width: 369px   
+}
+
+.form-container {
+    margin-top: 20px;
+    border: 1px solid rgba(0,0,0,0.16);
+    padding: 24px 24px 0 24px;
+    box-shadow: 2px 2px 2px 0px #EBEBEB;
+}
+
+.form-container .label {
+    color:rgba(0,0,0,0.8);
+    font-weight: 600;
+    letter-spacing:0.12;
+    font-size: 20px;
+}
+.form-element {
+    margin-top: 17px;
+}
+
+.fonm-element-label {
+    font-size: 14px;
+    font-weight: 700;
+    letter-spacing: 0.25;
+    color: rgba(0,0,0,0.87);
+}
+
+.calender {
+    margin-top:16px
+}
+
+.calender  ::ng-deep .mat-form-field-label {
+    color: rgba(0, 0, 0, 0.87);
+    font-size: 14px;
+    font-weight: 400;
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.spec.ts b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.spec.ts
new file mode 100644
index 000000000..76308e85e
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AddTimelineFormComponent } from './add-timeline-form.component';
+
+describe('AddTimelineFormComponent', () => {
+  let component: AddTimelineFormComponent;
+  let fixture: ComponentFixture<AddTimelineFormComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ AddTimelineFormComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AddTimelineFormComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
new file mode 100644
index 000000000..89eae8b32
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'ws-app-add-timeline-form',
+  templateUrl: './add-timeline-form.component.html',
+  styleUrls: ['./add-timeline-form.component.scss']
+})
+export class AddTimelineFormComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
index 2d8c671dc..b966236c9 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
@@ -1,15 +1,15 @@
 <div class="flex flex-1 flex-row breadcrumb">
     <div class="flex flex-2 flex-row left-breadcrumb">
-        <div class="home">Training Plans
+        <div class="home cursor-pointer">Training Plans
             <img src="/assets/icons/arrow-forward_small.svg" />
         </div>
-        <div class="home">Create CBP Plan
+        <div class="home cursor-pointer">Create CBP Plan
             <img src="/assets/icons/arrow-forward_small.svg" />
         </div>
-        <div class="action">Note taking - Shortand
+        <div class="action cursor-pointer">Note taking - Shortand
         </div>
     </div>
-    <div class="flex flex-1 flex-row right-breadcrumb">
+    <div class="flex flex-1 flex-row right-breadcrumb" *ngIf="showBreadcrumbAction">
         <div class="cancel">
             <span>Cancel</span>
         </div>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
index 0ca3edec4..7a726831a 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core'
+import { Component,Input, OnInit } from '@angular/core'
 
 @Component({
   selector: 'ws-app-breadcrumb',
@@ -6,7 +6,7 @@ import { Component, OnInit } from '@angular/core'
   styleUrls: ['./breadcrumb.component.scss'],
 })
 export class BreadcrumbComponent implements OnInit {
-
+  @Input() showBreadcrumbAction = true;
   constructor() { }
 
   ngOnInit() {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
index 79b09083a..852d7a14e 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
@@ -1,4 +1,4 @@
-<div class="flex flex-row">
+<div class="flex flex-row chip-container">
     <div class="flex flex-2 left-section">
         <div class="selected-item-label">Selected items - </div>
         <div class="chips">
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.scss b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.scss
index f6b4514d1..761b6c20c 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.scss
@@ -13,6 +13,9 @@
     vertical-align: middle;
     margin-left: 8px;
 }
+.chip-container {
+    margin-top:20px;
+}
 
 .chips span {
     font-size: 14px;
diff --git a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.scss b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.scss
index ccd619ae5..7a454c8f7 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.scss
@@ -6,6 +6,7 @@
     min-height: 300px;
     margin-left: 25px;
     border-radius: 12px;
+    margin-left: 60%;
     
 }
 .competency-summary-header {
@@ -18,8 +19,9 @@
 }
 
 .default-tab-content {
-    margin: 319px 65px;
-    color: rgba(0,0,0,0.6)
+    margin: 100px 65px;
+    color: rgba(0,0,0,0.6);
+    text-align: center;
 }
 
 .category-card {
@@ -32,3 +34,52 @@
 .category-card .label {
     width:90%;
 }
+
+
+/** Grid Changes**/
+
+::ng-deep .competency-tabs .mat-ink-bar {
+    display: block;
+}
+
+::ng-deep .competency-tabs .mat-tab-label {
+    flex: 1;
+    color: black;
+    opacity: 1 !important;
+    padding: 0 24px 0 46px !important;
+
+    ::ng-deep .mat-tab-label-content {
+        background-color: transparent;
+        color: black;
+        width: 100%;
+        height: 100%;
+    }
+}
+
+::ng-deep .competency-tabs .mat-tab-label::after {
+    display: none;
+}
+
+::ng-deep .competency-tabs .mat-tab-label::before {
+    display: none;
+}
+
+
+::ng-deep .competency-tabs .mat-tab-label-active {
+    flex: 1;
+    opacity: 1 !important;
+
+    .mat-tab-label-content {
+        background-color: transparent;
+        width: 100%;
+        height: 100%;
+    }
+}
+
+::ng-deep .competency-tabs .mat-tab-label-active::after {
+    display: none;
+}
+
+::ng-deep .competency-tabs .mat-tab-label-active::before {
+    display: none;
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
index 3a29411d8..88a739b7b 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
@@ -3,7 +3,7 @@ import { Component, OnInit } from '@angular/core'
 @Component({
   selector: 'ws-app-competency-summary',
   templateUrl: './competency-summary.component.html',
-  styleUrls: ['./competency-summary.component.scss'],
+  styleUrls: ['./competency-summary.component.scss']
 })
 export class CompetencySummaryComponent implements OnInit {
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.html b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.html
new file mode 100644
index 000000000..9f4f7257c
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.html
@@ -0,0 +1,51 @@
+<div class="box-container" *ngIf="data?.type === 'normal'">
+    <div class="flex flex-1 flex-row icon">
+        <img src="assets/icons/{{data?.icon}}.svg"/>
+
+    </div>
+    <div class="flex flex-1 flex-row title">
+        {{data?.title}}
+        
+    </div>
+    <div class="flex flex-1 flex-row subtitle">
+        {{data?.subTitle}}
+    </div>
+    <div mat-dialog-actions class="flex flex-1 flex-row action">
+        <div class="cancel cursor-pointer" [mat-dialog-close]="data?.secondaryAction">
+            <span>{{data?.secondaryAction}}</span>
+        </div>
+        <div class="primary cursor-pointer">
+            <span>{{data?.primaryAction}}</span>
+        </div>
+    </div>
+</div>
+
+<div class="box-container" *ngIf="data?.type === 'progress'">   
+    <div class="flex flex-1 flex-row progress-title">
+        {{data?.title}}        
+    </div>
+    <div class="flex flex-1 flex-row progress-subtitle">
+        {{data?.subTitle}}
+    </div>
+    <div class="flex flex-1 flex-row progress-icon">
+        <img src="assets/icons/{{data?.icon}}.svg"/>
+
+    </div>
+</div>
+
+<div class="box-container" *ngIf="data?.type === 'progress-completed'">   
+    <div class="flex flex-1 flex-row progress-title">
+        {{data?.title}}        
+    </div>
+    <div class="flex flex-1 flex-row progress-subtitle">
+        {{data?.subTitle}}
+    </div>
+    <div class="flex flex-1 flex-row progress-icon">
+        <img src="assets/icons/{{data?.icon}}.svg"/>
+    </div>
+    <div mat-dialog-actions class="flex flex-1 flex-row action">       
+        <div class="primary cursor-pointer">
+            <span>{{data?.primaryAction}}</span>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.scss b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.scss
new file mode 100644
index 000000000..455da40c0
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.scss
@@ -0,0 +1,75 @@
+::ng-deep .mat-dialog-container {
+    border-radius: 8px;
+}
+.box-container {
+    width:632px;
+    padding: 24px;
+}
+.icon {
+    justify-content: center;
+}
+.title {
+    justify-content: center;
+    color: #1B4CA1;
+    font-size: 16px;
+    font-weight: 600;
+    letter-spacing: 0.12px;
+    margin-top: 16px;
+    text-align: center;
+}
+.subtitle {
+    justify-content: center;
+    font-size: 14px;
+    font-weight: 400;
+    letter-spacing: 0.25px;
+    margin-top: 12px;
+    text-align: center;
+}
+.action {
+    justify-content: center;
+    margin-top: 16px;
+}
+.cancel {
+    color: rgb(27, 76, 161);
+    border: 1px solid rgb(27, 76, 161);
+    border-radius: 4px;
+    width: auto;
+    text-align: center;
+    padding: 10px;
+}
+
+
+.primary {
+    color: rgba(255, 255, 255);
+    border: 1px solid rgb(27, 76, 161);
+    border-radius: 4px;
+    width: auto;
+    text-align: center;
+    padding: 10px;
+    background-color: rgb(27, 76, 161);
+    margin-left: 16px;
+}
+
+.progress-title {
+    justify-content: center;
+    color: rgba(0,0,0,0.87);
+    font-size: 24px;
+    font-weight: 600;
+    letter-spacing: 0.12px;
+    margin-top: 16px;
+    text-align: center;
+}
+
+.progress-subtitle {
+    justify-content: center;
+    font-size: 12px;
+    font-weight: 400;
+    letter-spacing: 0.25px;
+    margin-top: 16px;
+    text-align: center;
+}
+
+.progress-icon {
+    justify-content: center;
+    margin-top: 16px;
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.spec.ts b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.spec.ts
new file mode 100644
index 000000000..2407b9ab9
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ConfirmationBoxComponent } from './confirmation.box.component';
+
+describe('ConfirmationBoxComponent', () => {
+  let component: ConfirmationBoxComponent;
+  let fixture: ComponentFixture<ConfirmationBoxComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ConfirmationBoxComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ConfirmationBoxComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation.box.component.ts b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation.box.component.ts
new file mode 100644
index 000000000..584fd8fe0
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation.box.component.ts
@@ -0,0 +1,16 @@
+import { Component, Inject, OnInit } from '@angular/core';
+import { MAT_DIALOG_DATA } from '@angular/material';
+
+@Component({
+  selector: 'ws-app-confirmation-box',
+  templateUrl: './confirmation-box.component.html',
+  styleUrls: ['./confirmation-box.component.scss']
+})
+export class ConfirmationBoxComponent implements OnInit {
+
+  constructor(@Inject(MAT_DIALOG_DATA) public data: any) { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
index ee607a5cc..f04ee7eaa 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
@@ -1,17 +1,94 @@
-<div class=" filter">
-    <div class="filter-header flex flex-1">
-        <div class="flex flex-2 flex-row">
-            <div class="label">Filters</div>
-            <div class="cross-filter"><img src="assets/icons/close.svg"></div>
+<div class="filter-overlay">
+    <div class="filter">
+        <div class="filter-header flex flex-1">
+            <div class="flex flex-2 flex-row">
+                <div class="label">Filters</div>
+                <div class="cross-filter cursor-pointer" (click)="hideFilter()"><img src="assets/icons/close.svg"></div>
+            </div>
         </div>
-    </div>
-    <div class="filter-footer flex flex-1">
-        <div class="flex flex-2 flex-row">
-            <div class="filter-clear">
-                Clear
+        <div class="filter-content-container">
+            <div class="filter-content flex flex-1">
+                <mat-accordion>
+                    <mat-expansion-panel disableRipple (opened)="panelOpenState = true"
+                        (closed)="panelOpenState = false">
+                        <mat-expansion-panel-header>
+                            <mat-panel-title>
+                                Competency Area
+                            </mat-panel-title>
+                        </mat-expansion-panel-header>
+                        <div class="flex flex-1 flex-row category-item">
+                            <mat-checkbox disableRipple class="example-margin">Behavioural</mat-checkbox>
+                        </div>
+                        <div class="flex flex-1 flex-row category-item">
+                            <mat-checkbox disableRipple class="example-margin">Functional</mat-checkbox>
+                        </div>
+                        <div class="flex flex-1 flex-row category-item">
+                            <mat-checkbox disableRipple class="example-margin">Domain</mat-checkbox>
+                        </div>
+                    </mat-expansion-panel>
+                </mat-accordion>
+            </div>
+            <div class="spacer"></div>
+            <div class="filter-content flex flex-1">
+                <mat-accordion>
+                    <mat-expansion-panel (opened)="panelOpenState = true" (closed)="panelOpenState = false">
+                        <mat-expansion-panel-header disableRipple>
+                            <mat-panel-title>
+                                Competency Type
+                            </mat-panel-title>
+                        </mat-expansion-panel-header>
+                        <p>I'm visible because I am open</p>
+                    </mat-expansion-panel>
+                </mat-accordion>
+            </div>
+            <div class="spacer"></div>
+            <div class="filter-content flex flex-1">
+                <mat-accordion>
+                    <mat-expansion-panel (opened)="panelOpenState = true" (closed)="panelOpenState = false">
+                        <mat-expansion-panel-header disableRipple>
+                            <mat-panel-title>
+                                Competency Theme
+                            </mat-panel-title>
+                        </mat-expansion-panel-header>
+                        <p>I'm visible because I am open</p>
+                    </mat-expansion-panel>
+                </mat-accordion>
             </div>
-            <div class="filter-apply">
-                Apply
+            <div class="spacer"></div>
+            <div class="filter-content flex flex-1">
+                <mat-accordion>
+                    <mat-expansion-panel (opened)="panelOpenState = true" (closed)="panelOpenState = false">
+                        <mat-expansion-panel-header>
+                            <mat-panel-title>
+                                Competency Sub-Theme
+                            </mat-panel-title>
+                        </mat-expansion-panel-header>
+                        <p>I'm visible because I am open</p>
+                    </mat-expansion-panel>
+                </mat-accordion>
+            </div>
+            <div class="spacer"></div>
+            <div class="filter-content flex flex-1">
+                <mat-accordion>
+                    <mat-expansion-panel (opened)="panelOpenState = true" (closed)="panelOpenState = false">
+                        <mat-expansion-panel-header disableRipple>
+                            <mat-panel-title>
+                                Provider
+                            </mat-panel-title>
+                        </mat-expansion-panel-header>
+                        <p>I'm visible because I am open</p>
+                    </mat-expansion-panel>
+                </mat-accordion>
+            </div>
+        </div>
+        <div class="filter-footer flex flex-1">
+            <div class="flex flex-2 flex-row">
+                <div class="filter-clear" (click)="hideFilter()">
+                    Clear
+                </div>
+                <div class="filter-apply" (click)="hideFilter()">
+                    Apply
+                </div>
             </div>
         </div>
     </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.scss b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.scss
index d9d919494..2143b11f0 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.scss
@@ -1,25 +1,52 @@
-
+.filter-overlay {
+    background: rgba(0,0,0,0.6);
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    z-index: 1;
+}
 .filter {
-    width: 363px;
-    height: auto;
+    height: 100%;
     border: 1px solid #ccc;
     position: absolute;
     right: 0;
     top: 0;
     background: #fff;
-    z-index: 1000;
+    z-index: 10000 !important;
+    top:0px;
+    position: fixed;
+    overflow-y: auto;
 }
 
+
 .filter-header {
-    margin:26px 12px;
+    margin:26px 25px;
+}
+
+.filter-content {    
+    padding: 18px 0px;
+    margin: 0px 25px;
 }
 
+.filter-content-container {
+    height: calc(100vh - 200px);
+    overflow-y: auto;
+}
+
+.filter-content:last-child {
+    border:none;
+}
 .filter-footer {
-    margin:26px 12px;
+    margin:26px 25px;
+    position: fixed;
+    bottom: 0;
 }
 
 .filter-header .label {
-    width:275px;
+    width:299px;
     font-weight: 700;
 }
 
@@ -31,6 +58,7 @@
     padding: 10px;
     border-radius: 4px;
     color: #1B4CA1;
+    cursor: pointer;
 }
 
 .filter-apply {
@@ -42,4 +70,44 @@
     padding: 10px;
     border-radius: 4px;
     margin-left: 15px;
+    cursor: pointer;
+}
+
+.filter ::ng-deep .mat-expansion-panel {
+    box-shadow: none !important;
+}
+
+.filter ::ng-deep .mat-expansion-panel-header {
+    padding:0 !important;
+}
+
+.filter ::ng-deep .mat-expansion-panel-header-title {
+    font-weight: 700;
+    font-size: 14px;
+    width: 299px;
+}
+
+
+.filter ::ng-deep .mat-expansion-panel:not(.mat-expanded) .mat-expansion-panel-header:not([aria-disabled=true]).cdk-keyboard-focused, .mat-expansion-panel:not(.mat-expanded) .mat-expansion-panel-header:not([aria-disabled=true]).cdk-program-focused, .mat-expansion-panel:not(.mat-expanded) .mat-expansion-panel-header:hover {
+    background:none !important;
+}
+
+.filter ::ng-deep .mat-expansion-panel-body {
+    padding: 0 !important;
+}
+
+.filter ::ng-deep .mat-expansion-panel-header {
+    height: 24px !important; 
+}
+
+.spacer {
+    height: 1px;
+    width: 250px;
+    margin-left: 25px;
+    background: rgba(0,0,0,0.16);
+}
+
+.category-item {
+    color: rgba(0,0,0,0.6);
+    padding: 12px 0;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index 7d56a904e..f86d7138d 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -1,4 +1,5 @@
-import { Component, OnInit } from '@angular/core'
+import { Component, EventEmitter, OnInit, Output } from '@angular/core'
+import {  } from 'stream'
 
 @Component({
   selector: 'ws-app-filter',
@@ -6,10 +7,13 @@ import { Component, OnInit } from '@angular/core'
   styleUrls: ['./filter.component.scss'],
 })
 export class FilterComponent implements OnInit {
-
+  @Output() toggleFilter = new EventEmitter();
   constructor() { }
 
   ngOnInit() {
   }
 
+  hideFilter() {
+    this.toggleFilter.emit(false);
+  }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
index 6231761c6..d1cdb9367 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
@@ -1,7 +1,9 @@
-<div class="flex flex-1 flex-row">
+<div class="flex flex-1 flex-row search-container">
     <div class="selectWrapper">
-        <select class="selectBox">
+        <select class="selectBox" (change)="showDialogBox()">
             <option>Designation</option>
+            <option>All Users</option>
+            <option>Custom Users</option>
         </select>
     </div>
     <div class="search">
@@ -10,9 +12,11 @@
             <input class="sinput color-60" label="" placeholder="Select" type="Standard">
         </div>
     </div>
-    <div class="filter-section">
+    <div class="filter-section" (click)="openFilter()">
         <img src="/assets/icons/filter.svg" />
         <span>Apply Filters</span>
     </div>
 </div>
-<div>
\ No newline at end of file
+<ng-container *ngIf="filterVisibilityFlag">
+    <ws-app-filter (toggleFilter)="hideFilter($event)"></ws-app-filter>
+</ng-container>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.scss b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.scss
index 4fdeb1e04..d4da7fe12 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.scss
@@ -1,3 +1,7 @@
+.search-container {
+    margin-top:20px;
+}
+
 .selectWrapper {
     border-radius: 4px;
     display: inline-block;
@@ -53,6 +57,7 @@ select {
 .filter-section {
     margin-left: 20px;
     margin-top: 10px;
+    cursor: pointer;
 }
 
 .filter-section img {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 9fd73a359..fcb1af65b 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -1,4 +1,7 @@
-import { Component, OnInit } from '@angular/core'
+import { Component, Inject, OnInit } from '@angular/core'
+import {MatDialog} from '@angular/material';
+import { DOCUMENT } from '@angular/common';
+import { ConfirmationBoxComponent } from '../confirmation-box/confirmation.box.component';
 
 @Component({
   selector: 'ws-app-search',
@@ -6,10 +9,42 @@ import { Component, OnInit } from '@angular/core'
   styleUrls: ['./search.component.scss'],
 })
 export class SearchComponent implements OnInit {
-
-  constructor() { }
+  filterVisibilityFlag = false;
+  constructor(public dialog: MatDialog, @Inject(DOCUMENT) private document: Document) { }
 
   ngOnInit() {
   }
 
+  openFilter() {
+      this.filterVisibilityFlag = true;
+      if(this.document.getElementById('top-nav-bar')) {
+        this.document.getElementById('top-nav-bar')!.style.zIndex = "1";
+      }
+    
+  }
+
+  hideFilter(event:any) {
+    this.filterVisibilityFlag = event;
+    if(this.document.getElementById('top-nav-bar')) {
+      this.document.getElementById('top-nav-bar')!.style.zIndex = "1000";
+    }
+  }
+
+  showDialogBox() {
+    const dialogRef = this.dialog.open(ConfirmationBoxComponent, {
+      data: {
+        'type':'progress',
+        'icon':'close',
+        'title':'You are attempting to change the selected user type?',
+        'subTitle':"By selecting all users, you've selected all the users from your Department of fisheries.If you want to select custom users or by designation, use the above option",
+        'primaryAction':'I understand, change user type',
+        'secondaryAction':'Cancel'
+      },
+    });
+
+    dialogRef.afterClosed().subscribe(() => {
+      // console.log('The dialog was closed');
+    });
+  }
+
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
index 99fcf3582..4ffefb0e8 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
@@ -145,6 +145,4 @@
             </mat-card>
         </div>
     </div>
-   <ws-app-competency-summary></ws-app-competency-summary>
-
-</div>
\ No newline at end of file
+</div>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
index d5f1c683d..b53863da0 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
@@ -11,7 +11,7 @@ $secondary-color: #EF951E;
 
 
 .card-grid-container {
-    width: 100%;
+    width: 55%;
 }
 
 .card-standard-container {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
index c94ff7f51..25a414f36 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
@@ -10,18 +10,25 @@
                 <span>2. Add Content
                 </span>
             </ng-template>
+            <ng-template matTabContent>
+                <ws-app-create-content></ws-app-create-content>
+            </ng-template>
         </mat-tab>
         <mat-tab>
             <ng-template mat-tab-label>
                 <span>3. Add Assignee</span>
             </ng-template>
             <ng-template matTabContent>
+                <ws-app-create-assignee></ws-app-create-assignee>
             </ng-template>
         </mat-tab>
         <mat-tab>
             <ng-template mat-tab-label>
                 <span>4. Add Timeline</span>
             </ng-template>
+            <ng-template matTabContent>
+                <ws-app-create-timeline></ws-app-create-timeline>
+            </ng-template>
         </mat-tab>
     </mat-tab-group>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
index 7fe0c3927..12c922f9f 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
@@ -1,4 +1,4 @@
-<div class="flex flex-4 flex-row">
+<div class="flex flex-4 flex-row assignee-card-container">
     <div class="flex flex-1 assignee-card">
         <div class="avatar">
             <div>HG</div>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
index d5157684c..ea80b8093 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
@@ -1,3 +1,6 @@
+.assignee-card-container {
+    margin-top:20px
+}
 .assignee-card {
     width: 325px;
     border: 1px solid rgba(0, 0, 0, 0.16);
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
new file mode 100644
index 000000000..22ce7e271
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
@@ -0,0 +1,9 @@
+<ng-container>
+    <ws-app-search></ws-app-search>
+</ng-container>
+<ng-container>
+    <ws-app-chip></ws-app-chip>
+</ng-container>
+<ng-container>
+    <ws-app-user-card></ws-app-user-card>
+</ng-container>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.scss b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.spec.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.spec.ts
new file mode 100644
index 000000000..48828724d
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CreateAssigneeComponent } from './create-assignee.component';
+
+describe('CreateAssigneeComponent', () => {
+  let component: CreateAssigneeComponent;
+  let fixture: ComponentFixture<CreateAssigneeComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ CreateAssigneeComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CreateAssigneeComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
new file mode 100644
index 000000000..437b3094b
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'ws-app-create-assignee',
+  templateUrl: './create-assignee.component.html',
+  styleUrls: ['./create-assignee.component.scss']
+})
+export class CreateAssigneeComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
new file mode 100644
index 000000000..92f2d712f
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
@@ -0,0 +1,17 @@
+<ng-container>
+    <ws-app-search></ws-app-search>
+</ng-container>
+
+<ng-container>
+    <div class="flex flex-2 flex-row">
+        <div>
+            <ws-app-chip></ws-app-chip>
+            <ws-app-standard-card></ws-app-standard-card>
+        </div>
+        <div>
+            <ws-app-competency-summary></ws-app-competency-summary>
+        </div>
+    </div>
+    
+    <!--  -->
+</ng-container>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.scss b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.spec.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.spec.ts
new file mode 100644
index 000000000..a4b989d3e
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CreateContentComponent } from './create-content.component';
+
+describe('CreateContentComponent', () => {
+  let component: CreateContentComponent;
+  let fixture: ComponentFixture<CreateContentComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ CreateContentComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CreateContentComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
new file mode 100644
index 000000000..00e18f9df
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'ws-app-create-content',
+  templateUrl: './create-content.component.html',
+  styleUrls: ['./create-content.component.scss']
+})
+export class CreateContentComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
index 051893885..3fb06a1f2 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
@@ -1,6 +1,14 @@
 <div class="plan-container">
-    <ws-app-breadcrumb></ws-app-breadcrumb>
-    <ws-app-stepper></ws-app-stepper>
-    <ws-app-search></ws-app-search>
-    <ws-app-standard-card></ws-app-standard-card>
+    
+    <!-- <ws-app-search></ws-app-search>
+    <div class="flex flex-2 flex-row">
+        <div>
+            <ws-app-chip></ws-app-chip>
+        </div>
+        <div>
+            <ws-app-competency-summary></ws-app-competency-summary>
+        </div>
+    </div>
+    
+    <ws-app-standard-card></ws-app-standard-card> -->
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.scss b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.scss
index a70b50894..e69de29bb 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.scss
@@ -1,3 +0,0 @@
-.plan-container {
-    margin: 20px 40px;
-}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
new file mode 100644
index 000000000..01b0b2d75
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
@@ -0,0 +1,22 @@
+<ng-container>
+    <ws-app-add-timeline-form></ws-app-add-timeline-form>
+</ng-container>
+<ng-container>
+    <div class="mt-48">
+        <div class="flex flex-row flex-2">
+            <div class="mat-subheading-1 left-heading">Selected Cards</div>
+            <div class="mat-subheading-2 right-heading">Show all > </div>
+        </div>
+        
+    </div>
+    <ws-app-standard-card></ws-app-standard-card>
+</ng-container>
+<ng-container>
+    <div class="mt-32">
+        <div class="flex flex-row flex-2">
+            <div class="mat-subheading-1 left-heading">Selected Content</div>
+            <div class="mat-subheading-2 right-heading">Show all > </div>
+        </div>
+    </div>
+    <ws-app-user-card></ws-app-user-card>
+</ng-container>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.scss b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.scss
new file mode 100644
index 000000000..5eb297bc9
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.scss
@@ -0,0 +1,15 @@
+.mt-48 {
+    margin-top : 48px
+}
+
+.mt-32 {
+    margin-top : 32px
+}
+
+.left-heading {
+    width: 95%;
+}
+.right-heading {
+    color: #1B4CA1;
+
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.spec.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.spec.ts
new file mode 100644
index 000000000..84c5765cc
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CreateTimelineComponent } from './create-timeline.component';
+
+describe('CreateTimelineComponent', () => {
+  let component: CreateTimelineComponent;
+  let fixture: ComponentFixture<CreateTimelineComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ CreateTimelineComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CreateTimelineComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
new file mode 100644
index 000000000..c859ebc00
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'ws-app-create-timeline',
+  templateUrl: './create-timeline.component.html',
+  styleUrls: ['./create-timeline.component.scss']
+})
+export class CreateTimelineComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
new file mode 100644
index 000000000..4eb321db0
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
@@ -0,0 +1,6 @@
+<ws-app-breadcrumb [showBreadcrumbAction]="false"></ws-app-breadcrumb>
+<div class="flex flex-1 flex-row">
+    <div class="go-back">
+        <img src="assets/icons/close.svg">Go back 
+    </div>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.scss b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.scss
new file mode 100644
index 000000000..f698419a3
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.scss
@@ -0,0 +1,12 @@
+.go-back {
+    width:119px;
+    padding:14px 20px;
+    color: rgba(0,0,0,0.6);
+    font-weight:700;
+    border: 1px solid rgba(0,0,0,0.16);
+}
+
+.go-back img {
+    vertical-align: middle;
+    margin-right: 10px;
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.spec.ts b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.spec.ts
new file mode 100644
index 000000000..6627a9d11
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { PreviewPlanComponent } from './preview-plan.component';
+
+describe('PreviewPlanComponent', () => {
+  let component: PreviewPlanComponent;
+  let fixture: ComponentFixture<PreviewPlanComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ PreviewPlanComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PreviewPlanComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
new file mode 100644
index 000000000..02927ddfd
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'ws-app-preview-plan',
+  templateUrl: './preview-plan.component.html',
+  styleUrls: ['./preview-plan.component.scss']
+})
+export class PreviewPlanComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.html b/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.html
index d2b776c56..b4b8bf491 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.html
@@ -1,3 +1,7 @@
 <div class="container-balanced">
-  <router-outlet></router-outlet>
+  <div class="plan-container">
+    <ws-app-breadcrumb></ws-app-breadcrumb>
+    <ws-app-stepper></ws-app-stepper>
+    <router-outlet></router-outlet>
+  </div>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.scss b/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.scss
index e69de29bb..a70b50894 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.scss
@@ -0,0 +1,3 @@
+.plan-container {
+    margin: 20px 40px;
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
index 968330f00..a7b913aa3 100644
--- a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
+++ b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
@@ -20,6 +20,7 @@ import {
   MatRadioModule,
   MatTabsModule,
   MatCheckboxModule,
+  MatDatepickerModule
 } from '@angular/material'
 import { MatMenuModule } from '@angular/material/menu'
 import { MatPaginatorModule } from '@angular/material/paginator'
@@ -44,6 +45,16 @@ import { StepperComponent } from './components/stepper/stepper.component'
 import { SearchComponent } from './components/search/search.component'
 import { StandardCardComponent } from './components/standard-card/standard-card.component'
 import { CompetencySummaryComponent } from './components/competency-summary/competency-summary.component'
+import { ChipComponent } from './components/chip/chip.component'
+import { CreateAssigneeComponent } from './routes/create-assignee/create-assignee.component'
+import { UserCardComponent } from './components/user-card/user-card.component'
+import { CreateTimelineComponent } from './routes/create-timeline/create-timeline.component'
+import { AddTimelineFormComponent } from './components/add-timeline-form/add-timeline-form.component'
+import { FilterComponent } from './components/filter/filter.component'
+import { ConfirmationBoxComponent } from './components/confirmation-box/confirmation.box.component'
+import { PreviewPlanComponent } from './routes/preview-plan/preview-plan.component'
+import { CreateContentComponent } from './routes/create-content/create-content.component'
+
 @NgModule({
   declarations: [
     TrainingPlanHomeComponent,
@@ -53,6 +64,15 @@ import { CompetencySummaryComponent } from './components/competency-summary/comp
     SearchComponent,
     StandardCardComponent,
     CompetencySummaryComponent,
+    ChipComponent,
+    CreateAssigneeComponent,
+    UserCardComponent,
+    CreateTimelineComponent,
+    AddTimelineFormComponent,
+    FilterComponent,
+    ConfirmationBoxComponent,
+    PreviewPlanComponent,
+    CreateContentComponent
   ],
   imports: [
     CommonModule,
@@ -101,8 +121,10 @@ import { CompetencySummaryComponent } from './components/competency-summary/comp
     MatTableModule,
     MatTooltipModule,
     MatSortModule,
+    MatDatepickerModule
   ],
   entryComponents: [
+    ConfirmationBoxComponent
   ],
   providers: [
     InitResolver,
diff --git a/src/app/component/root/root.component.html b/src/app/component/root/root.component.html
index 7f35851f7..d7f438e6b 100644
--- a/src/app/component/root/root.component.html
+++ b/src/app/component/root/root.component.html
@@ -3,7 +3,7 @@
 
 <ws-app-public-nav-bar *ngIf=""></ws-app-public-nav-bar>
 <!-- <ws-widget-sticky-header> -->
-<ws-app-nav-bar class="top-nav-bar" *ngIf="
+<ws-app-nav-bar class="top-nav-bar" id="top-nav-bar" *ngIf="
     isNavBarRequired && (isXSmall$ | async) === false
   " [hidden]="!showNavbar" [mode]="'top'"></ws-app-nav-bar>
 <!-- </ws-widget-sticky-header> -->

From dbc5ed9f4c0458e59362e0771bd0b4fc8e112b01 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Thu, 7 Dec 2023 18:23:03 +0530
Subject: [PATCH 312/887] update for add assignee, filter, add content, add
 timeline, dialogbox, previewpage

---
 .../add-timeline-form.component.spec.ts       | 28 ++++++-------
 .../add-timeline-form.component.ts            |  4 +-
 .../breadcrumb/breadcrumb.component.ts        |  4 +-
 .../competency-summary.component.ts           |  2 +-
 .../confirmation-box.component.spec.ts        | 28 ++++++-------
 .../confirmation.box.component.ts             |  6 +--
 .../components/filter/filter.component.ts     |  4 +-
 .../components/search/search.component.ts     | 42 ++++++++++---------
 .../create-assignee.component.spec.ts         | 28 ++++++-------
 .../create-assignee.component.ts              |  4 +-
 .../create-content.component.spec.ts          | 28 ++++++-------
 .../create-content.component.ts               |  4 +-
 .../create-timeline.component.spec.ts         | 28 ++++++-------
 .../create-timeline.component.ts              |  4 +-
 .../preview-plan.component.spec.ts            | 28 ++++++-------
 .../preview-plan/preview-plan.component.ts    |  4 +-
 .../training-plan/training-plan.module.ts     |  8 ++--
 17 files changed, 128 insertions(+), 126 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.spec.ts b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.spec.ts
index 76308e85e..30ab4808c 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.spec.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.spec.ts
@@ -1,25 +1,25 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
 
-import { AddTimelineFormComponent } from './add-timeline-form.component';
+import { AddTimelineFormComponent } from './add-timeline-form.component'
 
 describe('AddTimelineFormComponent', () => {
-  let component: AddTimelineFormComponent;
-  let fixture: ComponentFixture<AddTimelineFormComponent>;
+  let component: AddTimelineFormComponent
+  let fixture: ComponentFixture<AddTimelineFormComponent>
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ AddTimelineFormComponent ]
+      declarations: [AddTimelineFormComponent],
     })
-    .compileComponents();
-  }));
+    .compileComponents()
+  }))
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(AddTimelineFormComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+    fixture = TestBed.createComponent(AddTimelineFormComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
 
   it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
index 89eae8b32..cab3cb26d 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
@@ -1,9 +1,9 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit } from '@angular/core'
 
 @Component({
   selector: 'ws-app-add-timeline-form',
   templateUrl: './add-timeline-form.component.html',
-  styleUrls: ['./add-timeline-form.component.scss']
+  styleUrls: ['./add-timeline-form.component.scss'],
 })
 export class AddTimelineFormComponent implements OnInit {
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
index 7a726831a..6475d60d3 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
@@ -1,4 +1,4 @@
-import { Component,Input, OnInit } from '@angular/core'
+import { Component, Input, OnInit } from '@angular/core'
 
 @Component({
   selector: 'ws-app-breadcrumb',
@@ -6,7 +6,7 @@ import { Component,Input, OnInit } from '@angular/core'
   styleUrls: ['./breadcrumb.component.scss'],
 })
 export class BreadcrumbComponent implements OnInit {
-  @Input() showBreadcrumbAction = true;
+  @Input() showBreadcrumbAction = true
   constructor() { }
 
   ngOnInit() {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
index 88a739b7b..3a29411d8 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
@@ -3,7 +3,7 @@ import { Component, OnInit } from '@angular/core'
 @Component({
   selector: 'ws-app-competency-summary',
   templateUrl: './competency-summary.component.html',
-  styleUrls: ['./competency-summary.component.scss']
+  styleUrls: ['./competency-summary.component.scss'],
 })
 export class CompetencySummaryComponent implements OnInit {
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.spec.ts b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.spec.ts
index 2407b9ab9..e1d468814 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.spec.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.spec.ts
@@ -1,25 +1,25 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
 
-import { ConfirmationBoxComponent } from './confirmation.box.component';
+import { ConfirmationBoxComponent } from './confirmation.box.component'
 
 describe('ConfirmationBoxComponent', () => {
-  let component: ConfirmationBoxComponent;
-  let fixture: ComponentFixture<ConfirmationBoxComponent>;
+  let component: ConfirmationBoxComponent
+  let fixture: ComponentFixture<ConfirmationBoxComponent>
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ ConfirmationBoxComponent ]
+      declarations: [ConfirmationBoxComponent],
     })
-    .compileComponents();
-  }));
+    .compileComponents()
+  }))
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(ConfirmationBoxComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+    fixture = TestBed.createComponent(ConfirmationBoxComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
 
   it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation.box.component.ts b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation.box.component.ts
index 584fd8fe0..c1b894efa 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation.box.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation.box.component.ts
@@ -1,10 +1,10 @@
-import { Component, Inject, OnInit } from '@angular/core';
-import { MAT_DIALOG_DATA } from '@angular/material';
+import { Component, Inject, OnInit } from '@angular/core'
+import { MAT_DIALOG_DATA } from '@angular/material'
 
 @Component({
   selector: 'ws-app-confirmation-box',
   templateUrl: './confirmation-box.component.html',
-  styleUrls: ['./confirmation-box.component.scss']
+  styleUrls: ['./confirmation-box.component.scss'],
 })
 export class ConfirmationBoxComponent implements OnInit {
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index f86d7138d..6e7652eb6 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -7,13 +7,13 @@ import {  } from 'stream'
   styleUrls: ['./filter.component.scss'],
 })
 export class FilterComponent implements OnInit {
-  @Output() toggleFilter = new EventEmitter();
+  @Output() toggleFilter = new EventEmitter()
   constructor() { }
 
   ngOnInit() {
   }
 
   hideFilter() {
-    this.toggleFilter.emit(false);
+    this.toggleFilter.emit(false)
   }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index fcb1af65b..879fc46c2 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -1,7 +1,7 @@
 import { Component, Inject, OnInit } from '@angular/core'
-import {MatDialog} from '@angular/material';
-import { DOCUMENT } from '@angular/common';
-import { ConfirmationBoxComponent } from '../confirmation-box/confirmation.box.component';
+import { MatDialog } from '@angular/material'
+import { DOCUMENT } from '@angular/common'
+import { ConfirmationBoxComponent } from '../confirmation-box/confirmation.box.component'
 
 @Component({
   selector: 'ws-app-search',
@@ -9,42 +9,44 @@ import { ConfirmationBoxComponent } from '../confirmation-box/confirmation.box.c
   styleUrls: ['./search.component.scss'],
 })
 export class SearchComponent implements OnInit {
-  filterVisibilityFlag = false;
+  filterVisibilityFlag = false
   constructor(public dialog: MatDialog, @Inject(DOCUMENT) private document: Document) { }
 
   ngOnInit() {
   }
 
   openFilter() {
-      this.filterVisibilityFlag = true;
-      if(this.document.getElementById('top-nav-bar')) {
-        this.document.getElementById('top-nav-bar')!.style.zIndex = "1";
+      this.filterVisibilityFlag = true
+      if (this.document.getElementById('top-nav-bar')) {
+        /* eslint-disable  @typescript-eslint/no-non-null-assertion */
+        this.document.getElementById('top-nav-bar').style.zIndex = '1'
       }
-    
+
   }
 
-  hideFilter(event:any) {
-    this.filterVisibilityFlag = event;
-    if(this.document.getElementById('top-nav-bar')) {
-      this.document.getElementById('top-nav-bar')!.style.zIndex = "1000";
+  hideFilter(event: any) {
+    this.filterVisibilityFlag = event
+    if (this.document.getElementById('top-nav-bar')) {
+      /* eslint-disable  @typescript-eslint/no-non-null-assertion */
+      this.document.getElementById('top-nav-bar').style.zIndex = '1000'
     }
   }
 
   showDialogBox() {
     const dialogRef = this.dialog.open(ConfirmationBoxComponent, {
       data: {
-        'type':'progress',
-        'icon':'close',
-        'title':'You are attempting to change the selected user type?',
-        'subTitle':"By selecting all users, you've selected all the users from your Department of fisheries.If you want to select custom users or by designation, use the above option",
-        'primaryAction':'I understand, change user type',
-        'secondaryAction':'Cancel'
+        type: 'progress',
+        icon: 'close',
+        title: 'You are attempting to change the selected user type?',
+        subTitle: 'By selecting all users, you\'ve selected all the users from your Department of fisheries.',
+        primaryAction: 'I understand, change user type',
+        secondaryAction: 'Cancel',
       },
-    });
+    })
 
     dialogRef.afterClosed().subscribe(() => {
       // console.log('The dialog was closed');
-    });
+    })
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.spec.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.spec.ts
index 48828724d..814848814 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.spec.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.spec.ts
@@ -1,25 +1,25 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
 
-import { CreateAssigneeComponent } from './create-assignee.component';
+import { CreateAssigneeComponent } from './create-assignee.component'
 
 describe('CreateAssigneeComponent', () => {
-  let component: CreateAssigneeComponent;
-  let fixture: ComponentFixture<CreateAssigneeComponent>;
+  let component: CreateAssigneeComponent
+  let fixture: ComponentFixture<CreateAssigneeComponent>
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ CreateAssigneeComponent ]
+      declarations: [CreateAssigneeComponent],
     })
-    .compileComponents();
-  }));
+    .compileComponents()
+  }))
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(CreateAssigneeComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+    fixture = TestBed.createComponent(CreateAssigneeComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
 
   it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
index 437b3094b..c6ad953de 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
@@ -1,9 +1,9 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit } from '@angular/core'
 
 @Component({
   selector: 'ws-app-create-assignee',
   templateUrl: './create-assignee.component.html',
-  styleUrls: ['./create-assignee.component.scss']
+  styleUrls: ['./create-assignee.component.scss'],
 })
 export class CreateAssigneeComponent implements OnInit {
 
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.spec.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.spec.ts
index a4b989d3e..e39d967ec 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.spec.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.spec.ts
@@ -1,25 +1,25 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
 
-import { CreateContentComponent } from './create-content.component';
+import { CreateContentComponent } from './create-content.component'
 
 describe('CreateContentComponent', () => {
-  let component: CreateContentComponent;
-  let fixture: ComponentFixture<CreateContentComponent>;
+  let component: CreateContentComponent
+  let fixture: ComponentFixture<CreateContentComponent>
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ CreateContentComponent ]
+      declarations: [CreateContentComponent],
     })
-    .compileComponents();
-  }));
+    .compileComponents()
+  }))
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(CreateContentComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+    fixture = TestBed.createComponent(CreateContentComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
 
   it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
index 00e18f9df..3de3c03dd 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
@@ -1,9 +1,9 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit } from '@angular/core'
 
 @Component({
   selector: 'ws-app-create-content',
   templateUrl: './create-content.component.html',
-  styleUrls: ['./create-content.component.scss']
+  styleUrls: ['./create-content.component.scss'],
 })
 export class CreateContentComponent implements OnInit {
 
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.spec.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.spec.ts
index 84c5765cc..d1b349e09 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.spec.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.spec.ts
@@ -1,25 +1,25 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
 
-import { CreateTimelineComponent } from './create-timeline.component';
+import { CreateTimelineComponent } from './create-timeline.component'
 
 describe('CreateTimelineComponent', () => {
-  let component: CreateTimelineComponent;
-  let fixture: ComponentFixture<CreateTimelineComponent>;
+  let component: CreateTimelineComponent
+  let fixture: ComponentFixture<CreateTimelineComponent>
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ CreateTimelineComponent ]
+      declarations: [CreateTimelineComponent],
     })
-    .compileComponents();
-  }));
+    .compileComponents()
+  }))
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(CreateTimelineComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+    fixture = TestBed.createComponent(CreateTimelineComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
 
   it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
index c859ebc00..a363d441d 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
@@ -1,9 +1,9 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit } from '@angular/core'
 
 @Component({
   selector: 'ws-app-create-timeline',
   templateUrl: './create-timeline.component.html',
-  styleUrls: ['./create-timeline.component.scss']
+  styleUrls: ['./create-timeline.component.scss'],
 })
 export class CreateTimelineComponent implements OnInit {
 
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.spec.ts b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.spec.ts
index 6627a9d11..49aec1e67 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.spec.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.spec.ts
@@ -1,25 +1,25 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
 
-import { PreviewPlanComponent } from './preview-plan.component';
+import { PreviewPlanComponent } from './preview-plan.component'
 
 describe('PreviewPlanComponent', () => {
-  let component: PreviewPlanComponent;
-  let fixture: ComponentFixture<PreviewPlanComponent>;
+  let component: PreviewPlanComponent
+  let fixture: ComponentFixture<PreviewPlanComponent>
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ PreviewPlanComponent ]
+      declarations: [PreviewPlanComponent],
     })
-    .compileComponents();
-  }));
+    .compileComponents()
+  }))
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(PreviewPlanComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+    fixture = TestBed.createComponent(PreviewPlanComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
 
   it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
index 02927ddfd..31ca71e88 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
@@ -1,9 +1,9 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit } from '@angular/core'
 
 @Component({
   selector: 'ws-app-preview-plan',
   templateUrl: './preview-plan.component.html',
-  styleUrls: ['./preview-plan.component.scss']
+  styleUrls: ['./preview-plan.component.scss'],
 })
 export class PreviewPlanComponent implements OnInit {
 
diff --git a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
index a7b913aa3..505a986cc 100644
--- a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
+++ b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
@@ -20,7 +20,7 @@ import {
   MatRadioModule,
   MatTabsModule,
   MatCheckboxModule,
-  MatDatepickerModule
+  MatDatepickerModule,
 } from '@angular/material'
 import { MatMenuModule } from '@angular/material/menu'
 import { MatPaginatorModule } from '@angular/material/paginator'
@@ -72,7 +72,7 @@ import { CreateContentComponent } from './routes/create-content/create-content.c
     FilterComponent,
     ConfirmationBoxComponent,
     PreviewPlanComponent,
-    CreateContentComponent
+    CreateContentComponent,
   ],
   imports: [
     CommonModule,
@@ -121,10 +121,10 @@ import { CreateContentComponent } from './routes/create-content/create-content.c
     MatTableModule,
     MatTooltipModule,
     MatSortModule,
-    MatDatepickerModule
+    MatDatepickerModule,
   ],
   entryComponents: [
-    ConfirmationBoxComponent
+    ConfirmationBoxComponent,
   ],
   providers: [
     InitResolver,

From 8d19e83abb3a3d56b278f9e7c4d63626131f41a0 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Thu, 7 Dec 2023 18:27:16 +0530
Subject: [PATCH 313/887] update for add assignee, filter, add content, add
 timeline, dialogbox, previewpage

---
 .../training-plan/components/search/search.component.ts   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 879fc46c2..6a83cb6f8 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -18,8 +18,8 @@ export class SearchComponent implements OnInit {
   openFilter() {
       this.filterVisibilityFlag = true
       if (this.document.getElementById('top-nav-bar')) {
-        /* eslint-disable  @typescript-eslint/no-non-null-assertion */
-        this.document.getElementById('top-nav-bar').style.zIndex = '1'
+        let ele:any = this.document.getElementById('top-nav-bar');
+        ele.style.zIndex = '1'
       }
 
   }
@@ -27,8 +27,8 @@ export class SearchComponent implements OnInit {
   hideFilter(event: any) {
     this.filterVisibilityFlag = event
     if (this.document.getElementById('top-nav-bar')) {
-      /* eslint-disable  @typescript-eslint/no-non-null-assertion */
-      this.document.getElementById('top-nav-bar').style.zIndex = '1000'
+      let ele:any = this.document.getElementById('top-nav-bar');
+      ele.style.zIndex = '1000'
     }
   }
 

From b58e3764adadb0e5f9402dcac72678615bda1af0 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Thu, 7 Dec 2023 18:29:39 +0530
Subject: [PATCH 314/887] update for add assignee, filter, add content, add
 timeline, dialogbox, previewpage

---
 .../training-plan/components/search/search.component.ts       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 6a83cb6f8..a4201121a 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -18,7 +18,7 @@ export class SearchComponent implements OnInit {
   openFilter() {
       this.filterVisibilityFlag = true
       if (this.document.getElementById('top-nav-bar')) {
-        let ele:any = this.document.getElementById('top-nav-bar');
+        const ele: any = this.document.getElementById('top-nav-bar')
         ele.style.zIndex = '1'
       }
 
@@ -27,7 +27,7 @@ export class SearchComponent implements OnInit {
   hideFilter(event: any) {
     this.filterVisibilityFlag = event
     if (this.document.getElementById('top-nav-bar')) {
-      let ele:any = this.document.getElementById('top-nav-bar');
+      const ele: any = this.document.getElementById('top-nav-bar')
       ele.style.zIndex = '1000'
     }
   }

From 13eb3e91c5aa2604024519bd349484700175a27d Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Thu, 7 Dec 2023 18:32:33 +0530
Subject: [PATCH 315/887] update for add assignee, filter, add content, add
 timeline, dialogbox, previewpage

---
 .../components/filter/filter.component.html         | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
index f04ee7eaa..2c7e81cc3 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
@@ -9,8 +9,9 @@
         <div class="filter-content-container">
             <div class="filter-content flex flex-1">
                 <mat-accordion>
-                    <mat-expansion-panel disableRipple (opened)="panelOpenState = true"
-                        (closed)="panelOpenState = false">
+                    <!-- (opened)="panelOpenState = true"
+                        (closed)="panelOpenState = false" -->
+                    <mat-expansion-panel disableRipple>
                         <mat-expansion-panel-header>
                             <mat-panel-title>
                                 Competency Area
@@ -31,7 +32,7 @@
             <div class="spacer"></div>
             <div class="filter-content flex flex-1">
                 <mat-accordion>
-                    <mat-expansion-panel (opened)="panelOpenState = true" (closed)="panelOpenState = false">
+                    <mat-expansion-panel>
                         <mat-expansion-panel-header disableRipple>
                             <mat-panel-title>
                                 Competency Type
@@ -44,7 +45,7 @@
             <div class="spacer"></div>
             <div class="filter-content flex flex-1">
                 <mat-accordion>
-                    <mat-expansion-panel (opened)="panelOpenState = true" (closed)="panelOpenState = false">
+                    <mat-expansion-panel>
                         <mat-expansion-panel-header disableRipple>
                             <mat-panel-title>
                                 Competency Theme
@@ -57,7 +58,7 @@
             <div class="spacer"></div>
             <div class="filter-content flex flex-1">
                 <mat-accordion>
-                    <mat-expansion-panel (opened)="panelOpenState = true" (closed)="panelOpenState = false">
+                    <mat-expansion-panel>
                         <mat-expansion-panel-header>
                             <mat-panel-title>
                                 Competency Sub-Theme
@@ -70,7 +71,7 @@
             <div class="spacer"></div>
             <div class="filter-content flex flex-1">
                 <mat-accordion>
-                    <mat-expansion-panel (opened)="panelOpenState = true" (closed)="panelOpenState = false">
+                    <mat-expansion-panel>
                         <mat-expansion-panel-header disableRipple>
                             <mat-panel-title>
                                 Provider

From b08ecdb698c368d1cec5bf57629ac86cd7580ca3 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Fri, 8 Dec 2023 18:27:15 +0530
Subject: [PATCH 316/887] add ui element for create plan, filter, preview,
 dialog box, cards enhancement, linking of actions, breadcrumb

---
 .../add-plan-information.component.html       |    9 +
 .../add-plan-information.component.scss       |   35 +
 .../add-plan-information.component.spec.ts    |   25 +
 .../add-plan-information.component.ts         |   15 +
 .../breadcrumb/breadcrumb.component.html      |   10 +-
 .../breadcrumb/breadcrumb.component.scss      |    7 +-
 .../breadcrumb/breadcrumb.component.ts        |   77 +-
 .../category-drop-down.component.html         |    5 +
 .../category-drop-down.component.scss         |   26 +
 .../category-drop-down.component.spec.ts      |   25 +
 .../category-drop-down.component.ts           |  116 +
 .../components/chip/chip.component.html       |   10 +-
 .../components/chip/chip.component.ts         |    4 +
 .../competency-summary.component.scss         |    2 +-
 .../confirmation-box.component.html           |    8 +-
 .../confirmation-box.component.scss           |   14 +
 .../confirmation.box.component.ts             |    2 +
 .../components/filter/filter.component.html   |   83 +-
 .../components/filter/filter.component.scss   |   49 +-
 .../components/search/search.component.html   |   11 +-
 .../components/search/search.component.scss   |   28 -
 .../components/search/search.component.ts     |   25 +-
 .../standard-card.component.html              | 2495 ++++++++++++++++-
 .../standard-card.component.scss              |   12 +-
 .../standard-card/standard-card.component.ts  |    5 +-
 .../components/stepper/stepper.component.html |    3 +
 .../components/stepper/stepper.component.scss |    7 +-
 .../user-card/user-card.component.html        |  261 +-
 .../user-card/user-card.component.scss        |   55 +-
 .../user-card/user-card.component.ts          |    4 +-
 .../create-assignee.component.html            |    2 +-
 .../create-assignee.component.ts              |   19 +-
 .../create-content.component.html             |    4 +-
 .../create-content.component.ts               |   29 +-
 .../create-plan/create-plan.component.html    |   14 +-
 .../create-timeline.component.html            |    8 +-
 .../create-timeline.component.scss            |    4 +
 .../create-timeline.component.ts              |    7 +-
 .../preview-plan/preview-plan.component.html  |    9 +-
 .../preview-plan/preview-plan.component.ts    |    7 +-
 .../training-plan-home.component.html         |    4 +-
 .../training-plan/training-plan.module.ts     |    5 +-
 .../training-plan.routing.module.ts           |    9 +
 43 files changed, 3267 insertions(+), 282 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.html
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.scss
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.html
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.scss
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts

diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.html b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.html
new file mode 100644
index 000000000..5fea2fd39
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.html
@@ -0,0 +1,9 @@
+<div class="flex flex-1 flex-column form-container">
+    <div class="label">
+        Plan information
+    </div>
+    <div class="form-element">
+        <div class="fonm-element-label">Plan title <span class="required"></span></div>
+        <input class="sinput color-60  mt-8" label="" placeholder="Enter Plan title" type="Standard">
+    </div>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.scss b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.scss
new file mode 100644
index 000000000..335598b0e
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.scss
@@ -0,0 +1,35 @@
+::ng-deep .mat-form-field-appearance-outline .mat-form-field-flex {
+    width: 369px   
+}
+
+.form-container {
+    margin-top: 20px;
+    border: 1px solid rgba(0,0,0,0.16);
+    padding: 24px 24px 0 24px;
+    box-shadow: 2px 2px 2px 0px #EBEBEB;
+}
+
+.form-container .label {
+    color:rgba(0,0,0,0.8);
+    font-weight: 600;
+    letter-spacing:0.12;
+    font-size: 20px;
+}
+.form-element {
+    margin: 24px 0;
+}
+
+.fonm-element-label {
+    font-size: 14px;
+    font-weight: 700;
+    letter-spacing: 0.25;
+    color: rgba(0,0,0,0.87);
+}
+
+.sinput {
+    border-radius: 4px;
+    border: 1px solid #d5d0d0;
+    padding: 15px 16px;
+    font: 400 14px Lato;
+    width: 95%;
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.spec.ts b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.spec.ts
new file mode 100644
index 000000000..3a9f30a9b
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AddPlanInformationComponent } from './add-plan-information.component';
+
+describe('AddPlanInformationComponent', () => {
+  let component: AddPlanInformationComponent;
+  let fixture: ComponentFixture<AddPlanInformationComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ AddPlanInformationComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AddPlanInformationComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
new file mode 100644
index 000000000..55338b003
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'ws-app-add-plan-information',
+  templateUrl: './add-plan-information.component.html',
+  styleUrls: ['./add-plan-information.component.scss']
+})
+export class AddPlanInformationComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
index b966236c9..7541a3603 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
@@ -1,19 +1,19 @@
 <div class="flex flex-1 flex-row breadcrumb">
     <div class="flex flex-2 flex-row left-breadcrumb">
-        <div class="home cursor-pointer">Training Plans
+        <div class="home cursor-pointer" (click)="performRoute('list')">Training Plans
             <img src="/assets/icons/arrow-forward_small.svg" />
         </div>
-        <div class="home cursor-pointer">Create CBP Plan
+        <div class="home cursor-pointer" (click)="performRoute('create-plan')">Create CBP Plan
             <img src="/assets/icons/arrow-forward_small.svg" />
         </div>
-        <div class="action cursor-pointer">Note taking - Shortand
+        <div class="action cursor-pointer">Create a Plan
         </div>
     </div>
     <div class="flex flex-1 flex-row right-breadcrumb" *ngIf="showBreadcrumbAction">
-        <div class="cancel">
+        <div class="cancel cursor-pointer" (click)="cancel()">
             <span>Cancel</span>
         </div>
-        <div class="next active">
+        <div class="next-btn cursor-pointer" (click)="nextStep()">
             <span>Next: Add Content</span>
         </div>
     </div>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.scss b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.scss
index 4686e86ef..ef2d0a268 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.scss
@@ -35,18 +35,17 @@
 }
 
 
-.next {
+.next-btn {
     color: rgba(255, 255, 255, 0.7);
-    border: 1px solid rgb(27, 76, 161);
     border-radius: 4px;
-    width: 174px;
+    width: 199px;
     text-align: center;
     padding: 10px 0;
     background-color: rgb(153, 153, 153);
     margin-left: 10px;
 }
 
-.next.active {
+.next-btn.active {
     background-color: rgb(61, 81, 174);
     color: rgba(255, 255, 255)
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
index 6475d60d3..ef9dc1d0f 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
@@ -1,15 +1,86 @@
 import { Component, Input, OnInit } from '@angular/core'
-
+import { MatDialog } from '@angular/material'
+import { Router } from '@angular/router'
+import { ConfirmationBoxComponent } from '../confirmation-box/confirmation.box.component'
 @Component({
   selector: 'ws-app-breadcrumb',
   templateUrl: './breadcrumb.component.html',
   styleUrls: ['./breadcrumb.component.scss'],
 })
 export class BreadcrumbComponent implements OnInit {
-  @Input() showBreadcrumbAction = true
-  constructor() { }
+  @Input() showBreadcrumbAction = true;
+  public dialogRef:any;
+  constructor(private router: Router,public dialog: MatDialog) { }
 
   ngOnInit() {
   }
 
+  cancel() {
+    this.router.navigateByUrl('app/home/training-plan-dashboard');
+  }
+
+  nextStep() {
+    this.showDialogBox('progress-completed');
+  }
+
+  performRoute(route:any) {
+    if(route === 'list') {
+      this.router.navigateByUrl('app/home/training-plan-dashboard');
+    } else {
+      this.router.navigateByUrl('app/training-plan/'+route)
+    }
+    
+  }
+
+  showDialogBox(event:any) {
+    let dialogData:any = {}
+    switch(event) {
+      case 'progress':
+        dialogData['type'] = 'progress';
+        dialogData['icon'] = 'vega';
+        dialogData['title'] = 'Processing your request';
+        dialogData['subTitle'] = `Wait a second , your request is processing………`;
+      break;
+      case 'progress-completed':
+        dialogData['type'] = 'progress-completed';
+        dialogData['icon'] = 'accept_icon';
+        dialogData['title'] = 'Your processing has been done.';
+        dialogData['subTitle'] = `Updated to Draft`;
+        dialogData['primaryAction'] = 'Redirecting....';
+      break;
+        dialogData['type'] = 'normal';
+        dialogData['icon'] = 'radio_on';
+        dialogData['title'] = 'You are attempting to change the selected user type?';
+        dialogData['subTitle'] = `By selecting all users, you've selected all the users from your Department of fisheries.
+        If you want to select custom users or by designation, use the above option`;
+        dialogData['primaryAction'] = 'I understand, change user type';
+        dialogData['secondaryAction'] = 'Cancel';
+      break;
+    }
+
+    this.openDialoagBox(dialogData);
+  }
+
+  openDialoagBox(dialogData:any) {
+    this.dialogRef = this.dialog.open(ConfirmationBoxComponent, {
+      disableClose: true,
+      data: {
+        type: dialogData.type,
+        icon: dialogData.icon,
+        title: dialogData.title,
+        subTitle: dialogData.subTitle,
+        primaryAction: dialogData.primaryAction,
+        secondaryAction: dialogData.secondaryAction,
+      },
+    })
+
+    this.dialogRef.afterClosed().subscribe(() => {
+      // console.log('The dialog was closed');
+    })
+  }
+
+  hideConfirmationBox(event:any) {
+    console.log('close',event);
+    this.dialogRef.close();
+  }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.html b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.html
new file mode 100644
index 000000000..3416b641b
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.html
@@ -0,0 +1,5 @@
+<div class="selectWrapper">
+    <select  #select class="selectBox" (change)="showDialogBox(select?.value)">
+        <option *ngFor="let item of categoryData" [value]="item?.value">{{item?.name}}</option>
+    </select>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.scss b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.scss
new file mode 100644
index 000000000..3a9dbfc44
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.scss
@@ -0,0 +1,26 @@
+.selectWrapper {
+    border-radius: 4px;
+    display: inline-block;
+    width: 11%;
+}
+
+.selectBox {
+    width: 192px;
+    height: 48px;
+    border: 0px;
+    outline: none;
+    background: none;
+}
+
+select {
+    -webkit-appearance: none;
+    -moz-appearance: none;
+    background: transparent !important;
+    background-image: url("data:image/svg+xml;utf8,<svg fill='black' height='24' viewBox='0 0 24 24' width='24' xmlns='http://www.w3.org/2000/svg'><path d='M7 10l5 5 5-5z'/><path d='M0 0h24v24H0z' fill='none'/></svg>") !important;
+    background-repeat: no-repeat !important;
+    background-position-x: 100% !important;
+    background-position-y: 10px !important;
+    border: 1px solid rgba(0, 0, 0, 0.16) !important;
+    border-radius: 2px !important;
+    padding: 1rem !important;
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.spec.ts b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.spec.ts
new file mode 100644
index 000000000..35251d05a
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CategoryDropDownComponent } from './category-drop-down.component';
+
+describe('CategoryDropDownComponent', () => {
+  let component: CategoryDropDownComponent;
+  let fixture: ComponentFixture<CategoryDropDownComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ CategoryDropDownComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CategoryDropDownComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
new file mode 100644
index 000000000..31194b85a
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
@@ -0,0 +1,116 @@
+import { Component, EventEmitter, Input, Output, OnInit } from '@angular/core';
+import { MatDialog } from '@angular/material'
+import { ConfirmationBoxComponent } from '../confirmation-box/confirmation.box.component'
+@Component({
+  selector: 'ws-app-category-drop-down',
+  templateUrl: './category-drop-down.component.html',
+  styleUrls: ['./category-drop-down.component.scss']
+})
+export class CategoryDropDownComponent implements OnInit {
+  @Input() categoryData:any[] = [];
+  @Output() closeDropDown:any = new EventEmitter();
+  dialogRef:any;
+  constructor(public dialog: MatDialog) { }
+
+  ngOnInit() {
+  }
+
+
+  showDialogBox(event:any) {
+    let dialogData:any = {}
+    switch(event) {
+      case 'Course':
+        dialogData['type'] = 'normal';
+        dialogData['icon'] = 'radio_on';
+        dialogData['title'] = 'You are attempting to change the selected content type?';
+        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection. It's advisable to save the current one as a draft and create a new one instead.`;
+        dialogData['primaryAction'] = 'I understand, change content type';
+        dialogData['secondaryAction'] = 'Cancel';
+      break;
+      case 'Program':
+        dialogData['type'] = 'normal';
+        dialogData['icon'] = 'radio_on';
+        dialogData['title'] = 'You are attempting to change the selected content type?';
+        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection. It's advisable to save the current one as a draft and create a new one instead.`;
+        dialogData['primaryAction'] = 'I understand, change content type';
+        dialogData['secondaryAction'] = 'Cancel';
+      break;
+      case 'Blended program':
+        dialogData['type'] = 'normal';
+        dialogData['icon'] = 'radio_on';
+        dialogData['title'] = 'You are attempting to change the selected content type?';
+        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection. It's advisable to save the current one as a draft and create a new one instead.`;
+        dialogData['primaryAction'] = 'I understand, change content type';
+        dialogData['secondaryAction'] = 'Cancel';
+      break;
+      case 'Curated program':
+        dialogData['type'] = 'normal';
+        dialogData['icon'] = 'radio_on';
+        dialogData['title'] = 'You are attempting to change the selected content type?';
+        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection. It's advisable to save the current one as a draft and create a new one instead.`;
+        dialogData['primaryAction'] = 'I understand, change content type';
+        dialogData['secondaryAction'] = 'Cancel';
+      break;
+      case 'Moderated Course':
+        dialogData['type'] = 'normal';
+        dialogData['icon'] = 'radio_on';
+        dialogData['title'] = 'You are attempting to change the selected content type?';
+        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection. It's advisable to save the current one as a draft and create a new one instead.`;
+        dialogData['primaryAction'] = 'I understand, change content type';
+        dialogData['secondaryAction'] = 'Cancel';
+      break;
+      case 'Designation':
+        dialogData['type'] = 'normal';
+        dialogData['icon'] = 'radio_on';
+        dialogData['title'] = 'You are attempting to change the selected user type?';
+        dialogData['subTitle'] = `By selecting all users, you've selected all the users from your Department of fisheries.
+        If you want to select custom users or by designation, use the above option`;
+        dialogData['primaryAction'] = 'I understand, change user type';
+        dialogData['secondaryAction'] = 'Cancel';
+      break;
+      case 'All Users':
+        dialogData['type'] = 'normal';
+        dialogData['icon'] = 'radio_on';
+        dialogData['title'] = 'You are attempting to change the selected user type?';
+        dialogData['subTitle'] = `By selecting all users, you've selected all the users from your Department of fisheries.
+        If you want to select custom users or by designation, use the above option`;
+        dialogData['primaryAction'] = 'I understand, change user type';
+        dialogData['secondaryAction'] = 'Cancel';
+      break;
+      case 'Custom Users':
+        dialogData['type'] = 'normal';
+        dialogData['icon'] = 'radio_on';
+        dialogData['title'] = 'You are attempting to change the selected user type?';
+        dialogData['subTitle'] = `By selecting all users, you've selected all the users from your Department of fisheries.
+        If you want to select custom users or by designation, use the above option`;
+        dialogData['primaryAction'] = 'I understand, change user type';
+        dialogData['secondaryAction'] = 'Cancel';
+      break;
+    }
+
+    this.openDialoagBox(dialogData);
+  }
+
+  openDialoagBox(dialogData:any) {
+    this.dialogRef = this.dialog.open(ConfirmationBoxComponent, {
+      data: {
+        type: dialogData.type,
+        icon: dialogData.icon,
+        title: dialogData.title,
+        subTitle: dialogData.subTitle,
+        primaryAction: dialogData.primaryAction,
+        secondaryAction: dialogData.secondaryAction,
+      },
+    })
+
+    this.dialogRef.afterClosed().subscribe(() => {
+      // console.log('The dialog was closed');
+    })
+  }
+
+  hideConfirmationBox(event:any) {
+    console.log('close',event);
+    this.dialogRef.close();
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
index 852d7a14e..03b6e4db8 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
@@ -3,23 +3,23 @@
         <div class="selected-item-label">Selected items - </div>
         <div class="chips">
             <div class="chips-content">
-                <span class="color-60">Himanshu Gupta</span><img src="assets/icons/close.svg" />
+                <span class="color-60">Himanshu Gupta</span><img class="cursor-pointer" src="assets/icons/close.svg" />
             </div>
         </div>
         <div class="chips">
             <div class="chips-content">
-                <span class="color-60">Himanshu Gupta</span><img src="assets/icons/close.svg" />
+                <span class="color-60">Himanshu Gupta</span><img class="cursor-pointer" src="assets/icons/close.svg" />
             </div>
         </div>
         <div class="chips">
             <div class="chips-content">
-                <span class="color-60">Himanshu Gupta</span><img src="assets/icons/close.svg" />
+                <span class="color-60">Himanshu Gupta</span><img class="cursor-pointer" src="assets/icons/close.svg" />
             </div>
         </div>
-        <div class="select-more-link"><span>+3 more</span></div>
+        <div class="select-more-link cursor-pointer"><span>+3 more</span></div>
     </div>
     <div class="flex flex-1 flex-row right-section">
-        <div class="select-more-link">
+        <div class="select-more-link cursor-pointer" (click)="clearAll()">
             <span>Clear all</span>
         </div>
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
index 4a1757b0f..1e735e6ac 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
@@ -12,4 +12,8 @@ export class ChipComponent implements OnInit {
   ngOnInit() {
   }
 
+  clearAll() {
+    
+  }
+
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.scss b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.scss
index 7a454c8f7..2d92f8d67 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.scss
@@ -6,7 +6,7 @@
     min-height: 300px;
     margin-left: 25px;
     border-radius: 12px;
-    margin-left: 60%;
+    margin-left: 58%;
     
 }
 .competency-summary-header {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.html b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.html
index 9f4f7257c..e53bfdb19 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.html
@@ -14,13 +14,13 @@
         <div class="cancel cursor-pointer" [mat-dialog-close]="data?.secondaryAction">
             <span>{{data?.secondaryAction}}</span>
         </div>
-        <div class="primary cursor-pointer">
+        <div class="primary cursor-pointer" (click)="performAction(data)">
             <span>{{data?.primaryAction}}</span>
         </div>
     </div>
 </div>
 
-<div class="box-container" *ngIf="data?.type === 'progress'">   
+<div class="box-container-portrait" *ngIf="data?.type === 'progress'">   
     <div class="flex flex-1 flex-row progress-title">
         {{data?.title}}        
     </div>
@@ -33,11 +33,11 @@
     </div>
 </div>
 
-<div class="box-container" *ngIf="data?.type === 'progress-completed'">   
+<div class="box-container-portrait" *ngIf="data?.type === 'progress-completed'">   
     <div class="flex flex-1 flex-row progress-title">
         {{data?.title}}        
     </div>
-    <div class="flex flex-1 flex-row progress-subtitle">
+    <div class="flex flex-1 flex-row progress-subtitle-16">
         {{data?.subTitle}}
     </div>
     <div class="flex flex-1 flex-row progress-icon">
diff --git a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.scss b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.scss
index 455da40c0..43e13a599 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.scss
@@ -5,6 +5,11 @@
     width:632px;
     padding: 24px;
 }
+
+.box-container-portrait {
+    width:511px;
+    margin: 32px 0 20px 0;
+}
 .icon {
     justify-content: center;
 }
@@ -69,6 +74,15 @@
     text-align: center;
 }
 
+.progress-subtitle-16 {
+    justify-content: center;
+    font-size: 16px;
+    font-weight: 400;
+    letter-spacing: 0.25px;
+    margin-top: 16px;
+    text-align: center;
+}
+
 .progress-icon {
     justify-content: center;
     margin-top: 16px;
diff --git a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation.box.component.ts b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation.box.component.ts
index c1b894efa..f07302151 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation.box.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation.box.component.ts
@@ -13,4 +13,6 @@ export class ConfirmationBoxComponent implements OnInit {
   ngOnInit() {
   }
 
+  performAction() {
+  }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
index 2c7e81cc3..b18b29e85 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
@@ -38,7 +38,12 @@
                                 Competency Type
                             </mat-panel-title>
                         </mat-expansion-panel-header>
-                        <p>I'm visible because I am open</p>
+                        <div class="flex flex-1 flex-row category-item">
+                            <mat-checkbox disableRipple class="example-margin">Core</mat-checkbox>
+                        </div>
+                        <div class="flex flex-1 flex-row category-item">
+                            <mat-checkbox disableRipple class="example-margin">Leadership</mat-checkbox>
+                        </div>
                     </mat-expansion-panel>
                 </mat-accordion>
             </div>
@@ -51,7 +56,33 @@
                                 Competency Theme
                             </mat-panel-title>
                         </mat-expansion-panel-header>
-                        <p>I'm visible because I am open</p>
+                            <div class="search-container">
+                                <div class="rsearch"><mat-icon
+                                    class="color-60 search-icon mat-icon notranslate material-icons mat-icon-no-color">search</mat-icon>
+                                <input class="sinput color-60" label="" placeholder="Enter competency theme" type="Standard">
+                                </div>
+                            </div>
+                            <div class="category-content">
+                                <div class="flex flex-1 flex-row category-item">
+                                    <mat-checkbox disableRipple class="example-margin">Self-Awareness</mat-checkbox>
+                                </div>
+                                <div class="flex flex-1 flex-row category-item">
+                                    <mat-checkbox disableRipple class="example-margin">Personal Effectiveness</mat-checkbox>
+                                </div>
+                                <div class="flex flex-1 flex-row category-item">
+                                    <mat-checkbox disableRipple class="example-margin">Solution Orientation</mat-checkbox>
+                                </div>
+                                <div class="flex flex-1 flex-row category-item">
+                                    <mat-checkbox disableRipple class="example-margin">Communication</mat-checkbox>
+                                </div>
+                                <div class="flex flex-1 flex-row category-item">
+                                    <mat-checkbox disableRipple class="example-margin">Creativity & innovation</mat-checkbox>
+                                </div>
+                                <div class="flex flex-1 flex-row category-item">
+                                    <mat-checkbox disableRipple class="example-margin">Personal Effectiveness</mat-checkbox>
+                                </div>
+                            </div>
+                        
                     </mat-expansion-panel>
                 </mat-accordion>
             </div>
@@ -64,7 +95,32 @@
                                 Competency Sub-Theme
                             </mat-panel-title>
                         </mat-expansion-panel-header>
-                        <p>I'm visible because I am open</p>
+                        <div class="search-container">
+                            <div class="rsearch"><mat-icon
+                                class="color-60 search-icon mat-icon notranslate material-icons mat-icon-no-color">search</mat-icon>
+                            <input class="sinput color-60" label="" placeholder="Enter competency sub-theme" type="Standard">
+                            </div>
+                        </div>
+                        <div class="category-content">
+                            <div class="flex flex-1 flex-row category-item">
+                                <mat-checkbox disableRipple class="example-margin">Diversity & Inclusion</mat-checkbox>
+                            </div>
+                            <div class="flex flex-1 flex-row category-item">
+                                <mat-checkbox disableRipple class="example-margin">Personal Effectiveness</mat-checkbox>
+                            </div>
+                            <div class="flex flex-1 flex-row category-item">
+                                <mat-checkbox disableRipple class="example-margin">Solution Orientation</mat-checkbox>
+                            </div>
+                            <div class="flex flex-1 flex-row category-item">
+                                <mat-checkbox disableRipple class="example-margin">Communication</mat-checkbox>
+                            </div>
+                            <div class="flex flex-1 flex-row category-item">
+                                <mat-checkbox disableRipple class="example-margin">Creativity & innovation</mat-checkbox>
+                            </div>
+                            <div class="flex flex-1 flex-row category-item">
+                                <mat-checkbox disableRipple class="example-margin">Personal Effectiveness</mat-checkbox>
+                            </div>
+                        </div>
                     </mat-expansion-panel>
                 </mat-accordion>
             </div>
@@ -77,7 +133,26 @@
                                 Provider
                             </mat-panel-title>
                         </mat-expansion-panel-header>
-                        <p>I'm visible because I am open</p>
+                        <div class="category-content">
+                            <div class="flex flex-1 flex-row category-item">
+                                <mat-checkbox disableRipple class="example-margin">Diversity & Inclusion</mat-checkbox>
+                            </div>
+                            <div class="flex flex-1 flex-row category-item">
+                                <mat-checkbox disableRipple class="example-margin">Personal Effectiveness</mat-checkbox>
+                            </div>
+                            <div class="flex flex-1 flex-row category-item">
+                                <mat-checkbox disableRipple class="example-margin">Solution Orientation</mat-checkbox>
+                            </div>
+                            <div class="flex flex-1 flex-row category-item">
+                                <mat-checkbox disableRipple class="example-margin">Communication</mat-checkbox>
+                            </div>
+                            <div class="flex flex-1 flex-row category-item">
+                                <mat-checkbox disableRipple class="example-margin">Creativity & innovation</mat-checkbox>
+                            </div>
+                            <div class="flex flex-1 flex-row category-item">
+                                <mat-checkbox disableRipple class="example-margin">Personal Effectiveness</mat-checkbox>
+                            </div>
+                        </div>
                     </mat-expansion-panel>
                 </mat-accordion>
             </div>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.scss b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.scss
index 2143b11f0..735902c53 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.scss
@@ -6,7 +6,7 @@
     top: 0;
     left: 0;
     right: 0;
-    z-index: 1;
+    z-index: 1000;
 }
 .filter {
     height: 100%;
@@ -110,4 +110,51 @@
 .category-item {
     color: rgba(0,0,0,0.6);
     padding: 12px 0;
+}
+
+
+/** Search **/
+
+.rsearch {
+    position: relative;
+    margin-top: 10px;
+}
+
+.search {
+    margin-left: 16px;
+    width: 78%;
+}
+
+.search-icon {
+    position: absolute;
+    top: 16px;
+    font-size: 20px;
+    left: 10px;
+}
+
+.sinput {
+    border-radius: 63px;
+    border: 1px solid #d5d0d0;
+    padding: 6px 36px;
+    font: 400 14px Lato;
+    width: 250px;
+    height: 32px;
+}
+
+.filter .category-content {
+    max-height: 232px;
+    overflow-y: auto;
+}
+
+::-webkit-scrollbar {
+    width: 2px;
+}
+
+::-webkit-scrollbar-track {
+    -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
+}
+
+::-webkit-scrollbar-thumb {
+  background-color: darkgrey;
+  outline: 1px solid slategrey;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
index d1cdb9367..2af88dd14 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
@@ -1,11 +1,8 @@
 <div class="flex flex-1 flex-row search-container">
-    <div class="selectWrapper">
-        <select class="selectBox" (change)="showDialogBox()">
-            <option>Designation</option>
-            <option>All Users</option>
-            <option>Custom Users</option>
-        </select>
-    </div>
+    <!-- Category Drop down -->
+    <ng-container>
+        <ws-app-category-drop-down [categoryData]="categoryData" (closeDropDown)="closeDropDown($event)"></ws-app-category-drop-down>
+    </ng-container>
     <div class="search">
         <div class="rsearch"><mat-icon
                 class="color-60 search-icon mat-icon notranslate material-icons mat-icon-no-color">search</mat-icon>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.scss b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.scss
index d4da7fe12..fd98a7d73 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.scss
@@ -2,34 +2,6 @@
     margin-top:20px;
 }
 
-.selectWrapper {
-    border-radius: 4px;
-    display: inline-block;
-    overflow: hidden;
-    width: 11%;
-}
-
-.selectBox {
-    width: 192px;
-    height: 48px;
-    border: 0px;
-    outline: none;
-    background: none;
-}
-
-select {
-    -webkit-appearance: none;
-    -moz-appearance: none;
-    background: transparent !important;
-    background-image: url("data:image/svg+xml;utf8,<svg fill='black' height='24' viewBox='0 0 24 24' width='24' xmlns='http://www.w3.org/2000/svg'><path d='M7 10l5 5 5-5z'/><path d='M0 0h24v24H0z' fill='none'/></svg>") !important;
-    background-repeat: no-repeat !important;
-    background-position-x: 100% !important;
-    background-position-y: 10px !important;
-    border: 1px solid rgba(0, 0, 0, 0.16) !important;
-    border-radius: 2px !important;
-    padding: 1rem !important;
-}
-
 .rsearch {
     position: relative;
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index a4201121a..62f6d5b30 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -1,7 +1,6 @@
-import { Component, Inject, OnInit } from '@angular/core'
-import { MatDialog } from '@angular/material'
+import { Component, Input, Inject, OnInit } from '@angular/core'
 import { DOCUMENT } from '@angular/common'
-import { ConfirmationBoxComponent } from '../confirmation-box/confirmation.box.component'
+
 
 @Component({
   selector: 'ws-app-search',
@@ -9,8 +8,9 @@ import { ConfirmationBoxComponent } from '../confirmation-box/confirmation.box.c
   styleUrls: ['./search.component.scss'],
 })
 export class SearchComponent implements OnInit {
+  @Input() categoryData:any = [];
   filterVisibilityFlag = false
-  constructor(public dialog: MatDialog, @Inject(DOCUMENT) private document: Document) { }
+  constructor(@Inject(DOCUMENT) private document: Document) { }
 
   ngOnInit() {
   }
@@ -32,21 +32,4 @@ export class SearchComponent implements OnInit {
     }
   }
 
-  showDialogBox() {
-    const dialogRef = this.dialog.open(ConfirmationBoxComponent, {
-      data: {
-        type: 'progress',
-        icon: 'close',
-        title: 'You are attempting to change the selected user type?',
-        subTitle: 'By selecting all users, you\'ve selected all the users from your Department of fisheries.',
-        primaryAction: 'I understand, change user type',
-        secondaryAction: 'Cancel',
-      },
-    })
-
-    dialogRef.afterClosed().subscribe(() => {
-      // console.log('The dialog was closed');
-    })
-  }
-
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
index 4ffefb0e8..82bf08959 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
@@ -1,148 +1,2355 @@
-<div class="flex flex-4 flex-row card-grid">
-    <div class="flex flex-3 flex-row card-grid-container">
-        <div class="flex flex-1 course-card">
-            <mat-card class="card-standard-container mr-5 padding-remove">
-                <div class="display-contents">
-                    <ng-container>
-                        <a>
-                            <ng-container>
-                                <mat-card-content class="min-top">
-                                    <div style="position: relative; z-index: 1;">
-                                        <ng-container>
-                                            <div class="card-select-box">
-                                                <mat-checkbox class="card-select-check"></mat-checkbox>
-                                            </div>
-                                            <img mat-card-image loading="lazy"
-                                                class="card-img ws-mat-primary-lite-background margin-remove" />
-                                        </ng-container>
-                                    </div>
-                                    <div class="padding-m">
-                                        <div class="course_widget flex margin-remove">
-                                            <div class="flex flex-end course_v2">
-                                                <mat-icon
-                                                    class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                Course
-                                            </div>
-                                        </div>
-                                        <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                            BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                        </div>
-                                        <div class="flex w-full flex-wrap flex-middle">
-                                            <div class="course_logo_box">
-                                                <img class="source-icon" />
-                                            </div>
-                                            <span class="org-text">By Karmayogi Bharat</span>
-                                        </div>
-                                        <div class="flex flex-middle rating-session margin-top-m">
-                                            <div class="flex flex-middle">
-                                                <mat-icon class="mr-1">star</mat-icon>
-                                                <span>4.5</span>
-                                            </div>
-                                            <ng-container>
-                                                <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                            </ng-container>
-                                        </div>
-                                    </div>
-                                </mat-card-content>
-                            </ng-container>
-                        </a>
-                    </ng-container>
-                </div>
-            </mat-card>
+<ng-container *ngIf="cardSize === 3">
+    <div class="flex flex-4 flex-row card-grid">
+        <div class="flex flex-3 flex-row card-grid-container">
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                            <ng-container>
+                                                <div class="card-select-box" *ngIf="checkboxVisibility">
+                                                    <mat-checkbox class="card-select-check"></mat-checkbox>
+                                                </div>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                              <ng-container>
+                                                <div class="card-select-box" *ngIf="checkboxVisibility">
+                                                    <mat-checkbox class="card-select-check"></mat-checkbox>
+                                                </div>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                              <ng-container>
+                                                <div class="card-select-box" *ngIf="checkboxVisibility">
+                                                    <mat-checkbox class="card-select-check"></mat-checkbox>
+                                                </div>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            
+        </div>
+    </div>
+    <div class="flex flex-4 flex-row card-grid">
+        <div class="flex flex-3 flex-row card-grid-container">
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                              <ng-container>
+                                                <div class="card-select-box" *ngIf="checkboxVisibility">
+                                                    <mat-checkbox class="card-select-check"></mat-checkbox>
+                                                </div>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                            <ng-container>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                            <ng-container>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+        </div>
+    </div>
+    <div class="flex flex-4 flex-row card-grid">
+        <div class="flex flex-3 flex-row card-grid-container">
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                              <ng-container>
+                                                <div class="card-select-box" *ngIf="checkboxVisibility">
+                                                    <mat-checkbox class="card-select-check"></mat-checkbox>
+                                                </div>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                            <ng-container>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                            <ng-container>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+        </div>
+    </div>
+    <div class="flex flex-4 flex-row card-grid">
+        <div class="flex flex-3 flex-row card-grid-container">
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                              <ng-container>
+                                                <div class="card-select-box" *ngIf="checkboxVisibility">
+                                                    <mat-checkbox class="card-select-check"></mat-checkbox>
+                                                </div>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                            <ng-container>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                            <ng-container>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+        </div>
+    </div>
+</ng-container>
+<ng-container *ngIf="cardSize === 4">
+    <div class="flex flex-4 flex-row card-grid">
+        <div class="flex flex-3 flex-row card-grid-container">
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                              <ng-container>
+                                                <div class="card-select-box" *ngIf="checkboxVisibility">
+                                                    <mat-checkbox class="card-select-check"></mat-checkbox>
+                                                </div>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                            <ng-container>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                            <ng-container>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                            <ng-container>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+        </div>
+    </div>
+    <div class="flex flex-4 flex-row card-grid">
+        <div class="flex flex-3 flex-row card-grid-container">
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                              <ng-container>
+                                                <div class="card-select-box" *ngIf="checkboxVisibility">
+                                                    <mat-checkbox class="card-select-check"></mat-checkbox>
+                                                </div>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                            <ng-container>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                            <ng-container>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                            <ng-container>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
         </div>
-        <div class="flex flex-1 course-card">
-            <mat-card class="card-standard-container mr-5 padding-remove">
-                <div class="display-contents">
-                    <ng-container>
-                        <a>
-                            <ng-container>
-                                <mat-card-content class="min-top">
-                                    <div style="position: relative; z-index: 1;">
-                                        <ng-container>
-                                            <img mat-card-image loading="lazy"
-                                                class="card-img ws-mat-primary-lite-background margin-remove" />
-                                        </ng-container>
-                                    </div>
-                                    <div class="padding-m">
-                                        <div class="course_widget flex margin-remove">
-                                            <div class="flex flex-end course_v2">
-                                                <mat-icon
-                                                    class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                Course
-                                            </div>
-                                        </div>
-                                        <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                            BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                        </div>
-                                        <div class="flex w-full flex-wrap flex-middle">
-                                            <div class="course_logo_box">
-                                                <img class="source-icon" />
-                                            </div>
-                                            <span class="org-text">By Karmayogi Bharat</span>
-                                        </div>
-                                        <div class="flex flex-middle rating-session margin-top-m">
-                                            <div class="flex flex-middle">
-                                                <mat-icon class="mr-1">star</mat-icon>
-                                                <span>4.5</span>
-                                            </div>
-                                            <ng-container>
-                                                <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                            </ng-container>
-                                        </div>
-                                    </div>
-                                </mat-card-content>
-                            </ng-container>
-                        </a>
-                    </ng-container>
-                </div>
-            </mat-card>
+    </div>
+    <div class="flex flex-4 flex-row card-grid">
+        <div class="flex flex-3 flex-row card-grid-container">
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                              <ng-container>
+                                                <div class="card-select-box" *ngIf="checkboxVisibility">
+                                                    <mat-checkbox class="card-select-check"></mat-checkbox>
+                                                </div>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                            <ng-container>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                            <ng-container>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                            <ng-container>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
         </div>
-        <div class="flex flex-1 course-card">
-            <mat-card class="card-standard-container mr-5 padding-remove">
-                <div class="display-contents">
-                    <ng-container>
-                        <a>
-                            <ng-container>
-                                <mat-card-content class="min-top">
-                                    <div style="position: relative; z-index: 1;">
-                                        <ng-container>
-                                            <img mat-card-image loading="lazy"
-                                                class="card-img ws-mat-primary-lite-background margin-remove" />
-                                        </ng-container>
-                                    </div>
-                                    <div class="padding-m">
-                                        <div class="course_widget flex margin-remove">
-                                            <div class="flex flex-end course_v2">
-                                                <mat-icon
-                                                    class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                Course
-                                            </div>
-                                        </div>
-                                        <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                            BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                        </div>
-                                        <div class="flex w-full flex-wrap flex-middle">
-                                            <div class="course_logo_box">
-                                                <img class="source-icon" />
-                                            </div>
-                                            <span class="org-text">By Karmayogi Bharat</span>
-                                        </div>
-                                        <div class="flex flex-middle rating-session margin-top-m">
-                                            <div class="flex flex-middle">
-                                                <mat-icon class="mr-1">star</mat-icon>
-                                                <span>4.5</span>
-                                            </div>
-                                            <ng-container>
-                                                <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                            </ng-container>
-                                        </div>
-                                    </div>
-                                </mat-card-content>
-                            </ng-container>
-                        </a>
-                    </ng-container>
-                </div>
-            </mat-card>
+    </div>
+    <div class="flex flex-4 flex-row card-grid">
+        <div class="flex flex-3 flex-row card-grid-container">
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                              <ng-container>
+                                                <div class="card-select-box" *ngIf="checkboxVisibility">
+                                                    <mat-checkbox class="card-select-check"></mat-checkbox>
+                                                </div>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                            <ng-container>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                            <ng-container>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                            <ng-container>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+        </div>
+    </div>
+</ng-container>
+<ng-container *ngIf="cardSize === 5">
+    <div class="flex flex-4 flex-row card-grid">
+        <div class="flex flex-3 flex-row card-grid-container">
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                              <ng-container>
+                                                <div class="card-select-box" *ngIf="checkboxVisibility">
+                                                    <mat-checkbox class="card-select-check"></mat-checkbox>
+                                                </div>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                            <ng-container>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                            <ng-container>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                            <ng-container>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                            <ng-container>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+        </div>
+    </div>
+    <div class="flex flex-4 flex-row card-grid">
+        <div class="flex flex-3 flex-row card-grid-container">
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                              <ng-container>
+                                                <div class="card-select-box" *ngIf="checkboxVisibility">
+                                                    <mat-checkbox class="card-select-check"></mat-checkbox>
+                                                </div>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                            <ng-container>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                            <ng-container>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                            <ng-container>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                            <ng-container>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+        </div>
+    </div>
+    
+    <div class="flex flex-4 flex-row card-grid">
+        <div class="flex flex-3 flex-row card-grid-container">
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                              <ng-container>
+                                                <div class="card-select-box" *ngIf="checkboxVisibility">
+                                                    <mat-checkbox class="card-select-check"></mat-checkbox>
+                                                </div>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                            <ng-container>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                            <ng-container>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                            <ng-container>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                            <ng-container>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+        </div>
+    </div>
+    <div class="flex flex-4 flex-row card-grid">
+        <div class="flex flex-3 flex-row card-grid-container">
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                              <ng-container>
+                                                <div class="card-select-box" *ngIf="checkboxVisibility">
+                                                    <mat-checkbox class="card-select-check"></mat-checkbox>
+                                                </div>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                            <ng-container>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                            <ng-container>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                            <ng-container>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
+            <div class="flex  course-card">
+                <mat-card class="card-standard-container mr-5 padding-remove">
+                    <div class="display-contents">
+                        <ng-container>
+                            <a>
+                                <ng-container>
+                                    <mat-card-content class="min-top">
+                                        <div style="position: relative; z-index: 1;">
+                                            <ng-container>
+                                                <img mat-card-image loading="lazy"
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                            </ng-container>
+                                        </div>
+                                        <div class="padding-m">
+                                            <div class="course_widget flex margin-remove">
+                                                <div class="flex flex-end course_v2">
+                                                    <mat-icon
+                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                                    Course
+                                                </div>
+                                            </div>
+                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                            </div>
+                                            <div class="flex w-full flex-wrap flex-middle">
+                                                <div class="course_logo_box">
+                                                    <img class="source-icon" />
+                                                </div>
+                                                <span class="org-text">By Karmayogi Bharat</span>
+                                            </div>
+                                            <div class="flex flex-middle rating-session margin-top-m">
+                                                <div class="flex flex-middle">
+                                                    <mat-icon class="mr-1">star</mat-icon>
+                                                    <span>4.5</span>
+                                                </div>
+                                                <ng-container>
+                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                                </ng-container>
+                                            </div>
+                                        </div>
+                                    </mat-card-content>
+                                </ng-container>
+                            </a>
+                        </ng-container>
+                    </div>
+                </mat-card>
+            </div>
         </div>
     </div>
-</div>
+</ng-container>
+
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
index b53863da0..80f16a908 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
@@ -11,7 +11,6 @@ $secondary-color: #EF951E;
 
 
 .card-grid-container {
-    width: 55%;
 }
 
 .card-standard-container {
@@ -218,9 +217,6 @@ $secondary-color: #EF951E;
   }
 }
 
-.card-standard-container:hover {
-  transform: scale(1.02);
-}
 .card-discussions-container {
   $card-padding: $size-m;
   $action-btn-size: 2.5 * $size-m;
@@ -523,20 +519,22 @@ $title-line-count: 2;
 }
 
 .course-card:first-child {
-    margin-left: 0;
+    margin-left: 5px;
 }
 
 .card-select-box {
     position: absolute;
-    background: gray;
+    background: rgb(255,255,255);
     border-radius: 4px;
     height: 32px;
     width: 32px;
     margin: 18px;
+    border: 1px solid rgba(0,0,0,0.16);
 }
 
 .card-select-check {
-    padding:6px;
+    padding:8px;
     height: 20px;
     width: 20px;
+    vertical-align: middle;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
index 341e8231a..c71bb0d65 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core'
+import { Component, Input, OnInit } from '@angular/core'
 
 @Component({
   selector: 'ws-app-standard-card',
@@ -6,7 +6,8 @@ import { Component, OnInit } from '@angular/core'
   styleUrls: ['./standard-card.component.scss'],
 })
 export class StandardCardComponent implements OnInit {
-
+  @Input() cardSize: any;
+  @Input() checkboxVisibility:any = true;
   constructor() { }
 
   ngOnInit() {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
index 25a414f36..99e45425e 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
@@ -4,6 +4,9 @@
             <ng-template mat-tab-label>
                 1. Create a plan
             </ng-template>
+            <ng-template matTabContent>
+                <ws-app-add-plan-information></ws-app-add-plan-information>
+            </ng-template>            
         </mat-tab>
         <mat-tab>
             <ng-template mat-tab-label>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.scss b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.scss
index 4f2c4f61c..126153f7a 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.scss
@@ -59,6 +59,9 @@
     display: none;
 }
 
+::ng-deep .mat-tab-body-content {
+    overflow: hidden !important;
+}
 
 
 ::ng-deep .stepper .mat-tab-label {
@@ -105,9 +108,11 @@
 
     .mat-tab-label-content {
         background-color: #373434;
-        color: white;
+        color: white !important;
         width: 100%;
         height: 100%;
+        font-size: 14px !important;
+        letter-spacing: 0.25;
     }
 }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
index 12c922f9f..dab8e2326 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
@@ -1,49 +1,286 @@
 <div class="flex flex-4 flex-row assignee-card-container">
-    <div class="flex flex-1 assignee-card">
+    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
         <div class="avatar">
             <div>HG</div>
         </div>
         <div class="assignee-desc">
             <p>Heading</p>
-            <p>Subheading</p>
+            <p class="sub-heading">Subheading</p>
         </div>
-        <div class="check-action">
+        <div class="check-action" *ngIf="checkboxVisibility">
             <mat-checkbox class="example-margin"></mat-checkbox>
         </div>
     </div>
-    <div class="flex flex-1 assignee-card">
+     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
         <div class="avatar">
             <div>HG</div>
         </div>
         <div class="assignee-desc">
             <p>Heading</p>
-            <p>Subheading</p>
+            <p class="sub-heading">Subheading</p>
         </div>
-        <div class="check-action">
+        <div class="check-action" *ngIf="checkboxVisibility">
             <mat-checkbox class="example-margin"></mat-checkbox>
         </div>
     </div>
-    <div class="flex flex-1 assignee-card">
+     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
         <div class="avatar">
             <div>HG</div>
         </div>
         <div class="assignee-desc">
             <p>Heading</p>
-            <p>Subheading</p>
+            <p class="sub-heading">Subheading</p>
         </div>
-        <div class="check-action">
+        <div class="check-action" *ngIf="checkboxVisibility">
             <mat-checkbox class="example-margin"></mat-checkbox>
         </div>
     </div>
-    <div class="flex flex-1 assignee-card">
+     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
         <div class="avatar">
             <div>HG</div>
         </div>
         <div class="assignee-desc">
             <p>Heading</p>
-            <p>Subheading</p>
+            <p class="sub-heading">Subheading</p>
         </div>
-        <div class="check-action">
+        <div class="check-action" *ngIf="checkboxVisibility">
+            <mat-checkbox class="example-margin"></mat-checkbox>
+        </div>
+    </div>
+</div>
+<div class="flex flex-4 flex-row assignee-card-container">
+     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+        <div class="avatar">
+            <div>HG</div>
+        </div>
+        <div class="assignee-desc">
+            <p>Heading</p>
+            <p class="sub-heading">Subheading</p>
+        </div>
+        <div class="check-action" *ngIf="checkboxVisibility">
+            <mat-checkbox class="example-margin"></mat-checkbox>
+        </div>
+    </div>
+     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+        <div class="avatar">
+            <div>HG</div>
+        </div>
+        <div class="assignee-desc">
+            <p>Heading</p>
+            <p class="sub-heading">Subheading</p>
+        </div>
+        <div class="check-action" *ngIf="checkboxVisibility">
+            <mat-checkbox class="example-margin"></mat-checkbox>
+        </div>
+    </div>
+     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+        <div class="avatar">
+            <div>HG</div>
+        </div>
+        <div class="assignee-desc">
+            <p>Heading</p>
+            <p class="sub-heading">Subheading</p>
+        </div>
+        <div class="check-action" *ngIf="checkboxVisibility">
+            <mat-checkbox class="example-margin"></mat-checkbox>
+        </div>
+    </div>
+     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+        <div class="avatar">
+            <div>HG</div>
+        </div>
+        <div class="assignee-desc">
+            <p>Heading</p>
+            <p class="sub-heading">Subheading</p>
+        </div>
+        <div class="check-action" *ngIf="checkboxVisibility">
+            <mat-checkbox class="example-margin"></mat-checkbox>
+        </div>
+    </div>
+</div>
+<div class="flex flex-4 flex-row assignee-card-container">
+     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+        <div class="avatar">
+            <div>HG</div>
+        </div>
+        <div class="assignee-desc">
+            <p>Heading</p>
+            <p class="sub-heading">Subheading</p>
+        </div>
+        <div class="check-action" *ngIf="checkboxVisibility">
+            <mat-checkbox class="example-margin"></mat-checkbox>
+        </div>
+    </div>
+     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+        <div class="avatar">
+            <div>HG</div>
+        </div>
+        <div class="assignee-desc">
+            <p>Heading</p>
+            <p class="sub-heading">Subheading</p>
+        </div>
+        <div class="check-action" *ngIf="checkboxVisibility">
+            <mat-checkbox class="example-margin"></mat-checkbox>
+        </div>
+    </div>
+     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+        <div class="avatar">
+            <div>HG</div>
+        </div>
+        <div class="assignee-desc">
+            <p>Heading</p>
+            <p class="sub-heading">Subheading</p>
+        </div>
+        <div class="check-action" *ngIf="checkboxVisibility">
+            <mat-checkbox class="example-margin"></mat-checkbox>
+        </div>
+    </div>
+     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+        <div class="avatar">
+            <div>HG</div>
+        </div>
+        <div class="assignee-desc">
+            <p>Heading</p>
+            <p class="sub-heading">Subheading</p>
+        </div>
+        <div class="check-action" *ngIf="checkboxVisibility">
+            <mat-checkbox class="example-margin"></mat-checkbox>
+        </div>
+    </div>
+</div>
+<div class="flex flex-4 flex-row assignee-card-container">
+     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+        <div class="avatar">
+            <div>HG</div>
+        </div>
+        <div class="assignee-desc">
+            <p>Heading</p>
+            <p class="sub-heading">Subheading</p>
+        </div>
+        <div class="check-action" *ngIf="checkboxVisibility">
+            <mat-checkbox class="example-margin"></mat-checkbox>
+        </div>
+    </div>
+     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+        <div class="avatar">
+            <div>HG</div>
+        </div>
+        <div class="assignee-desc">
+            <p>Heading</p>
+            <p class="sub-heading">Subheading</p>
+        </div>
+        <div class="check-action" *ngIf="checkboxVisibility">
+            <mat-checkbox class="example-margin"></mat-checkbox>
+        </div>
+    </div>
+     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+        <div class="avatar">
+            <div>HG</div>
+        </div>
+        <div class="assignee-desc">
+            <p>Heading</p>
+            <p class="sub-heading">Subheading</p>
+        </div>
+        <div class="check-action" *ngIf="checkboxVisibility">
+            <mat-checkbox class="example-margin"></mat-checkbox>
+        </div>
+    </div>
+     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+        <div class="avatar">
+            <div>HG</div>
+        </div>
+        <div class="assignee-desc">
+            <p>Heading</p>
+            <p class="sub-heading">Subheading</p>
+        </div>
+        <div class="check-action" *ngIf="checkboxVisibility">
+            <mat-checkbox class="example-margin"></mat-checkbox>
+        </div>
+    </div>
+</div>
+<div class="flex flex-4 flex-row assignee-card-container">
+     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+        <div class="avatar">
+            <div>HG</div>
+        </div>
+        <div class="assignee-desc">
+            <p>Heading</p>
+            <p class="sub-heading">Subheading</p>
+        </div>
+        <div class="check-action" *ngIf="checkboxVisibility">
+            <mat-checkbox class="example-margin"></mat-checkbox>
+        </div>
+    </div>
+     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+        <div class="avatar">
+            <div>HG</div>
+        </div>
+        <div class="assignee-desc">
+            <p>Heading</p>
+            <p class="sub-heading">Subheading</p>
+        </div>
+        <div class="check-action" *ngIf="checkboxVisibility">
+            <mat-checkbox class="example-margin"></mat-checkbox>
+        </div>
+    </div>
+     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+        <div class="avatar">
+            <div>HG</div>
+        </div>
+        <div class="assignee-desc">
+            <p>Heading</p>
+            <p class="sub-heading">Subheading</p>
+        </div>
+        <div class="check-action" *ngIf="checkboxVisibility">
+            <mat-checkbox class="example-margin"></mat-checkbox>
+        </div>
+    </div>
+     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+        <div class="avatar">
+            <div>HG</div>
+        </div>
+        <div class="assignee-desc">
+            <p>Heading</p>
+            <p class="sub-heading">Subheading</p>
+        </div>
+        <div class="check-action" *ngIf="checkboxVisibility">
+            <mat-checkbox class="example-margin"></mat-checkbox>
+        </div>
+    </div>
+</div>
+
+<!-- Custom User Card-->
+
+<div class="flex flex-4 flex-row custom-user-card-container">
+    <div class="flex flex-4 custom-user-card active">        
+        <div class="custom-user-desc">
+            <p>Heading</p>
+        </div>
+        <div class="check-action" *ngIf="checkboxVisibility">
+            <mat-checkbox class="example-margin"></mat-checkbox>
+        </div>
+    </div>
+    <div class="flex flex-4 custom-user-card">        
+        <div class="custom-user-desc">
+            <p>Heading</p>
+        </div>
+        <div class="check-action" *ngIf="checkboxVisibility">
+            <mat-checkbox class="example-margin"></mat-checkbox>
+        </div>
+    </div>
+    <div class="flex flex-4 custom-user-card">        
+        <div class="custom-user-desc">
+            <p>Heading</p>
+        </div>
+        <div class="check-action" *ngIf="checkboxVisibility">
+            <mat-checkbox class="example-margin"></mat-checkbox>
+        </div>
+    </div>
+    <div class="flex flex-4 custom-user-card">        
+        <div class="custom-user-desc">
+            <p>Heading</p>
+        </div>
+        <div class="check-action" *ngIf="checkboxVisibility">
             <mat-checkbox class="example-margin"></mat-checkbox>
         </div>
     </div>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
index ea80b8093..d1cb9c1f5 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
@@ -9,6 +9,15 @@
     margin-left: 20px;
 }
 
+.assignee-card-without-checkbox {
+    background-color: rgb(240,240,240);
+    width: 325px;
+    border: none !important;
+    border-radius: 4px;
+    padding: 22px 12px !important;
+    margin-left: 20px;
+}
+
 .assignee-card:first-child {
     margin-left: 0;
 }
@@ -32,14 +41,58 @@
     width: 230px;
 }
 
+.assignee-desc .sub-heading {
+    font-size: 14px;
+    color: rgb(0,0,0,0.6);
+}
+
 
 .assignee-desc p {
     padding: 0;
     margin: 0;
 }
 
-.check-action {
+.assignee-card-container .check-action {
     margin-top: 12px;
     margin-right: 16px;
 
+}
+
+/** Custom User **/
+
+.custom-user-card-container {
+    margin-top:20px
+}
+.custom-user-card {
+    width: 325px;
+    border: 1px solid rgba(0, 0, 0, 0.16);
+    border-radius: 4px;
+    padding: 24px 16px;
+    margin-left: 20px;
+}
+
+.custom-user-card.active {
+    border: 1px solid #1B4CA1;
+}
+
+.custom-user-card:first-child {
+    margin-left: 0;
+}
+
+.custom-user-desc {
+    display: flex;
+    flex-direction: column;
+    padding: 0 16px;
+    width: 230px;
+}
+
+
+.custom-user-desc p {
+    padding: 0;
+    margin: 0;
+}
+
+.custom-user-card-container .check-action {
+    margin-right: 16px;
+
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
index 823c9334b..c5a467be2 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core'
+import { Component, Input, OnInit } from '@angular/core'
 
 @Component({
   selector: 'ws-app-user-card',
@@ -6,7 +6,7 @@ import { Component, OnInit } from '@angular/core'
   styleUrls: ['./user-card.component.scss'],
 })
 export class UserCardComponent implements OnInit {
-
+  @Input() checkboxVisibility:boolean = true;
   constructor() { }
 
   ngOnInit() {
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
index 22ce7e271..6d59e70f5 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
@@ -1,5 +1,5 @@
 <ng-container>
-    <ws-app-search></ws-app-search>
+    <ws-app-search [categoryData]="categoryData"></ws-app-search>
 </ng-container>
 <ng-container>
     <ws-app-chip></ws-app-chip>
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
index c6ad953de..965579b3b 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
@@ -6,10 +6,27 @@ import { Component, OnInit } from '@angular/core'
   styleUrls: ['./create-assignee.component.scss'],
 })
 export class CreateAssigneeComponent implements OnInit {
-
+  categoryData:any[] = []
   constructor() { }
 
   ngOnInit() {
+    this.categoryData = [
+      {
+       'id':1,
+       'name':'Designation',
+       'value':'Designation'
+      },
+      {
+        'id':2,
+        'name':'All Users',
+        'value':'All Users'
+      },
+      {
+        'id':3,
+        'name':'Custom Users',
+        'value':'Custom Users'
+      }
+    ]
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
index 92f2d712f..9c9b81a19 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
@@ -1,12 +1,12 @@
 <ng-container>
-    <ws-app-search></ws-app-search>
+    <ws-app-search [categoryData]="categoryData"></ws-app-search>
 </ng-container>
 
 <ng-container>
     <div class="flex flex-2 flex-row">
         <div>
             <ws-app-chip></ws-app-chip>
-            <ws-app-standard-card></ws-app-standard-card>
+            <ws-app-standard-card [cardSize]="3"></ws-app-standard-card>
         </div>
         <div>
             <ws-app-competency-summary></ws-app-competency-summary>
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
index 3de3c03dd..ab4535401 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
@@ -6,10 +6,37 @@ import { Component, OnInit } from '@angular/core'
   styleUrls: ['./create-content.component.scss'],
 })
 export class CreateContentComponent implements OnInit {
-
+  categoryData:any[] = []
   constructor() { }
 
   ngOnInit() {
+    this.categoryData = [
+      {
+       'id':1,
+       'name':'Course',
+       'value':'Course'
+      },
+      {
+        'id':2,
+        'name':'Program',
+        'value':'Program'
+      },
+      {
+        'id':3,
+        'name':'Blended program',
+        'value':'Blended program'
+      },
+      {
+        'id':4,
+        'name':'Curated program',
+        'value':'Curated program'
+      },
+      {
+        'id':5,
+        'name':'Moderated Course',
+        'value':'Moderated Course'
+      }
+    ]
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
index 3fb06a1f2..b307cf011 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
@@ -1,14 +1,4 @@
 <div class="plan-container">
-    
-    <!-- <ws-app-search></ws-app-search>
-    <div class="flex flex-2 flex-row">
-        <div>
-            <ws-app-chip></ws-app-chip>
-        </div>
-        <div>
-            <ws-app-competency-summary></ws-app-competency-summary>
-        </div>
-    </div>
-    
-    <ws-app-standard-card></ws-app-standard-card> -->
+     <ws-app-breadcrumb></ws-app-breadcrumb>
+    <ws-app-stepper></ws-app-stepper>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
index 01b0b2d75..1e9607a9c 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
@@ -5,18 +5,18 @@
     <div class="mt-48">
         <div class="flex flex-row flex-2">
             <div class="mat-subheading-1 left-heading">Selected Cards</div>
-            <div class="mat-subheading-2 right-heading">Show all > </div>
+            <div (click)="showAll()" class="mat-subheading-2 right-heading cursor-pointer show-all">Show all <img src="assets/icons/forward_arrow.svg"/> </div>
         </div>
         
     </div>
-    <ws-app-standard-card></ws-app-standard-card>
+    <ws-app-standard-card [cardSize]="5" [checkboxVisibility]="false"></ws-app-standard-card>
 </ng-container>
 <ng-container>
     <div class="mt-32">
         <div class="flex flex-row flex-2">
             <div class="mat-subheading-1 left-heading">Selected Content</div>
-            <div class="mat-subheading-2 right-heading">Show all > </div>
+            <div (click)="showAll()" class="mat-subheading-2 right-heading cursor-pointer show-all">Show all <img src="assets/icons/forward_arrow.svg"/> </div>
         </div>
     </div>
-    <ws-app-user-card></ws-app-user-card>
+    <ws-app-user-card [checkboxVisibility]="false"></ws-app-user-card>
 </ng-container>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.scss b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.scss
index 5eb297bc9..0659cd30c 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.scss
@@ -12,4 +12,8 @@
 .right-heading {
     color: #1B4CA1;
 
+}
+
+.show-all img{
+    vertical-align: middle;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
index a363d441d..6b9ecf7ba 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
@@ -1,4 +1,5 @@
 import { Component, OnInit } from '@angular/core'
+import { Router } from '@angular/router'
 
 @Component({
   selector: 'ws-app-create-timeline',
@@ -7,9 +8,13 @@ import { Component, OnInit } from '@angular/core'
 })
 export class CreateTimelineComponent implements OnInit {
 
-  constructor() { }
+  constructor(private router: Router) { }
 
   ngOnInit() {
   }
 
+  showAll() {
+    this.router.navigateByUrl('/app/training-plan/preview-plan')
+  }
+
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
index 4eb321db0..e8f8b88f9 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
@@ -1,6 +1,9 @@
 <ws-app-breadcrumb [showBreadcrumbAction]="false"></ws-app-breadcrumb>
-<div class="flex flex-1 flex-row">
-    <div class="go-back">
-        <img src="assets/icons/close.svg">Go back 
+<div class="flex flex-1 flex-row mt-8">
+    <div class="go-back cursor-pointer" (click)="goBack()">
+        <img src="assets/icons/backwardArrow.svg"/><span>Go back </span>
     </div>
+</div>
+<div class="flex flex-1 flex-row mt-16">
+    <ws-app-standard-card [cardSize]="5"></ws-app-standard-card>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
index 31ca71e88..fbdfced05 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
@@ -1,4 +1,5 @@
 import { Component, OnInit } from '@angular/core'
+import { Router } from '@angular/router'
 
 @Component({
   selector: 'ws-app-preview-plan',
@@ -7,9 +8,13 @@ import { Component, OnInit } from '@angular/core'
 })
 export class PreviewPlanComponent implements OnInit {
 
-  constructor() { }
+  constructor(private router: Router) { }
 
   ngOnInit() {
   }
 
+  goBack() {
+    this.router.navigateByUrl('/app/training-plan/create-plan')
+  }
+
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.html b/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.html
index b4b8bf491..be01ee04c 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.html
@@ -1,7 +1,5 @@
 <div class="container-balanced">
-  <div class="plan-container">
-    <ws-app-breadcrumb></ws-app-breadcrumb>
-    <ws-app-stepper></ws-app-stepper>
+  <div class="plan-container">   
     <router-outlet></router-outlet>
   </div>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
index 505a986cc..ec38dcb85 100644
--- a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
+++ b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
@@ -54,7 +54,8 @@ import { FilterComponent } from './components/filter/filter.component'
 import { ConfirmationBoxComponent } from './components/confirmation-box/confirmation.box.component'
 import { PreviewPlanComponent } from './routes/preview-plan/preview-plan.component'
 import { CreateContentComponent } from './routes/create-content/create-content.component'
-
+import { CategoryDropDownComponent } from './components/category-drop-down/category-drop-down.component'
+import { AddPlanInformationComponent } from './components/add-plan-information/add-plan-information.component'
 @NgModule({
   declarations: [
     TrainingPlanHomeComponent,
@@ -73,6 +74,8 @@ import { CreateContentComponent } from './routes/create-content/create-content.c
     ConfirmationBoxComponent,
     PreviewPlanComponent,
     CreateContentComponent,
+    CategoryDropDownComponent,
+    AddPlanInformationComponent
   ],
   imports: [
     CommonModule,
diff --git a/project/ws/app/src/lib/routes/training-plan/training-plan.routing.module.ts b/project/ws/app/src/lib/routes/training-plan/training-plan.routing.module.ts
index 6d6cf1097..fed48982e 100644
--- a/project/ws/app/src/lib/routes/training-plan/training-plan.routing.module.ts
+++ b/project/ws/app/src/lib/routes/training-plan/training-plan.routing.module.ts
@@ -3,6 +3,7 @@ import { Routes, RouterModule } from '@angular/router'
 import { ConfigResolveService } from './resolvers/config-resolve.service'
 import { TrainingPlanHomeComponent } from './routes/training-plan-home/training-plan-home.component'
 import { CreatePlanComponent } from './routes/create-plan/create-plan.component'
+import { PreviewPlanComponent } from './routes/preview-plan/preview-plan.component'
 
 const routes: Routes = [
   {
@@ -25,6 +26,14 @@ const routes: Routes = [
           module: 'Create Plan',
         },
       },
+      {
+        path: 'preview-plan',
+        component: PreviewPlanComponent,
+        data: {
+          pageId: 'preview-plan',
+          module: 'Preview Plan',
+        },
+      },
     ],
   },
 ]

From 7d210dcf5a993bdab3026a01b249582d22743e1e Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Fri, 8 Dec 2023 18:27:30 +0530
Subject: [PATCH 317/887] add ui element for create plan, filter, preview,
 dialog box, cards enhancement, linking of actions, breadcrumb

---
 .../add-plan-information.component.spec.ts    |  28 ++--
 .../add-plan-information.component.ts         |   4 +-
 .../breadcrumb/breadcrumb.component.ts        |  71 +++++----
 .../category-drop-down.component.spec.ts      |  28 ++--
 .../category-drop-down.component.ts           | 140 +++++++++---------
 .../components/chip/chip.component.ts         |   2 +-
 .../components/search/search.component.ts     |   3 +-
 .../standard-card/standard-card.component.ts  |   4 +-
 .../user-card/user-card.component.ts          |   2 +-
 .../create-assignee.component.ts              |  22 +--
 .../create-content.component.ts               |  34 ++---
 .../training-plan/training-plan.module.ts     |   2 +-
 12 files changed, 169 insertions(+), 171 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.spec.ts b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.spec.ts
index 3a9f30a9b..871e04b05 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.spec.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.spec.ts
@@ -1,25 +1,25 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
 
-import { AddPlanInformationComponent } from './add-plan-information.component';
+import { AddPlanInformationComponent } from './add-plan-information.component'
 
 describe('AddPlanInformationComponent', () => {
-  let component: AddPlanInformationComponent;
-  let fixture: ComponentFixture<AddPlanInformationComponent>;
+  let component: AddPlanInformationComponent
+  let fixture: ComponentFixture<AddPlanInformationComponent>
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ AddPlanInformationComponent ]
+      declarations: [AddPlanInformationComponent],
     })
-    .compileComponents();
-  }));
+    .compileComponents()
+  }))
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(AddPlanInformationComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+    fixture = TestBed.createComponent(AddPlanInformationComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
 
   it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
index 55338b003..f231d25a5 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
@@ -1,9 +1,9 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit } from '@angular/core'
 
 @Component({
   selector: 'ws-app-add-plan-information',
   templateUrl: './add-plan-information.component.html',
-  styleUrls: ['./add-plan-information.component.scss']
+  styleUrls: ['./add-plan-information.component.scss'],
 })
 export class AddPlanInformationComponent implements OnInit {
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
index ef9dc1d0f..4eb0fed52 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
@@ -8,60 +8,60 @@ import { ConfirmationBoxComponent } from '../confirmation-box/confirmation.box.c
   styleUrls: ['./breadcrumb.component.scss'],
 })
 export class BreadcrumbComponent implements OnInit {
-  @Input() showBreadcrumbAction = true;
-  public dialogRef:any;
-  constructor(private router: Router,public dialog: MatDialog) { }
+  @Input() showBreadcrumbAction = true
+  public dialogRef: any
+  constructor(private router: Router, public dialog: MatDialog) { }
 
   ngOnInit() {
   }
 
   cancel() {
-    this.router.navigateByUrl('app/home/training-plan-dashboard');
+    this.router.navigateByUrl('app/home/training-plan-dashboard')
   }
 
   nextStep() {
-    this.showDialogBox('progress-completed');
+    this.showDialogBox('progress-completed')
   }
 
-  performRoute(route:any) {
-    if(route === 'list') {
-      this.router.navigateByUrl('app/home/training-plan-dashboard');
+  performRoute(route: any) {
+    if (route === 'list') {
+      this.router.navigateByUrl('app/home/training-plan-dashboard')
     } else {
-      this.router.navigateByUrl('app/training-plan/'+route)
+      this.router.navigateByUrl('app/training-plan/' + route)
     }
-    
+
   }
 
-  showDialogBox(event:any) {
-    let dialogData:any = {}
-    switch(event) {
+  showDialogBox(event: any) {
+    const dialogData: any = {}
+    switch (event) {
       case 'progress':
-        dialogData['type'] = 'progress';
-        dialogData['icon'] = 'vega';
-        dialogData['title'] = 'Processing your request';
-        dialogData['subTitle'] = `Wait a second , your request is processing………`;
-      break;
+        dialogData['type'] = 'progress'
+        dialogData['icon'] = 'vega'
+        dialogData['title'] = 'Processing your request'
+        dialogData['subTitle'] = `Wait a second , your request is processing………`
+      break
       case 'progress-completed':
-        dialogData['type'] = 'progress-completed';
-        dialogData['icon'] = 'accept_icon';
-        dialogData['title'] = 'Your processing has been done.';
-        dialogData['subTitle'] = `Updated to Draft`;
-        dialogData['primaryAction'] = 'Redirecting....';
-      break;
-        dialogData['type'] = 'normal';
-        dialogData['icon'] = 'radio_on';
-        dialogData['title'] = 'You are attempting to change the selected user type?';
+        dialogData['type'] = 'progress-completed'
+        dialogData['icon'] = 'accept_icon'
+        dialogData['title'] = 'Your processing has been done.'
+        dialogData['subTitle'] = `Updated to Draft`
+        dialogData['primaryAction'] = 'Redirecting....'
+      break
+        dialogData['type'] = 'normal'
+        dialogData['icon'] = 'radio_on'
+        dialogData['title'] = 'You are attempting to change the selected user type?'
         dialogData['subTitle'] = `By selecting all users, you've selected all the users from your Department of fisheries.
-        If you want to select custom users or by designation, use the above option`;
-        dialogData['primaryAction'] = 'I understand, change user type';
-        dialogData['secondaryAction'] = 'Cancel';
-      break;
+        If you want to select custom users or by designation, use the above option`
+        dialogData['primaryAction'] = 'I understand, change user type'
+        dialogData['secondaryAction'] = 'Cancel'
+      break
     }
 
-    this.openDialoagBox(dialogData);
+    this.openDialoagBox(dialogData)
   }
 
-  openDialoagBox(dialogData:any) {
+  openDialoagBox(dialogData: any) {
     this.dialogRef = this.dialog.open(ConfirmationBoxComponent, {
       disableClose: true,
       data: {
@@ -79,8 +79,7 @@ export class BreadcrumbComponent implements OnInit {
     })
   }
 
-  hideConfirmationBox(event:any) {
-    console.log('close',event);
-    this.dialogRef.close();
+  hideConfirmationBox() {
+    this.dialogRef.close()
   }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.spec.ts b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.spec.ts
index 35251d05a..0a7ebd712 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.spec.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.spec.ts
@@ -1,25 +1,25 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
 
-import { CategoryDropDownComponent } from './category-drop-down.component';
+import { CategoryDropDownComponent } from './category-drop-down.component'
 
 describe('CategoryDropDownComponent', () => {
-  let component: CategoryDropDownComponent;
-  let fixture: ComponentFixture<CategoryDropDownComponent>;
+  let component: CategoryDropDownComponent
+  let fixture: ComponentFixture<CategoryDropDownComponent>
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ CategoryDropDownComponent ]
+      declarations: [CategoryDropDownComponent],
     })
-    .compileComponents();
-  }));
+    .compileComponents()
+  }))
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(CategoryDropDownComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+    fixture = TestBed.createComponent(CategoryDropDownComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
 
   it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
index 31194b85a..47950b3c8 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
@@ -1,97 +1,97 @@
-import { Component, EventEmitter, Input, Output, OnInit } from '@angular/core';
+import { Component, EventEmitter, Input, Output, OnInit } from '@angular/core'
 import { MatDialog } from '@angular/material'
 import { ConfirmationBoxComponent } from '../confirmation-box/confirmation.box.component'
 @Component({
   selector: 'ws-app-category-drop-down',
   templateUrl: './category-drop-down.component.html',
-  styleUrls: ['./category-drop-down.component.scss']
+  styleUrls: ['./category-drop-down.component.scss'],
 })
 export class CategoryDropDownComponent implements OnInit {
-  @Input() categoryData:any[] = [];
-  @Output() closeDropDown:any = new EventEmitter();
-  dialogRef:any;
+  @Input() categoryData: any[] = []
+  @Output() closeDropDown: any = new EventEmitter()
+  dialogRef: any
   constructor(public dialog: MatDialog) { }
 
   ngOnInit() {
   }
 
-
-  showDialogBox(event:any) {
-    let dialogData:any = {}
-    switch(event) {
+  showDialogBox(event: any) {
+    const dialogData: any = {}
+    switch (event) {
       case 'Course':
-        dialogData['type'] = 'normal';
-        dialogData['icon'] = 'radio_on';
-        dialogData['title'] = 'You are attempting to change the selected content type?';
-        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection. It's advisable to save the current one as a draft and create a new one instead.`;
-        dialogData['primaryAction'] = 'I understand, change content type';
-        dialogData['secondaryAction'] = 'Cancel';
-      break;
+        // `Changing it now will result in the loss of your current selection. It's advisable to save the current one as a draft and create a new one instead.`
+        dialogData['type'] = 'normal'
+        dialogData['icon'] = 'radio_on'
+        dialogData['title'] = 'You are attempting to change the selected content type?'
+        dialogData['subTitle'] = 'Test'
+        dialogData['primaryAction'] = 'I understand, change content type'
+        dialogData['secondaryAction'] = 'Cancel'
+      break
       case 'Program':
-        dialogData['type'] = 'normal';
-        dialogData['icon'] = 'radio_on';
-        dialogData['title'] = 'You are attempting to change the selected content type?';
-        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection. It's advisable to save the current one as a draft and create a new one instead.`;
-        dialogData['primaryAction'] = 'I understand, change content type';
-        dialogData['secondaryAction'] = 'Cancel';
-      break;
+        dialogData['type'] = 'normal'
+        dialogData['icon'] = 'radio_on'
+        dialogData['title'] = 'You are attempting to change the selected content type?'
+        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection. It's advisable to save the current one as a draft and create a new one instead.`
+        dialogData['primaryAction'] = 'I understand, change content type'
+        dialogData['secondaryAction'] = 'Cancel'
+      break
       case 'Blended program':
-        dialogData['type'] = 'normal';
-        dialogData['icon'] = 'radio_on';
-        dialogData['title'] = 'You are attempting to change the selected content type?';
-        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection. It's advisable to save the current one as a draft and create a new one instead.`;
-        dialogData['primaryAction'] = 'I understand, change content type';
-        dialogData['secondaryAction'] = 'Cancel';
-      break;
+        dialogData['type'] = 'normal'
+        dialogData['icon'] = 'radio_on'
+        dialogData['title'] = 'You are attempting to change the selected content type?'
+        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection. It's advisable to save the current one as a draft and create a new one instead.`
+        dialogData['primaryAction'] = 'I understand, change content type'
+        dialogData['secondaryAction'] = 'Cancel'
+      break
       case 'Curated program':
-        dialogData['type'] = 'normal';
-        dialogData['icon'] = 'radio_on';
-        dialogData['title'] = 'You are attempting to change the selected content type?';
-        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection. It's advisable to save the current one as a draft and create a new one instead.`;
-        dialogData['primaryAction'] = 'I understand, change content type';
-        dialogData['secondaryAction'] = 'Cancel';
-      break;
+        dialogData['type'] = 'normal'
+        dialogData['icon'] = 'radio_on'
+        dialogData['title'] = 'You are attempting to change the selected content type?'
+        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection. It's advisable to save the current one as a draft and create a new one instead.`
+        dialogData['primaryAction'] = 'I understand, change content type'
+        dialogData['secondaryAction'] = 'Cancel'
+      break
       case 'Moderated Course':
-        dialogData['type'] = 'normal';
-        dialogData['icon'] = 'radio_on';
-        dialogData['title'] = 'You are attempting to change the selected content type?';
-        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection. It's advisable to save the current one as a draft and create a new one instead.`;
-        dialogData['primaryAction'] = 'I understand, change content type';
-        dialogData['secondaryAction'] = 'Cancel';
-      break;
+        dialogData['type'] = 'normal'
+        dialogData['icon'] = 'radio_on'
+        dialogData['title'] = 'You are attempting to change the selected content type?'
+        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection. It's advisable to save the current one as a draft and create a new one instead.`
+        dialogData['primaryAction'] = 'I understand, change content type'
+        dialogData['secondaryAction'] = 'Cancel'
+      break
       case 'Designation':
-        dialogData['type'] = 'normal';
-        dialogData['icon'] = 'radio_on';
-        dialogData['title'] = 'You are attempting to change the selected user type?';
+        dialogData['type'] = 'normal'
+        dialogData['icon'] = 'radio_on'
+        dialogData['title'] = 'You are attempting to change the selected user type?'
         dialogData['subTitle'] = `By selecting all users, you've selected all the users from your Department of fisheries.
-        If you want to select custom users or by designation, use the above option`;
-        dialogData['primaryAction'] = 'I understand, change user type';
-        dialogData['secondaryAction'] = 'Cancel';
-      break;
+        If you want to select custom users or by designation, use the above option`
+        dialogData['primaryAction'] = 'I understand, change user type'
+        dialogData['secondaryAction'] = 'Cancel'
+      break
       case 'All Users':
-        dialogData['type'] = 'normal';
-        dialogData['icon'] = 'radio_on';
-        dialogData['title'] = 'You are attempting to change the selected user type?';
+        dialogData['type'] = 'normal'
+        dialogData['icon'] = 'radio_on'
+        dialogData['title'] = 'You are attempting to change the selected user type?'
         dialogData['subTitle'] = `By selecting all users, you've selected all the users from your Department of fisheries.
-        If you want to select custom users or by designation, use the above option`;
-        dialogData['primaryAction'] = 'I understand, change user type';
-        dialogData['secondaryAction'] = 'Cancel';
-      break;
+        If you want to select custom users or by designation, use the above option`
+        dialogData['primaryAction'] = 'I understand, change user type'
+        dialogData['secondaryAction'] = 'Cancel'
+      break
       case 'Custom Users':
-        dialogData['type'] = 'normal';
-        dialogData['icon'] = 'radio_on';
-        dialogData['title'] = 'You are attempting to change the selected user type?';
+        dialogData['type'] = 'normal'
+        dialogData['icon'] = 'radio_on'
+        dialogData['title'] = 'You are attempting to change the selected user type?'
         dialogData['subTitle'] = `By selecting all users, you've selected all the users from your Department of fisheries.
-        If you want to select custom users or by designation, use the above option`;
-        dialogData['primaryAction'] = 'I understand, change user type';
-        dialogData['secondaryAction'] = 'Cancel';
-      break;
+        If you want to select custom users or by designation, use the above option`
+        dialogData['primaryAction'] = 'I understand, change user type'
+        dialogData['secondaryAction'] = 'Cancel'
+      break
     }
 
-    this.openDialoagBox(dialogData);
+    this.openDialoagBox(dialogData)
   }
 
-  openDialoagBox(dialogData:any) {
+  openDialoagBox(dialogData: any) {
     this.dialogRef = this.dialog.open(ConfirmationBoxComponent, {
       data: {
         type: dialogData.type,
@@ -108,9 +108,9 @@ export class CategoryDropDownComponent implements OnInit {
     })
   }
 
-  hideConfirmationBox(event:any) {
-    console.log('close',event);
-    this.dialogRef.close();
+  hideConfirmationBox() {
+    // console.log('close', event)
+    this.dialogRef.close()
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
index 1e735e6ac..c221cd188 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
@@ -13,7 +13,7 @@ export class ChipComponent implements OnInit {
   }
 
   clearAll() {
-    
+
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 62f6d5b30..89d95a467 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -1,14 +1,13 @@
 import { Component, Input, Inject, OnInit } from '@angular/core'
 import { DOCUMENT } from '@angular/common'
 
-
 @Component({
   selector: 'ws-app-search',
   templateUrl: './search.component.html',
   styleUrls: ['./search.component.scss'],
 })
 export class SearchComponent implements OnInit {
-  @Input() categoryData:any = [];
+  @Input() categoryData: any = []
   filterVisibilityFlag = false
   constructor(@Inject(DOCUMENT) private document: Document) { }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
index c71bb0d65..65b55bf01 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
@@ -6,8 +6,8 @@ import { Component, Input, OnInit } from '@angular/core'
   styleUrls: ['./standard-card.component.scss'],
 })
 export class StandardCardComponent implements OnInit {
-  @Input() cardSize: any;
-  @Input() checkboxVisibility:any = true;
+  @Input() cardSize: any
+  @Input() checkboxVisibility: any = true
   constructor() { }
 
   ngOnInit() {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
index c5a467be2..d58719ddf 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
@@ -6,7 +6,7 @@ import { Component, Input, OnInit } from '@angular/core'
   styleUrls: ['./user-card.component.scss'],
 })
 export class UserCardComponent implements OnInit {
-  @Input() checkboxVisibility:boolean = true;
+  @Input() checkboxVisibility = true
   constructor() { }
 
   ngOnInit() {
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
index 965579b3b..b45c4cd9a 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
@@ -6,26 +6,26 @@ import { Component, OnInit } from '@angular/core'
   styleUrls: ['./create-assignee.component.scss'],
 })
 export class CreateAssigneeComponent implements OnInit {
-  categoryData:any[] = []
+  categoryData: any[] = []
   constructor() { }
 
   ngOnInit() {
     this.categoryData = [
       {
-       'id':1,
-       'name':'Designation',
-       'value':'Designation'
+       id: 1,
+       name: 'Designation',
+       value: 'Designation',
       },
       {
-        'id':2,
-        'name':'All Users',
-        'value':'All Users'
+        id: 2,
+        name: 'All Users',
+        value: 'All Users',
       },
       {
-        'id':3,
-        'name':'Custom Users',
-        'value':'Custom Users'
-      }
+        id: 3,
+        name: 'Custom Users',
+        value: 'Custom Users',
+      },
     ]
   }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
index ab4535401..8137348bf 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
@@ -6,36 +6,36 @@ import { Component, OnInit } from '@angular/core'
   styleUrls: ['./create-content.component.scss'],
 })
 export class CreateContentComponent implements OnInit {
-  categoryData:any[] = []
+  categoryData: any[] = []
   constructor() { }
 
   ngOnInit() {
     this.categoryData = [
       {
-       'id':1,
-       'name':'Course',
-       'value':'Course'
+       id: 1,
+       name: 'Course',
+       value: 'Course',
       },
       {
-        'id':2,
-        'name':'Program',
-        'value':'Program'
+        id: 2,
+        name: 'Program',
+        value: 'Program',
       },
       {
-        'id':3,
-        'name':'Blended program',
-        'value':'Blended program'
+        id: 3,
+        name: 'Blended program',
+        value: 'Blended program',
       },
       {
-        'id':4,
-        'name':'Curated program',
-        'value':'Curated program'
+        id: 4,
+        name: 'Curated program',
+        value: 'Curated program',
       },
       {
-        'id':5,
-        'name':'Moderated Course',
-        'value':'Moderated Course'
-      }
+        id: 5,
+        name: 'Moderated Course',
+        value: 'Moderated Course',
+      },
     ]
   }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
index ec38dcb85..1aa993dad 100644
--- a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
+++ b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
@@ -75,7 +75,7 @@ import { AddPlanInformationComponent } from './components/add-plan-information/a
     PreviewPlanComponent,
     CreateContentComponent,
     CategoryDropDownComponent,
-    AddPlanInformationComponent
+    AddPlanInformationComponent,
   ],
   imports: [
     CommonModule,

From cea16549ab3055c76b13b16dbe91a53bd4ad1ac7 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Sun, 10 Dec 2023 12:23:41 +0530
Subject: [PATCH 318/887] still working

---
 .../routes/create-event/create-event.component.ts  |  8 ++++----
 .../training-plan-dashboard.component.html         |  6 +++---
 .../training-plan-dashboard.component.scss         |  2 +-
 .../training-plan-dashboard.component.ts           | 14 ++++++++++----
 .../routes/training-plan/training-plan.module.ts   |  2 +-
 src/app/routes/route-training-plan.module.ts       |  2 +-
 6 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
index 5a50c6573..4d6010b66 100644
--- a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
+++ b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
@@ -544,10 +544,10 @@ export class CreateEventComponent implements OnInit {
       request: {
         event: {
           versionKey,
-          status: "Live",
-          identifier: identifierkey
-        }
-      }
+          status: 'Live',
+          identifier: identifierkey,
+        },
+      },
     }
     this.eventsSvc.publishEvent(identifierkey, reqestBody).subscribe(
       res => {
diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html
index 7c71079fe..4a4fe2744 100644
--- a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html
@@ -16,10 +16,10 @@
       </div>
       <ng-container class="margin-top-l">
         <ws-widget-org-user-table [tableData]="tabledata" [data]="trainingPlanData" [isTrainingPlan]="true"
-          [trainingTagList]="tagListData" *ngIf="currentFilter === 'live'">
+          [trainingTagList]="tagListData" *ngIf="currentFilter === 'live'" (eOnButtonClick)="clickHandler($event)">
         </ws-widget-org-user-table>
-        <ws-widget-org-user-table [tableData]="tabledata" [data]="trainingPlanData" [isTrainingPlan]="true"
-          [trainingTagList]="tagListData" *ngIf="currentFilter === 'draft'">
+        <ws-widget-org-user-table [tableData]="tabledata" [data]="[]" [isTrainingPlan]="true"
+          [trainingTagList]="tagListData" *ngIf="currentFilter === 'draft'" (eOnButtonClick)="clickHandler($event)">
         </ws-widget-org-user-table>
       </ng-container>
     </mat-card-content>
diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.scss b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.scss
index a1997a92f..a9d90439f 100644
--- a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.scss
@@ -20,7 +20,7 @@
 
 .create-cbp-btn {
   width: 109px;
-  background: #0075B7 !important;
+  background: #0075b7 !important;
   color: white !important;
   font-family: 'Lato';
   font-weight: 700;
diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
index 36f092169..9937a1650 100644
--- a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
@@ -12,10 +12,10 @@ import { ITableData } from '@sunbird-cb/collection/lib/ui-org-table/interface/in
 export class TrainingPlanDashboardComponent implements OnInit {
 
   currentFilter = 'live'
-  pageIndex: number = 0
-  currentOffset: number = 0
-  limit: number = 20
-  searchQuery: string = ''
+  pageIndex = 0
+  currentOffset = 0
+  limit = 20
+  searchQuery = ''
   tabledata!: ITableData
   trainingPlanData: any = []
   tagListData: any = ['Designation', 'All users', 'Custom users']
@@ -127,4 +127,10 @@ export class TrainingPlanDashboardComponent implements OnInit {
     this.router.navigate(['app', 'training-plan', 'create-plan'])
   }
 
+  clickHandler($event: any) {
+    if ($event.type === 'createCbpPlan') {
+      this.createCbp()
+    }
+  }
+
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
index d313af29d..74efae6fb 100644
--- a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
+++ b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
@@ -42,7 +42,7 @@ import { CreatePlanComponent } from './routes/create-plan/create-plan.component'
 @NgModule({
   declarations: [
     TrainingPlanHomeComponent,
-    CreatePlanComponent
+    CreatePlanComponent,
   ],
   imports: [
     CommonModule,
diff --git a/src/app/routes/route-training-plan.module.ts b/src/app/routes/route-training-plan.module.ts
index 6809ade86..2f17fa3c4 100644
--- a/src/app/routes/route-training-plan.module.ts
+++ b/src/app/routes/route-training-plan.module.ts
@@ -9,7 +9,7 @@ import { TrainingPlanModule } from '../../../project/ws/app/src/lib/routes/train
     TrainingPlanModule,
   ],
   exports: [
-    TrainingPlanModule
+    TrainingPlanModule,
   ],
 })
 export class RouteTrainingPlanAppModule { }

From e3f28d57ba854511831f3662700ab6973e4a000e Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Sun, 10 Dec 2023 20:12:25 +0530
Subject: [PATCH 319/887] ui fixes

---
 .../competency-summary/competency-summary.component.scss | 1 +
 src/app/component/app-nav-bar/app-nav-bar.component.html | 2 +-
 src/app/component/app-nav-bar/app-nav-bar.component.scss | 9 +++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.scss b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.scss
index 2d92f8d67..45b42187d 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.scss
@@ -73,6 +73,7 @@
         background-color: transparent;
         width: 100%;
         height: 100%;
+        color: #000 !important;
     }
 }
 
diff --git a/src/app/component/app-nav-bar/app-nav-bar.component.html b/src/app/component/app-nav-bar/app-nav-bar.component.html
index 9eb379d36..1d743ebf8 100644
--- a/src/app/component/app-nav-bar/app-nav-bar.component.html
+++ b/src/app/component/app-nav-bar/app-nav-bar.component.html
@@ -4,7 +4,7 @@
     <ng-container *ngIf="mode === 'top'">
       <a routerLink="/app/home" class="logo-dim" role="link" title="Home" i18n-aria-title i18n-aria-label>
         <img [src]="appIcon" alt="Application Logo" class="app-logo" />
-      </a>
+      </a> <div><span class="vertical-seperator"></span><span>MDO portal</span></div>
       <!-- <span class="spacer"></span> -->
       <ng-container *ngIf="primaryNavbarConfig?.mediumScreen">
         <ng-container [ngTemplateOutlet]="navbarSide" [ngTemplateOutletContext]="{ item: item }"
diff --git a/src/app/component/app-nav-bar/app-nav-bar.component.scss b/src/app/component/app-nav-bar/app-nav-bar.component.scss
index 1b82a60bf..55d88e466 100644
--- a/src/app/component/app-nav-bar/app-nav-bar.component.scss
+++ b/src/app/component/app-nav-bar/app-nav-bar.component.scss
@@ -167,5 +167,14 @@
   }
 }
 
+.header-title {
+  margin-left: 10px;
+    margin-top: 10px;
+}
+
+.vertical-seperator {
+  border-left: 1px solid rgb(0,0,0,0.16);
+  margin-right: 16px;
+}
 // @media
 // 760px

From ce6ebf2eed04942381c96de5998bb9ba6f3cf8eb Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Mon, 11 Dec 2023 16:25:39 +0530
Subject: [PATCH 320/887] still working on the ui clean up

---
 .../breadcrumb/breadcrumb.component.html      |  20 +--
 .../breadcrumb/breadcrumb.component.scss      |  23 ++--
 .../breadcrumb/breadcrumb.component.ts        |  36 +++--
 .../competency-summary.component.html         | 130 +++++++++---------
 .../competency-summary.component.scss         |  12 +-
 .../confirmation-box.component.html           |  33 +++--
 .../confirmation-box.component.scss           |  10 +-
 .../confirmation.box.component.ts             |  11 +-
 .../components/search/search.component.html   |   3 +-
 .../components/search/search.component.scss   |   5 +-
 .../standard-card.component.html              |  41 +++---
 .../standard-card.component.scss              |  12 +-
 .../components/stepper/stepper.component.html |  13 +-
 .../components/stepper/stepper.component.ts   |  33 ++++-
 .../user-card/user-card.component.html        |  48 +++----
 .../user-card/user-card.component.scss        |  22 +--
 .../models/training-plan.model.ts             |   8 ++
 .../create-content.component.html             |   8 +-
 .../create-plan/create-plan.component.html    |   4 +-
 .../create-plan/create-plan.component.ts      |  12 ++
 .../create-timeline.component.ts              |   2 +-
 .../app-nav-bar/app-nav-bar.component.html    |   3 +-
 22 files changed, 282 insertions(+), 207 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/training-plan/models/training-plan.model.ts

diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
index 7541a3603..1a6873934 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
@@ -3,18 +3,22 @@
         <div class="home cursor-pointer" (click)="performRoute('list')">Training Plans
             <img src="/assets/icons/arrow-forward_small.svg" />
         </div>
-        <div class="home cursor-pointer" (click)="performRoute('create-plan')">Create CBP Plan
+        <!-- <div class="home cursor-pointer" (click)="performRoute('create-plan')">Create CBP Plan
             <img src="/assets/icons/arrow-forward_small.svg" />
-        </div>
-        <div class="action cursor-pointer">Create a Plan
+        </div> -->
+        <div class="action cursor-pointer">{{(tabType.CREATE_PLAN === selectedTab) ? 'Create a plan' :
+            (tabType.ADD_CONTENT === selectedTab) ? 'Add content' : (tabType.ADD_ASSIGNEE === selectedTab) ? 'Add
+            assignee' : (tabType.ADD_TIMELINE === selectedTab) ? 'Add timeline' : ''}}
         </div>
     </div>
     <div class="flex flex-1 flex-row right-breadcrumb" *ngIf="showBreadcrumbAction">
-        <div class="cancel cursor-pointer" (click)="cancel()">
+        <button mat-button class="cancel" (click)="cancel()">
             <span>Cancel</span>
-        </div>
-        <div class="next-btn cursor-pointer" (click)="nextStep()">
-            <span>Next: Add Content</span>
-        </div>
+        </button>
+        <button mat-button class="next-btn margin-left-m" (click)="nextStep()"
+            *ngIf="tabType.CREATE_PLAN === selectedTab || tabType.ADD_CONTENT === selectedTab || tabType.ADD_ASSIGNEE === selectedTab">
+            <span>Next: {{(tabType.CREATE_PLAN === selectedTab) ? 'Add Content' : (tabType.ADD_CONTENT === selectedTab)
+                ? 'Add assignee' : (tabType.ADD_ASSIGNEE === selectedTab) ? 'Add timeline' : ''}}</span>
+        </button>
     </div>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.scss b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.scss
index ef2d0a268..72f4d40dd 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.scss
@@ -26,28 +26,21 @@
 }
 
 .cancel {
-    color: rgb(27, 76, 161);
-    border: 1px solid rgb(27, 76, 161);
+    color: #0075B7 !important;
+    border: 1px solid #0075B7;
     border-radius: 4px;
     width: 174px;
-    text-align: center;
-    padding: 10px 0;
 }
 
 
 .next-btn {
-    color: rgba(255, 255, 255, 0.7);
+    background: #0075B7 !important;
+    color: white !important;
+    font-family: 'Lato';
+    font-weight: 700;
+    font-size: 14px;
     border-radius: 4px;
-    width: 199px;
-    text-align: center;
-    padding: 10px 0;
-    background-color: rgb(153, 153, 153);
-    margin-left: 10px;
-}
-
-.next-btn.active {
-    background-color: rgb(61, 81, 174);
-    color: rgba(255, 255, 255)
+    min-width: 199px;
 }
 
 .left-breadcrumb {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
index 4eb0fed52..8c447e208 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
@@ -1,15 +1,22 @@
-import { Component, Input, OnInit } from '@angular/core'
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
 import { MatDialog } from '@angular/material'
 import { Router } from '@angular/router'
 import { ConfirmationBoxComponent } from '../confirmation-box/confirmation.box.component'
+import { TrainingPlanContent } from '../../models/training-plan.model'
 @Component({
   selector: 'ws-app-breadcrumb',
   templateUrl: './breadcrumb.component.html',
   styleUrls: ['./breadcrumb.component.scss'],
 })
 export class BreadcrumbComponent implements OnInit {
+
   @Input() showBreadcrumbAction = true
+  @Input() selectedTab: string = ''
+  @Output() changeToNextTab = new EventEmitter<any>()
+
   public dialogRef: any
+  tabType = TrainingPlanContent.TTabLabelKey
+
   constructor(private router: Router, public dialog: MatDialog) { }
 
   ngOnInit() {
@@ -20,7 +27,19 @@ export class BreadcrumbComponent implements OnInit {
   }
 
   nextStep() {
-    this.showDialogBox('progress-completed')
+    // this.showDialogBox('progress-completed')
+    switch (this.selectedTab) {
+      case TrainingPlanContent.TTabLabelKey.CREATE_PLAN:
+        this.changeToNextTab.emit(TrainingPlanContent.TTabLabelKey.ADD_CONTENT)
+        break
+      case TrainingPlanContent.TTabLabelKey.ADD_CONTENT:
+        this.changeToNextTab.emit(TrainingPlanContent.TTabLabelKey.ADD_ASSIGNEE)
+        break
+      case TrainingPlanContent.TTabLabelKey.ADD_ASSIGNEE:
+        this.changeToNextTab.emit(TrainingPlanContent.TTabLabelKey.ADD_TIMELINE)
+        break
+    }
+
   }
 
   performRoute(route: any) {
@@ -40,22 +59,14 @@ export class BreadcrumbComponent implements OnInit {
         dialogData['icon'] = 'vega'
         dialogData['title'] = 'Processing your request'
         dialogData['subTitle'] = `Wait a second , your request is processing………`
-      break
+        break
       case 'progress-completed':
         dialogData['type'] = 'progress-completed'
         dialogData['icon'] = 'accept_icon'
         dialogData['title'] = 'Your processing has been done.'
         dialogData['subTitle'] = `Updated to Draft`
         dialogData['primaryAction'] = 'Redirecting....'
-      break
-        dialogData['type'] = 'normal'
-        dialogData['icon'] = 'radio_on'
-        dialogData['title'] = 'You are attempting to change the selected user type?'
-        dialogData['subTitle'] = `By selecting all users, you've selected all the users from your Department of fisheries.
-        If you want to select custom users or by designation, use the above option`
-        dialogData['primaryAction'] = 'I understand, change user type'
-        dialogData['secondaryAction'] = 'Cancel'
-      break
+        break
     }
 
     this.openDialoagBox(dialogData)
@@ -72,6 +83,7 @@ export class BreadcrumbComponent implements OnInit {
         primaryAction: dialogData.primaryAction,
         secondaryAction: dialogData.secondaryAction,
       },
+      autoFocus: false
     })
 
     this.dialogRef.afterClosed().subscribe(() => {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.html b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.html
index 4c2b39461..6a32c9640 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.html
@@ -1,74 +1,70 @@
-<div class="flex flex-1 flex-row">
-    <div class="competency-summary">
-        <div class="competency-summary-header">Competency summary</div>
-        <div class="competency-tabs">
-            <mat-tab-group [selectedIndex]="0" class="margin-top-m">
-                <mat-tab>
-                    <ng-template mat-tab-label>
-                        Behavioural(0)
-                    </ng-template>
-                    <ng-template matTabContent>
-                        <div class="category-card flex flex-row">
-                            <div class="label">
-                                Seeking Information
-                            </div>
-                            <div>
-                                (02)
-                            </div>
+<div class="competency-summary">
+    <div class="competency-summary-header">Competency summary</div>
+    <div class="competency-tabs">
+        <mat-tab-group [selectedIndex]="0" class="margin-top-m">
+            <mat-tab>
+                <ng-template mat-tab-label>
+                    Behavioural(0)
+                </ng-template>
+                <ng-template matTabContent>
+                    <div class="category-card flex flex-row">
+                        <div class="label">
+                            Seeking Information
                         </div>
-                        <div class="category-card flex flex-row">
-                            <div class="label">
-                                Seeking Information
-                            </div>
-                            <div>
-                                (02)
-                            </div>
+                        <div>
+                            (02)
                         </div>
-                        <div class="category-card flex flex-row">
-                            <div class="label">
-                                Seeking Information
-                            </div>
-                            <div>
-                                (02)
-                            </div>
+                    </div>
+                    <div class="category-card flex flex-row">
+                        <div class="label">
+                            Seeking Information
                         </div>
-                        <div class="category-card flex flex-row">
-                            <div class="label">
-                                Seeking Information
-                            </div>
-                            <div>
-                                (02)
-                            </div>
+                        <div>
+                            (02)
                         </div>
-                        <div class="category-card flex flex-row">
-                            <div class="label">
-                                Seeking Information
-                            </div>
-                            <div>
-                                (02)
-                            </div>
+                    </div>
+                    <div class="category-card flex flex-row">
+                        <div class="label">
+                            Seeking Information
                         </div>
-                    </ng-template>
-                </mat-tab>
-                <mat-tab>
-                    <ng-template mat-tab-label>
-                        <span>Functional(0)
-                        </span>
-                    </ng-template>
-                    <ng-template matTabContent>
-                        <div class="default-tab-content">There are no competency added yet</div>
-                    </ng-template>
-                </mat-tab>
-                <mat-tab>
-                    <ng-template mat-tab-label>
-                        <span>Domain(0)</span>
-                    </ng-template>
-                    <ng-template matTabContent>
-                    </ng-template>
-                </mat-tab>
-
-            </mat-tab-group>
-        </div>
+                        <div>
+                            (02)
+                        </div>
+                    </div>
+                    <div class="category-card flex flex-row">
+                        <div class="label">
+                            Seeking Information
+                        </div>
+                        <div>
+                            (02)
+                        </div>
+                    </div>
+                    <div class="category-card flex flex-row">
+                        <div class="label">
+                            Seeking Information
+                        </div>
+                        <div>
+                            (02)
+                        </div>
+                    </div>
+                </ng-template>
+            </mat-tab>
+            <mat-tab>
+                <ng-template mat-tab-label>
+                    <span>Functional(0)
+                    </span>
+                </ng-template>
+                <ng-template matTabContent>
+                    <div class="default-tab-content">There are no competency added yet</div>
+                </ng-template>
+            </mat-tab>
+            <mat-tab>
+                <ng-template mat-tab-label>
+                    <span>Domain(0)</span>
+                </ng-template>
+                <ng-template matTabContent>
+                </ng-template>
+            </mat-tab>
+        </mat-tab-group>
     </div>
-
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.scss b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.scss
index 45b42187d..4a7ab286b 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.scss
@@ -1,13 +1,13 @@
 
 .competency-summary {
-    margin-top: 24px;
-    width: 494px;
+    // margin-top: 24px;
+    max-width: 363px;
     border: 1px solid rgb(0,0,0,0.16);
     min-height: 300px;
-    margin-left: 25px;
+    // margin-left: 25px;
     border-radius: 12px;
-    margin-left: 58%;
-    
+    // margin-left: 58%;
+
 }
 .competency-summary-header {
     font-size: 14px;
@@ -46,7 +46,7 @@
     flex: 1;
     color: black;
     opacity: 1 !important;
-    padding: 0 24px 0 46px !important;
+    // padding: 0 24px 0 46px !important;
 
     ::ng-deep .mat-tab-label-content {
         background-color: transparent;
diff --git a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.html b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.html
index e53bfdb19..9880a032a 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.html
@@ -1,11 +1,16 @@
 <div class="box-container" *ngIf="data?.type === 'normal'">
+    <div class="close-modal-container">
+        <button mat-icon-button>
+            <mat-icon>more_vert</mat-icon>
+        </button>
+    </div>
     <div class="flex flex-1 flex-row icon">
-        <img src="assets/icons/{{data?.icon}}.svg"/>
+        <img src="assets/icons/{{data?.icon}}.svg" />
 
     </div>
     <div class="flex flex-1 flex-row title">
         {{data?.title}}
-        
+
     </div>
     <div class="flex flex-1 flex-row subtitle">
         {{data?.subTitle}}
@@ -20,30 +25,40 @@
     </div>
 </div>
 
-<div class="box-container-portrait" *ngIf="data?.type === 'progress'">   
+<div class="box-container-portrait" *ngIf="data?.type === 'progress'">
+    <div class="close-modal-container">
+        <button mat-icon-button>
+            <mat-icon>more_vert</mat-icon>
+        </button>
+    </div>
     <div class="flex flex-1 flex-row progress-title">
-        {{data?.title}}        
+        {{data?.title}}
     </div>
     <div class="flex flex-1 flex-row progress-subtitle">
         {{data?.subTitle}}
     </div>
     <div class="flex flex-1 flex-row progress-icon">
-        <img src="assets/icons/{{data?.icon}}.svg"/>
+        <img src="assets/icons/{{data?.icon}}.svg" />
 
     </div>
 </div>
 
-<div class="box-container-portrait" *ngIf="data?.type === 'progress-completed'">   
+<div class="box-container-portrait" *ngIf="data?.type === 'progress-completed'">
+    <div class="close-modal-container">
+        <button mat-icon-button type="button" (click)="dialogRef.close()">
+            <mat-icon>close</mat-icon>
+        </button>
+    </div>
     <div class="flex flex-1 flex-row progress-title">
-        {{data?.title}}        
+        {{data?.title}}
     </div>
     <div class="flex flex-1 flex-row progress-subtitle-16">
         {{data?.subTitle}}
     </div>
     <div class="flex flex-1 flex-row progress-icon">
-        <img src="assets/icons/{{data?.icon}}.svg"/>
+        <img src="assets/icons/{{data?.icon}}.svg" />
     </div>
-    <div mat-dialog-actions class="flex flex-1 flex-row action">       
+    <div mat-dialog-actions class="flex flex-1 flex-row action">
         <div class="primary cursor-pointer">
             <span>{{data?.primaryAction}}</span>
         </div>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.scss b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.scss
index 43e13a599..030a04aac 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.scss
@@ -4,11 +4,13 @@
 .box-container {
     width:632px;
     padding: 24px;
+    position: relative;
 }
 
 .box-container-portrait {
     width:511px;
     margin: 32px 0 20px 0;
+    position: relative;
 }
 .icon {
     justify-content: center;
@@ -86,4 +88,10 @@
 .progress-icon {
     justify-content: center;
     margin-top: 16px;
-}
\ No newline at end of file
+}
+
+.close-modal-container {
+    position: absolute;
+    top: -45px;
+    right: -10px;
+ }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation.box.component.ts b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation.box.component.ts
index f07302151..4beeae8ae 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation.box.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation.box.component.ts
@@ -1,5 +1,5 @@
 import { Component, Inject, OnInit } from '@angular/core'
-import { MAT_DIALOG_DATA } from '@angular/material'
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'
 
 @Component({
   selector: 'ws-app-confirmation-box',
@@ -8,11 +8,18 @@ import { MAT_DIALOG_DATA } from '@angular/material'
 })
 export class ConfirmationBoxComponent implements OnInit {
 
-  constructor(@Inject(MAT_DIALOG_DATA) public data: any) { }
+  constructor(
+    @Inject(MAT_DIALOG_DATA) public data: any,
+    private dialogRef: MatDialogRef<ConfirmationBoxComponent>
+  ) { }
 
   ngOnInit() {
   }
 
+  closeModal() {
+    this.dialogRef.close()
+  }
+
   performAction() {
   }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
index 2af88dd14..529b9638c 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
@@ -1,7 +1,8 @@
 <div class="flex flex-1 flex-row search-container">
     <!-- Category Drop down -->
     <ng-container>
-        <ws-app-category-drop-down [categoryData]="categoryData" (closeDropDown)="closeDropDown($event)"></ws-app-category-drop-down>
+        <ws-app-category-drop-down [categoryData]="categoryData"
+            (closeDropDown)="closeDropDown($event)"></ws-app-category-drop-down>
     </ng-container>
     <div class="search">
         <div class="rsearch"><mat-icon
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.scss b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.scss
index fd98a7d73..c01d6cfae 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.scss
@@ -8,7 +8,7 @@
 
 .search {
     margin-left: 16px;
-    width: 78%;
+    width: 75%;
 }
 
 .search-icon {
@@ -23,11 +23,10 @@
     border: 1px solid #d5d0d0;
     padding: 15px 36px;
     font: 400 14px Lato;
-    width: 95%;
+    width: 90%;
 }
 
 .filter-section {
-    margin-left: 20px;
     margin-top: 10px;
     cursor: pointer;
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
index 82bf08959..d3fcd0958 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
@@ -1,6 +1,6 @@
 <ng-container *ngIf="cardSize === 3">
-    <div class="flex flex-4 flex-row card-grid">
-        <div class="flex flex-3 flex-row card-grid-container">
+    <div>
+        <div class="flex flex-3 flex-row card-grid-container flex-evenly">
             <div class="flex  course-card">
                 <mat-card class="card-standard-container mr-5 padding-remove">
                     <div class="display-contents">
@@ -59,7 +59,7 @@
                                 <ng-container>
                                     <mat-card-content class="min-top">
                                         <div style="position: relative; z-index: 1;">
-                                              <ng-container>
+                                            <ng-container>
                                                 <div class="card-select-box" *ngIf="checkboxVisibility">
                                                     <mat-checkbox class="card-select-check"></mat-checkbox>
                                                 </div>
@@ -109,7 +109,7 @@
                                 <ng-container>
                                     <mat-card-content class="min-top">
                                         <div style="position: relative; z-index: 1;">
-                                              <ng-container>
+                                            <ng-container>
                                                 <div class="card-select-box" *ngIf="checkboxVisibility">
                                                     <mat-checkbox class="card-select-check"></mat-checkbox>
                                                 </div>
@@ -151,10 +151,10 @@
                     </div>
                 </mat-card>
             </div>
-            
+
         </div>
     </div>
-    <div class="flex flex-4 flex-row card-grid">
+    <!-- <div class="flex flex-4 flex-row card-grid">
         <div class="flex flex-3 flex-row card-grid-container">
             <div class="flex  course-card">
                 <mat-card class="card-standard-container mr-5 padding-remove">
@@ -164,7 +164,7 @@
                                 <ng-container>
                                     <mat-card-content class="min-top">
                                         <div style="position: relative; z-index: 1;">
-                                              <ng-container>
+                                            <ng-container>
                                                 <div class="card-select-box" *ngIf="checkboxVisibility">
                                                     <mat-checkbox class="card-select-check"></mat-checkbox>
                                                 </div>
@@ -312,7 +312,7 @@
                                 <ng-container>
                                     <mat-card-content class="min-top">
                                         <div style="position: relative; z-index: 1;">
-                                              <ng-container>
+                                            <ng-container>
                                                 <div class="card-select-box" *ngIf="checkboxVisibility">
                                                     <mat-checkbox class="card-select-check"></mat-checkbox>
                                                 </div>
@@ -460,7 +460,7 @@
                                 <ng-container>
                                     <mat-card-content class="min-top">
                                         <div style="position: relative; z-index: 1;">
-                                              <ng-container>
+                                            <ng-container>
                                                 <div class="card-select-box" *ngIf="checkboxVisibility">
                                                     <mat-checkbox class="card-select-check"></mat-checkbox>
                                                 </div>
@@ -597,7 +597,7 @@
                 </mat-card>
             </div>
         </div>
-    </div>
+    </div> -->
 </ng-container>
 <ng-container *ngIf="cardSize === 4">
     <div class="flex flex-4 flex-row card-grid">
@@ -610,7 +610,7 @@
                                 <ng-container>
                                     <mat-card-content class="min-top">
                                         <div style="position: relative; z-index: 1;">
-                                              <ng-container>
+                                            <ng-container>
                                                 <div class="card-select-box" *ngIf="checkboxVisibility">
                                                     <mat-checkbox class="card-select-check"></mat-checkbox>
                                                 </div>
@@ -805,7 +805,7 @@
                                 <ng-container>
                                     <mat-card-content class="min-top">
                                         <div style="position: relative; z-index: 1;">
-                                              <ng-container>
+                                            <ng-container>
                                                 <div class="card-select-box" *ngIf="checkboxVisibility">
                                                     <mat-checkbox class="card-select-check"></mat-checkbox>
                                                 </div>
@@ -1000,7 +1000,7 @@
                                 <ng-container>
                                     <mat-card-content class="min-top">
                                         <div style="position: relative; z-index: 1;">
-                                              <ng-container>
+                                            <ng-container>
                                                 <div class="card-select-box" *ngIf="checkboxVisibility">
                                                     <mat-checkbox class="card-select-check"></mat-checkbox>
                                                 </div>
@@ -1195,7 +1195,7 @@
                                 <ng-container>
                                     <mat-card-content class="min-top">
                                         <div style="position: relative; z-index: 1;">
-                                              <ng-container>
+                                            <ng-container>
                                                 <div class="card-select-box" *ngIf="checkboxVisibility">
                                                     <mat-checkbox class="card-select-check"></mat-checkbox>
                                                 </div>
@@ -1392,7 +1392,7 @@
                                 <ng-container>
                                     <mat-card-content class="min-top">
                                         <div style="position: relative; z-index: 1;">
-                                              <ng-container>
+                                            <ng-container>
                                                 <div class="card-select-box" *ngIf="checkboxVisibility">
                                                     <mat-checkbox class="card-select-check"></mat-checkbox>
                                                 </div>
@@ -1634,7 +1634,7 @@
                                 <ng-container>
                                     <mat-card-content class="min-top">
                                         <div style="position: relative; z-index: 1;">
-                                              <ng-container>
+                                            <ng-container>
                                                 <div class="card-select-box" *ngIf="checkboxVisibility">
                                                     <mat-checkbox class="card-select-check"></mat-checkbox>
                                                 </div>
@@ -1866,7 +1866,7 @@
             </div>
         </div>
     </div>
-    
+
     <div class="flex flex-4 flex-row card-grid">
         <div class="flex flex-3 flex-row card-grid-container">
             <div class="flex  course-card">
@@ -1877,7 +1877,7 @@
                                 <ng-container>
                                     <mat-card-content class="min-top">
                                         <div style="position: relative; z-index: 1;">
-                                              <ng-container>
+                                            <ng-container>
                                                 <div class="card-select-box" *ngIf="checkboxVisibility">
                                                     <mat-checkbox class="card-select-check"></mat-checkbox>
                                                 </div>
@@ -2119,7 +2119,7 @@
                                 <ng-container>
                                     <mat-card-content class="min-top">
                                         <div style="position: relative; z-index: 1;">
-                                              <ng-container>
+                                            <ng-container>
                                                 <div class="card-select-box" *ngIf="checkboxVisibility">
                                                     <mat-checkbox class="card-select-check"></mat-checkbox>
                                                 </div>
@@ -2351,5 +2351,4 @@
             </div>
         </div>
     </div>
-</ng-container>
-
+</ng-container>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
index 80f16a908..3da3abf45 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
@@ -514,13 +514,13 @@ $title-line-count: 2;
     color: #ef951e!important;
 }
 
-.course-card {
-    margin-left: 25px;
-}
+// .course-card {
+//     margin-left: 25px;
+// }
 
-.course-card:first-child {
-    margin-left: 5px;
-}
+// .course-card:first-child {
+//     margin-left: 5px;
+// }
 
 .card-select-box {
     position: absolute;
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
index 99e45425e..48604631a 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
@@ -1,14 +1,15 @@
 <div class="stepper">
-    <mat-tab-group #tabGroup [disableRipple]=true [selectedIndex]="0" class="margin-top-m">
-        <mat-tab>
+    <mat-tab-group #tabGroup [disableRipple]="true" [selectedIndex]="tabIndexValue" class="margin-top-m"
+        (selectedTabChange)="tabSelected($event)">
+        <mat-tab [label]="tabType.CREATE_PLAN">
             <ng-template mat-tab-label>
                 1. Create a plan
             </ng-template>
             <ng-template matTabContent>
                 <ws-app-add-plan-information></ws-app-add-plan-information>
-            </ng-template>            
+            </ng-template>
         </mat-tab>
-        <mat-tab>
+        <mat-tab [label]="tabType.ADD_CONTENT">
             <ng-template mat-tab-label>
                 <span>2. Add Content
                 </span>
@@ -17,7 +18,7 @@
                 <ws-app-create-content></ws-app-create-content>
             </ng-template>
         </mat-tab>
-        <mat-tab>
+        <mat-tab [label]="tabType.ADD_ASSIGNEE">
             <ng-template mat-tab-label>
                 <span>3. Add Assignee</span>
             </ng-template>
@@ -25,7 +26,7 @@
                 <ws-app-create-assignee></ws-app-create-assignee>
             </ng-template>
         </mat-tab>
-        <mat-tab>
+        <mat-tab [label]="tabType.ADD_TIMELINE">
             <ng-template mat-tab-label>
                 <span>4. Add Timeline</span>
             </ng-template>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
index be86d9549..efb944f61 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
@@ -1,15 +1,44 @@
-import { Component, OnInit } from '@angular/core'
+import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core'
+import { TrainingPlanContent } from '../../models/training-plan.model'
 
 @Component({
   selector: 'ws-app-stepper',
   templateUrl: './stepper.component.html',
   styleUrls: ['./stepper.component.scss'],
 })
-export class StepperComponent implements OnInit {
+export class StepperComponent implements OnInit, OnChanges {
+
+  @Input() changeTabOnNext!: string
+  @Output() selectedTabType = new EventEmitter<any>()
+
+  tabType = TrainingPlanContent.TTabLabelKey
+  tabIndexValue: number = 0
 
   constructor() { }
 
   ngOnInit() {
+
+  }
+
+  ngOnChanges() {
+    if (this.changeTabOnNext) {
+      switch (this.changeTabOnNext) {
+        case TrainingPlanContent.TTabLabelKey.ADD_CONTENT:
+          this.tabIndexValue = 1
+          break
+        case TrainingPlanContent.TTabLabelKey.ADD_ASSIGNEE:
+          this.tabIndexValue = 2
+          break
+        case TrainingPlanContent.TTabLabelKey.ADD_TIMELINE:
+          this.tabIndexValue = 3
+          break
+      }
+    }
+  }
+
+  tabSelected(_event: any) {
+    const tempData = _event.tab.textLabel
+    this.selectedTabType.emit(tempData)
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
index dab8e2326..0a6424e35 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
@@ -11,7 +11,7 @@
             <mat-checkbox class="example-margin"></mat-checkbox>
         </div>
     </div>
-     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
         <div class="avatar">
             <div>HG</div>
         </div>
@@ -23,7 +23,7 @@
             <mat-checkbox class="example-margin"></mat-checkbox>
         </div>
     </div>
-     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
         <div class="avatar">
             <div>HG</div>
         </div>
@@ -35,7 +35,7 @@
             <mat-checkbox class="example-margin"></mat-checkbox>
         </div>
     </div>
-     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
         <div class="avatar">
             <div>HG</div>
         </div>
@@ -49,7 +49,7 @@
     </div>
 </div>
 <div class="flex flex-4 flex-row assignee-card-container">
-     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
         <div class="avatar">
             <div>HG</div>
         </div>
@@ -61,7 +61,7 @@
             <mat-checkbox class="example-margin"></mat-checkbox>
         </div>
     </div>
-     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
         <div class="avatar">
             <div>HG</div>
         </div>
@@ -73,7 +73,7 @@
             <mat-checkbox class="example-margin"></mat-checkbox>
         </div>
     </div>
-     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
         <div class="avatar">
             <div>HG</div>
         </div>
@@ -85,7 +85,7 @@
             <mat-checkbox class="example-margin"></mat-checkbox>
         </div>
     </div>
-     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
         <div class="avatar">
             <div>HG</div>
         </div>
@@ -99,7 +99,7 @@
     </div>
 </div>
 <div class="flex flex-4 flex-row assignee-card-container">
-     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
         <div class="avatar">
             <div>HG</div>
         </div>
@@ -111,7 +111,7 @@
             <mat-checkbox class="example-margin"></mat-checkbox>
         </div>
     </div>
-     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
         <div class="avatar">
             <div>HG</div>
         </div>
@@ -123,7 +123,7 @@
             <mat-checkbox class="example-margin"></mat-checkbox>
         </div>
     </div>
-     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
         <div class="avatar">
             <div>HG</div>
         </div>
@@ -135,7 +135,7 @@
             <mat-checkbox class="example-margin"></mat-checkbox>
         </div>
     </div>
-     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
         <div class="avatar">
             <div>HG</div>
         </div>
@@ -149,7 +149,7 @@
     </div>
 </div>
 <div class="flex flex-4 flex-row assignee-card-container">
-     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
         <div class="avatar">
             <div>HG</div>
         </div>
@@ -161,7 +161,7 @@
             <mat-checkbox class="example-margin"></mat-checkbox>
         </div>
     </div>
-     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
         <div class="avatar">
             <div>HG</div>
         </div>
@@ -173,7 +173,7 @@
             <mat-checkbox class="example-margin"></mat-checkbox>
         </div>
     </div>
-     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
         <div class="avatar">
             <div>HG</div>
         </div>
@@ -185,7 +185,7 @@
             <mat-checkbox class="example-margin"></mat-checkbox>
         </div>
     </div>
-     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
         <div class="avatar">
             <div>HG</div>
         </div>
@@ -199,7 +199,7 @@
     </div>
 </div>
 <div class="flex flex-4 flex-row assignee-card-container">
-     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
         <div class="avatar">
             <div>HG</div>
         </div>
@@ -211,7 +211,7 @@
             <mat-checkbox class="example-margin"></mat-checkbox>
         </div>
     </div>
-     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
         <div class="avatar">
             <div>HG</div>
         </div>
@@ -223,7 +223,7 @@
             <mat-checkbox class="example-margin"></mat-checkbox>
         </div>
     </div>
-     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
         <div class="avatar">
             <div>HG</div>
         </div>
@@ -235,7 +235,7 @@
             <mat-checkbox class="example-margin"></mat-checkbox>
         </div>
     </div>
-     <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
         <div class="avatar">
             <div>HG</div>
         </div>
@@ -252,15 +252,15 @@
 <!-- Custom User Card-->
 
 <div class="flex flex-4 flex-row custom-user-card-container">
-    <div class="flex flex-4 custom-user-card active">        
+    <div class="flex flex-4 custom-user-card active-card">
         <div class="custom-user-desc">
             <p>Heading</p>
         </div>
         <div class="check-action" *ngIf="checkboxVisibility">
-            <mat-checkbox class="example-margin"></mat-checkbox>
+            <mat-checkbox class="example-margin" [checked]="true"></mat-checkbox>
         </div>
     </div>
-    <div class="flex flex-4 custom-user-card">        
+    <div class="flex flex-4 custom-user-card">
         <div class="custom-user-desc">
             <p>Heading</p>
         </div>
@@ -268,7 +268,7 @@
             <mat-checkbox class="example-margin"></mat-checkbox>
         </div>
     </div>
-    <div class="flex flex-4 custom-user-card">        
+    <div class="flex flex-4 custom-user-card">
         <div class="custom-user-desc">
             <p>Heading</p>
         </div>
@@ -276,7 +276,7 @@
             <mat-checkbox class="example-margin"></mat-checkbox>
         </div>
     </div>
-    <div class="flex flex-4 custom-user-card">        
+    <div class="flex flex-4 custom-user-card">
         <div class="custom-user-desc">
             <p>Heading</p>
         </div>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
index d1cb9c1f5..2d3ec291e 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
@@ -2,26 +2,22 @@
     margin-top:20px
 }
 .assignee-card {
-    width: 325px;
+    width: 292px;
     border: 1px solid rgba(0, 0, 0, 0.16);
     border-radius: 4px;
     padding: 16px;
-    margin-left: 20px;
+    margin-right: 20px;
 }
 
 .assignee-card-without-checkbox {
     background-color: rgb(240,240,240);
-    width: 325px;
+    width: 292px;
     border: none !important;
     border-radius: 4px;
     padding: 22px 12px !important;
     margin-left: 20px;
 }
 
-.assignee-card:first-child {
-    margin-left: 0;
-}
-
 .avatar {
     height: 48px;
     width: 49px;
@@ -64,19 +60,15 @@
     margin-top:20px
 }
 .custom-user-card {
-    width: 325px;
+    width: 292px;
     border: 1px solid rgba(0, 0, 0, 0.16);
     border-radius: 4px;
     padding: 24px 16px;
-    margin-left: 20px;
-}
-
-.custom-user-card.active {
-    border: 1px solid #1B4CA1;
+    margin-right: 20px;
 }
 
-.custom-user-card:first-child {
-    margin-left: 0;
+.custom-user-card.active-card {
+    border: 1px solid #1B4CA1 !important;
 }
 
 .custom-user-desc {
diff --git a/project/ws/app/src/lib/routes/training-plan/models/training-plan.model.ts b/project/ws/app/src/lib/routes/training-plan/models/training-plan.model.ts
new file mode 100644
index 000000000..f1dfc0fd3
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/models/training-plan.model.ts
@@ -0,0 +1,8 @@
+export namespace TrainingPlanContent {
+  export enum TTabLabelKey {
+    CREATE_PLAN = 'createPlan',
+    ADD_CONTENT = 'addContent',
+    ADD_ASSIGNEE = 'addAssignee',
+    ADD_TIMELINE = 'addTimeline'
+  }
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
index 9c9b81a19..bcccad215 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
@@ -3,15 +3,13 @@
 </ng-container>
 
 <ng-container>
-    <div class="flex flex-2 flex-row">
-        <div>
+    <div class="flex flex-row">
+        <div class="flex-1">
             <ws-app-chip></ws-app-chip>
             <ws-app-standard-card [cardSize]="3"></ws-app-standard-card>
         </div>
-        <div>
+        <div class="flex-2 margin-left-s margin-top-s">
             <ws-app-competency-summary></ws-app-competency-summary>
         </div>
     </div>
-    
-    <!--  -->
 </ng-container>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
index b307cf011..207dfb36d 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
@@ -1,4 +1,4 @@
 <div class="plan-container">
-     <ws-app-breadcrumb></ws-app-breadcrumb>
-    <ws-app-stepper></ws-app-stepper>
+    <ws-app-breadcrumb [selectedTab]="selectedTabData" (changeToNextTab)="changeTab($event)"></ws-app-breadcrumb>
+    <ws-app-stepper (selectedTabType)="selectedTabAction($event)" [changeTabOnNext]="nextTab"></ws-app-stepper>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
index 9299466e0..151b59e68 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
@@ -11,6 +11,9 @@ import _ from 'lodash'
 
 export class CreatePlanComponent implements OnInit, AfterViewInit, OnDestroy {
 
+  selectedTabData: string = 'createPlan'
+  nextTab: string = ''
+
   constructor() {
   }
   ngOnDestroy() {
@@ -18,6 +21,15 @@ export class CreatePlanComponent implements OnInit, AfterViewInit, OnDestroy {
   }
   ngOnInit() {
   }
+
   ngAfterViewInit() {
   }
+
+  selectedTabAction(_event: any) {
+    this.selectedTabData = _event
+  }
+
+  changeTab(_event: any) {
+    this.nextTab = _event
+  }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
index 6b9ecf7ba..d3648b0c6 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
@@ -14,7 +14,7 @@ export class CreateTimelineComponent implements OnInit {
   }
 
   showAll() {
-    this.router.navigateByUrl('/app/training-plan/preview-plan')
+    this.router.navigate(['app', 'training-plan', 'preview-plan'])
   }
 
 }
diff --git a/src/app/component/app-nav-bar/app-nav-bar.component.html b/src/app/component/app-nav-bar/app-nav-bar.component.html
index 1d743ebf8..d2acf3613 100644
--- a/src/app/component/app-nav-bar/app-nav-bar.component.html
+++ b/src/app/component/app-nav-bar/app-nav-bar.component.html
@@ -4,7 +4,8 @@
     <ng-container *ngIf="mode === 'top'">
       <a routerLink="/app/home" class="logo-dim" role="link" title="Home" i18n-aria-title i18n-aria-label>
         <img [src]="appIcon" alt="Application Logo" class="app-logo" />
-      </a> <div><span class="vertical-seperator"></span><span>MDO portal</span></div>
+      </a> <span class="vertical-seperator"></span>
+      <div class="flex flex-middle"><span>MDO portal</span></div>
       <!-- <span class="spacer"></span> -->
       <ng-container *ngIf="primaryNavbarConfig?.mediumScreen">
         <ng-container [ngTemplateOutlet]="navbarSide" [ngTemplateOutletContext]="{ item: item }"

From 90336871f874ec0cf4f027d4a0587e1a14c3d711 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Mon, 11 Dec 2023 16:31:39 +0530
Subject: [PATCH 321/887] update for api integration

---
 .../category-drop-down.component.ts           | 36 +++++++++++++++++--
 .../create-assignee.component.ts              |  3 ++
 .../services/traininig-plan.service.ts        | 28 +++++++++++++++
 .../training-plan/training-plan.module.ts     |  3 ++
 4 files changed, 67 insertions(+), 3 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts

diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
index 47950b3c8..3323e2931 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
@@ -1,6 +1,10 @@
-import { Component, EventEmitter, Input, Output, OnInit } from '@angular/core'
+import { Component, EventEmitter, Input, Output, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
 import { MatDialog } from '@angular/material'
-import { ConfirmationBoxComponent } from '../confirmation-box/confirmation.box.component'
+import { ConfirmationBoxComponent } from '../confirmation-box/confirmation.box.component';
+import { TrainingPlanService } from './../../services/traininig-plan.service';
+/* tslint:disable */
+import _ from 'lodash'
 @Component({
   selector: 'ws-app-category-drop-down',
   templateUrl: './category-drop-down.component.html',
@@ -10,9 +14,35 @@ export class CategoryDropDownComponent implements OnInit {
   @Input() categoryData: any[] = []
   @Output() closeDropDown: any = new EventEmitter()
   dialogRef: any
-  constructor(public dialog: MatDialog) { }
+  constructor(public dialog: MatDialog, private trainingPlanService: TrainingPlanService, private route: ActivatedRoute) { }
 
   ngOnInit() {
+    this.getAllUsers();
+    this.getDesignations();
+  }
+
+  getAllUsers() {
+    const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
+    const filterObj = {
+      request: {
+        query: '',
+        filters: {
+          rootOrgId,
+          status: 1,
+        },
+        limit: 100,
+        offset: 0,
+      },
+    }
+    this.trainingPlanService.getAllUsers(filterObj).subscribe((res:any) => {
+        console.log('res-->', res);
+    })
+  }
+
+  getDesignations() {
+    this.trainingPlanService.getDesignations().subscribe((res:any)=>{
+      console.log('res-->', res);
+    })
   }
 
   showDialogBox(event: any) {
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
index b45c4cd9a..7946da476 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
@@ -27,6 +27,9 @@ export class CreateAssigneeComponent implements OnInit {
         value: 'Custom Users',
       },
     ]
+
+    
   }
 
+
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts b/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
new file mode 100644
index 000000000..5b7dfe53a
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
@@ -0,0 +1,28 @@
+import { Injectable } from '@angular/core'
+import { HttpClient } from '@angular/common/http'
+import { Observable } from 'rxjs'
+import { map } from 'rxjs/operators'
+// tslint:disable
+import _ from 'lodash'
+// tslint:enable
+
+const API_END_POINTS = {
+  GET_ALL_USERS: '/apis/proxies/v8/user/v1/search',
+  GET_ALL_DESIGNATIONS: '/apis/proxies/v8/user/v1/positions',
+}
+@Injectable({
+  providedIn: 'root',
+})
+export class TrainingPlanService {
+  constructor(private http: HttpClient) { 
+    
+  }
+
+  getAllUsers(filter: object): Observable<any> {
+    return this.http.post<any>(`${API_END_POINTS.GET_ALL_USERS}`, filter).pipe(map(res => _.get(res, 'result.response')))
+  }
+
+  getDesignations() {
+    return this.http.get<any>(API_END_POINTS.GET_ALL_DESIGNATIONS)
+  }
+}
diff --git a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
index 1aa993dad..4b9e1d814 100644
--- a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
+++ b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
@@ -56,6 +56,8 @@ import { PreviewPlanComponent } from './routes/preview-plan/preview-plan.compone
 import { CreateContentComponent } from './routes/create-content/create-content.component'
 import { CategoryDropDownComponent } from './components/category-drop-down/category-drop-down.component'
 import { AddPlanInformationComponent } from './components/add-plan-information/add-plan-information.component'
+
+import { TrainingPlanService } from './services/traininig-plan.service';
 @NgModule({
   declarations: [
     TrainingPlanHomeComponent,
@@ -131,6 +133,7 @@ import { AddPlanInformationComponent } from './components/add-plan-information/a
   ],
   providers: [
     InitResolver,
+    TrainingPlanService
   ],
 })
 export class TrainingPlanModule {

From b7016c3e981fa81b99209353617150aa5e40f22d Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Mon, 11 Dec 2023 20:59:53 +0530
Subject: [PATCH 322/887] api integration  for add content, add assignee

---
 .../category-drop-down.component.ts           |  48 ++-
 .../components/search/search.component.html   |   4 +-
 .../components/search/search.component.ts     |  91 +++++-
 .../standard-card.component.html              | 115 +------
 .../standard-card/standard-card.component.ts  |   5 +
 .../user-card/user-card.component.html        | 308 ++----------------
 .../user-card/user-card.component.ts          |   3 +-
 .../create-assignee.component.html            |   4 +-
 .../create-assignee.component.ts              |  20 +-
 .../create-content.component.html             |   4 +-
 .../create-content.component.ts               |  15 +-
 .../training-plan-data-share.service.ts       |  12 +
 .../services/traininig-plan.service.ts        |  15 +
 13 files changed, 206 insertions(+), 438 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts

diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
index 3323e2931..e13b87dc2 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
@@ -1,10 +1,8 @@
 import { Component, EventEmitter, Input, Output, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
 import { MatDialog } from '@angular/material'
 import { ConfirmationBoxComponent } from '../confirmation-box/confirmation.box.component';
-import { TrainingPlanService } from './../../services/traininig-plan.service';
-/* tslint:disable */
-import _ from 'lodash'
+
+
 @Component({
   selector: 'ws-app-category-drop-down',
   templateUrl: './category-drop-down.component.html',
@@ -12,38 +10,30 @@ import _ from 'lodash'
 })
 export class CategoryDropDownComponent implements OnInit {
   @Input() categoryData: any[] = []
-  @Output() closeDropDown: any = new EventEmitter()
+  @Input() from:string = '';
+  @Output() handleCategorySelection: any = new EventEmitter()
   dialogRef: any
-  constructor(public dialog: MatDialog, private trainingPlanService: TrainingPlanService, private route: ActivatedRoute) { }
+  constructor(public dialog: MatDialog) { }
 
   ngOnInit() {
-    this.getAllUsers();
-    this.getDesignations();
+    // console.log("this.from", this.from);
+    // if(this.from === 'content') {
+    //   this.handleCategorySelection.emit('Course');
+    // } else if(this.from === 'assignee') {
+    //   this.handleCategorySelection.emit('Designation');
+    // }
   }
 
-  getAllUsers() {
-    const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
-    const filterObj = {
-      request: {
-        query: '',
-        filters: {
-          rootOrgId,
-          status: 1,
-        },
-        limit: 100,
-        offset: 0,
-      },
+  ngOnChanges() {
+    console.log("this.from", this.from);
+    if(this.from === 'content') {
+      this.handleCategorySelection.emit('Course');
+    } else if(this.from === 'assignee') {
+      this.handleCategorySelection.emit('Designation');
     }
-    this.trainingPlanService.getAllUsers(filterObj).subscribe((res:any) => {
-        console.log('res-->', res);
-    })
   }
 
-  getDesignations() {
-    this.trainingPlanService.getDesignations().subscribe((res:any)=>{
-      console.log('res-->', res);
-    })
-  }
+ 
 
   showDialogBox(event: any) {
     const dialogData: any = {}
@@ -117,7 +107,7 @@ export class CategoryDropDownComponent implements OnInit {
         dialogData['secondaryAction'] = 'Cancel'
       break
     }
-
+    this.handleCategorySelection.emit(event);
     this.openDialoagBox(dialogData)
   }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
index 529b9638c..b1f682f6b 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
@@ -1,8 +1,8 @@
 <div class="flex flex-1 flex-row search-container">
     <!-- Category Drop down -->
     <ng-container>
-        <ws-app-category-drop-down [categoryData]="categoryData"
-            (closeDropDown)="closeDropDown($event)"></ws-app-category-drop-down>
+        <ws-app-category-drop-down [categoryData]="categoryData" [from]="from"
+            (handleCategorySelection)="handleCategorySelection($event)"></ws-app-category-drop-down>
     </ng-container>
     <div class="search">
         <div class="rsearch"><mat-icon
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 89d95a467..e880bb938 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -1,6 +1,10 @@
-import { Component, Input, Inject, OnInit } from '@angular/core'
+import { Component, EventEmitter, Input, Inject, Output, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
 import { DOCUMENT } from '@angular/common'
-
+import { TrainingPlanService } from './../../services/traininig-plan.service';
+import { TrainingPlanDataSharingService } from './../../services/training-plan-data-share.service';
+/* tslint:disable */
+import _ from 'lodash'
 @Component({
   selector: 'ws-app-search',
   templateUrl: './search.component.html',
@@ -8,10 +12,20 @@ import { DOCUMENT } from '@angular/common'
 })
 export class SearchComponent implements OnInit {
   @Input() categoryData: any = []
+  @Input() from:any = '';
+  @Output() handleApiData = new EventEmitter();
   filterVisibilityFlag = false
-  constructor(@Inject(DOCUMENT) private document: Document) { }
+  constructor(@Inject(DOCUMENT) private document: Document, 
+  private trainingPlanService: TrainingPlanService, 
+  private route: ActivatedRoute,
+  private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
+    // this.handleCategorySelection('');
+  }
+
+  ngOnChanges() {
+    // this.handleCategorySelection('');
   }
 
   openFilter() {
@@ -31,4 +45,75 @@ export class SearchComponent implements OnInit {
     }
   }
 
+  handleCategorySelection(event:any) {
+    console.log('event--',event, this.from);
+    switch(this.from) {
+      case 'content':
+      event = !event ? 'Course' : event;
+      this.getContent(event);
+      break;
+      case 'assignee':
+      event = !event ? 'Designation' : event;
+      if(event === 'Designation') {
+        this.getDesignations(event);
+      } else if (event === 'Custom Users') {
+        this.getAllUsers(event);
+      }      
+      
+      break;
+    }
+  }
+
+  getContent(contentType:any) {
+    if(contentType) {
+      const filterObj  = {
+        "request":{"filters":{
+          "primaryCategory":["Standalone Assessment"],
+          "contentType":[contentType]},
+          "offset":0,
+          "limit":20,
+          "query":"",
+          "sort_by":{"lastUpdatedOn":"desc"},
+          "fields":["name","appIcon","instructions","description","purpose","mimeType","gradeLevel","identifier","medium","pkgVersion","board","subject","resourceType","primaryCategory","contentType","channel","organisation","trackable","license","posterImage","idealScreenSize","learningMode","creatorLogo","duration","version","avgRating"]},"query":""
+      };
+      this.trainingPlanService.getAllContent(filterObj).subscribe((res:any) => {
+        console.log('res-->', res);
+        this.trainingPlanDataSharingService.traingingPlanContentData =  {category:contentType , data: res};
+        this.handleApiData.emit(true);
+      })
+    }
+    
+  }
+
+  getAllUsers(event:any) {
+    console.log('event', event);
+    const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
+    const filterObj = {
+      request: {
+        query: '',
+        filters: {
+          rootOrgId,
+          status: 1,
+        },
+        limit: 100,
+        offset: 0,
+      },
+    }
+    this.trainingPlanService.getAllUsers(filterObj).subscribe((res:any) => {
+        console.log('res-->', res);
+        this.trainingPlanDataSharingService.traingingPlanAssigneeData =  {category:event , data: res};
+        this.handleApiData.emit(true);
+    })
+  }
+
+  getDesignations(event:any) {
+    this.trainingPlanService.getDesignations().subscribe((res:any)=>{
+      console.log('res-->', res);
+      this.trainingPlanDataSharingService.traingingPlanAssigneeData =  {category:event , data: res.responseData};
+      this.handleApiData.emit(true);
+    })
+  }
+
+
+
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
index d3fcd0958..722b30a8b 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
@@ -1,107 +1,7 @@
 <ng-container *ngIf="cardSize === 3">
     <div>
-        <div class="flex flex-3 flex-row card-grid-container flex-evenly">
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <div class="card-select-box" *ngIf="checkboxVisibility">
-                                                    <mat-checkbox class="card-select-check"></mat-checkbox>
-                                                </div>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <div class="card-select-box" *ngIf="checkboxVisibility">
-                                                    <mat-checkbox class="card-select-check"></mat-checkbox>
-                                                </div>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
+        <div class="flex flex-3 flex-row card-grid-container flex-evenly flex-wrap">
+            <div class="flex course-card" *ngFor="let item of contentData">
                 <mat-card class="card-standard-container mr-5 padding-remove">
                     <div class="display-contents">
                         <ng-container>
@@ -114,7 +14,7 @@
                                                     <mat-checkbox class="card-select-check"></mat-checkbox>
                                                 </div>
                                                 <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
+                                                    class="card-img ws-mat-primary-lite-background margin-remove" [src]="item?.posterImage" />
                                             </ng-container>
                                         </div>
                                         <div class="padding-m">
@@ -122,17 +22,18 @@
                                                 <div class="flex flex-end course_v2">
                                                     <mat-icon
                                                         class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
+                                                    {{item?.contentType}}
                                                 </div>
                                             </div>
                                             <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
+                                                {{item?.description}}
                                             </div>
                                             <div class="flex w-full flex-wrap flex-middle">
                                                 <div class="course_logo_box">
-                                                    <img class="source-icon" />
+                                                    <img class="source-icon" [src]="item?.appIcon"/>
                                                 </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
+                                                <span class="org-text" *ngIf="item?.organisation && item?.organisation[0]">
+                                                    By {{item?.organisation[0]}}</span>
                                             </div>
                                             <div class="flex flex-middle rating-session margin-top-m">
                                                 <div class="flex flex-middle">
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
index 65b55bf01..75392ad1d 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
@@ -8,9 +8,14 @@ import { Component, Input, OnInit } from '@angular/core'
 export class StandardCardComponent implements OnInit {
   @Input() cardSize: any
   @Input() checkboxVisibility: any = true
+  @Input() contentData:any[] = [];
   constructor() { }
 
   ngOnInit() {
   }
 
+  ngOnChanges() {
+    console.log('contentData', this.contentData);
+  }
+
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
index 0a6424e35..7f1957078 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
@@ -1,287 +1,31 @@
-<div class="flex flex-4 flex-row assignee-card-container">
-    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
-        <div class="avatar">
-            <div>HG</div>
-        </div>
-        <div class="assignee-desc">
-            <p>Heading</p>
-            <p class="sub-heading">Subheading</p>
-        </div>
-        <div class="check-action" *ngIf="checkboxVisibility">
-            <mat-checkbox class="example-margin"></mat-checkbox>
-        </div>
-    </div>
-    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
-        <div class="avatar">
-            <div>HG</div>
-        </div>
-        <div class="assignee-desc">
-            <p>Heading</p>
-            <p class="sub-heading">Subheading</p>
-        </div>
-        <div class="check-action" *ngIf="checkboxVisibility">
-            <mat-checkbox class="example-margin"></mat-checkbox>
-        </div>
-    </div>
-    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
-        <div class="avatar">
-            <div>HG</div>
-        </div>
-        <div class="assignee-desc">
-            <p>Heading</p>
-            <p class="sub-heading">Subheading</p>
-        </div>
-        <div class="check-action" *ngIf="checkboxVisibility">
-            <mat-checkbox class="example-margin"></mat-checkbox>
-        </div>
-    </div>
-    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
-        <div class="avatar">
-            <div>HG</div>
-        </div>
-        <div class="assignee-desc">
-            <p>Heading</p>
-            <p class="sub-heading">Subheading</p>
-        </div>
-        <div class="check-action" *ngIf="checkboxVisibility">
-            <mat-checkbox class="example-margin"></mat-checkbox>
-        </div>
-    </div>
-</div>
-<div class="flex flex-4 flex-row assignee-card-container">
-    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
-        <div class="avatar">
-            <div>HG</div>
-        </div>
-        <div class="assignee-desc">
-            <p>Heading</p>
-            <p class="sub-heading">Subheading</p>
-        </div>
-        <div class="check-action" *ngIf="checkboxVisibility">
-            <mat-checkbox class="example-margin"></mat-checkbox>
-        </div>
-    </div>
-    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
-        <div class="avatar">
-            <div>HG</div>
-        </div>
-        <div class="assignee-desc">
-            <p>Heading</p>
-            <p class="sub-heading">Subheading</p>
-        </div>
-        <div class="check-action" *ngIf="checkboxVisibility">
-            <mat-checkbox class="example-margin"></mat-checkbox>
-        </div>
-    </div>
-    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
-        <div class="avatar">
-            <div>HG</div>
-        </div>
-        <div class="assignee-desc">
-            <p>Heading</p>
-            <p class="sub-heading">Subheading</p>
-        </div>
-        <div class="check-action" *ngIf="checkboxVisibility">
-            <mat-checkbox class="example-margin"></mat-checkbox>
-        </div>
-    </div>
-    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
-        <div class="avatar">
-            <div>HG</div>
-        </div>
-        <div class="assignee-desc">
-            <p>Heading</p>
-            <p class="sub-heading">Subheading</p>
-        </div>
-        <div class="check-action" *ngIf="checkboxVisibility">
-            <mat-checkbox class="example-margin"></mat-checkbox>
-        </div>
-    </div>
-</div>
-<div class="flex flex-4 flex-row assignee-card-container">
-    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
-        <div class="avatar">
-            <div>HG</div>
-        </div>
-        <div class="assignee-desc">
-            <p>Heading</p>
-            <p class="sub-heading">Subheading</p>
-        </div>
-        <div class="check-action" *ngIf="checkboxVisibility">
-            <mat-checkbox class="example-margin"></mat-checkbox>
-        </div>
-    </div>
-    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
-        <div class="avatar">
-            <div>HG</div>
-        </div>
-        <div class="assignee-desc">
-            <p>Heading</p>
-            <p class="sub-heading">Subheading</p>
-        </div>
-        <div class="check-action" *ngIf="checkboxVisibility">
-            <mat-checkbox class="example-margin"></mat-checkbox>
-        </div>
-    </div>
-    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
-        <div class="avatar">
-            <div>HG</div>
-        </div>
-        <div class="assignee-desc">
-            <p>Heading</p>
-            <p class="sub-heading">Subheading</p>
-        </div>
-        <div class="check-action" *ngIf="checkboxVisibility">
-            <mat-checkbox class="example-margin"></mat-checkbox>
-        </div>
-    </div>
-    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
-        <div class="avatar">
-            <div>HG</div>
-        </div>
-        <div class="assignee-desc">
-            <p>Heading</p>
-            <p class="sub-heading">Subheading</p>
-        </div>
-        <div class="check-action" *ngIf="checkboxVisibility">
-            <mat-checkbox class="example-margin"></mat-checkbox>
-        </div>
-    </div>
-</div>
-<div class="flex flex-4 flex-row assignee-card-container">
-    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
-        <div class="avatar">
-            <div>HG</div>
-        </div>
-        <div class="assignee-desc">
-            <p>Heading</p>
-            <p class="sub-heading">Subheading</p>
-        </div>
-        <div class="check-action" *ngIf="checkboxVisibility">
-            <mat-checkbox class="example-margin"></mat-checkbox>
-        </div>
-    </div>
-    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
-        <div class="avatar">
-            <div>HG</div>
-        </div>
-        <div class="assignee-desc">
-            <p>Heading</p>
-            <p class="sub-heading">Subheading</p>
-        </div>
-        <div class="check-action" *ngIf="checkboxVisibility">
-            <mat-checkbox class="example-margin"></mat-checkbox>
-        </div>
-    </div>
-    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
-        <div class="avatar">
-            <div>HG</div>
-        </div>
-        <div class="assignee-desc">
-            <p>Heading</p>
-            <p class="sub-heading">Subheading</p>
-        </div>
-        <div class="check-action" *ngIf="checkboxVisibility">
-            <mat-checkbox class="example-margin"></mat-checkbox>
-        </div>
-    </div>
-    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
-        <div class="avatar">
-            <div>HG</div>
-        </div>
-        <div class="assignee-desc">
-            <p>Heading</p>
-            <p class="sub-heading">Subheading</p>
-        </div>
-        <div class="check-action" *ngIf="checkboxVisibility">
-            <mat-checkbox class="example-margin"></mat-checkbox>
-        </div>
-    </div>
-</div>
-<div class="flex flex-4 flex-row assignee-card-container">
-    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
-        <div class="avatar">
-            <div>HG</div>
-        </div>
-        <div class="assignee-desc">
-            <p>Heading</p>
-            <p class="sub-heading">Subheading</p>
-        </div>
-        <div class="check-action" *ngIf="checkboxVisibility">
-            <mat-checkbox class="example-margin"></mat-checkbox>
-        </div>
-    </div>
-    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
-        <div class="avatar">
-            <div>HG</div>
-        </div>
-        <div class="assignee-desc">
-            <p>Heading</p>
-            <p class="sub-heading">Subheading</p>
-        </div>
-        <div class="check-action" *ngIf="checkboxVisibility">
-            <mat-checkbox class="example-margin"></mat-checkbox>
-        </div>
-    </div>
-    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
-        <div class="avatar">
-            <div>HG</div>
-        </div>
-        <div class="assignee-desc">
-            <p>Heading</p>
-            <p class="sub-heading">Subheading</p>
-        </div>
-        <div class="check-action" *ngIf="checkboxVisibility">
-            <mat-checkbox class="example-margin"></mat-checkbox>
-        </div>
-    </div>
-    <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
-        <div class="avatar">
-            <div>HG</div>
-        </div>
-        <div class="assignee-desc">
-            <p>Heading</p>
-            <p class="sub-heading">Subheading</p>
-        </div>
-        <div class="check-action" *ngIf="checkboxVisibility">
-            <mat-checkbox class="example-margin"></mat-checkbox>
-        </div>
-    </div>
+<div class="flex flex-4 flex-row assignee-card-container flex-wrap" *ngIf="assigneeData?.category === 'Custom Users'">
+    <ng-container *ngFor="let item of assigneeData?.data?.content | slice : 0 : 20">
+        <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+            <div class="avatar">
+                <div>HG</div>
+            </div>
+            <div class="assignee-desc">
+                <p>{{item?.firstName}}</p>
+                <p class="sub-heading">{{item?.rootOrgName}}</p>
+            </div>
+            <div class="check-action" *ngIf="checkboxVisibility">
+                <mat-checkbox class="example-margin"></mat-checkbox>
+            </div>
+        </div>
+    </ng-container>
 </div>
 
 <!-- Custom User Card-->
 
-<div class="flex flex-4 flex-row custom-user-card-container">
-    <div class="flex flex-4 custom-user-card active-card">
-        <div class="custom-user-desc">
-            <p>Heading</p>
-        </div>
-        <div class="check-action" *ngIf="checkboxVisibility">
-            <mat-checkbox class="example-margin" [checked]="true"></mat-checkbox>
-        </div>
-    </div>
-    <div class="flex flex-4 custom-user-card">
-        <div class="custom-user-desc">
-            <p>Heading</p>
-        </div>
-        <div class="check-action" *ngIf="checkboxVisibility">
-            <mat-checkbox class="example-margin"></mat-checkbox>
-        </div>
-    </div>
-    <div class="flex flex-4 custom-user-card">
-        <div class="custom-user-desc">
-            <p>Heading</p>
-        </div>
-        <div class="check-action" *ngIf="checkboxVisibility">
-            <mat-checkbox class="example-margin"></mat-checkbox>
-        </div>
-    </div>
-    <div class="flex flex-4 custom-user-card">
-        <div class="custom-user-desc">
-            <p>Heading</p>
-        </div>
-        <div class="check-action" *ngIf="checkboxVisibility">
-            <mat-checkbox class="example-margin"></mat-checkbox>
-        </div>
-    </div>
+<div class="flex flex-4 flex-row custom-user-card-container flex-wrap" *ngIf="assigneeData?.category === 'Designation'">
+    <ng-container *ngFor="let item of assigneeData?.data | slice : 0 : 20">
+        <div class="flex flex-4 custom-user-card active-card">
+            <div class="custom-user-desc">
+                <p>{{item?.name}}</p>
+            </div>
+            <div class="check-action" *ngIf="checkboxVisibility">
+                <mat-checkbox class="example-margin"></mat-checkbox>
+            </div>
+        </div>
+    </ng-container>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
index d58719ddf..e2628d2a6 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
@@ -6,7 +6,8 @@ import { Component, Input, OnInit } from '@angular/core'
   styleUrls: ['./user-card.component.scss'],
 })
 export class UserCardComponent implements OnInit {
-  @Input() checkboxVisibility = true
+  @Input() checkboxVisibility = true;
+  @Input() assigneeData:any[] = [];
   constructor() { }
 
   ngOnInit() {
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
index 6d59e70f5..c8abf7912 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
@@ -1,9 +1,9 @@
 <ng-container>
-    <ws-app-search [categoryData]="categoryData"></ws-app-search>
+    <ws-app-search [categoryData]="categoryData" [from]="from" (handleApiData)="handleApiData($event)"></ws-app-search>
 </ng-container>
 <ng-container>
     <ws-app-chip></ws-app-chip>
 </ng-container>
 <ng-container>
-    <ws-app-user-card></ws-app-user-card>
+    <ws-app-user-card [assigneeData]="assigneeData"></ws-app-user-card>
 </ng-container>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
index 7946da476..5ca862df6 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
@@ -1,4 +1,5 @@
-import { Component, OnInit } from '@angular/core'
+import { Component, OnInit } from '@angular/core';
+import { TrainingPlanDataSharingService } from './../../services/training-plan-data-share.service';
 
 @Component({
   selector: 'ws-app-create-assignee',
@@ -6,9 +7,10 @@ import { Component, OnInit } from '@angular/core'
   styleUrls: ['./create-assignee.component.scss'],
 })
 export class CreateAssigneeComponent implements OnInit {
-  categoryData: any[] = []
-  constructor() { }
-
+  categoryData: any[] = [];
+  assigneeData:any[] = [];
+  constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
+  from = 'assignee';
   ngOnInit() {
     this.categoryData = [
       {
@@ -26,10 +28,14 @@ export class CreateAssigneeComponent implements OnInit {
         name: 'Custom Users',
         value: 'Custom Users',
       },
-    ]
-
-    
+    ]    
   }
 
+  handleApiData(event:any) {
+    if(event) {
+      console.log(this.trainingPlanDataSharingService.traingingPlanAssigneeData);
+      this.assigneeData = this.trainingPlanDataSharingService.traingingPlanAssigneeData;
+    }
+  }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
index bcccad215..d830c8cb3 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
@@ -1,12 +1,12 @@
 <ng-container>
-    <ws-app-search [categoryData]="categoryData"></ws-app-search>
+    <ws-app-search [categoryData]="categoryData" [from]="from" (handleApiData)="handleApiData($event)"></ws-app-search>
 </ng-container>
 
 <ng-container>
     <div class="flex flex-row">
         <div class="flex-1">
             <ws-app-chip></ws-app-chip>
-            <ws-app-standard-card [cardSize]="3"></ws-app-standard-card>
+            <ws-app-standard-card [cardSize]="3" [contentData]="contentData"></ws-app-standard-card>
         </div>
         <div class="flex-2 margin-left-s margin-top-s">
             <ws-app-competency-summary></ws-app-competency-summary>
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
index 8137348bf..d0060726c 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
@@ -1,13 +1,15 @@
 import { Component, OnInit } from '@angular/core'
-
+import { TrainingPlanDataSharingService } from './../../services/training-plan-data-share.service';
 @Component({
   selector: 'ws-app-create-content',
   templateUrl: './create-content.component.html',
   styleUrls: ['./create-content.component.scss'],
 })
 export class CreateContentComponent implements OnInit {
-  categoryData: any[] = []
-  constructor() { }
+  categoryData: any[] = [];
+  contentData:any[] = [];
+  from = 'content';
+  constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
     this.categoryData = [
@@ -39,4 +41,11 @@ export class CreateContentComponent implements OnInit {
     ]
   }
 
+  handleApiData(event:any) {
+    if(event) {
+      console.log(this.trainingPlanDataSharingService.traingingPlanContentData);
+      this.contentData = this.trainingPlanDataSharingService.traingingPlanContentData.data.content;
+    }
+  }
+
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts b/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
new file mode 100644
index 000000000..f9894fdb3
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
@@ -0,0 +1,12 @@
+import { Injectable } from '@angular/core'
+
+@Injectable({
+  providedIn: 'root',
+})
+export class TrainingPlanDataSharingService {
+  traingingPlanContentData: any;
+  traingingPlanAssigneeData:any;
+  constructor() { 
+    
+  }
+}
diff --git a/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts b/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
index 5b7dfe53a..f0ad0e3fa 100644
--- a/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
+++ b/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
@@ -7,6 +7,9 @@ import _ from 'lodash'
 // tslint:enable
 
 const API_END_POINTS = {
+  CREATE_PLAN: 'apis/proxies/v8/cbplan/v1/create',
+  UPDATE_PLAN: 'apis/proxies/v8/cbplan/v1/update',
+  GET_ALL_CONTENT: '/apis/proxies/v8/sunbirdigot/search',
   GET_ALL_USERS: '/apis/proxies/v8/user/v1/search',
   GET_ALL_DESIGNATIONS: '/apis/proxies/v8/user/v1/positions',
 }
@@ -17,6 +20,18 @@ export class TrainingPlanService {
   constructor(private http: HttpClient) { 
     
   }
+  //reqObj:object
+  createPlan() {
+
+  }
+
+  updatePlan() {
+
+  }
+
+  getAllContent(filter:object):Observable<any> {
+    return this.http.post<any>(`${API_END_POINTS.GET_ALL_CONTENT}`, filter).pipe(map(res => _.get(res, 'result')))
+  }
 
   getAllUsers(filter: object): Observable<any> {
     return this.http.post<any>(`${API_END_POINTS.GET_ALL_USERS}`, filter).pipe(map(res => _.get(res, 'result.response')))

From 7ca8ef7e8201ce5a33be41c40de1fbbe57133987 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Tue, 12 Dec 2023 11:04:43 +0530
Subject: [PATCH 323/887] still working on UI

---
 .../standard-card.component.html              | 741 +-----------------
 .../user-card/user-card.component.scss        |   3 +-
 .../create-timeline.component.html            |  17 +-
 .../create-timeline.component.scss            |  20 +-
 .../preview-plan/preview-plan.component.html  |   8 +-
 src/app/component/root/root.component.ts      |   2 +-
 6 files changed, 22 insertions(+), 769 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
index d3fcd0958..bbc56a2d1 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
@@ -1382,736 +1382,9 @@
     </div>
 </ng-container>
 <ng-container *ngIf="cardSize === 5">
-    <div class="flex flex-4 flex-row card-grid">
-        <div class="flex flex-3 flex-row card-grid-container">
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <div class="card-select-box" *ngIf="checkboxVisibility">
-                                                    <mat-checkbox class="card-select-check"></mat-checkbox>
-                                                </div>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-        </div>
-    </div>
-    <div class="flex flex-4 flex-row card-grid">
-        <div class="flex flex-3 flex-row card-grid-container">
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <div class="card-select-box" *ngIf="checkboxVisibility">
-                                                    <mat-checkbox class="card-select-check"></mat-checkbox>
-                                                </div>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-        </div>
-    </div>
-
-    <div class="flex flex-4 flex-row card-grid">
-        <div class="flex flex-3 flex-row card-grid-container">
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <div class="card-select-box" *ngIf="checkboxVisibility">
-                                                    <mat-checkbox class="card-select-check"></mat-checkbox>
-                                                </div>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-        </div>
-    </div>
-    <div class="flex flex-4 flex-row card-grid">
-        <div class="flex flex-3 flex-row card-grid-container">
-            <div class="flex  course-card">
+    <div class="">
+        <div class="flex flex-3 flex-row card-grid-container flex-wrap">
+            <div class="flex  course-card  margin-right-l margin-right-l">
                 <mat-card class="card-standard-container mr-5 padding-remove">
                     <div class="display-contents">
                         <ng-container>
@@ -2161,7 +1434,7 @@
                     </div>
                 </mat-card>
             </div>
-            <div class="flex  course-card">
+            <div class="flex  course-card  margin-right-l">
                 <mat-card class="card-standard-container mr-5 padding-remove">
                     <div class="display-contents">
                         <ng-container>
@@ -2208,7 +1481,7 @@
                     </div>
                 </mat-card>
             </div>
-            <div class="flex  course-card">
+            <div class="flex  course-card  margin-right-l">
                 <mat-card class="card-standard-container mr-5 padding-remove">
                     <div class="display-contents">
                         <ng-container>
@@ -2255,7 +1528,7 @@
                     </div>
                 </mat-card>
             </div>
-            <div class="flex  course-card">
+            <div class="flex  course-card  margin-right-l">
                 <mat-card class="card-standard-container mr-5 padding-remove">
                     <div class="display-contents">
                         <ng-container>
@@ -2302,7 +1575,7 @@
                     </div>
                 </mat-card>
             </div>
-            <div class="flex  course-card">
+            <div class="flex  course-card  margin-right-l">
                 <mat-card class="card-standard-container mr-5 padding-remove">
                     <div class="display-contents">
                         <ng-container>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
index 2d3ec291e..c415cb552 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
@@ -11,11 +11,10 @@
 
 .assignee-card-without-checkbox {
     background-color: rgb(240,240,240);
-    width: 292px;
+    width: 301px;
     border: none !important;
     border-radius: 4px;
     padding: 22px 12px !important;
-    margin-left: 20px;
 }
 
 .avatar {
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
index 1e9607a9c..ca88772b4 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
@@ -2,20 +2,19 @@
     <ws-app-add-timeline-form></ws-app-add-timeline-form>
 </ng-container>
 <ng-container>
-    <div class="mt-48">
-        <div class="flex flex-row flex-2">
-            <div class="mat-subheading-1 left-heading">Selected Cards</div>
-            <div (click)="showAll()" class="mat-subheading-2 right-heading cursor-pointer show-all">Show all <img src="assets/icons/forward_arrow.svg"/> </div>
+    <div class="margin-top-xl">
+        <div class="flex flex-middle flex-between">
+            <div class="mat-subheading-1 margin-remove">Selected Cards</div>
+            <a mat-button (click)="showAll()" class="show-all">Show all <mat-icon>keyboard_arrow_right</mat-icon></a>
         </div>
-        
     </div>
     <ws-app-standard-card [cardSize]="5" [checkboxVisibility]="false"></ws-app-standard-card>
 </ng-container>
 <ng-container>
-    <div class="mt-32">
-        <div class="flex flex-row flex-2">
-            <div class="mat-subheading-1 left-heading">Selected Content</div>
-            <div (click)="showAll()" class="mat-subheading-2 right-heading cursor-pointer show-all">Show all <img src="assets/icons/forward_arrow.svg"/> </div>
+    <div class="margin-top-xl">
+        <div class=" flex flex-middle flex-between">
+            <div class="mat-subheading-1 margin-remove">Selected Cards</div>
+            <a mat-button (click)="showAll()" class="show-all">Show all <mat-icon>keyboard_arrow_right</mat-icon></a>
         </div>
     </div>
     <ws-app-user-card [checkboxVisibility]="false"></ws-app-user-card>
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.scss b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.scss
index 0659cd30c..351003608 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.scss
@@ -1,19 +1,3 @@
-.mt-48 {
-    margin-top : 48px
-}
-
-.mt-32 {
-    margin-top : 32px
-}
-
-.left-heading {
-    width: 95%;
-}
-.right-heading {
-    color: #1B4CA1;
-
-}
-
-.show-all img{
-    vertical-align: middle;
+.show-all {
+    color: #0075B7 !important;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
index e8f8b88f9..d9b824809 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
@@ -1,9 +1,7 @@
 <ws-app-breadcrumb [showBreadcrumbAction]="false"></ws-app-breadcrumb>
-<div class="flex flex-1 flex-row mt-8">
-    <div class="go-back cursor-pointer" (click)="goBack()">
-        <img src="assets/icons/backwardArrow.svg"/><span>Go back </span>
-    </div>
+<div class="flex margin-top-l">
+    <button mat-stroked-button><mat-icon>arrow_back</mat-icon> Go back</button>
 </div>
-<div class="flex flex-1 flex-row mt-16">
+<div class="flex">
     <ws-app-standard-card [cardSize]="5"></ws-app-standard-card>
 </div>
\ No newline at end of file
diff --git a/src/app/component/root/root.component.ts b/src/app/component/root/root.component.ts
index 9cb5adf56..a7ee3c01a 100644
--- a/src/app/component/root/root.component.ts
+++ b/src/app/component/root/root.component.ts
@@ -123,7 +123,7 @@ export class RootComponent implements OnInit, AfterViewInit {
         }
       }
       if (event instanceof NavigationStart) {
-        if (event.url.includes('preview') || event.url.includes('embed')) {
+        if (event.url.includes('embed')) {
           this.isNavBarRequired = false
         } else if (event.url.includes('author/') && this.isInIframe) {
           this.isNavBarRequired = false

From aea273be760ba642fed4109477667a1152cf800a Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Tue, 12 Dec 2023 12:22:45 +0530
Subject: [PATCH 324/887] still working

---
 .../components/chip/chip.component.html       |  11 +-
 .../components/chip/chip.component.scss       |   3 +-
 .../standard-card.component.html              | 534 ++----------------
 3 files changed, 45 insertions(+), 503 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
index 03b6e4db8..e1dccff9c 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
@@ -1,5 +1,5 @@
 <div class="flex flex-row chip-container">
-    <div class="flex flex-2 left-section">
+    <div class="flex flex-2 left-section flex-middle">
         <div class="selected-item-label">Selected items - </div>
         <div class="chips">
             <div class="chips-content">
@@ -16,12 +16,9 @@
                 <span class="color-60">Himanshu Gupta</span><img class="cursor-pointer" src="assets/icons/close.svg" />
             </div>
         </div>
-        <div class="select-more-link cursor-pointer"><span>+3 more</span></div>
+        <a mat-button class="select-more-link margin-left-m">+3 more</a>
     </div>
-    <div class="flex flex-1 flex-row right-section">
-        <div class="select-more-link cursor-pointer" (click)="clearAll()">
-            <span>Clear all</span>
-        </div>
-
+    <div class="flex flex-1 flex-row right-section flex-middle">
+        <a mat-button class="select-more-link" (click)="clearAll()">Clear all</a>
     </div>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.scss b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.scss
index 761b6c20c..bc0f45fbc 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.scss
@@ -31,8 +31,7 @@
 }
 
 .select-more-link {
-    margin: 10px 12px;
-    color: #1B4CA1;
+    color: #0075B7 !important;
     font-weight: 700;
     letter-spacing: 0.25px;
     font-family: 'Lato';
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
index 58f4d31b4..f28e136fe 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
@@ -1,504 +1,50 @@
 <ng-container *ngIf="cardSize === 3">
-    <div>
-        <div class="flex flex-3 flex-row card-grid-container flex-evenly flex-wrap">
-            <div class="flex course-card" *ngFor="let item of contentData">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <div class="card-select-box" *ngIf="checkboxVisibility">
-                                                    <mat-checkbox class="card-select-check"></mat-checkbox>
-                                                </div>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" [src]="item?.posterImage" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    {{item?.contentType}}
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                {{item?.description}}
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" [src]="item?.appIcon"/>
-                                                </div>
-                                                <span class="org-text" *ngIf="item?.organisation && item?.organisation[0]">
-                                                    By {{item?.organisation[0]}}</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-
-        </div>
-    </div>
-    <!-- <div class="flex flex-4 flex-row card-grid">
-        <div class="flex flex-3 flex-row card-grid-container">
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <div class="card-select-box" *ngIf="checkboxVisibility">
-                                                    <mat-checkbox class="card-select-check"></mat-checkbox>
-                                                </div>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-        </div>
-    </div>
-    <div class="flex flex-4 flex-row card-grid">
-        <div class="flex flex-3 flex-row card-grid-container">
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <div class="card-select-box" *ngIf="checkboxVisibility">
-                                                    <mat-checkbox class="card-select-check"></mat-checkbox>
-                                                </div>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
+    <div class="flex flex-3 flex-row card-grid-container flex-wrap">
+        <div class="flex course-card margin-right-xl" *ngFor="let item of contentData">
+            <mat-card class="card-standard-container mr-5 padding-remove">
+                <mat-card-content class="min-top">
+                    <div style="position: relative; z-index: 1;">
                         <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
+                            <div class="card-select-box" *ngIf="checkboxVisibility">
+                                <mat-checkbox class="card-select-check"></mat-checkbox>
+                            </div>
+                            <img mat-card-image loading="lazy"
+                                class="card-img ws-mat-primary-lite-background margin-remove"
+                                [src]="item?.posterImage" />
                         </ng-container>
                     </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
+                    <div class="padding-m">
+                        <div class="course_widget flex margin-remove">
+                            <div class="flex flex-end course_v2">
+                                <mat-icon
+                                    class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
+                                {{item?.contentType}}
+                            </div>
+                        </div>
+                        <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
+                            {{item?.description}}
+                        </div>
+                        <div class="flex w-full flex-wrap flex-middle">
+                            <div class="course_logo_box">
+                                <img class="source-icon" [src]="item?.appIcon" />
+                            </div>
+                            <span class="org-text" *ngIf="item?.organisation && item?.organisation[0]">
+                                By {{item?.organisation[0]}}</span>
+                        </div>
+                        <div class="flex flex-middle rating-session margin-top-m">
+                            <div class="flex flex-middle">
+                                <mat-icon class="mr-1">star</mat-icon>
+                                <span>4.5</span>
+                            </div>
+                            <ng-container>
+                                <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                            </ng-container>
+                        </div>
                     </div>
-                </mat-card>
-            </div>
+                </mat-card-content>
+            </mat-card>
         </div>
     </div>
-    <div class="flex flex-4 flex-row card-grid">
-        <div class="flex flex-3 flex-row card-grid-container">
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <div class="card-select-box" *ngIf="checkboxVisibility">
-                                                    <mat-checkbox class="card-select-check"></mat-checkbox>
-                                                </div>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-        </div>
-    </div> -->
 </ng-container>
 <ng-container *ngIf="cardSize === 4">
     <div class="flex flex-4 flex-row card-grid">

From b7a081a1b3c15641c8a8b5249367f0d990c91818 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Tue, 12 Dec 2023 12:31:33 +0530
Subject: [PATCH 325/887] update for user card

---
 .../components/user-card/user-card.component.scss    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
index 2d3ec291e..a74ede139 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
@@ -7,6 +7,7 @@
     border-radius: 4px;
     padding: 16px;
     margin-right: 20px;
+    margin-bottom: 16px;
 }
 
 .assignee-card-without-checkbox {
@@ -35,6 +36,8 @@
     flex-direction: column;
     padding: 0 16px;
     width: 230px;
+    white-space:nowrap;
+    text-overflow: ellipsis;
 }
 
 .assignee-desc .sub-heading {
@@ -46,6 +49,9 @@
 .assignee-desc p {
     padding: 0;
     margin: 0;
+    width:190px;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 
 .assignee-card-container .check-action {
@@ -65,6 +71,7 @@
     border-radius: 4px;
     padding: 24px 16px;
     margin-right: 20px;
+    margin-bottom: 16px;
 }
 
 .custom-user-card.active-card {
@@ -76,12 +83,17 @@
     flex-direction: column;
     padding: 0 16px;
     width: 230px;
+    white-space:nowrap;
+    
 }
 
 
 .custom-user-desc p {
     padding: 0;
     margin: 0;
+    width: 190px;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 
 .custom-user-card-container .check-action {

From 981d155cb9775f1b1451f7f62ca1612cffa4bd87 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Tue, 12 Dec 2023 19:58:39 +0530
Subject: [PATCH 326/887] update for create plan api integration, selected
 chips, clear chips

---
 .../add-timeline-form.component.html          |   2 +-
 .../add-timeline-form.component.ts            |  15 ++-
 .../breadcrumb/breadcrumb.component.html      |   4 +-
 .../breadcrumb/breadcrumb.component.ts        |  25 +++-
 .../category-drop-down.component.ts           | 117 ++++++++++--------
 .../components/chip/chip.component.html       |  36 ++++--
 .../components/chip/chip.component.scss       |  10 +-
 .../components/chip/chip.component.ts         |  63 +++++++++-
 .../components/search/search.component.ts     |  14 ++-
 .../standard-card.component.html              |   4 +-
 .../standard-card/standard-card.component.ts  |  40 +++++-
 .../user-card/user-card.component.html        |   4 +-
 .../user-card/user-card.component.ts          |  36 +++++-
 .../create-assignee.component.html            |   4 +-
 .../create-assignee.component.ts              |  18 +++
 .../create-content.component.html             |   4 +-
 .../create-content.component.ts               |  18 +++
 .../create-timeline.component.html            |  10 +-
 .../create-timeline.component.ts              |  30 ++++-
 .../training-plan-data-share.service.ts       |  10 ++
 .../services/traininig-plan.service.ts        |   4 +-
 21 files changed, 364 insertions(+), 104 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html
index 887f762fb..3f3ba1d49 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html
@@ -7,7 +7,7 @@
         <div class="calender">
         <mat-form-field appearance="outline">
             <mat-label>Select date</mat-label>
-            <input matInput [matDatepicker]="picker">
+            <input matInput #ref [matDatepicker]="picker" [min]="todayDate" [(ngModel)]="todayDate" (dateChange)="changeTimeline(ref.value)">
             <mat-datepicker-toggle matSuffix [for]="picker">
                 <mat-icon matDatepickerToggleIcon>calendar_today</mat-icon>
             </mat-datepicker-toggle>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
index cab3cb26d..403236bec 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
@@ -1,15 +1,24 @@
 import { Component, OnInit } from '@angular/core'
-
+import { DatePipe } from '@angular/common';
+import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service';
 @Component({
   selector: 'ws-app-add-timeline-form',
   templateUrl: './add-timeline-form.component.html',
   styleUrls: ['./add-timeline-form.component.scss'],
+  providers: [DatePipe]
 })
 export class AddTimelineFormComponent implements OnInit {
-
-  constructor() { }
+  todayDate:Date = new Date();
+  constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService, private datePipe: DatePipe) { }
 
   ngOnInit() {
+    this.trainingPlanDataSharingService.trainingPlanStepperData['endDate'] = this.datePipe.transform(this.todayDate,"yyyy-MM-dd");
+  }
+
+  changeTimeline(timeline:any) {
+    
+    this.trainingPlanDataSharingService.trainingPlanStepperData['endDate'] = this.datePipe.transform(timeline,"yyyy-MM-dd");
+    console.log('timeline',this.trainingPlanDataSharingService.trainingPlanStepperData);
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
index 1a6873934..272b49a0f 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
@@ -16,9 +16,9 @@
             <span>Cancel</span>
         </button>
         <button mat-button class="next-btn margin-left-m" (click)="nextStep()"
-            *ngIf="tabType.CREATE_PLAN === selectedTab || tabType.ADD_CONTENT === selectedTab || tabType.ADD_ASSIGNEE === selectedTab">
+            *ngIf="tabType.CREATE_PLAN === selectedTab || tabType.ADD_CONTENT === selectedTab || tabType.ADD_ASSIGNEE === selectedTab || tabType.ADD_TIMELINE === selectedTab">
             <span>Next: {{(tabType.CREATE_PLAN === selectedTab) ? 'Add Content' : (tabType.ADD_CONTENT === selectedTab)
-                ? 'Add assignee' : (tabType.ADD_ASSIGNEE === selectedTab) ? 'Add timeline' : ''}}</span>
+                ? 'Add assignee' : (tabType.ADD_ASSIGNEE === selectedTab) ? 'Add timeline' : 'Draft'}}</span>
         </button>
     </div>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
index 8c447e208..09e2f3bfc 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
@@ -2,7 +2,9 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
 import { MatDialog } from '@angular/material'
 import { Router } from '@angular/router'
 import { ConfirmationBoxComponent } from '../confirmation-box/confirmation.box.component'
-import { TrainingPlanContent } from '../../models/training-plan.model'
+import { TrainingPlanContent } from '../../models/training-plan.model';
+import { TrainingPlanService } from '../../services/traininig-plan.service';
+import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service';
 @Component({
   selector: 'ws-app-breadcrumb',
   templateUrl: './breadcrumb.component.html',
@@ -17,7 +19,9 @@ export class BreadcrumbComponent implements OnInit {
   public dialogRef: any
   tabType = TrainingPlanContent.TTabLabelKey
 
-  constructor(private router: Router, public dialog: MatDialog) { }
+  constructor(private router: Router, public dialog: MatDialog, 
+    private trainingPlanDataSharingService: TrainingPlanDataSharingService,
+    private trainingPlanService: TrainingPlanService) { }
 
   ngOnInit() {
   }
@@ -28,6 +32,7 @@ export class BreadcrumbComponent implements OnInit {
 
   nextStep() {
     // this.showDialogBox('progress-completed')
+    console.log('this.selectedTab', this.selectedTab);
     switch (this.selectedTab) {
       case TrainingPlanContent.TTabLabelKey.CREATE_PLAN:
         this.changeToNextTab.emit(TrainingPlanContent.TTabLabelKey.ADD_CONTENT)
@@ -38,6 +43,9 @@ export class BreadcrumbComponent implements OnInit {
       case TrainingPlanContent.TTabLabelKey.ADD_ASSIGNEE:
         this.changeToNextTab.emit(TrainingPlanContent.TTabLabelKey.ADD_TIMELINE)
         break
+      case TrainingPlanContent.TTabLabelKey.ADD_TIMELINE:
+        this.createPlanDraftView();
+        break;
     }
 
   }
@@ -94,4 +102,17 @@ export class BreadcrumbComponent implements OnInit {
   hideConfirmationBox() {
     this.dialogRef.close()
   }
+
+  createPlanDraftView() {
+    console.log(this.trainingPlanDataSharingService.trainingPlanStepperData);
+    // let obj = {"request": this.trainingPlanDataSharingService.trainingPlanStepperData} ;
+    // this.showDialogBox('progress');
+    // this.trainingPlanService.createPlan(obj).subscribe((data:any)=>{
+    //   console.log('data', data);
+    //   this.showDialogBox('progress-completed');
+    //   setTimeout(()=>{
+    //     this.router.navigateByUrl('app/home/training-plan-dashboard')
+    //   },1000);
+    // })  
+  }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
index e13b87dc2..a7697efca 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
@@ -1,7 +1,7 @@
 import { Component, EventEmitter, Input, Output, OnInit } from '@angular/core';
 import { MatDialog } from '@angular/material'
 import { ConfirmationBoxComponent } from '../confirmation-box/confirmation.box.component';
-
+import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service';
 
 @Component({
   selector: 'ws-app-category-drop-down',
@@ -13,7 +13,7 @@ export class CategoryDropDownComponent implements OnInit {
   @Input() from:string = '';
   @Output() handleCategorySelection: any = new EventEmitter()
   dialogRef: any
-  constructor(public dialog: MatDialog) { }
+  constructor(public dialog: MatDialog, private trainingPlanDataSharingService:TrainingPlanDataSharingService) { }
 
   ngOnInit() {
     // console.log("this.from", this.from);
@@ -27,8 +27,10 @@ export class CategoryDropDownComponent implements OnInit {
   ngOnChanges() {
     console.log("this.from", this.from);
     if(this.from === 'content') {
+      this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = 'Course';
       this.handleCategorySelection.emit('Course');
     } else if(this.from === 'assignee') {
+      this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType'] = 'Designation';
       this.handleCategorySelection.emit('Designation');
     }
   }
@@ -40,73 +42,82 @@ export class CategoryDropDownComponent implements OnInit {
     switch (event) {
       case 'Course':
         // `Changing it now will result in the loss of your current selection. It's advisable to save the current one as a draft and create a new one instead.`
-        dialogData['type'] = 'normal'
-        dialogData['icon'] = 'radio_on'
-        dialogData['title'] = 'You are attempting to change the selected content type?'
-        dialogData['subTitle'] = 'Test'
-        dialogData['primaryAction'] = 'I understand, change content type'
-        dialogData['secondaryAction'] = 'Cancel'
+        dialogData['type'] = 'normal';
+        dialogData['icon'] = 'radio_on';
+        dialogData['title'] = 'You are attempting to change the selected content type?';
+        dialogData['subTitle'] = 'Test';
+        dialogData['primaryAction'] = 'I understand, change content type';
+        dialogData['secondaryAction'] = 'Cancel';
+        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event;
       break
       case 'Program':
-        dialogData['type'] = 'normal'
-        dialogData['icon'] = 'radio_on'
-        dialogData['title'] = 'You are attempting to change the selected content type?'
-        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection. It's advisable to save the current one as a draft and create a new one instead.`
-        dialogData['primaryAction'] = 'I understand, change content type'
-        dialogData['secondaryAction'] = 'Cancel'
+        dialogData['type'] = 'normal';
+        dialogData['icon'] = 'radio_on';
+        dialogData['title'] = 'You are attempting to change the selected content type?';
+        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection. It's advisable to save the current one as a draft and create a new one instead.`;
+        dialogData['primaryAction'] = 'I understand, change content type';
+        dialogData['secondaryAction'] = 'Cancel';
+        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event;
       break
       case 'Blended program':
-        dialogData['type'] = 'normal'
-        dialogData['icon'] = 'radio_on'
-        dialogData['title'] = 'You are attempting to change the selected content type?'
-        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection. It's advisable to save the current one as a draft and create a new one instead.`
-        dialogData['primaryAction'] = 'I understand, change content type'
-        dialogData['secondaryAction'] = 'Cancel'
+        dialogData['type'] = 'normal';
+        dialogData['icon'] = 'radio_on';
+        dialogData['title'] = 'You are attempting to change the selected content type?';
+        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection. It's advisable to save the current one as a draft and create a new one instead.`;
+        dialogData['primaryAction'] = 'I understand, change content type';
+        dialogData['secondaryAction'] = 'Cancel';
+        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event;
       break
       case 'Curated program':
-        dialogData['type'] = 'normal'
-        dialogData['icon'] = 'radio_on'
-        dialogData['title'] = 'You are attempting to change the selected content type?'
-        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection. It's advisable to save the current one as a draft and create a new one instead.`
-        dialogData['primaryAction'] = 'I understand, change content type'
-        dialogData['secondaryAction'] = 'Cancel'
+        dialogData['type'] = 'normal';
+        dialogData['icon'] = 'radio_on';
+        dialogData['title'] = 'You are attempting to change the selected content type?';
+        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection. It's advisable to save the current one as a draft and create a new one instead.`;
+        dialogData['primaryAction'] = 'I understand, change content type';
+        dialogData['secondaryAction'] = 'Cancel';
+        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event;
       break
       case 'Moderated Course':
-        dialogData['type'] = 'normal'
-        dialogData['icon'] = 'radio_on'
-        dialogData['title'] = 'You are attempting to change the selected content type?'
-        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection. It's advisable to save the current one as a draft and create a new one instead.`
-        dialogData['primaryAction'] = 'I understand, change content type'
-        dialogData['secondaryAction'] = 'Cancel'
+        dialogData['type'] = 'normal';
+        dialogData['icon'] = 'radio_on';
+        dialogData['title'] = 'You are attempting to change the selected content type?';
+        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection. It's advisable to save the current one as a draft and create a new one instead.`;
+        dialogData['primaryAction'] = 'I understand, change content type';
+        dialogData['secondaryAction'] = 'Cancel';
+        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event;
       break
       case 'Designation':
-        dialogData['type'] = 'normal'
-        dialogData['icon'] = 'radio_on'
-        dialogData['title'] = 'You are attempting to change the selected user type?'
-        dialogData['subTitle'] = `By selecting all users, you've selected all the users from your Department of fisheries.
-        If you want to select custom users or by designation, use the above option`
-        dialogData['primaryAction'] = 'I understand, change user type'
-        dialogData['secondaryAction'] = 'Cancel'
+        dialogData['type'] = 'normal';
+        dialogData['icon'] = 'radio_on';
+        dialogData['title'] = 'You are attempting to change the selected user type?';
+        dialogData['subTitle'] = `By selecting all users, you've selected all the users from your Department of fisheries.;
+        If you want to select custom users or by designation, use the above option`;
+        dialogData['primaryAction'] = 'I understand, change user type';
+        dialogData['secondaryAction'] = 'Cancel';
+        this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType'] = event;
       break
       case 'All Users':
-        dialogData['type'] = 'normal'
-        dialogData['icon'] = 'radio_on'
-        dialogData['title'] = 'You are attempting to change the selected user type?'
-        dialogData['subTitle'] = `By selecting all users, you've selected all the users from your Department of fisheries.
-        If you want to select custom users or by designation, use the above option`
-        dialogData['primaryAction'] = 'I understand, change user type'
-        dialogData['secondaryAction'] = 'Cancel'
+        dialogData['type'] = 'normal';
+        dialogData['icon'] = 'radio_on';
+        dialogData['title'] = 'You are attempting to change the selected user type?';
+        dialogData['subTitle'] = `By selecting all users, you've selected all the users from your Department of fisheries.;
+        If you want to select custom users or by designation, use the above option`;
+        dialogData['primaryAction'] = 'I understand, change user type';
+        dialogData['secondaryAction'] = 'Cancel';
+        this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType'] = event;
       break
       case 'Custom Users':
-        dialogData['type'] = 'normal'
-        dialogData['icon'] = 'radio_on'
-        dialogData['title'] = 'You are attempting to change the selected user type?'
-        dialogData['subTitle'] = `By selecting all users, you've selected all the users from your Department of fisheries.
-        If you want to select custom users or by designation, use the above option`
-        dialogData['primaryAction'] = 'I understand, change user type'
-        dialogData['secondaryAction'] = 'Cancel'
+        dialogData['type'] = 'normal';
+        dialogData['icon'] = 'radio_on';
+        dialogData['title'] = 'You are attempting to change the selected user type?';
+        dialogData['subTitle'] = `By selecting all users, you've selected all the users from your Department of fisheries.;
+        If you want to select custom users or by designation, use the above option`;
+        dialogData['primaryAction'] = 'I understand, change user type';
+        dialogData['secondaryAction'] = 'Cancel';
+        this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType'] = event;
       break
     }
+    
     this.handleCategorySelection.emit(event);
     this.openDialoagBox(dialogData)
   }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
index e1dccff9c..550a34314 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
@@ -1,24 +1,38 @@
-<div class="flex flex-row chip-container">
+<div class="flex flex-row chip-container" *ngIf="selectContentCount > 0 && from === 'content'">
     <div class="flex flex-2 left-section flex-middle">
         <div class="selected-item-label">Selected items - </div>
-        <div class="chips">
+        <ng-container *ngFor="let item of selectedContentChips | slice : 0 : 3">
+        <div class="chips flex flex-row" *ngIf="item?.selected">
             <div class="chips-content">
-                <span class="color-60">Himanshu Gupta</span><img class="cursor-pointer" src="assets/icons/close.svg" />
+                <span class="color-60">{{item?.name}}</span>
             </div>
-        </div>
-        <div class="chips">
-            <div class="chips-content">
-                <span class="color-60">Himanshu Gupta</span><img class="cursor-pointer" src="assets/icons/close.svg" />
+            <div class="cross-icon" (click)="removeContent(item)">
+                <img class="cursor-pointer" src="assets/icons/close.svg" />
             </div>
         </div>
-        <div class="chips">
+        </ng-container>
+        <a mat-button class="select-more-link margin-left-m" *ngIf="selectContentCount > 3">+3 more</a>
+    </div>
+    <div class="flex flex-1 flex-row right-section flex-middle">
+        <a mat-button class="select-more-link" (click)="clearAll()">Clear all</a>
+    </div>
+</div>
+<div class="flex flex-row chip-container" *ngIf="selectAssigneeCount > 0 && from === 'assignee'">
+    <div class="flex flex-2 left-section flex-middle">
+        <div class="selected-item-label">Selected items - </div>
+        <ng-container *ngFor="let item of selectedAssigneeChips | slice : 0 : 3">
+        <div class="chips flex flex-row" *ngIf="item?.selected">
             <div class="chips-content">
-                <span class="color-60">Himanshu Gupta</span><img class="cursor-pointer" src="assets/icons/close.svg" />
+                <span class="color-60">{{item?.name}}</span>                
+            </div>
+            <div class="cross-icon" (click)="removeAssignee(item)">
+                <img class="cursor-pointer" src="assets/icons/close.svg" />
             </div>
         </div>
-        <a mat-button class="select-more-link margin-left-m">+3 more</a>
+        </ng-container>
+        <a mat-button class="select-more-link margin-left-m" *ngIf="selectAssigneeCount > 3">+3 more</a>
     </div>
     <div class="flex flex-1 flex-row right-section flex-middle">
         <a mat-button class="select-more-link" (click)="clearAll()">Clear all</a>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.scss b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.scss
index bc0f45fbc..bab256949 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.scss
@@ -6,12 +6,16 @@
 }
 
 .chips-content {
-    margin: 10px 16px;
+    margin: 12px 16px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    vertical-align: middle;
 }
 
-.chips-content img {
+.cross-icon {
     vertical-align: middle;
-    margin-left: 8px;
+    margin: 12px 16px;
 }
 .chip-container {
     margin-top:20px;
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
index c221cd188..395712956 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
@@ -1,19 +1,74 @@
-import { Component, OnInit } from '@angular/core'
-
+import { Component, Input, OnInit } from '@angular/core'
+import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service';
 @Component({
   selector: 'ws-app-chip',
   templateUrl: './chip.component.html',
   styleUrls: ['./chip.component.scss'],
 })
 export class ChipComponent implements OnInit {
-
-  constructor() { }
+  @Input() selectedContentChips:any[] = [];
+  @Input() selectContentCount:number = 0;
+  @Input() from:any;
+  @Input() selectedAssigneeChips:any[] = [];
+  @Input() selectAssigneeCount:number = 0;
+  constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
   }
 
+  ngOnChanges() {
+    console.log('selectedAssigneeChips--', this.selectedAssigneeChips);
+  }
+
   clearAll() {
+    if(this.from === 'content') {
+      this.selectContentCount = 0;
+      this.trainingPlanDataSharingService.traingingPlanContentData.data.content.map((sitem:any)=>{
+        if(sitem['selected']) {
+          sitem['selected'] = false;
+        }
+      })
+      this.trainingPlanDataSharingService.trainingPlanStepperData.contentList = [];
+      this.trainingPlanDataSharingService.trainingPlanStepperData.contentType = '';
+    }
+    if(this.from === 'assignee') {
+      this.selectContentCount = 0;
+      console.log('this.trainingPlanDataSharingService.traingingPlanAssigneeData',this.trainingPlanDataSharingService.traingingPlanAssigneeData);
+      this.trainingPlanDataSharingService.traingingPlanAssigneeData.data.map((sitem:any)=>{
+        if(sitem['selected']) {
+          sitem['selected'] = false;
+        }
+      })
+      this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo = [];
+      this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentType = '';
+    }
+    
+  }
+
+  removeContent(item:any) {
+    console.log('item', item);
+    this.trainingPlanDataSharingService.traingingPlanContentData.data.content.map((sitem:any)=>{
+      if(sitem['selected'] && sitem['identifier'] === item['identifier']) {
+        sitem['selected'] = false;
+      }
+    })
+    if(this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.indexOf(item['identifier']) > -1) {
+      let index = this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.findIndex((x:any) => x === item['identifier']);
+      this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.splice(index,1);
+    }
+  }
 
+  removeAssignee(item:any) {
+    console.log('item', item, this.trainingPlanDataSharingService.traingingPlanAssigneeData);
+    this.trainingPlanDataSharingService.traingingPlanAssigneeData.data.map((sitem:any)=>{
+      if(sitem['selected'] && sitem['id'] === item['id']) {
+        sitem['selected'] = false;
+      }      
+    })
+    if(this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.indexOf(item['identifier']) > -1) {
+      let index = this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.findIndex((x:any) => x === item['id']);
+      this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.splice(index,1);
+    }
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index e880bb938..6d6dd7e33 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -78,7 +78,19 @@ export class SearchComponent implements OnInit {
       };
       this.trainingPlanService.getAllContent(filterObj).subscribe((res:any) => {
         console.log('res-->', res);
-        this.trainingPlanDataSharingService.traingingPlanContentData =  {category:contentType , data: res};
+        
+        // if(this.trainingPlanDataSharingService.traingingPlanContentData &&
+        //    this.trainingPlanDataSharingService.traingingPlanContentData['data'] &&
+        //    this.trainingPlanDataSharingService.traingingPlanContentData['data']['content'] && 
+        //    this.trainingPlanDataSharingService.traingingPlanContentData['data']['content'].length 
+        //   ) {
+        //     console.log('this.trainingPlanDataSharingService.traingingPlanContentData',this.trainingPlanDataSharingService.traingingPlanContentData);
+        //     res && res.content.map((sitem:any)=> {
+        //       sitem
+        //     })
+        // } 
+
+        this.trainingPlanDataSharingService.traingingPlanContentData =  {category:contentType , data: res};        
         this.handleApiData.emit(true);
       })
     }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
index f28e136fe..78a534943 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
@@ -1,4 +1,4 @@
-<ng-container *ngIf="cardSize === 3">
+<ng-container>
     <div class="flex flex-3 flex-row card-grid-container flex-wrap">
         <div class="flex course-card margin-right-xl" *ngFor="let item of contentData">
             <mat-card class="card-standard-container mr-5 padding-remove">
@@ -6,7 +6,7 @@
                     <div style="position: relative; z-index: 1;">
                         <ng-container>
                             <div class="card-select-box" *ngIf="checkboxVisibility">
-                                <mat-checkbox class="card-select-check"></mat-checkbox>
+                                <mat-checkbox class="card-select-check" [checked]="item?.selected" (change)="selectContentItem($event, item)"></mat-checkbox>
                             </div>
                             <img mat-card-image loading="lazy"
                                 class="card-img ws-mat-primary-lite-background margin-remove"
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
index 75392ad1d..8db3a48ff 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
@@ -1,5 +1,5 @@
-import { Component, Input, OnInit } from '@angular/core'
-
+import { Component, EventEmitter, Input, Output, OnInit } from '@angular/core'
+import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service';
 @Component({
   selector: 'ws-app-standard-card',
   templateUrl: './standard-card.component.html',
@@ -9,7 +9,9 @@ export class StandardCardComponent implements OnInit {
   @Input() cardSize: any
   @Input() checkboxVisibility: any = true
   @Input() contentData:any[] = [];
-  constructor() { }
+  @Output() handleSelectedChips = new EventEmitter();
+  selectedContent:any[]= [];
+  constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
   }
@@ -18,4 +20,36 @@ export class StandardCardComponent implements OnInit {
     console.log('contentData', this.contentData);
   }
 
+  selectContentItem(event:any, item:any) {
+    if(event.checked) {
+      // this.selectedContent.push(item); 
+      this.trainingPlanDataSharingService.traingingPlanContentData.data.content.map((sitem:any, index:any)=>{
+        if(sitem.identifier === item.identifier) {
+          sitem['selected'] = true;
+          this.trainingPlanDataSharingService.traingingPlanContentData.data.content.splice(index,1);
+          this.trainingPlanDataSharingService.traingingPlanContentData.data.content.unshift(sitem);
+        }
+      })
+      
+      if(this.trainingPlanDataSharingService.trainingPlanStepperData['contentList']) {
+        this.trainingPlanDataSharingService.trainingPlanStepperData['contentList'].push(item.identifier);
+      }
+      
+    } else {      
+      // this.selectedContent = this.selectedContent.filter( sitem  => sitem.identifier !== item.identifier)
+      this.trainingPlanDataSharingService.traingingPlanContentData.data.content.map((sitem:any)=>{
+        if(sitem.identifier === item.identifier) {
+          sitem['selected'] = false;
+        }
+      })  
+      this.trainingPlanDataSharingService.trainingPlanStepperData['contentList'].filter((identifier:any, index:any)=>{
+        if(identifier === item.identifier) {
+          this.trainingPlanDataSharingService.trainingPlanStepperData['contentList'].splice(index,1);
+        }
+      })
+    }
+    console.log(' this.trainingPlanDataSharingService.trainingPlanStepperData', this.trainingPlanDataSharingService.trainingPlanStepperData);
+    this.handleSelectedChips.emit(true);
+  }
+
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
index 7f1957078..b5d55b5d0 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
@@ -9,7 +9,7 @@
                 <p class="sub-heading">{{item?.rootOrgName}}</p>
             </div>
             <div class="check-action" *ngIf="checkboxVisibility">
-                <mat-checkbox class="example-margin"></mat-checkbox>
+                <mat-checkbox class="example-margin" [checked]="item?.selected" (change)="selectAssigneeItem($event, item)"></mat-checkbox>
             </div>
         </div>
     </ng-container>
@@ -24,7 +24,7 @@
                 <p>{{item?.name}}</p>
             </div>
             <div class="check-action" *ngIf="checkboxVisibility">
-                <mat-checkbox class="example-margin"></mat-checkbox>
+                <mat-checkbox class="example-margin" [checked]="item?.selected" (change)="selectAssigneeItem($event, item)"></mat-checkbox>
             </div>
         </div>
     </ng-container>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
index e2628d2a6..a0b1fce92 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
@@ -1,5 +1,5 @@
-import { Component, Input, OnInit } from '@angular/core'
-
+import { Component, EventEmitter, Input, Output, OnInit } from '@angular/core'
+import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service';
 @Component({
   selector: 'ws-app-user-card',
   templateUrl: './user-card.component.html',
@@ -8,9 +8,39 @@ import { Component, Input, OnInit } from '@angular/core'
 export class UserCardComponent implements OnInit {
   @Input() checkboxVisibility = true;
   @Input() assigneeData:any[] = [];
-  constructor() { }
+  @Output() handleSelectedChips = new EventEmitter();
+  constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
   }
 
+  selectAssigneeItem(event:any, item:any) {
+    if(event.checked) {
+      // this.selectedContent.push(item); 
+      this.trainingPlanDataSharingService.traingingPlanAssigneeData.data.map((sitem:any, index:any)=>{
+        if(sitem.id === item.id) {
+          sitem['selected'] = true;
+          this.trainingPlanDataSharingService.traingingPlanAssigneeData.data.splice(index,1);
+          this.trainingPlanDataSharingService.traingingPlanAssigneeData.data.unshift(sitem);
+        }
+      }) 
+      if(this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo']) {
+        this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].push(item.id);
+      }    
+    } else {      
+      // this.selectedContent = this.selectedContent.filter( sitem  => sitem.identifier !== item.identifier)
+      this.trainingPlanDataSharingService.traingingPlanAssigneeData.data.map((sitem:any)=>{
+        if(sitem.id === item.id) {
+          sitem['selected'] = false;
+        }
+      })  
+      this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier:any, index:any)=>{
+        if(identifier === item.id) {
+          this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].splice(index,1);
+        }
+      })
+    }
+    this.handleSelectedChips.emit(true);
+  }
+
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
index c8abf7912..10f753b5b 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
@@ -2,8 +2,8 @@
     <ws-app-search [categoryData]="categoryData" [from]="from" (handleApiData)="handleApiData($event)"></ws-app-search>
 </ng-container>
 <ng-container>
-    <ws-app-chip></ws-app-chip>
+    <ws-app-chip [selectedAssigneeChips]="selectedAssigneeChips" [from]="from" [selectAssigneeCount]="selectAssigneeCount"></ws-app-chip>
 </ng-container>
 <ng-container>
-    <ws-app-user-card [assigneeData]="assigneeData"></ws-app-user-card>
+    <ws-app-user-card [assigneeData]="assigneeData" (handleSelectedChips)="handleSelectedChips($event)"></ws-app-user-card>
 </ng-container>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
index 5ca862df6..a4dce8944 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
@@ -9,6 +9,8 @@ import { TrainingPlanDataSharingService } from './../../services/training-plan-d
 export class CreateAssigneeComponent implements OnInit {
   categoryData: any[] = [];
   assigneeData:any[] = [];
+  selectAssigneeCount:number = 0;
+  selectedAssigneeChips:any[] = [];
   constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
   from = 'assignee';
   ngOnInit() {
@@ -38,4 +40,20 @@ export class CreateAssigneeComponent implements OnInit {
     }
   }
 
+  handleSelectedChips(event:any) {
+    console.log('event', event);
+    this.selectAssigneeCount = 0;
+    if(event) {
+      this.selectedAssigneeChips = this.trainingPlanDataSharingService.traingingPlanAssigneeData.data;
+      console.log('this.selectedAssigneeChips', this.selectedAssigneeChips);
+      this.selectedAssigneeChips.map((sitem)=>{
+        if(sitem.selected) {
+          this.selectAssigneeCount = this.selectAssigneeCount + 1;
+          console.log('this.selectContentCount', this.selectAssigneeCount);
+        }
+      })
+    }
+    
+  }
+
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
index d830c8cb3..dba797d8d 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
@@ -5,8 +5,8 @@
 <ng-container>
     <div class="flex flex-row">
         <div class="flex-1">
-            <ws-app-chip></ws-app-chip>
-            <ws-app-standard-card [cardSize]="3" [contentData]="contentData"></ws-app-standard-card>
+            <ws-app-chip [selectedContentChips]="selectedContentChips" [from]="from" [selectContentCount]="selectContentCount"></ws-app-chip>
+            <ws-app-standard-card [cardSize]="3" [contentData]="contentData" (handleSelectedChips)="handleSelectedChips($event)"></ws-app-standard-card>
         </div>
         <div class="flex-2 margin-left-s margin-top-s">
             <ws-app-competency-summary></ws-app-competency-summary>
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
index d0060726c..b2d0f5a6b 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
@@ -9,6 +9,8 @@ export class CreateContentComponent implements OnInit {
   categoryData: any[] = [];
   contentData:any[] = [];
   from = 'content';
+  selectedContentChips:any[] = [];
+  selectContentCount:number = 0;
   constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
@@ -48,4 +50,20 @@ export class CreateContentComponent implements OnInit {
     }
   }
 
+  handleSelectedChips(event:any) {
+    console.log('event', event);
+    this.selectContentCount = 0;
+    if(event) {
+      this.selectedContentChips = this.trainingPlanDataSharingService.traingingPlanContentData.data.content;
+      console.log('this.selectedContentChips', this.selectedContentChips);
+      this.selectedContentChips.map((sitem)=>{
+        if(sitem.selected) {
+          this.selectContentCount = this.selectContentCount + 1;
+          console.log('this.selectContentCount', this.selectContentCount);
+        }
+      })
+    }
+    
+  }
+
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
index ca88772b4..1aad4ba6e 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
@@ -1,21 +1,21 @@
 <ng-container>
     <ws-app-add-timeline-form></ws-app-add-timeline-form>
 </ng-container>
-<ng-container>
+<ng-container *ngIf="contentData.length">
     <div class="margin-top-xl">
         <div class="flex flex-middle flex-between">
-            <div class="mat-subheading-1 margin-remove">Selected Cards</div>
+            <div class="mat-subheading-1 margin-remove">Selected Content</div>
             <a mat-button (click)="showAll()" class="show-all">Show all <mat-icon>keyboard_arrow_right</mat-icon></a>
         </div>
     </div>
-    <ws-app-standard-card [cardSize]="5" [checkboxVisibility]="false"></ws-app-standard-card>
+    <ws-app-standard-card [checkboxVisibility]="false" [contentData]="contentData"></ws-app-standard-card>
 </ng-container>
-<ng-container>
+<ng-container *ngIf="assigneeData && assigneeData.data.length">
     <div class="margin-top-xl">
         <div class=" flex flex-middle flex-between">
             <div class="mat-subheading-1 margin-remove">Selected Cards</div>
             <a mat-button (click)="showAll()" class="show-all">Show all <mat-icon>keyboard_arrow_right</mat-icon></a>
         </div>
     </div>
-    <ws-app-user-card [checkboxVisibility]="false"></ws-app-user-card>
+    <ws-app-user-card [checkboxVisibility]="false" [assigneeData]="assigneeData"></ws-app-user-card>
 </ng-container>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
index d3648b0c6..15b408e20 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
@@ -1,16 +1,40 @@
 import { Component, OnInit } from '@angular/core'
 import { Router } from '@angular/router'
-
+import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service';
 @Component({
   selector: 'ws-app-create-timeline',
   templateUrl: './create-timeline.component.html',
   styleUrls: ['./create-timeline.component.scss'],
 })
 export class CreateTimelineComponent implements OnInit {
-
-  constructor(private router: Router) { }
+  contentData:any[] = [];
+  assigneeData:any;
+  constructor(private router: Router, private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
+    if(this.trainingPlanDataSharingService.traingingPlanContentData && 
+      this.trainingPlanDataSharingService.traingingPlanContentData.data && 
+      this.trainingPlanDataSharingService.traingingPlanContentData.data.content
+      ) {
+        this.contentData = this.trainingPlanDataSharingService.traingingPlanContentData.data.content.filter((item:any)=>{
+          return item.selected
+        })
+
+    }
+    
+    console.log('this.contentData', this.contentData);
+    console.log('this.trainingPlanDataSharingService.traingingPlanAssigneeData', this.trainingPlanDataSharingService.traingingPlanAssigneeData);
+    if(this.trainingPlanDataSharingService.traingingPlanAssigneeData &&
+      this.trainingPlanDataSharingService.traingingPlanAssigneeData.data
+      ) {
+        let category = this.trainingPlanDataSharingService.traingingPlanAssigneeData.category;
+    let assigneeData = this.trainingPlanDataSharingService.traingingPlanAssigneeData.data.filter((item:any)=>{
+      return item.selected;
+    });
+    this.assigneeData = {'category':category,data:assigneeData};
+
+    console.log('this.assigneeData', this.assigneeData);
+  }
   }
 
   showAll() {
diff --git a/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts b/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
index f9894fdb3..9c59ef1d6 100644
--- a/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
+++ b/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
@@ -6,6 +6,16 @@ import { Injectable } from '@angular/core'
 export class TrainingPlanDataSharingService {
   traingingPlanContentData: any;
   traingingPlanAssigneeData:any;
+  trainingPlanStepperData:any = {
+    "name": "CBP Plan Name",
+    "contentType": "",
+    "contentList": [
+    ],
+    "assignmentType": "",
+    "assignmentTypeInfo": [
+    ],
+    "endDate": ""
+  };
   constructor() { 
     
   }
diff --git a/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts b/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
index f0ad0e3fa..f0a1b1f04 100644
--- a/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
+++ b/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
@@ -21,8 +21,8 @@ export class TrainingPlanService {
     
   }
   //reqObj:object
-  createPlan() {
-
+  createPlan(obj:any) {
+    return this.http.post<any>(`${API_END_POINTS.CREATE_PLAN}`, obj).pipe(map(res => _.get(res, 'result')))
   }
 
   updatePlan() {

From cf25c64159aedd63b73ece97295b6c31887c2df6 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Tue, 12 Dec 2023 21:48:16 +0530
Subject: [PATCH 327/887] update for create plan api integration, selected
 chips, clear chips

---
 .../breadcrumb/breadcrumb.component.ts        | 18 ++++++++---------
 .../create-assignee.component.ts              | 15 +++++++++++++-
 .../create-content.component.ts               | 20 +++++++++++++++++--
 3 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
index 09e2f3bfc..3d26dc178 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
@@ -105,14 +105,14 @@ export class BreadcrumbComponent implements OnInit {
 
   createPlanDraftView() {
     console.log(this.trainingPlanDataSharingService.trainingPlanStepperData);
-    // let obj = {"request": this.trainingPlanDataSharingService.trainingPlanStepperData} ;
-    // this.showDialogBox('progress');
-    // this.trainingPlanService.createPlan(obj).subscribe((data:any)=>{
-    //   console.log('data', data);
-    //   this.showDialogBox('progress-completed');
-    //   setTimeout(()=>{
-    //     this.router.navigateByUrl('app/home/training-plan-dashboard')
-    //   },1000);
-    // })  
+    let obj = {"request": this.trainingPlanDataSharingService.trainingPlanStepperData} ;
+    this.showDialogBox('progress');
+    this.trainingPlanService.createPlan(obj).subscribe((data:any)=>{
+      console.log('data', data);
+      this.showDialogBox('progress-completed');
+      setTimeout(()=>{
+        this.router.navigateByUrl('app/home/training-plan-dashboard')
+      },1000);
+    })  
   }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
index a4dce8944..b08ade108 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
@@ -36,7 +36,20 @@ export class CreateAssigneeComponent implements OnInit {
   handleApiData(event:any) {
     if(event) {
       console.log(this.trainingPlanDataSharingService.traingingPlanAssigneeData);
-      this.assigneeData = this.trainingPlanDataSharingService.traingingPlanAssigneeData;
+      if(this.trainingPlanDataSharingService.trainingPlanStepperData &&
+        this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo) {
+        console.log('this.trainingPlanDataSharingService.traingingPlanContentData.data.content', this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo);
+        this.trainingPlanDataSharingService.traingingPlanAssigneeData.data.map((sitem:any)=> {
+          if(this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.indexOf(sitem.id) > -1) {
+            sitem['selected'] = true;
+          }
+        })
+        this.assigneeData = this.trainingPlanDataSharingService.traingingPlanAssigneeData;
+        this.handleSelectedChips(true);
+      } else {
+        this.assigneeData = this.trainingPlanDataSharingService.traingingPlanAssigneeData;
+      }
+      
     }
   }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
index b2d0f5a6b..d6114c00d 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
@@ -40,13 +40,29 @@ export class CreateContentComponent implements OnInit {
         name: 'Moderated Course',
         value: 'Moderated Course',
       },
-    ]
+    ];
+    
+    
   }
 
   handleApiData(event:any) {
     if(event) {
       console.log(this.trainingPlanDataSharingService.traingingPlanContentData);
-      this.contentData = this.trainingPlanDataSharingService.traingingPlanContentData.data.content;
+      if(this.trainingPlanDataSharingService.trainingPlanStepperData &&
+        this.trainingPlanDataSharingService.trainingPlanStepperData.contentList) {
+        console.log('this.trainingPlanDataSharingService.traingingPlanContentData.data.content', this.trainingPlanDataSharingService.trainingPlanStepperData.contentList);
+        this.trainingPlanDataSharingService.traingingPlanContentData.data.content.map((sitem:any)=> {
+          if(this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.indexOf(sitem.identifier) > -1) {
+            sitem['selected'] = true;
+          }
+        })
+        this.contentData = this.trainingPlanDataSharingService.traingingPlanContentData.data.content;
+        this.handleSelectedChips(true);
+      } else {
+        this.contentData = this.trainingPlanDataSharingService.traingingPlanContentData.data.content;
+      }
+      
+
     }
   }
 

From 0cc2b68d4854dc0eb8b8f79bf92e2ca6decb8fcb Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Tue, 12 Dec 2023 21:51:40 +0530
Subject: [PATCH 328/887] update for create plan api integration, selected
 chips, clear chips

---
 .../components/breadcrumb/breadcrumb.component.ts             | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
index 3d26dc178..430a37443 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
@@ -109,9 +109,11 @@ export class BreadcrumbComponent implements OnInit {
     this.showDialogBox('progress');
     this.trainingPlanService.createPlan(obj).subscribe((data:any)=>{
       console.log('data', data);
+      this.dialogRef.close();
       this.showDialogBox('progress-completed');
       setTimeout(()=>{
-        this.router.navigateByUrl('app/home/training-plan-dashboard')
+        this.dialogRef.close();
+        this.router.navigateByUrl('app/home/training-plan-dashboard');
       },1000);
     })  
   }

From 8cb84caa75872804ff2afb4b1ea84bc8f2449b09 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Wed, 13 Dec 2023 09:16:52 +0530
Subject: [PATCH 329/887] working on create plan title

---
 .../add-plan-information.component.html       | 19 ++++++++++++---
 .../add-plan-information.component.scss       | 11 ++++++++-
 .../add-plan-information.component.ts         | 23 +++++++++++++++++--
 .../breadcrumb/breadcrumb.component.html      |  4 ++++
 .../breadcrumb/breadcrumb.component.ts        |  4 ++++
 .../components/stepper/stepper.component.html | 10 ++++----
 .../components/stepper/stepper.component.ts   |  5 ++++
 .../create-plan/create-plan.component.html    |  3 ++-
 .../create-plan/create-plan.component.ts      |  4 ++++
 .../training-plan-data-share.service.ts       |  9 ++++----
 10 files changed, 76 insertions(+), 16 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.html b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.html
index 5fea2fd39..425b4bdf2 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.html
@@ -1,9 +1,22 @@
-<div class="flex flex-1 flex-column form-container">
+<div class="flex flex-1 flex-column form-container plan-info">
     <div class="label">
         Plan information
     </div>
     <div class="form-element">
-        <div class="fonm-element-label">Plan title <span class="required"></span></div>
-        <input class="sinput color-60  mt-8" label="" placeholder="Enter Plan title" type="Standard">
+        <form [formGroup]="contentForm">
+            <div class="title-name">
+                <div class="fonm-element-label">Plan title <span class="required"></span></div>
+                <mat-form-field appearance="outline" class="w-full" fxFlex="40">
+                    <input class="w-full" matInput placeholder="Enter Plan title" formControlName="name" maxlength="70">
+                    <mat-hint align="end">{{ contentForm.controls['name'].value.length }} / 70</mat-hint>
+                    <mat-error *ngIf="contentForm.controls['name'].hasError('minlength')">
+                        Minimum 10 characters are required
+                    </mat-error>
+                    <mat-error *ngIf="contentForm.controls['name'].hasError('required')">
+                        Plan title is mandatory
+                    </mat-error>
+                </mat-form-field>
+            </div>
+        </form>
     </div>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.scss b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.scss
index 335598b0e..02b703557 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.scss
@@ -1,5 +1,5 @@
 ::ng-deep .mat-form-field-appearance-outline .mat-form-field-flex {
-    width: 369px   
+    width: 369px
 }
 
 .form-container {
@@ -32,4 +32,13 @@
     padding: 15px 16px;
     font: 400 14px Lato;
     width: 95%;
+}
+
+
+::ng-deep {
+    .plan-info {
+        .mat-form-field-appearance-outline .mat-form-field-flex{
+            width: 100%;
+        }
+    }
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
index f231d25a5..dfa2d6c57 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
@@ -1,4 +1,7 @@
-import { Component, OnInit } from '@angular/core'
+import { Component, EventEmitter, OnInit, Output } from '@angular/core'
+import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'
+import { debounceTime } from 'rxjs/operators'
+import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
 
 @Component({
   selector: 'ws-app-add-plan-information',
@@ -7,9 +10,25 @@ import { Component, OnInit } from '@angular/core'
 })
 export class AddPlanInformationComponent implements OnInit {
 
-  constructor() { }
+  @Output() planTitleValid = new EventEmitter<any>()
+
+  contentForm!: FormGroup
+
+  constructor(
+    private formBuilder: FormBuilder,
+    private trainingPlanDataSharingSvc: TrainingPlanDataSharingService
+  ) { }
 
   ngOnInit() {
+    this.contentForm = this.formBuilder.group({
+      name: new FormControl('', [Validators.required, Validators.minLength(10)])
+    })
+    this.contentForm.controls['name'].valueChanges.pipe(debounceTime(700)).subscribe((_ele: any) => {
+      if (!this.contentForm.invalid) {
+        this.trainingPlanDataSharingSvc.trainingPlanTitle = _ele
+      }
+      this.planTitleValid.emit(this.contentForm.invalid)
+    })
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
index 1a6873934..e744460b3 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
@@ -20,5 +20,9 @@
             <span>Next: {{(tabType.CREATE_PLAN === selectedTab) ? 'Add Content' : (tabType.ADD_CONTENT === selectedTab)
                 ? 'Add assignee' : (tabType.ADD_ASSIGNEE === selectedTab) ? 'Add timeline' : ''}}</span>
         </button>
+        <button mat-button class="next-btn margin-left-m" (click)="saveAsDraft()"
+            *ngIf="tabType.ADD_TIMELINE === selectedTab">
+            <span>Save as draft</span>
+        </button>
     </div>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
index 8c447e208..266618a1f 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
@@ -94,4 +94,8 @@ export class BreadcrumbComponent implements OnInit {
   hideConfirmationBox() {
     this.dialogRef.close()
   }
+
+  saveAsDraft() {
+    this.changeToNextTab.emit('saveAsDraft')
+  }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
index 48604631a..87308dbcc 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
@@ -1,15 +1,15 @@
 <div class="stepper">
     <mat-tab-group #tabGroup [disableRipple]="true" [selectedIndex]="tabIndexValue" class="margin-top-m"
         (selectedTabChange)="tabSelected($event)">
-        <mat-tab [label]="tabType.CREATE_PLAN">
+        <mat-tab [label]="tabType.CREATE_PLAN" [disabled]="true">
             <ng-template mat-tab-label>
                 1. Create a plan
             </ng-template>
             <ng-template matTabContent>
-                <ws-app-add-plan-information></ws-app-add-plan-information>
+                <ws-app-add-plan-information (planTitleValid)="checkForPlanTitle($event)"></ws-app-add-plan-information>
             </ng-template>
         </mat-tab>
-        <mat-tab [label]="tabType.ADD_CONTENT">
+        <mat-tab [label]="tabType.ADD_CONTENT" [disabled]="true">
             <ng-template mat-tab-label>
                 <span>2. Add Content
                 </span>
@@ -18,7 +18,7 @@
                 <ws-app-create-content></ws-app-create-content>
             </ng-template>
         </mat-tab>
-        <mat-tab [label]="tabType.ADD_ASSIGNEE">
+        <mat-tab [label]="tabType.ADD_ASSIGNEE" [disabled]="true">
             <ng-template mat-tab-label>
                 <span>3. Add Assignee</span>
             </ng-template>
@@ -26,7 +26,7 @@
                 <ws-app-create-assignee></ws-app-create-assignee>
             </ng-template>
         </mat-tab>
-        <mat-tab [label]="tabType.ADD_TIMELINE">
+        <mat-tab [label]="tabType.ADD_TIMELINE" [disabled]="true">
             <ng-template mat-tab-label>
                 <span>4. Add Timeline</span>
             </ng-template>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
index efb944f61..e22a06f55 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
@@ -10,6 +10,7 @@ export class StepperComponent implements OnInit, OnChanges {
 
   @Input() changeTabOnNext!: string
   @Output() selectedTabType = new EventEmitter<any>()
+  @Output() planTitleCheck = new EventEmitter<any>()
 
   tabType = TrainingPlanContent.TTabLabelKey
   tabIndexValue: number = 0
@@ -41,4 +42,8 @@ export class StepperComponent implements OnInit, OnChanges {
     this.selectedTabType.emit(tempData)
   }
 
+  checkForPlanTitle(_event: any) {
+    this.planTitleCheck.emit(_event)
+  }
+
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
index 207dfb36d..1e53d583f 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
@@ -1,4 +1,5 @@
 <div class="plan-container">
     <ws-app-breadcrumb [selectedTab]="selectedTabData" (changeToNextTab)="changeTab($event)"></ws-app-breadcrumb>
-    <ws-app-stepper (selectedTabType)="selectedTabAction($event)" [changeTabOnNext]="nextTab"></ws-app-stepper>
+    <ws-app-stepper (selectedTabType)="selectedTabAction($event)" [changeTabOnNext]="nextTab"
+        (planTitleCheck)="planTitleValidation($event)"></ws-app-stepper>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
index 151b59e68..99ff97863 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
@@ -32,4 +32,8 @@ export class CreatePlanComponent implements OnInit, AfterViewInit, OnDestroy {
   changeTab(_event: any) {
     this.nextTab = _event
   }
+
+  planTitleValidation(_event: any) {
+    debugger
+  }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts b/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
index f9894fdb3..d5465fa6d 100644
--- a/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
+++ b/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
@@ -4,9 +4,10 @@ import { Injectable } from '@angular/core'
   providedIn: 'root',
 })
 export class TrainingPlanDataSharingService {
-  traingingPlanContentData: any;
-  traingingPlanAssigneeData:any;
-  constructor() { 
-    
+  trainingPlanTitle: string = ''
+  traingingPlanContentData: any
+  traingingPlanAssigneeData: any
+  constructor() {
+
   }
 }

From 4e13dac2444f9b57b625fa06fa899a98d4cbf30f Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Wed, 13 Dec 2023 09:22:26 +0530
Subject: [PATCH 330/887] changed the spell

---
 .../components/chip/chip.component.ts         |  80 +++++------
 .../components/search/search.component.ts     | 129 +++++++++---------
 .../standard-card/standard-card.component.ts  |  52 +++----
 .../user-card/user-card.component.ts          |  46 +++----
 .../create-assignee.component.ts              |  64 ++++-----
 .../create-content.component.ts               |  66 ++++-----
 .../create-timeline.component.ts              |  46 +++----
 .../training-plan-data-share.service.ts       |   4 +-
 8 files changed, 245 insertions(+), 242 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
index 395712956..2059d92a0 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
@@ -1,73 +1,73 @@
 import { Component, Input, OnInit } from '@angular/core'
-import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service';
+import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
 @Component({
   selector: 'ws-app-chip',
   templateUrl: './chip.component.html',
   styleUrls: ['./chip.component.scss'],
 })
 export class ChipComponent implements OnInit {
-  @Input() selectedContentChips:any[] = [];
-  @Input() selectContentCount:number = 0;
-  @Input() from:any;
-  @Input() selectedAssigneeChips:any[] = [];
-  @Input() selectAssigneeCount:number = 0;
+  @Input() selectedContentChips: any[] = [];
+  @Input() selectContentCount: number = 0;
+  @Input() from: any
+  @Input() selectedAssigneeChips: any[] = [];
+  @Input() selectAssigneeCount: number = 0;
   constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
   }
 
   ngOnChanges() {
-    console.log('selectedAssigneeChips--', this.selectedAssigneeChips);
+    console.log('selectedAssigneeChips--', this.selectedAssigneeChips)
   }
 
   clearAll() {
-    if(this.from === 'content') {
-      this.selectContentCount = 0;
-      this.trainingPlanDataSharingService.traingingPlanContentData.data.content.map((sitem:any)=>{
-        if(sitem['selected']) {
-          sitem['selected'] = false;
+    if (this.from === 'content') {
+      this.selectContentCount = 0
+      this.trainingPlanDataSharingService.trainingPlanContentData.data.content.map((sitem: any) => {
+        if (sitem['selected']) {
+          sitem['selected'] = false
         }
       })
-      this.trainingPlanDataSharingService.trainingPlanStepperData.contentList = [];
-      this.trainingPlanDataSharingService.trainingPlanStepperData.contentType = '';
+      this.trainingPlanDataSharingService.trainingPlanStepperData.contentList = []
+      this.trainingPlanDataSharingService.trainingPlanStepperData.contentType = ''
     }
-    if(this.from === 'assignee') {
-      this.selectContentCount = 0;
-      console.log('this.trainingPlanDataSharingService.traingingPlanAssigneeData',this.trainingPlanDataSharingService.traingingPlanAssigneeData);
-      this.trainingPlanDataSharingService.traingingPlanAssigneeData.data.map((sitem:any)=>{
-        if(sitem['selected']) {
-          sitem['selected'] = false;
+    if (this.from === 'assignee') {
+      this.selectContentCount = 0
+      console.log('this.trainingPlanDataSharingService.trainingPlanAssigneeData', this.trainingPlanDataSharingService.trainingPlanAssigneeData)
+      this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
+        if (sitem['selected']) {
+          sitem['selected'] = false
         }
       })
-      this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo = [];
-      this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentType = '';
+      this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo = []
+      this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentType = ''
     }
-    
+
   }
 
-  removeContent(item:any) {
-    console.log('item', item);
-    this.trainingPlanDataSharingService.traingingPlanContentData.data.content.map((sitem:any)=>{
-      if(sitem['selected'] && sitem['identifier'] === item['identifier']) {
-        sitem['selected'] = false;
+  removeContent(item: any) {
+    console.log('item', item)
+    this.trainingPlanDataSharingService.trainingPlanContentData.data.content.map((sitem: any) => {
+      if (sitem['selected'] && sitem['identifier'] === item['identifier']) {
+        sitem['selected'] = false
       }
     })
-    if(this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.indexOf(item['identifier']) > -1) {
-      let index = this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.findIndex((x:any) => x === item['identifier']);
-      this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.splice(index,1);
+    if (this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.indexOf(item['identifier']) > -1) {
+      let index = this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.findIndex((x: any) => x === item['identifier'])
+      this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.splice(index, 1)
     }
   }
 
-  removeAssignee(item:any) {
-    console.log('item', item, this.trainingPlanDataSharingService.traingingPlanAssigneeData);
-    this.trainingPlanDataSharingService.traingingPlanAssigneeData.data.map((sitem:any)=>{
-      if(sitem['selected'] && sitem['id'] === item['id']) {
-        sitem['selected'] = false;
-      }      
+  removeAssignee(item: any) {
+    console.log('item', item, this.trainingPlanDataSharingService.trainingPlanAssigneeData)
+    this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
+      if (sitem['selected'] && sitem['id'] === item['id']) {
+        sitem['selected'] = false
+      }
     })
-    if(this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.indexOf(item['identifier']) > -1) {
-      let index = this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.findIndex((x:any) => x === item['id']);
-      this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.splice(index,1);
+    if (this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.indexOf(item['identifier']) > -1) {
+      let index = this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.findIndex((x: any) => x === item['id'])
+      this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.splice(index, 1)
     }
   }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 6d6dd7e33..82873dd18 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -1,8 +1,8 @@
-import { Component, EventEmitter, Input, Inject, Output, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import { Component, EventEmitter, Input, Inject, Output, OnInit } from '@angular/core'
+import { ActivatedRoute } from '@angular/router'
 import { DOCUMENT } from '@angular/common'
-import { TrainingPlanService } from './../../services/traininig-plan.service';
-import { TrainingPlanDataSharingService } from './../../services/training-plan-data-share.service';
+import { TrainingPlanService } from './../../services/traininig-plan.service'
+import { TrainingPlanDataSharingService } from './../../services/training-plan-data-share.service'
 /* tslint:disable */
 import _ from 'lodash'
 @Component({
@@ -12,13 +12,13 @@ import _ from 'lodash'
 })
 export class SearchComponent implements OnInit {
   @Input() categoryData: any = []
-  @Input() from:any = '';
+  @Input() from: any = '';
   @Output() handleApiData = new EventEmitter();
   filterVisibilityFlag = false
-  constructor(@Inject(DOCUMENT) private document: Document, 
-  private trainingPlanService: TrainingPlanService, 
-  private route: ActivatedRoute,
-  private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
+  constructor(@Inject(DOCUMENT) private document: Document,
+    private trainingPlanService: TrainingPlanService,
+    private route: ActivatedRoute,
+    private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
     // this.handleCategorySelection('');
@@ -29,11 +29,11 @@ export class SearchComponent implements OnInit {
   }
 
   openFilter() {
-      this.filterVisibilityFlag = true
-      if (this.document.getElementById('top-nav-bar')) {
-        const ele: any = this.document.getElementById('top-nav-bar')
-        ele.style.zIndex = '1'
-      }
+    this.filterVisibilityFlag = true
+    if (this.document.getElementById('top-nav-bar')) {
+      const ele: any = this.document.getElementById('top-nav-bar')
+      ele.style.zIndex = '1'
+    }
 
   }
 
@@ -45,60 +45,63 @@ export class SearchComponent implements OnInit {
     }
   }
 
-  handleCategorySelection(event:any) {
-    console.log('event--',event, this.from);
-    switch(this.from) {
+  handleCategorySelection(event: any) {
+    console.log('event--', event, this.from)
+    switch (this.from) {
       case 'content':
-      event = !event ? 'Course' : event;
-      this.getContent(event);
-      break;
+        event = !event ? 'Course' : event
+        this.getContent(event)
+        break
       case 'assignee':
-      event = !event ? 'Designation' : event;
-      if(event === 'Designation') {
-        this.getDesignations(event);
-      } else if (event === 'Custom Users') {
-        this.getAllUsers(event);
-      }      
-      
-      break;
+        event = !event ? 'Designation' : event
+        if (event === 'Designation') {
+          this.getDesignations(event)
+        } else if (event === 'Custom Users') {
+          this.getAllUsers(event)
+        }
+
+        break
     }
   }
 
-  getContent(contentType:any) {
-    if(contentType) {
-      const filterObj  = {
-        "request":{"filters":{
-          "primaryCategory":["Standalone Assessment"],
-          "contentType":[contentType]},
-          "offset":0,
-          "limit":20,
-          "query":"",
-          "sort_by":{"lastUpdatedOn":"desc"},
-          "fields":["name","appIcon","instructions","description","purpose","mimeType","gradeLevel","identifier","medium","pkgVersion","board","subject","resourceType","primaryCategory","contentType","channel","organisation","trackable","license","posterImage","idealScreenSize","learningMode","creatorLogo","duration","version","avgRating"]},"query":""
-      };
-      this.trainingPlanService.getAllContent(filterObj).subscribe((res:any) => {
-        console.log('res-->', res);
-        
-        // if(this.trainingPlanDataSharingService.traingingPlanContentData &&
-        //    this.trainingPlanDataSharingService.traingingPlanContentData['data'] &&
-        //    this.trainingPlanDataSharingService.traingingPlanContentData['data']['content'] && 
-        //    this.trainingPlanDataSharingService.traingingPlanContentData['data']['content'].length 
+  getContent(contentType: any) {
+    if (contentType) {
+      const filterObj = {
+        "request": {
+          "filters": {
+            "primaryCategory": ["Standalone Assessment"],
+            "contentType": [contentType]
+          },
+          "offset": 0,
+          "limit": 20,
+          "query": "",
+          "sort_by": { "lastUpdatedOn": "desc" },
+          "fields": ["name", "appIcon", "instructions", "description", "purpose", "mimeType", "gradeLevel", "identifier", "medium", "pkgVersion", "board", "subject", "resourceType", "primaryCategory", "contentType", "channel", "organisation", "trackable", "license", "posterImage", "idealScreenSize", "learningMode", "creatorLogo", "duration", "version", "avgRating"]
+        }, "query": ""
+      }
+      this.trainingPlanService.getAllContent(filterObj).subscribe((res: any) => {
+        console.log('res-->', res)
+
+        // if(this.trainingPlanDataSharingService.trainingPlanContentData &&
+        //    this.trainingPlanDataSharingService.trainingPlanContentData['data'] &&
+        //    this.trainingPlanDataSharingService.trainingPlanContentData['data']['content'] &&
+        //    this.trainingPlanDataSharingService.trainingPlanContentData['data']['content'].length
         //   ) {
-        //     console.log('this.trainingPlanDataSharingService.traingingPlanContentData',this.trainingPlanDataSharingService.traingingPlanContentData);
+        //     console.log('this.trainingPlanDataSharingService.trainingPlanContentData',this.trainingPlanDataSharingService.trainingPlanContentData);
         //     res && res.content.map((sitem:any)=> {
         //       sitem
         //     })
-        // } 
+        // }
 
-        this.trainingPlanDataSharingService.traingingPlanContentData =  {category:contentType , data: res};        
-        this.handleApiData.emit(true);
+        this.trainingPlanDataSharingService.trainingPlanContentData = { category: contentType, data: res }
+        this.handleApiData.emit(true)
       })
     }
-    
+
   }
 
-  getAllUsers(event:any) {
-    console.log('event', event);
+  getAllUsers(event: any) {
+    console.log('event', event)
     const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
     const filterObj = {
       request: {
@@ -111,18 +114,18 @@ export class SearchComponent implements OnInit {
         offset: 0,
       },
     }
-    this.trainingPlanService.getAllUsers(filterObj).subscribe((res:any) => {
-        console.log('res-->', res);
-        this.trainingPlanDataSharingService.traingingPlanAssigneeData =  {category:event , data: res};
-        this.handleApiData.emit(true);
+    this.trainingPlanService.getAllUsers(filterObj).subscribe((res: any) => {
+      console.log('res-->', res)
+      this.trainingPlanDataSharingService.trainingPlanAssigneeData = { category: event, data: res }
+      this.handleApiData.emit(true)
     })
   }
 
-  getDesignations(event:any) {
-    this.trainingPlanService.getDesignations().subscribe((res:any)=>{
-      console.log('res-->', res);
-      this.trainingPlanDataSharingService.traingingPlanAssigneeData =  {category:event , data: res.responseData};
-      this.handleApiData.emit(true);
+  getDesignations(event: any) {
+    this.trainingPlanService.getDesignations().subscribe((res: any) => {
+      console.log('res-->', res)
+      this.trainingPlanDataSharingService.trainingPlanAssigneeData = { category: event, data: res.responseData }
+      this.handleApiData.emit(true)
     })
   }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
index 8db3a48ff..2378137ce 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, Output, OnInit } from '@angular/core'
-import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service';
+import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
 @Component({
   selector: 'ws-app-standard-card',
   templateUrl: './standard-card.component.html',
@@ -8,48 +8,48 @@ import { TrainingPlanDataSharingService } from '../../services/training-plan-dat
 export class StandardCardComponent implements OnInit {
   @Input() cardSize: any
   @Input() checkboxVisibility: any = true
-  @Input() contentData:any[] = [];
+  @Input() contentData: any[] = [];
   @Output() handleSelectedChips = new EventEmitter();
-  selectedContent:any[]= [];
+  selectedContent: any[] = [];
   constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
   }
 
   ngOnChanges() {
-    console.log('contentData', this.contentData);
+    console.log('contentData', this.contentData)
   }
 
-  selectContentItem(event:any, item:any) {
-    if(event.checked) {
-      // this.selectedContent.push(item); 
-      this.trainingPlanDataSharingService.traingingPlanContentData.data.content.map((sitem:any, index:any)=>{
-        if(sitem.identifier === item.identifier) {
-          sitem['selected'] = true;
-          this.trainingPlanDataSharingService.traingingPlanContentData.data.content.splice(index,1);
-          this.trainingPlanDataSharingService.traingingPlanContentData.data.content.unshift(sitem);
+  selectContentItem(event: any, item: any) {
+    if (event.checked) {
+      // this.selectedContent.push(item);
+      this.trainingPlanDataSharingService.trainingPlanContentData.data.content.map((sitem: any, index: any) => {
+        if (sitem.identifier === item.identifier) {
+          sitem['selected'] = true
+          this.trainingPlanDataSharingService.trainingPlanContentData.data.content.splice(index, 1)
+          this.trainingPlanDataSharingService.trainingPlanContentData.data.content.unshift(sitem)
         }
       })
-      
-      if(this.trainingPlanDataSharingService.trainingPlanStepperData['contentList']) {
-        this.trainingPlanDataSharingService.trainingPlanStepperData['contentList'].push(item.identifier);
+
+      if (this.trainingPlanDataSharingService.trainingPlanStepperData['contentList']) {
+        this.trainingPlanDataSharingService.trainingPlanStepperData['contentList'].push(item.identifier)
       }
-      
-    } else {      
+
+    } else {
       // this.selectedContent = this.selectedContent.filter( sitem  => sitem.identifier !== item.identifier)
-      this.trainingPlanDataSharingService.traingingPlanContentData.data.content.map((sitem:any)=>{
-        if(sitem.identifier === item.identifier) {
-          sitem['selected'] = false;
+      this.trainingPlanDataSharingService.trainingPlanContentData.data.content.map((sitem: any) => {
+        if (sitem.identifier === item.identifier) {
+          sitem['selected'] = false
         }
-      })  
-      this.trainingPlanDataSharingService.trainingPlanStepperData['contentList'].filter((identifier:any, index:any)=>{
-        if(identifier === item.identifier) {
-          this.trainingPlanDataSharingService.trainingPlanStepperData['contentList'].splice(index,1);
+      })
+      this.trainingPlanDataSharingService.trainingPlanStepperData['contentList'].filter((identifier: any, index: any) => {
+        if (identifier === item.identifier) {
+          this.trainingPlanDataSharingService.trainingPlanStepperData['contentList'].splice(index, 1)
         }
       })
     }
-    console.log(' this.trainingPlanDataSharingService.trainingPlanStepperData', this.trainingPlanDataSharingService.trainingPlanStepperData);
-    this.handleSelectedChips.emit(true);
+    console.log(' this.trainingPlanDataSharingService.trainingPlanStepperData', this.trainingPlanDataSharingService.trainingPlanStepperData)
+    this.handleSelectedChips.emit(true)
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
index a0b1fce92..a2481c032 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, Output, OnInit } from '@angular/core'
-import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service';
+import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
 @Component({
   selector: 'ws-app-user-card',
   templateUrl: './user-card.component.html',
@@ -7,40 +7,40 @@ import { TrainingPlanDataSharingService } from '../../services/training-plan-dat
 })
 export class UserCardComponent implements OnInit {
   @Input() checkboxVisibility = true;
-  @Input() assigneeData:any[] = [];
+  @Input() assigneeData: any[] = [];
   @Output() handleSelectedChips = new EventEmitter();
   constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
   }
 
-  selectAssigneeItem(event:any, item:any) {
-    if(event.checked) {
-      // this.selectedContent.push(item); 
-      this.trainingPlanDataSharingService.traingingPlanAssigneeData.data.map((sitem:any, index:any)=>{
-        if(sitem.id === item.id) {
-          sitem['selected'] = true;
-          this.trainingPlanDataSharingService.traingingPlanAssigneeData.data.splice(index,1);
-          this.trainingPlanDataSharingService.traingingPlanAssigneeData.data.unshift(sitem);
+  selectAssigneeItem(event: any, item: any) {
+    if (event.checked) {
+      // this.selectedContent.push(item);
+      this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any, index: any) => {
+        if (sitem.id === item.id) {
+          sitem['selected'] = true
+          this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.splice(index, 1)
+          this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.unshift(sitem)
         }
-      }) 
-      if(this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo']) {
-        this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].push(item.id);
-      }    
-    } else {      
+      })
+      if (this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo']) {
+        this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].push(item.id)
+      }
+    } else {
       // this.selectedContent = this.selectedContent.filter( sitem  => sitem.identifier !== item.identifier)
-      this.trainingPlanDataSharingService.traingingPlanAssigneeData.data.map((sitem:any)=>{
-        if(sitem.id === item.id) {
-          sitem['selected'] = false;
+      this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
+        if (sitem.id === item.id) {
+          sitem['selected'] = false
         }
-      })  
-      this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier:any, index:any)=>{
-        if(identifier === item.id) {
-          this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].splice(index,1);
+      })
+      this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier: any, index: any) => {
+        if (identifier === item.id) {
+          this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].splice(index, 1)
         }
       })
     }
-    this.handleSelectedChips.emit(true);
+    this.handleSelectedChips.emit(true)
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
index b08ade108..b294dc7bd 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
@@ -1,5 +1,5 @@
-import { Component, OnInit } from '@angular/core';
-import { TrainingPlanDataSharingService } from './../../services/training-plan-data-share.service';
+import { Component, OnInit } from '@angular/core'
+import { TrainingPlanDataSharingService } from './../../services/training-plan-data-share.service'
 
 @Component({
   selector: 'ws-app-create-assignee',
@@ -8,17 +8,17 @@ import { TrainingPlanDataSharingService } from './../../services/training-plan-d
 })
 export class CreateAssigneeComponent implements OnInit {
   categoryData: any[] = [];
-  assigneeData:any[] = [];
-  selectAssigneeCount:number = 0;
-  selectedAssigneeChips:any[] = [];
+  assigneeData: any[] = [];
+  selectAssigneeCount: number = 0;
+  selectedAssigneeChips: any[] = [];
   constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
   from = 'assignee';
   ngOnInit() {
     this.categoryData = [
       {
-       id: 1,
-       name: 'Designation',
-       value: 'Designation',
+        id: 1,
+        name: 'Designation',
+        value: 'Designation',
       },
       {
         id: 2,
@@ -30,43 +30,43 @@ export class CreateAssigneeComponent implements OnInit {
         name: 'Custom Users',
         value: 'Custom Users',
       },
-    ]    
+    ]
   }
 
-  handleApiData(event:any) {
-    if(event) {
-      console.log(this.trainingPlanDataSharingService.traingingPlanAssigneeData);
-      if(this.trainingPlanDataSharingService.trainingPlanStepperData &&
+  handleApiData(event: any) {
+    if (event) {
+      console.log(this.trainingPlanDataSharingService.trainingPlanAssigneeData)
+      if (this.trainingPlanDataSharingService.trainingPlanStepperData &&
         this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo) {
-        console.log('this.trainingPlanDataSharingService.traingingPlanContentData.data.content', this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo);
-        this.trainingPlanDataSharingService.traingingPlanAssigneeData.data.map((sitem:any)=> {
-          if(this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.indexOf(sitem.id) > -1) {
-            sitem['selected'] = true;
+        console.log('this.trainingPlanDataSharingService.trainingPlanContentData.data.content', this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo)
+        this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
+          if (this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.indexOf(sitem.id) > -1) {
+            sitem['selected'] = true
           }
         })
-        this.assigneeData = this.trainingPlanDataSharingService.traingingPlanAssigneeData;
-        this.handleSelectedChips(true);
+        this.assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData
+        this.handleSelectedChips(true)
       } else {
-        this.assigneeData = this.trainingPlanDataSharingService.traingingPlanAssigneeData;
+        this.assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData
       }
-      
+
     }
   }
 
-  handleSelectedChips(event:any) {
-    console.log('event', event);
-    this.selectAssigneeCount = 0;
-    if(event) {
-      this.selectedAssigneeChips = this.trainingPlanDataSharingService.traingingPlanAssigneeData.data;
-      console.log('this.selectedAssigneeChips', this.selectedAssigneeChips);
-      this.selectedAssigneeChips.map((sitem)=>{
-        if(sitem.selected) {
-          this.selectAssigneeCount = this.selectAssigneeCount + 1;
-          console.log('this.selectContentCount', this.selectAssigneeCount);
+  handleSelectedChips(event: any) {
+    console.log('event', event)
+    this.selectAssigneeCount = 0
+    if (event) {
+      this.selectedAssigneeChips = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data
+      console.log('this.selectedAssigneeChips', this.selectedAssigneeChips)
+      this.selectedAssigneeChips.map((sitem) => {
+        if (sitem.selected) {
+          this.selectAssigneeCount = this.selectAssigneeCount + 1
+          console.log('this.selectContentCount', this.selectAssigneeCount)
         }
       })
     }
-    
+
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
index d6114c00d..f2d989cdc 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core'
-import { TrainingPlanDataSharingService } from './../../services/training-plan-data-share.service';
+import { TrainingPlanDataSharingService } from './../../services/training-plan-data-share.service'
 @Component({
   selector: 'ws-app-create-content',
   templateUrl: './create-content.component.html',
@@ -7,18 +7,18 @@ import { TrainingPlanDataSharingService } from './../../services/training-plan-d
 })
 export class CreateContentComponent implements OnInit {
   categoryData: any[] = [];
-  contentData:any[] = [];
+  contentData: any[] = [];
   from = 'content';
-  selectedContentChips:any[] = [];
-  selectContentCount:number = 0;
+  selectedContentChips: any[] = [];
+  selectContentCount: number = 0;
   constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
     this.categoryData = [
       {
-       id: 1,
-       name: 'Course',
-       value: 'Course',
+        id: 1,
+        name: 'Course',
+        value: 'Course',
       },
       {
         id: 2,
@@ -40,46 +40,46 @@ export class CreateContentComponent implements OnInit {
         name: 'Moderated Course',
         value: 'Moderated Course',
       },
-    ];
-    
-    
+    ]
+
+
   }
 
-  handleApiData(event:any) {
-    if(event) {
-      console.log(this.trainingPlanDataSharingService.traingingPlanContentData);
-      if(this.trainingPlanDataSharingService.trainingPlanStepperData &&
+  handleApiData(event: any) {
+    if (event) {
+      console.log(this.trainingPlanDataSharingService.trainingPlanContentData)
+      if (this.trainingPlanDataSharingService.trainingPlanStepperData &&
         this.trainingPlanDataSharingService.trainingPlanStepperData.contentList) {
-        console.log('this.trainingPlanDataSharingService.traingingPlanContentData.data.content', this.trainingPlanDataSharingService.trainingPlanStepperData.contentList);
-        this.trainingPlanDataSharingService.traingingPlanContentData.data.content.map((sitem:any)=> {
-          if(this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.indexOf(sitem.identifier) > -1) {
-            sitem['selected'] = true;
+        console.log('this.trainingPlanDataSharingService.trainingPlanContentData.data.content', this.trainingPlanDataSharingService.trainingPlanStepperData.contentList)
+        this.trainingPlanDataSharingService.trainingPlanContentData.data.content.map((sitem: any) => {
+          if (this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.indexOf(sitem.identifier) > -1) {
+            sitem['selected'] = true
           }
         })
-        this.contentData = this.trainingPlanDataSharingService.traingingPlanContentData.data.content;
-        this.handleSelectedChips(true);
+        this.contentData = this.trainingPlanDataSharingService.trainingPlanContentData.data.content
+        this.handleSelectedChips(true)
       } else {
-        this.contentData = this.trainingPlanDataSharingService.traingingPlanContentData.data.content;
+        this.contentData = this.trainingPlanDataSharingService.trainingPlanContentData.data.content
       }
-      
+
 
     }
   }
 
-  handleSelectedChips(event:any) {
-    console.log('event', event);
-    this.selectContentCount = 0;
-    if(event) {
-      this.selectedContentChips = this.trainingPlanDataSharingService.traingingPlanContentData.data.content;
-      console.log('this.selectedContentChips', this.selectedContentChips);
-      this.selectedContentChips.map((sitem)=>{
-        if(sitem.selected) {
-          this.selectContentCount = this.selectContentCount + 1;
-          console.log('this.selectContentCount', this.selectContentCount);
+  handleSelectedChips(event: any) {
+    console.log('event', event)
+    this.selectContentCount = 0
+    if (event) {
+      this.selectedContentChips = this.trainingPlanDataSharingService.trainingPlanContentData.data.content
+      console.log('this.selectedContentChips', this.selectedContentChips)
+      this.selectedContentChips.map((sitem) => {
+        if (sitem.selected) {
+          this.selectContentCount = this.selectContentCount + 1
+          console.log('this.selectContentCount', this.selectContentCount)
         }
       })
     }
-    
+
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
index 15b408e20..6648fe11d 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
@@ -1,40 +1,40 @@
 import { Component, OnInit } from '@angular/core'
 import { Router } from '@angular/router'
-import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service';
+import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
 @Component({
   selector: 'ws-app-create-timeline',
   templateUrl: './create-timeline.component.html',
   styleUrls: ['./create-timeline.component.scss'],
 })
 export class CreateTimelineComponent implements OnInit {
-  contentData:any[] = [];
-  assigneeData:any;
+  contentData: any[] = [];
+  assigneeData: any
   constructor(private router: Router, private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
-    if(this.trainingPlanDataSharingService.traingingPlanContentData && 
-      this.trainingPlanDataSharingService.traingingPlanContentData.data && 
-      this.trainingPlanDataSharingService.traingingPlanContentData.data.content
-      ) {
-        this.contentData = this.trainingPlanDataSharingService.traingingPlanContentData.data.content.filter((item:any)=>{
-          return item.selected
-        })
+    if (this.trainingPlanDataSharingService.trainingPlanContentData &&
+      this.trainingPlanDataSharingService.trainingPlanContentData.data &&
+      this.trainingPlanDataSharingService.trainingPlanContentData.data.content
+    ) {
+      this.contentData = this.trainingPlanDataSharingService.trainingPlanContentData.data.content.filter((item: any) => {
+        return item.selected
+      })
 
     }
-    
-    console.log('this.contentData', this.contentData);
-    console.log('this.trainingPlanDataSharingService.traingingPlanAssigneeData', this.trainingPlanDataSharingService.traingingPlanAssigneeData);
-    if(this.trainingPlanDataSharingService.traingingPlanAssigneeData &&
-      this.trainingPlanDataSharingService.traingingPlanAssigneeData.data
-      ) {
-        let category = this.trainingPlanDataSharingService.traingingPlanAssigneeData.category;
-    let assigneeData = this.trainingPlanDataSharingService.traingingPlanAssigneeData.data.filter((item:any)=>{
-      return item.selected;
-    });
-    this.assigneeData = {'category':category,data:assigneeData};
 
-    console.log('this.assigneeData', this.assigneeData);
-  }
+    console.log('this.contentData', this.contentData)
+    console.log('this.trainingPlanDataSharingService.trainingPlanAssigneeData', this.trainingPlanDataSharingService.trainingPlanAssigneeData)
+    if (this.trainingPlanDataSharingService.trainingPlanAssigneeData &&
+      this.trainingPlanDataSharingService.trainingPlanAssigneeData.data
+    ) {
+      let category = this.trainingPlanDataSharingService.trainingPlanAssigneeData.category
+      let assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
+        return item.selected
+      })
+      this.assigneeData = { 'category': category, data: assigneeData }
+
+      console.log('this.assigneeData', this.assigneeData)
+    }
   }
 
   showAll() {
diff --git a/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts b/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
index 2f8b3b83d..eb630c56b 100644
--- a/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
+++ b/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
@@ -5,8 +5,8 @@ import { Injectable } from '@angular/core'
 })
 export class TrainingPlanDataSharingService {
   trainingPlanTitle: string = ''
-  traingingPlanContentData: any
-  traingingPlanAssigneeData: any
+  trainingPlanContentData: any
+  trainingPlanAssigneeData: any
   trainingPlanStepperData: any = {
     "name": "CBP Plan Name",
     "contentType": "",

From 1ccc112aff09da2c03abb2c4cefcbc93716ed519 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Wed, 13 Dec 2023 09:23:35 +0530
Subject: [PATCH 331/887] removed debugger

---
 .../training-plan/routes/create-plan/create-plan.component.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
index 99ff97863..ffd794d36 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
@@ -34,6 +34,6 @@ export class CreatePlanComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   planTitleValidation(_event: any) {
-    debugger
+
   }
 }

From c44336e7e74633dde46d7081e7ff3616a9396f51 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Wed, 13 Dec 2023 12:24:16 +0530
Subject: [PATCH 332/887] update for delete functionality for cards on timeline
 page

---
 .../standard-card.component.html              | 1029 +----------------
 .../standard-card.component.scss              |   17 +-
 .../standard-card/standard-card.component.ts  |   21 +
 .../user-card/user-card.component.html        |    9 +-
 .../user-card/user-card.component.scss        |   34 +-
 .../user-card/user-card.component.ts          |   22 +-
 .../create-timeline.component.html            |    4 +-
 7 files changed, 97 insertions(+), 1039 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
index 78a534943..f1825a385 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
@@ -8,6 +8,9 @@
                             <div class="card-select-box" *ngIf="checkboxVisibility">
                                 <mat-checkbox class="card-select-check" [checked]="item?.selected" (change)="selectContentItem($event, item)"></mat-checkbox>
                             </div>
+                            <div class="card-cross-icon" *ngIf="showDeleteFlag" (click)="deleteItem(item)">
+                                    <img class="cursor-pointer" src="assets/icons/close.svg" />
+                            </div>
                             <img mat-card-image loading="lazy"
                                 class="card-img ws-mat-primary-lite-background margin-remove"
                                 [src]="item?.posterImage" />
@@ -45,1030 +48,4 @@
             </mat-card>
         </div>
     </div>
-</ng-container>
-<ng-container *ngIf="cardSize === 4">
-    <div class="flex flex-4 flex-row card-grid">
-        <div class="flex flex-3 flex-row card-grid-container">
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <div class="card-select-box" *ngIf="checkboxVisibility">
-                                                    <mat-checkbox class="card-select-check"></mat-checkbox>
-                                                </div>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-        </div>
-    </div>
-    <div class="flex flex-4 flex-row card-grid">
-        <div class="flex flex-3 flex-row card-grid-container">
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <div class="card-select-box" *ngIf="checkboxVisibility">
-                                                    <mat-checkbox class="card-select-check"></mat-checkbox>
-                                                </div>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-        </div>
-    </div>
-    <div class="flex flex-4 flex-row card-grid">
-        <div class="flex flex-3 flex-row card-grid-container">
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <div class="card-select-box" *ngIf="checkboxVisibility">
-                                                    <mat-checkbox class="card-select-check"></mat-checkbox>
-                                                </div>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-        </div>
-    </div>
-    <div class="flex flex-4 flex-row card-grid">
-        <div class="flex flex-3 flex-row card-grid-container">
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <div class="card-select-box" *ngIf="checkboxVisibility">
-                                                    <mat-checkbox class="card-select-check"></mat-checkbox>
-                                                </div>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-        </div>
-    </div>
-</ng-container>
-<ng-container *ngIf="cardSize === 5">
-    <div class="">
-        <div class="flex flex-3 flex-row card-grid-container flex-wrap">
-            <div class="flex  course-card  margin-right-l margin-right-l">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <div class="card-select-box" *ngIf="checkboxVisibility">
-                                                    <mat-checkbox class="card-select-check"></mat-checkbox>
-                                                </div>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card  margin-right-l">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card  margin-right-l">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card  margin-right-l">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card  margin-right-l">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-        </div>
-    </div>
 </ng-container>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
index 3da3abf45..320727d11 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
@@ -23,7 +23,7 @@ $secondary-color: #EF951E;
   border-radius: 8px;
   box-sizing: border-box;
   box-shadow: 0px 10px 30px #99999933;
-  overflow: hidden;
+  overflow: visible;
   margin: 20px 0;
   .progress-bar {
     // display: block;
@@ -537,4 +537,19 @@ $title-line-count: 2;
     height: 20px;
     width: 20px;
     vertical-align: middle;
+}
+
+.card-cross-icon {
+  position: absolute;
+  border: 1px solid rgb(27, 76, 161);
+  background: #fff;
+  border-radius: 50%;
+  padding: 10px;
+  vertical-align: middle;
+  right: -12px;
+  top: -14px;
+}
+
+.card-cross-icon img {
+  vertical-align: middle;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
index 2378137ce..67f88b244 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
@@ -9,6 +9,7 @@ export class StandardCardComponent implements OnInit {
   @Input() cardSize: any
   @Input() checkboxVisibility: any = true
   @Input() contentData: any[] = [];
+  @Input() showDeleteFlag = false;
   @Output() handleSelectedChips = new EventEmitter();
   selectedContent: any[] = [];
   constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
@@ -52,4 +53,24 @@ export class StandardCardComponent implements OnInit {
     this.handleSelectedChips.emit(true)
   }
 
+  deleteItem(item:any) {
+    console.log('item', item);
+    this.trainingPlanDataSharingService.trainingPlanContentData.data.content.map((sitem: any) => {
+      if (sitem.identifier === item.identifier) {
+        sitem['selected'] = false
+      }
+    })
+    this.contentData.filter((sitem: any, index:any) => {
+      if (sitem.identifier === item.identifier) {
+        this.contentData.splice(index,1);
+      }
+    })
+    console.log('result-->', this.trainingPlanDataSharingService.trainingPlanContentData.data.content);
+    this.trainingPlanDataSharingService.trainingPlanStepperData['contentList'].filter((identifier: any, index: any) => {
+      if (identifier === item.identifier) {
+        this.trainingPlanDataSharingService.trainingPlanStepperData['contentList'].splice(index, 1)
+      }
+    })
+  }
+
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
index b5d55b5d0..5c0d6f509 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
@@ -5,9 +5,12 @@
                 <div>HG</div>
             </div>
             <div class="assignee-desc">
-                <p>{{item?.firstName}}</p>
+                <p>{{item?.firstName}} </p>
                 <p class="sub-heading">{{item?.rootOrgName}}</p>
             </div>
+            <div class="card-cross-icon" *ngIf="showDeleteFlag" (click)="deleteItem(item)">
+                <img class="cursor-pointer" src="assets/icons/close.svg" />
+            </div>
             <div class="check-action" *ngIf="checkboxVisibility">
                 <mat-checkbox class="example-margin" [checked]="item?.selected" (change)="selectAssigneeItem($event, item)"></mat-checkbox>
             </div>
@@ -20,9 +23,13 @@
 <div class="flex flex-4 flex-row custom-user-card-container flex-wrap" *ngIf="assigneeData?.category === 'Designation'">
     <ng-container *ngFor="let item of assigneeData?.data | slice : 0 : 20">
         <div class="flex flex-4 custom-user-card active-card">
+            <div class="card-cross-icon" *ngIf="showDeleteFlag" (click)="deleteItem(item)">
+                <img class="cursor-pointer" src="assets/icons/close.svg" />
+            </div>
             <div class="custom-user-desc">
                 <p>{{item?.name}}</p>
             </div>
+            
             <div class="check-action" *ngIf="checkboxVisibility">
                 <mat-checkbox class="example-margin" [checked]="item?.selected" (change)="selectAssigneeItem($event, item)"></mat-checkbox>
             </div>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
index 2c6429835..a2a6a820f 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
@@ -1,6 +1,7 @@
 .assignee-card-container {
-    margin-top:20px
+    margin-top: 20px
 }
+
 .assignee-card {
     width: 292px;
     border: 1px solid rgba(0, 0, 0, 0.16);
@@ -11,7 +12,7 @@
 }
 
 .assignee-card-without-checkbox {
-    background-color: rgb(240,240,240);
+    background-color: rgb(240, 240, 240);
     width: 301px;
     border: none !important;
     border-radius: 4px;
@@ -35,20 +36,20 @@
     flex-direction: column;
     padding: 0 16px;
     width: 230px;
-    white-space:nowrap;
+    white-space: nowrap;
     text-overflow: ellipsis;
 }
 
 .assignee-desc .sub-heading {
     font-size: 14px;
-    color: rgb(0,0,0,0.6);
+    color: rgb(0, 0, 0, 0.6);
 }
 
 
 .assignee-desc p {
     padding: 0;
     margin: 0;
-    width:190px;
+    width: 190px;
     overflow: hidden;
     text-overflow: ellipsis;
 }
@@ -62,8 +63,9 @@
 /** Custom User **/
 
 .custom-user-card-container {
-    margin-top:20px
+    margin-top: 20px
 }
+
 .custom-user-card {
     width: 292px;
     border: 1px solid rgba(0, 0, 0, 0.16);
@@ -71,6 +73,7 @@
     padding: 24px 16px;
     margin-right: 20px;
     margin-bottom: 16px;
+    position: relative;
 }
 
 .custom-user-card.active-card {
@@ -82,8 +85,8 @@
     flex-direction: column;
     padding: 0 16px;
     width: 230px;
-    white-space:nowrap;
-    
+    white-space: nowrap;
+
 }
 
 
@@ -98,4 +101,19 @@
 .custom-user-card-container .check-action {
     margin-right: 16px;
 
+}
+
+.card-cross-icon {
+    position: absolute;
+    border: 1px solid rgb(27, 76, 161);
+    background: #fff;
+    border-radius: 50%;
+    padding: 10px;
+    vertical-align: middle;
+    right: -12px;
+    top:-14px;
+}
+
+.card-cross-icon img {
+    vertical-align: middle;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
index a2481c032..542aa3baf 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
@@ -7,7 +7,8 @@ import { TrainingPlanDataSharingService } from '../../services/training-plan-dat
 })
 export class UserCardComponent implements OnInit {
   @Input() checkboxVisibility = true;
-  @Input() assigneeData: any[] = [];
+  @Input() showDeleteFlag = false;
+  @Input() assigneeData: any;
   @Output() handleSelectedChips = new EventEmitter();
   constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
 
@@ -43,4 +44,23 @@ export class UserCardComponent implements OnInit {
     this.handleSelectedChips.emit(true)
   }
 
+  deleteItem(item:any) {
+    console.log('item', item);
+    this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
+      if (sitem.id === item.id) {
+        sitem['selected'] = false
+      }
+    })
+    this.assigneeData.data.map((sitem: any, index:any) => {
+      if (sitem.id === item.id) {
+        this.assigneeData.data.splice(index, 1)
+      }
+    })
+    this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier: any, index: any) => {
+      if (identifier === item.id) {
+        this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].splice(index, 1)
+      }
+    })
+  }
+
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
index 1aad4ba6e..db0aa8e67 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
@@ -8,7 +8,7 @@
             <a mat-button (click)="showAll()" class="show-all">Show all <mat-icon>keyboard_arrow_right</mat-icon></a>
         </div>
     </div>
-    <ws-app-standard-card [checkboxVisibility]="false" [contentData]="contentData"></ws-app-standard-card>
+    <ws-app-standard-card [checkboxVisibility]="false" [contentData]="contentData" [showDeleteFlag]="true"></ws-app-standard-card>
 </ng-container>
 <ng-container *ngIf="assigneeData && assigneeData.data.length">
     <div class="margin-top-xl">
@@ -17,5 +17,5 @@
             <a mat-button (click)="showAll()" class="show-all">Show all <mat-icon>keyboard_arrow_right</mat-icon></a>
         </div>
     </div>
-    <ws-app-user-card [checkboxVisibility]="false" [assigneeData]="assigneeData"></ws-app-user-card>
+    <ws-app-user-card [checkboxVisibility]="false" [assigneeData]="assigneeData" [showDeleteFlag]="true"></ws-app-user-card>
 </ng-container>
\ No newline at end of file

From effae286094894b35358e8bc40e9d4f02ea6693f Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Wed, 13 Dec 2023 15:23:20 +0530
Subject: [PATCH 333/887] update for competency summary and popup yes action
 functionality

---
 .../category-drop-down.component.ts           | 19 +++-
 .../competency-summary.component.html         | 32 ++++++-
 .../competency-summary.component.ts           | 90 ++++++++++++++++++-
 .../confirmation.box.component.ts             | 11 ++-
 .../components/search/search.component.ts     | 27 +++++-
 .../create-content.component.html             |  2 +-
 .../create-content.component.ts               |  4 +-
 .../training-plan-data-share.service.ts       |  2 +
 8 files changed, 173 insertions(+), 14 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
index a7697efca..efee0f958 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
@@ -22,6 +22,12 @@ export class CategoryDropDownComponent implements OnInit {
     // } else if(this.from === 'assignee') {
     //   this.handleCategorySelection.emit('Designation');
     // }
+    this.trainingPlanDataSharingService.trainingPlanCategoryChangeEvent.subscribe((data:any)=>{
+      if(data && data.event) {
+        console.log('data', data.event);
+        this.handleCategorySelection.emit(data.event);
+      }
+    })
   }
 
   ngOnChanges() {
@@ -45,9 +51,10 @@ export class CategoryDropDownComponent implements OnInit {
         dialogData['type'] = 'normal';
         dialogData['icon'] = 'radio_on';
         dialogData['title'] = 'You are attempting to change the selected content type?';
-        dialogData['subTitle'] = 'Test';
+        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection. It's advisable to save the current one as a draft and create a new one instead.`;
         dialogData['primaryAction'] = 'I understand, change content type';
         dialogData['secondaryAction'] = 'Cancel';
+        dialogData['event'] = 'Course';
         this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event;
       break
       case 'Program':
@@ -57,6 +64,7 @@ export class CategoryDropDownComponent implements OnInit {
         dialogData['subTitle'] = `Changing it now will result in the loss of your current selection. It's advisable to save the current one as a draft and create a new one instead.`;
         dialogData['primaryAction'] = 'I understand, change content type';
         dialogData['secondaryAction'] = 'Cancel';
+        dialogData['event'] = 'Program';
         this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event;
       break
       case 'Blended program':
@@ -66,6 +74,7 @@ export class CategoryDropDownComponent implements OnInit {
         dialogData['subTitle'] = `Changing it now will result in the loss of your current selection. It's advisable to save the current one as a draft and create a new one instead.`;
         dialogData['primaryAction'] = 'I understand, change content type';
         dialogData['secondaryAction'] = 'Cancel';
+        dialogData['event'] = 'Blended program';
         this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event;
       break
       case 'Curated program':
@@ -75,6 +84,7 @@ export class CategoryDropDownComponent implements OnInit {
         dialogData['subTitle'] = `Changing it now will result in the loss of your current selection. It's advisable to save the current one as a draft and create a new one instead.`;
         dialogData['primaryAction'] = 'I understand, change content type';
         dialogData['secondaryAction'] = 'Cancel';
+        dialogData['event'] = 'Curated program';
         this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event;
       break
       case 'Moderated Course':
@@ -84,6 +94,7 @@ export class CategoryDropDownComponent implements OnInit {
         dialogData['subTitle'] = `Changing it now will result in the loss of your current selection. It's advisable to save the current one as a draft and create a new one instead.`;
         dialogData['primaryAction'] = 'I understand, change content type';
         dialogData['secondaryAction'] = 'Cancel';
+        dialogData['event'] = 'Moderated Course';
         this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event;
       break
       case 'Designation':
@@ -94,6 +105,7 @@ export class CategoryDropDownComponent implements OnInit {
         If you want to select custom users or by designation, use the above option`;
         dialogData['primaryAction'] = 'I understand, change user type';
         dialogData['secondaryAction'] = 'Cancel';
+        dialogData['event'] = 'Designation';
         this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType'] = event;
       break
       case 'All Users':
@@ -104,6 +116,7 @@ export class CategoryDropDownComponent implements OnInit {
         If you want to select custom users or by designation, use the above option`;
         dialogData['primaryAction'] = 'I understand, change user type';
         dialogData['secondaryAction'] = 'Cancel';
+        dialogData['event'] = 'All Users';
         this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType'] = event;
       break
       case 'Custom Users':
@@ -114,11 +127,12 @@ export class CategoryDropDownComponent implements OnInit {
         If you want to select custom users or by designation, use the above option`;
         dialogData['primaryAction'] = 'I understand, change user type';
         dialogData['secondaryAction'] = 'Cancel';
+        dialogData['event'] = 'Custom Users';
         this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType'] = event;
       break
     }
     
-    this.handleCategorySelection.emit(event);
+    // this.handleCategorySelection.emit(event);
     this.openDialoagBox(dialogData)
   }
 
@@ -131,6 +145,7 @@ export class CategoryDropDownComponent implements OnInit {
         subTitle: dialogData.subTitle,
         primaryAction: dialogData.primaryAction,
         secondaryAction: dialogData.secondaryAction,
+        event: dialogData.event
       },
     })
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.html b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.html
index 6a32c9640..e52c28e66 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.html
@@ -1,4 +1,4 @@
-<div class="competency-summary">
+<!-- <div class="competency-summary">
     <div class="competency-summary-header">Competency summary</div>
     <div class="competency-tabs">
         <mat-tab-group [selectedIndex]="0" class="margin-top-m">
@@ -67,4 +67,34 @@
             </mat-tab>
         </mat-tab-group>
     </div>
+</div> -->
+
+<div class="competency-summary">
+    <div class="competency-summary-header">Competency summary</div>
+    <div class="competency-tabs">
+        <mat-tab-group [selectedIndex]="selectedIndex" class="margin-top-m" >
+            <ng-container *ngFor="let item of competencySummaryObj">
+            <mat-tab>
+                <ng-template mat-tab-label>
+                    {{item?.title | titlecase}} ({{item[item?.title]['count']}}) 
+                </ng-template>
+                <ng-template matTabContent>
+                    <ng-container *ngIf="item[item?.title]['listData'].length">
+                    <div class="category-card flex flex-row" *ngFor="let sitem of item[item?.title]['listData']">
+                        <div class="label">
+                            {{sitem?.competencyTheme}}
+                        </div>
+                        <div>
+                            (1)
+                        </div>
+                    </div>
+                    </ng-container>
+                    <ng-container *ngIf="!(item[item?.title]['listData'].length)">
+                        <div class="default-tab-content">There are no competency added yet</div>
+                    </ng-container>
+                </ng-template>
+            </mat-tab>        
+        </ng-container>   
+        </mat-tab-group>
+    </div>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
index 3a29411d8..a4c6feabe 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core'
+import { Component, Input, OnInit } from '@angular/core'
 
 @Component({
   selector: 'ws-app-competency-summary',
@@ -6,10 +6,96 @@ import { Component, OnInit } from '@angular/core'
   styleUrls: ['./competency-summary.component.scss'],
 })
 export class CompetencySummaryComponent implements OnInit {
-
+  @Input() contentData: any;
+  @Input() selectContentCount: any;
+  selectedCardData: any[] = [];
+  competencySummaryObj: any = [{
+    "title": "behaviroal",
+    "behaviroal": {
+      "listData": [],
+      "count": 0
+    }
+  }, {
+    "title": "functional",
+    "functional": {
+      "listData": [],
+      "count": 0
+    }
+  }, {
+    "title": "domain",
+    "domain": {
+      "listData": [],
+      "count": 0
+    }
+  }
+  ];
+  selectedIndex = 0;
   constructor() { }
 
   ngOnInit() {
   }
 
+  ngOnChanges() {
+    this.selectedCardData = [];
+    this.competencySummaryObj = [{
+      "title": "behaviroal",
+      "behaviroal": {
+        "listData": [],
+        "count": 0
+      }
+    }, {
+      "title": "functional",
+      "functional": {
+        "listData": [],
+        "count": 0
+      }
+    }, {
+      "title": "domain",
+      "domain": {
+        "listData": [],
+        "count": 0
+      }
+    }
+    ];
+    this.contentData.map((item: any) => {
+      if (item.selected) {
+        this.selectedCardData.push(item);
+      }
+    })
+
+    // let competencyThemeObj = {};
+
+    this.selectedCardData.map((sitem: any) => {
+      sitem.competencies_v5.map((fitem: any) => {
+        if (fitem.competencyArea.toLowerCase() === 'behaviroal') {
+          this.competencySummaryObj[0]['behaviroal']['count'] = this.competencySummaryObj[0]['behaviroal']['count'] + 1;
+
+          // competencyThemeObj = this.checkIfThemeNameExists(this.competencySummaryObj['behaviroal']['listData'], fitem);
+          this.competencySummaryObj[0]['behaviroal']['listData'].push(fitem);
+          this.selectedIndex = 0;
+        }
+        if (fitem.competencyArea.toLowerCase() === 'functional') {
+          this.competencySummaryObj[1]['functional']['count'] = this.competencySummaryObj[1]['functional']['count'] + 1;
+          this.competencySummaryObj[1]['functional']['listData'].push(fitem);
+          this.selectedIndex = 1;
+        }
+        if (fitem.competencyArea.toLowerCase() === 'domain') {
+          this.competencySummaryObj[2]['domain']['count'] = this.competencySummaryObj[2]['domain']['count'] + 1;
+          this.competencySummaryObj[2]['domain']['listData'].push(fitem);
+          this.selectedIndex = 2;
+        }
+      })
+    })
+    console.log('this.competencySummaryObj', this.competencySummaryObj);
+  }
+
+  // checkIfThemeNameExists(arr:any, fitem:any):object {
+  //   arr.map((sitem:any)=>{
+  //     if(sitem.competencyTheme === fitem.competencyTheme) {
+
+  //     }
+  //   })
+  //   return {"themeName": "", "themeCount": 0};
+  // }
+
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation.box.component.ts b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation.box.component.ts
index 4beeae8ae..ce00f4832 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation.box.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation.box.component.ts
@@ -1,6 +1,6 @@
 import { Component, Inject, OnInit } from '@angular/core'
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'
-
+import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service';
 @Component({
   selector: 'ws-app-confirmation-box',
   templateUrl: './confirmation-box.component.html',
@@ -10,7 +10,8 @@ export class ConfirmationBoxComponent implements OnInit {
 
   constructor(
     @Inject(MAT_DIALOG_DATA) public data: any,
-    private dialogRef: MatDialogRef<ConfirmationBoxComponent>
+    private dialogRef: MatDialogRef<ConfirmationBoxComponent>,
+    private trainingPlanDataSharingService: TrainingPlanDataSharingService
   ) { }
 
   ngOnInit() {
@@ -20,6 +21,10 @@ export class ConfirmationBoxComponent implements OnInit {
     this.dialogRef.close()
   }
 
-  performAction() {
+  performAction(data:any) {
+    console.log(data);
+    this.dialogRef.close();
+    this.trainingPlanDataSharingService.trainingPlanCategoryChangeEvent.next(data);
+
   }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 82873dd18..09ae760dc 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -69,14 +69,35 @@ export class SearchComponent implements OnInit {
       const filterObj = {
         "request": {
           "filters": {
-            "primaryCategory": ["Standalone Assessment"],
-            "contentType": [contentType]
+            "primaryCategory": ["Course"],
+            "contentType": [contentType],
+            "identifier": [
+              "do_1139104696922521601317",
+              "do_1135500940397936641158",
+              "do_1139026887251066881137",
+              "do_11374977269157888011298",
+              "do_113545216626319360174",
+              "do_1136643005068328961197",
+              "do_113694464635666432153",
+              "do_113882971081441280172",
+              "do_113882887752704000151",
+              "do_1138813223247462401116",
+              "do_113703698843983872134",
+              "do_1137468666262241281756",
+              "do_1139084314725498881268",
+              "do_113720205181059072151",
+              "do_113896199910367232144",
+              "do_11364656119311564815"
+            ]
           },
           "offset": 0,
           "limit": 20,
           "query": "",
           "sort_by": { "lastUpdatedOn": "desc" },
-          "fields": ["name", "appIcon", "instructions", "description", "purpose", "mimeType", "gradeLevel", "identifier", "medium", "pkgVersion", "board", "subject", "resourceType", "primaryCategory", "contentType", "channel", "organisation", "trackable", "license", "posterImage", "idealScreenSize", "learningMode", "creatorLogo", "duration", "version", "avgRating"]
+          "fields": ["name", "appIcon", "instructions", "description", "purpose", "mimeType", 
+          "gradeLevel", "identifier", "medium", "pkgVersion", "board", "subject", "resourceType", 
+          "primaryCategory", "contentType", "channel", "organisation", "trackable", "license", "posterImage", 
+          "idealScreenSize", "learningMode", "creatorLogo", "duration", "version", "avgRating", "competencies_v5"]
         }, "query": ""
       }
       this.trainingPlanService.getAllContent(filterObj).subscribe((res: any) => {
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
index dba797d8d..2eddbaa84 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
@@ -9,7 +9,7 @@
             <ws-app-standard-card [cardSize]="3" [contentData]="contentData" (handleSelectedChips)="handleSelectedChips($event)"></ws-app-standard-card>
         </div>
         <div class="flex-2 margin-left-s margin-top-s">
-            <ws-app-competency-summary></ws-app-competency-summary>
+            <ws-app-competency-summary [contentData]="contentData" [selectContentCount]="selectContentCount"></ws-app-competency-summary>
         </div>
     </div>
 </ng-container>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
index f2d989cdc..d19de791d 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
@@ -51,7 +51,7 @@ export class CreateContentComponent implements OnInit {
       if (this.trainingPlanDataSharingService.trainingPlanStepperData &&
         this.trainingPlanDataSharingService.trainingPlanStepperData.contentList) {
         console.log('this.trainingPlanDataSharingService.trainingPlanContentData.data.content', this.trainingPlanDataSharingService.trainingPlanStepperData.contentList)
-        this.trainingPlanDataSharingService.trainingPlanContentData.data.content.map((sitem: any) => {
+        this.trainingPlanDataSharingService.trainingPlanContentData.data.content && this.trainingPlanDataSharingService.trainingPlanContentData.data.content.map((sitem: any) => {
           if (this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.indexOf(sitem.identifier) > -1) {
             sitem['selected'] = true
           }
@@ -72,7 +72,7 @@ export class CreateContentComponent implements OnInit {
     if (event) {
       this.selectedContentChips = this.trainingPlanDataSharingService.trainingPlanContentData.data.content
       console.log('this.selectedContentChips', this.selectedContentChips)
-      this.selectedContentChips.map((sitem) => {
+      this.selectedContentChips && this.selectedContentChips.map((sitem) => {
         if (sitem.selected) {
           this.selectContentCount = this.selectContentCount + 1
           console.log('this.selectContentCount', this.selectContentCount)
diff --git a/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts b/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
index eb630c56b..51ca57173 100644
--- a/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
+++ b/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
@@ -1,9 +1,11 @@
 import { Injectable } from '@angular/core'
+import { Subject } from 'rxjs';
 
 @Injectable({
   providedIn: 'root',
 })
 export class TrainingPlanDataSharingService {
+  trainingPlanCategoryChangeEvent = new Subject();
   trainingPlanTitle: string = ''
   trainingPlanContentData: any
   trainingPlanAssigneeData: any

From 56bc407d6f1596b514d29d175c986ab0301e4f8d Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Wed, 13 Dec 2023 15:34:44 +0530
Subject: [PATCH 334/887] still working on disable and stepper

---
 .../add-plan-information.component.ts         |   10 +-
 .../breadcrumb/breadcrumb.component.html      |    6 +-
 .../breadcrumb/breadcrumb.component.scss      |    4 +
 .../breadcrumb/breadcrumb.component.ts        |   12 +
 .../components/chip/chip.component.ts         |    9 +-
 .../standard-card.component.html              | 1029 +----------------
 .../components/stepper/stepper.component.html |   11 +-
 .../components/stepper/stepper.component.ts   |   13 +-
 .../create-content.component.html             |    6 +-
 .../create-content.component.ts               |   17 +-
 .../create-plan/create-plan.component.html    |    6 +-
 .../create-plan/create-plan.component.ts      |   14 +-
 12 files changed, 85 insertions(+), 1052 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
index dfa2d6c57..fa415ed2e 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
@@ -10,7 +10,7 @@ import { TrainingPlanDataSharingService } from '../../services/training-plan-dat
 })
 export class AddPlanInformationComponent implements OnInit {
 
-  @Output() planTitleValid = new EventEmitter<any>()
+  @Output() planTitleInvalid = new EventEmitter<any>()
 
   contentForm!: FormGroup
 
@@ -20,14 +20,18 @@ export class AddPlanInformationComponent implements OnInit {
   ) { }
 
   ngOnInit() {
+    if (!this.trainingPlanDataSharingSvc.trainingPlanTitle) {
+      this.planTitleInvalid.emit(true)
+    }
     this.contentForm = this.formBuilder.group({
-      name: new FormControl('', [Validators.required, Validators.minLength(10)])
+      name: new FormControl((this.trainingPlanDataSharingSvc.trainingPlanTitle)
+        ? this.trainingPlanDataSharingSvc.trainingPlanTitle : '', [Validators.required, Validators.minLength(10)])
     })
     this.contentForm.controls['name'].valueChanges.pipe(debounceTime(700)).subscribe((_ele: any) => {
       if (!this.contentForm.invalid) {
         this.trainingPlanDataSharingSvc.trainingPlanTitle = _ele
       }
-      this.planTitleValid.emit(this.contentForm.invalid)
+      this.planTitleInvalid.emit(this.contentForm.invalid)
     })
   }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
index 9651ac51d..fd4b11e4a 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
@@ -10,13 +10,15 @@
             (tabType.ADD_CONTENT === selectedTab) ? 'Add content' : (tabType.ADD_ASSIGNEE === selectedTab) ? 'Add
             assignee' : (tabType.ADD_TIMELINE === selectedTab) ? 'Add timeline' : ''}}
         </div>
+        {{validationList | json}}
     </div>
     <div class="flex flex-1 flex-row right-breadcrumb" *ngIf="showBreadcrumbAction">
         <button mat-button class="cancel" (click)="cancel()">
             <span>Cancel</span>
         </button>
-        <button mat-button class="next-btn margin-left-m" (click)="nextStep()"
-            *ngIf="tabType.CREATE_PLAN === selectedTab || tabType.ADD_CONTENT === selectedTab || tabType.ADD_ASSIGNEE === selectedTab || tabType.ADD_TIMELINE === selectedTab">
+        <button mat-button class="next-btn margin-left-m" (click)="nextStep()" *ngIf="tabType.CREATE_PLAN === selectedTab || tabType.ADD_CONTENT === selectedTab
+            || tabType.ADD_ASSIGNEE === selectedTab || tabType.ADD_TIMELINE === selectedTab"
+            [disabled]="checkIfDisabled()" [ngClass]="{'btn-disabled': checkIfDisabled()}">
             <span>Next: {{(tabType.CREATE_PLAN === selectedTab) ? 'Add Content' : (tabType.ADD_CONTENT === selectedTab)
                 ? 'Add assignee' : (tabType.ADD_ASSIGNEE === selectedTab) ? 'Add timeline' : 'Draft'}}</span>
         </button>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.scss b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.scss
index 72f4d40dd..8a9f35371 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.scss
@@ -49,4 +49,8 @@
 
 .right-breaddrumb {
     width: 20%
+}
+
+.btn-disabled {
+    background: rgba(0, 0, 0, 0.16) !important
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
index 472279e26..972a4b241 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
@@ -14,6 +14,7 @@ export class BreadcrumbComponent implements OnInit {
 
   @Input() showBreadcrumbAction = true
   @Input() selectedTab: string = ''
+  @Input() validationList: any
   @Output() changeToNextTab = new EventEmitter<any>()
 
   public dialogRef: any
@@ -24,6 +25,7 @@ export class BreadcrumbComponent implements OnInit {
     private trainingPlanService: TrainingPlanService) { }
 
   ngOnInit() {
+    this.checkIfDisabled()
   }
 
   cancel() {
@@ -121,4 +123,14 @@ export class BreadcrumbComponent implements OnInit {
       }, 1000)
     })
   }
+
+  checkIfDisabled() {
+    if (this.tabType.CREATE_PLAN === this.selectedTab && this.validationList && !this.validationList.titleIsInvalid) {
+      return this.validationList.titleIsInvalid
+    }
+    if (this.tabType.ADD_CONTENT === this.selectedTab && this.validationList && !this.validationList.addContentIsInvalid) {
+      return this.validationList.addContentIsInvalid
+    }
+    return true
+  }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
index 2059d92a0..24c79635e 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, OnInit } from '@angular/core'
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
 import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
 @Component({
   selector: 'ws-app-chip',
@@ -11,6 +11,8 @@ export class ChipComponent implements OnInit {
   @Input() from: any
   @Input() selectedAssigneeChips: any[] = [];
   @Input() selectAssigneeCount: number = 0;
+  @Output() itemRemoved = new EventEmitter<any>()
+
   constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
@@ -32,7 +34,7 @@ export class ChipComponent implements OnInit {
       this.trainingPlanDataSharingService.trainingPlanStepperData.contentType = ''
     }
     if (this.from === 'assignee') {
-      this.selectContentCount = 0
+      this.selectAssigneeCount = 0
       console.log('this.trainingPlanDataSharingService.trainingPlanAssigneeData', this.trainingPlanDataSharingService.trainingPlanAssigneeData)
       this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
         if (sitem['selected']) {
@@ -42,7 +44,7 @@ export class ChipComponent implements OnInit {
       this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo = []
       this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentType = ''
     }
-
+    this.itemRemoved.emit(true)
   }
 
   removeContent(item: any) {
@@ -56,6 +58,7 @@ export class ChipComponent implements OnInit {
       let index = this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.findIndex((x: any) => x === item['identifier'])
       this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.splice(index, 1)
     }
+    this.itemRemoved.emit(true)
   }
 
   removeAssignee(item: any) {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
index 78a534943..bf873d47a 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
@@ -6,7 +6,8 @@
                     <div style="position: relative; z-index: 1;">
                         <ng-container>
                             <div class="card-select-box" *ngIf="checkboxVisibility">
-                                <mat-checkbox class="card-select-check" [checked]="item?.selected" (change)="selectContentItem($event, item)"></mat-checkbox>
+                                <mat-checkbox class="card-select-check" [checked]="item?.selected"
+                                    (change)="selectContentItem($event, item)"></mat-checkbox>
                             </div>
                             <img mat-card-image loading="lazy"
                                 class="card-img ws-mat-primary-lite-background margin-remove"
@@ -45,1030 +46,4 @@
             </mat-card>
         </div>
     </div>
-</ng-container>
-<ng-container *ngIf="cardSize === 4">
-    <div class="flex flex-4 flex-row card-grid">
-        <div class="flex flex-3 flex-row card-grid-container">
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <div class="card-select-box" *ngIf="checkboxVisibility">
-                                                    <mat-checkbox class="card-select-check"></mat-checkbox>
-                                                </div>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-        </div>
-    </div>
-    <div class="flex flex-4 flex-row card-grid">
-        <div class="flex flex-3 flex-row card-grid-container">
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <div class="card-select-box" *ngIf="checkboxVisibility">
-                                                    <mat-checkbox class="card-select-check"></mat-checkbox>
-                                                </div>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-        </div>
-    </div>
-    <div class="flex flex-4 flex-row card-grid">
-        <div class="flex flex-3 flex-row card-grid-container">
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <div class="card-select-box" *ngIf="checkboxVisibility">
-                                                    <mat-checkbox class="card-select-check"></mat-checkbox>
-                                                </div>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-        </div>
-    </div>
-    <div class="flex flex-4 flex-row card-grid">
-        <div class="flex flex-3 flex-row card-grid-container">
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <div class="card-select-box" *ngIf="checkboxVisibility">
-                                                    <mat-checkbox class="card-select-check"></mat-checkbox>
-                                                </div>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-        </div>
-    </div>
-</ng-container>
-<ng-container *ngIf="cardSize === 5">
-    <div class="">
-        <div class="flex flex-3 flex-row card-grid-container flex-wrap">
-            <div class="flex  course-card  margin-right-l margin-right-l">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <div class="card-select-box" *ngIf="checkboxVisibility">
-                                                    <mat-checkbox class="card-select-check"></mat-checkbox>
-                                                </div>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card  margin-right-l">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card  margin-right-l">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card  margin-right-l">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-            <div class="flex  course-card  margin-right-l">
-                <mat-card class="card-standard-container mr-5 padding-remove">
-                    <div class="display-contents">
-                        <ng-container>
-                            <a>
-                                <ng-container>
-                                    <mat-card-content class="min-top">
-                                        <div style="position: relative; z-index: 1;">
-                                            <ng-container>
-                                                <img mat-card-image loading="lazy"
-                                                    class="card-img ws-mat-primary-lite-background margin-remove" />
-                                            </ng-container>
-                                        </div>
-                                        <div class="padding-m">
-                                            <div class="course_widget flex margin-remove">
-                                                <div class="flex flex-end course_v2">
-                                                    <mat-icon
-                                                        class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                                    Course
-                                                </div>
-                                            </div>
-                                            <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                                                BLENDED PROGRAM FOR ONE STEP PC APPROVAL
-                                            </div>
-                                            <div class="flex w-full flex-wrap flex-middle">
-                                                <div class="course_logo_box">
-                                                    <img class="source-icon" />
-                                                </div>
-                                                <span class="org-text">By Karmayogi Bharat</span>
-                                            </div>
-                                            <div class="flex flex-middle rating-session margin-top-m">
-                                                <div class="flex flex-middle">
-                                                    <mat-icon class="mr-1">star</mat-icon>
-                                                    <span>4.5</span>
-                                                </div>
-                                                <ng-container>
-                                                    <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                                </ng-container>
-                                            </div>
-                                        </div>
-                                    </mat-card-content>
-                                </ng-container>
-                            </a>
-                        </ng-container>
-                    </div>
-                </mat-card>
-            </div>
-        </div>
-    </div>
 </ng-container>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
index 87308dbcc..89b9943b9 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
@@ -1,24 +1,25 @@
 <div class="stepper">
     <mat-tab-group #tabGroup [disableRipple]="true" [selectedIndex]="tabIndexValue" class="margin-top-m"
         (selectedTabChange)="tabSelected($event)">
-        <mat-tab [label]="tabType.CREATE_PLAN" [disabled]="true">
+        <mat-tab [label]="tabType.CREATE_PLAN" [disabled]="false">
             <ng-template mat-tab-label>
                 1. Create a plan
             </ng-template>
             <ng-template matTabContent>
-                <ws-app-add-plan-information (planTitleValid)="checkForPlanTitle($event)"></ws-app-add-plan-information>
+                <ws-app-add-plan-information
+                    (planTitleInvalid)="checkForPlanTitle($event)"></ws-app-add-plan-information>
             </ng-template>
         </mat-tab>
-        <mat-tab [label]="tabType.ADD_CONTENT" [disabled]="true">
+        <mat-tab [label]="tabType.ADD_CONTENT" [disabled]="addCotnentDisable">
             <ng-template mat-tab-label>
                 <span>2. Add Content
                 </span>
             </ng-template>
             <ng-template matTabContent>
-                <ws-app-create-content></ws-app-create-content>
+                <ws-app-create-content (addContentInvalid)="checkForaddContent($event)"></ws-app-create-content>
             </ng-template>
         </mat-tab>
-        <mat-tab [label]="tabType.ADD_ASSIGNEE" [disabled]="true">
+        <mat-tab [label]="tabType.ADD_ASSIGNEE" [disabled]="addCotnentDisable || addAssigneeDisable">
             <ng-template mat-tab-label>
                 <span>3. Add Assignee</span>
             </ng-template>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
index e22a06f55..2eeeaebaf 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
@@ -10,10 +10,13 @@ export class StepperComponent implements OnInit, OnChanges {
 
   @Input() changeTabOnNext!: string
   @Output() selectedTabType = new EventEmitter<any>()
-  @Output() planTitleCheck = new EventEmitter<any>()
+  @Output() titleInvalid = new EventEmitter<any>()
+  @Output() addContentIsInvalid = new EventEmitter<any>()
 
   tabType = TrainingPlanContent.TTabLabelKey
   tabIndexValue: number = 0
+  addCotnentDisable: boolean = true
+  addAssigneeDisable: boolean = true
 
   constructor() { }
 
@@ -38,12 +41,18 @@ export class StepperComponent implements OnInit, OnChanges {
   }
 
   tabSelected(_event: any) {
+    this.tabIndexValue = _event.index
     const tempData = _event.tab.textLabel
     this.selectedTabType.emit(tempData)
   }
 
   checkForPlanTitle(_event: any) {
-    this.planTitleCheck.emit(_event)
+    this.addCotnentDisable = _event
+    this.titleInvalid.emit(_event)
   }
 
+  checkForaddContent(_event: any) {
+    this.addAssigneeDisable = _event
+    this.addContentIsInvalid.emit(_event)
+  }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
index dba797d8d..6b5bca0bb 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
@@ -5,8 +5,10 @@
 <ng-container>
     <div class="flex flex-row">
         <div class="flex-1">
-            <ws-app-chip [selectedContentChips]="selectedContentChips" [from]="from" [selectContentCount]="selectContentCount"></ws-app-chip>
-            <ws-app-standard-card [cardSize]="3" [contentData]="contentData" (handleSelectedChips)="handleSelectedChips($event)"></ws-app-standard-card>
+            <ws-app-chip [selectedContentChips]="selectedContentChips" [from]="from"
+                [selectContentCount]="selectContentCount" (itemRemoved)="itemsRemovedFromChip()"></ws-app-chip>
+            <ws-app-standard-card [cardSize]="3" [contentData]="contentData"
+                (handleSelectedChips)="handleSelectedChips($event)"></ws-app-standard-card>
         </div>
         <div class="flex-2 margin-left-s margin-top-s">
             <ws-app-competency-summary></ws-app-competency-summary>
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
index f2d989cdc..118e08be0 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core'
+import { Component, EventEmitter, OnInit, Output } from '@angular/core'
 import { TrainingPlanDataSharingService } from './../../services/training-plan-data-share.service'
 @Component({
   selector: 'ws-app-create-content',
@@ -6,6 +6,9 @@ import { TrainingPlanDataSharingService } from './../../services/training-plan-d
   styleUrls: ['./create-content.component.scss'],
 })
 export class CreateContentComponent implements OnInit {
+
+  @Output() addContentInvalid = new EventEmitter<any>()
+
   categoryData: any[] = [];
   contentData: any[] = [];
   from = 'content';
@@ -41,8 +44,6 @@ export class CreateContentComponent implements OnInit {
         value: 'Moderated Course',
       },
     ]
-
-
   }
 
   handleApiData(event: any) {
@@ -61,8 +62,6 @@ export class CreateContentComponent implements OnInit {
       } else {
         this.contentData = this.trainingPlanDataSharingService.trainingPlanContentData.data.content
       }
-
-
     }
   }
 
@@ -79,7 +78,15 @@ export class CreateContentComponent implements OnInit {
         }
       })
     }
+    if (this.selectContentCount <= 0) {
+      this.addContentInvalid.emit(true)
+    } else {
+      this.addContentInvalid.emit(false)
+    }
+  }
 
+  itemsRemovedFromChip() {
+    this.handleSelectedChips(true)
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
index 1e53d583f..bd4ee0a9d 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
@@ -1,5 +1,7 @@
 <div class="plan-container">
-    <ws-app-breadcrumb [selectedTab]="selectedTabData" (changeToNextTab)="changeTab($event)"></ws-app-breadcrumb>
+    <ws-app-breadcrumb [selectedTab]="selectedTabData" [validationList]="createCheck"
+        (changeToNextTab)="changeTab($event)"></ws-app-breadcrumb>
     <ws-app-stepper (selectedTabType)="selectedTabAction($event)" [changeTabOnNext]="nextTab"
-        (planTitleCheck)="planTitleValidation($event)"></ws-app-stepper>
+        (titleInvalid)="isPlanTitleInvalid($event)"
+        (addContentIsInvalid)="isAddContentInvalid($event)"></ws-app-stepper>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
index ffd794d36..ce7eab8f6 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
@@ -13,6 +13,7 @@ export class CreatePlanComponent implements OnInit, AfterViewInit, OnDestroy {
 
   selectedTabData: string = 'createPlan'
   nextTab: string = ''
+  createCheck: any
 
   constructor() {
   }
@@ -27,13 +28,24 @@ export class CreatePlanComponent implements OnInit, AfterViewInit, OnDestroy {
 
   selectedTabAction(_event: any) {
     this.selectedTabData = _event
+    this.nextTab = _event
   }
 
   changeTab(_event: any) {
     this.nextTab = _event
   }
 
-  planTitleValidation(_event: any) {
+  isPlanTitleInvalid(_event: any) {
+    this.createCheck = {
+      ...this.createCheck,
+      titleIsInvalid: _event
+    }
+  }
 
+  isAddContentInvalid(_event: any) {
+    this.createCheck = {
+      ...this.createCheck,
+      addContentIsInvalid: _event
+    }
   }
 }

From 5f5ec772ec60daf62b62ef93ef0170429489fc63 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Thu, 14 Dec 2023 10:59:07 +0530
Subject: [PATCH 335/887] done with disable and enable of the tabs and complete
 flow for create cbp plan

---
 .../breadcrumb/breadcrumb.component.html      |  8 ++++----
 .../breadcrumb/breadcrumb.component.ts        |  7 +++----
 .../standard-card.component.html              |  6 ++++--
 .../standard-card.component.scss              | 10 ++++------
 .../components/stepper/stepper.component.html |  5 +++--
 .../components/stepper/stepper.component.ts   |  7 +++++++
 .../user-card/user-card.component.html        | 20 ++++++++++++-------
 .../user-card/user-card.component.scss        | 13 ++++--------
 .../create-assignee.component.ts              | 11 ++++++++--
 .../create-plan/create-plan.component.html    |  4 ++--
 .../create-plan/create-plan.component.ts      |  7 +++++++
 11 files changed, 60 insertions(+), 38 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
index fd4b11e4a..46ebd7903 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
@@ -17,12 +17,12 @@
             <span>Cancel</span>
         </button>
         <button mat-button class="next-btn margin-left-m" (click)="nextStep()" *ngIf="tabType.CREATE_PLAN === selectedTab || tabType.ADD_CONTENT === selectedTab
-            || tabType.ADD_ASSIGNEE === selectedTab || tabType.ADD_TIMELINE === selectedTab"
-            [disabled]="checkIfDisabled()" [ngClass]="{'btn-disabled': checkIfDisabled()}">
+            || tabType.ADD_ASSIGNEE === selectedTab" [disabled]="checkIfDisabled()"
+            [ngClass]="{'btn-disabled': checkIfDisabled()}">
             <span>Next: {{(tabType.CREATE_PLAN === selectedTab) ? 'Add Content' : (tabType.ADD_CONTENT === selectedTab)
-                ? 'Add assignee' : (tabType.ADD_ASSIGNEE === selectedTab) ? 'Add timeline' : 'Draft'}}</span>
+                ? 'Add assignee' : (tabType.ADD_ASSIGNEE === selectedTab) ? 'Add timeline' : ''}}</span>
         </button>
-        <button mat-button class="next-btn margin-left-m" (click)="saveAsDraft()"
+        <button mat-button class="next-btn margin-left-m" (click)="createPlanDraftView()"
             *ngIf="tabType.ADD_TIMELINE === selectedTab">
             <span>Save as draft</span>
         </button>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
index 972a4b241..28477dcdd 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
@@ -105,10 +105,6 @@ export class BreadcrumbComponent implements OnInit {
     this.dialogRef.close()
   }
 
-  saveAsDraft() {
-    this.changeToNextTab.emit('saveAsDraft')
-  }
-
   createPlanDraftView() {
     console.log(this.trainingPlanDataSharingService.trainingPlanStepperData)
     let obj = { "request": this.trainingPlanDataSharingService.trainingPlanStepperData }
@@ -131,6 +127,9 @@ export class BreadcrumbComponent implements OnInit {
     if (this.tabType.ADD_CONTENT === this.selectedTab && this.validationList && !this.validationList.addContentIsInvalid) {
       return this.validationList.addContentIsInvalid
     }
+    if (this.tabType.ADD_ASSIGNEE === this.selectedTab && this.validationList && !this.validationList.addAssigneeIsInvalid) {
+      return this.validationList.addAssigneeIsInvalid
+    }
     return true
   }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
index d1039611b..b999cab62 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
@@ -9,8 +9,10 @@
                                 <mat-checkbox class="card-select-check" [checked]="item?.selected"
                                     (change)="selectContentItem($event, item)"></mat-checkbox>
                             </div>
-                            <div class="card-cross-icon" *ngIf="showDeleteFlag" (click)="deleteItem(item)">
-                                    <img class="cursor-pointer" src="assets/icons/close.svg" />
+                            <div class="card-cross-icon" *ngIf="showDeleteFlag">
+                                <button mat-mini-fab class="card-cross-btn" type="button" (click)="deleteItem(item)">
+                                    <mat-icon>close</mat-icon>
+                                </button>
                             </div>
                             <img mat-card-image loading="lazy"
                                 class="card-img ws-mat-primary-lite-background margin-remove"
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
index 320727d11..6e6cb45a8 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
@@ -19,7 +19,6 @@ $secondary-color: #EF951E;
   // $card-standard-width-: 331px;
   position: relative;
   width: 307px;
-  height: 345px;
   border-radius: 8px;
   box-sizing: border-box;
   box-shadow: 0px 10px 30px #99999933;
@@ -541,15 +540,14 @@ $title-line-count: 2;
 
 .card-cross-icon {
   position: absolute;
-  border: 1px solid rgb(27, 76, 161);
-  background: #fff;
-  border-radius: 50%;
-  padding: 10px;
-  vertical-align: middle;
   right: -12px;
   top: -14px;
 }
 
 .card-cross-icon img {
   vertical-align: middle;
+}
+
+.card-cross-btn {
+  background: white !important;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
index 89b9943b9..89f5d3e18 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
@@ -24,10 +24,11 @@
                 <span>3. Add Assignee</span>
             </ng-template>
             <ng-template matTabContent>
-                <ws-app-create-assignee></ws-app-create-assignee>
+                <ws-app-create-assignee (addAssigneeInvalid)="checkForaddAssignee($event)"></ws-app-create-assignee>
             </ng-template>
         </mat-tab>
-        <mat-tab [label]="tabType.ADD_TIMELINE" [disabled]="true">
+        <mat-tab [label]="tabType.ADD_TIMELINE"
+            [disabled]="addCotnentDisable || addAssigneeDisable || addTimelineDisable">
             <ng-template mat-tab-label>
                 <span>4. Add Timeline</span>
             </ng-template>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
index 2eeeaebaf..9ce54cc93 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
@@ -12,11 +12,13 @@ export class StepperComponent implements OnInit, OnChanges {
   @Output() selectedTabType = new EventEmitter<any>()
   @Output() titleInvalid = new EventEmitter<any>()
   @Output() addContentIsInvalid = new EventEmitter<any>()
+  @Output() addAssigneeIsInvalid = new EventEmitter<any>()
 
   tabType = TrainingPlanContent.TTabLabelKey
   tabIndexValue: number = 0
   addCotnentDisable: boolean = true
   addAssigneeDisable: boolean = true
+  addTimelineDisable: boolean = true
 
   constructor() { }
 
@@ -55,4 +57,9 @@ export class StepperComponent implements OnInit, OnChanges {
     this.addAssigneeDisable = _event
     this.addContentIsInvalid.emit(_event)
   }
+
+  checkForaddAssignee(_event: any) {
+    this.addTimelineDisable = _event
+    this.addAssigneeIsInvalid.emit(_event)
+  }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
index 5c0d6f509..0a3d62e49 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
@@ -8,11 +8,14 @@
                 <p>{{item?.firstName}} </p>
                 <p class="sub-heading">{{item?.rootOrgName}}</p>
             </div>
-            <div class="card-cross-icon" *ngIf="showDeleteFlag" (click)="deleteItem(item)">
-                <img class="cursor-pointer" src="assets/icons/close.svg" />
+            <div class="card-cross-icon" *ngIf="showDeleteFlag">
+                <button mat-mini-fab class="card-cross-btn" type="button" (click)="deleteItem(item)">
+                    <mat-icon>close</mat-icon>
+                </button>
             </div>
             <div class="check-action" *ngIf="checkboxVisibility">
-                <mat-checkbox class="example-margin" [checked]="item?.selected" (change)="selectAssigneeItem($event, item)"></mat-checkbox>
+                <mat-checkbox class="example-margin" [checked]="item?.selected"
+                    (change)="selectAssigneeItem($event, item)"></mat-checkbox>
             </div>
         </div>
     </ng-container>
@@ -23,15 +26,18 @@
 <div class="flex flex-4 flex-row custom-user-card-container flex-wrap" *ngIf="assigneeData?.category === 'Designation'">
     <ng-container *ngFor="let item of assigneeData?.data | slice : 0 : 20">
         <div class="flex flex-4 custom-user-card active-card">
-            <div class="card-cross-icon" *ngIf="showDeleteFlag" (click)="deleteItem(item)">
-                <img class="cursor-pointer" src="assets/icons/close.svg" />
+            <div class="card-cross-icon" *ngIf="showDeleteFlag">
+                <button mat-mini-fab class="card-cross-btn" type="button" (click)="deleteItem(item)">
+                    <mat-icon>close</mat-icon>
+                </button>
             </div>
             <div class="custom-user-desc">
                 <p>{{item?.name}}</p>
             </div>
-            
+
             <div class="check-action" *ngIf="checkboxVisibility">
-                <mat-checkbox class="example-margin" [checked]="item?.selected" (change)="selectAssigneeItem($event, item)"></mat-checkbox>
+                <mat-checkbox class="example-margin" [checked]="item?.selected"
+                    (change)="selectAssigneeItem($event, item)"></mat-checkbox>
             </div>
         </div>
     </ng-container>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
index a2a6a820f..1605330a8 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
@@ -105,15 +105,10 @@
 
 .card-cross-icon {
     position: absolute;
-    border: 1px solid rgb(27, 76, 161);
-    background: #fff;
-    border-radius: 50%;
-    padding: 10px;
-    vertical-align: middle;
-    right: -12px;
-    top:-14px;
+    right: -10px;
+    top:-20px;
 }
 
-.card-cross-icon img {
-    vertical-align: middle;
+.card-cross-btn  {
+    background: white !important;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
index b294dc7bd..6a6b71b6e 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core'
+import { Component, EventEmitter, OnInit, Output } from '@angular/core'
 import { TrainingPlanDataSharingService } from './../../services/training-plan-data-share.service'
 
 @Component({
@@ -7,6 +7,9 @@ import { TrainingPlanDataSharingService } from './../../services/training-plan-d
   styleUrls: ['./create-assignee.component.scss'],
 })
 export class CreateAssigneeComponent implements OnInit {
+
+  @Output() addAssigneeInvalid = new EventEmitter<any>()
+
   categoryData: any[] = [];
   assigneeData: any[] = [];
   selectAssigneeCount: number = 0;
@@ -66,7 +69,11 @@ export class CreateAssigneeComponent implements OnInit {
         }
       })
     }
-
+    if (this.selectAssigneeCount <= 0) {
+      this.addAssigneeInvalid.emit(true)
+    } else {
+      this.addAssigneeInvalid.emit(false)
+    }
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
index bd4ee0a9d..36bf1ffc7 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
@@ -2,6 +2,6 @@
     <ws-app-breadcrumb [selectedTab]="selectedTabData" [validationList]="createCheck"
         (changeToNextTab)="changeTab($event)"></ws-app-breadcrumb>
     <ws-app-stepper (selectedTabType)="selectedTabAction($event)" [changeTabOnNext]="nextTab"
-        (titleInvalid)="isPlanTitleInvalid($event)"
-        (addContentIsInvalid)="isAddContentInvalid($event)"></ws-app-stepper>
+        (titleInvalid)="isPlanTitleInvalid($event)" (addContentIsInvalid)="isAddContentInvalid($event)"
+        (addAssigneeIsInvalid)="isAddAssigneeInvalid($event)"></ws-app-stepper>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
index ce7eab8f6..7e9a215c6 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
@@ -48,4 +48,11 @@ export class CreatePlanComponent implements OnInit, AfterViewInit, OnDestroy {
       addContentIsInvalid: _event
     }
   }
+
+  isAddAssigneeInvalid(_event: any) {
+    this.createCheck = {
+      ...this.createCheck,
+      addAssigneeIsInvalid: _event
+    }
+  }
 }

From b2cc4300edcedd449330172d1be33b114104b8cb Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Thu, 14 Dec 2023 12:22:36 +0530
Subject: [PATCH 336/887] update for 3 more and training plan name with servie
 variable binding

---
 .../add-plan-information.component.ts         |  3 +-
 .../components/chip/chip.component.html       |  4 +--
 .../components/chip/chip.component.ts         |  9 ++++--
 .../preview-plan/preview-plan.component.html  |  7 +++--
 .../preview-plan/preview-plan.component.ts    | 29 +++++++++++++++----
 .../training-plan-data-share.service.ts       |  2 +-
 6 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
index fa415ed2e..929ffba72 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
@@ -29,7 +29,8 @@ export class AddPlanInformationComponent implements OnInit {
     })
     this.contentForm.controls['name'].valueChanges.pipe(debounceTime(700)).subscribe((_ele: any) => {
       if (!this.contentForm.invalid) {
-        this.trainingPlanDataSharingSvc.trainingPlanTitle = _ele
+        this.trainingPlanDataSharingSvc.trainingPlanTitle = _ele;
+        this.trainingPlanDataSharingSvc.trainingPlanStepperData.name = _ele;
       }
       this.planTitleInvalid.emit(this.contentForm.invalid)
     })
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
index 550a34314..f69e1a214 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
@@ -11,7 +11,7 @@
             </div>
         </div>
         </ng-container>
-        <a mat-button class="select-more-link margin-left-m" *ngIf="selectContentCount > 3">+3 more</a>
+        <a mat-button class="select-more-link margin-left-m" *ngIf="selectContentCount > 3" (click)="navigateToPreviewPage()">+3 more</a>
     </div>
     <div class="flex flex-1 flex-row right-section flex-middle">
         <a mat-button class="select-more-link" (click)="clearAll()">Clear all</a>
@@ -30,7 +30,7 @@
             </div>
         </div>
         </ng-container>
-        <a mat-button class="select-more-link margin-left-m" *ngIf="selectAssigneeCount > 3">+3 more</a>
+        <a mat-button class="select-more-link margin-left-m" *ngIf="selectAssigneeCount > 3" (click)="navigateToPreviewPage()">+3 more</a>
     </div>
     <div class="flex flex-1 flex-row right-section flex-middle">
         <a mat-button class="select-more-link" (click)="clearAll()">Clear all</a>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
index 24c79635e..708a3e6fc 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
@@ -1,5 +1,6 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
-import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
+import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service';
+import { Router } from '@angular/router'
 @Component({
   selector: 'ws-app-chip',
   templateUrl: './chip.component.html',
@@ -13,7 +14,7 @@ export class ChipComponent implements OnInit {
   @Input() selectAssigneeCount: number = 0;
   @Output() itemRemoved = new EventEmitter<any>()
 
-  constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
+  constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService, private router: Router) { }
 
   ngOnInit() {
   }
@@ -74,4 +75,8 @@ export class ChipComponent implements OnInit {
     }
   }
 
+  navigateToPreviewPage() {
+    this.router.navigate(['app', 'training-plan', 'preview-plan'], { queryParams: {from : this.from}})
+  }
+
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
index d9b824809..6a5b47422 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
@@ -2,6 +2,9 @@
 <div class="flex margin-top-l">
     <button mat-stroked-button><mat-icon>arrow_back</mat-icon> Go back</button>
 </div>
-<div class="flex">
-    <ws-app-standard-card [cardSize]="5"></ws-app-standard-card>
+<div class="flex" *ngIf="from==='content'">
+    <ws-app-standard-card [checkboxVisibility]="false" [contentData]="contentData"></ws-app-standard-card>
+</div>
+<div class="flex" *ngIf="from==='assignee'">
+    <ws-app-user-card [checkboxVisibility]="false" [assigneeData]="contentData"></ws-app-user-card>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
index fbdfced05..309259b7e 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
@@ -1,20 +1,39 @@
 import { Component, OnInit } from '@angular/core'
-import { Router } from '@angular/router'
-
+import { Router, ActivatedRoute } from '@angular/router'
+import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service';
 @Component({
   selector: 'ws-app-preview-plan',
   templateUrl: './preview-plan.component.html',
   styleUrls: ['./preview-plan.component.scss'],
 })
 export class PreviewPlanComponent implements OnInit {
-
-  constructor(private router: Router) { }
+  contentData:any = [];
+  from:any = '';
+  constructor(private router: Router, private route: ActivatedRoute, private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
+    this.from = this.route.snapshot.queryParams['from'];
+    console.log('from', this.from, this.trainingPlanDataSharingService);
+    if(this.from === 'content') {
+      if( this.trainingPlanDataSharingService.trainingPlanContentData &&
+        this.trainingPlanDataSharingService.trainingPlanContentData.data ) {
+          this.contentData = this.trainingPlanDataSharingService.trainingPlanContentData.data.content.filter((item: any) => {
+            return item.selected
+          })
+        }
+      
+    } else if(this.from === 'assignee') {
+      let category = this.trainingPlanDataSharingService.trainingPlanAssigneeData.category
+      let assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
+        return item.selected
+      })
+      this.contentData = { 'category': category, data: assigneeData }
+    }
+    
   }
 
   goBack() {
     this.router.navigateByUrl('/app/training-plan/create-plan')
   }
 
-}
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts b/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
index 51ca57173..2ca748522 100644
--- a/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
+++ b/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
@@ -10,7 +10,7 @@ export class TrainingPlanDataSharingService {
   trainingPlanContentData: any
   trainingPlanAssigneeData: any
   trainingPlanStepperData: any = {
-    "name": "CBP Plan Name",
+    "name": "",
     "contentType": "",
     "contentList": [
     ],

From f8cc1933e11b0d1f0384e3ba5392b2d928845a54 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Thu, 14 Dec 2023 14:57:07 +0530
Subject: [PATCH 337/887] added see all preview page for timeline

---
 .../components/chip/chip.component.html       |  21 +++-
 .../components/chip/chip.component.ts         |  46 ++++++--
 .../competency-summary.component.ts           |   4 +-
 .../user-card/user-card.component.scss        |   1 +
 .../user-card/user-card.component.ts          | 105 +++++++++++++-----
 .../create-assignee.component.ts              |  42 +++++--
 .../create-timeline.component.html            |   6 +-
 .../create-timeline.component.ts              |  20 +++-
 .../preview-plan/preview-plan.component.html  |  17 ++-
 .../preview-plan/preview-plan.component.ts    |  53 ++++++++-
 10 files changed, 250 insertions(+), 65 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
index f69e1a214..848428f3e 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
@@ -17,7 +17,7 @@
         <a mat-button class="select-more-link" (click)="clearAll()">Clear all</a>
     </div>
 </div>
-<div class="flex flex-row chip-container" *ngIf="selectAssigneeCount > 0 && from === 'assignee'">
+<div class="flex flex-row chip-container" *ngIf="selectAssigneeCount > 0 && from === 'assignee' && trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Designation'">
     <div class="flex flex-2 left-section flex-middle">
         <div class="selected-item-label">Selected items - </div>
         <ng-container *ngFor="let item of selectedAssigneeChips | slice : 0 : 3">
@@ -36,3 +36,22 @@
         <a mat-button class="select-more-link" (click)="clearAll()">Clear all</a>
     </div>
 </div>
+<div class="flex flex-row chip-container" *ngIf="selectAssigneeCount > 0 && from === 'assignee' && trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Custom Users'">
+    <div class="flex flex-2 left-section flex-middle">
+        <div class="selected-item-label">Selected items - </div>
+        <ng-container *ngFor="let item of selectedAssigneeChips | slice : 0 : 3">
+        <div class="chips flex flex-row" *ngIf="item?.selected">
+            <div class="chips-content">
+                <span class="color-60">{{item?.firstName}}</span>                
+            </div>
+            <div class="cross-icon" (click)="removeAssignee(item)">
+                <img class="cursor-pointer" src="assets/icons/close.svg" />
+            </div>
+        </div>
+        </ng-container>
+        <a mat-button class="select-more-link margin-left-m" *ngIf="selectAssigneeCount > 3" (click)="navigateToPreviewPage()">+3 more</a>
+    </div>
+    <div class="flex flex-1 flex-row right-section flex-middle">
+        <a mat-button class="select-more-link" (click)="clearAll()">Clear all</a>
+    </div>
+</div>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
index 708a3e6fc..ba8b4e2e2 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
@@ -37,11 +37,20 @@ export class ChipComponent implements OnInit {
     if (this.from === 'assignee') {
       this.selectAssigneeCount = 0
       console.log('this.trainingPlanDataSharingService.trainingPlanAssigneeData', this.trainingPlanDataSharingService.trainingPlanAssigneeData)
-      this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
-        if (sitem['selected']) {
-          sitem['selected'] = false
-        }
-      })
+      if(this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Designation') {
+        this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
+          if (sitem['selected']) {
+            sitem['selected'] = false
+          }
+        })
+      } else if(this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Custom Users') {
+        this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.content.map((sitem: any) => {
+          if (sitem['selected']) {
+            sitem['selected'] = false
+          }
+        })
+      }
+     
       this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo = []
       this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentType = ''
     }
@@ -64,15 +73,28 @@ export class ChipComponent implements OnInit {
 
   removeAssignee(item: any) {
     console.log('item', item, this.trainingPlanDataSharingService.trainingPlanAssigneeData)
-    this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
-      if (sitem['selected'] && sitem['id'] === item['id']) {
-        sitem['selected'] = false
+    if(this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Designation') {
+      this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
+        if (sitem['selected'] && sitem['id'] === item['id']) {
+          sitem['selected'] = false
+        }
+      })
+      if (this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.indexOf(item['identifier']) > -1) {
+        let index = this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.findIndex((x: any) => x === item['id'])
+        this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.splice(index, 1)
+      }
+    } else if (this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Custom Users') {
+      this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.content.map((sitem: any) => {
+        if (sitem['selected'] && sitem['userId'] === item['userId']) {
+          sitem['selected'] = false
+        }
+      })
+      if (this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.indexOf(item['identifier']) > -1) {
+        let index = this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.findIndex((x: any) => x === item['userId'])
+        this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.splice(index, 1)
       }
-    })
-    if (this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.indexOf(item['identifier']) > -1) {
-      let index = this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.findIndex((x: any) => x === item['id'])
-      this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.splice(index, 1)
     }
+    
   }
 
   navigateToPreviewPage() {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
index a4c6feabe..af054f281 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
@@ -57,7 +57,7 @@ export class CompetencySummaryComponent implements OnInit {
       }
     }
     ];
-    this.contentData.map((item: any) => {
+    this.contentData && this.contentData.map((item: any) => {
       if (item.selected) {
         this.selectedCardData.push(item);
       }
@@ -65,7 +65,7 @@ export class CompetencySummaryComponent implements OnInit {
 
     // let competencyThemeObj = {};
 
-    this.selectedCardData.map((sitem: any) => {
+    this.selectedCardData && this.selectedCardData.map((sitem: any) => {
       sitem.competencies_v5.map((fitem: any) => {
         if (fitem.competencyArea.toLowerCase() === 'behaviroal') {
           this.competencySummaryObj[0]['behaviroal']['count'] = this.competencySummaryObj[0]['behaviroal']['count'] + 1;
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
index 1605330a8..955deeb0b 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
@@ -17,6 +17,7 @@
     border: none !important;
     border-radius: 4px;
     padding: 22px 12px !important;
+    position: relative;
 }
 
 .avatar {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
index 542aa3baf..1a964f8d1 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
@@ -18,49 +18,98 @@ export class UserCardComponent implements OnInit {
   selectAssigneeItem(event: any, item: any) {
     if (event.checked) {
       // this.selectedContent.push(item);
-      this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any, index: any) => {
-        if (sitem.id === item.id) {
-          sitem['selected'] = true
-          this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.splice(index, 1)
-          this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.unshift(sitem)
+      if(this.assigneeData && this.assigneeData.category === 'Designation') {
+        this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any, index: any) => {
+          if (sitem.id === item.id) {
+            sitem['selected'] = true
+            this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.splice(index, 1)
+            this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.unshift(sitem)
+          }
+        })
+        if (this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo']) {
+          this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].push(item.id)
+        }
+      }
+      if(this.assigneeData && this.assigneeData.category === 'Custom Users') {
+        this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.content.map((sitem: any, index: any) => {
+          if (sitem.userId === item.userId) {
+            sitem['selected'] = true
+            this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.content.splice(index, 1)
+            this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.content.unshift(sitem)
+          }
+        })
+        if (this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo']) {
+          this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].push(item.userId)
         }
-      })
-      if (this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo']) {
-        this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].push(item.id)
       }
+      
     } else {
       // this.selectedContent = this.selectedContent.filter( sitem  => sitem.identifier !== item.identifier)
+      if(this.assigneeData && this.assigneeData.category === 'Designation') {
+        this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
+          if (sitem.id === item.id) {
+            sitem['selected'] = false
+          }
+        })
+        this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier: any, index: any) => {
+          if (identifier === item.id) {
+            this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].splice(index, 1)
+          }
+        })
+      } 
+      if(this.assigneeData && this.assigneeData.category === 'Custom Users') {
+        this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.content.map((sitem: any) => {
+          if (sitem.userId === item.userId) {
+            sitem['selected'] = false
+          }
+        })
+        this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier: any, index: any) => {
+          if (identifier === item.userId) {
+            this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].splice(index, 1)
+          }
+        })
+      }
+      
+    }
+    this.handleSelectedChips.emit(true)
+  }
+
+  deleteItem(item:any) {
+    console.log('item', item);
+    if(this.assigneeData && this.assigneeData.category === 'Designation') {
       this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
         if (sitem.id === item.id) {
           sitem['selected'] = false
         }
       })
+      this.assigneeData.data.map((sitem: any, index:any) => {
+        if (sitem.id === item.id) {
+          this.assigneeData.data.splice(index, 1)
+        }
+      })
       this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier: any, index: any) => {
         if (identifier === item.id) {
           this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].splice(index, 1)
         }
       })
+    } else if(this.assigneeData && this.assigneeData.category === 'Custom Users') {
+      this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
+        if (sitem.userId === item.userId) {
+          sitem['selected'] = false
+        }
+      })
+      this.assigneeData.data.map((sitem: any, index:any) => {
+        if (sitem.userId === item.userId) {
+          this.assigneeData.data.splice(index, 1)
+        }
+      })
+      this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier: any, index: any) => {
+        if (identifier === item.userId) {
+          this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].splice(index, 1)
+        }
+      })
     }
-    this.handleSelectedChips.emit(true)
-  }
-
-  deleteItem(item:any) {
-    console.log('item', item);
-    this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
-      if (sitem.id === item.id) {
-        sitem['selected'] = false
-      }
-    })
-    this.assigneeData.data.map((sitem: any, index:any) => {
-      if (sitem.id === item.id) {
-        this.assigneeData.data.splice(index, 1)
-      }
-    })
-    this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier: any, index: any) => {
-      if (identifier === item.id) {
-        this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].splice(index, 1)
-      }
-    })
+    
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
index 6a6b71b6e..cfba03ccc 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
@@ -13,7 +13,7 @@ export class CreateAssigneeComponent implements OnInit {
   categoryData: any[] = [];
   assigneeData: any[] = [];
   selectAssigneeCount: number = 0;
-  selectedAssigneeChips: any[] = [];
+  selectedAssigneeChips: any;
   constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
   from = 'assignee';
   ngOnInit() {
@@ -40,6 +40,7 @@ export class CreateAssigneeComponent implements OnInit {
     if (event) {
       console.log(this.trainingPlanDataSharingService.trainingPlanAssigneeData)
       if (this.trainingPlanDataSharingService.trainingPlanStepperData &&
+        this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Designation' && 
         this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo) {
         console.log('this.trainingPlanDataSharingService.trainingPlanContentData.data.content', this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo)
         this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
@@ -49,6 +50,17 @@ export class CreateAssigneeComponent implements OnInit {
         })
         this.assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData
         this.handleSelectedChips(true)
+      } else  if (this.trainingPlanDataSharingService.trainingPlanStepperData &&
+        this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Custom Users' && 
+        this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo) {
+        console.log('this.trainingPlanDataSharingService.trainingPlanContentData.data.content', this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo)
+        this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.content.map((sitem: any) => {
+          if (this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.indexOf(sitem.id) > -1) {
+            sitem['selected'] = true
+          }
+        })
+        this.assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData
+        this.handleSelectedChips(true)
       } else {
         this.assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData
       }
@@ -60,14 +72,26 @@ export class CreateAssigneeComponent implements OnInit {
     console.log('event', event)
     this.selectAssigneeCount = 0
     if (event) {
-      this.selectedAssigneeChips = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data
-      console.log('this.selectedAssigneeChips', this.selectedAssigneeChips)
-      this.selectedAssigneeChips.map((sitem) => {
-        if (sitem.selected) {
-          this.selectAssigneeCount = this.selectAssigneeCount + 1
-          console.log('this.selectContentCount', this.selectAssigneeCount)
-        }
-      })
+      if(this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Designation') {
+        this.selectedAssigneeChips = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data
+        console.log('this.selectedAssigneeChips', this.selectedAssigneeChips)
+        this.selectedAssigneeChips && this.selectedAssigneeChips.map((sitem:any) => {
+          if (sitem.selected) {
+            this.selectAssigneeCount = this.selectAssigneeCount + 1
+            console.log('this.selectContentCount', this.selectAssigneeCount)
+          }
+        })
+      } else if (this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Custom Users') {
+        this.selectedAssigneeChips = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.content
+        console.log('this.selectedAssigneeChips', this.selectedAssigneeChips)
+        this.selectedAssigneeChips && this.selectedAssigneeChips.map((sitem:any) => {
+          if (sitem.selected) {
+            this.selectAssigneeCount = this.selectAssigneeCount + 1
+            console.log('this.selectContentCount', this.selectAssigneeCount)
+          }
+        })
+      }
+      
     }
     if (this.selectAssigneeCount <= 0) {
       this.addAssigneeInvalid.emit(true)
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
index db0aa8e67..66a073689 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
@@ -5,16 +5,16 @@
     <div class="margin-top-xl">
         <div class="flex flex-middle flex-between">
             <div class="mat-subheading-1 margin-remove">Selected Content</div>
-            <a mat-button (click)="showAll()" class="show-all">Show all <mat-icon>keyboard_arrow_right</mat-icon></a>
+            <a mat-button (click)="showAll('all','content')" class="show-all">Show all <mat-icon>keyboard_arrow_right</mat-icon></a>
         </div>
     </div>
     <ws-app-standard-card [checkboxVisibility]="false" [contentData]="contentData" [showDeleteFlag]="true"></ws-app-standard-card>
 </ng-container>
-<ng-container *ngIf="assigneeData && assigneeData.data.length">
+<ng-container *ngIf="assigneeData && (assigneeData?.data?.length || assigneeData?.data?.content.length)">
     <div class="margin-top-xl">
         <div class=" flex flex-middle flex-between">
             <div class="mat-subheading-1 margin-remove">Selected Cards</div>
-            <a mat-button (click)="showAll()" class="show-all">Show all <mat-icon>keyboard_arrow_right</mat-icon></a>
+            <a mat-button (click)="showAll('all','assignee')" class="show-all">Show all <mat-icon>keyboard_arrow_right</mat-icon></a>
         </div>
     </div>
     <ws-app-user-card [checkboxVisibility]="false" [assigneeData]="assigneeData" [showDeleteFlag]="true"></ws-app-user-card>
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
index 6648fe11d..744fa3771 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
@@ -25,7 +25,8 @@ export class CreateTimelineComponent implements OnInit {
     console.log('this.contentData', this.contentData)
     console.log('this.trainingPlanDataSharingService.trainingPlanAssigneeData', this.trainingPlanDataSharingService.trainingPlanAssigneeData)
     if (this.trainingPlanDataSharingService.trainingPlanAssigneeData &&
-      this.trainingPlanDataSharingService.trainingPlanAssigneeData.data
+      this.trainingPlanDataSharingService.trainingPlanAssigneeData.data &&
+      this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Designation'
     ) {
       let category = this.trainingPlanDataSharingService.trainingPlanAssigneeData.category
       let assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
@@ -33,12 +34,25 @@ export class CreateTimelineComponent implements OnInit {
       })
       this.assigneeData = { 'category': category, data: assigneeData }
 
+      console.log('this.assigneeData', this.assigneeData)
+    }
+    if (this.trainingPlanDataSharingService.trainingPlanAssigneeData &&
+      this.trainingPlanDataSharingService.trainingPlanAssigneeData.data &&
+      this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Custom Users'
+    ) {
+      let category = this.trainingPlanDataSharingService.trainingPlanAssigneeData.category
+      let assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.content.filter((item: any) => {
+        return item.selected
+      })
+      this.assigneeData = { 'category': category, 'data' : {'content': assigneeData} } ;
+
       console.log('this.assigneeData', this.assigneeData)
     }
   }
 
-  showAll() {
-    this.router.navigate(['app', 'training-plan', 'preview-plan'])
+  showAll(from:string, tab:string) {
+    // this.router.navigate(['app', 'training-plan', 'preview-plan'])
+    this.router.navigate(['app', 'training-plan', 'preview-plan'], { queryParams: {from , tab}})
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
index 6a5b47422..36729cb68 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
@@ -6,5 +6,20 @@
     <ws-app-standard-card [checkboxVisibility]="false" [contentData]="contentData"></ws-app-standard-card>
 </div>
 <div class="flex" *ngIf="from==='assignee'">
-    <ws-app-user-card [checkboxVisibility]="false" [assigneeData]="contentData"></ws-app-user-card>
+    <ws-app-user-card [checkboxVisibility]="false" [assigneeData]="assigneeData"></ws-app-user-card>
+</div>
+<div class="flex" *ngIf="from === 'all'">
+    <mat-chip-list [multiple]="true" [selectable]="true">
+        <mat-chip *ngFor="let item of allContentChips"
+                  [selected]="item.selected"
+                  (click)="selectedTab = item.tab">{{item.name}}</mat-chip>
+      </mat-chip-list>
+      <div class="content-container">
+        <ng-container *ngIf="selectedTab === 'content'">
+            <ws-app-standard-card [checkboxVisibility]="false" [contentData]="contentData"></ws-app-standard-card>
+        </ng-container>
+        <ng-container *ngIf="selectedTab === 'assignee'">
+            <ws-app-user-card [checkboxVisibility]="false" [assigneeData]="assigneeData"></ws-app-user-card>
+        </ng-container>
+      </div>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
index 309259b7e..8ec03e399 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
@@ -8,11 +8,16 @@ import { TrainingPlanDataSharingService } from '../../services/training-plan-dat
 })
 export class PreviewPlanComponent implements OnInit {
   contentData:any = [];
+  assigneeData:any=[];
   from:any = '';
+  tab:any = '';
+  allContentChips:any = [];
+  selectedTab = '';
   constructor(private router: Router, private route: ActivatedRoute, private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
     this.from = this.route.snapshot.queryParams['from'];
+    this.tab = this.selectedTab =  this.route.snapshot.queryParams['tab'];
     console.log('from', this.from, this.trainingPlanDataSharingService);
     if(this.from === 'content') {
       if( this.trainingPlanDataSharingService.trainingPlanContentData &&
@@ -20,14 +25,50 @@ export class PreviewPlanComponent implements OnInit {
           this.contentData = this.trainingPlanDataSharingService.trainingPlanContentData.data.content.filter((item: any) => {
             return item.selected
           })
-        }
-      
+        }      
     } else if(this.from === 'assignee') {
       let category = this.trainingPlanDataSharingService.trainingPlanAssigneeData.category
-      let assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
-        return item.selected
-      })
-      this.contentData = { 'category': category, data: assigneeData }
+      if(category === 'Designation') {
+        let assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
+          return item.selected
+        })
+        this.assigneeData = { 'category': category, data: assigneeData }
+      } else if (category === 'Custom Users') {
+        let assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.content.filter((item: any) => {
+          return item.selected
+        })
+        this.assigneeData = { 'category': category, data: { content : assigneeData } }
+      }
+      
+    } else if(this.from === 'all') {
+      let arr =[];
+      arr.push({name: this.trainingPlanDataSharingService.trainingPlanStepperData.contentType, tab: 'content', selected: (this.tab === 'content'? true: false)});
+      this.allContentChips = arr;
+      arr.push({name: this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentType, tab: 'assignee', selected: (this.tab === 'assignee'? true: false)});
+      this.allContentChips = arr;
+      if(this.trainingPlanDataSharingService.trainingPlanAssigneeData) {
+        let category = this.trainingPlanDataSharingService.trainingPlanAssigneeData.category;
+        if (category === 'Custom Users') {        
+          let assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.content.filter((item: any) => {
+            return item.selected
+          })
+          this.assigneeData = { 'category': category, data: { content : assigneeData } }
+        } 
+        if(category === 'Designation') {
+          let assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
+            return item.selected
+          })
+          this.assigneeData = { 'category': category, data: assigneeData }
+        }
+      }
+     
+      if( this.trainingPlanDataSharingService.trainingPlanContentData &&
+        this.trainingPlanDataSharingService.trainingPlanContentData.data ) {
+          this.contentData = this.trainingPlanDataSharingService.trainingPlanContentData.data.content.filter((item: any) => {
+            return item.selected
+          })
+      }  
+      
     }
     
   }

From 8a73f8c231ce4a7ccc9181ae1872b31ca634b5d8 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Thu, 14 Dec 2023 15:25:43 +0530
Subject: [PATCH 338/887] update for 3 more and training plan name with servie
 variable binding

---
 .../standard-card.component.html              |  4 ++--
 .../standard-card.component.scss              |  6 +++++
 .../user-card/user-card.component.html        |  4 ++--
 .../user-card/user-card.component.scss        |  2 +-
 .../preview-plan/preview-plan.component.html  | 23 ++++++++++---------
 .../preview-plan/preview-plan.component.scss  |  4 ++++
 6 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
index b999cab62..a112de743 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
@@ -1,7 +1,7 @@
 <ng-container>
     <div class="flex flex-3 flex-row card-grid-container flex-wrap">
-        <div class="flex course-card margin-right-xl" *ngFor="let item of contentData">
-            <mat-card class="card-standard-container mr-5 padding-remove">
+        <div  class="flex course-card margin-right-xl" *ngFor="let item of contentData">
+            <mat-card [ngClass]="item?.selected ? 'active-card':''" class="card-standard-container mr-5 padding-remove">
                 <mat-card-content class="min-top">
                     <div style="position: relative; z-index: 1;">
                         <ng-container>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
index 6e6cb45a8..bb8b20471 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
@@ -128,6 +128,7 @@ $secondary-color: #EF951E;
   mat-card-content {
     // margin: 0 -0.25 * $card-padding;
     background: #fff;
+    border-radius: 8px;
   }
 
   .card-img {
@@ -550,4 +551,9 @@ $title-line-count: 2;
 
 .card-cross-btn {
   background: white !important;
+}
+
+.active-card {
+  border: 1px solid #1B4CA1 !important;
+  border-radius: 8px;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
index 0a3d62e49..0ec5a51a7 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
@@ -1,6 +1,6 @@
 <div class="flex flex-4 flex-row assignee-card-container flex-wrap" *ngIf="assigneeData?.category === 'Custom Users'">
     <ng-container *ngFor="let item of assigneeData?.data?.content | slice : 0 : 20">
-        <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
+        <div class="flex flex-4 assignee-card" [ngClass]="item?.selected ? 'active-card':''" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
             <div class="avatar">
                 <div>HG</div>
             </div>
@@ -25,7 +25,7 @@
 
 <div class="flex flex-4 flex-row custom-user-card-container flex-wrap" *ngIf="assigneeData?.category === 'Designation'">
     <ng-container *ngFor="let item of assigneeData?.data | slice : 0 : 20">
-        <div class="flex flex-4 custom-user-card active-card">
+        <div class="flex flex-4 custom-user-card" [ngClass]="item?.selected ? 'active-card':''">
             <div class="card-cross-icon" *ngIf="showDeleteFlag">
                 <button mat-mini-fab class="card-cross-btn" type="button" (click)="deleteItem(item)">
                     <mat-icon>close</mat-icon>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
index 955deeb0b..876e0f471 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
@@ -77,7 +77,7 @@
     position: relative;
 }
 
-.custom-user-card.active-card {
+.active-card {
     border: 1px solid #1B4CA1 !important;
 }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
index 36729cb68..2c00f6a19 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
@@ -8,18 +8,19 @@
 <div class="flex" *ngIf="from==='assignee'">
     <ws-app-user-card [checkboxVisibility]="false" [assigneeData]="assigneeData"></ws-app-user-card>
 </div>
-<div class="flex" *ngIf="from === 'all'">
+<div class="flex content-container" *ngIf="from === 'all'">
     <mat-chip-list [multiple]="true" [selectable]="true">
         <mat-chip *ngFor="let item of allContentChips"
-                  [selected]="item.selected"
+                  [selected]="selectedTab == item.tab"
                   (click)="selectedTab = item.tab">{{item.name}}</mat-chip>
       </mat-chip-list>
-      <div class="content-container">
-        <ng-container *ngIf="selectedTab === 'content'">
-            <ws-app-standard-card [checkboxVisibility]="false" [contentData]="contentData"></ws-app-standard-card>
-        </ng-container>
-        <ng-container *ngIf="selectedTab === 'assignee'">
-            <ws-app-user-card [checkboxVisibility]="false" [assigneeData]="assigneeData"></ws-app-user-card>
-        </ng-container>
-      </div>
-</div>
\ No newline at end of file
+      
+</div>
+<div class="content-container flex">
+    <ng-container *ngIf="selectedTab === 'content'">
+        <ws-app-standard-card [checkboxVisibility]="false" [contentData]="contentData"></ws-app-standard-card>
+    </ng-container>
+    <ng-container *ngIf="selectedTab === 'assignee'">
+        <ws-app-user-card [checkboxVisibility]="false" [assigneeData]="assigneeData"></ws-app-user-card>
+    </ng-container>
+  </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.scss b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.scss
index f698419a3..75e2afbed 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.scss
@@ -9,4 +9,8 @@
 .go-back img {
     vertical-align: middle;
     margin-right: 10px;
+}
+
+.content-container {
+    justify-content: center;
 }
\ No newline at end of file

From dd62098780ec0ce93d3d860663473074fe1d97cc Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Fri, 15 Dec 2023 01:45:49 +0530
Subject: [PATCH 339/887] finished the no data for the content and all user
 timeline navigation

---
 .../app-setup/app-setup-home.component.ts     |   2 -
 .../lang-select/lang-select.component.ts      |   4 +-
 .../routes/basic-info/basic-info.component.ts |   1 -
 .../batch-details/batch-details.component.ts  |  12 +-
 .../batch-list/batch-list.component.ts        |   1 -
 .../nominate-users-dialog.component.ts        |   4 +-
 .../reject-reason-dialog.component.ts         |   1 -
 .../admintable/admintable.component.ts        |   1 -
 .../budgetproofspopup.component.ts            |  11 -
 .../leadershiptable.component.ts              |   1 -
 .../routes/approvals/approvals.component.ts   |   2 -
 .../blended-approvals.component.ts            |   1 -
 .../home/routes/budget/budget.component.ts    |   3 +-
 .../routes/leadership/leadership.component.ts |  11 +-
 .../reports-section.component.ts              |   4 +-
 .../routes/users-view/users-view.component.ts |   2 -
 .../workallocation.component.ts               |   5 -
 .../info/about-video/about-video.component.ts |   1 -
 .../state-profile-home.component.ts           |   6 -
 .../services/org-profile.service.ts           |   2 -
 .../add-plan-information.component.ts         |   5 +-
 .../add-timeline-form.component.ts            |  16 +-
 .../breadcrumb/breadcrumb.component.html      |   1 -
 .../breadcrumb/breadcrumb.component.ts        |  25 ++-
 .../category-drop-down.component.ts           | 191 +++++++++---------
 .../components/chip/chip.component.html       |  31 +--
 .../components/chip/chip.component.ts         |  20 +-
 .../competency-summary.component.ts           | 103 +++++-----
 .../confirmation-box.component.html           |  12 +-
 .../confirmation.box.component.ts             |   9 +-
 .../components/search/search.component.ts     |  31 +--
 .../standard-card/standard-card.component.ts  |  22 +-
 .../components/stepper/stepper.component.html |   3 +-
 .../components/stepper/stepper.component.ts   |  14 +-
 .../user-card/user-card.component.html        |   2 +-
 .../user-card/user-card.component.ts          |  13 +-
 .../models/training-plan.model.ts             |   4 +-
 .../create-assignee.component.html            |  20 +-
 .../create-assignee.component.scss            |  23 +++
 .../create-assignee.component.ts              |  30 +--
 .../create-content.component.html             |  11 +-
 .../create-content.component.scss             |  23 +++
 .../create-content.component.ts               |  43 ++--
 .../create-plan/create-plan.component.ts      |  10 +-
 .../create-timeline.component.ts              |  13 +-
 .../training-plan-data-share.service.ts       |  20 +-
 .../services/traininig-plan.service.ts        |  12 +-
 .../training-plan/training-plan.module.ts     |   6 +-
 .../users-upload/users-upload.component.ts    |   6 +-
 .../routes/view-user/view-user.component.ts   |   3 -
 .../activity-labels.component.ts              |  10 -
 .../assistant-content-card.component.ts       |   2 -
 .../assistant-message-card.component.ts       |   3 -
 .../comp-details/comp-details.component.ts    |   4 +-
 .../competency-labels.component.ts            |   7 +-
 .../publish-popup/publish-popup.component.ts  |   1 -
 .../create-workallocation.component.ts        |   2 -
 .../draft-allocations.component.ts            |   1 -
 .../services/user-work-resolver.service.ts    |   1 -
 .../allocation-actions.component.ts           |   2 -
 .../create-workallocation.component.ts        |   1 -
 .../download-allocation.component.ts          |   2 -
 .../update-workallocation.component.ts        |   1 -
 src/app/component/root/root.component.ts      |   6 -
 src/app/routes/signup/signup.component.ts     |   2 +-
 src/app/services/init.service.ts              |   2 -
 src/app/services/mobile-apps.service.ts       |   1 -
 src/mdo-assets/telemetry.min.js               |   3 -
 68 files changed, 403 insertions(+), 445 deletions(-)

diff --git a/project/ws/app/src/lib/routes/app-setup/app-setup-home.component.ts b/project/ws/app/src/lib/routes/app-setup/app-setup-home.component.ts
index 43f4e493b..1c682b6be 100644
--- a/project/ws/app/src/lib/routes/app-setup/app-setup-home.component.ts
+++ b/project/ws/app/src/lib/routes/app-setup/app-setup-home.component.ts
@@ -59,7 +59,6 @@ export class AppSetupHomeComponent implements OnInit, AfterViewInit {
     this.appLanguage = (this.configSvc.activeLocale && this.configSvc.activeLocale.path) || ''
     if (this.configSvc.instanceConfig) {
       this.introVideos = this.configSvc.instanceConfig.introVideo
-      // //console.log('TYPE: ', this.introVideos)
     }
     this.widgetResolverData = {
       ...this.widgetResolverData,
@@ -125,6 +124,5 @@ export class AppSetupHomeComponent implements OnInit, AfterViewInit {
       },
     }
     // this.widgetResolverData.widgetData.url = this.introVideos[value]
-    // //console.log('TYPE: ', this.widgetResolverData)
   }
 }
diff --git a/project/ws/app/src/lib/routes/app-setup/components/lang-select/lang-select.component.ts b/project/ws/app/src/lib/routes/app-setup/components/lang-select/lang-select.component.ts
index cd75917ef..bfaa1595f 100644
--- a/project/ws/app/src/lib/routes/app-setup/components/lang-select/lang-select.component.ts
+++ b/project/ws/app/src/lib/routes/app-setup/components/lang-select/lang-select.component.ts
@@ -17,7 +17,7 @@ export class LangSelectComponent implements OnInit {
     private configSvc: ConfigurationsService,
     private router: Router,
     private userPrefSvc: UserPreferenceService,
-  ) {}
+  ) { }
   userName = ''
   selectedLang = ''
   lang = ''
@@ -56,8 +56,6 @@ export class LangSelectComponent implements OnInit {
   //     }
   //     if (langCode.split('-')[0] === this.lang.split('-')[0]) {
   //       if (this.configSvc.userPreference && this.configSvc.userPreference.selectedLocale !== this.lang) {
-  //         console.log('seleced: ', this.configSvc.userPreference.selectedLocale)
-  //         console.log('Geo: ', this.lang)
   //         await this.userPrefSvc.saveUserPreference({
   //           selectedLocale: this.lang,
   //         })
diff --git a/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.ts b/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.ts
index 4e865ce45..40ccd7e39 100644
--- a/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.ts
+++ b/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.ts
@@ -22,7 +22,6 @@ export class BasicInfoComponent implements OnInit {
         // if (this.configSvc.userProfile && this.configSvc.userProfile.departmentName) {
         //   this.configSvc.userProfile.departmentName = _.get(this.activeRoute, 'snapshot.data.department.data.deptName')
         // }
-        // console.log(this.activeRoute.snapshot, 'this.activeRoute.snapshot====')
         this.basicInfo = profileData.personalDetails
         this.imagePath = profileData.photo
         this.verifiedKarmayogi = profileData.verifiedKarmayogi
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
index 1e7ec27f1..49a70d90e 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-details/batch-details.component.ts
@@ -268,9 +268,7 @@ export class BatchDetailsComponent implements OnInit {
         },
       ],
     }
-    this.bpService.updateBlendedRequests(request).subscribe((res: any) => {
-      // tslint:disable-next-line:no-console
-      console.log('res', res)
+    this.bpService.updateBlendedRequests(request).subscribe((_res: any) => {
       if (event.action === 'Approve') {
         this.newUsers = []
         if (this.programData.wfApprovalType) {
@@ -318,16 +316,12 @@ export class BatchDetailsComponent implements OnInit {
         toValue: { name: event.userData.first_name },
       }],
     }
-    this.bpService.removeLearner(request).subscribe((res: any) => {
+    this.bpService.removeLearner(request).subscribe((_res: any) => {
       this.openSnackbar('Learner is removed successfully!')
       this.filter('approved')
-      // tslint:disable-next-line:no-console
-      console.log(res)
       this.getLearnersList()
       // tslint:disable-next-line:align
-    }, (err: { error: any }) => {
-      // tslint:disable-next-line:no-console
-      console.log('request', err)
+    }, (_err: { error: any }) => {
       this.openSnackbar('Something went wrong. Please try after sometime.')
     })
   }
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
index cf2b47ccf..cb8b24887 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
@@ -21,7 +21,6 @@ export class BatchListComponent implements OnInit {
     this.programID = this.activeRouter.snapshot.params.id
     if (this.activeRouter.parent && this.activeRouter.parent.snapshot.data.configService) {
       this.userProfile = this.activeRouter.parent.snapshot.data.configService.unMappedUser
-      // console.log('this.userProfile', this.userProfile)
     }
     if (currentState && currentState.extras.state) {
       this.programData = currentState.extras.state
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
index 9c6f96b1a..8ceaede3e 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/nominate-users-dialog/nominate-users-dialog.component.ts
@@ -158,9 +158,7 @@ export class NominateUsersDialogComponent implements OnInit {
           //   }
           // }
           this.dialogRef.close('done')
-        },                                                        (err: { error: any }) => {
-          // tslint:disable-next-line:no-console
-          console.log(err)
+        },                                                        (_err: { error: any }) => {
           this.openSnackbar('some thing went wrong, Please try after sometime.')
         })
       } else {
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.ts
index 50ea294f3..d4927c71e 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.ts
@@ -21,7 +21,6 @@ export class RejectReasonDialogComponent implements OnInit {
   }
 
   onSubmit() {
-    // console.log('this.reasonForm.value', this.reasonForm.value)
     this.dialogRef.close(this.reasonForm.value)
   }
 
diff --git a/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.ts b/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.ts
index 1a7fe0cfa..d1c73f6e8 100644
--- a/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.ts
@@ -191,7 +191,6 @@ export class AdmintableComponent implements OnInit, OnChanges {
   }
 
   // onRowClick(e: any) {
-  //   console.log('clicked row', e)
   // }
 
   adduser() {
diff --git a/project/ws/app/src/lib/routes/home/components/budgetproofspopup/budgetproofspopup.component.ts b/project/ws/app/src/lib/routes/home/components/budgetproofspopup/budgetproofspopup.component.ts
index f5c8bc595..8f571b05c 100644
--- a/project/ws/app/src/lib/routes/home/components/budgetproofspopup/budgetproofspopup.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/budgetproofspopup/budgetproofspopup.component.ts
@@ -95,12 +95,10 @@ export class BudgetproofspopupComponent implements OnInit {
     this.uploading = true
     const fileList = (<HTMLInputElement>files.target).files
     if (fileList && fileList.length > 0) {
-      // console.log('fileList', fileList)
       // const file: File = fileList[0]
       // this.progressInfos[idx].value = Math.round(100 * event.loaded / event.total)
       Array.from(fileList).forEach((file: any, index: any) => {
         this.uploadedFiles.push(file)
-        // console.log('this.uploadedFiles', this.uploadedFiles)
         const currentDate = new Date()
         const tabinfo = {
           srno: index + 1,
@@ -113,7 +111,6 @@ export class BudgetproofspopupComponent implements OnInit {
         // file.identifier = res.result.identifier
         this.uploadedFilesAssets.push(tabinfo)
         this.dataSource.data.push(tabinfo)
-        // console.log('this.uploadedFilesAssets', this.uploadedFilesAssets)
         // this.uploadFilesList(file, index)
       })
     }
@@ -121,8 +118,6 @@ export class BudgetproofspopupComponent implements OnInit {
 
   // uploadFilesList(file: any) {
   //   // this.dataSource.data = this.uploadedFilesAssets
-  //   // console.log('this.dataSource', this.dataSource)
-  //   // console.log('index', index)
   //   const username = `${this.userData.firstName} ${this.userData.lastName}`
   //   const org = []
   //   const createdforarray: any[] = []
@@ -146,12 +141,10 @@ export class BudgetproofspopupComponent implements OnInit {
   //       },
   //     },
   //   }
-  //   // console.log('req', request)
   //   // start the upload and save the progress map
   //   this.progress = this.uploadService.crreateAsset(request).subscribe((res: any) => {
   //     if (event.type === HttpEventType.UploadProgress) {
   //       const progress = Math.round(100 * event.loaded / event.total)
-  //       console.log(progress)
   //     } else if (event instanceof HttpResponse) {
   //     }
   //     const contentID = res.result.identifier
@@ -174,7 +167,6 @@ export class BudgetproofspopupComponent implements OnInit {
   // }
 
   addSelectedFiles(form: any) {
-    // console.log('form value', form.value)
     this.dialogRef.close({ data: form.value })
   }
 
@@ -199,14 +191,11 @@ export class BudgetproofspopupComponent implements OnInit {
   //     (event: any) => {
   //       if (event.type === HttpEventType.UploadProgress) {
   //         this.progressInfos[idx].value = Math.round(100 * event.loaded / event.total)
-  //         console.log('this.progressInfos', this.progressInfos)
   //       } else if (event instanceof HttpResponse) {
   //         this.fileInfos = this.uploadService.getFiles()
-  //         console.log('this.fileInfos', this.fileInfos)
   //       }
   //     },
   //     (err: any) => {
-  //       console.log('err', err)
   //       this.progressInfos[idx].value = 0
   //       this.message = 'Could not upload the file:' + file.name
   //     })
diff --git a/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.ts b/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.ts
index 9a2607a6c..f75fa472f 100644
--- a/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.ts
@@ -193,7 +193,6 @@ export class LeadershiptableComponent implements OnInit, OnChanges {
   }
 
   // onRowClick(e: any) {
-  //   console.log('clicked row', e)
   // }
 
   adduser() {
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
index bf469e1bc..1800a1871 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
@@ -126,7 +126,6 @@ export class ApprovalsComponent implements OnInit, OnDestroy {
       }
       this.apprService.getApprovals(req).subscribe(res => {
         let currentdate: Date
-        // console.log("result ", res)
         res.result.data.forEach((approval: any) => {
           let keys = ''
           approval.wfInfo.forEach((wf: any) => {
@@ -167,7 +166,6 @@ export class ApprovalsComponent implements OnInit, OnDestroy {
   }
 
   get getTableData() {
-    // console.log("table data", this.data)
     return this.data
   }
 
diff --git a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
index bbca4dc52..86fabd969 100644
--- a/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/blended-approvals/blended-approvals.component.ts
@@ -40,7 +40,6 @@ export class BlendedApprovalsComponent implements OnInit {
   ngOnInit() {
     if (this.activeRouter.parent && this.activeRouter.parent.snapshot.data.configService) {
       this.userProfile = this.activeRouter.parent.snapshot.data.configService.unMappedUser
-      // console.log('this.userProfile', this.userProfile)
     }
     this.getBlendedPreogramsList()
   }
diff --git a/project/ws/app/src/lib/routes/home/routes/budget/budget.component.ts b/project/ws/app/src/lib/routes/home/routes/budget/budget.component.ts
index 231e42635..2da6b3266 100644
--- a/project/ws/app/src/lib/routes/home/routes/budget/budget.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/budget/budget.component.ts
@@ -63,7 +63,7 @@ export class BudgetComponent implements OnInit, OnChanges {
   mdotrainingdata!: { srnumber: number; filename: string; filetype: string; filesize: string; uploadedon: string }[]
   schemewisedata!: { srnumber: number; filename: string; filetype: string; filesize: string; uploadedon: string }[]
   scehemetableDatadata!: {
-    srnumber: number; schemeName: string; trainingBudgetAllocated: number;
+    srnumber: number; schemeName: string; trainingBudgetAllocated: number
     trainingBudgetUtilization: number; budgetYear: string
   }[]
   yearsList: any = []
@@ -443,7 +443,6 @@ export class BudgetComponent implements OnInit, OnChanges {
 
     dialogRef.afterClosed().subscribe((response: any) => {
       if (response) {
-        // console.log('response', response)
       }
     })
 
diff --git a/project/ws/app/src/lib/routes/home/routes/leadership/leadership.component.ts b/project/ws/app/src/lib/routes/home/routes/leadership/leadership.component.ts
index 3ef38c8f3..57687cefe 100644
--- a/project/ws/app/src/lib/routes/home/routes/leadership/leadership.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/leadership/leadership.component.ts
@@ -44,7 +44,7 @@ export class LeadershipComponent implements OnInit, AfterViewInit, OnChanges {
   }
   ltdata: any = []
   admindata: any = []
-  usersData:  any = []
+  usersData: any = []
   bodyHeight = document.body.clientHeight - 125
   deptID: any
   tabData = 'MDO_LEADER'
@@ -126,9 +126,9 @@ export class LeadershipComponent implements OnInit, AfterViewInit, OnChanges {
     const req = {
       request: {
         filters: {
-            rootOrgId: this.deptID,
-            'roles.role': [
-              role,
+          rootOrgId: this.deptID,
+          'roles.role': [
+            role,
           ],
         },
       },
@@ -137,7 +137,7 @@ export class LeadershipComponent implements OnInit, AfterViewInit, OnChanges {
       (res: any) => {
         this.usersData = res.result.response.content
         if (this.usersData.length > 0) {
-          this.usersData.forEach((user: any, index: any)  => {
+          this.usersData.forEach((user: any, index: any) => {
             const obj = {
               fullname: `${user.firstName}`,
               email: this.profileUtilSvc.emailTransform(user.email),
@@ -153,7 +153,6 @@ export class LeadershipComponent implements OnInit, AfterViewInit, OnChanges {
           })
 
           if (this.data) {
-            // console.log('this.data', this.data)
             this.dataSource.data = this.data
             this.dataSource.paginator = this.paginator
           }
diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
index e49e8a187..858864db2 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
@@ -54,9 +54,7 @@ export class ReportsSectionComponent implements OnInit {
       this.downloadService.fetctReportsUpdatedOn(this.configSvc.userProfile.rootOrgId).subscribe((res: any) => {
         this.lastUpdatedOn = res
         this.getTableData()
-      },                                                                                         err => {
-        // tslint:disable-next-line:no-console
-        console.log(err)
+      },                                                                                         _err => {
         this.getTableData()
       })
     })
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 9c2ea9bff..d2e5f5a6e 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -326,8 +326,6 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   // }
 
   clickHandler(event: any) {
-    // tslint:disable-next-line: no-console
-    console.log('clickHandler :: event ', event)
     switch (event.type) {
       case 'createUser':
         this.onCreateClick()
diff --git a/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.ts b/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.ts
index 6ae97ce91..f985d822c 100644
--- a/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.ts
@@ -60,18 +60,13 @@ export class WorkallocationComponent implements OnInit, OnDestroy {
     public dialog: MatDialog, public eventSvc: EventService) {
     // this.configSvc = this.route.parent && this.route.parent.snapshot.data.configService
     // const paramsMap = this.activeRoute.snapshot.params.tab
-    // console.log(paramsMap, '-paramsMap====')
     // if (paramsMap === 'published') {
     //   this.currentUrl = "app/home/workallocation/published"
     //   this.currentFilter = 'Published'
-    //   console.log(this.currentUrl, 'this.currentUrl published==========')
-    //   console.log(paramsMap, '- published paramsMap====')
     // }
     // if (paramsMap === 'draft') {
     //   this.currentUrl = "app/home/workallocation/draft"
     //   this.currentFilter = 'Draft'
-    //   console.log(this.currentUrl, 'this.currentUrl draft ==========')
-    //   console.log(paramsMap, '- draft paramsMap====')
     // }
   }
 
diff --git a/project/ws/app/src/lib/routes/info/about-video/about-video.component.ts b/project/ws/app/src/lib/routes/info/about-video/about-video.component.ts
index 6e2a799d6..c6f37261d 100644
--- a/project/ws/app/src/lib/routes/info/about-video/about-video.component.ts
+++ b/project/ws/app/src/lib/routes/info/about-video/about-video.component.ts
@@ -70,7 +70,6 @@ export class AboutVideoComponent implements OnInit {
       },
     }
     // this.widgetResolverData.widgetData.url = this.introVideos[value]
-    // //console.log('TYPE: ', this.widgetResolverData)
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/state-profile/routes/state-profile-home/state-profile-home.component.ts b/project/ws/app/src/lib/routes/state-profile/routes/state-profile-home/state-profile-home.component.ts
index 26ad4a970..bd034d4d6 100644
--- a/project/ws/app/src/lib/routes/state-profile/routes/state-profile-home/state-profile-home.component.ts
+++ b/project/ws/app/src/lib/routes/state-profile/routes/state-profile-home/state-profile-home.component.ts
@@ -51,7 +51,6 @@ export class StateProfileHomeComponent implements OnInit, OnDestroy {
     }
     this.routerSubscription = this.router.events.subscribe((event: any) => {
       if (event instanceof NavigationStart) { // do not delete this
-        // console.log(event)
       }
       if (event instanceof NavigationEnd) {
         _.each(this.tabs, t => {
@@ -73,7 +72,6 @@ export class StateProfileHomeComponent implements OnInit, OnDestroy {
   //     if (s.step === this.currentStep) {
   //       if (s.key.indexOf('currentcompetencies') !== -1 && this.configSvc.userProfileV2) {
   //         if (this.compLocalService.autoSaveCurrent.value) {
-  //           // console.log("currentcompetencies========>", this.compLocalService.currentComps.value)
   //           this.profileSvc.updateCCProfileDetails({
   //             request: {
   //               profileDetails: {
@@ -91,7 +89,6 @@ export class StateProfileHomeComponent implements OnInit, OnDestroy {
   //         }
   //       } else if (s.key.indexOf('desiredcompetencies') !== -1 && this.configSvc.userProfileV2) {
   //         if (this.compLocalService.autoSaveDesired.value) {
-  //           // console.log("desiredcompetencies========>", this.compLocalService.desiredComps.value)
   //           this.profileSvc.updateDCProfileDetails({
   //             request: {
   //               profileDetails: {
@@ -120,8 +117,6 @@ export class StateProfileHomeComponent implements OnInit, OnDestroy {
           },
           orgId: _.get(this.configSvc.unMappedUser, 'rootOrgId'),
         }
-        // tslint:disable-next-line: no-console
-        console.log('request: ', request)
 
         // Call API to update org profile
 
@@ -192,7 +187,6 @@ export class StateProfileHomeComponent implements OnInit, OnDestroy {
   get current() {
     const currentStep = _.first(_.filter(this.tabs, { step: this.currentStep }))
     if (currentStep !== undefined) {
-      // console.log(JSON.stringify(currentStep)+ '-- value of currentStep======-')
       return currentStep
 
     }
diff --git a/project/ws/app/src/lib/routes/state-profile/services/org-profile.service.ts b/project/ws/app/src/lib/routes/state-profile/services/org-profile.service.ts
index 4ed56c10b..1d2b4a95c 100644
--- a/project/ws/app/src/lib/routes/state-profile/services/org-profile.service.ts
+++ b/project/ws/app/src/lib/routes/state-profile/services/org-profile.service.ts
@@ -60,8 +60,6 @@ export class OrgProfileService {
   }
 
   updateFormStatus(keyName: keyof IATIOnbaording, value: boolean) {
-    // tslint:disable-next-line: no-console
-    console.log('updateFormStatus: ', value)
     this.formStatus[keyName] = value
   }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
index fa415ed2e..c263cf4f0 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
@@ -24,8 +24,9 @@ export class AddPlanInformationComponent implements OnInit {
       this.planTitleInvalid.emit(true)
     }
     this.contentForm = this.formBuilder.group({
-      name: new FormControl((this.trainingPlanDataSharingSvc.trainingPlanTitle)
-        ? this.trainingPlanDataSharingSvc.trainingPlanTitle : '', [Validators.required, Validators.minLength(10)])
+      name:
+        new FormControl((this.trainingPlanDataSharingSvc.trainingPlanTitle) ? this.trainingPlanDataSharingSvc.trainingPlanTitle : '',
+                        [Validators.required, Validators.minLength(10)]),
     })
     this.contentForm.controls['name'].valueChanges.pipe(debounceTime(700)).subscribe((_ele: any) => {
       if (!this.contentForm.invalid) {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
index 403236bec..d77595690 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
@@ -1,24 +1,22 @@
 import { Component, OnInit } from '@angular/core'
-import { DatePipe } from '@angular/common';
-import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service';
+import { DatePipe } from '@angular/common'
+import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
 @Component({
   selector: 'ws-app-add-timeline-form',
   templateUrl: './add-timeline-form.component.html',
   styleUrls: ['./add-timeline-form.component.scss'],
-  providers: [DatePipe]
+  providers: [DatePipe],
 })
 export class AddTimelineFormComponent implements OnInit {
-  todayDate:Date = new Date();
+  todayDate: Date = new Date()
   constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService, private datePipe: DatePipe) { }
 
   ngOnInit() {
-    this.trainingPlanDataSharingService.trainingPlanStepperData['endDate'] = this.datePipe.transform(this.todayDate,"yyyy-MM-dd");
+    this.trainingPlanDataSharingService.trainingPlanStepperData['endDate'] = this.datePipe.transform(this.todayDate, 'yyyy-MM-dd')
   }
 
-  changeTimeline(timeline:any) {
-    
-    this.trainingPlanDataSharingService.trainingPlanStepperData['endDate'] = this.datePipe.transform(timeline,"yyyy-MM-dd");
-    console.log('timeline',this.trainingPlanDataSharingService.trainingPlanStepperData);
+  changeTimeline(timeline: any) {
+    this.trainingPlanDataSharingService.trainingPlanStepperData['endDate'] = this.datePipe.transform(timeline, 'yyyy-MM-dd')
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
index 46ebd7903..145f99833 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
@@ -10,7 +10,6 @@
             (tabType.ADD_CONTENT === selectedTab) ? 'Add content' : (tabType.ADD_ASSIGNEE === selectedTab) ? 'Add
             assignee' : (tabType.ADD_TIMELINE === selectedTab) ? 'Add timeline' : ''}}
         </div>
-        {{validationList | json}}
     </div>
     <div class="flex flex-1 flex-row right-breadcrumb" *ngIf="showBreadcrumbAction">
         <button mat-button class="cancel" (click)="cancel()">
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
index 28477dcdd..b594bcd68 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
@@ -13,7 +13,7 @@ import { TrainingPlanDataSharingService } from '../../services/training-plan-dat
 export class BreadcrumbComponent implements OnInit {
 
   @Input() showBreadcrumbAction = true
-  @Input() selectedTab: string = ''
+  @Input() selectedTab = ''
   @Input() validationList: any
   @Output() changeToNextTab = new EventEmitter<any>()
 
@@ -21,20 +21,19 @@ export class BreadcrumbComponent implements OnInit {
   tabType = TrainingPlanContent.TTabLabelKey
 
   constructor(private router: Router, public dialog: MatDialog,
-    private trainingPlanDataSharingService: TrainingPlanDataSharingService,
-    private trainingPlanService: TrainingPlanService) { }
+              private trainingPlanDataSharingService: TrainingPlanDataSharingService,
+              private trainingPlanService: TrainingPlanService) { }
 
   ngOnInit() {
     this.checkIfDisabled()
   }
 
   cancel() {
+    this.trainingPlanDataSharingService.trainingPlanTitle = ''
     this.router.navigateByUrl('app/home/training-plan-dashboard')
   }
 
   nextStep() {
-    // this.showDialogBox('progress-completed')
-    console.log('this.selectedTab', this.selectedTab)
     switch (this.selectedTab) {
       case TrainingPlanContent.TTabLabelKey.CREATE_PLAN:
         this.changeToNextTab.emit(TrainingPlanContent.TTabLabelKey.ADD_CONTENT)
@@ -54,9 +53,10 @@ export class BreadcrumbComponent implements OnInit {
 
   performRoute(route: any) {
     if (route === 'list') {
+      this.trainingPlanDataSharingService.trainingPlanTitle = ''
       this.router.navigateByUrl('app/home/training-plan-dashboard')
     } else {
-      this.router.navigateByUrl('app/training-plan/' + route)
+      this.router.navigateByUrl(`app/training-plan/${route}`)
     }
 
   }
@@ -93,11 +93,10 @@ export class BreadcrumbComponent implements OnInit {
         primaryAction: dialogData.primaryAction,
         secondaryAction: dialogData.secondaryAction,
       },
-      autoFocus: false
+      autoFocus: false,
     })
 
     this.dialogRef.afterClosed().subscribe(() => {
-      // console.log('The dialog was closed');
     })
   }
 
@@ -106,17 +105,17 @@ export class BreadcrumbComponent implements OnInit {
   }
 
   createPlanDraftView() {
-    console.log(this.trainingPlanDataSharingService.trainingPlanStepperData)
-    let obj = { "request": this.trainingPlanDataSharingService.trainingPlanStepperData }
+    this.trainingPlanDataSharingService.trainingPlanStepperData.name = this.trainingPlanDataSharingService.trainingPlanTitle
+    const obj = { request: this.trainingPlanDataSharingService.trainingPlanStepperData }
     this.showDialogBox('progress')
-    this.trainingPlanService.createPlan(obj).subscribe((data: any) => {
-      console.log('data', data)
+    this.trainingPlanService.createPlan(obj).subscribe((_data: any) => {
       this.dialogRef.close()
       this.showDialogBox('progress-completed')
       setTimeout(() => {
         this.dialogRef.close()
+        this.trainingPlanDataSharingService.trainingPlanTitle = ''
         this.router.navigateByUrl('app/home/training-plan-dashboard')
-      }, 1000)
+      },         1000)
     })
   }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
index efee0f958..8899ffaf7 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
@@ -1,137 +1,136 @@
-import { Component, EventEmitter, Input, Output, OnInit } from '@angular/core';
+import { Component, EventEmitter, Input, Output, OnInit, OnChanges } from '@angular/core'
 import { MatDialog } from '@angular/material'
-import { ConfirmationBoxComponent } from '../confirmation-box/confirmation.box.component';
-import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service';
+import { ConfirmationBoxComponent } from '../confirmation-box/confirmation.box.component'
+import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
 
 @Component({
   selector: 'ws-app-category-drop-down',
   templateUrl: './category-drop-down.component.html',
   styleUrls: ['./category-drop-down.component.scss'],
 })
-export class CategoryDropDownComponent implements OnInit {
+export class CategoryDropDownComponent implements OnInit, OnChanges {
   @Input() categoryData: any[] = []
-  @Input() from:string = '';
+  @Input() from = ''
   @Output() handleCategorySelection: any = new EventEmitter()
   dialogRef: any
-  constructor(public dialog: MatDialog, private trainingPlanDataSharingService:TrainingPlanDataSharingService) { }
+  constructor(public dialog: MatDialog, private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
-    // console.log("this.from", this.from);
     // if(this.from === 'content') {
     //   this.handleCategorySelection.emit('Course');
     // } else if(this.from === 'assignee') {
     //   this.handleCategorySelection.emit('Designation');
     // }
-    this.trainingPlanDataSharingService.trainingPlanCategoryChangeEvent.subscribe((data:any)=>{
-      if(data && data.event) {
-        console.log('data', data.event);
-        this.handleCategorySelection.emit(data.event);
+    this.trainingPlanDataSharingService.trainingPlanCategoryChangeEvent.subscribe((data: any) => {
+      if (data && data.event) {
+        this.handleCategorySelection.emit(data.event)
       }
     })
   }
 
   ngOnChanges() {
-    console.log("this.from", this.from);
-    if(this.from === 'content') {
-      this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = 'Course';
-      this.handleCategorySelection.emit('Course');
-    } else if(this.from === 'assignee') {
-      this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType'] = 'Designation';
-      this.handleCategorySelection.emit('Designation');
+    if (this.from === 'content') {
+      this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = 'Course'
+      this.handleCategorySelection.emit('Course')
+    } else if (this.from === 'assignee') {
+      this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType'] = 'Designation'
+      this.handleCategorySelection.emit('Designation')
     }
   }
 
- 
-
   showDialogBox(event: any) {
     const dialogData: any = {}
     switch (event) {
       case 'Course':
-        // `Changing it now will result in the loss of your current selection. It's advisable to save the current one as a draft and create a new one instead.`
-        dialogData['type'] = 'normal';
-        dialogData['icon'] = 'radio_on';
-        dialogData['title'] = 'You are attempting to change the selected content type?';
-        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection. It's advisable to save the current one as a draft and create a new one instead.`;
-        dialogData['primaryAction'] = 'I understand, change content type';
-        dialogData['secondaryAction'] = 'Cancel';
-        dialogData['event'] = 'Course';
-        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event;
-      break
+        dialogData['type'] = 'normal'
+        dialogData['icon'] = 'radio_on'
+        dialogData['title'] = 'You are attempting to change the selected content type?'
+        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection.
+        It's advisable to save the current one as a draft and create a new one instead.`
+        dialogData['primaryAction'] = 'I understand, change content type'
+        dialogData['secondaryAction'] = 'Cancel'
+        dialogData['event'] = 'Course'
+        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event
+        break
       case 'Program':
-        dialogData['type'] = 'normal';
-        dialogData['icon'] = 'radio_on';
-        dialogData['title'] = 'You are attempting to change the selected content type?';
-        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection. It's advisable to save the current one as a draft and create a new one instead.`;
-        dialogData['primaryAction'] = 'I understand, change content type';
-        dialogData['secondaryAction'] = 'Cancel';
-        dialogData['event'] = 'Program';
-        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event;
-      break
+        dialogData['type'] = 'normal'
+        dialogData['icon'] = 'radio_on'
+        dialogData['title'] = 'You are attempting to change the selected content type?'
+        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection.
+        It's advisable to save the current one as a draft and create a new one instead.`
+        dialogData['primaryAction'] = 'I understand, change content type'
+        dialogData['secondaryAction'] = 'Cancel'
+        dialogData['event'] = 'Program'
+        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event
+        break
       case 'Blended program':
-        dialogData['type'] = 'normal';
-        dialogData['icon'] = 'radio_on';
-        dialogData['title'] = 'You are attempting to change the selected content type?';
-        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection. It's advisable to save the current one as a draft and create a new one instead.`;
-        dialogData['primaryAction'] = 'I understand, change content type';
-        dialogData['secondaryAction'] = 'Cancel';
-        dialogData['event'] = 'Blended program';
-        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event;
-      break
+        dialogData['type'] = 'normal'
+        dialogData['icon'] = 'radio_on'
+        dialogData['title'] = 'You are attempting to change the selected content type?'
+        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection.
+        It's advisable to save the current one as a draft and create a new one instead.`
+        dialogData['primaryAction'] = 'I understand, change content type'
+        dialogData['secondaryAction'] = 'Cancel'
+        dialogData['event'] = 'Blended program'
+        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event
+        break
       case 'Curated program':
-        dialogData['type'] = 'normal';
-        dialogData['icon'] = 'radio_on';
-        dialogData['title'] = 'You are attempting to change the selected content type?';
-        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection. It's advisable to save the current one as a draft and create a new one instead.`;
-        dialogData['primaryAction'] = 'I understand, change content type';
-        dialogData['secondaryAction'] = 'Cancel';
-        dialogData['event'] = 'Curated program';
-        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event;
-      break
+        dialogData['type'] = 'normal'
+        dialogData['icon'] = 'radio_on'
+        dialogData['title'] = 'You are attempting to change the selected content type?'
+        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection.
+         It's advisable to save the current one as a draft and create a new one instead.`
+        dialogData['primaryAction'] = 'I understand, change content type'
+        dialogData['secondaryAction'] = 'Cancel'
+        dialogData['event'] = 'Curated program'
+        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event
+        break
       case 'Moderated Course':
-        dialogData['type'] = 'normal';
-        dialogData['icon'] = 'radio_on';
-        dialogData['title'] = 'You are attempting to change the selected content type?';
-        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection. It's advisable to save the current one as a draft and create a new one instead.`;
-        dialogData['primaryAction'] = 'I understand, change content type';
-        dialogData['secondaryAction'] = 'Cancel';
-        dialogData['event'] = 'Moderated Course';
-        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event;
-      break
+        dialogData['type'] = 'normal'
+        dialogData['icon'] = 'radio_on'
+        dialogData['title'] = 'You are attempting to change the selected content type?'
+        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection.
+        It's advisable to save the current one as a draft and create a new one instead.`
+        dialogData['primaryAction'] = 'I understand, change content type'
+        dialogData['secondaryAction'] = 'Cancel'
+        dialogData['event'] = 'Moderated Course'
+        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event
+        break
       case 'Designation':
-        dialogData['type'] = 'normal';
-        dialogData['icon'] = 'radio_on';
-        dialogData['title'] = 'You are attempting to change the selected user type?';
+        dialogData['type'] = 'normal'
+        dialogData['icon'] = 'radio_on'
+        dialogData['title'] = 'You are attempting to change the selected user type?'
         dialogData['subTitle'] = `By selecting all users, you've selected all the users from your Department of fisheries.;
-        If you want to select custom users or by designation, use the above option`;
-        dialogData['primaryAction'] = 'I understand, change user type';
-        dialogData['secondaryAction'] = 'Cancel';
-        dialogData['event'] = 'Designation';
-        this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType'] = event;
-      break
+        If you want to select custom users or by designation, use the above option`
+        dialogData['primaryAction'] = 'I understand, change user type'
+        dialogData['secondaryAction'] = 'Cancel'
+        dialogData['event'] = 'Designation'
+        this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType'] = event
+        break
       case 'All Users':
-        dialogData['type'] = 'normal';
-        dialogData['icon'] = 'radio_on';
-        dialogData['title'] = 'You are attempting to change the selected user type?';
+        dialogData['type'] = 'normal'
+        dialogData['icon'] = 'radio_on'
+        dialogData['title'] = 'You are attempting to change the selected user type?'
         dialogData['subTitle'] = `By selecting all users, you've selected all the users from your Department of fisheries.;
-        If you want to select custom users or by designation, use the above option`;
-        dialogData['primaryAction'] = 'I understand, change user type';
-        dialogData['secondaryAction'] = 'Cancel';
-        dialogData['event'] = 'All Users';
-        this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType'] = event;
-      break
+        If you want to select custom users or by designation, use the above option`
+        dialogData['primaryAction'] = 'I understand, change user type'
+        dialogData['secondaryAction'] = 'Cancel'
+        dialogData['event'] = 'All Users'
+        this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType'] = event
+        break
       case 'Custom Users':
-        dialogData['type'] = 'normal';
-        dialogData['icon'] = 'radio_on';
-        dialogData['title'] = 'You are attempting to change the selected user type?';
+        dialogData['type'] = 'normal'
+        dialogData['icon'] = 'radio_on'
+        dialogData['title'] = 'You are attempting to change the selected user type?'
         dialogData['subTitle'] = `By selecting all users, you've selected all the users from your Department of fisheries.;
-        If you want to select custom users or by designation, use the above option`;
-        dialogData['primaryAction'] = 'I understand, change user type';
-        dialogData['secondaryAction'] = 'Cancel';
-        dialogData['event'] = 'Custom Users';
-        this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType'] = event;
-      break
+        If you want to select custom users or by designation, use the above option`
+        dialogData['primaryAction'] = 'I understand, change user type'
+        dialogData['secondaryAction'] = 'Cancel'
+        dialogData['event'] = 'Custom Users'
+        this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType'] = event
+        break
     }
-    
+
     // this.handleCategorySelection.emit(event);
     this.openDialoagBox(dialogData)
   }
@@ -145,17 +144,15 @@ export class CategoryDropDownComponent implements OnInit {
         subTitle: dialogData.subTitle,
         primaryAction: dialogData.primaryAction,
         secondaryAction: dialogData.secondaryAction,
-        event: dialogData.event
+        event: dialogData.event,
       },
     })
 
     this.dialogRef.afterClosed().subscribe(() => {
-      // console.log('The dialog was closed');
     })
   }
 
   hideConfirmationBox() {
-    // console.log('close', event)
     this.dialogRef.close()
   }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
index 550a34314..237e03f3a 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
@@ -2,14 +2,14 @@
     <div class="flex flex-2 left-section flex-middle">
         <div class="selected-item-label">Selected items - </div>
         <ng-container *ngFor="let item of selectedContentChips | slice : 0 : 3">
-        <div class="chips flex flex-row" *ngIf="item?.selected">
-            <div class="chips-content">
-                <span class="color-60">{{item?.name}}</span>
+            <div class="chips flex flex-row" *ngIf="item?.selected">
+                <div class="chips-content">
+                    <span class="color-60">{{item?.name}}</span>
+                </div>
+                <div class="cross-icon" (click)="removeContent(item)">
+                    <img class="cursor-pointer" src="assets/icons/close.svg" />
+                </div>
             </div>
-            <div class="cross-icon" (click)="removeContent(item)">
-                <img class="cursor-pointer" src="assets/icons/close.svg" />
-            </div>
-        </div>
         </ng-container>
         <a mat-button class="select-more-link margin-left-m" *ngIf="selectContentCount > 3">+3 more</a>
     </div>
@@ -21,18 +21,19 @@
     <div class="flex flex-2 left-section flex-middle">
         <div class="selected-item-label">Selected items - </div>
         <ng-container *ngFor="let item of selectedAssigneeChips | slice : 0 : 3">
-        <div class="chips flex flex-row" *ngIf="item?.selected">
-            <div class="chips-content">
-                <span class="color-60">{{item?.name}}</span>                
-            </div>
-            <div class="cross-icon" (click)="removeAssignee(item)">
-                <img class="cursor-pointer" src="assets/icons/close.svg" />
+            <div class="chips flex flex-row" *ngIf="item?.selected">
+                <div class="chips-content">
+                    <span class="color-60">{{(item?.name) ? item?.name : (item?.firstName) ? item?.firstName :
+                        ''}}</span>
+                </div>
+                <div class="cross-icon" (click)="removeAssignee(item)">
+                    <img class="cursor-pointer" src="assets/icons/close.svg" />
+                </div>
             </div>
-        </div>
         </ng-container>
         <a mat-button class="select-more-link margin-left-m" *ngIf="selectAssigneeCount > 3">+3 more</a>
     </div>
     <div class="flex flex-1 flex-row right-section flex-middle">
         <a mat-button class="select-more-link" (click)="clearAll()">Clear all</a>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
index 24c79635e..94af2f125 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
@@ -1,16 +1,16 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
+import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core'
 import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
 @Component({
   selector: 'ws-app-chip',
   templateUrl: './chip.component.html',
   styleUrls: ['./chip.component.scss'],
 })
-export class ChipComponent implements OnInit {
-  @Input() selectedContentChips: any[] = [];
-  @Input() selectContentCount: number = 0;
+export class ChipComponent implements OnInit, OnChanges {
+  @Input() selectedContentChips: any[] = []
+  @Input() selectContentCount = 0
   @Input() from: any
-  @Input() selectedAssigneeChips: any[] = [];
-  @Input() selectAssigneeCount: number = 0;
+  @Input() selectedAssigneeChips: any[] = []
+  @Input() selectAssigneeCount = 0
   @Output() itemRemoved = new EventEmitter<any>()
 
   constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
@@ -19,7 +19,6 @@ export class ChipComponent implements OnInit {
   }
 
   ngOnChanges() {
-    console.log('selectedAssigneeChips--', this.selectedAssigneeChips)
   }
 
   clearAll() {
@@ -35,7 +34,6 @@ export class ChipComponent implements OnInit {
     }
     if (this.from === 'assignee') {
       this.selectAssigneeCount = 0
-      console.log('this.trainingPlanDataSharingService.trainingPlanAssigneeData', this.trainingPlanDataSharingService.trainingPlanAssigneeData)
       this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
         if (sitem['selected']) {
           sitem['selected'] = false
@@ -48,28 +46,26 @@ export class ChipComponent implements OnInit {
   }
 
   removeContent(item: any) {
-    console.log('item', item)
     this.trainingPlanDataSharingService.trainingPlanContentData.data.content.map((sitem: any) => {
       if (sitem['selected'] && sitem['identifier'] === item['identifier']) {
         sitem['selected'] = false
       }
     })
     if (this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.indexOf(item['identifier']) > -1) {
-      let index = this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.findIndex((x: any) => x === item['identifier'])
+      const index = this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.findIndex((x: any) => x === item['identifier'])
       this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.splice(index, 1)
     }
     this.itemRemoved.emit(true)
   }
 
   removeAssignee(item: any) {
-    console.log('item', item, this.trainingPlanDataSharingService.trainingPlanAssigneeData)
     this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
       if (sitem['selected'] && sitem['id'] === item['id']) {
         sitem['selected'] = false
       }
     })
     if (this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.indexOf(item['identifier']) > -1) {
-      let index = this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.findIndex((x: any) => x === item['id'])
+      const index = this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.findIndex((x: any) => x === item['id'])
       this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.splice(index, 1)
     }
   }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
index a4c6feabe..356283243 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
@@ -1,65 +1,65 @@
-import { Component, Input, OnInit } from '@angular/core'
+import { Component, Input, OnChanges, OnInit } from '@angular/core'
 
 @Component({
   selector: 'ws-app-competency-summary',
   templateUrl: './competency-summary.component.html',
   styleUrls: ['./competency-summary.component.scss'],
 })
-export class CompetencySummaryComponent implements OnInit {
-  @Input() contentData: any;
-  @Input() selectContentCount: any;
-  selectedCardData: any[] = [];
+export class CompetencySummaryComponent implements OnInit, OnChanges {
+  @Input() contentData: any
+  @Input() selectContentCount: any
+  selectedCardData: any[] = []
   competencySummaryObj: any = [{
-    "title": "behaviroal",
-    "behaviroal": {
-      "listData": [],
-      "count": 0
-    }
+    title: 'behaviroal',
+    behaviroal: {
+      listData: [],
+      count: 0,
+    },
   }, {
-    "title": "functional",
-    "functional": {
-      "listData": [],
-      "count": 0
-    }
+    title: 'functional',
+    functional: {
+      listData: [],
+      count: 0,
+    },
   }, {
-    "title": "domain",
-    "domain": {
-      "listData": [],
-      "count": 0
-    }
-  }
-  ];
-  selectedIndex = 0;
+    title: 'domain',
+    domain: {
+      listData: [],
+      count: 0,
+    },
+  },
+  ]
+  selectedIndex = 0
   constructor() { }
 
   ngOnInit() {
   }
 
   ngOnChanges() {
-    this.selectedCardData = [];
+    this.selectedCardData = []
     this.competencySummaryObj = [{
-      "title": "behaviroal",
-      "behaviroal": {
-        "listData": [],
-        "count": 0
-      }
+      title: 'behaviroal',
+      behaviroal: {
+        listData: [],
+        count: 0,
+      },
     }, {
-      "title": "functional",
-      "functional": {
-        "listData": [],
-        "count": 0
-      }
+      title: 'functional',
+      functional: {
+        listData: [],
+        count: 0,
+      },
     }, {
-      "title": "domain",
-      "domain": {
-        "listData": [],
-        "count": 0
-      }
-    }
-    ];
+      title: 'domain',
+      domain: {
+        listData: [],
+        count: 0,
+      },
+    },
+    ]
     this.contentData.map((item: any) => {
       if (item.selected) {
-        this.selectedCardData.push(item);
+        this.selectedCardData.push(item)
       }
     })
 
@@ -68,25 +68,24 @@ export class CompetencySummaryComponent implements OnInit {
     this.selectedCardData.map((sitem: any) => {
       sitem.competencies_v5.map((fitem: any) => {
         if (fitem.competencyArea.toLowerCase() === 'behaviroal') {
-          this.competencySummaryObj[0]['behaviroal']['count'] = this.competencySummaryObj[0]['behaviroal']['count'] + 1;
+          this.competencySummaryObj[0]['behaviroal']['count'] = this.competencySummaryObj[0]['behaviroal']['count'] + 1
 
           // competencyThemeObj = this.checkIfThemeNameExists(this.competencySummaryObj['behaviroal']['listData'], fitem);
-          this.competencySummaryObj[0]['behaviroal']['listData'].push(fitem);
-          this.selectedIndex = 0;
+          this.competencySummaryObj[0]['behaviroal']['listData'].push(fitem)
+          this.selectedIndex = 0
         }
         if (fitem.competencyArea.toLowerCase() === 'functional') {
-          this.competencySummaryObj[1]['functional']['count'] = this.competencySummaryObj[1]['functional']['count'] + 1;
-          this.competencySummaryObj[1]['functional']['listData'].push(fitem);
-          this.selectedIndex = 1;
+          this.competencySummaryObj[1]['functional']['count'] = this.competencySummaryObj[1]['functional']['count'] + 1
+          this.competencySummaryObj[1]['functional']['listData'].push(fitem)
+          this.selectedIndex = 1
         }
         if (fitem.competencyArea.toLowerCase() === 'domain') {
-          this.competencySummaryObj[2]['domain']['count'] = this.competencySummaryObj[2]['domain']['count'] + 1;
-          this.competencySummaryObj[2]['domain']['listData'].push(fitem);
-          this.selectedIndex = 2;
+          this.competencySummaryObj[2]['domain']['count'] = this.competencySummaryObj[2]['domain']['count'] + 1
+          this.competencySummaryObj[2]['domain']['listData'].push(fitem)
+          this.selectedIndex = 2
         }
       })
     })
-    console.log('this.competencySummaryObj', this.competencySummaryObj);
   }
 
   // checkIfThemeNameExists(arr:any, fitem:any):object {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.html b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.html
index 9880a032a..d169201b7 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.html
@@ -1,9 +1,9 @@
 <div class="box-container" *ngIf="data?.type === 'normal'">
-    <div class="close-modal-container">
+    <!-- <div class="close-modal-container">
         <button mat-icon-button>
             <mat-icon>more_vert</mat-icon>
         </button>
-    </div>
+    </div> -->
     <div class="flex flex-1 flex-row icon">
         <img src="assets/icons/{{data?.icon}}.svg" />
 
@@ -26,11 +26,11 @@
 </div>
 
 <div class="box-container-portrait" *ngIf="data?.type === 'progress'">
-    <div class="close-modal-container">
+    <!-- <div class="close-modal-container">
         <button mat-icon-button>
             <mat-icon>more_vert</mat-icon>
         </button>
-    </div>
+    </div> -->
     <div class="flex flex-1 flex-row progress-title">
         {{data?.title}}
     </div>
@@ -44,11 +44,11 @@
 </div>
 
 <div class="box-container-portrait" *ngIf="data?.type === 'progress-completed'">
-    <div class="close-modal-container">
+    <!-- <div class="close-modal-container">
         <button mat-icon-button type="button" (click)="dialogRef.close()">
             <mat-icon>close</mat-icon>
         </button>
-    </div>
+    </div> -->
     <div class="flex flex-1 flex-row progress-title">
         {{data?.title}}
     </div>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation.box.component.ts b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation.box.component.ts
index ce00f4832..2503644c7 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation.box.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation.box.component.ts
@@ -1,6 +1,6 @@
 import { Component, Inject, OnInit } from '@angular/core'
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'
-import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service';
+import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
 @Component({
   selector: 'ws-app-confirmation-box',
   templateUrl: './confirmation-box.component.html',
@@ -21,10 +21,9 @@ export class ConfirmationBoxComponent implements OnInit {
     this.dialogRef.close()
   }
 
-  performAction(data:any) {
-    console.log(data);
-    this.dialogRef.close();
-    this.trainingPlanDataSharingService.trainingPlanCategoryChangeEvent.next(data);
+  performAction(data: any) {
+    this.dialogRef.close()
+    this.trainingPlanDataSharingService.trainingPlanCategoryChangeEvent.next(data)
 
   }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 09ae760dc..29feebb8f 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -18,7 +18,8 @@ export class SearchComponent implements OnInit {
   constructor(@Inject(DOCUMENT) private document: Document,
     private trainingPlanService: TrainingPlanService,
     private route: ActivatedRoute,
-    private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
+    private trainingPlanDataSharingService: TrainingPlanDataSharingService,
+  ) { }
 
   ngOnInit() {
     // this.handleCategorySelection('');
@@ -46,7 +47,6 @@ export class SearchComponent implements OnInit {
   }
 
   handleCategorySelection(event: any) {
-    console.log('event--', event, this.from)
     switch (this.from) {
       case 'content':
         event = !event ? 'Course' : event
@@ -57,9 +57,10 @@ export class SearchComponent implements OnInit {
         if (event === 'Designation') {
           this.getDesignations(event)
         } else if (event === 'Custom Users') {
+          this.getCustomUsers(event)
+        } else if (event === 'All Users') {
           this.getAllUsers(event)
         }
-
         break
     }
   }
@@ -94,21 +95,19 @@ export class SearchComponent implements OnInit {
           "limit": 20,
           "query": "",
           "sort_by": { "lastUpdatedOn": "desc" },
-          "fields": ["name", "appIcon", "instructions", "description", "purpose", "mimeType", 
-          "gradeLevel", "identifier", "medium", "pkgVersion", "board", "subject", "resourceType", 
-          "primaryCategory", "contentType", "channel", "organisation", "trackable", "license", "posterImage", 
-          "idealScreenSize", "learningMode", "creatorLogo", "duration", "version", "avgRating", "competencies_v5"]
+          "fields": ["name", "appIcon", "instructions", "description", "purpose", "mimeType",
+            "gradeLevel", "identifier", "medium", "pkgVersion", "board", "subject", "resourceType",
+            "primaryCategory", "contentType", "channel", "organisation", "trackable", "license", "posterImage",
+            "idealScreenSize", "learningMode", "creatorLogo", "duration", "version", "avgRating", "competencies_v5"]
         }, "query": ""
       }
       this.trainingPlanService.getAllContent(filterObj).subscribe((res: any) => {
-        console.log('res-->', res)
 
         // if(this.trainingPlanDataSharingService.trainingPlanContentData &&
         //    this.trainingPlanDataSharingService.trainingPlanContentData['data'] &&
         //    this.trainingPlanDataSharingService.trainingPlanContentData['data']['content'] &&
         //    this.trainingPlanDataSharingService.trainingPlanContentData['data']['content'].length
         //   ) {
-        //     console.log('this.trainingPlanDataSharingService.trainingPlanContentData',this.trainingPlanDataSharingService.trainingPlanContentData);
         //     res && res.content.map((sitem:any)=> {
         //       sitem
         //     })
@@ -121,8 +120,7 @@ export class SearchComponent implements OnInit {
 
   }
 
-  getAllUsers(event: any) {
-    console.log('event', event)
+  getCustomUsers(event: any) {
     const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
     const filterObj = {
       request: {
@@ -135,16 +133,19 @@ export class SearchComponent implements OnInit {
         offset: 0,
       },
     }
-    this.trainingPlanService.getAllUsers(filterObj).subscribe((res: any) => {
-      console.log('res-->', res)
-      this.trainingPlanDataSharingService.trainingPlanAssigneeData = { category: event, data: res }
+    this.trainingPlanService.getCustomUsers(filterObj).subscribe((res: any) => {
+      this.trainingPlanDataSharingService.trainingPlanAssigneeData = { category: event, data: res.content }
       this.handleApiData.emit(true)
     })
   }
 
+  getAllUsers(_event: any) {
+    this.trainingPlanDataSharingService.trainingPlanAssigneeData = { category: _event, data: [] }
+    this.handleApiData.emit(true)
+  }
+
   getDesignations(event: any) {
     this.trainingPlanService.getDesignations().subscribe((res: any) => {
-      console.log('res-->', res)
       this.trainingPlanDataSharingService.trainingPlanAssigneeData = { category: event, data: res.responseData }
       this.handleApiData.emit(true)
     })
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
index 67f88b244..5faf78c16 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
@@ -1,24 +1,23 @@
-import { Component, EventEmitter, Input, Output, OnInit } from '@angular/core'
+import { Component, EventEmitter, Input, Output, OnInit, OnChanges } from '@angular/core'
 import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
 @Component({
   selector: 'ws-app-standard-card',
   templateUrl: './standard-card.component.html',
   styleUrls: ['./standard-card.component.scss'],
 })
-export class StandardCardComponent implements OnInit {
+export class StandardCardComponent implements OnInit, OnChanges {
   @Input() cardSize: any
   @Input() checkboxVisibility: any = true
-  @Input() contentData: any[] = [];
-  @Input() showDeleteFlag = false;
-  @Output() handleSelectedChips = new EventEmitter();
-  selectedContent: any[] = [];
+  @Input() contentData: any[] = []
+  @Input() showDeleteFlag = false
+  @Output() handleSelectedChips = new EventEmitter()
+  selectedContent: any[] = []
   constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
   }
 
   ngOnChanges() {
-    console.log('contentData', this.contentData)
   }
 
   selectContentItem(event: any, item: any) {
@@ -49,23 +48,20 @@ export class StandardCardComponent implements OnInit {
         }
       })
     }
-    console.log(' this.trainingPlanDataSharingService.trainingPlanStepperData', this.trainingPlanDataSharingService.trainingPlanStepperData)
     this.handleSelectedChips.emit(true)
   }
 
-  deleteItem(item:any) {
-    console.log('item', item);
+  deleteItem(item: any) {
     this.trainingPlanDataSharingService.trainingPlanContentData.data.content.map((sitem: any) => {
       if (sitem.identifier === item.identifier) {
         sitem['selected'] = false
       }
     })
-    this.contentData.filter((sitem: any, index:any) => {
+    this.contentData.filter((sitem: any, index: any) => {
       if (sitem.identifier === item.identifier) {
-        this.contentData.splice(index,1);
+        this.contentData.splice(index, 1)
       }
     })
-    console.log('result-->', this.trainingPlanDataSharingService.trainingPlanContentData.data.content);
     this.trainingPlanDataSharingService.trainingPlanStepperData['contentList'].filter((identifier: any, index: any) => {
       if (identifier === item.identifier) {
         this.trainingPlanDataSharingService.trainingPlanStepperData['contentList'].splice(index, 1)
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
index 89f5d3e18..24b1438bc 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
@@ -24,7 +24,8 @@
                 <span>3. Add Assignee</span>
             </ng-template>
             <ng-template matTabContent>
-                <ws-app-create-assignee (addAssigneeInvalid)="checkForaddAssignee($event)"></ws-app-create-assignee>
+                <ws-app-create-assignee (addAssigneeInvalid)="checkForaddAssignee($event)"
+                    (changeTabToTimeline)="tabChangeToTimeline($event)"></ws-app-create-assignee>
             </ng-template>
         </mat-tab>
         <mat-tab [label]="tabType.ADD_TIMELINE"
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
index 9ce54cc93..aa16aae1b 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
@@ -15,10 +15,10 @@ export class StepperComponent implements OnInit, OnChanges {
   @Output() addAssigneeIsInvalid = new EventEmitter<any>()
 
   tabType = TrainingPlanContent.TTabLabelKey
-  tabIndexValue: number = 0
-  addCotnentDisable: boolean = true
-  addAssigneeDisable: boolean = true
-  addTimelineDisable: boolean = true
+  tabIndexValue = 0
+  addCotnentDisable = true
+  addAssigneeDisable = true
+  addTimelineDisable = true
 
   constructor() { }
 
@@ -62,4 +62,10 @@ export class StepperComponent implements OnInit, OnChanges {
     this.addTimelineDisable = _event
     this.addAssigneeIsInvalid.emit(_event)
   }
+
+  tabChangeToTimeline(_event: any) {
+    this.addTimelineDisable = _event
+    this.addAssigneeIsInvalid.emit(_event)
+    this.tabIndexValue = 3
+  }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
index 0a3d62e49..49908801c 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
@@ -1,5 +1,5 @@
 <div class="flex flex-4 flex-row assignee-card-container flex-wrap" *ngIf="assigneeData?.category === 'Custom Users'">
-    <ng-container *ngFor="let item of assigneeData?.data?.content | slice : 0 : 20">
+    <ng-container *ngFor="let item of assigneeData?.data | slice : 0 : 20">
         <div class="flex flex-4 assignee-card" [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
             <div class="avatar">
                 <div>HG</div>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
index 542aa3baf..23b5ad07a 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
@@ -6,10 +6,10 @@ import { TrainingPlanDataSharingService } from '../../services/training-plan-dat
   styleUrls: ['./user-card.component.scss'],
 })
 export class UserCardComponent implements OnInit {
-  @Input() checkboxVisibility = true;
-  @Input() showDeleteFlag = false;
-  @Input() assigneeData: any;
-  @Output() handleSelectedChips = new EventEmitter();
+  @Input() checkboxVisibility = true
+  @Input() showDeleteFlag = false
+  @Input() assigneeData: any
+  @Output() handleSelectedChips = new EventEmitter()
   constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
@@ -44,14 +44,13 @@ export class UserCardComponent implements OnInit {
     this.handleSelectedChips.emit(true)
   }
 
-  deleteItem(item:any) {
-    console.log('item', item);
+  deleteItem(item: any) {
     this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
       if (sitem.id === item.id) {
         sitem['selected'] = false
       }
     })
-    this.assigneeData.data.map((sitem: any, index:any) => {
+    this.assigneeData.data.map((sitem: any, index: any) => {
       if (sitem.id === item.id) {
         this.assigneeData.data.splice(index, 1)
       }
diff --git a/project/ws/app/src/lib/routes/training-plan/models/training-plan.model.ts b/project/ws/app/src/lib/routes/training-plan/models/training-plan.model.ts
index f1dfc0fd3..560a1297d 100644
--- a/project/ws/app/src/lib/routes/training-plan/models/training-plan.model.ts
+++ b/project/ws/app/src/lib/routes/training-plan/models/training-plan.model.ts
@@ -3,6 +3,6 @@ export namespace TrainingPlanContent {
     CREATE_PLAN = 'createPlan',
     ADD_CONTENT = 'addContent',
     ADD_ASSIGNEE = 'addAssignee',
-    ADD_TIMELINE = 'addTimeline'
+    ADD_TIMELINE = 'addTimeline',
   }
-}
\ No newline at end of file
+}
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
index 10f753b5b..7c93582d3 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
@@ -2,8 +2,24 @@
     <ws-app-search [categoryData]="categoryData" [from]="from" (handleApiData)="handleApiData($event)"></ws-app-search>
 </ng-container>
 <ng-container>
-    <ws-app-chip [selectedAssigneeChips]="selectedAssigneeChips" [from]="from" [selectAssigneeCount]="selectAssigneeCount"></ws-app-chip>
+    <ws-app-chip [selectedAssigneeChips]="selectedAssigneeChips" [from]="from"
+        [selectAssigneeCount]="selectAssigneeCount"></ws-app-chip>
 </ng-container>
 <ng-container>
-    <ws-app-user-card [assigneeData]="assigneeData" (handleSelectedChips)="handleSelectedChips($event)"></ws-app-user-card>
+    <ws-app-user-card [assigneeData]="assigneeData" (handleSelectedChips)="handleSelectedChips($event)"
+        *ngIf="assigneeData?.category === 'Designation'"></ws-app-user-card>
+    <ws-app-user-card [assigneeData]="assigneeData" (handleSelectedChips)="handleSelectedChips($event)"
+        *ngIf="assigneeData?.category === 'Custom Users'"></ws-app-user-card>
+</ng-container>
+<ng-container *ngIf="trainingPlanDataSharingService?.trainingPlanAssigneeData?.category === 'All Users'">
+    <div class="no-cbp-data margin-top-xl margin-bottom-xl">
+        <div><img src="/assets/icons/no-data.svg"></div>
+        <div class="mat-subheading-1 margin-remove">It will assign to all users</div>
+        <div>By selecting all users, you've selected all the users from your Department of fisheries.</div>
+        <div class="margin-top-m">
+            <button mat-button type="button" class="create-btn" (click)="changeTab()">
+                Next: Add timeline
+            </button>
+        </div>
+    </div>
 </ng-container>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.scss b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.scss
index e69de29bb..3464a9887 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.scss
@@ -0,0 +1,23 @@
+.no-cbp-data {
+  width: auto;
+  margin: 0 auto;
+  text-align: center;
+
+  img {
+    width: 190px;
+  }
+
+  .small-text {
+    font-size: 14px;
+    color: rgba(0, 0, 0, 0.6);
+  }
+}
+
+.create-btn {
+  width: auto;
+  background: #0075B7 !important;
+  color: white !important;
+  font-family: 'Lato';
+  font-weight: 700;
+  font-size: 14px;
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
index 6a6b71b6e..87fc71946 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
@@ -9,13 +9,14 @@ import { TrainingPlanDataSharingService } from './../../services/training-plan-d
 export class CreateAssigneeComponent implements OnInit {
 
   @Output() addAssigneeInvalid = new EventEmitter<any>()
+  @Output() changeTabToTimeline = new EventEmitter<any>()
 
-  categoryData: any[] = [];
-  assigneeData: any[] = [];
-  selectAssigneeCount: number = 0;
-  selectedAssigneeChips: any[] = [];
-  constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
-  from = 'assignee';
+  categoryData: any[] = []
+  assigneeData: any
+  selectAssigneeCount = 0
+  selectedAssigneeChips: any[] = []
+  constructor(public trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
+  from = 'assignee'
   ngOnInit() {
     this.categoryData = [
       {
@@ -37,11 +38,9 @@ export class CreateAssigneeComponent implements OnInit {
   }
 
   handleApiData(event: any) {
-    if (event) {
-      console.log(this.trainingPlanDataSharingService.trainingPlanAssigneeData)
+    if (event && this.trainingPlanDataSharingService.trainingPlanAssigneeData) {
       if (this.trainingPlanDataSharingService.trainingPlanStepperData &&
         this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo) {
-        console.log('this.trainingPlanDataSharingService.trainingPlanContentData.data.content', this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo)
         this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
           if (this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.indexOf(sitem.id) > -1) {
             sitem['selected'] = true
@@ -52,20 +51,19 @@ export class CreateAssigneeComponent implements OnInit {
       } else {
         this.assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData
       }
-
+    }
+    if (this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'All Users') {
+      this.addAssigneeInvalid.emit(false)
     }
   }
 
   handleSelectedChips(event: any) {
-    console.log('event', event)
     this.selectAssigneeCount = 0
     if (event) {
       this.selectedAssigneeChips = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data
-      console.log('this.selectedAssigneeChips', this.selectedAssigneeChips)
-      this.selectedAssigneeChips.map((sitem) => {
+      this.selectedAssigneeChips.map(sitem => {
         if (sitem.selected) {
           this.selectAssigneeCount = this.selectAssigneeCount + 1
-          console.log('this.selectContentCount', this.selectAssigneeCount)
         }
       })
     }
@@ -76,4 +74,8 @@ export class CreateAssigneeComponent implements OnInit {
     }
   }
 
+  changeTab() {
+    this.changeTabToTimeline.emit(false)
+  }
+
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
index 3a03ab2f1..10cb5ac1d 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
@@ -3,7 +3,7 @@
 </ng-container>
 
 <ng-container>
-    <div class="flex flex-row">
+    <div class="flex flex-row" *ngIf="contentData.length > 0">
         <div class="flex-1">
             <ws-app-chip [selectedContentChips]="selectedContentChips" [from]="from"
                 [selectContentCount]="selectContentCount" (itemRemoved)="itemsRemovedFromChip()"></ws-app-chip>
@@ -11,7 +11,14 @@
                 (handleSelectedChips)="handleSelectedChips($event)"></ws-app-standard-card>
         </div>
         <div class="flex-2 margin-left-s margin-top-s">
-            <ws-app-competency-summary [contentData]="contentData" [selectContentCount]="selectContentCount"></ws-app-competency-summary>
+            <ws-app-competency-summary [contentData]="contentData"
+                [selectContentCount]="selectContentCount"></ws-app-competency-summary>
         </div>
     </div>
+    <div class="no-cbp-data margin-top-xl margin-bottom-xl" *ngIf="contentData.length === 0">
+        <div><img src="/assets/icons/no-data.svg"></div>
+        <div class="mat-subheading-1 margin-remove">No content avaliable.</div>
+        <!-- <div>Create a content in CBP portal to get the contents.</div> -->
+    </div>
+
 </ng-container>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.scss b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.scss
index e69de29bb..3464a9887 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.scss
@@ -0,0 +1,23 @@
+.no-cbp-data {
+  width: auto;
+  margin: 0 auto;
+  text-align: center;
+
+  img {
+    width: 190px;
+  }
+
+  .small-text {
+    font-size: 14px;
+    color: rgba(0, 0, 0, 0.6);
+  }
+}
+
+.create-btn {
+  width: auto;
+  background: #0075B7 !important;
+  color: white !important;
+  font-family: 'Lato';
+  font-weight: 700;
+  font-size: 14px;
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
index 92a8d53a2..7d26db5f4 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
@@ -9,11 +9,11 @@ export class CreateContentComponent implements OnInit {
 
   @Output() addContentInvalid = new EventEmitter<any>()
 
-  categoryData: any[] = [];
-  contentData: any[] = [];
-  from = 'content';
-  selectedContentChips: any[] = [];
-  selectContentCount: number = 0;
+  categoryData: any[] = []
+  contentData: any[] = []
+  from = 'content'
+  selectedContentChips: any[] = []
+  selectContentCount = 0
   constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
@@ -44,19 +44,21 @@ export class CreateContentComponent implements OnInit {
         value: 'Moderated Course',
       },
     ]
+    this.handleApiData(true)
   }
 
   handleApiData(event: any) {
-    if (event) {
-      console.log(this.trainingPlanDataSharingService.trainingPlanContentData)
+    if (event && this.trainingPlanDataSharingService.trainingPlanContentData) {
       if (this.trainingPlanDataSharingService.trainingPlanStepperData &&
         this.trainingPlanDataSharingService.trainingPlanStepperData.contentList) {
-        console.log('this.trainingPlanDataSharingService.trainingPlanContentData.data.content', this.trainingPlanDataSharingService.trainingPlanStepperData.contentList)
-        this.trainingPlanDataSharingService.trainingPlanContentData.data.content && this.trainingPlanDataSharingService.trainingPlanContentData.data.content.map((sitem: any) => {
-          if (this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.indexOf(sitem.identifier) > -1) {
-            sitem['selected'] = true
-          }
-        })
+        if (this.trainingPlanDataSharingService.trainingPlanContentData &&
+          this.trainingPlanDataSharingService.trainingPlanContentData.data.content) {
+          this.trainingPlanDataSharingService.trainingPlanContentData.data.content.map((sitem: any) => {
+            if (this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.indexOf(sitem.identifier) > -1) {
+              sitem['selected'] = true
+            }
+          })
+        }
         this.contentData = this.trainingPlanDataSharingService.trainingPlanContentData.data.content
         this.handleSelectedChips(true)
       } else {
@@ -66,17 +68,16 @@ export class CreateContentComponent implements OnInit {
   }
 
   handleSelectedChips(event: any) {
-    console.log('event', event)
     this.selectContentCount = 0
     if (event) {
       this.selectedContentChips = this.trainingPlanDataSharingService.trainingPlanContentData.data.content
-      console.log('this.selectedContentChips', this.selectedContentChips)
-      this.selectedContentChips && this.selectedContentChips.map((sitem) => {
-        if (sitem.selected) {
-          this.selectContentCount = this.selectContentCount + 1
-          console.log('this.selectContentCount', this.selectContentCount)
-        }
-      })
+      if (this.selectedContentChips) {
+        this.selectedContentChips.map(sitem => {
+          if (sitem.selected) {
+            this.selectContentCount = this.selectContentCount + 1
+          }
+        })
+      }
     }
     if (this.selectContentCount <= 0) {
       this.addContentInvalid.emit(true)
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
index 7e9a215c6..b463367bb 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
@@ -11,8 +11,8 @@ import _ from 'lodash'
 
 export class CreatePlanComponent implements OnInit, AfterViewInit, OnDestroy {
 
-  selectedTabData: string = 'createPlan'
-  nextTab: string = ''
+  selectedTabData = 'createPlan'
+  nextTab = ''
   createCheck: any
 
   constructor() {
@@ -38,21 +38,21 @@ export class CreatePlanComponent implements OnInit, AfterViewInit, OnDestroy {
   isPlanTitleInvalid(_event: any) {
     this.createCheck = {
       ...this.createCheck,
-      titleIsInvalid: _event
+      titleIsInvalid: _event,
     }
   }
 
   isAddContentInvalid(_event: any) {
     this.createCheck = {
       ...this.createCheck,
-      addContentIsInvalid: _event
+      addContentIsInvalid: _event,
     }
   }
 
   isAddAssigneeInvalid(_event: any) {
     this.createCheck = {
       ...this.createCheck,
-      addAssigneeIsInvalid: _event
+      addAssigneeIsInvalid: _event,
     }
   }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
index 6648fe11d..3451e21b1 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
@@ -7,7 +7,7 @@ import { TrainingPlanDataSharingService } from '../../services/training-plan-dat
   styleUrls: ['./create-timeline.component.scss'],
 })
 export class CreateTimelineComponent implements OnInit {
-  contentData: any[] = [];
+  contentData: any[] = []
   assigneeData: any
   constructor(private router: Router, private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
 
@@ -21,19 +21,14 @@ export class CreateTimelineComponent implements OnInit {
       })
 
     }
-
-    console.log('this.contentData', this.contentData)
-    console.log('this.trainingPlanDataSharingService.trainingPlanAssigneeData', this.trainingPlanDataSharingService.trainingPlanAssigneeData)
     if (this.trainingPlanDataSharingService.trainingPlanAssigneeData &&
       this.trainingPlanDataSharingService.trainingPlanAssigneeData.data
     ) {
-      let category = this.trainingPlanDataSharingService.trainingPlanAssigneeData.category
-      let assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
+      const category = this.trainingPlanDataSharingService.trainingPlanAssigneeData.category
+      const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
         return item.selected
       })
-      this.assigneeData = { 'category': category, data: assigneeData }
-
-      console.log('this.assigneeData', this.assigneeData)
+      this.assigneeData = { category, data: assigneeData }
     }
   }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts b/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
index 51ca57173..8d555aa04 100644
--- a/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
+++ b/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
@@ -1,24 +1,24 @@
 import { Injectable } from '@angular/core'
-import { Subject } from 'rxjs';
+import { Subject } from 'rxjs'
 
 @Injectable({
   providedIn: 'root',
 })
 export class TrainingPlanDataSharingService {
-  trainingPlanCategoryChangeEvent = new Subject();
-  trainingPlanTitle: string = ''
+  trainingPlanCategoryChangeEvent = new Subject()
+  trainingPlanTitle = ''
   trainingPlanContentData: any
   trainingPlanAssigneeData: any
   trainingPlanStepperData: any = {
-    "name": "CBP Plan Name",
-    "contentType": "",
-    "contentList": [
+    name: '',
+    contentType: '',
+    contentList: [
     ],
-    "assignmentType": "",
-    "assignmentTypeInfo": [
+    assignmentType: '',
+    assignmentTypeInfo: [
     ],
-    "endDate": ""
-  };
+    endDate: '',
+  }
   constructor() {
 
   }
diff --git a/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts b/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
index f0a1b1f04..ecc4f0359 100644
--- a/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
+++ b/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
@@ -17,11 +17,11 @@ const API_END_POINTS = {
   providedIn: 'root',
 })
 export class TrainingPlanService {
-  constructor(private http: HttpClient) { 
-    
+  constructor(private http: HttpClient) {
+
   }
-  //reqObj:object
-  createPlan(obj:any) {
+  // reqObj:object
+  createPlan(obj: any) {
     return this.http.post<any>(`${API_END_POINTS.CREATE_PLAN}`, obj).pipe(map(res => _.get(res, 'result')))
   }
 
@@ -29,11 +29,11 @@ export class TrainingPlanService {
 
   }
 
-  getAllContent(filter:object):Observable<any> {
+  getAllContent(filter: object): Observable<any> {
     return this.http.post<any>(`${API_END_POINTS.GET_ALL_CONTENT}`, filter).pipe(map(res => _.get(res, 'result')))
   }
 
-  getAllUsers(filter: object): Observable<any> {
+  getCustomUsers(filter: object): Observable<any> {
     return this.http.post<any>(`${API_END_POINTS.GET_ALL_USERS}`, filter).pipe(map(res => _.get(res, 'result.response')))
   }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
index 4b9e1d814..bd62c6bab 100644
--- a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
+++ b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
@@ -57,7 +57,8 @@ import { CreateContentComponent } from './routes/create-content/create-content.c
 import { CategoryDropDownComponent } from './components/category-drop-down/category-drop-down.component'
 import { AddPlanInformationComponent } from './components/add-plan-information/add-plan-information.component'
 
-import { TrainingPlanService } from './services/traininig-plan.service';
+import { TrainingPlanService } from './services/traininig-plan.service'
+import { LoaderService } from '../../../../../../../src/app/services/loader.service'
 @NgModule({
   declarations: [
     TrainingPlanHomeComponent,
@@ -133,7 +134,8 @@ import { TrainingPlanService } from './services/traininig-plan.service';
   ],
   providers: [
     InitResolver,
-    TrainingPlanService
+    TrainingPlanService,
+    LoaderService,
   ],
 })
 export class TrainingPlanModule {
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
index 3dc254ed3..a45750f61 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
@@ -156,7 +156,6 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   radioChange(_event: MatRadioChange) {
-    // console.log(_event.source.name, _event.value)
     this.resetOTPFields()
   }
 
@@ -241,9 +240,7 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
               this.formGroup.reset()
               this.getBulkUploadData()
             },
-            err => {
-              // tslint:disable-next-line: no-console
-              console.log('error', err)
+            _err => {
               this.openSnackbar(this.toastError.nativeElement.value)
             })
       }
@@ -371,7 +368,6 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   verifyOtp(otp: any) {
-    // console.log(otp)
     // const mob = this.registrationForm.get('mobile')
 
     if (otp && otp.value) {
diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
index c7cb46b6f..69481fcd0 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
@@ -74,8 +74,6 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
     private snackBar: MatSnackBar) {
     this.router.events.subscribe((event: Event) => {
       if (event instanceof NavigationEnd) {
-        // console.log(this.activeRoute.snapshot.data, 'this.activeRoute.snapshot.data====')
-        // console.log(this.activeRoute.snapshot.data.profileData.data, 'this.activeRoute.snapshot.data.profileData.data')
         this.configSvc = this.activeRoute.snapshot.data.configService || {}
         const profileDataAll = this.activeRoute.snapshot.data.profileData.data || {}
         const profileData = profileDataAll.profileDetails
@@ -230,7 +228,6 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
         const usrRoles = profileDataAll.roles
         usrRoles.forEach((role: any) => {
           this.orguserRoles.push(role)
-          // console.log('orguserRoles', this.orguserRoles)
           this.modifyUserRoles(role)
         })
 
diff --git a/project/ws/app/src/lib/routes/workallocation-v2/components/activity-labels/activity-labels.component.ts b/project/ws/app/src/lib/routes/workallocation-v2/components/activity-labels/activity-labels.component.ts
index 982aed294..464732487 100644
--- a/project/ws/app/src/lib/routes/workallocation-v2/components/activity-labels/activity-labels.component.ts
+++ b/project/ws/app/src/lib/routes/workallocation-v2/components/activity-labels/activity-labels.component.ts
@@ -77,11 +77,9 @@ export class ActivityLabelsComponent implements OnInit, OnDestroy, AfterViewInit
   }
 
   get groupList(): FormArray {
-    // console.log(this.activityForm.get('groupsArray'))
     return this.activityForm.get('groupsArray') as FormArray
   }
   get grpArray(): FormArray | null {
-    // console.log(this.activityForm.get('groupsArray'))
     return this.activityForm ? this.activityForm.get('groupsArray') as FormArray : null
   }
   get getControls(): AbstractControl[] {
@@ -142,7 +140,6 @@ export class ActivityLabelsComponent implements OnInit, OnDestroy, AfterViewInit
       const previousContainerIndex = parseInt(event.previousContainer.id.replace('groups_', ''), 10)
       const targetContainerIndex = parseInt(event.container.id.replace('groups_', ''), 10)
       // tslint:disable
-      // console.log(actualIdx)
       const oldArray = (this.activityForm.get('groupsArray') as any)!.at(previousContainerIndex).get('activities')
       const newArray = (this.activityForm.get('groupsArray') as any)!.at(targetContainerIndex).get('activities')
       // tslint:enable
@@ -153,11 +150,7 @@ export class ActivityLabelsComponent implements OnInit, OnDestroy, AfterViewInit
       // this.addNewGroupActivityCustom(previousContainerIndex, oldArray.value)
       // this.activityForm.reset()
       this.changeDetector.detectChanges()
-      // console.log(this.watStore.getactivitiesGroup)
-
-      // console.log(oldArray, newArray)
     }
-    // console.log(this.groupList.value)
 
     this.watStore.setgetactivitiesGroup(this.groupList.value, false, true)
   }
@@ -180,7 +173,6 @@ export class ActivityLabelsComponent implements OnInit, OnDestroy, AfterViewInit
   }
   log(value: any) {
     if (value) {
-      // console.log(value)
     }
   }
   setlabelsValues(val: any) {
@@ -383,7 +375,6 @@ export class ActivityLabelsComponent implements OnInit, OnDestroy, AfterViewInit
   }
   submitResult(qualityForm: any) {
     if (qualityForm) { }
-    // console.log(qualityForm)
   }
   public async filterUsers(value: string) {
     // if (value && value.length > 3) {
@@ -472,7 +463,6 @@ export class ActivityLabelsComponent implements OnInit, OnDestroy, AfterViewInit
               { activityDescription: item.activityDescription }
             )
           )
-          // console.log(newValues)
           const unselectVals =
             _.reject(_.get(lst.get('activities'), 'value'), item =>
               _.find(val.data, { activityDescription: item.activityDescription }))
diff --git a/project/ws/app/src/lib/routes/workallocation-v2/components/assistant-content-card/assistant-content-card.component.ts b/project/ws/app/src/lib/routes/workallocation-v2/components/assistant-content-card/assistant-content-card.component.ts
index c501c97df..29039d5d2 100644
--- a/project/ws/app/src/lib/routes/workallocation-v2/components/assistant-content-card/assistant-content-card.component.ts
+++ b/project/ws/app/src/lib/routes/workallocation-v2/components/assistant-content-card/assistant-content-card.component.ts
@@ -26,8 +26,6 @@ export class AssistantContentCardComponent implements OnInit {
     })
     dialogRef.afterClosed().subscribe((val: any) => {
       if (val) {
-        // tslint:disable-next-line: no-console
-        console.log({ val })
       }
     })
   }
diff --git a/project/ws/app/src/lib/routes/workallocation-v2/components/assistant-message-card/assistant-message-card.component.ts b/project/ws/app/src/lib/routes/workallocation-v2/components/assistant-message-card/assistant-message-card.component.ts
index 2e56dc648..2c0ef8cfa 100644
--- a/project/ws/app/src/lib/routes/workallocation-v2/components/assistant-message-card/assistant-message-card.component.ts
+++ b/project/ws/app/src/lib/routes/workallocation-v2/components/assistant-message-card/assistant-message-card.component.ts
@@ -145,7 +145,6 @@ export class AssistantMessageCardComponent implements OnInit, OnDestroy {
 
   calculateOfficerErrors(data: any): IWarnError[] {
     const result: IWarnError[] = []
-    // console.log('data------', data)
     if (data && data.officerName === '' && (data.position !== '' || data.positionDescription !== '')) {
       result.push({ _type: 'error', type: 'officer', counts: 0, label: 'Officer name is empty' })
     }
@@ -331,8 +330,6 @@ export class AssistantMessageCardComponent implements OnInit, OnDestroy {
         (isNaN(competencyProgress) ? 0 : competencyProgress) +
         (isNaN(compDetailsProgress) ? 0 : compDetailsProgress)) || 0
     } catch (e) {
-      // tslint:disable-next-line: no-console
-      console.log('ERROR in calculating progress')
       return 0
     }
     this.watStore.setCurrentProgress(progress)
diff --git a/project/ws/app/src/lib/routes/workallocation-v2/components/comp-details/comp-details.component.ts b/project/ws/app/src/lib/routes/workallocation-v2/components/comp-details/comp-details.component.ts
index 56abfe25e..c3149e517 100644
--- a/project/ws/app/src/lib/routes/workallocation-v2/components/comp-details/comp-details.component.ts
+++ b/project/ws/app/src/lib/routes/workallocation-v2/components/comp-details/comp-details.component.ts
@@ -87,8 +87,6 @@ export class CompDetailsComponent implements OnInit, OnDestroy {
     return `<ul>${(_.compact(data.split('• '))
       .map(i => { if (i) { return `<li>${i}</li>` } return null })).join('')}</ul>`
   }
-  log(a: any) {
-    // tslint:disable-next-line
-    console.log(a)
+  log(_a: any) {
   }
 }
diff --git a/project/ws/app/src/lib/routes/workallocation-v2/components/competency-labels/competency-labels.component.ts b/project/ws/app/src/lib/routes/workallocation-v2/components/competency-labels/competency-labels.component.ts
index 4ee25fdc4..709832b04 100644
--- a/project/ws/app/src/lib/routes/workallocation-v2/components/competency-labels/competency-labels.component.ts
+++ b/project/ws/app/src/lib/routes/workallocation-v2/components/competency-labels/competency-labels.component.ts
@@ -78,7 +78,6 @@ export class CompetencyLabelsComponent implements OnInit, OnDestroy, AfterViewIn
     this.activitySubscription = this.watStore.getactivitiesGroup.subscribe(groups => {
       if (groups) {
         this.groups = groups
-        // console.log(groups)
         this.updateForm()
       }
     })
@@ -167,7 +166,6 @@ export class CompetencyLabelsComponent implements OnInit, OnDestroy, AfterViewIn
       const previousContainerIndex = parseInt(event.previousContainer.id.replace('compe_', ''), 10)
       const targetContainerIndex = parseInt(event.container.id.replace('compe_', ''), 10)
       // tslint:disable
-      // console.log(actualIdx)
       const oldArray = (this.activityForm.get('groupsArray') as any)!.at(previousContainerIndex).get('competincies')
       const newArray = (this.activityForm.get('groupsArray') as any)!.at(targetContainerIndex).get('competincies')
 
@@ -194,7 +192,6 @@ export class CompetencyLabelsComponent implements OnInit, OnDestroy, AfterViewIn
       this.updateCompData()
       this.changeDetector.detectChanges()
     }
-    // console.log(this.groupList.value)
 
     this.watStore.setgetcompetencyGroup(this.groupList.value, false, true)
 
@@ -604,8 +601,6 @@ export class CompetencyLabelsComponent implements OnInit, OnDestroy, AfterViewIn
       })
     }
   }
-  log(val: any) {
-    // tslint:disable-next-line
-    console.log(val)
+  log(_val: any) {
   }
 }
diff --git a/project/ws/app/src/lib/routes/workallocation-v2/components/publish-popup/publish-popup.component.ts b/project/ws/app/src/lib/routes/workallocation-v2/components/publish-popup/publish-popup.component.ts
index b7e3b4d0a..4b6db7d76 100644
--- a/project/ws/app/src/lib/routes/workallocation-v2/components/publish-popup/publish-popup.component.ts
+++ b/project/ws/app/src/lib/routes/workallocation-v2/components/publish-popup/publish-popup.component.ts
@@ -100,7 +100,6 @@ export class PublishPopupComponent implements OnInit {
     })
     // tslint:disable-next-line:forin
     // for (const key in this.progress) {
-    //   this.progress[key].progress.subscribe((val: any) => console.log(val))
     // }
   }
 
diff --git a/project/ws/app/src/lib/routes/workallocation-v2/routes/create-workallocation/create-workallocation.component.ts b/project/ws/app/src/lib/routes/workallocation-v2/routes/create-workallocation/create-workallocation.component.ts
index 357c14fe8..ed9fad034 100644
--- a/project/ws/app/src/lib/routes/workallocation-v2/routes/create-workallocation/create-workallocation.component.ts
+++ b/project/ws/app/src/lib/routes/workallocation-v2/routes/create-workallocation/create-workallocation.component.ts
@@ -316,7 +316,6 @@ export class CreateWorkallocationComponent implements OnInit, AfterViewInit, OnD
   saveWAT(autoSave: boolean = false, reload: boolean = false) {
     if (this.getWorkOrderId) {
       const req = this.getStrcuturedReq()
-      // console.log(req)
       if (req) {
         this.allocateSrvc.createAllocationV2(req).subscribe(res => {
           if (res) {
@@ -350,7 +349,6 @@ export class CreateWorkallocationComponent implements OnInit, AfterViewInit, OnD
     if (serverCall) {
       if (this.getWorkOrderId) {
         const req = this.getStrcuturedReqUpdate()
-        // console.log(req)
         if (req) {
           this.allocateSrvc.updateAllocationV2(req).pipe(delay(500)).subscribe(res => {
             if (res) {
diff --git a/project/ws/app/src/lib/routes/workallocation-v2/routes/draft-allocations/draft-allocations.component.ts b/project/ws/app/src/lib/routes/workallocation-v2/routes/draft-allocations/draft-allocations.component.ts
index 1c7682fe6..c465392a5 100644
--- a/project/ws/app/src/lib/routes/workallocation-v2/routes/draft-allocations/draft-allocations.component.ts
+++ b/project/ws/app/src/lib/routes/workallocation-v2/routes/draft-allocations/draft-allocations.component.ts
@@ -84,7 +84,6 @@ export class DraftAllocationsComponent implements OnInit {
   // buttonClick(action: string, row: any) {
   // this.downloaddata = []
   // if (action === 'Download') {
-  //   console.log('row data', row)
   //   this.downloaddata.push(row)
   //   this.exportAsService.save(this.config, 'WorkAllocation').subscribe(() => {
   //     // save started
diff --git a/project/ws/app/src/lib/routes/workallocation-v2/services/user-work-resolver.service.ts b/project/ws/app/src/lib/routes/workallocation-v2/services/user-work-resolver.service.ts
index 0d7761a49..dbb29b8bb 100644
--- a/project/ws/app/src/lib/routes/workallocation-v2/services/user-work-resolver.service.ts
+++ b/project/ws/app/src/lib/routes/workallocation-v2/services/user-work-resolver.service.ts
@@ -14,7 +14,6 @@ export class UserWorkResolverService {
     const officerId = route.params['officerId']
     return this.userWorkService.fetchUserWorkAllocation(officerId).pipe(
       map((data: any) => {
-        // console.log(data)
         // tslint:disable
         // let data1 = { "result": { "data": { "createdByName": "Moloy Sanyal", "updatedBy": "7aff3da6-ef4d-4185-91e3-a731beef3979", "unmappedCompetencies": [], "unmappedActivities": [], "positionDescription": "ASO looking after service matters of employees in ISTM and involved in the implementation of Mission Karmayogi.", "updatedByName": "Neelabh Singh", "userName": "Neelabh Singh", "userId": "b7d4e20d-1b9e-4ec3-99ff-65e75f78dfa3", "createdAt": 0, "roleCompetencyList": [{ "competencyDetails": [], "roleDetails": { "archivedAt": 0, "archived": false, "addedAt": 0, "updatedBy": null, "childNodes": [{ "submittedFromId": null, "level": null, "submittedToEmail": "sandeep.kumar130@gov.in", "description": "Receive and sort the applications for internships", "parentRole": null, "submittedFromEmail": null, "source": "WAT", "type": "ACTIVITY", "submittedToName": "SANDEEP KUMAR", "submittedFromName": null, "name": "", "id": "AID0120", "submittedToId": "14d8225d-768d-4e4c-9aff-9cf24e10a28a", "status": "UNVERIFIED" }, { "submittedFromId": null, "level": null, "submittedToEmail": "sandeep.kumar130@gov.in", "description": "Collect and categorise data for work allocation for APAR generation", "parentRole": null, "submittedFromEmail": null, "source": "WAT", "type": "ACTIVITY", "submittedToName": "SANDEEP KUMAR", "submittedFromName": null, "name": "", "id": "AID0127", "submittedToId": "14d8225d-768d-4e4c-9aff-9cf24e10a28a", "status": "UNVERIFIED" }, { "submittedFromId": null, "level": null, "submittedToEmail": "sandeep.kumar130@gov.in", "description": "Collect information for pension cases", "parentRole": null, "submittedFromEmail": null, "source": "WAT", "type": "ACTIVITY", "submittedToName": "SANDEEP KUMAR", "submittedFromName": null, "name": "", "id": "AID0128", "submittedToId": "14d8225d-768d-4e4c-9aff-9cf24e10a28a", "status": "UNVERIFIED" }, { "submittedFromId": null, "level": null, "submittedToEmail": "sandeep.kumar130@gov.in", "description": "Making a note", "parentRole": null, "submittedFromEmail": null, "source": "WAT", "type": "ACTIVITY", "submittedToName": "SANDEEP KUMAR", "submittedFromName": null, "name": "", "id": "AID0138", "submittedToId": "14d8225d-768d-4e4c-9aff-9cf24e10a28a", "status": "UNVERIFIED" }, { "submittedFromId": null, "level": null, "submittedToEmail": "sandeep.kumar130@gov.in", "description": "Drafting a circular", "parentRole": null, "submittedFromEmail": null, "source": "WAT", "type": "ACTIVITY", "submittedToName": "SANDEEP KUMAR", "submittedFromName": null, "name": "", "id": "AID0139", "submittedToId": "14d8225d-768d-4e4c-9aff-9cf24e10a28a", "status": "UNVERIFIED" }], "name": "Data collector", "description": "Collect data from all the stakeholders and relevant sources", "id": "RID0206", "source": "ISTM", "type": "ROLE", "status": "UNVERIFIED", "updatedAt": 0 } }, { "competencyDetails": [], "roleDetails": { "archivedAt": 0, "archived": false, "addedAt": 0, "updatedBy": null, "childNodes": [{ "submittedFromId": null, "level": null, "submittedToEmail": "sandeep.kumar130@gov.in", "description": "Initiate a case by putting up file for recruitment of Consultant", "parentRole": null, "submittedFromEmail": null, "source": "WAT", "type": "ACTIVITY", "submittedToName": "SANDEEP KUMAR", "submittedFromName": null, "name": "", "id": "AID0121", "submittedToId": "14d8225d-768d-4e4c-9aff-9cf24e10a28a", "status": "UNVERIFIED" }, { "submittedFromId": null, "level": null, "submittedToEmail": "sandeep.kumar130@gov.in", "description": "Put up file for selecting the suitable applicants for internship ", "parentRole": null, "submittedFromEmail": null, "source": "WAT", "type": "ACTIVITY", "submittedToName": "SANDEEP KUMAR", "submittedFromName": null, "name": "", "id": "AID0129", "submittedToId": "14d8225d-768d-4e4c-9aff-9cf24e10a28a", "status": "UNVERIFIED" }], "name": "Case initiator", "description": "Initiates a case by putting up the file bringing out all the relevant facts and related rules", "id": "RID0207", "source": "ISTM", "type": "ROLE", "status": "UNVERIFIED", "updatedAt": 0 } }, { "competencyDetails": [], "roleDetails": { "archivedAt": 0, "archived": false, "addedAt": 0, "updatedBy": null, "childNodes": [{ "submittedFromId": null, "level": null, "submittedToEmail": "sandeep.kumar130@gov.in", "description": "To look after smooth functioning of e-office", "parentRole": null, "submittedFromEmail": null, "source": "WAT", "type": "ACTIVITY", "submittedToName": "SANDEEP KUMAR", "submittedFromName": null, "name": "", "id": "AID0122", "submittedToId": "14d8225d-768d-4e4c-9aff-9cf24e10a28a", "status": "UNVERIFIED" }, { "submittedFromId": null, "level": null, "submittedToEmail": "moloy.istm@gmail.com", "description": "To attend meetings and note important points in NCCSCB", "parentRole": null, "submittedFromEmail": null, "source": "WAT", "type": "ACTIVITY", "submittedToName": "MOLOY SANYAL", "submittedFromName": null, "name": "", "id": "AID0123", "submittedToId": "aab8fe35-a892-4621-b314-606d2a81b6d4", "status": "UNVERIFIED" }, { "submittedFromId": null, "level": null, "submittedToEmail": "sandeep.kumar130@gov.in", "description": "To ensure implementation of e-office modules", "parentRole": null, "submittedFromEmail": null, "source": "WAT", "type": "ACTIVITY", "submittedToName": "SANDEEP KUMAR", "submittedFromName": null, "name": "", "id": "AID0124", "submittedToId": "14d8225d-768d-4e4c-9aff-9cf24e10a28a", "status": "UNVERIFIED" }, { "submittedFromId": null, "level": null, "submittedToEmail": "sandeep.kumar130@gov.in", "description": "To communicate any issues and extension of contract of support personnel", "parentRole": null, "submittedFromEmail": null, "source": "WAT", "type": "ACTIVITY", "submittedToName": "SANDEEP KUMAR", "submittedFromName": null, "name": "", "id": "AID0125", "submittedToId": "14d8225d-768d-4e4c-9aff-9cf24e10a28a", "status": "UNVERIFIED" }, { "submittedFromId": null, "level": null, "submittedToEmail": "sandeep.kumar130@gov.in", "description": "To prepare reports and presentation in development of NCCSCB", "parentRole": null, "submittedFromEmail": null, "source": "WAT", "type": "ACTIVITY", "submittedToName": "SANDEEP KUMAR", "submittedFromName": null, "name": "", "id": "AID0126", "submittedToId": "14d8225d-768d-4e4c-9aff-9cf24e10a28a", "status": "UNVERIFIED" }], "name": "Project Associate", "description": "Looks after any project assigned to him", "id": "RID0208", "source": "ISTM", "type": "ROLE", "status": "UNVERIFIED", "updatedAt": 0 } }, { "competencyDetails": [{ "level": "Level 1", "children": null, "name": "Subject matter expertise", "description": "iiii", "id": "CID0852", "source": "WAT", "additionalProperties": { "competencyType": "Functional", "competencyArea": "" }, "type": "COMPETENCY", "status": "UNVERIFIED" }], "roleDetails": { "archivedAt": 0, "archived": false, "addedAt": 0, "updatedBy": null, "childNodes": [{ "submittedFromId": null, "level": null, "submittedToEmail": "shefali.saraf@nic.in", "description": "Create workflow on Sparrow and generate APAR", "parentRole": null, "submittedFromEmail": null, "source": "WAT", "type": "ACTIVITY", "submittedToName": "SANDEEP KUMAR", "submittedFromName": null, "name": "", "id": "AID0130", "submittedToId": "c74a90a2-cfd0-424a-ab65-5ac61e4b0b64", "status": "UNVERIFIED" }, { "submittedFromId": null, "level": null, "submittedToEmail": "sandeep.kumar130@gov.in", "description": "Verifying the information produced by employee for Pension", "parentRole": null, "submittedFromEmail": null, "source": "WAT", "type": "ACTIVITY", "submittedToName": "SANDEEP KUMAR", "submittedFromName": null, "name": "", "id": "AID0131", "submittedToId": "14d8225d-768d-4e4c-9aff-9cf24e10a28a", "status": "UNVERIFIED" }, { "submittedFromId": null, "level": null, "submittedToEmail": "", "description": "Assisting nodal officer in processing pension case on e-Bhavishya", "parentRole": null, "submittedFromEmail": null, "source": "WAT", "type": "ACTIVITY", "submittedToName": "SANDEEP KUMAR", "submittedFromName": null, "name": "", "id": "AID0132", "submittedToId": "", "status": "UNVERIFIED" }, { "submittedFromId": null, "level": null, "submittedToEmail": "sandeep.kumar130@gov.in", "description": "Draft circular to issue advertisement for Consultant or search on GeM", "parentRole": null, "submittedFromEmail": null, "source": "WAT", "type": "ACTIVITY", "submittedToName": "SANDEEP KUMAR", "submittedFromName": null, "name": "", "id": "AID0133", "submittedToId": "14d8225d-768d-4e4c-9aff-9cf24e10a28a", "status": "UNVERIFIED" }, { "submittedFromId": null, "level": null, "submittedToEmail": "sandeep.kumar130@gov.in", "description": "Addressing any grievance related to pension", "parentRole": null, "submittedFromEmail": null, "source": "WAT", "type": "ACTIVITY", "submittedToName": "SANDEEP KUMAR", "submittedFromName": null, "name": "", "id": "AID0134", "submittedToId": "14d8225d-768d-4e4c-9aff-9cf24e10a28a", "status": "UNVERIFIED" }], "name": "Subject Matter Expert", "description": "", "id": "RID0209", "source": "ISTM", "type": "ROLE", "status": "UNVERIFIED", "updatedAt": 0 } }], "positionId": "PID0108", "createdBy": "052d28b9-ec77-400c-a8c6-b16fbbc69cf3", "userPosition": "ASO (Establishment and NCCSCB)", "progress": 93, "userEmail": "nelsn187@gmail.com", "id": "4dd8c9ee-2cd6-4a39-b039-453daf62b4da", "workOrderId": "4c59b2b3-d88d-4372-99da-ffebe02739c1", "errorCount": 5, "updatedAt": 1624859153031 }, "message": "Successful", "status": "OK" } }
         // tslint:disable
diff --git a/project/ws/app/src/lib/routes/workallocation/components/allocation-actions/allocation-actions.component.ts b/project/ws/app/src/lib/routes/workallocation/components/allocation-actions/allocation-actions.component.ts
index e9dc87ce5..6e851b572 100644
--- a/project/ws/app/src/lib/routes/workallocation/components/allocation-actions/allocation-actions.component.ts
+++ b/project/ws/app/src/lib/routes/workallocation/components/allocation-actions/allocation-actions.component.ts
@@ -314,7 +314,6 @@ export class AllocationActionsComponent implements OnInit {
   }
 
   showRemoveActivity(index: any) {
-    // console.log(document.getElementById(`showremove${index}`))
     // tslint:disable-next-line:no-non-null-assertion
     const vart = document.getElementById(`showremove${index}`)!
     vart.style.display = 'block'
@@ -328,7 +327,6 @@ export class AllocationActionsComponent implements OnInit {
   }
 
   showRemoveCompetency(index: any) {
-    // console.log(document.getElementById(`showremoveComp${index}`))
     // tslint:disable-next-line:no-non-null-assertion
     const vart = document.getElementById(`showremoveComp${index}`)!
     vart.style.display = 'block'
diff --git a/project/ws/app/src/lib/routes/workallocation/routes/create-workallocation/create-workallocation.component.ts b/project/ws/app/src/lib/routes/workallocation/routes/create-workallocation/create-workallocation.component.ts
index ccd67c9f7..0a986bba7 100644
--- a/project/ws/app/src/lib/routes/workallocation/routes/create-workallocation/create-workallocation.component.ts
+++ b/project/ws/app/src/lib/routes/workallocation/routes/create-workallocation/create-workallocation.component.ts
@@ -118,7 +118,6 @@ export class CreateWorkallocationComponent implements OnInit {
     })
     // get the data as base64 or json object for json type - this will be helpful in ionic or SSR
     // this.exportAsService.get(this.config).subscribe(content => {
-    //   console.log(content)
     // })
   }
 
diff --git a/project/ws/app/src/lib/routes/workallocation/routes/download-allocation/download-allocation.component.ts b/project/ws/app/src/lib/routes/workallocation/routes/download-allocation/download-allocation.component.ts
index d20241e80..7b4de9300 100644
--- a/project/ws/app/src/lib/routes/workallocation/routes/download-allocation/download-allocation.component.ts
+++ b/project/ws/app/src/lib/routes/workallocation/routes/download-allocation/download-allocation.component.ts
@@ -16,8 +16,6 @@ export class DownloadAllocationComponent implements OnInit {
   constructor() { }
 
   ngOnInit() {
-    // console.log(this.data)
-    // console.log(this.deptname)
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/workallocation/routes/update-workallocation/update-workallocation.component.ts b/project/ws/app/src/lib/routes/workallocation/routes/update-workallocation/update-workallocation.component.ts
index 6c64a97aa..8555aed6c 100644
--- a/project/ws/app/src/lib/routes/workallocation/routes/update-workallocation/update-workallocation.component.ts
+++ b/project/ws/app/src/lib/routes/workallocation/routes/update-workallocation/update-workallocation.component.ts
@@ -170,7 +170,6 @@ export class UpdateWorkallocationComponent implements OnInit {
     // }
     // get the data as base64 or json object for json type - this will be helpful in ionic or SSR
     // this.exportAsService.get(this.config).subscribe(content => {
-    //   console.log(content)
     // })
   }
 
diff --git a/src/app/component/root/root.component.ts b/src/app/component/root/root.component.ts
index a7ee3c01a..090e97cdf 100644
--- a/src/app/component/root/root.component.ts
+++ b/src/app/component/root/root.component.ts
@@ -144,14 +144,9 @@ export class RootComponent implements OnInit, AfterViewInit {
 
       if (event instanceof NavigationEnd) {
         // let snapshot = this.router.routerState.firstChild(this.activatedRoute).snapshot
-        // console.log('this.route.snapshot :: ', this.route.snapshot)
         const snapshot = this.route.snapshot
-        // console.log('root.snapshot.root.firstChild ', snapshot.root.firstChild)
-        // console.log('firstChild ', snapshot.firstChild)
         const firstChild = snapshot.root.firstChild
         this.getChildRouteData(snapshot, firstChild)
-        // tslint:disable-next-line: no-console
-        // console.log('Final currentDataRoute', this.currentRouteData)
         this.utilitySvc.setRouteData(this.currentRouteData)
         const pageContext = this.utilitySvc.routeData
         const data = {
@@ -206,7 +201,6 @@ export class RootComponent implements OnInit, AfterViewInit {
   getChildRouteData(snapshot: ActivatedRouteSnapshot, firstChild: ActivatedRouteSnapshot | null) {
     if (firstChild) {
       if (firstChild.data) {
-        // console.log('firstChild.data', firstChild.data)
         this.currentRouteData.push(firstChild.data)
       }
       if (firstChild.firstChild) {
diff --git a/src/app/routes/signup/signup.component.ts b/src/app/routes/signup/signup.component.ts
index fe9d3d9cd..b6da5da5b 100644
--- a/src/app/routes/signup/signup.component.ts
+++ b/src/app/routes/signup/signup.component.ts
@@ -32,7 +32,7 @@ export class SignupComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     // this.unseenCtrlSub = this.signupForm.valueChanges.subscribe(value => {
-    //   console.log('ngOnInit - value', value);
+
     // })
   }
 
diff --git a/src/app/services/init.service.ts b/src/app/services/init.service.ts
index dd7cd2969..82a19caea 100644
--- a/src/app/services/init.service.ts
+++ b/src/app/services/init.service.ts
@@ -314,7 +314,6 @@ export class InitService {
             isManager: false,
           }
           if (completeProdata.rootOrg && completeProdata.rootOrg.isInstitute) {
-            // console.log('inside is institute ---- calling org profile')
             try {
               const orgProfile = await this.http
                 .get<any>(endpoint.orgProfile(completeProdata.rootOrgId))
@@ -327,7 +326,6 @@ export class InitService {
               this.configSvc.unMappedUser.orgProfile = null
             }
           } else {
-            // console.log('outside is institute ---- NOT calling org profile')
             this.configSvc.unMappedUser.orgProfile = null
           }
 
diff --git a/src/app/services/mobile-apps.service.ts b/src/app/services/mobile-apps.service.ts
index 25ceafaa9..3996e6f2a 100644
--- a/src/app/services/mobile-apps.service.ts
+++ b/src/app/services/mobile-apps.service.ts
@@ -123,7 +123,6 @@ export class MobileAppsService {
       if (window.dispatchEventFlag) {
         document.dispatchEvent(new CustomEvent(eventName, { detail: data }))
       } else {
-        // //console.log(eventName, data)
       }
     }
   }
diff --git a/src/mdo-assets/telemetry.min.js b/src/mdo-assets/telemetry.min.js
index 9a9dfa13c..cf0a45450 100644
--- a/src/mdo-assets/telemetry.min.js
+++ b/src/mdo-assets/telemetry.min.js
@@ -3071,14 +3071,12 @@ var TelemetrySyncManager = {
         data: JSON.stringify(telemetryObj),
       })
       .done(function (resp) {
-        // //console.log("Telemetry API success", resp);
       })
       .fail(function (error, textStatus, errorThrown) {
         instance.updateEventStack(telemetryData)
         if (error.status == 403) {
           console.error('Authentication error: ', error)
         } else {
-          //console.log("Error while Telemetry sync to server: ", error);
         }
       })
   },
@@ -3406,7 +3404,6 @@ var Telemetry = (function () {
    */
   instance.init = function (config, contentId, contentVer) {
     if (Telemetry.initialized) {
-      //console.log("Telemetry is already initialized..");
       return
     }
     !config && (config = {})

From 7ba3c4bcffef9e925301179db2c20bdf9aed2507 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Fri, 15 Dec 2023 02:19:19 +0530
Subject: [PATCH 340/887] lint and build issues fixed

---
 .../add-plan-information.component.ts         |   4 +-
 .../components/chip/chip.component.html       |  29 +++--
 .../components/chip/chip.component.ts         |  10 +-
 .../competency-summary.component.ts           |  53 +++++----
 .../user-card/user-card.component.ts          |   1 -
 .../create-assignee.component.ts              |  29 +++--
 .../create-timeline.component.ts              |  11 +-
 .../preview-plan/preview-plan.component.ts    | 112 ++++++++++--------
 8 files changed, 132 insertions(+), 117 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
index 674b896cf..0a61774b8 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
@@ -30,8 +30,8 @@ export class AddPlanInformationComponent implements OnInit {
     })
     this.contentForm.controls['name'].valueChanges.pipe(debounceTime(700)).subscribe((_ele: any) => {
       if (!this.contentForm.invalid) {
-        this.trainingPlanDataSharingSvc.trainingPlanTitle = _ele;
-        this.trainingPlanDataSharingSvc.trainingPlanStepperData.name = _ele;
+        this.trainingPlanDataSharingSvc.trainingPlanTitle = _ele
+        this.trainingPlanDataSharingSvc.trainingPlanStepperData.name = _ele
       }
       this.planTitleInvalid.emit(this.contentForm.invalid)
     })
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
index cd16146e9..f66fd33c4 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
@@ -11,13 +11,15 @@
                 </div>
             </div>
         </ng-container>
-        <a mat-button class="select-more-link margin-left-m" *ngIf="selectContentCount > 3" (click)="navigateToPreviewPage()">+3 more</a>
+        <a mat-button class="select-more-link margin-left-m" *ngIf="selectContentCount > 3"
+            (click)="navigateToPreviewPage()">+3 more</a>
     </div>
     <div class="flex flex-1 flex-row right-section flex-middle">
         <a mat-button class="select-more-link" (click)="clearAll()">Clear all</a>
     </div>
 </div>
-<div class="flex flex-row chip-container" *ngIf="selectAssigneeCount > 0 && from === 'assignee' && trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Designation'">
+<div class="flex flex-row chip-container"
+    *ngIf="selectAssigneeCount > 0 && from === 'assignee' && trainingPlanDataSharingService?.trainingPlanAssigneeData?.category === 'Designation'">
     <div class="flex flex-2 left-section flex-middle">
         <div class="selected-item-label">Selected items - </div>
         <ng-container *ngFor="let item of selectedAssigneeChips | slice : 0 : 3">
@@ -31,26 +33,29 @@
                 </div>
             </div>
         </ng-container>
-        <a mat-button class="select-more-link margin-left-m" *ngIf="selectAssigneeCount > 3" (click)="navigateToPreviewPage()">+3 more</a>
+        <a mat-button class="select-more-link margin-left-m" *ngIf="selectAssigneeCount > 3"
+            (click)="navigateToPreviewPage()">+3 more</a>
     </div>
     <div class="flex flex-1 flex-row right-section flex-middle">
         <a mat-button class="select-more-link" (click)="clearAll()">Clear all</a>
     </div>
 </div>
-<div class="flex flex-row chip-container" *ngIf="selectAssigneeCount > 0 && from === 'assignee' && trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Custom Users'">
+<div class="flex flex-row chip-container"
+    *ngIf="selectAssigneeCount > 0 && from === 'assignee' && trainingPlanDataSharingService?.trainingPlanAssigneeData?.category === 'Custom Users'">
     <div class="flex flex-2 left-section flex-middle">
         <div class="selected-item-label">Selected items - </div>
         <ng-container *ngFor="let item of selectedAssigneeChips | slice : 0 : 3">
-        <div class="chips flex flex-row" *ngIf="item?.selected">
-            <div class="chips-content">
-                <span class="color-60">{{item?.firstName}}</span>                
-            </div>
-            <div class="cross-icon" (click)="removeAssignee(item)">
-                <img class="cursor-pointer" src="assets/icons/close.svg" />
+            <div class="chips flex flex-row" *ngIf="item?.selected">
+                <div class="chips-content">
+                    <span class="color-60">{{item?.firstName}}</span>
+                </div>
+                <div class="cross-icon" (click)="removeAssignee(item)">
+                    <img class="cursor-pointer" src="assets/icons/close.svg" />
+                </div>
             </div>
-        </div>
         </ng-container>
-        <a mat-button class="select-more-link margin-left-m" *ngIf="selectAssigneeCount > 3" (click)="navigateToPreviewPage()">+3 more</a>
+        <a mat-button class="select-more-link margin-left-m" *ngIf="selectAssigneeCount > 3"
+            (click)="navigateToPreviewPage()">+3 more</a>
     </div>
     <div class="flex flex-1 flex-row right-section flex-middle">
         <a mat-button class="select-more-link" (click)="clearAll()">Clear all</a>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
index 640d1293c..70d506d38 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
@@ -14,7 +14,7 @@ export class ChipComponent implements OnInit, OnChanges {
   @Input() selectAssigneeCount = 0
   @Output() itemRemoved = new EventEmitter<any>()
 
-  constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService, private router: Router) { }
+  constructor(public trainingPlanDataSharingService: TrainingPlanDataSharingService, private router: Router) { }
 
   ngOnInit() {
   }
@@ -35,7 +35,6 @@ export class ChipComponent implements OnInit, OnChanges {
     }
     if (this.from === 'assignee') {
       this.selectAssigneeCount = 0
-      console.log('this.trainingPlanDataSharingService.trainingPlanAssigneeData', this.trainingPlanDataSharingService.trainingPlanAssigneeData)
       if (this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Designation') {
         this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
           if (sitem['selected']) {
@@ -70,7 +69,6 @@ export class ChipComponent implements OnInit, OnChanges {
   }
 
   removeAssignee(item: any) {
-    console.log('item', item, this.trainingPlanDataSharingService.trainingPlanAssigneeData)
     if (this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Designation') {
       this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
         if (sitem['selected'] && sitem['id'] === item['id']) {
@@ -78,7 +76,8 @@ export class ChipComponent implements OnInit, OnChanges {
         }
       })
       if (this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.indexOf(item['identifier']) > -1) {
-        let index = this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.findIndex((x: any) => x === item['id'])
+        const index =
+          this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.findIndex((x: any) => x === item['id'])
         this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.splice(index, 1)
       }
     } else if (this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Custom Users') {
@@ -88,7 +87,8 @@ export class ChipComponent implements OnInit, OnChanges {
         }
       })
       if (this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.indexOf(item['identifier']) > -1) {
-        let index = this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.findIndex((x: any) => x === item['userId'])
+        const index =
+          this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.findIndex((x: any) => x === item['userId'])
         this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.splice(index, 1)
       }
     }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
index 8dfd0fe63..7031dce09 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
@@ -57,35 +57,38 @@ export class CompetencySummaryComponent implements OnInit, OnChanges {
       },
     },
     ]
-    this.contentData && this.contentData.map((item: any) => {
-      if (item.selected) {
-        this.selectedCardData.push(item)
-      }
-    })
-
+    if (this.contentData) {
+      this.contentData.map((item: any) => {
+        if (item.selected) {
+          this.selectedCardData.push(item)
+        }
+      })
+    }
     // let competencyThemeObj = {};
 
-    this.selectedCardData && this.selectedCardData.map((sitem: any) => {
-      sitem.competencies_v5.map((fitem: any) => {
-        if (fitem.competencyArea.toLowerCase() === 'behaviroal') {
-          this.competencySummaryObj[0]['behaviroal']['count'] = this.competencySummaryObj[0]['behaviroal']['count'] + 1
+    if (this.selectedCardData) {
+      this.selectedCardData.map((sitem: any) => {
+        sitem.competencies_v5.map((fitem: any) => {
+          if (fitem.competencyArea.toLowerCase() === 'behaviroal') {
+            this.competencySummaryObj[0]['behaviroal']['count'] = this.competencySummaryObj[0]['behaviroal']['count'] + 1
 
-          // competencyThemeObj = this.checkIfThemeNameExists(this.competencySummaryObj['behaviroal']['listData'], fitem);
-          this.competencySummaryObj[0]['behaviroal']['listData'].push(fitem)
-          this.selectedIndex = 0
-        }
-        if (fitem.competencyArea.toLowerCase() === 'functional') {
-          this.competencySummaryObj[1]['functional']['count'] = this.competencySummaryObj[1]['functional']['count'] + 1
-          this.competencySummaryObj[1]['functional']['listData'].push(fitem)
-          this.selectedIndex = 1
-        }
-        if (fitem.competencyArea.toLowerCase() === 'domain') {
-          this.competencySummaryObj[2]['domain']['count'] = this.competencySummaryObj[2]['domain']['count'] + 1
-          this.competencySummaryObj[2]['domain']['listData'].push(fitem)
-          this.selectedIndex = 2
-        }
+            // competencyThemeObj = this.checkIfThemeNameExists(this.competencySummaryObj['behaviroal']['listData'], fitem);
+            this.competencySummaryObj[0]['behaviroal']['listData'].push(fitem)
+            this.selectedIndex = 0
+          }
+          if (fitem.competencyArea.toLowerCase() === 'functional') {
+            this.competencySummaryObj[1]['functional']['count'] = this.competencySummaryObj[1]['functional']['count'] + 1
+            this.competencySummaryObj[1]['functional']['listData'].push(fitem)
+            this.selectedIndex = 1
+          }
+          if (fitem.competencyArea.toLowerCase() === 'domain') {
+            this.competencySummaryObj[2]['domain']['count'] = this.competencySummaryObj[2]['domain']['count'] + 1
+            this.competencySummaryObj[2]['domain']['listData'].push(fitem)
+            this.selectedIndex = 2
+          }
+        })
       })
-    })
+    }
   }
 
   // checkIfThemeNameExists(arr:any, fitem:any):object {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
index 04e13c688..be29a82bc 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
@@ -75,7 +75,6 @@ export class UserCardComponent implements OnInit {
   }
 
   deleteItem(item: any) {
-    console.log('item', item)
     if (this.assigneeData && this.assigneeData.category === 'Designation') {
       this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
         if (sitem.id === item.id) {
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
index 39462d189..f9bd4a97b 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
@@ -52,7 +52,6 @@ export class CreateAssigneeComponent implements OnInit {
       } else if (this.trainingPlanDataSharingService.trainingPlanStepperData &&
         this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Custom Users' &&
         this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo) {
-        console.log('this.trainingPlanDataSharingService.trainingPlanContentData.data.content', this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo)
         this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.content.map((sitem: any) => {
           if (this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.indexOf(sitem.id) > -1) {
             sitem['selected'] = true
@@ -74,22 +73,22 @@ export class CreateAssigneeComponent implements OnInit {
     if (event) {
       if (this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Designation') {
         this.selectedAssigneeChips = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data
-        console.log('this.selectedAssigneeChips', this.selectedAssigneeChips)
-        this.selectedAssigneeChips && this.selectedAssigneeChips.map((sitem: any) => {
-          if (sitem.selected) {
-            this.selectAssigneeCount = this.selectAssigneeCount + 1
-            console.log('this.selectContentCount', this.selectAssigneeCount)
-          }
-        })
+        if (this.selectedAssigneeChips) {
+          this.selectedAssigneeChips.map((sitem: any) => {
+            if (sitem.selected) {
+              this.selectAssigneeCount = this.selectAssigneeCount + 1
+            }
+          })
+        }
       } else if (this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Custom Users') {
         this.selectedAssigneeChips = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.content
-        console.log('this.selectedAssigneeChips', this.selectedAssigneeChips)
-        this.selectedAssigneeChips && this.selectedAssigneeChips.map((sitem: any) => {
-          if (sitem.selected) {
-            this.selectAssigneeCount = this.selectAssigneeCount + 1
-            console.log('this.selectContentCount', this.selectAssigneeCount)
-          }
-        })
+        if (this.selectedAssigneeChips) {
+          this.selectedAssigneeChips.map((sitem: any) => {
+            if (sitem.selected) {
+              this.selectAssigneeCount = this.selectAssigneeCount + 1
+            }
+          })
+        }
       }
 
     }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
index 36deb71a2..95b238e10 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
@@ -35,19 +35,18 @@ export class CreateTimelineComponent implements OnInit {
       this.trainingPlanDataSharingService.trainingPlanAssigneeData.data &&
       this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Custom Users'
     ) {
-      let category = this.trainingPlanDataSharingService.trainingPlanAssigneeData.category
-      let assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.content.filter((item: any) => {
+      const category = this.trainingPlanDataSharingService.trainingPlanAssigneeData.category
+      const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.content.filter((item: any) => {
         return item.selected
       })
-      this.assigneeData = { 'category': category, 'data' : {'content': assigneeData} } ;
+      this.assigneeData = { category, data: { content: assigneeData } }
 
-      console.log('this.assigneeData', this.assigneeData)
     }
   }
 
-  showAll(from:string, tab:string) {
+  showAll(from: string, tab: string) {
     // this.router.navigate(['app', 'training-plan', 'preview-plan'])
-    this.router.navigate(['app', 'training-plan', 'preview-plan'], { queryParams: {from , tab}})
+    this.router.navigate(['app', 'training-plan', 'preview-plan'], { queryParams: { from, tab } })
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
index 8ec03e399..be22e5adf 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
@@ -1,80 +1,90 @@
 import { Component, OnInit } from '@angular/core'
 import { Router, ActivatedRoute } from '@angular/router'
-import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service';
+import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
 @Component({
   selector: 'ws-app-preview-plan',
   templateUrl: './preview-plan.component.html',
   styleUrls: ['./preview-plan.component.scss'],
 })
 export class PreviewPlanComponent implements OnInit {
-  contentData:any = [];
-  assigneeData:any=[];
-  from:any = '';
-  tab:any = '';
-  allContentChips:any = [];
-  selectedTab = '';
-  constructor(private router: Router, private route: ActivatedRoute, private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
+  contentData: any = []
+  assigneeData: any = []
+  from: any = ''
+  tab: any = ''
+  allContentChips: any = []
+  selectedTab = ''
+  constructor(
+    private router: Router,
+    private route: ActivatedRoute,
+    private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
-    this.from = this.route.snapshot.queryParams['from'];
-    this.tab = this.selectedTab =  this.route.snapshot.queryParams['tab'];
-    console.log('from', this.from, this.trainingPlanDataSharingService);
-    if(this.from === 'content') {
-      if( this.trainingPlanDataSharingService.trainingPlanContentData &&
-        this.trainingPlanDataSharingService.trainingPlanContentData.data ) {
-          this.contentData = this.trainingPlanDataSharingService.trainingPlanContentData.data.content.filter((item: any) => {
-            return item.selected
-          })
-        }      
-    } else if(this.from === 'assignee') {
-      let category = this.trainingPlanDataSharingService.trainingPlanAssigneeData.category
-      if(category === 'Designation') {
-        let assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
+    this.from = this.route.snapshot.queryParams['from']
+    this.tab = this.selectedTab = this.route.snapshot.queryParams['tab']
+    if (this.from === 'content') {
+      if (this.trainingPlanDataSharingService.trainingPlanContentData &&
+        this.trainingPlanDataSharingService.trainingPlanContentData.data) {
+        this.contentData = this.trainingPlanDataSharingService.trainingPlanContentData.data.content.filter((item: any) => {
+          return item.selected
+        })
+      }
+    } else if (this.from === 'assignee') {
+      const category = this.trainingPlanDataSharingService.trainingPlanAssigneeData.category
+      if (category === 'Designation') {
+        const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
           return item.selected
         })
-        this.assigneeData = { 'category': category, data: assigneeData }
+        this.assigneeData = { category, data: assigneeData }
       } else if (category === 'Custom Users') {
-        let assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.content.filter((item: any) => {
+        const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.content.filter((item: any) => {
           return item.selected
         })
-        this.assigneeData = { 'category': category, data: { content : assigneeData } }
+        this.assigneeData = { category, data: { content: assigneeData } }
       }
-      
-    } else if(this.from === 'all') {
-      let arr =[];
-      arr.push({name: this.trainingPlanDataSharingService.trainingPlanStepperData.contentType, tab: 'content', selected: (this.tab === 'content'? true: false)});
-      this.allContentChips = arr;
-      arr.push({name: this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentType, tab: 'assignee', selected: (this.tab === 'assignee'? true: false)});
-      this.allContentChips = arr;
-      if(this.trainingPlanDataSharingService.trainingPlanAssigneeData) {
-        let category = this.trainingPlanDataSharingService.trainingPlanAssigneeData.category;
-        if (category === 'Custom Users') {        
-          let assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.content.filter((item: any) => {
+
+    } else if (this.from === 'all') {
+      const arr = []
+      arr.push({
+        name: this.trainingPlanDataSharingService.trainingPlanStepperData.contentType,
+        tab: 'content',
+        selected: (this.tab === 'content' ? true : false),
+      })
+      this.allContentChips = arr
+      arr.push({
+        name: this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentType,
+        tab: 'assignee',
+        selected: (this.tab === 'assignee' ? true : false),
+      })
+      this.allContentChips = arr
+      if (this.trainingPlanDataSharingService.trainingPlanAssigneeData) {
+        const category = this.trainingPlanDataSharingService.trainingPlanAssigneeData.category
+        if (category === 'Custom Users') {
+          const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.content.filter((item: any) => {
             return item.selected
           })
-          this.assigneeData = { 'category': category, data: { content : assigneeData } }
-        } 
-        if(category === 'Designation') {
-          let assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
+          this.assigneeData = { category, data: { content: assigneeData } }
+        }
+        if (category === 'Designation') {
+          const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
             return item.selected
           })
-          this.assigneeData = { 'category': category, data: assigneeData }
+          this.assigneeData = { category, data: assigneeData }
         }
       }
-     
-      if( this.trainingPlanDataSharingService.trainingPlanContentData &&
-        this.trainingPlanDataSharingService.trainingPlanContentData.data ) {
-          this.contentData = this.trainingPlanDataSharingService.trainingPlanContentData.data.content.filter((item: any) => {
-            return item.selected
-          })
-      }  
-      
+
+      if (this.trainingPlanDataSharingService.trainingPlanContentData &&
+        this.trainingPlanDataSharingService.trainingPlanContentData.data) {
+        this.contentData = this.trainingPlanDataSharingService.trainingPlanContentData.data.content.filter((item: any) => {
+          return item.selected
+        })
+      }
+
     }
-    
+
   }
 
   goBack() {
     this.router.navigateByUrl('/app/training-plan/create-plan')
   }
 
-}
\ No newline at end of file
+}

From 8d8d2637aaf362b253e4e8df8426a9067d604f54 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Sun, 17 Dec 2023 15:00:57 +0530
Subject: [PATCH 341/887] ui fixes and function for read plan, publish and
 delete plan api

---
 .../training-plan-dashboard.component.html    |  2 +-
 .../training-plan-dashboard.component.scss    |  2 +-
 .../add-plan-information.component.ts         |  1 +
 .../add-timeline-form.component.html          |  2 +-
 .../breadcrumb/breadcrumb.component.html      |  2 +-
 .../breadcrumb/breadcrumb.component.scss      |  6 +-
 .../components/chip/chip.component.scss       | 12 ++-
 .../components/chip/chip.component.ts         |  4 +-
 .../competency-summary.component.html         |  6 +-
 .../competency-summary.component.ts           | 58 +++++++-----
 .../standard-card.component.scss              |  8 ++
 .../user-card/user-card.component.html        |  2 +-
 .../user-card/user-card.component.ts          |  8 +-
 .../create-assignee.component.scss            |  2 +-
 .../create-assignee.component.ts              |  6 +-
 .../create-content.component.html             |  4 +-
 .../create-content.component.scss             |  2 +-
 .../create-plan/create-plan.component.ts      | 91 ++++++++++++++++++-
 .../create-timeline.component.scss            |  2 +-
 .../create-timeline.component.ts              |  2 +-
 .../preview-plan/preview-plan.component.ts    |  4 +-
 .../services/traininig-plan.service.ts        |  5 +
 .../training-plan.routing.module.ts           |  8 ++
 .../app-nav-bar/app-nav-bar.component.scss    |  2 +-
 24 files changed, 186 insertions(+), 55 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html
index 4a4fe2744..8c264d0ac 100644
--- a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html
@@ -11,7 +11,7 @@
             (click)="filter('live'); tabTelemetry('live', 0)" role="button">Live</a>
           <a routerLinkActive="router-link-active" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'draft',
                                 'ws-mat-accent-border font-medium':currentFilter !== 'draft'}" mat-button
-            (click)="filter('draft'); tabTelemetry('draft', 1)" role="button">Draft</a>
+            (click)="filter('draft'); tabTelemetry('draft', 1)" role="button">Drafts</a>
         </div>
       </div>
       <ng-container class="margin-top-l">
diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.scss b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.scss
index a9d90439f..041153fd2 100644
--- a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.scss
@@ -20,7 +20,7 @@
 
 .create-cbp-btn {
   width: 109px;
-  background: #0075b7 !important;
+  background: rgb(27, 76, 161) !important;
   color: white !important;
   font-family: 'Lato';
   font-weight: 700;
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
index 0a61774b8..404b9a735 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
@@ -28,6 +28,7 @@ export class AddPlanInformationComponent implements OnInit {
         new FormControl((this.trainingPlanDataSharingSvc.trainingPlanTitle) ? this.trainingPlanDataSharingSvc.trainingPlanTitle : '',
                         [Validators.required, Validators.minLength(10)]),
     })
+    
     this.contentForm.controls['name'].valueChanges.pipe(debounceTime(700)).subscribe((_ele: any) => {
       if (!this.contentForm.invalid) {
         this.trainingPlanDataSharingSvc.trainingPlanTitle = _ele
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html
index 3f3ba1d49..bf2352d37 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html
@@ -6,7 +6,7 @@
         <div class="fonm-element-label">Timeline <span class="required"></span></div>
         <div class="calender">
         <mat-form-field appearance="outline">
-            <mat-label>Select date</mat-label>
+            <mat-label>End date</mat-label>
             <input matInput #ref [matDatepicker]="picker" [min]="todayDate" [(ngModel)]="todayDate" (dateChange)="changeTimeline(ref.value)">
             <mat-datepicker-toggle matSuffix [for]="picker">
                 <mat-icon matDatepickerToggleIcon>calendar_today</mat-icon>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
index 145f99833..4fd9a2423 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
@@ -6,7 +6,7 @@
         <!-- <div class="home cursor-pointer" (click)="performRoute('create-plan')">Create CBP Plan
             <img src="/assets/icons/arrow-forward_small.svg" />
         </div> -->
-        <div class="action cursor-pointer">{{(tabType.CREATE_PLAN === selectedTab) ? 'Create a plan' :
+        <div class="action cursor-pointer">{{(tabType.CREATE_PLAN === selectedTab) ? 'Create CBP plan' :
             (tabType.ADD_CONTENT === selectedTab) ? 'Add content' : (tabType.ADD_ASSIGNEE === selectedTab) ? 'Add
             assignee' : (tabType.ADD_TIMELINE === selectedTab) ? 'Add timeline' : ''}}
         </div>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.scss b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.scss
index 8a9f35371..e5740f464 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.scss
@@ -26,15 +26,15 @@
 }
 
 .cancel {
-    color: #0075B7 !important;
-    border: 1px solid #0075B7;
+    color: #1b4ca1 !important;
+    border: 1px solid #1b4ca1;
     border-radius: 4px;
     width: 174px;
 }
 
 
 .next-btn {
-    background: #0075B7 !important;
+    background: #1b4ca1 !important;
     color: white !important;
     font-family: 'Lato';
     font-weight: 700;
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.scss b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.scss
index bab256949..e1dfe5b6b 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.scss
@@ -3,19 +3,25 @@
     width: 178px;
     border: 1px solid rgba(0, 0, 0, 0.16);
     margin-left: 12px;
+    align-items: center;
 }
 
 .chips-content {
-    margin: 12px 16px;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
     vertical-align: middle;
+    padding-top: 10px;
+    padding-bottom: 10px;
+    padding-left: 16px;
+    width: 131px;
 }
 
 .cross-icon {
     vertical-align: middle;
-    margin: 12px 16px;
+    margin-left: 0;
+    margin-right: 16px;
+    margin-top: 6px;
 }
 .chip-container {
     margin-top:20px;
@@ -35,7 +41,7 @@
 }
 
 .select-more-link {
-    color: #0075B7 !important;
+    color: #1b4ca1 !important;
     font-weight: 700;
     letter-spacing: 0.25px;
     font-family: 'Lato';
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
index 70d506d38..9df8a7e35 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
@@ -42,7 +42,7 @@ export class ChipComponent implements OnInit, OnChanges {
           }
         })
       } else if (this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Custom Users') {
-        this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.content.map((sitem: any) => {
+        this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
           if (sitem['selected']) {
             sitem['selected'] = false
           }
@@ -81,7 +81,7 @@ export class ChipComponent implements OnInit, OnChanges {
         this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.splice(index, 1)
       }
     } else if (this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Custom Users') {
-      this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.content.map((sitem: any) => {
+      this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
         if (sitem['selected'] && sitem['userId'] === item['userId']) {
           sitem['selected'] = false
         }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.html b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.html
index e52c28e66..d83a5adfd 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.html
@@ -74,7 +74,7 @@
     <div class="competency-tabs">
         <mat-tab-group [selectedIndex]="selectedIndex" class="margin-top-m" >
             <ng-container *ngFor="let item of competencySummaryObj">
-            <mat-tab>
+            <mat-tab [disabled]="!(item[item?.title]['count'])">
                 <ng-template mat-tab-label>
                     {{item?.title | titlecase}} ({{item[item?.title]['count']}}) 
                 </ng-template>
@@ -85,12 +85,12 @@
                             {{sitem?.competencyTheme}}
                         </div>
                         <div>
-                            (1)
+                           <span *ngIf="sitem?.count">({{sitem?.count}})</span> 
                         </div>
                     </div>
                     </ng-container>
                     <ng-container *ngIf="!(item[item?.title]['listData'].length)">
-                        <div class="default-tab-content">There are no competency added yet</div>
+                        <div class="default-tab-content">There are no competency added yet.</div>
                     </ng-container>
                 </ng-template>
             </mat-tab>        
diff --git a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
index 7031dce09..87debcb84 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
@@ -10,8 +10,8 @@ export class CompetencySummaryComponent implements OnInit, OnChanges {
   @Input() selectContentCount: any
   selectedCardData: any[] = []
   competencySummaryObj: any = [{
-    title: 'behaviroal',
-    behaviroal: {
+    title: 'behavioural',
+    behavioural: {
       listData: [],
       count: 0,
     },
@@ -38,8 +38,8 @@ export class CompetencySummaryComponent implements OnInit, OnChanges {
   ngOnChanges() {
     this.selectedCardData = []
     this.competencySummaryObj = [{
-      title: 'behaviroal',
-      behaviroal: {
+      title: 'behavioural',
+      behavioural: {
         listData: [],
         count: 0,
       },
@@ -67,23 +67,35 @@ export class CompetencySummaryComponent implements OnInit, OnChanges {
     // let competencyThemeObj = {};
 
     if (this.selectedCardData) {
+      let fObj = {"competencyTheme": '', count: 0};
       this.selectedCardData.map((sitem: any) => {
         sitem.competencies_v5.map((fitem: any) => {
-          if (fitem.competencyArea.toLowerCase() === 'behaviroal') {
-            this.competencySummaryObj[0]['behaviroal']['count'] = this.competencySummaryObj[0]['behaviroal']['count'] + 1
-
-            // competencyThemeObj = this.checkIfThemeNameExists(this.competencySummaryObj['behaviroal']['listData'], fitem);
-            this.competencySummaryObj[0]['behaviroal']['listData'].push(fitem)
+          if (fitem.competencyArea.toLowerCase() === 'behavioural') {
+            this.competencySummaryObj[0]['behavioural']['count'] = this.competencySummaryObj[0]['behavioural']['count'] + 1
+            let result = this.checkIfThemeNameExists(this.competencySummaryObj[0]['behavioural']['listData'], fitem);
+            fObj = {"competencyTheme": fitem.competencyTheme, count: 1};
+            if(result) {
+              this.competencySummaryObj[0]['behavioural']['count'] = this.competencySummaryObj[0]['behavioural']['count'] + 1;
+              this.competencySummaryObj[0]['behavioural']['listData'].push(fObj)
+            }
             this.selectedIndex = 0
           }
-          if (fitem.competencyArea.toLowerCase() === 'functional') {
-            this.competencySummaryObj[1]['functional']['count'] = this.competencySummaryObj[1]['functional']['count'] + 1
-            this.competencySummaryObj[1]['functional']['listData'].push(fitem)
+          if (fitem.competencyArea.toLowerCase() === 'functional') {            
+            let result = this.checkIfThemeNameExists(this.competencySummaryObj[1]['functional']['listData'], fitem);
+            fObj = {"competencyTheme": fitem.competencyTheme, count: 1};
+            if(result) {
+              this.competencySummaryObj[1]['functional']['count'] = this.competencySummaryObj[1]['functional']['count'] + 1;
+              this.competencySummaryObj[1]['functional']['listData'].push(fObj)
+            }
             this.selectedIndex = 1
           }
           if (fitem.competencyArea.toLowerCase() === 'domain') {
-            this.competencySummaryObj[2]['domain']['count'] = this.competencySummaryObj[2]['domain']['count'] + 1
-            this.competencySummaryObj[2]['domain']['listData'].push(fitem)
+            let result = this.checkIfThemeNameExists(this.competencySummaryObj[2]['domain']['listData'], fitem);
+            fObj = {"competencyTheme": fitem.competencyTheme, count: 1};
+            if(result) {
+              this.competencySummaryObj[2]['domain']['count'] = this.competencySummaryObj[2]['domain']['count'] + 1;
+              this.competencySummaryObj[2]['domain']['listData'].push(fObj)
+            }
             this.selectedIndex = 2
           }
         })
@@ -91,13 +103,17 @@ export class CompetencySummaryComponent implements OnInit, OnChanges {
     }
   }
 
-  // checkIfThemeNameExists(arr:any, fitem:any):object {
-  //   arr.map((sitem:any)=>{
-  //     if(sitem.competencyTheme === fitem.competencyTheme) {
 
-  //     }
-  //   })
-  //   return {"themeName": "", "themeCount": 0};
-  // }
+
+  checkIfThemeNameExists(arr:any, fitem:any):boolean {
+    let flag = true;
+    arr.map((sitem:any)=>{
+      if(sitem.competencyTheme === fitem.competencyTheme) {
+        sitem['count'] = sitem['count']+1;
+        flag = false;
+      }
+    })
+    return flag;
+  }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
index bb8b20471..ac75e8815 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
@@ -556,4 +556,12 @@ $title-line-count: 2;
 .active-card {
   border: 1px solid #1B4CA1 !important;
   border-radius: 8px;
+}
+
+::ng-deep .mat-checkbox-checked:not(.mat-checkbox-disabled).mat-accent .mat-ripple-element, ::ng-deep .mat-checkbox:active:not(.mat-checkbox-disabled).mat-accent .mat-ripple-element {
+  background: #1b4ca1 !important;
+}
+
+::ng-deep .mat-checkbox-indeterminate.mat-accent .mat-checkbox-background, ::ng-deep .mat-checkbox-checked.mat-accent .mat-checkbox-background {
+  background: #1b4ca1 !important;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
index 63772f0d2..2741ad7df 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
@@ -1,5 +1,5 @@
 <div class="flex flex-4 flex-row assignee-card-container flex-wrap" *ngIf="assigneeData?.category === 'Custom Users'">
-    <ng-container *ngFor="let item of assigneeData?.data?.content | slice : 0 : 20">
+    <ng-container *ngFor="let item of assigneeData?.data | slice : 0 : 20">
         <div class="flex flex-4 assignee-card" [ngClass]="item?.selected ? 'active-card':''"
             [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
             <div class="avatar">
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
index be29a82bc..46cc3070d 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
@@ -31,11 +31,11 @@ export class UserCardComponent implements OnInit {
         }
       }
       if (this.assigneeData && this.assigneeData.category === 'Custom Users') {
-        this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.content.map((sitem: any, index: any) => {
+        this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any, index: any) => {
           if (sitem.userId === item.userId) {
             sitem['selected'] = true
-            this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.content.splice(index, 1)
-            this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.content.unshift(sitem)
+            this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.splice(index, 1)
+            this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.unshift(sitem)
           }
         })
         if (this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo']) {
@@ -58,7 +58,7 @@ export class UserCardComponent implements OnInit {
         })
       }
       if (this.assigneeData && this.assigneeData.category === 'Custom Users') {
-        this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.content.map((sitem: any) => {
+        this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
           if (sitem.userId === item.userId) {
             sitem['selected'] = false
           }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.scss b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.scss
index 3464a9887..0b7b50228 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.scss
@@ -15,7 +15,7 @@
 
 .create-btn {
   width: auto;
-  background: #0075B7 !important;
+  background: #1b4ca1 !important;
   color: white !important;
   font-family: 'Lato';
   font-weight: 700;
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
index f9bd4a97b..96810d78d 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
@@ -52,8 +52,8 @@ export class CreateAssigneeComponent implements OnInit {
       } else if (this.trainingPlanDataSharingService.trainingPlanStepperData &&
         this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Custom Users' &&
         this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo) {
-        this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.content.map((sitem: any) => {
-          if (this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.indexOf(sitem.id) > -1) {
+        this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
+          if (this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.indexOf(sitem.userId) > -1) {
             sitem['selected'] = true
           }
         })
@@ -81,7 +81,7 @@ export class CreateAssigneeComponent implements OnInit {
           })
         }
       } else if (this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Custom Users') {
-        this.selectedAssigneeChips = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.content
+        this.selectedAssigneeChips = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data;
         if (this.selectedAssigneeChips) {
           this.selectedAssigneeChips.map((sitem: any) => {
             if (sitem.selected) {
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
index 10cb5ac1d..44f2af16e 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
@@ -3,7 +3,7 @@
 </ng-container>
 
 <ng-container>
-    <div class="flex flex-row" *ngIf="contentData.length > 0">
+    <div class="flex flex-row" *ngIf="contentData?.length > 0">
         <div class="flex-1">
             <ws-app-chip [selectedContentChips]="selectedContentChips" [from]="from"
                 [selectContentCount]="selectContentCount" (itemRemoved)="itemsRemovedFromChip()"></ws-app-chip>
@@ -15,7 +15,7 @@
                 [selectContentCount]="selectContentCount"></ws-app-competency-summary>
         </div>
     </div>
-    <div class="no-cbp-data margin-top-xl margin-bottom-xl" *ngIf="contentData.length === 0">
+    <div class="no-cbp-data margin-top-xl margin-bottom-xl" *ngIf="contentData?.length === 0">
         <div><img src="/assets/icons/no-data.svg"></div>
         <div class="mat-subheading-1 margin-remove">No content avaliable.</div>
         <!-- <div>Create a content in CBP portal to get the contents.</div> -->
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.scss b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.scss
index 3464a9887..0b7b50228 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.scss
@@ -15,7 +15,7 @@
 
 .create-btn {
   width: auto;
-  background: #0075B7 !important;
+  background: #1b4ca1 !important;
   color: white !important;
   font-family: 'Lato';
   font-weight: 700;
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
index b463367bb..ce94e4da4 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
@@ -1,5 +1,8 @@
 
 import { AfterViewInit, Component, OnDestroy, OnInit } from '@angular/core'
+import { ActivatedRoute } from '@angular/router'
+import { TrainingPlanService } from '../../services/traininig-plan.service';
+import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service';
 /* tslint:disable */
 import _ from 'lodash'
 /* tslint:enable */
@@ -14,13 +17,97 @@ export class CreatePlanComponent implements OnInit, AfterViewInit, OnDestroy {
   selectedTabData = 'createPlan'
   nextTab = ''
   createCheck: any
-
-  constructor() {
+  planId:string = '';
+  constructor(private route: ActivatedRoute, private trainingPlanService: TrainingPlanService,
+    private trainingPlanDataSharingService: TrainingPlanDataSharingService) {
   }
   ngOnDestroy() {
 
   }
   ngOnInit() {
+    console.log("this.route", this.route, this.trainingPlanService);
+    this.route.params.subscribe(params => {
+      console.log('parans', params);
+      this.planId = params['planId'];
+      // let response  = {
+      //   "id": "api.cbplan.read.byId",
+      //   "ver": "1.0",
+      //   "ts": "2023-12-04T05:53:32.031Z",
+      //   "params": {
+      //       "resmsgid": "749690f0-9269-11ee-80e8-4dda841c8af0",
+      //       "msgid": "74879cd0-9269-11ee-82b8-cfe1f59faeaf",
+      //       "status": "successful",
+      //       "err": null,
+      //       "errmsg": null
+      //   },
+      //   "responseCode": "OK",
+      //   "result": {
+      //       "content": {
+      //           "id": 1,
+      //           "name": "CBP Plan Name",
+      //           "description": "CBP Plan Description",
+      //           "contentList": [
+      //               {
+      //                   "identifier" : "doId1",
+      //                   "name": "Course Name 1",
+      //                   "description" : "Description",
+      //                   "avgRating": 4.0,
+      //                   "competencies_v5" : []
+      //               },
+      //               {
+      //                   "identifier" : "doId2",
+      //                   "name": "Course Name 2",
+      //                   "description" : "Description",
+      //                   "avgRating": 4.0,
+      //                   "competencies_v5" : []
+      //               }
+      //           ],
+      //           "userType": "custom",
+      //           "userDetails": [
+      //               {
+      //                   "userId": "userId1",
+      //                   "firstName": "User Name"
+      //               },
+      //               {
+      //                   "userId": "userId2",
+      //                   "firstName" : "User Name"
+      //               }
+      //           ],
+      //           "endDate": "2023-12-14T10:00:00",
+      //           "status": "Draft",
+      //           "createdBy" : "adminUserId",
+      //           "createdAt" : "timeStamp"
+      //       }
+      //   }
+      // };
+        
+
+      this.trainingPlanService.readPlan(this.planId).subscribe((response:any)=>{
+        console.log('read data', response );
+        if(response && response.result && response.result.content) {
+          console.log('trainingPlanDataSharingService', this.trainingPlanDataSharingService);
+          this.trainingPlanDataSharingService.trainingPlanTitle = response.result.content.name;
+          this.trainingPlanDataSharingService.trainingPlanContentData = {data: {content : response.result.content.contentList}};
+          if(this.trainingPlanDataSharingService.trainingPlanAssigneeData) {
+            if(response.result.content.userType === 'custom') {
+              this.trainingPlanDataSharingService.trainingPlanAssigneeData['category'] = 'Custom Users';
+            } else {
+              this.trainingPlanDataSharingService.trainingPlanAssigneeData['category'] = response.result.content.userType;
+            }
+            
+          }
+          
+          if(response.result.content.userType === 'custom') {
+            this.trainingPlanDataSharingService.trainingPlanAssigneeData = {data:{content : response.result.content.userDetails}}
+          } else {            
+            this.trainingPlanDataSharingService.trainingPlanAssigneeData = response.result.content.userDetails;
+          }
+          
+          this.trainingPlanDataSharingService.trainingPlanStepperData['endDate'] = response.result.content.endDate;
+          this.trainingPlanDataSharingService.trainingPlanStepperData['status'] = response.result.content.status;
+        }
+      })
+    });
   }
 
   ngAfterViewInit() {
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.scss b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.scss
index 351003608..6cbf52325 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.scss
@@ -1,3 +1,3 @@
 .show-all {
-    color: #0075B7 !important;
+    color: #1b4ca1 !important;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
index 95b238e10..60b894912 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
@@ -36,7 +36,7 @@ export class CreateTimelineComponent implements OnInit {
       this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Custom Users'
     ) {
       const category = this.trainingPlanDataSharingService.trainingPlanAssigneeData.category
-      const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.content.filter((item: any) => {
+      const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
         return item.selected
       })
       this.assigneeData = { category, data: { content: assigneeData } }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
index be22e5adf..cf3ec19d1 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
@@ -36,7 +36,7 @@ export class PreviewPlanComponent implements OnInit {
         })
         this.assigneeData = { category, data: assigneeData }
       } else if (category === 'Custom Users') {
-        const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.content.filter((item: any) => {
+        const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
           return item.selected
         })
         this.assigneeData = { category, data: { content: assigneeData } }
@@ -59,7 +59,7 @@ export class PreviewPlanComponent implements OnInit {
       if (this.trainingPlanDataSharingService.trainingPlanAssigneeData) {
         const category = this.trainingPlanDataSharingService.trainingPlanAssigneeData.category
         if (category === 'Custom Users') {
-          const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.content.filter((item: any) => {
+          const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
             return item.selected
           })
           this.assigneeData = { category, data: { content: assigneeData } }
diff --git a/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts b/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
index ecc4f0359..af859562a 100644
--- a/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
+++ b/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
@@ -8,6 +8,7 @@ import _ from 'lodash'
 
 const API_END_POINTS = {
   CREATE_PLAN: 'apis/proxies/v8/cbplan/v1/create',
+  READ_PLAN:'apis/proxies/v8/cbplan/v1/read/',
   UPDATE_PLAN: 'apis/proxies/v8/cbplan/v1/update',
   GET_ALL_CONTENT: '/apis/proxies/v8/sunbirdigot/search',
   GET_ALL_USERS: '/apis/proxies/v8/user/v1/search',
@@ -25,6 +26,10 @@ export class TrainingPlanService {
     return this.http.post<any>(`${API_END_POINTS.CREATE_PLAN}`, obj).pipe(map(res => _.get(res, 'result')))
   }
 
+  readPlan(planId:any) {
+    return this.http.get<any>(API_END_POINTS.GET_ALL_DESIGNATIONS+`/${planId}`);
+  }
+
   updatePlan() {
 
   }
diff --git a/project/ws/app/src/lib/routes/training-plan/training-plan.routing.module.ts b/project/ws/app/src/lib/routes/training-plan/training-plan.routing.module.ts
index fed48982e..6de84cc4a 100644
--- a/project/ws/app/src/lib/routes/training-plan/training-plan.routing.module.ts
+++ b/project/ws/app/src/lib/routes/training-plan/training-plan.routing.module.ts
@@ -26,6 +26,14 @@ const routes: Routes = [
           module: 'Create Plan',
         },
       },
+      {
+        path: 'update-plan/:planId',
+        component: CreatePlanComponent,
+        data: {
+          pageId: 'update-plan',
+          module: 'Create Plan',
+        },
+      },
       {
         path: 'preview-plan',
         component: PreviewPlanComponent,
diff --git a/src/app/component/app-nav-bar/app-nav-bar.component.scss b/src/app/component/app-nav-bar/app-nav-bar.component.scss
index 55d88e466..ca784e8f0 100644
--- a/src/app/component/app-nav-bar/app-nav-bar.component.scss
+++ b/src/app/component/app-nav-bar/app-nav-bar.component.scss
@@ -174,7 +174,7 @@
 
 .vertical-seperator {
   border-left: 1px solid rgb(0,0,0,0.16);
-  margin-right: 16px;
+  margin: 16px 16px 16px 0;
 }
 // @media
 // 760px

From 0f1ad2ddc29a55cfd9e7dd02eea580321ef37a40 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Sun, 17 Dec 2023 15:11:35 +0530
Subject: [PATCH 342/887] ui fixes and function for read plan, publish and
 delete plan api

---
 .../create-plan/create-plan.component.ts      | 52 ++++++++++++++-----
 .../services/traininig-plan.service.ts        | 15 +++++-
 2 files changed, 52 insertions(+), 15 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
index ce94e4da4..0bac9f11f 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
@@ -17,7 +17,7 @@ export class CreatePlanComponent implements OnInit, AfterViewInit, OnDestroy {
   selectedTabData = 'createPlan'
   nextTab = ''
   createCheck: any
-  planId:string = '';
+  planId: string = '';
   constructor(private route: ActivatedRoute, private trainingPlanService: TrainingPlanService,
     private trainingPlanDataSharingService: TrainingPlanDataSharingService) {
   }
@@ -80,29 +80,29 @@ export class CreatePlanComponent implements OnInit, AfterViewInit, OnDestroy {
       //       }
       //   }
       // };
-        
 
-      this.trainingPlanService.readPlan(this.planId).subscribe((response:any)=>{
-        console.log('read data', response );
-        if(response && response.result && response.result.content) {
+
+      this.trainingPlanService.readPlan(this.planId).subscribe((response: any) => {
+        console.log('read data', response);
+        if (response && response.result && response.result.content) {
           console.log('trainingPlanDataSharingService', this.trainingPlanDataSharingService);
           this.trainingPlanDataSharingService.trainingPlanTitle = response.result.content.name;
-          this.trainingPlanDataSharingService.trainingPlanContentData = {data: {content : response.result.content.contentList}};
-          if(this.trainingPlanDataSharingService.trainingPlanAssigneeData) {
-            if(response.result.content.userType === 'custom') {
+          this.trainingPlanDataSharingService.trainingPlanContentData = { data: { content: response.result.content.contentList } };
+          if (this.trainingPlanDataSharingService.trainingPlanAssigneeData) {
+            if (response.result.content.userType === 'custom') {
               this.trainingPlanDataSharingService.trainingPlanAssigneeData['category'] = 'Custom Users';
             } else {
               this.trainingPlanDataSharingService.trainingPlanAssigneeData['category'] = response.result.content.userType;
             }
-            
+
           }
-          
-          if(response.result.content.userType === 'custom') {
-            this.trainingPlanDataSharingService.trainingPlanAssigneeData = {data:{content : response.result.content.userDetails}}
-          } else {            
+
+          if (response.result.content.userType === 'custom') {
+            this.trainingPlanDataSharingService.trainingPlanAssigneeData = { data: { content: response.result.content.userDetails } }
+          } else {
             this.trainingPlanDataSharingService.trainingPlanAssigneeData = response.result.content.userDetails;
           }
-          
+
           this.trainingPlanDataSharingService.trainingPlanStepperData['endDate'] = response.result.content.endDate;
           this.trainingPlanDataSharingService.trainingPlanStepperData['status'] = response.result.content.status;
         }
@@ -142,4 +142,28 @@ export class CreatePlanComponent implements OnInit, AfterViewInit, OnDestroy {
       addAssigneeIsInvalid: _event,
     }
   }
+
+  archivePlan() {
+    let obj = {
+      "request": {
+        "id": this.planId,
+        "comment": ""
+      }
+    }
+    this.trainingPlanService.archivePlan(obj).subscribe((data: any) => {
+      console.log('data', data);
+    })
+  }
+
+  publishPlan() {
+    let obj = {
+      "request": {
+        "id": this.planId,
+        "comment": ""
+      }
+    }
+    this.trainingPlanService.publishPlan(obj).subscribe((data: any) => {
+      console.log('data', data);
+    })
+  }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts b/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
index af859562a..3bb1605e8 100644
--- a/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
+++ b/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
@@ -10,9 +10,12 @@ const API_END_POINTS = {
   CREATE_PLAN: 'apis/proxies/v8/cbplan/v1/create',
   READ_PLAN:'apis/proxies/v8/cbplan/v1/read/',
   UPDATE_PLAN: 'apis/proxies/v8/cbplan/v1/update',
+  ARCHIVE_PLAN: 'apis/proxies/v8/cbplan/v1/archive',
+  PUBLISH_PLAN: 'apis/proxies/v8/cbplan/v1/publish',
   GET_ALL_CONTENT: '/apis/proxies/v8/sunbirdigot/search',
   GET_ALL_USERS: '/apis/proxies/v8/user/v1/search',
   GET_ALL_DESIGNATIONS: '/apis/proxies/v8/user/v1/positions',
+
 }
 @Injectable({
   providedIn: 'root',
@@ -30,8 +33,16 @@ export class TrainingPlanService {
     return this.http.get<any>(API_END_POINTS.GET_ALL_DESIGNATIONS+`/${planId}`);
   }
 
-  updatePlan() {
+  updatePlan(obj:any) {
+    return this.http.post<any>(`${API_END_POINTS.UPDATE_PLAN}`, obj).pipe(map(res => _.get(res, 'result')))
+  }
+
+  archivePlan(obj:any) {
+    return this.http.post<any>(`${API_END_POINTS.ARCHIVE_PLAN}`, obj).pipe(map(res => _.get(res, 'result')))
+  }
 
+  publishPlan(obj:any) {
+    return this.http.post<any>(`${API_END_POINTS.PUBLISH_PLAN}`, obj).pipe(map(res => _.get(res, 'result')))
   }
 
   getAllContent(filter: object): Observable<any> {
@@ -45,4 +56,6 @@ export class TrainingPlanService {
   getDesignations() {
     return this.http.get<any>(API_END_POINTS.GET_ALL_DESIGNATIONS)
   }
+
+
 }

From e9a5bea31045ef695ce23d749ee2002d820d0e45 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Sun, 17 Dec 2023 16:12:53 +0530
Subject: [PATCH 343/887] update for pagination for add content and assignee

---
 .../standard-card.component.html              |  6 ++++-
 .../standard-card/standard-card.component.ts  | 25 +++++++++++++++--
 .../user-card/user-card.component.html        |  9 +++++--
 .../user-card/user-card.component.ts          | 27 +++++++++++++++++--
 4 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
index a112de743..2da25c4ec 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
@@ -1,6 +1,6 @@
 <ng-container>
     <div class="flex flex-3 flex-row card-grid-container flex-wrap">
-        <div  class="flex course-card margin-right-xl" *ngFor="let item of contentData">
+        <div  class="flex course-card margin-right-xl" *ngFor="let item of contentData | slice : startIndex : lastIndex">
             <mat-card [ngClass]="item?.selected ? 'active-card':''" class="card-standard-container mr-5 padding-remove">
                 <mat-card-content class="min-top">
                     <div style="position: relative; z-index: 1;">
@@ -50,5 +50,9 @@
                 </mat-card-content>
             </mat-card>
         </div>
+        
+    </div>
+    <div class="flex flex-row justify-center">
+        <mat-paginator [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 100]" [length]="contentData?.length" (page)="onChangePage($event)"></mat-paginator>
     </div>
 </ng-container>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
index 5faf78c16..e6fb220ea 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
@@ -1,4 +1,5 @@
-import { Component, EventEmitter, Input, Output, OnInit, OnChanges } from '@angular/core'
+import { Component, EventEmitter, Input, Output, OnInit, OnChanges, ChangeDetectorRef, ViewChild } from '@angular/core'
+import { MatTableDataSource, MatPaginator, PageEvent } from '@angular/material';
 import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
 @Component({
   selector: 'ws-app-standard-card',
@@ -11,13 +12,33 @@ export class StandardCardComponent implements OnInit, OnChanges {
   @Input() contentData: any[] = []
   @Input() showDeleteFlag = false
   @Output() handleSelectedChips = new EventEmitter()
+  @ViewChild(MatPaginator, {static: false}) paginator: MatPaginator | any;
+  dataSource:any;
   selectedContent: any[] = []
-  constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
+  startIndex= 0;
+  lastIndex = 10; 
+  pageSize = 10;
+  constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService, private changeDetectorRef:ChangeDetectorRef ) { }
 
   ngOnInit() {
+    
   }
 
   ngOnChanges() {
+    this.changeDetectorRef.detectChanges();
+    console.log('this.contentData',this.contentData)
+    this.dataSource= new MatTableDataSource<any>(this.contentData);
+    this.dataSource.paginator = this.paginator;
+    console.log('this.dataSource', this.dataSource);
+  }
+
+  onChangePage(pe:PageEvent) {
+    console.log(pe.pageIndex);
+    console.log(pe.pageSize);
+    this.startIndex = pe.pageIndex* pe.pageSize;
+    this.lastIndex =(pe.pageIndex+1)*pe.pageSize ;
+    
+    // this.startIndex = this.pageIndex
   }
 
   selectContentItem(event: any, item: any) {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
index 2741ad7df..897afd8f4 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
@@ -1,5 +1,5 @@
 <div class="flex flex-4 flex-row assignee-card-container flex-wrap" *ngIf="assigneeData?.category === 'Custom Users'">
-    <ng-container *ngFor="let item of assigneeData?.data | slice : 0 : 20">
+    <ng-container *ngFor="let item of assigneeData?.data | slice : startIndex : lastIndex">
         <div class="flex flex-4 assignee-card" [ngClass]="item?.selected ? 'active-card':''"
             [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
             <div class="avatar">
@@ -22,10 +22,11 @@
     </ng-container>
 </div>
 
+
 <!-- Custom User Card-->
 
 <div class="flex flex-4 flex-row custom-user-card-container flex-wrap" *ngIf="assigneeData?.category === 'Designation'">
-    <ng-container *ngFor="let item of assigneeData?.data | slice : 0 : 20">
+    <ng-container *ngFor="let item of assigneeData?.data | slice : startIndex : lastIndex">
         <div class="flex flex-4 custom-user-card" [ngClass]="item?.selected ? 'active-card':''">
             <div class="card-cross-icon" *ngIf="showDeleteFlag">
                 <button mat-mini-fab class="card-cross-btn" type="button" (click)="deleteItem(item)">
@@ -42,4 +43,8 @@
             </div>
         </div>
     </ng-container>
+</div>
+
+<div class="flex flex-row justify-center" *ngIf="assigneeData?.category === 'Custom Users' || assigneeData?.category === 'Designation'">
+    <mat-paginator [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 100]" [length]="contentData?.length" (page)="onChangePage($event)"></mat-paginator>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
index 46cc3070d..d76b13749 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
@@ -1,4 +1,5 @@
-import { Component, EventEmitter, Input, Output, OnInit } from '@angular/core'
+import { Component, EventEmitter, Input, Output, OnInit, OnChanges, ChangeDetectorRef, ViewChild } from '@angular/core'
+import { MatTableDataSource, MatPaginator, PageEvent } from '@angular/material';
 import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
 @Component({
   selector: 'ws-app-user-card',
@@ -10,11 +11,33 @@ export class UserCardComponent implements OnInit {
   @Input() showDeleteFlag = false
   @Input() assigneeData: any
   @Output() handleSelectedChips = new EventEmitter()
-  constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
+  @ViewChild(MatPaginator, {static: false}) paginator: MatPaginator | any;
+  dataSource:any;
+  startIndex= 0;
+  lastIndex = 10; 
+  pageSize = 10;
+  constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService, private changeDetectorRef:ChangeDetectorRef) { }
 
   ngOnInit() {
   }
 
+  ngOnChanges() {
+    this.changeDetectorRef.detectChanges();
+    console.log('this.contentData',this.assigneeData)
+    this.dataSource= new MatTableDataSource<any>(this.assigneeData.data);
+    this.dataSource.paginator = this.paginator;
+    console.log('this.dataSource', this.dataSource);
+  }
+
+  onChangePage(pe:PageEvent) {
+    console.log(pe.pageIndex);
+    console.log(pe.pageSize);
+    this.startIndex = pe.pageIndex* pe.pageSize;
+    this.lastIndex =(pe.pageIndex+1)*pe.pageSize ;
+    
+    // this.startIndex = this.pageIndex
+  }
+
   selectAssigneeItem(event: any, item: any) {
     if (event.checked) {
       // this.selectedContent.push(item);

From 547a16daa059fec9d9b472462443c00c4f0d85d0 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Mon, 18 Dec 2023 13:31:22 +0530
Subject: [PATCH 344/887] add condition for apply filter , update api for
 designation and read api correction

---
 .../components/chip/chip.component.html       |  1 +
 .../components/search/search.component.html   |  3 +-
 .../components/search/search.component.ts     |  7 ++-
 .../user-card/user-card.component.ts          | 16 +++---
 .../create-assignee.component.ts              |  2 +-
 .../create-plan/create-plan.component.ts      | 55 -------------------
 .../services/traininig-plan.service.ts        |  4 +-
 7 files changed, 18 insertions(+), 70 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
index f66fd33c4..ed9ead207 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
@@ -18,6 +18,7 @@
         <a mat-button class="select-more-link" (click)="clearAll()">Clear all</a>
     </div>
 </div>
+hi {{selectAssigneeCount}}, {{trainingPlanDataSharingService?.trainingPlanAssigneeData?.category}}
 <div class="flex flex-row chip-container"
     *ngIf="selectAssigneeCount > 0 && from === 'assignee' && trainingPlanDataSharingService?.trainingPlanAssigneeData?.category === 'Designation'">
     <div class="flex flex-2 left-section flex-middle">
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
index b1f682f6b..e9f4c1fb3 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
@@ -10,7 +10,8 @@
             <input class="sinput color-60" label="" placeholder="Select" type="Standard">
         </div>
     </div>
-    <div class="filter-section" (click)="openFilter()">
+    <div class="filter-section" *ngIf="!(trainingPlanDataSharingService?.trainingPlanAssigneeData?.category === 'Designation' || 
+    trainingPlanDataSharingService?.trainingPlanAssigneeData?.category === 'All Users')" (click)="openFilter()">
         <img src="/assets/icons/filter.svg" />
         <span>Apply Filters</span>
     </div>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 29feebb8f..4dadfc6aa 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -139,14 +139,15 @@ export class SearchComponent implements OnInit {
     })
   }
 
-  getAllUsers(_event: any) {
-    this.trainingPlanDataSharingService.trainingPlanAssigneeData = { category: _event, data: [] }
+  getAllUsers(event: any) {
+    this.trainingPlanDataSharingService.trainingPlanAssigneeData = { category: event, data: [] }
     this.handleApiData.emit(true)
   }
 
   getDesignations(event: any) {
     this.trainingPlanService.getDesignations().subscribe((res: any) => {
-      this.trainingPlanDataSharingService.trainingPlanAssigneeData = { category: event, data: res.responseData }
+      console.log('res', res)
+      this.trainingPlanDataSharingService.trainingPlanAssigneeData = { category: event, data: res.result.response.content }
       this.handleApiData.emit(true)
     })
   }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
index d76b13749..e582c18f9 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
@@ -6,7 +6,7 @@ import { TrainingPlanDataSharingService } from '../../services/training-plan-dat
   templateUrl: './user-card.component.html',
   styleUrls: ['./user-card.component.scss'],
 })
-export class UserCardComponent implements OnInit {
+export class UserCardComponent implements OnInit, OnChanges {
   @Input() checkboxVisibility = true
   @Input() showDeleteFlag = false
   @Input() assigneeData: any
@@ -43,14 +43,14 @@ export class UserCardComponent implements OnInit {
       // this.selectedContent.push(item);
       if (this.assigneeData && this.assigneeData.category === 'Designation') {
         this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any, index: any) => {
-          if (sitem.id === item.id) {
+          if (sitem.name === item.name) {
             sitem['selected'] = true
             this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.splice(index, 1)
             this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.unshift(sitem)
           }
         })
         if (this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo']) {
-          this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].push(item.id)
+          this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].push(item.name)
         }
       }
       if (this.assigneeData && this.assigneeData.category === 'Custom Users') {
@@ -70,12 +70,12 @@ export class UserCardComponent implements OnInit {
       // this.selectedContent = this.selectedContent.filter( sitem  => sitem.identifier !== item.identifier)
       if (this.assigneeData && this.assigneeData.category === 'Designation') {
         this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
-          if (sitem.id === item.id) {
+          if (sitem.name === item.name) {
             sitem['selected'] = false
           }
         })
         this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier: any, index: any) => {
-          if (identifier === item.id) {
+          if (identifier === item.name) {
             this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].splice(index, 1)
           }
         })
@@ -100,17 +100,17 @@ export class UserCardComponent implements OnInit {
   deleteItem(item: any) {
     if (this.assigneeData && this.assigneeData.category === 'Designation') {
       this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
-        if (sitem.id === item.id) {
+        if (sitem.name === item.name) {
           sitem['selected'] = false
         }
       })
       this.assigneeData.data.map((sitem: any, index: any) => {
-        if (sitem.id === item.id) {
+        if (sitem.name === item.name) {
           this.assigneeData.data.splice(index, 1)
         }
       })
       this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier: any, index: any) => {
-        if (identifier === item.id) {
+        if (identifier === item.name) {
           this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].splice(index, 1)
         }
       })
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
index 96810d78d..14180fa1c 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
@@ -43,7 +43,7 @@ export class CreateAssigneeComponent implements OnInit {
         this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Designation' &&
         this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo) {
         this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
-          if (this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.indexOf(sitem.id) > -1) {
+          if (this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.indexOf(sitem) > -1) {
             sitem['selected'] = true
           }
         })
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
index 0bac9f11f..b8fdbc32f 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
@@ -25,63 +25,8 @@ export class CreatePlanComponent implements OnInit, AfterViewInit, OnDestroy {
 
   }
   ngOnInit() {
-    console.log("this.route", this.route, this.trainingPlanService);
     this.route.params.subscribe(params => {
-      console.log('parans', params);
       this.planId = params['planId'];
-      // let response  = {
-      //   "id": "api.cbplan.read.byId",
-      //   "ver": "1.0",
-      //   "ts": "2023-12-04T05:53:32.031Z",
-      //   "params": {
-      //       "resmsgid": "749690f0-9269-11ee-80e8-4dda841c8af0",
-      //       "msgid": "74879cd0-9269-11ee-82b8-cfe1f59faeaf",
-      //       "status": "successful",
-      //       "err": null,
-      //       "errmsg": null
-      //   },
-      //   "responseCode": "OK",
-      //   "result": {
-      //       "content": {
-      //           "id": 1,
-      //           "name": "CBP Plan Name",
-      //           "description": "CBP Plan Description",
-      //           "contentList": [
-      //               {
-      //                   "identifier" : "doId1",
-      //                   "name": "Course Name 1",
-      //                   "description" : "Description",
-      //                   "avgRating": 4.0,
-      //                   "competencies_v5" : []
-      //               },
-      //               {
-      //                   "identifier" : "doId2",
-      //                   "name": "Course Name 2",
-      //                   "description" : "Description",
-      //                   "avgRating": 4.0,
-      //                   "competencies_v5" : []
-      //               }
-      //           ],
-      //           "userType": "custom",
-      //           "userDetails": [
-      //               {
-      //                   "userId": "userId1",
-      //                   "firstName": "User Name"
-      //               },
-      //               {
-      //                   "userId": "userId2",
-      //                   "firstName" : "User Name"
-      //               }
-      //           ],
-      //           "endDate": "2023-12-14T10:00:00",
-      //           "status": "Draft",
-      //           "createdBy" : "adminUserId",
-      //           "createdAt" : "timeStamp"
-      //       }
-      //   }
-      // };
-
-
       this.trainingPlanService.readPlan(this.planId).subscribe((response: any) => {
         console.log('read data', response);
         if (response && response.result && response.result.content) {
diff --git a/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts b/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
index 3bb1605e8..6bb13f797 100644
--- a/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
+++ b/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
@@ -14,7 +14,7 @@ const API_END_POINTS = {
   PUBLISH_PLAN: 'apis/proxies/v8/cbplan/v1/publish',
   GET_ALL_CONTENT: '/apis/proxies/v8/sunbirdigot/search',
   GET_ALL_USERS: '/apis/proxies/v8/user/v1/search',
-  GET_ALL_DESIGNATIONS: '/apis/proxies/v8/user/v1/positions',
+  GET_ALL_DESIGNATIONS: '/apis/proxies/v8/masterData/v2/deptPosition',
 
 }
 @Injectable({
@@ -30,7 +30,7 @@ export class TrainingPlanService {
   }
 
   readPlan(planId:any) {
-    return this.http.get<any>(API_END_POINTS.GET_ALL_DESIGNATIONS+`/${planId}`);
+    return this.http.get<any>(API_END_POINTS.READ_PLAN+`/${planId}`);
   }
 
   updatePlan(obj:any) {

From 4cebcf933a1fbe9602a50af0d3110ffd671aa188 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Mon, 18 Dec 2023 13:32:57 +0530
Subject: [PATCH 345/887] add condition for apply filter , update api for
 designation and read api correction

---
 .../lib/routes/training-plan/components/chip/chip.component.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
index ed9ead207..f66fd33c4 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
@@ -18,7 +18,6 @@
         <a mat-button class="select-more-link" (click)="clearAll()">Clear all</a>
     </div>
 </div>
-hi {{selectAssigneeCount}}, {{trainingPlanDataSharingService?.trainingPlanAssigneeData?.category}}
 <div class="flex flex-row chip-container"
     *ngIf="selectAssigneeCount > 0 && from === 'assignee' && trainingPlanDataSharingService?.trainingPlanAssigneeData?.category === 'Designation'">
     <div class="flex flex-2 left-section flex-middle">

From 6c1604b3686d93622eec452e23c82dea97978e00 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Mon, 18 Dec 2023 17:20:26 +0530
Subject: [PATCH 346/887] added pipes for course card data and preview plan
 page changes for show all

---
 .../default-thubnail.module.ts                | 12 +++
 .../default-thumbnail.directive.ts            | 26 ++++++
 .../pipe-duration-transform.module.ts         | 12 +++
 .../pipe-duration-transform.pipe.spec.ts      |  8 ++
 .../pipe-duration-transform.pipe.ts           | 83 +++++++++++++++++++
 .../pipe-public-URL/pipe-public-URL.module.ts | 12 +++
 .../pipe-public-URL/pipe-public-URL.pipe.ts   | 15 ++++
 .../competency-summary.component.ts           |  2 +-
 .../components/search/search.component.ts     | 39 ++++-----
 .../standard-card.component.html              | 34 ++++++--
 .../standard-card.component.scss              | 34 ++++++++
 .../standard-card/standard-card.component.ts  |  3 +
 .../user-card/user-card.component.html        |  4 +-
 .../user-card/user-card.component.scss        |  1 +
 .../user-card/user-card.component.ts          | 27 +++++-
 .../create-assignee.component.html            |  6 +-
 .../create-content.component.html             |  2 +-
 .../create-plan/create-plan.component.ts      | 44 +++++-----
 .../create-timeline.component.html            |  4 +-
 .../create-timeline.component.ts              |  4 +-
 .../preview-plan/preview-plan.component.html  |  2 +-
 .../preview-plan/preview-plan.component.ts    |  4 +-
 .../training-plan/training-plan.module.ts     |  6 ++
 23 files changed, 323 insertions(+), 61 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/directives/default-thumbnail/default-thubnail.module.ts
 create mode 100644 project/ws/app/src/lib/routes/directives/default-thumbnail/default-thumbnail.directive.ts
 create mode 100644 project/ws/app/src/lib/routes/pipes/pipe-duration-transform/pipe-duration-transform.module.ts
 create mode 100644 project/ws/app/src/lib/routes/pipes/pipe-duration-transform/pipe-duration-transform.pipe.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/pipes/pipe-duration-transform/pipe-duration-transform.pipe.ts
 create mode 100644 project/ws/app/src/lib/routes/pipes/pipe-public-URL/pipe-public-URL.module.ts
 create mode 100644 project/ws/app/src/lib/routes/pipes/pipe-public-URL/pipe-public-URL.pipe.ts

diff --git a/project/ws/app/src/lib/routes/directives/default-thumbnail/default-thubnail.module.ts b/project/ws/app/src/lib/routes/directives/default-thumbnail/default-thubnail.module.ts
new file mode 100644
index 000000000..4c80e9a15
--- /dev/null
+++ b/project/ws/app/src/lib/routes/directives/default-thumbnail/default-thubnail.module.ts
@@ -0,0 +1,12 @@
+import { NgModule } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { DefaultThumbnailDirective } from './default-thumbnail.directive'
+
+@NgModule({
+  declarations: [DefaultThumbnailDirective],
+  imports: [
+    CommonModule,
+  ],
+  exports: [DefaultThumbnailDirective],
+})
+export class DefaultThumbnailModule { }
diff --git a/project/ws/app/src/lib/routes/directives/default-thumbnail/default-thumbnail.directive.ts b/project/ws/app/src/lib/routes/directives/default-thumbnail/default-thumbnail.directive.ts
new file mode 100644
index 000000000..654004e5b
--- /dev/null
+++ b/project/ws/app/src/lib/routes/directives/default-thumbnail/default-thumbnail.directive.ts
@@ -0,0 +1,26 @@
+import { Directive, Input, HostListener, HostBinding, OnChanges } from '@angular/core'
+
+@Directive({
+  selector: '[wsUtilsDefaultThumbnail]',
+})
+export class DefaultThumbnailDirective implements OnChanges {
+
+  @Input() wsUtilsDefaultThumbnail = ''
+  @Input() src = ''
+  isSrcUpdateAttemptedForDefault = false
+
+  @HostBinding('src') srcUrl = ''
+  @HostListener('error') updateSrc() {
+    if (!this.isSrcUpdateAttemptedForDefault) {
+      this.srcUrl = this.wsUtilsDefaultThumbnail
+      this.isSrcUpdateAttemptedForDefault = true
+    }
+  }
+
+  ngOnChanges() {
+    if (this.src) {
+      this.srcUrl = this.src
+    }
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/pipes/pipe-duration-transform/pipe-duration-transform.module.ts b/project/ws/app/src/lib/routes/pipes/pipe-duration-transform/pipe-duration-transform.module.ts
new file mode 100644
index 000000000..eb0284cef
--- /dev/null
+++ b/project/ws/app/src/lib/routes/pipes/pipe-duration-transform/pipe-duration-transform.module.ts
@@ -0,0 +1,12 @@
+import { NgModule } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { PipeDurationTransformPipe } from './pipe-duration-transform.pipe'
+
+@NgModule({
+  declarations: [PipeDurationTransformPipe],
+  imports: [
+    CommonModule,
+  ],
+  exports: [PipeDurationTransformPipe],
+})
+export class PipeDurationTransformModule { }
diff --git a/project/ws/app/src/lib/routes/pipes/pipe-duration-transform/pipe-duration-transform.pipe.spec.ts b/project/ws/app/src/lib/routes/pipes/pipe-duration-transform/pipe-duration-transform.pipe.spec.ts
new file mode 100644
index 000000000..586a794bc
--- /dev/null
+++ b/project/ws/app/src/lib/routes/pipes/pipe-duration-transform/pipe-duration-transform.pipe.spec.ts
@@ -0,0 +1,8 @@
+import { PipeDurationTransformPipe } from './pipe-duration-transform.pipe'
+
+describe('PipeDurationTransformPipe', () => {
+  it('create an instance', () => {
+    const pipe = new PipeDurationTransformPipe()
+    expect(pipe).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/pipes/pipe-duration-transform/pipe-duration-transform.pipe.ts b/project/ws/app/src/lib/routes/pipes/pipe-duration-transform/pipe-duration-transform.pipe.ts
new file mode 100644
index 000000000..b6d574e04
--- /dev/null
+++ b/project/ws/app/src/lib/routes/pipes/pipe-duration-transform/pipe-duration-transform.pipe.ts
@@ -0,0 +1,83 @@
+import { Pipe, PipeTransform } from '@angular/core'
+import moment from 'moment'
+
+@Pipe({
+  name: 'pipeDurationTransform',
+})
+export class PipeDurationTransformPipe implements PipeTransform {
+
+  transform(data: number, type: 'time24' | 'hms' | 'hour' | 'hms2H' | 'hms2M'| 'day'): any {
+    if (data <= 0) {
+      return ''
+    }
+    const h = Math.floor(data / 3600)
+    const m = Math.floor((data % 3600) / 60)
+    const s = Math.floor((data % 3600) % 60)
+    let duration = ''
+    switch (type) {
+      case 'time24':
+        return this.defaultDuration(h, m, s)
+      case 'hms':
+        return this.hmsCalculation(h, m, s, duration, type)
+      case 'hms2H':
+        /**to Print HH:mm:ss */
+        const duration2 = moment.duration(data, 'seconds')
+        const resultstring = moment.utc(duration2.asMilliseconds()).format('HH:mm:ss')
+        return resultstring
+      case 'hms2M': /**to Print mm:ss */
+        const duration2H = moment.duration(data, 'seconds')
+        const resultstring2H = moment.utc(duration2H.asMilliseconds()).format('mm:ss')
+
+        return resultstring2H
+      case 'hour':
+        if (h === 0) {
+          duration += 'less than an hour'
+        }
+        if (h === 1) {
+          duration += `${h} hour`
+        }
+        if (h > 1) {
+          duration += `${h} hours`
+        }
+        return duration
+      case 'day':
+        if (h > 24) {
+          const duration3 = moment.duration(data, 'seconds')
+          return `${duration3.days()} day(s)`
+        }
+        return this.hmsCalculation(h, m, s, duration, type)
+
+      default:
+        return this.defaultDuration(h, m, s)
+    }
+  }
+
+  defaultDuration(h: number, m: number, s: number) {
+    let duration = ''
+    duration += h > 0 ? `${h.toString().padStart(2)}:` : ''
+    duration += m > 0 ? `${m.toString().padStart(2)}:` : '00:'
+    duration += s > 0 ? s.toString().padStart(2) : '00'
+    return duration
+  }
+  hmsCalculation(h: number, m: number, s: number, dur: string, type: string) {
+    let space = ''
+    let duration = dur
+    if (h > 0) {
+      duration += type === 'hms' ? `${h}h` : `${h} hr`
+    }
+    if (m > 0) {
+      if (h > 0) {
+        space = ' '
+      }
+      duration += type === 'hms' ? `${space}${m}m` : `${space}${m} min`
+    }
+    if (s > 0 && h === 0) {
+      if (m > 0) {
+        space = ' '
+      }
+      duration += type === 'hms' ? `${space}${s}s` : `${space}${s} sec`
+    }
+    return duration
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/pipes/pipe-public-URL/pipe-public-URL.module.ts b/project/ws/app/src/lib/routes/pipes/pipe-public-URL/pipe-public-URL.module.ts
new file mode 100644
index 000000000..3b1f3ce4b
--- /dev/null
+++ b/project/ws/app/src/lib/routes/pipes/pipe-public-URL/pipe-public-URL.module.ts
@@ -0,0 +1,12 @@
+import { NgModule } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { PipePublicURL } from './pipe-public-URL.pipe'
+
+@NgModule({
+  declarations: [PipePublicURL],
+  imports: [
+    CommonModule,
+  ],
+  exports: [PipePublicURL],
+})
+export class PipePublicURLModule { }
diff --git a/project/ws/app/src/lib/routes/pipes/pipe-public-URL/pipe-public-URL.pipe.ts b/project/ws/app/src/lib/routes/pipes/pipe-public-URL/pipe-public-URL.pipe.ts
new file mode 100644
index 000000000..f29762c69
--- /dev/null
+++ b/project/ws/app/src/lib/routes/pipes/pipe-public-URL/pipe-public-URL.pipe.ts
@@ -0,0 +1,15 @@
+import { Pipe, PipeTransform } from '@angular/core'
+import { environment } from 'src/environments/environment'
+
+@Pipe({
+  name: 'pipePublicURL',
+})
+export class PipePublicURL implements PipeTransform {
+
+  transform(value: string): any {
+    const mainUrl = value && value.split('/content').pop() || ''
+    const finalURL = `${environment.contentHost}/${environment.contentBucket}/content${mainUrl}`
+    return value ? finalURL : ''
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
index 87debcb84..f2d97d754 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
@@ -69,7 +69,7 @@ export class CompetencySummaryComponent implements OnInit, OnChanges {
     if (this.selectedCardData) {
       let fObj = {"competencyTheme": '', count: 0};
       this.selectedCardData.map((sitem: any) => {
-        sitem.competencies_v5.map((fitem: any) => {
+        sitem && sitem.competencies_v5 && sitem.competencies_v5.map((fitem: any) => {
           if (fitem.competencyArea.toLowerCase() === 'behavioural') {
             this.competencySummaryObj[0]['behavioural']['count'] = this.competencySummaryObj[0]['behavioural']['count'] + 1
             let result = this.checkIfThemeNameExists(this.competencySummaryObj[0]['behavioural']['listData'], fitem);
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 4dadfc6aa..1129c75f6 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -69,26 +69,27 @@ export class SearchComponent implements OnInit {
     if (contentType) {
       const filterObj = {
         "request": {
+          "secureSettings": contentType === 'Moderated Course' ? true : false, // for moderated course
           "filters": {
-            "primaryCategory": ["Course"],
-            "contentType": [contentType],
+            "primaryCategory": [contentType === 'Moderated Course' ? 'Course' : contentType],
+            // "contentType": [contentType],
             "identifier": [
-              "do_1139104696922521601317",
-              "do_1135500940397936641158",
-              "do_1139026887251066881137",
-              "do_11374977269157888011298",
-              "do_113545216626319360174",
-              "do_1136643005068328961197",
-              "do_113694464635666432153",
-              "do_113882971081441280172",
-              "do_113882887752704000151",
-              "do_1138813223247462401116",
-              "do_113703698843983872134",
-              "do_1137468666262241281756",
-              "do_1139084314725498881268",
-              "do_113720205181059072151",
-              "do_113896199910367232144",
-              "do_11364656119311564815"
+              // "do_1139104696922521601317",
+              // "do_1135500940397936641158",
+              // "do_1139026887251066881137",
+              // "do_11374977269157888011298",
+              // "do_113545216626319360174",
+              // "do_1136643005068328961197",
+              // "do_113694464635666432153",
+              // "do_113882971081441280172",
+              // "do_113882887752704000151",
+              // "do_1138813223247462401116",
+              // "do_113703698843983872134",
+              // "do_1137468666262241281756",
+              // "do_1139084314725498881268",
+              // "do_113720205181059072151",
+              // "do_113896199910367232144",
+              // "do_11364656119311564815"
             ]
           },
           "offset": 0,
@@ -98,7 +99,7 @@ export class SearchComponent implements OnInit {
           "fields": ["name", "appIcon", "instructions", "description", "purpose", "mimeType",
             "gradeLevel", "identifier", "medium", "pkgVersion", "board", "subject", "resourceType",
             "primaryCategory", "contentType", "channel", "organisation", "trackable", "license", "posterImage",
-            "idealScreenSize", "learningMode", "creatorLogo", "duration", "version", "avgRating", "competencies_v5"]
+            "idealScreenSize", "learningMode", "creatorLogo", "duration", "programDuration", "version", "avgRating", "competencies_v5"]
         }, "query": ""
       }
       this.trainingPlanService.getAllContent(filterObj).subscribe((res: any) => {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
index 2da25c4ec..fc6b5904b 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
@@ -18,6 +18,17 @@
                                 class="card-img ws-mat-primary-lite-background margin-remove"
                                 [src]="item?.posterImage" />
                         </ng-container>
+                        <div class="duration-box right-corner"  *ngIf="item?.duration > 0">
+                            <mat-icon class="mat-icon main_icon mr-1 notranslate material-icons mat-icon-no-color">access_time</mat-icon>
+                            <span class=" ws-mat-white-text duration"> {{ (item?.duration || 120)| pipeDurationTransform: 'hms' }} </span>
+                        </div>
+                        
+                          <div class="duration-box right-corner" *ngIf="item?.programDuration > 0">
+                            <mat-icon class="mat-icon main_icon mr-1">access_time</mat-icon>
+                            <span class=" ws-mat-white-text duration"> 
+                              {{item?.programDuration}} {{item?.programDuration === 1 ? 'day' : 'days'}}
+                            </span>
+                          </div>
                     </div>
                     <div class="padding-m">
                         <div class="course_widget flex margin-remove">
@@ -28,22 +39,33 @@
                             </div>
                         </div>
                         <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
-                            {{item?.description}}
+                            {{item?.name | titlecase}}
                         </div>
                         <div class="flex w-full flex-wrap flex-middle">
                             <div class="course_logo_box">
-                                <img class="source-icon" [src]="item?.appIcon" />
+                                <img class="source-icon" [src]="item?.creatorLogo | pipePublicURL"  [alt]="item?.name" [wsUtilsDefaultThumbnail]="defaultThumbnail"/>
+                                <!-- <div *ngIf="this.data.value.content?.appIcon" class="float-left">
+                                    <img [src]="this.data.value.content?.posterImage | pipePublicURL" class="app-icon course-image"
+                                      [alt]="this.data.value.content.name || iGOT" />
+                                  </div> -->
                             </div>
                             <span class="org-text" *ngIf="item?.organisation && item?.organisation[0]">
                                 By {{item?.organisation[0]}}</span>
                         </div>
                         <div class="flex flex-middle rating-session margin-top-m">
-                            <div class="flex flex-middle">
+                            <div class="flex flex-middle" *ngIf="item?.avgRating">
                                 <mat-icon class="mr-1">star</mat-icon>
-                                <span>4.5</span>
+                                <span>{{item?.avgRating}}</span>
                             </div>
                             <ng-container>
-                                <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                <span class="most-enrolled-text margin-left-xs">
+                                    <ng-container *ngIf="item?.additionalTags && item?.additionalTags.includes('mostEnrolled')">
+                                        <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                      </ng-container>
+                                      <ng-container *ngIf="item?.additionalTags && item?.additionalTags.includes('mostTrending')">
+                                        <span class="most-enrolled-text margin-left-xs">Most trending</span>
+                                      </ng-container>
+                                </span>
                             </ng-container>
                         </div>
                     </div>
@@ -52,7 +74,7 @@
         </div>
         
     </div>
-    <div class="flex flex-row justify-center">
+    <div class="flex flex-row justify-center" *ngIf="showPagination">
         <mat-paginator [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 100]" [length]="contentData?.length" (page)="onChangePage($event)"></mat-paginator>
     </div>
 </ng-container>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
index ac75e8815..d6bdf6b6a 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
@@ -43,6 +43,40 @@ $secondary-color: #EF951E;
 
   }
 
+  .duration-box {
+    background: #000;
+    position: absolute;
+    // height: auto;
+    // min-height: 24px;
+    // min-width: 60px;
+    border: none;
+    display: flex;
+    align-items: center;
+    padding: 4px;
+    border-radius: 4px;
+  
+    &.right-corner {
+      right: 4px;
+      bottom: 4px;
+    }
+    .mat-icon {
+      vertical-align: middle;
+      color: #fff !important;
+      height: 14px !important;
+      width: 14px !important;
+      font-size: 14px;
+    }
+    .duration{
+      font: 700 12px/16px Lato;
+      display: inline-block;
+      margin: 0;
+      padding: 0;
+    }
+  }
+
+  .ws-mat-white-text {
+    color: rgb(255,255,255);
+  }
 
 
   ::ng-deep .mat-progress-bar {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
index e6fb220ea..6aea56b59 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
@@ -1,6 +1,7 @@
 import { Component, EventEmitter, Input, Output, OnInit, OnChanges, ChangeDetectorRef, ViewChild } from '@angular/core'
 import { MatTableDataSource, MatPaginator, PageEvent } from '@angular/material';
 import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
+import { SafeUrl } from '@angular/platform-browser'
 @Component({
   selector: 'ws-app-standard-card',
   templateUrl: './standard-card.component.html',
@@ -11,6 +12,7 @@ export class StandardCardComponent implements OnInit, OnChanges {
   @Input() checkboxVisibility: any = true
   @Input() contentData: any[] = []
   @Input() showDeleteFlag = false
+  @Input() showPagination = false;
   @Output() handleSelectedChips = new EventEmitter()
   @ViewChild(MatPaginator, {static: false}) paginator: MatPaginator | any;
   dataSource:any;
@@ -18,6 +20,7 @@ export class StandardCardComponent implements OnInit, OnChanges {
   startIndex= 0;
   lastIndex = 10; 
   pageSize = 10;
+  defaultThumbnail: SafeUrl | null = 'assets/instances/eagle/app_logos/KarmayogiBharat_Logo.svg'
   constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService, private changeDetectorRef:ChangeDetectorRef ) { }
 
   ngOnInit() {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
index 897afd8f4..299c85135 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
@@ -3,7 +3,7 @@
         <div class="flex flex-4 assignee-card" [ngClass]="item?.selected ? 'active-card':''"
             [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
             <div class="avatar">
-                <div>HG</div>
+                <div>{{createInititals(item?.firstName)}}</div>
             </div>
             <div class="assignee-desc">
                 <p>{{item?.firstName}} </p>
@@ -45,6 +45,6 @@
     </ng-container>
 </div>
 
-<div class="flex flex-row justify-center" *ngIf="assigneeData?.category === 'Custom Users' || assigneeData?.category === 'Designation'">
+<div *ngIf="showPagination" class="flex flex-row justify-center">
     <mat-paginator [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 100]" [length]="contentData?.length" (page)="onChangePage($event)"></mat-paginator>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
index 876e0f471..0ee43e25f 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
@@ -9,6 +9,7 @@
     padding: 16px;
     margin-right: 20px;
     margin-bottom: 16px;
+    position: relative;
 }
 
 .assignee-card-without-checkbox {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
index e582c18f9..f0efe4a7a 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
@@ -10,6 +10,7 @@ export class UserCardComponent implements OnInit, OnChanges {
   @Input() checkboxVisibility = true
   @Input() showDeleteFlag = false
   @Input() assigneeData: any
+  @Input() showPagination = false;
   @Output() handleSelectedChips = new EventEmitter()
   @ViewChild(MatPaginator, {static: false}) paginator: MatPaginator | any;
   dataSource:any;
@@ -23,7 +24,7 @@ export class UserCardComponent implements OnInit, OnChanges {
 
   ngOnChanges() {
     this.changeDetectorRef.detectChanges();
-    console.log('this.contentData',this.assigneeData)
+    console.log('this.assigneeData',this.assigneeData)
     this.dataSource= new MatTableDataSource<any>(this.assigneeData.data);
     this.dataSource.paginator = this.paginator;
     console.log('this.dataSource', this.dataSource);
@@ -133,4 +134,28 @@ export class UserCardComponent implements OnInit, OnChanges {
     }
   }
 
+  private createInititals(name:string): string {
+    let initials = ''
+    const array = `${name} `.toString().split(' ')
+    if (array[0] !== 'undefined' && typeof array[1] !== 'undefined') {
+      initials += array[0].charAt(0)
+      initials += array[1].charAt(0)
+    } else {
+      for (let i = 0; i < name.length; i += 1) {
+        if (name.charAt(i) === ' ') {
+          continue
+        }
+
+        if (name.charAt(i) === name.charAt(i)) {
+          initials += name.charAt(i)
+
+          if (initials.length === 2) {
+            break
+          }
+        }
+      }
+    }
+    return initials.toUpperCase()
+  }
+
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
index 7c93582d3..bb03afb60 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
@@ -2,14 +2,14 @@
     <ws-app-search [categoryData]="categoryData" [from]="from" (handleApiData)="handleApiData($event)"></ws-app-search>
 </ng-container>
 <ng-container>
-    <ws-app-chip [selectedAssigneeChips]="selectedAssigneeChips" [from]="from"
+    <ws-app-chip [selectedAssigneeChips]="selectedAssigneeChips" [from]="from" 
         [selectAssigneeCount]="selectAssigneeCount"></ws-app-chip>
 </ng-container>
 <ng-container>
     <ws-app-user-card [assigneeData]="assigneeData" (handleSelectedChips)="handleSelectedChips($event)"
-        *ngIf="assigneeData?.category === 'Designation'"></ws-app-user-card>
+        *ngIf="assigneeData?.category === 'Designation'" [showPagination]="true" ></ws-app-user-card>
     <ws-app-user-card [assigneeData]="assigneeData" (handleSelectedChips)="handleSelectedChips($event)"
-        *ngIf="assigneeData?.category === 'Custom Users'"></ws-app-user-card>
+        *ngIf="assigneeData?.category === 'Custom Users'" [showPagination]="true" ></ws-app-user-card>
 </ng-container>
 <ng-container *ngIf="trainingPlanDataSharingService?.trainingPlanAssigneeData?.category === 'All Users'">
     <div class="no-cbp-data margin-top-xl margin-bottom-xl">
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
index 44f2af16e..4762b90e1 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
@@ -7,7 +7,7 @@
         <div class="flex-1">
             <ws-app-chip [selectedContentChips]="selectedContentChips" [from]="from"
                 [selectContentCount]="selectContentCount" (itemRemoved)="itemsRemovedFromChip()"></ws-app-chip>
-            <ws-app-standard-card [cardSize]="3" [contentData]="contentData"
+            <ws-app-standard-card [cardSize]="3" [contentData]="contentData" [showPagination]="true" 
                 (handleSelectedChips)="handleSelectedChips($event)"></ws-app-standard-card>
         </div>
         <div class="flex-2 margin-left-s margin-top-s">
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
index b8fdbc32f..5ae4f57d5 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
@@ -27,31 +27,33 @@ export class CreatePlanComponent implements OnInit, AfterViewInit, OnDestroy {
   ngOnInit() {
     this.route.params.subscribe(params => {
       this.planId = params['planId'];
-      this.trainingPlanService.readPlan(this.planId).subscribe((response: any) => {
-        console.log('read data', response);
-        if (response && response.result && response.result.content) {
-          console.log('trainingPlanDataSharingService', this.trainingPlanDataSharingService);
-          this.trainingPlanDataSharingService.trainingPlanTitle = response.result.content.name;
-          this.trainingPlanDataSharingService.trainingPlanContentData = { data: { content: response.result.content.contentList } };
-          if (this.trainingPlanDataSharingService.trainingPlanAssigneeData) {
+      if(this.planId) {
+        this.trainingPlanService.readPlan(this.planId).subscribe((response: any) => {
+          console.log('read data', response);
+          if (response && response.result && response.result.content) {
+            console.log('trainingPlanDataSharingService', this.trainingPlanDataSharingService);
+            this.trainingPlanDataSharingService.trainingPlanTitle = response.result.content.name;
+            this.trainingPlanDataSharingService.trainingPlanContentData = { data: { content: response.result.content.contentList } };
+            if (this.trainingPlanDataSharingService.trainingPlanAssigneeData) {
+              if (response.result.content.userType === 'custom') {
+                this.trainingPlanDataSharingService.trainingPlanAssigneeData['category'] = 'Custom Users';
+              } else {
+                this.trainingPlanDataSharingService.trainingPlanAssigneeData['category'] = response.result.content.userType;
+              }
+  
+            }
+  
             if (response.result.content.userType === 'custom') {
-              this.trainingPlanDataSharingService.trainingPlanAssigneeData['category'] = 'Custom Users';
+              this.trainingPlanDataSharingService.trainingPlanAssigneeData = { data: { content: response.result.content.userDetails } }
             } else {
-              this.trainingPlanDataSharingService.trainingPlanAssigneeData['category'] = response.result.content.userType;
+              this.trainingPlanDataSharingService.trainingPlanAssigneeData = response.result.content.userDetails;
             }
-
+  
+            this.trainingPlanDataSharingService.trainingPlanStepperData['endDate'] = response.result.content.endDate;
+            this.trainingPlanDataSharingService.trainingPlanStepperData['status'] = response.result.content.status;
           }
-
-          if (response.result.content.userType === 'custom') {
-            this.trainingPlanDataSharingService.trainingPlanAssigneeData = { data: { content: response.result.content.userDetails } }
-          } else {
-            this.trainingPlanDataSharingService.trainingPlanAssigneeData = response.result.content.userDetails;
-          }
-
-          this.trainingPlanDataSharingService.trainingPlanStepperData['endDate'] = response.result.content.endDate;
-          this.trainingPlanDataSharingService.trainingPlanStepperData['status'] = response.result.content.status;
-        }
-      })
+        })
+      }     
     });
   }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
index 66a073689..2c5169047 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
@@ -5,7 +5,7 @@
     <div class="margin-top-xl">
         <div class="flex flex-middle flex-between">
             <div class="mat-subheading-1 margin-remove">Selected Content</div>
-            <a mat-button (click)="showAll('all','content')" class="show-all">Show all <mat-icon>keyboard_arrow_right</mat-icon></a>
+            <a mat-button (click)="showAll('content')" class="show-all">Show all <mat-icon>keyboard_arrow_right</mat-icon></a>
         </div>
     </div>
     <ws-app-standard-card [checkboxVisibility]="false" [contentData]="contentData" [showDeleteFlag]="true"></ws-app-standard-card>
@@ -14,7 +14,7 @@
     <div class="margin-top-xl">
         <div class=" flex flex-middle flex-between">
             <div class="mat-subheading-1 margin-remove">Selected Cards</div>
-            <a mat-button (click)="showAll('all','assignee')" class="show-all">Show all <mat-icon>keyboard_arrow_right</mat-icon></a>
+            <a mat-button (click)="showAll('assignee')" class="show-all">Show all <mat-icon>keyboard_arrow_right</mat-icon></a>
         </div>
     </div>
     <ws-app-user-card [checkboxVisibility]="false" [assigneeData]="assigneeData" [showDeleteFlag]="true"></ws-app-user-card>
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
index 60b894912..788d81907 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
@@ -39,8 +39,8 @@ export class CreateTimelineComponent implements OnInit {
       const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
         return item.selected
       })
-      this.assigneeData = { category, data: { content: assigneeData } }
-
+      this.assigneeData = { category, data:  assigneeData  }
+      console.log('this.assigneeData',this.assigneeData);
     }
   }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
index 2c00f6a19..b3aa75bdc 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
@@ -16,7 +16,7 @@
       </mat-chip-list>
       
 </div>
-<div class="content-container flex">
+<div class="content-container flex" *ngIf="from === 'all'">
     <ng-container *ngIf="selectedTab === 'content'">
         <ws-app-standard-card [checkboxVisibility]="false" [contentData]="contentData"></ws-app-standard-card>
     </ng-container>
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
index cf3ec19d1..5f20be35d 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
@@ -39,7 +39,7 @@ export class PreviewPlanComponent implements OnInit {
         const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
           return item.selected
         })
-        this.assigneeData = { category, data: { content: assigneeData } }
+        this.assigneeData = { category, data:  assigneeData }
       }
 
     } else if (this.from === 'all') {
@@ -62,7 +62,7 @@ export class PreviewPlanComponent implements OnInit {
           const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
             return item.selected
           })
-          this.assigneeData = { category, data: { content: assigneeData } }
+          this.assigneeData = { category, data: assigneeData }
         }
         if (category === 'Designation') {
           const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
diff --git a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
index bd62c6bab..5aeaed8d8 100644
--- a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
+++ b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
@@ -22,6 +22,9 @@ import {
   MatCheckboxModule,
   MatDatepickerModule,
 } from '@angular/material'
+import { PipePublicURLModule } from '../pipes/pipe-public-URL/pipe-public-URL.module';
+import { PipeDurationTransformModule } from '../pipes/pipe-duration-transform/pipe-duration-transform.module';
+import { DefaultThumbnailModule } from '../directives/default-thumbnail/default-thubnail.module';
 import { MatMenuModule } from '@angular/material/menu'
 import { MatPaginatorModule } from '@angular/material/paginator'
 import { MatCardModule } from '@angular/material/card'
@@ -128,6 +131,9 @@ import { LoaderService } from '../../../../../../../src/app/services/loader.serv
     MatTooltipModule,
     MatSortModule,
     MatDatepickerModule,
+    PipePublicURLModule,
+    PipeDurationTransformModule,
+    DefaultThumbnailModule
   ],
   entryComponents: [
     ConfirmationBoxComponent,

From c15e01c493ace42c6aa066702c35aba15a1bd385 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Mon, 18 Dec 2023 18:04:06 +0530
Subject: [PATCH 347/887] added information strip for moderated courses

---
 .../category-drop-down.component.ts           |  9 ++++++--
 .../components/search/search.component.ts     | 22 +++----------------
 .../user-card/user-card.component.ts          |  2 +-
 .../training-plan-home.component.html         |  4 ++++
 .../training-plan-home.component.scss         |  8 +++++++
 .../training-plan-home.component.ts           | 21 +++++++++++++-----
 .../training-plan-data-share.service.ts       |  1 +
 7 files changed, 40 insertions(+), 27 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
index 8899ffaf7..69ab02831 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
@@ -50,7 +50,8 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['primaryAction'] = 'I understand, change content type'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Course'
-        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event
+        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event;
+        this.trainingPlanDataSharingService.moderatedCourseSelectStatus.next(false);
         break
       case 'Program':
         dialogData['type'] = 'normal'
@@ -61,7 +62,8 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['primaryAction'] = 'I understand, change content type'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Program'
-        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event
+        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event;
+        this.trainingPlanDataSharingService.moderatedCourseSelectStatus.next(false);
         break
       case 'Blended program':
         dialogData['type'] = 'normal'
@@ -73,6 +75,7 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Blended program'
         this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event
+        this.trainingPlanDataSharingService.moderatedCourseSelectStatus.next(false);
         break
       case 'Curated program':
         dialogData['type'] = 'normal'
@@ -84,6 +87,7 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Curated program'
         this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event
+        this.trainingPlanDataSharingService.moderatedCourseSelectStatus.next(false);
         break
       case 'Moderated Course':
         dialogData['type'] = 'normal'
@@ -95,6 +99,7 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Moderated Course'
         this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event
+        
         break
       case 'Designation':
         dialogData['type'] = 'normal'
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 1129c75f6..88c0d5278 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -67,30 +67,14 @@ export class SearchComponent implements OnInit {
 
   getContent(contentType: any) {
     if (contentType) {
+      if(contentType === 'Moderated Course') {
+        this.trainingPlanDataSharingService.moderatedCourseSelectStatus.next(true);
+      }
       const filterObj = {
         "request": {
           "secureSettings": contentType === 'Moderated Course' ? true : false, // for moderated course
           "filters": {
             "primaryCategory": [contentType === 'Moderated Course' ? 'Course' : contentType],
-            // "contentType": [contentType],
-            "identifier": [
-              // "do_1139104696922521601317",
-              // "do_1135500940397936641158",
-              // "do_1139026887251066881137",
-              // "do_11374977269157888011298",
-              // "do_113545216626319360174",
-              // "do_1136643005068328961197",
-              // "do_113694464635666432153",
-              // "do_113882971081441280172",
-              // "do_113882887752704000151",
-              // "do_1138813223247462401116",
-              // "do_113703698843983872134",
-              // "do_1137468666262241281756",
-              // "do_1139084314725498881268",
-              // "do_113720205181059072151",
-              // "do_113896199910367232144",
-              // "do_11364656119311564815"
-            ]
           },
           "offset": 0,
           "limit": 20,
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
index f0efe4a7a..d17f4aa38 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
@@ -134,7 +134,7 @@ export class UserCardComponent implements OnInit, OnChanges {
     }
   }
 
-  private createInititals(name:string): string {
+  createInititals(name:string): string {
     let initials = ''
     const array = `${name} `.toString().split(' ')
     if (array[0] !== 'undefined' && typeof array[1] !== 'undefined') {
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.html b/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.html
index be01ee04c..413cfda61 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.html
@@ -1,4 +1,8 @@
 <div class="container-balanced">
+  <div class="moderated-course-info flex flex-2" *ngIf="showModeratedNotification">
+    <div>Only officials with the verified Karmayogi badge can receive moderated course assignments.</div>
+    <div class="cursor-pointer" (click)="removeNotification()"><img src="assets/icons/close.svg"></div>
+  </div>
   <div class="plan-container">   
     <router-outlet></router-outlet>
   </div>
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.scss b/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.scss
index a70b50894..a6a4277d6 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.scss
@@ -1,3 +1,11 @@
 .plan-container {
     margin: 20px 40px;
+}
+
+.moderated-course-info {
+    padding: 16px;
+    background: rgb(214,214,214);
+    color: rgba(0, 0, 0, 0.87);
+    font-weight: 400;
+    justify-content: space-evenly;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.ts
index 22489a692..59fd244c2 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit, OnDestroy, AfterViewInit } from '@angular/core'
 /* tslint:disable */
 import _ from 'lodash'
 /* tslint:enable */
-
+import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service';
 @Component({
   selector: 'ws-app-training-plan-home',
   templateUrl: './training-plan-home.component.html',
@@ -12,19 +12,30 @@ import _ from 'lodash'
   /* tslint:enable */
 })
 export class TrainingPlanHomeComponent implements OnInit, AfterViewInit, OnDestroy {
-
-  constructor(
+  showModeratedNotification = false;
+  constructor( private trainingPlanDataSharingService: TrainingPlanDataSharingService
   ) {
-
+    
   }
   ngOnInit() {
-
+    this.trainingPlanDataSharingService.moderatedCourseSelectStatus.subscribe((status)=>{
+      if(status) {
+          this.showModeratedNotification = true;
+      } else {
+        this.showModeratedNotification = false;
+      }
+    })
   }
 
   ngAfterViewInit() {
   }
 
   ngOnDestroy() {
+    this.trainingPlanDataSharingService.moderatedCourseSelectStatus.unsubscribe();
+  }
+
+  removeNotification() {
+    this.showModeratedNotification = false;
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts b/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
index 8d555aa04..5b01c4805 100644
--- a/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
+++ b/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
@@ -6,6 +6,7 @@ import { Subject } from 'rxjs'
 })
 export class TrainingPlanDataSharingService {
   trainingPlanCategoryChangeEvent = new Subject()
+  moderatedCourseSelectStatus = new Subject()
   trainingPlanTitle = ''
   trainingPlanContentData: any
   trainingPlanAssigneeData: any

From 20bd58bfac34c31edb4345e52f6bce1724332952 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Mon, 18 Dec 2023 23:57:58 +0530
Subject: [PATCH 348/887] search api, loader, publish content, delete content

---
 .../ws/app/src/lib/routes/home/home.module.ts |   2 +
 .../training-plan-dashboard.component.html    |   8 +-
 .../training-plan-dashboard.component.scss    |   4 +
 .../training-plan-dashboard.component.ts      | 185 +++++++++++++-----
 .../training-plan-dashboard.service.ts        |  18 ++
 .../components/search/search.component.html   |  15 +-
 .../components/search/search.component.scss   |  31 ++-
 .../components/search/search.component.ts     |  39 +++-
 .../user-card/user-card.component.ts          |  36 ++--
 .../create-plan/create-plan.component.ts      | 144 ++++----------
 .../preview-plan/preview-plan.component.html  |  14 +-
 .../services/traininig-plan.service.ts        |  18 +-
 .../training-plan/training-plan.module.ts     |   2 -
 src/app/app.module.ts                         |   2 +
 src/app/component/root/root.component.html    |  10 +-
 src/app/component/root/root.component.scss    |  71 +++++++
 src/app/component/root/root.component.ts      |  11 +-
 src/app/services/loader.service.ts            |   8 +-
 18 files changed, 385 insertions(+), 233 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/home/services/training-plan-dashboard.service.ts

diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index a98b4e9d5..05d199224 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -63,6 +63,7 @@ import { UsersModule } from '../users/users.module'
 import { BlendedApprovalsComponent } from './routes/blended-approvals/blended-approvals.component'
 import { ReportsSectionComponent } from './routes/reports-section/reports-section.component'
 import { TrainingPlanDashboardComponent } from './routes/training-plan-dashboard/training-plan-dashboard.component'
+import { TrainingPlanDashboardService } from './services/training-plan-dashboard.service'
 @NgModule({
   declarations: [
     HomeComponent,
@@ -152,6 +153,7 @@ import { TrainingPlanDashboardComponent } from './routes/training-plan-dashboard
     InitResolver,
     MdoInfoService,
     UploadService,
+    TrainingPlanDashboardService,
   ],
 })
 export class HomeModule {
diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html
index 8c264d0ac..e7d9fe8bb 100644
--- a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html
@@ -16,10 +16,12 @@
       </div>
       <ng-container class="margin-top-l">
         <ws-widget-org-user-table [tableData]="tabledata" [data]="trainingPlanData" [isTrainingPlan]="true"
-          [trainingTagList]="tagListData" *ngIf="currentFilter === 'live'" (eOnButtonClick)="clickHandler($event)">
+          [trainingTagList]="tagListData" *ngIf="currentFilter === 'live'" (eOnButtonClick)="clickHandler($event)"
+          (actionsClick)="menuSelected($event)">
         </ws-widget-org-user-table>
-        <ws-widget-org-user-table [tableData]="tabledata" [data]="[]" [isTrainingPlan]="true"
-          [trainingTagList]="tagListData" *ngIf="currentFilter === 'draft'" (eOnButtonClick)="clickHandler($event)">
+        <ws-widget-org-user-table [tableData]="tabledata" [data]="trainingPlanData" [isTrainingPlan]="true"
+          [trainingTagList]="tagListData" *ngIf="currentFilter === 'draft'" (eOnButtonClick)="clickHandler($event)"
+          (actionsClick)="menuSelected($event)">
         </ws-widget-org-user-table>
       </ng-container>
     </mat-card-content>
diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.scss b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.scss
index 041153fd2..5bcd8bf4f 100644
--- a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.scss
@@ -25,4 +25,8 @@
   font-family: 'Lato';
   font-weight: 700;
   font-size: 14px;
+}
+
+.mat-column-name {
+  width: 20% !important;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
index d1bd16ab6..bcfc572a6 100644
--- a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
@@ -3,6 +3,11 @@ import { Router } from '@angular/router'
 // import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
 // import { EventService } from '@sunbird-cb/utils'
 import { ITableData } from '@sunbird-cb/collection/lib/ui-org-table/interface/interfaces'
+import { TrainingPlanDashboardService } from '../../services/training-plan-dashboard.service'
+import moment from 'moment'
+import { LoaderService } from '../../../../../../../../../src/app/services/loader.service'
+import { TrainingPlanService } from '../../../training-plan/services/traininig-plan.service'
+import { MatSnackBar } from '@angular/material'
 
 @Component({
   selector: 'ws-app-training-plan-dashboard',
@@ -22,7 +27,11 @@ export class TrainingPlanDashboardComponent implements OnInit {
 
   constructor(
     // private events: EventService,
-    private router: Router
+    private router: Router,
+    private trainingDashboardSvc: TrainingPlanDashboardService,
+    private loaderService: LoaderService,
+    private trainingPlanService: TrainingPlanService,
+    private snackBar: MatSnackBar,
   ) {
 
   }
@@ -31,13 +40,13 @@ export class TrainingPlanDashboardComponent implements OnInit {
     this.tabledata = {
       columns: [
         // { displayName: 'Id', key: 'identifier' },
-        { displayName: 'Plan name', key: 'planName' },
-        { displayName: 'Assignee', key: 'assignee' },
-        { displayName: 'Total content', key: 'totalContent' },
+        { displayName: 'Plan name', key: 'name' },
+        { displayName: 'Assignee', key: 'assigneeCount' },
+        { displayName: 'Total content', key: 'contentCount' },
         { displayName: 'Content type', key: 'contentType' },
-        { displayName: 'Timeline', key: 'timeline' },
-        { displayName: 'Created by', key: 'CreatedBy' },
-        { displayName: 'Created on', key: 'CreatedOn' },
+        { displayName: 'Timeline', key: 'endDate' },
+        { displayName: 'Created by', key: 'createdByName' },
+        { displayName: 'Created on', key: 'createdAt' },
       ],
       needCheckBox: false,
       needHash: false,
@@ -46,6 +55,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
       needUserMenus: false,
       actions: [],
       actionColumnName: 'Action',
+      cbpPlanMenu: true,
     }
     this.filter('live')
   }
@@ -54,27 +64,23 @@ export class TrainingPlanDashboardComponent implements OnInit {
     this.currentFilter = item
   }
 
-  onEnterkySearch(enterValue: any) {
-    this.searchQuery = enterValue
-    this.currentOffset = 0
-    this.pageIndex = 0
-    this.filterData(this.searchQuery)
-  }
+  // onEnterkySearch(enterValue: any) {
+  //   this.searchQuery = enterValue
+  //   this.currentOffset = 0
+  //   this.pageIndex = 0
+  //   this.filterData(this.searchQuery)
+  // }
 
   filter(filter: string) {
     this.currentFilter = filter
-    this.pageIndex = 0
-    this.currentOffset = 0
-    this.limit = 20
-    this.searchQuery = ''
-    this.filterData(this.searchQuery)
+    this.filterData()
   }
 
-  filterData(query: string) {
+  filterData() {
     if (this.currentFilter === 'live') {
-      this.getLiveData(query)
+      this.getLiveData()
     } else if (this.currentFilter === 'draft') {
-      this.getDraftData(query)
+      this.getDraftData()
     }
   }
 
@@ -89,46 +95,125 @@ export class TrainingPlanDashboardComponent implements OnInit {
     // )
   }
 
-  getLiveData(_searchText: string) {
+  async getLiveData() {
+    this.loaderService.changeLoaderState(true)
     this.trainingPlanData = []
-    this.trainingPlanData.push({
-      planName: 'planName live',
-      assignee: 'assignee live',
-      totalContent: 'totalContent live',
-      timeline: 'timeline live',
-      contentType: 'contentType live',
-      CreatedBy: 'CreatedBy live',
-      CreatedOn: 'CreatedOn live',
-    },                         {
-      planName: 'check live',
-      assignee: 'assignee live',
-      totalContent: 'totalContent live',
-      timeline: 'timeline live',
-      contentType: 'contentType live',
-      CreatedBy: 'CreatedBy live',
-      CreatedOn: 'CreatedOn live',
-    })
+    this.trainingPlanData = []
+    const req = {
+      request: {
+        filters: {
+          status: 'Live',
+        },
+      },
+    }
+    const liveRes = await this.trainingDashboardSvc.getUserList(req).toPromise().catch(_error => { })
+    if (liveRes.params && liveRes.params.status && liveRes.params.status === 'success') {
+      this.trainingPlanData = liveRes.result.content
+      this.convertDataAsPerTable()
+    } else {
+      this.loaderService.changeLoaderState(false)
+    }
   }
 
-  getDraftData(_searchText: string) {
+  async getDraftData() {
+    this.loaderService.changeLoaderState(true)
     this.trainingPlanData = []
-    this.trainingPlanData.push({
-      planName: 'planName draft',
-      assignee: 'assignee draft',
-      totalContent: 'totalContent draft',
-      timeline: 'timeline draft',
-      contentType: 'contentType draft',
-      CreatedBy: 'CreatedBy draft',
-      CreatedOn: 'CreatedOn draft',
+    const req = {
+      request: {
+        filters: {
+          status: 'DRAFT',
+        },
+      },
+    }
+    const draftRes = await this.trainingDashboardSvc.getUserList(req).toPromise().catch(_error => { })
+    if (draftRes.params && draftRes.params.status && draftRes.params.status === 'success') {
+      this.trainingPlanData = draftRes.result.content
+      this.convertDataAsPerTable()
+    } else {
+      this.loaderService.changeLoaderState(false)
+    }
+  }
+
+  convertDataAsPerTable() {
+    this.trainingPlanData.map((res: any) => {
+      res.contentCount = (res.contentList) ? res.contentList.length : 0
+      res.assigneeCount = (res.userDetails) ? res.userDetails.length : 0
+      res.endDate = (res.endDate) ? moment(res.endDate).format('MMM DD[,] YYYY') : ''
+      res.createdAt = (res.createdAt) ? moment(res.createdAt).format('MMM DD[,] YYYY') : ''
     })
+    this.loaderService.changeLoaderState(false)
   }
 
   createCbp() {
     this.router.navigate(['app', 'training-plan', 'create-plan'])
   }
 
-  clickHandler($event: any) {
-    if ($event.type === 'createCbpPlan') {
+  menuSelected(_event: any) {
+    switch (_event.action) {
+      case 'preivewContent':
+        this.previewData(_event.row)
+        break
+      case 'editContent':
+        this.editContentData(_event.row)
+        break
+      case 'deleteContent':
+        this.deleteContentData(_event.row)
+        break
+      case 'publishContent':
+        this.publishContentData(_event.row)
+        break
+    }
+  }
+
+  previewData(_selectedRow: any) {
+    this.loaderService.changeLoaderState(true)
+  }
+
+  editContentData(_selectedRow: any) {
+    this.router.navigate(['app', 'training-plan', 'create-plan'], { queryParams: { planId: _selectedRow.id } })
+  }
+
+  deleteContentData(_selectedRow: any) {
+    this.loaderService.changeLoaderState(true)
+    const obj = {
+      request: {
+        id: _selectedRow.id,
+        comment: 'Content deleted',
+      },
+    }
+    this.trainingPlanService.archivePlan(obj).subscribe((_data: any) => {
+      this.snackBar.open('CBP plan deleted successfully.')
+      this.loaderService.changeLoaderState(false)
+    }, (_error) => {
+      this.loaderService.changeLoaderState(false)
+    })
+  }
+
+  publishContentData(_selectedRow: any) {
+    this.loaderService.changeLoaderState(false)
+    const obj = {
+      request: {
+        id: _selectedRow.id,
+        comment: 'CBP plan approved',
+      },
+    }
+    this.trainingPlanService.publishPlan(obj).subscribe((data: any) => {
+      if (data && data.params && data.params.status && data.params.status.toLowerCase() === 'success') {
+        this.snackBar.open('CBP plan published successfully.')
+        this.loaderService.changeLoaderState(false)
+        this.getDraftData()
+      } else {
+        this.snackBar.open('Something went wrong while publishing CBP plan. Try again later')
+        this.loaderService.changeLoaderState(false)
+      }
+    }, (_error: any) => {
+      this.snackBar.open('Something went wrong while publishing CBP plan. Try again later')
+      this.loaderService.changeLoaderState(false)
+    })
+  }
+
+  clickHandler(_event: any) {
+    if (_event.type === 'createCbpPlan') {
       this.createCbp()
     }
   }
diff --git a/project/ws/app/src/lib/routes/home/services/training-plan-dashboard.service.ts b/project/ws/app/src/lib/routes/home/services/training-plan-dashboard.service.ts
new file mode 100644
index 000000000..5115826f8
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/services/training-plan-dashboard.service.ts
@@ -0,0 +1,18 @@
+import { Injectable } from '@angular/core'
+import { HttpClient } from '@angular/common/http'
+import { Observable } from 'rxjs'
+
+const API_END_POINTS = {
+  CBP_PLAN_LIST: '/apis/proxies/v8/cbplan/v1/list',
+}
+
+@Injectable({
+  providedIn: 'root',
+})
+export class TrainingPlanDashboardService {
+  constructor(private http: HttpClient) { }
+
+  getUserList(req: any): Observable<any> {
+    return this.http.post<any>(API_END_POINTS.CBP_PLAN_LIST, req)
+  }
+}
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
index b1f682f6b..5744396d7 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
@@ -4,15 +4,18 @@
         <ws-app-category-drop-down [categoryData]="categoryData" [from]="from"
             (handleCategorySelection)="handleCategorySelection($event)"></ws-app-category-drop-down>
     </ng-container>
-    <div class="search">
-        <div class="rsearch"><mat-icon
+    <div class="search flex w-full margin-left-xl margin-right-xl">
+        <div class="rsearch flex w-full"><mat-icon
                 class="color-60 search-icon mat-icon notranslate material-icons mat-icon-no-color">search</mat-icon>
-            <input class="sinput color-60" label="" placeholder="Select" type="Standard">
+            <input class="sinput color-60 w-full margin-right-m" [(ngModel)]="searchText" label="" placeholder="Select"
+                type="Standard">
         </div>
+        <button mat-button type="button" class="search-btn" (click)="searchData()">Search</button>
     </div>
-    <div class="filter-section" (click)="openFilter()">
-        <img src="/assets/icons/filter.svg" />
-        <span>Apply Filters</span>
+    <div class="filter-section flex flex-end">
+        <button mat-button type="button" (click)="openFilter()" class="apply-filter">
+            <mat-icon class="margin-right-xs">filter_list</mat-icon> Apply Filters
+        </button>
     </div>
 </div>
 <ng-container *ngIf="filterVisibilityFlag">
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.scss b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.scss
index c01d6cfae..800491838 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.scss
@@ -6,11 +6,6 @@
     position: relative;
 }
 
-.search {
-    margin-left: 16px;
-    width: 75%;
-}
-
 .search-icon {
     position: absolute;
     top: 16px;
@@ -23,22 +18,24 @@
     border: 1px solid #d5d0d0;
     padding: 15px 36px;
     font: 400 14px Lato;
-    width: 90%;
-}
-
-.filter-section {
-    margin-top: 10px;
-    cursor: pointer;
-}
-
-.filter-section img {
-    vertical-align: middle;
 }
 
 .filter-section span {
-    vertical-align: middle;
-    margin-left: 24px;
     color: rgba(0, 0, 0, 0.87);
     font-size: 16px;
     font-weight: 600;
+}
+
+.search-btn {
+    background: #1b4ca1 !important;
+    color: white !important;
+    font-family: 'Lato';
+    font-weight: 700;
+    font-size: 14px;
+    border-radius: 4px;
+    min-width: 199px;
+}
+
+.btn-disabled {
+    background: rgba(0, 0, 0, 0.16) !important;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 29feebb8f..cdcec0be5 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -5,6 +5,7 @@ import { TrainingPlanService } from './../../services/traininig-plan.service'
 import { TrainingPlanDataSharingService } from './../../services/training-plan-data-share.service'
 /* tslint:disable */
 import _ from 'lodash'
+import { LoaderService } from '../../../../../../../../../src/app/services/loader.service'
 @Component({
   selector: 'ws-app-search',
   templateUrl: './search.component.html',
@@ -14,19 +15,20 @@ export class SearchComponent implements OnInit {
   @Input() categoryData: any = []
   @Input() from: any = '';
   @Output() handleApiData = new EventEmitter();
+  searchText = ''
   filterVisibilityFlag = false
+  selectedDropDownValue: any
   constructor(@Inject(DOCUMENT) private document: Document,
     private trainingPlanService: TrainingPlanService,
     private route: ActivatedRoute,
     private trainingPlanDataSharingService: TrainingPlanDataSharingService,
+    private loadingService: LoaderService
   ) { }
 
   ngOnInit() {
-    // this.handleCategorySelection('');
   }
 
   ngOnChanges() {
-    // this.handleCategorySelection('');
   }
 
   openFilter() {
@@ -47,6 +49,7 @@ export class SearchComponent implements OnInit {
   }
 
   handleCategorySelection(event: any) {
+    this.selectedDropDownValue = event
     switch (this.from) {
       case 'content':
         event = !event ? 'Course' : event
@@ -66,6 +69,7 @@ export class SearchComponent implements OnInit {
   }
 
   getContent(contentType: any) {
+    this.loadingService.changeLoaderState(true)
     if (contentType) {
       const filterObj = {
         "request": {
@@ -93,13 +97,13 @@ export class SearchComponent implements OnInit {
           },
           "offset": 0,
           "limit": 20,
-          "query": "",
+          "query": (this.searchText) ? this.searchText : '',
           "sort_by": { "lastUpdatedOn": "desc" },
           "fields": ["name", "appIcon", "instructions", "description", "purpose", "mimeType",
             "gradeLevel", "identifier", "medium", "pkgVersion", "board", "subject", "resourceType",
             "primaryCategory", "contentType", "channel", "organisation", "trackable", "license", "posterImage",
             "idealScreenSize", "learningMode", "creatorLogo", "duration", "version", "avgRating", "competencies_v5"]
-        }, "query": ""
+        }
       }
       this.trainingPlanService.getAllContent(filterObj).subscribe((res: any) => {
 
@@ -115,12 +119,14 @@ export class SearchComponent implements OnInit {
 
         this.trainingPlanDataSharingService.trainingPlanContentData = { category: contentType, data: res }
         this.handleApiData.emit(true)
+        this.loadingService.changeLoaderState(false)
       })
     }
 
   }
 
   getCustomUsers(event: any) {
+    this.loadingService.changeLoaderState(true)
     const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
     const filterObj = {
       request: {
@@ -136,6 +142,8 @@ export class SearchComponent implements OnInit {
     this.trainingPlanService.getCustomUsers(filterObj).subscribe((res: any) => {
       this.trainingPlanDataSharingService.trainingPlanAssigneeData = { category: event, data: res.content }
       this.handleApiData.emit(true)
+      this.loadingService.changeLoaderState(false)
+    }, (_error: any) => {
     })
   }
 
@@ -145,12 +153,33 @@ export class SearchComponent implements OnInit {
   }
 
   getDesignations(event: any) {
+    this.loadingService.changeLoaderState(true)
     this.trainingPlanService.getDesignations().subscribe((res: any) => {
       this.trainingPlanDataSharingService.trainingPlanAssigneeData = { category: event, data: res.responseData }
       this.handleApiData.emit(true)
+      this.loadingService.changeLoaderState(false)
     })
   }
 
-
+  searchData() {
+    switch (this.selectedDropDownValue) {
+      case 'Course':
+      case 'Program':
+      case 'Blended program':
+      case 'Curated program':
+      case 'Moderated Course':
+        this.getContent(this.selectedDropDownValue)
+        break
+      case 'Designation':
+        this.getDesignations(this.selectedDropDownValue)
+        break
+      case 'Custom Users':
+        this.getCustomUsers(this.selectedDropDownValue)
+        break
+      case 'All Users':
+        this.getAllUsers(this.selectedDropDownValue)
+        break
+    }
+  }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
index d76b13749..2576fcac6 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
@@ -1,5 +1,5 @@
-import { Component, EventEmitter, Input, Output, OnInit, OnChanges, ChangeDetectorRef, ViewChild } from '@angular/core'
-import { MatTableDataSource, MatPaginator, PageEvent } from '@angular/material';
+import { Component, EventEmitter, Input, Output, OnInit, ChangeDetectorRef, ViewChild } from '@angular/core'
+import { MatTableDataSource, MatPaginator, PageEvent } from '@angular/material'
 import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
 @Component({
   selector: 'ws-app-user-card',
@@ -11,30 +11,30 @@ export class UserCardComponent implements OnInit {
   @Input() showDeleteFlag = false
   @Input() assigneeData: any
   @Output() handleSelectedChips = new EventEmitter()
-  @ViewChild(MatPaginator, {static: false}) paginator: MatPaginator | any;
-  dataSource:any;
-  startIndex= 0;
-  lastIndex = 10; 
+  @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | any
+  dataSource: any
+  startIndex = 0;
+  lastIndex = 10;
   pageSize = 10;
-  constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService, private changeDetectorRef:ChangeDetectorRef) { }
+  constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService, private changeDetectorRef: ChangeDetectorRef) { }
 
   ngOnInit() {
   }
 
   ngOnChanges() {
-    this.changeDetectorRef.detectChanges();
-    console.log('this.contentData',this.assigneeData)
-    this.dataSource= new MatTableDataSource<any>(this.assigneeData.data);
-    this.dataSource.paginator = this.paginator;
-    console.log('this.dataSource', this.dataSource);
+    this.changeDetectorRef.detectChanges()
+    console.log('this.contentData', this.assigneeData)
+    this.dataSource = new MatTableDataSource<any>(this.assigneeData.data)
+    this.dataSource.paginator = this.paginator
+    console.log('this.dataSource', this.dataSource)
   }
 
-  onChangePage(pe:PageEvent) {
-    console.log(pe.pageIndex);
-    console.log(pe.pageSize);
-    this.startIndex = pe.pageIndex* pe.pageSize;
-    this.lastIndex =(pe.pageIndex+1)*pe.pageSize ;
-    
+  onChangePage(pe: PageEvent) {
+    console.log(pe.pageIndex)
+    console.log(pe.pageSize)
+    this.startIndex = pe.pageIndex * pe.pageSize
+    this.lastIndex = (pe.pageIndex + 1) * pe.pageSize
+
     // this.startIndex = this.pageIndex
   }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
index 0bac9f11f..08242fda6 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
@@ -1,8 +1,8 @@
 
-import { AfterViewInit, Component, OnDestroy, OnInit } from '@angular/core'
+import { Component, OnDestroy, OnInit } from '@angular/core'
 import { ActivatedRoute } from '@angular/router'
-import { TrainingPlanService } from '../../services/traininig-plan.service';
-import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service';
+import { TrainingPlanService } from '../../services/traininig-plan.service'
+import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
 /* tslint:disable */
 import _ from 'lodash'
 /* tslint:enable */
@@ -12,105 +12,56 @@ import _ from 'lodash'
   styleUrls: ['./create-plan.component.scss'],
 })
 
-export class CreatePlanComponent implements OnInit, AfterViewInit, OnDestroy {
+export class CreatePlanComponent implements OnInit, OnDestroy {
 
   selectedTabData = 'createPlan'
   nextTab = ''
   createCheck: any
-  planId: string = '';
-  constructor(private route: ActivatedRoute, private trainingPlanService: TrainingPlanService,
+  planId = ''
+  constructor(
+    private route: ActivatedRoute,
+    private trainingPlanService: TrainingPlanService,
     private trainingPlanDataSharingService: TrainingPlanDataSharingService) {
   }
+
   ngOnDestroy() {
 
   }
-  ngOnInit() {
-    console.log("this.route", this.route, this.trainingPlanService);
-    this.route.params.subscribe(params => {
-      console.log('parans', params);
-      this.planId = params['planId'];
-      // let response  = {
-      //   "id": "api.cbplan.read.byId",
-      //   "ver": "1.0",
-      //   "ts": "2023-12-04T05:53:32.031Z",
-      //   "params": {
-      //       "resmsgid": "749690f0-9269-11ee-80e8-4dda841c8af0",
-      //       "msgid": "74879cd0-9269-11ee-82b8-cfe1f59faeaf",
-      //       "status": "successful",
-      //       "err": null,
-      //       "errmsg": null
-      //   },
-      //   "responseCode": "OK",
-      //   "result": {
-      //       "content": {
-      //           "id": 1,
-      //           "name": "CBP Plan Name",
-      //           "description": "CBP Plan Description",
-      //           "contentList": [
-      //               {
-      //                   "identifier" : "doId1",
-      //                   "name": "Course Name 1",
-      //                   "description" : "Description",
-      //                   "avgRating": 4.0,
-      //                   "competencies_v5" : []
-      //               },
-      //               {
-      //                   "identifier" : "doId2",
-      //                   "name": "Course Name 2",
-      //                   "description" : "Description",
-      //                   "avgRating": 4.0,
-      //                   "competencies_v5" : []
-      //               }
-      //           ],
-      //           "userType": "custom",
-      //           "userDetails": [
-      //               {
-      //                   "userId": "userId1",
-      //                   "firstName": "User Name"
-      //               },
-      //               {
-      //                   "userId": "userId2",
-      //                   "firstName" : "User Name"
-      //               }
-      //           ],
-      //           "endDate": "2023-12-14T10:00:00",
-      //           "status": "Draft",
-      //           "createdBy" : "adminUserId",
-      //           "createdAt" : "timeStamp"
-      //       }
-      //   }
-      // };
-
-
-      this.trainingPlanService.readPlan(this.planId).subscribe((response: any) => {
-        console.log('read data', response);
-        if (response && response.result && response.result.content) {
-          console.log('trainingPlanDataSharingService', this.trainingPlanDataSharingService);
-          this.trainingPlanDataSharingService.trainingPlanTitle = response.result.content.name;
-          this.trainingPlanDataSharingService.trainingPlanContentData = { data: { content: response.result.content.contentList } };
-          if (this.trainingPlanDataSharingService.trainingPlanAssigneeData) {
-            if (response.result.content.userType === 'custom') {
-              this.trainingPlanDataSharingService.trainingPlanAssigneeData['category'] = 'Custom Users';
-            } else {
-              this.trainingPlanDataSharingService.trainingPlanAssigneeData['category'] = response.result.content.userType;
-            }
 
-          }
+  ngOnInit() {
+    this.route.queryParams.subscribe((_res: any) => {
+      if (_res && _res.planId) {
+        this.getContentData(_res.planId)
+      }
+    })
+  }
 
+  getContentData(_id: string) {
+    this.trainingPlanService.readPlan(_id).subscribe((response: any) => {
+      console.log('read data', response)
+      if (response && response.result && response.result.content) {
+        console.log('trainingPlanDataSharingService', this.trainingPlanDataSharingService)
+        this.trainingPlanDataSharingService.trainingPlanTitle = response.result.content.name
+        this.trainingPlanDataSharingService.trainingPlanContentData = { data: { content: response.result.content.contentList } }
+        if (this.trainingPlanDataSharingService.trainingPlanAssigneeData) {
           if (response.result.content.userType === 'custom') {
-            this.trainingPlanDataSharingService.trainingPlanAssigneeData = { data: { content: response.result.content.userDetails } }
+            this.trainingPlanDataSharingService.trainingPlanAssigneeData['category'] = 'Custom Users'
           } else {
-            this.trainingPlanDataSharingService.trainingPlanAssigneeData = response.result.content.userDetails;
+            this.trainingPlanDataSharingService.trainingPlanAssigneeData['category'] = response.result.content.userType
           }
 
-          this.trainingPlanDataSharingService.trainingPlanStepperData['endDate'] = response.result.content.endDate;
-          this.trainingPlanDataSharingService.trainingPlanStepperData['status'] = response.result.content.status;
         }
-      })
-    });
-  }
 
-  ngAfterViewInit() {
+        if (response.result.content.userType === 'custom') {
+          this.trainingPlanDataSharingService.trainingPlanAssigneeData = { data: { content: response.result.content.userDetails } }
+        } else {
+          this.trainingPlanDataSharingService.trainingPlanAssigneeData = response.result.content.userDetails
+        }
+
+        this.trainingPlanDataSharingService.trainingPlanStepperData['endDate'] = response.result.content.endDate
+        this.trainingPlanDataSharingService.trainingPlanStepperData['status'] = response.result.content.status
+      }
+    })
   }
 
   selectedTabAction(_event: any) {
@@ -143,27 +94,4 @@ export class CreatePlanComponent implements OnInit, AfterViewInit, OnDestroy {
     }
   }
 
-  archivePlan() {
-    let obj = {
-      "request": {
-        "id": this.planId,
-        "comment": ""
-      }
-    }
-    this.trainingPlanService.archivePlan(obj).subscribe((data: any) => {
-      console.log('data', data);
-    })
-  }
-
-  publishPlan() {
-    let obj = {
-      "request": {
-        "id": this.planId,
-        "comment": ""
-      }
-    }
-    this.trainingPlanService.publishPlan(obj).subscribe((data: any) => {
-      console.log('data', data);
-    })
-  }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
index 2c00f6a19..1b8046341 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
@@ -1,6 +1,7 @@
 <ws-app-breadcrumb [showBreadcrumbAction]="false"></ws-app-breadcrumb>
 <div class="flex margin-top-l">
-    <button mat-stroked-button><mat-icon>arrow_back</mat-icon> Go back</button>
+    <button mat-stroked-button type="button" (click)="goBack()"><mat-icon>arrow_back</mat-icon> Go
+        back</button>
 </div>
 <div class="flex" *ngIf="from==='content'">
     <ws-app-standard-card [checkboxVisibility]="false" [contentData]="contentData"></ws-app-standard-card>
@@ -10,11 +11,10 @@
 </div>
 <div class="flex content-container" *ngIf="from === 'all'">
     <mat-chip-list [multiple]="true" [selectable]="true">
-        <mat-chip *ngFor="let item of allContentChips"
-                  [selected]="selectedTab == item.tab"
-                  (click)="selectedTab = item.tab">{{item.name}}</mat-chip>
-      </mat-chip-list>
-      
+        <mat-chip *ngFor="let item of allContentChips" [selected]="selectedTab == item.tab"
+            (click)="selectedTab = item.tab">{{item.name}}</mat-chip>
+    </mat-chip-list>
+
 </div>
 <div class="content-container flex">
     <ng-container *ngIf="selectedTab === 'content'">
@@ -23,4 +23,4 @@
     <ng-container *ngIf="selectedTab === 'assignee'">
         <ws-app-user-card [checkboxVisibility]="false" [assigneeData]="assigneeData"></ws-app-user-card>
     </ng-container>
-  </div>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts b/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
index 3bb1605e8..d3803875b 100644
--- a/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
+++ b/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
@@ -8,14 +8,13 @@ import _ from 'lodash'
 
 const API_END_POINTS = {
   CREATE_PLAN: 'apis/proxies/v8/cbplan/v1/create',
-  READ_PLAN:'apis/proxies/v8/cbplan/v1/read/',
+  READ_PLAN: 'apis/proxies/v8/cbplan/v1/read',
   UPDATE_PLAN: 'apis/proxies/v8/cbplan/v1/update',
   ARCHIVE_PLAN: 'apis/proxies/v8/cbplan/v1/archive',
   PUBLISH_PLAN: 'apis/proxies/v8/cbplan/v1/publish',
   GET_ALL_CONTENT: '/apis/proxies/v8/sunbirdigot/search',
   GET_ALL_USERS: '/apis/proxies/v8/user/v1/search',
   GET_ALL_DESIGNATIONS: '/apis/proxies/v8/user/v1/positions',
-
 }
 @Injectable({
   providedIn: 'root',
@@ -29,20 +28,20 @@ export class TrainingPlanService {
     return this.http.post<any>(`${API_END_POINTS.CREATE_PLAN}`, obj).pipe(map(res => _.get(res, 'result')))
   }
 
-  readPlan(planId:any) {
-    return this.http.get<any>(API_END_POINTS.GET_ALL_DESIGNATIONS+`/${planId}`);
+  readPlan(planId: any) {
+    return this.http.get<any>(API_END_POINTS.READ_PLAN + `/${planId}`)
   }
 
-  updatePlan(obj:any) {
+  updatePlan(obj: any) {
     return this.http.post<any>(`${API_END_POINTS.UPDATE_PLAN}`, obj).pipe(map(res => _.get(res, 'result')))
   }
 
-  archivePlan(obj:any) {
-    return this.http.post<any>(`${API_END_POINTS.ARCHIVE_PLAN}`, obj).pipe(map(res => _.get(res, 'result')))
+  archivePlan(obj: any) {
+    return this.http.post<any>(`${API_END_POINTS.ARCHIVE_PLAN}`, obj)
   }
 
-  publishPlan(obj:any) {
-    return this.http.post<any>(`${API_END_POINTS.PUBLISH_PLAN}`, obj).pipe(map(res => _.get(res, 'result')))
+  publishPlan(obj: any) {
+    return this.http.post<any>(`${API_END_POINTS.PUBLISH_PLAN}`, obj)
   }
 
   getAllContent(filter: object): Observable<any> {
@@ -57,5 +56,4 @@ export class TrainingPlanService {
     return this.http.get<any>(API_END_POINTS.GET_ALL_DESIGNATIONS)
   }
 
-
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
index bd62c6bab..fa377229d 100644
--- a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
+++ b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
@@ -58,7 +58,6 @@ import { CategoryDropDownComponent } from './components/category-drop-down/categ
 import { AddPlanInformationComponent } from './components/add-plan-information/add-plan-information.component'
 
 import { TrainingPlanService } from './services/traininig-plan.service'
-import { LoaderService } from '../../../../../../../src/app/services/loader.service'
 @NgModule({
   declarations: [
     TrainingPlanHomeComponent,
@@ -135,7 +134,6 @@ import { LoaderService } from '../../../../../../../src/app/services/loader.serv
   providers: [
     InitResolver,
     TrainingPlanService,
-    LoaderService,
   ],
 })
 export class TrainingPlanModule {
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index e478d3a32..6b1ec8f8d 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -65,6 +65,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { ServiceWorkerModule } from '@angular/service-worker'
 import { environment } from '../environments/environment'
 import { PublicLogoutModule } from './routes/public/public-logout/public-logout.module'
+import { LoaderService } from './services/loader.service'
 @Injectable()
 export class HammerConfig extends GestureConfig {
   buildHammer(element: HTMLElement) {
@@ -184,6 +185,7 @@ const getBaseHref = (platformLocation: PlatformLocation): string => {
     { provide: ErrorHandler, useClass: GlobalErrorHandlingService },
     MatDatepickerModule, MatNativeDateModule,
     { provide: 'environment', useValue: environment },
+    LoaderService
   ],
 })
 export class AppModule { }
diff --git a/src/app/component/root/root.component.html b/src/app/component/root/root.component.html
index d7f438e6b..0cd1905ef 100644
--- a/src/app/component/root/root.component.html
+++ b/src/app/component/root/root.component.html
@@ -21,6 +21,14 @@
   }">
   <router-outlet></router-outlet>
 </div>
+<div class="overlay" *ngIf="isLoading">
+  <div class="loader-container">
+    <div class="loader-ripple">
+      <div></div>
+      <div></div>
+    </div>
+  </div>
+</div>
 <ws-app-footer class="app-footer" [ngClass]="{ 'padding-bottom: 56px': !isSetupPage}" *ngIf="showNavbar">
 </ws-app-footer>
 <ws-app-nav-bar class="bottom-nav-bar" [hidden]="!showNavbar" *ngIf="isNavBarRequired && (isXSmall$ | async) === true"
@@ -30,4 +38,4 @@
 <ng-container #previewContainer></ng-container>
 
 <input #appUpdateTitle type="hidden" i18n-value value="App Update" />
-<input #appUpdateBody type="hidden" i18n-value value="App has been updated. Do you want to load new version?" />
+<input #appUpdateBody type="hidden" i18n-value value="App has been updated. Do you want to load new version?" />
\ No newline at end of file
diff --git a/src/app/component/root/root.component.scss b/src/app/component/root/root.component.scss
index db92b4496..05d5c11ce 100644
--- a/src/app/component/root/root.component.scss
+++ b/src/app/component/root/root.component.scss
@@ -80,3 +80,74 @@ ws-app-nav-bar {
   /* display: flex; */
   flex: 1;
 }
+
+.outer {
+  display: flex;
+  flex-flow: column;
+  height: 100%;
+}
+
+.dim {
+  opacity: 0.2;
+}
+
+router-outlet+* {
+  flex-grow: 1;
+}
+
+.overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 2000 !important;
+  background: rgba(0,0,0,0.3);
+}
+
+.loader-container {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+}
+
+.loader-ripple {
+  display: inline-block;
+  position: relative;
+  width: 84px;
+  height: 84px;
+}
+
+.loader-ripple div {
+  position: absolute;
+  border: 4px solid #000;
+  opacity: 1;
+  border-radius: 50%;
+  animation: loader-ripple 1s cubic-bezier(0, 0.2, 0.8, 1) infinite;
+}
+
+.loader-ripple div:nth-child(2) {
+  animation-delay: -0.5s;
+}
+
+@keyframes loader-ripple {
+  0% {
+    top: 38px;
+    left: 38px;
+    width: 0;
+    height: 0;
+    opacity: 1;
+  }
+
+  100% {
+    top: -1px;
+    left: -1px;
+    width: 78px;
+    height: 78px;
+    opacity: 0;
+  }
+}
diff --git a/src/app/component/root/root.component.ts b/src/app/component/root/root.component.ts
index 090e97cdf..3096dac76 100644
--- a/src/app/component/root/root.component.ts
+++ b/src/app/component/root/root.component.ts
@@ -37,9 +37,10 @@ import { MobileAppsService } from '../../services/mobile-apps.service'
 import { RootService } from './root.service'
 import { SwUpdate } from '@angular/service-worker'
 import { environment } from '../../../environments/environment'
-import { interval, concat, timer } from 'rxjs'
+import { interval, concat, timer, Subscription } from 'rxjs'
 import { DialogConfirmComponent } from '../dialog-confirm/dialog-confirm.component'
 import { MatDialog } from '@angular/material'
+import { LoaderService } from '../../services/loader.service'
 // import { MatDialog } from '@angular/material'
 // import { DialogConfirmComponent } from '../dialog-confirm/dialog-confirm.component'
 
@@ -66,6 +67,8 @@ export class RootComponent implements OnInit, AfterViewInit {
   appStartRaised = false
   isSetupPage = false
   currentRouteData: any = []
+  isLoading = false
+  loaderSubscription!: Subscription
   constructor(
     public router: Router,
     private route: ActivatedRoute,
@@ -84,6 +87,7 @@ export class RootComponent implements OnInit, AfterViewInit {
     private utilitySvc: UtilityService,
     private eventSvc: EventService,
     public authSvc: AuthKeycloakService,
+    private loader: LoaderService,
   ) {
     this.mobileAppsSvc.init()
   }
@@ -171,6 +175,11 @@ export class RootComponent implements OnInit, AfterViewInit {
     this.rootSvc.showNavbarDisplay$.pipe(delay(500)).subscribe(display => {
       this.showNavbar = display
     })
+    this.loaderSubscription = this.loader.changeLoad.pipe(delay(200)).subscribe(
+      data => {
+        this.isLoading = data
+      },
+    )
   }
 
   raiseAppStartTelemetry() {
diff --git a/src/app/services/loader.service.ts b/src/app/services/loader.service.ts
index 58154cdad..1691cf402 100644
--- a/src/app/services/loader.service.ts
+++ b/src/app/services/loader.service.ts
@@ -4,12 +4,10 @@ import { Injectable } from '@angular/core'
 @Injectable()
 export class LoaderService {
   changeLoad = new BehaviorSubject<boolean>(false)
+  $currentState = this.changeLoad.asObservable()
 
-  private doubleBack = new BehaviorSubject(false)
-  currentState = this.doubleBack.asObservable()
-
-  changeLoadState(state: boolean) {
-    this.doubleBack.next(state)
+  changeLoaderState(state: boolean) {
+    this.changeLoad.next(state)
   }
 
 }

From c0cc4ba2d62da48557c5c0e0ea904cfaa72c2355 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Tue, 19 Dec 2023 00:34:31 +0530
Subject: [PATCH 349/887] breadcrumb changes done

---
 .../breadcrumb/breadcrumb.component.html           | 14 ++++++++++----
 .../components/breadcrumb/breadcrumb.component.ts  | 14 +++++++++++---
 .../components/stepper/stepper.component.ts        |  3 +++
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
index 4fd9a2423..d350d50bd 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
@@ -3,12 +3,18 @@
         <div class="home cursor-pointer" (click)="performRoute('list')">Training Plans
             <img src="/assets/icons/arrow-forward_small.svg" />
         </div>
-        <!-- <div class="home cursor-pointer" (click)="performRoute('create-plan')">Create CBP Plan
-            <img src="/assets/icons/arrow-forward_small.svg" />
-        </div> -->
-        <div class="action cursor-pointer">{{(tabType.CREATE_PLAN === selectedTab) ? 'Create CBP plan' :
+        <div class="home cursor-pointer" (click)="changeTabFromBreadCrumb('createPlan')">
+            Create CBP Plan
+            <img src="/assets/icons/arrow-forward_small.svg"
+                *ngIf="selectedTab !== tabType.CREATE_PLAN && !validationList?.titleIsInvalid" />
+        </div>
+        <!-- <div class="action cursor-pointer">{{(tabType.CREATE_PLAN === selectedTab) ? 'Create CBP plan' :
             (tabType.ADD_CONTENT === selectedTab) ? 'Add content' : (tabType.ADD_ASSIGNEE === selectedTab) ? 'Add
             assignee' : (tabType.ADD_TIMELINE === selectedTab) ? 'Add timeline' : ''}}
+        </div> -->
+        <div class="action" *ngIf="trainingPlanDataSharingService?.trainingPlanTitle &&
+        selectedTab !== tabType.CREATE_PLAN && !validationList?.titleIsInvalid">
+            {{trainingPlanDataSharingService?.trainingPlanTitle}}
         </div>
     </div>
     <div class="flex flex-1 flex-row right-breadcrumb" *ngIf="showBreadcrumbAction">
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
index b594bcd68..53e5a3568 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
@@ -21,8 +21,8 @@ export class BreadcrumbComponent implements OnInit {
   tabType = TrainingPlanContent.TTabLabelKey
 
   constructor(private router: Router, public dialog: MatDialog,
-              private trainingPlanDataSharingService: TrainingPlanDataSharingService,
-              private trainingPlanService: TrainingPlanService) { }
+    public trainingPlanDataSharingService: TrainingPlanDataSharingService,
+    private trainingPlanService: TrainingPlanService) { }
 
   ngOnInit() {
     this.checkIfDisabled()
@@ -51,6 +51,14 @@ export class BreadcrumbComponent implements OnInit {
 
   }
 
+  changeTabFromBreadCrumb(_item: string) {
+    switch (_item) {
+      case TrainingPlanContent.TTabLabelKey.CREATE_PLAN:
+        this.changeToNextTab.emit(TrainingPlanContent.TTabLabelKey.CREATE_PLAN)
+        break
+    }
+  }
+
   performRoute(route: any) {
     if (route === 'list') {
       this.trainingPlanDataSharingService.trainingPlanTitle = ''
@@ -115,7 +123,7 @@ export class BreadcrumbComponent implements OnInit {
         this.dialogRef.close()
         this.trainingPlanDataSharingService.trainingPlanTitle = ''
         this.router.navigateByUrl('app/home/training-plan-dashboard')
-      },         1000)
+      }, 1000)
     })
   }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
index aa16aae1b..05ddd71aa 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
@@ -29,6 +29,9 @@ export class StepperComponent implements OnInit, OnChanges {
   ngOnChanges() {
     if (this.changeTabOnNext) {
       switch (this.changeTabOnNext) {
+        case TrainingPlanContent.TTabLabelKey.CREATE_PLAN:
+          this.tabIndexValue = 0
+          break
         case TrainingPlanContent.TTabLabelKey.ADD_CONTENT:
           this.tabIndexValue = 1
           break

From 168561b3d2caf383b5a10ce0237b14db2d053d0c Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Tue, 19 Dec 2023 10:10:55 +0530
Subject: [PATCH 350/887] update for filter api integration

---
 .../filter-search/filter-search.module.ts     |  12 ++
 .../pipes/filter-search/filter-search.pipe.ts |  17 +++
 .../components/filter/filter.component.html   | 107 +++++------------
 .../components/filter/filter.component.scss   |   2 +-
 .../components/filter/filter.component.ts     | 109 +++++++++++++++++-
 .../services/traininig-plan.service.ts        |  17 ++-
 .../training-plan/training-plan.module.ts     |   4 +-
 7 files changed, 181 insertions(+), 87 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/pipes/filter-search/filter-search.module.ts
 create mode 100644 project/ws/app/src/lib/routes/pipes/filter-search/filter-search.pipe.ts

diff --git a/project/ws/app/src/lib/routes/pipes/filter-search/filter-search.module.ts b/project/ws/app/src/lib/routes/pipes/filter-search/filter-search.module.ts
new file mode 100644
index 000000000..699abf1e0
--- /dev/null
+++ b/project/ws/app/src/lib/routes/pipes/filter-search/filter-search.module.ts
@@ -0,0 +1,12 @@
+import { NgModule } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { FilterSearchPipe } from './filter-search.pipe'
+
+@NgModule({
+  declarations: [FilterSearchPipe],
+  imports: [
+    CommonModule,
+  ],
+  exports: [FilterSearchPipe],
+})
+export class FilterSearchPipeModule { }
diff --git a/project/ws/app/src/lib/routes/pipes/filter-search/filter-search.pipe.ts b/project/ws/app/src/lib/routes/pipes/filter-search/filter-search.pipe.ts
new file mode 100644
index 000000000..5cb32d1a8
--- /dev/null
+++ b/project/ws/app/src/lib/routes/pipes/filter-search/filter-search.pipe.ts
@@ -0,0 +1,17 @@
+import { Pipe, PipeTransform } from '@angular/core'
+
+@Pipe({
+    name: 'filterSearch',
+})
+export class FilterSearchPipe implements PipeTransform {
+
+    transform(items: any[], searchText: string): any {
+        if (!items) { return [] }
+        if (!searchText) { return items }
+        const searchTextLowerCase = searchText.toLowerCase()
+        return items.filter(it => {
+            return it.name.toLowerCase().includes(searchTextLowerCase)
+        })
+    }
+
+}
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
index b18b29e85..04441a9fd 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
@@ -11,29 +11,23 @@
                 <mat-accordion>
                     <!-- (opened)="panelOpenState = true"
                         (closed)="panelOpenState = false" -->
-                    <mat-expansion-panel disableRipple>
+                    <mat-expansion-panel disableRipple [expanded]="true">
                         <mat-expansion-panel-header>
                             <mat-panel-title>
                                 Competency Area
                             </mat-panel-title>
                         </mat-expansion-panel-header>
-                        <div class="flex flex-1 flex-row category-item">
-                            <mat-checkbox disableRipple class="example-margin">Behavioural</mat-checkbox>
-                        </div>
-                        <div class="flex flex-1 flex-row category-item">
-                            <mat-checkbox disableRipple class="example-margin">Functional</mat-checkbox>
-                        </div>
-                        <div class="flex flex-1 flex-row category-item">
-                            <mat-checkbox disableRipple class="example-margin">Domain</mat-checkbox>
+                        <div class="flex flex-1 flex-row category-item" *ngFor="let ctype of competencyTypeList">
+                            <mat-checkbox disableRipple class="example-margin" (change)="getCompetencyTheme($event, ctype)">{{ctype?.name}}</mat-checkbox>
                         </div>
                     </mat-expansion-panel>
                 </mat-accordion>
             </div>
-            <div class="spacer"></div>
+            <!-- <div class="spacer"></div>
             <div class="filter-content flex flex-1">
                 <mat-accordion>
-                    <mat-expansion-panel>
-                        <mat-expansion-panel-header disableRipple>
+                    <mat-expansion-panel disableRipple [expanded]="true">
+                        <mat-expansion-panel-header >
                             <mat-panel-title>
                                 Competency Type
                             </mat-panel-title>
@@ -46,12 +40,12 @@
                         </div>
                     </mat-expansion-panel>
                 </mat-accordion>
-            </div>
-            <div class="spacer"></div>
-            <div class="filter-content flex flex-1">
+            </div> -->
+            <div class="spacer" *ngIf="competencyThemeList.length"></div>
+            <div class="filter-content flex flex-1" *ngIf="competencyThemeList.length">
                 <mat-accordion>
-                    <mat-expansion-panel>
-                        <mat-expansion-panel-header disableRipple>
+                    <mat-expansion-panel disableRipple [expanded]="true">
+                        <mat-expansion-panel-header>
                             <mat-panel-title>
                                 Competency Theme
                             </mat-panel-title>
@@ -59,37 +53,22 @@
                             <div class="search-container">
                                 <div class="rsearch"><mat-icon
                                     class="color-60 search-icon mat-icon notranslate material-icons mat-icon-no-color">search</mat-icon>
-                                <input class="sinput color-60" label="" placeholder="Enter competency theme" type="Standard">
+                                <input #searchInput class="sinput color-60" label="" [formControl]='searchThemeControl' placeholder="Enter competency theme" type="Standard">
                                 </div>
                             </div>
                             <div class="category-content">
-                                <div class="flex flex-1 flex-row category-item">
-                                    <mat-checkbox disableRipple class="example-margin">Self-Awareness</mat-checkbox>
-                                </div>
-                                <div class="flex flex-1 flex-row category-item">
-                                    <mat-checkbox disableRipple class="example-margin">Personal Effectiveness</mat-checkbox>
-                                </div>
-                                <div class="flex flex-1 flex-row category-item">
-                                    <mat-checkbox disableRipple class="example-margin">Solution Orientation</mat-checkbox>
-                                </div>
-                                <div class="flex flex-1 flex-row category-item">
-                                    <mat-checkbox disableRipple class="example-margin">Communication</mat-checkbox>
-                                </div>
-                                <div class="flex flex-1 flex-row category-item">
-                                    <mat-checkbox disableRipple class="example-margin">Creativity & innovation</mat-checkbox>
-                                </div>
-                                <div class="flex flex-1 flex-row category-item">
-                                    <mat-checkbox disableRipple class="example-margin">Personal Effectiveness</mat-checkbox>
-                                </div>
+                                <div class="flex flex-1 flex-row category-item" *ngFor="let ctitem of competencyThemeList | filterSearch: searchInput.value">
+                                    <mat-checkbox disableRipple class="example-margin"  (change)="getCompetencySubTheme($event, ctitem)">{{ctitem?.name}}</mat-checkbox>
+                                </div>                               
                             </div>
                         
                     </mat-expansion-panel>
                 </mat-accordion>
             </div>
-            <div class="spacer"></div>
-            <div class="filter-content flex flex-1">
+            <div class="spacer"  *ngIf="competencySubThemeList.length"></div>
+            <div class="filter-content flex flex-1" *ngIf="competencySubThemeList.length">
                 <mat-accordion>
-                    <mat-expansion-panel>
+                    <mat-expansion-panel disableRipple [expanded]="true">
                         <mat-expansion-panel-header>
                             <mat-panel-title>
                                 Competency Sub-Theme
@@ -98,59 +77,29 @@
                         <div class="search-container">
                             <div class="rsearch"><mat-icon
                                 class="color-60 search-icon mat-icon notranslate material-icons mat-icon-no-color">search</mat-icon>
-                            <input class="sinput color-60" label="" placeholder="Enter competency sub-theme" type="Standard">
+                            <input #searchThemeInput class="sinput color-60" label="" placeholder="Enter competency sub-theme" type="Standard">
                             </div>
                         </div>
                         <div class="category-content">
-                            <div class="flex flex-1 flex-row category-item">
-                                <mat-checkbox disableRipple class="example-margin">Diversity & Inclusion</mat-checkbox>
-                            </div>
-                            <div class="flex flex-1 flex-row category-item">
-                                <mat-checkbox disableRipple class="example-margin">Personal Effectiveness</mat-checkbox>
-                            </div>
-                            <div class="flex flex-1 flex-row category-item">
-                                <mat-checkbox disableRipple class="example-margin">Solution Orientation</mat-checkbox>
-                            </div>
-                            <div class="flex flex-1 flex-row category-item">
-                                <mat-checkbox disableRipple class="example-margin">Communication</mat-checkbox>
-                            </div>
-                            <div class="flex flex-1 flex-row category-item">
-                                <mat-checkbox disableRipple class="example-margin">Creativity & innovation</mat-checkbox>
-                            </div>
-                            <div class="flex flex-1 flex-row category-item">
-                                <mat-checkbox disableRipple class="example-margin">Personal Effectiveness</mat-checkbox>
-                            </div>
+                            <div class="flex flex-1 flex-row category-item" *ngFor="let cstitem of competencySubThemeList | filterSearch: searchThemeInput.value">
+                                <mat-checkbox disableRipple class="example-margin"  (change)="manageCompetencySubTheme($event, cstitem)">{{cstitem?.name}}</mat-checkbox>
+                            </div> 
                         </div>
                     </mat-expansion-panel>
                 </mat-accordion>
             </div>
-            <div class="spacer"></div>
-            <div class="filter-content flex flex-1">
+            <div class="spacer" *ngIf="providersList.length"></div>
+            <div class="filter-content flex flex-1" *ngIf="providersList.length">
                 <mat-accordion>
-                    <mat-expansion-panel>
-                        <mat-expansion-panel-header disableRipple>
+                    <mat-expansion-panel disableRipple [expanded]="true">
+                        <mat-expansion-panel-header>
                             <mat-panel-title>
                                 Provider
                             </mat-panel-title>
                         </mat-expansion-panel-header>
                         <div class="category-content">
-                            <div class="flex flex-1 flex-row category-item">
-                                <mat-checkbox disableRipple class="example-margin">Diversity & Inclusion</mat-checkbox>
-                            </div>
-                            <div class="flex flex-1 flex-row category-item">
-                                <mat-checkbox disableRipple class="example-margin">Personal Effectiveness</mat-checkbox>
-                            </div>
-                            <div class="flex flex-1 flex-row category-item">
-                                <mat-checkbox disableRipple class="example-margin">Solution Orientation</mat-checkbox>
-                            </div>
-                            <div class="flex flex-1 flex-row category-item">
-                                <mat-checkbox disableRipple class="example-margin">Communication</mat-checkbox>
-                            </div>
-                            <div class="flex flex-1 flex-row category-item">
-                                <mat-checkbox disableRipple class="example-margin">Creativity & innovation</mat-checkbox>
-                            </div>
-                            <div class="flex flex-1 flex-row category-item">
-                                <mat-checkbox disableRipple class="example-margin">Personal Effectiveness</mat-checkbox>
+                            <div class="flex flex-1 flex-row category-item" *ngFor="let item of providersList">
+                                <mat-checkbox disableRipple class="example-margin" (change)="checkedProviders($event, item?.orgId)">{{item?.name}}</mat-checkbox>
                             </div>
                         </div>
                     </mat-expansion-panel>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.scss b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.scss
index 735902c53..163c778f0 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.scss
@@ -147,7 +147,7 @@
 }
 
 ::-webkit-scrollbar {
-    width: 2px;
+    width: 4px;
 }
 
 ::-webkit-scrollbar-track {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index 6e7652eb6..57252a106 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -1,5 +1,8 @@
 import { Component, EventEmitter, OnInit, Output } from '@angular/core'
-import {  } from 'stream'
+import { TrainingPlanService } from './../../services/traininig-plan.service';
+import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service';
+import { FormControl } from '@angular/forms';
+import { debounceTime } from 'rxjs/operators';
 
 @Component({
   selector: 'ws-app-filter',
@@ -8,12 +11,114 @@ import {  } from 'stream'
 })
 export class FilterComponent implements OnInit {
   @Output() toggleFilter = new EventEmitter()
-  constructor() { }
+  providersList: any[] = [];
+  selectedProviders: any[] = [];
+  competencyTypeList = [{ "id": "Behavioral", name: 'Behavioural' }, { "id": 'Functional', name: 'Functional' }, { "id": 'Domain', name: 'Domain' }];
+  competencyList: any = [];
+  competencyThemeList: any[] = [];
+  competencySubThemeList: any[] = [];
+  searchThemeControl = new FormControl();
+  constructor(private trainingPlanService: TrainingPlanService, private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
+    this.getFilterEntity();
+    this.getProviders();
+    console.log('trainingPlanDataSharingService--',this.trainingPlanDataSharingService)
+    // this.searchThemeControl.valueChanges.pipe(
+    //   debounceTime(500),
+    // ).subscribe((_value: any) => {
+    //   console.log('_value', _value);
+    //   if(_value) {
+    //     this.competencyThemeList = this.competencyThemeList.filter((sitem) => {
+    //       return sitem.name.toLowerCase().includes(_value.toLowerCase());
+    //     })
+    //     console.log(this.competencyThemeList)
+    //   }
+     
+    // });
+  }
+
+  getFilterEntity() {
+    let filterObj = {
+      "search": {
+        "type": "Competency Area"
+      },
+      "filter": {
+        "isDetail": true
+      }
+    }
+    this.trainingPlanService.getFilterEntity(filterObj).subscribe((res: any) => {
+      console.log('entity,', res);
+      this.competencyList = res;
+
+    })
+  }
+  getProviders() {
+    this.trainingPlanService.getProviders().subscribe((res: any) => {
+      console.log('providers,', res);
+      this.providersList = res;
+    })
   }
 
   hideFilter() {
     this.toggleFilter.emit(false)
   }
+
+  checkedProviders(event: any, item: any) {
+    if (event) {
+      this.selectedProviders.push(item);
+    } else {
+      if (this.selectedProviders.indexOf(item) > -1) {
+        const index = this.selectedProviders.findIndex((x: any) => x === item)
+        this.selectedProviders.splice(index, 1)
+      }
+    }
+  }
+
+  getCompetencyTheme(event: any, ctype: any) {
+    console.log('ctype', ctype, this.competencyList, event);
+    if (event.checked) {
+      this.competencyList.map((citem: any) => {
+        if (citem.name === ctype.id) {
+          console.log(citem.name, ctype.name, citem.children)
+          citem.children.map((themechild: any) => {
+            themechild['parent'] = ctype.id;
+          })
+          this.competencyThemeList = this.competencyThemeList.concat(citem.children);
+          console.log('competencyThemeList', this.competencyThemeList)
+        }
+      })
+    } else {
+      this.competencyThemeList = this.competencyThemeList.filter((sitem) => {
+        return sitem.parent != ctype.id
+      })
+    }
+    console.log('competencyThemeList', this.competencyThemeList)
+  }
+
+  getCompetencySubTheme(event: any, cstype: any) {
+    console.log('cstype.parent', cstype.name)
+    if (event.checked) {
+      this.competencyThemeList.map((csitem: any) => {
+        if (csitem.name === cstype.name) {
+          csitem.children.map((subthemechild: any) => {
+            subthemechild['parentType'] = csitem.parent;
+            subthemechild['parent'] = csitem.name;
+          })
+          this.competencySubThemeList = this.competencySubThemeList.concat(csitem.children);
+        }
+      })
+    } else {
+      this.competencySubThemeList = this.competencySubThemeList.filter((sitem) => {
+        return sitem.parent != cstype.name
+      })
+    }
+    console.log('this.competencySubThemeList', this.competencySubThemeList);
+  }
+
+
+
+  manageCompetencySubTheme(event: any, csttype: any) {
+    console.log('cstype, event --', event, csttype);
+  }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts b/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
index 6bb13f797..cd595bf1c 100644
--- a/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
+++ b/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
@@ -12,10 +12,11 @@ const API_END_POINTS = {
   UPDATE_PLAN: 'apis/proxies/v8/cbplan/v1/update',
   ARCHIVE_PLAN: 'apis/proxies/v8/cbplan/v1/archive',
   PUBLISH_PLAN: 'apis/proxies/v8/cbplan/v1/publish',
-  GET_ALL_CONTENT: '/apis/proxies/v8/sunbirdigot/search',
-  GET_ALL_USERS: '/apis/proxies/v8/user/v1/search',
-  GET_ALL_DESIGNATIONS: '/apis/proxies/v8/masterData/v2/deptPosition',
-
+  GET_ALL_CONTENT: 'apis/proxies/v8/sunbirdigot/search',
+  GET_ALL_USERS: 'apis/proxies/v8/user/v1/search',
+  GET_ALL_DESIGNATIONS: 'apis/proxies/v8/masterData/v2/deptPosition',
+  GET_PROVIDERS: 'apis/proxies/v8/searchBy/provider',
+  GET_FILTER_ENTITY: 'apis/proxies/v8/competency/v4/search'
 }
 @Injectable({
   providedIn: 'root',
@@ -57,5 +58,13 @@ export class TrainingPlanService {
     return this.http.get<any>(API_END_POINTS.GET_ALL_DESIGNATIONS)
   }
 
+  getFilterEntity(filter:object): Observable<any> {
+    return this.http.post<any>(`${API_END_POINTS.GET_FILTER_ENTITY}`, filter).pipe(map(res => _.get(res, 'result.competency')))
+  }
+
+  getProviders() {
+    return this.http.get<any>(API_END_POINTS.GET_PROVIDERS);
+  }
+
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
index 5aeaed8d8..31c1bf038 100644
--- a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
+++ b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
@@ -25,6 +25,7 @@ import {
 import { PipePublicURLModule } from '../pipes/pipe-public-URL/pipe-public-URL.module';
 import { PipeDurationTransformModule } from '../pipes/pipe-duration-transform/pipe-duration-transform.module';
 import { DefaultThumbnailModule } from '../directives/default-thumbnail/default-thubnail.module';
+import { FilterSearchPipeModule } from '../pipes/filter-search/filter-search.module';
 import { MatMenuModule } from '@angular/material/menu'
 import { MatPaginatorModule } from '@angular/material/paginator'
 import { MatCardModule } from '@angular/material/card'
@@ -133,7 +134,8 @@ import { LoaderService } from '../../../../../../../src/app/services/loader.serv
     MatDatepickerModule,
     PipePublicURLModule,
     PipeDurationTransformModule,
-    DefaultThumbnailModule
+    DefaultThumbnailModule,
+    FilterSearchPipeModule
   ],
   entryComponents: [
     ConfirmationBoxComponent,

From 6e2e885188672f202ceba3878c4e734fc96957b0 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Tue, 19 Dec 2023 10:24:27 +0530
Subject: [PATCH 351/887] update for lint error

---
 .../components/filter/filter.component.ts       | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index 57252a106..19dfe020c 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -1,8 +1,6 @@
 import { Component, EventEmitter, OnInit, Output } from '@angular/core'
 import { TrainingPlanService } from './../../services/traininig-plan.service';
-import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service';
 import { FormControl } from '@angular/forms';
-import { debounceTime } from 'rxjs/operators';
 
 @Component({
   selector: 'ws-app-filter',
@@ -18,24 +16,11 @@ export class FilterComponent implements OnInit {
   competencyThemeList: any[] = [];
   competencySubThemeList: any[] = [];
   searchThemeControl = new FormControl();
-  constructor(private trainingPlanService: TrainingPlanService, private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
+  constructor(private trainingPlanService: TrainingPlanService) { }
 
   ngOnInit() {
     this.getFilterEntity();
     this.getProviders();
-    console.log('trainingPlanDataSharingService--',this.trainingPlanDataSharingService)
-    // this.searchThemeControl.valueChanges.pipe(
-    //   debounceTime(500),
-    // ).subscribe((_value: any) => {
-    //   console.log('_value', _value);
-    //   if(_value) {
-    //     this.competencyThemeList = this.competencyThemeList.filter((sitem) => {
-    //       return sitem.name.toLowerCase().includes(_value.toLowerCase());
-    //     })
-    //     console.log(this.competencyThemeList)
-    //   }
-     
-    // });
   }
 
   getFilterEntity() {

From 3902e25e5bec4dda33f22540e7317c7b56692063 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Tue, 19 Dec 2023 14:00:49 +0530
Subject: [PATCH 352/887] update for filter passed to content search

---
 .../training-plan-dashboard.component.ts      |  1 +
 .../breadcrumb/breadcrumb.component.ts        |  6 ++++
 .../components/filter/filter.component.html   |  2 +-
 .../components/filter/filter.component.ts     | 34 ++++++++++++++++---
 .../components/search/search.component.html   |  2 +-
 .../components/search/search.component.ts     |  9 ++++-
 .../create-content.component.ts               | 12 +++----
 .../services/traininig-plan.service.ts        | 10 ++++--
 8 files changed, 60 insertions(+), 16 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
index bcfc572a6..6ccff4409 100644
--- a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
@@ -184,6 +184,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
     this.trainingPlanService.archivePlan(obj).subscribe((_data: any) => {
       this.snackBar.open('CBP plan deleted successfully.')
       this.loaderService.changeLoaderState(false)
+      this.getDraftData()
     }, (_error) => {
       this.loaderService.changeLoaderState(false)
     })
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
index 53e5a3568..aa8bf45d8 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
@@ -114,6 +114,12 @@ export class BreadcrumbComponent implements OnInit {
 
   createPlanDraftView() {
     this.trainingPlanDataSharingService.trainingPlanStepperData.name = this.trainingPlanDataSharingService.trainingPlanTitle
+    if(this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentType === 'All Users') {
+      this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentType = "allUsers";
+      this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo = [
+        "allUsers"
+      ];
+    }
     const obj = { request: this.trainingPlanDataSharingService.trainingPlanStepperData }
     this.showDialogBox('progress')
     this.trainingPlanService.createPlan(obj).subscribe((_data: any) => {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
index 04441a9fd..6bd8037d7 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
@@ -111,7 +111,7 @@
                 <div class="filter-clear" (click)="hideFilter()">
                     Clear
                 </div>
-                <div class="filter-apply" (click)="hideFilter()">
+                <div class="filter-apply" (click)="applyFilter()">
                     Apply
                 </div>
             </div>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index 19dfe020c..655f3b1ca 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -8,13 +8,15 @@ import { FormControl } from '@angular/forms';
   styleUrls: ['./filter.component.scss'],
 })
 export class FilterComponent implements OnInit {
-  @Output() toggleFilter = new EventEmitter()
+  @Output() toggleFilter = new EventEmitter() 
+  @Output() getFilterData = new EventEmitter();
   providersList: any[] = [];
   selectedProviders: any[] = [];
   competencyTypeList = [{ "id": "Behavioral", name: 'Behavioural' }, { "id": 'Functional', name: 'Functional' }, { "id": 'Domain', name: 'Domain' }];
   competencyList: any = [];
   competencyThemeList: any[] = [];
   competencySubThemeList: any[] = [];
+  filterObj:any = {"competencyArea":[], "competencyTheme": [], "competencySubTheme": []};
   searchThemeControl = new FormControl();
   constructor(private trainingPlanService: TrainingPlanService) { }
 
@@ -52,11 +54,9 @@ export class FilterComponent implements OnInit {
   checkedProviders(event: any, item: any) {
     if (event) {
       this.selectedProviders.push(item);
+      
     } else {
-      if (this.selectedProviders.indexOf(item) > -1) {
-        const index = this.selectedProviders.findIndex((x: any) => x === item)
-        this.selectedProviders.splice(index, 1)
-      }
+      
     }
   }
 
@@ -69,6 +69,7 @@ export class FilterComponent implements OnInit {
           citem.children.map((themechild: any) => {
             themechild['parent'] = ctype.id;
           })
+          this.filterObj['competencyArea'].push(citem.name);
           this.competencyThemeList = this.competencyThemeList.concat(citem.children);
           console.log('competencyThemeList', this.competencyThemeList)
         }
@@ -77,6 +78,10 @@ export class FilterComponent implements OnInit {
       this.competencyThemeList = this.competencyThemeList.filter((sitem) => {
         return sitem.parent != ctype.id
       })
+      if (this.filterObj['competencyArea'].indexOf(ctype.id) > -1) {
+        const index = this.filterObj['competencyArea'].findIndex((x: any) => x === ctype.id)
+        this.filterObj['competencyArea'].splice(index, 1);
+      }
     }
     console.log('competencyThemeList', this.competencyThemeList)
   }
@@ -91,12 +96,17 @@ export class FilterComponent implements OnInit {
             subthemechild['parent'] = csitem.name;
           })
           this.competencySubThemeList = this.competencySubThemeList.concat(csitem.children);
+          this.filterObj['competencyTheme'].push(cstype.name);
         }
       })
     } else {
       this.competencySubThemeList = this.competencySubThemeList.filter((sitem) => {
         return sitem.parent != cstype.name
       })
+      if (this.filterObj['competencyTheme'].indexOf(cstype.name) > -1) {
+        const index = this.filterObj['competencyTheme'].findIndex((x: any) => x === cstype.name)
+        this.filterObj['competencyTheme'].splice(index, 1)
+      }
     }
     console.log('this.competencySubThemeList', this.competencySubThemeList);
   }
@@ -105,5 +115,19 @@ export class FilterComponent implements OnInit {
 
   manageCompetencySubTheme(event: any, csttype: any) {
     console.log('cstype, event --', event, csttype);
+    if(event.checked) {
+      this.filterObj['competencySubTheme'].push(csttype.name);
+    } else {
+      if (this.filterObj['competencySubTheme'].indexOf(csttype.name) > -1) {
+        const index = this.filterObj['competencySubTheme'].findIndex((x: any) => x === csttype.name)
+        this.filterObj['competencySubTheme'].splice(index, 1)
+      }
+    }
+    
+  }
+
+  applyFilter() {
+    this.getFilterData.emit(this.filterObj);
+    this.toggleFilter.emit(false)
   }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
index aa4299d22..ebbce40bd 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
@@ -20,5 +20,5 @@
     </div>
 </div>
 <ng-container *ngIf="filterVisibilityFlag">
-    <ws-app-filter (toggleFilter)="hideFilter($event)"></ws-app-filter>
+    <ws-app-filter (toggleFilter)="hideFilter($event)" (getFilterData)="getFilterData($event)"></ws-app-filter>
 </ng-container>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 4c6392426..a420b2550 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -68,7 +68,7 @@ export class SearchComponent implements OnInit {
     }
   }
 
-  getContent(contentType: any) {
+  getContent(contentType: any, applyFilterObj?:any) {
     this.loadingService.changeLoaderState(true)
     if (contentType) {
       if (contentType === 'Moderated Course') {
@@ -79,6 +79,9 @@ export class SearchComponent implements OnInit {
           "secureSettings": contentType === 'Moderated Course' ? true : false, // for moderated course
           "filters": {
             "primaryCategory": [contentType === 'Moderated Course' ? 'Course' : contentType],
+            "competencies_v5.competencyArea": applyFilterObj && applyFilterObj['competencyArea'].length ? applyFilterObj['competencyArea'] : [],
+            "competencies_v5.competencyTheme": applyFilterObj && applyFilterObj['competencyTheme'].length ? applyFilterObj['competencyTheme'] : [],
+            "competencies_v5.competencySubTheme" : applyFilterObj && applyFilterObj['competencySubTheme'].length ? applyFilterObj['competencySubTheme'] : []
           },
           "offset": 0,
           "limit": 20,
@@ -168,4 +171,8 @@ export class SearchComponent implements OnInit {
     }
   }
 
+  getFilterData(event:any) {
+    this.getContent(this.selectedDropDownValue, event);
+  }
+
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
index 7d26db5f4..6d9bf76a9 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
@@ -24,9 +24,9 @@ export class CreateContentComponent implements OnInit {
         value: 'Course',
       },
       {
-        id: 2,
-        name: 'Program',
-        value: 'Program',
+        id: 4,
+        name: 'Curated program',
+        value: 'Curated program',
       },
       {
         id: 3,
@@ -34,9 +34,9 @@ export class CreateContentComponent implements OnInit {
         value: 'Blended program',
       },
       {
-        id: 4,
-        name: 'Curated program',
-        value: 'Curated program',
+        id: 2,
+        name: 'Program',
+        value: 'Program',
       },
       {
         id: 5,
diff --git a/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts b/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
index 83bf66e9e..c7dc10b2a 100644
--- a/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
+++ b/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core'
-import { HttpClient } from '@angular/common/http'
+import { HttpClient, HttpHeaders } from '@angular/common/http'
 import { Observable } from 'rxjs'
 import { map } from 'rxjs/operators'
 // tslint:disable
@@ -39,7 +39,13 @@ export class TrainingPlanService {
   }
 
   archivePlan(obj: any) {
-    return this.http.post<any>(`${API_END_POINTS.ARCHIVE_PLAN}`, obj)
+    const options = {
+      headers: new HttpHeaders({
+        'Content-Type': 'application/json',
+      }),
+      body: obj,
+    };
+    return this.http.delete<any>(`${API_END_POINTS.ARCHIVE_PLAN}`, options)
   }
 
   publishPlan(obj: any) {

From 6a67fa0977fc030aabb38b70fc92ba2ed6083de7 Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Tue, 19 Dec 2023 16:31:58 +0530
Subject: [PATCH 353/887] group tab added for approval form

---
 .../routes/approvals/routes/position/position.component.html | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/project/ws/app/src/lib/routes/approvals/routes/position/position.component.html b/project/ws/app/src/lib/routes/approvals/routes/position/position.component.html
index bac8ecbbe..5f2d32bdc 100644
--- a/project/ws/app/src/lib/routes/approvals/routes/position/position.component.html
+++ b/project/ws/app/src/lib/routes/approvals/routes/position/position.component.html
@@ -30,6 +30,11 @@
                   <input type="text" [disabled]="true"
                     [value]="professionalDetails.industry ? professionalDetails.industry : ''" class="appr-text-field">
                 </mat-grid-tile>
+                <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                  <label class="appr-text-label">Group</label>
+                  <input type="text" [disabled]="true" [value]="professionalDetails.group ? professionalDetails.group : ''"
+                    class="appr-text-field">
+                </mat-grid-tile>
                 <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                   <label class="appr-text-label">Designation</label>
                   <input type="text" [disabled]="true"

From ec76a05995a935cc411bc7cdfae91d768b7a429e Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Tue, 19 Dec 2023 18:22:06 +0530
Subject: [PATCH 354/887] update for filter and search for add assignee

---
 .../add-plan-information.component.ts         |  2 +-
 .../breadcrumb/breadcrumb.component.ts        |  3 ++
 .../category-drop-down.component.ts           | 48 +++++++++++++++++--
 .../components/chip/chip.component.html       |  6 +--
 .../components/filter/filter.component.html   | 10 ++--
 .../components/filter/filter.component.ts     | 44 +++++++++++++----
 .../components/search/search.component.html   |  6 +--
 .../components/search/search.component.ts     |  6 ++-
 .../user-card/user-card.component.ts          |  4 +-
 .../preview-plan/preview-plan.component.html  |  4 +-
 .../training-plan-data-share.service.ts       |  2 +
 11 files changed, 103 insertions(+), 32 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
index 404b9a735..719d2b6a9 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
@@ -29,7 +29,7 @@ export class AddPlanInformationComponent implements OnInit {
                         [Validators.required, Validators.minLength(10)]),
     })
     
-    this.contentForm.controls['name'].valueChanges.pipe(debounceTime(700)).subscribe((_ele: any) => {
+    this.contentForm.controls['name'].valueChanges.pipe(debounceTime(200)).subscribe((_ele: any) => {
       if (!this.contentForm.invalid) {
         this.trainingPlanDataSharingSvc.trainingPlanTitle = _ele
         this.trainingPlanDataSharingSvc.trainingPlanStepperData.name = _ele
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
index aa8bf45d8..4da2e0be9 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
@@ -120,6 +120,9 @@ export class BreadcrumbComponent implements OnInit {
         "allUsers"
       ];
     }
+    if(this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentType === 'Custom Users') {
+      this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentType = "custom";
+    }
     const obj = { request: this.trainingPlanDataSharingService.trainingPlanStepperData }
     this.showDialogBox('progress')
     this.trainingPlanService.createPlan(obj).subscribe((_data: any) => {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
index 69ab02831..5bbcd6aa6 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
@@ -23,6 +23,7 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
     // }
     this.trainingPlanDataSharingService.trainingPlanCategoryChangeEvent.subscribe((data: any) => {
       if (data && data.event) {
+        this.trainingPlanDataSharingService.trainingPlanStepperData.contentList = [];
         this.handleCategorySelection.emit(data.event)
       }
     })
@@ -52,6 +53,11 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['event'] = 'Course'
         this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event;
         this.trainingPlanDataSharingService.moderatedCourseSelectStatus.next(false);
+        if(this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.length) {
+          this.openDialoagBox(dialogData)
+        } else {
+          this.handleCategorySelection.emit(event);
+        }
         break
       case 'Program':
         dialogData['type'] = 'normal'
@@ -64,6 +70,11 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['event'] = 'Program'
         this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event;
         this.trainingPlanDataSharingService.moderatedCourseSelectStatus.next(false);
+        if(this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.length) {
+          this.openDialoagBox(dialogData)
+        } else {
+          this.handleCategorySelection.emit(event);
+        }
         break
       case 'Blended program':
         dialogData['type'] = 'normal'
@@ -76,6 +87,11 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['event'] = 'Blended program'
         this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event
         this.trainingPlanDataSharingService.moderatedCourseSelectStatus.next(false);
+        if(this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.length) {
+          this.openDialoagBox(dialogData)
+        } else {
+          this.handleCategorySelection.emit(event);
+        }
         break
       case 'Curated program':
         dialogData['type'] = 'normal'
@@ -88,6 +104,11 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['event'] = 'Curated program'
         this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event
         this.trainingPlanDataSharingService.moderatedCourseSelectStatus.next(false);
+        if(this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.length) {
+          this.openDialoagBox(dialogData)
+        } else {
+          this.handleCategorySelection.emit(event);
+        }
         break
       case 'Moderated Course':
         dialogData['type'] = 'normal'
@@ -98,8 +119,12 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['primaryAction'] = 'I understand, change content type'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Moderated Course'
-        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event
-        
+        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event;
+        if(this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.length) {
+          this.openDialoagBox(dialogData)
+        } else {
+          this.handleCategorySelection.emit(event);
+        }        
         break
       case 'Designation':
         dialogData['type'] = 'normal'
@@ -111,6 +136,11 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Designation'
         this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType'] = event
+        if(this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.length) {
+          this.openDialoagBox(dialogData)
+        } else {
+          this.handleCategorySelection.emit(event);
+        }
         break
       case 'All Users':
         dialogData['type'] = 'normal'
@@ -122,6 +152,11 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'All Users'
         this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType'] = event
+        if(this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.length) {
+          this.openDialoagBox(dialogData)
+        } else {
+          this.handleCategorySelection.emit(event);
+        }
         break
       case 'Custom Users':
         dialogData['type'] = 'normal'
@@ -133,11 +168,16 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Custom Users'
         this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType'] = event
+        if(this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.length) {
+          this.openDialoagBox(dialogData)
+        } else {
+          this.handleCategorySelection.emit(event);
+        }
         break
     }
-
+    
     // this.handleCategorySelection.emit(event);
-    this.openDialoagBox(dialogData)
+   // this.openDialoagBox(dialogData)
   }
 
   openDialoagBox(dialogData: any) {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
index f66fd33c4..631c576f1 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
@@ -12,7 +12,7 @@
             </div>
         </ng-container>
         <a mat-button class="select-more-link margin-left-m" *ngIf="selectContentCount > 3"
-            (click)="navigateToPreviewPage()">+3 more</a>
+            (click)="navigateToPreviewPage()">+{{selectContentCount - 3}} more</a>
     </div>
     <div class="flex flex-1 flex-row right-section flex-middle">
         <a mat-button class="select-more-link" (click)="clearAll()">Clear all</a>
@@ -34,7 +34,7 @@
             </div>
         </ng-container>
         <a mat-button class="select-more-link margin-left-m" *ngIf="selectAssigneeCount > 3"
-            (click)="navigateToPreviewPage()">+3 more</a>
+            (click)="navigateToPreviewPage()">+{{selectContentCount - 3}} more</a>
     </div>
     <div class="flex flex-1 flex-row right-section flex-middle">
         <a mat-button class="select-more-link" (click)="clearAll()">Clear all</a>
@@ -55,7 +55,7 @@
             </div>
         </ng-container>
         <a mat-button class="select-more-link margin-left-m" *ngIf="selectAssigneeCount > 3"
-            (click)="navigateToPreviewPage()">+3 more</a>
+            (click)="navigateToPreviewPage()">+{{selectContentCount - 3}} more</a>
     </div>
     <div class="flex flex-1 flex-row right-section flex-middle">
         <a mat-button class="select-more-link" (click)="clearAll()">Clear all</a>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
index 6bd8037d7..501ebb9d3 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
@@ -18,7 +18,7 @@
                             </mat-panel-title>
                         </mat-expansion-panel-header>
                         <div class="flex flex-1 flex-row category-item" *ngFor="let ctype of competencyTypeList">
-                            <mat-checkbox disableRipple class="example-margin" (change)="getCompetencyTheme($event, ctype)">{{ctype?.name}}</mat-checkbox>
+                            <mat-checkbox #checkboxes disableRipple class="example-margin" (change)="getCompetencyTheme($event, ctype)">{{ctype?.name}}</mat-checkbox>
                         </div>
                     </mat-expansion-panel>
                 </mat-accordion>
@@ -58,7 +58,7 @@
                             </div>
                             <div class="category-content">
                                 <div class="flex flex-1 flex-row category-item" *ngFor="let ctitem of competencyThemeList | filterSearch: searchInput.value">
-                                    <mat-checkbox disableRipple class="example-margin"  (change)="getCompetencySubTheme($event, ctitem)">{{ctitem?.name}}</mat-checkbox>
+                                    <mat-checkbox #checkboxes disableRipple class="example-margin"  (change)="getCompetencySubTheme($event, ctitem)">{{ctitem?.name}}</mat-checkbox>
                                 </div>                               
                             </div>
                         
@@ -82,7 +82,7 @@
                         </div>
                         <div class="category-content">
                             <div class="flex flex-1 flex-row category-item" *ngFor="let cstitem of competencySubThemeList | filterSearch: searchThemeInput.value">
-                                <mat-checkbox disableRipple class="example-margin"  (change)="manageCompetencySubTheme($event, cstitem)">{{cstitem?.name}}</mat-checkbox>
+                                <mat-checkbox #checkboxes disableRipple class="example-margin"  (change)="manageCompetencySubTheme($event, cstitem)">{{cstitem?.name}}</mat-checkbox>
                             </div> 
                         </div>
                     </mat-expansion-panel>
@@ -99,7 +99,7 @@
                         </mat-expansion-panel-header>
                         <div class="category-content">
                             <div class="flex flex-1 flex-row category-item" *ngFor="let item of providersList">
-                                <mat-checkbox disableRipple class="example-margin" (change)="checkedProviders($event, item?.orgId)">{{item?.name}}</mat-checkbox>
+                                <mat-checkbox #checkboxes disableRipple class="example-margin" (change)="checkedProviders($event, item?.name)">{{item?.name}}</mat-checkbox>
                             </div>
                         </div>
                     </mat-expansion-panel>
@@ -108,7 +108,7 @@
         </div>
         <div class="filter-footer flex flex-1">
             <div class="flex flex-2 flex-row">
-                <div class="filter-clear" (click)="hideFilter()">
+                <div class="filter-clear" (click)="clearFilter()">
                     Clear
                 </div>
                 <div class="filter-apply" (click)="applyFilter()">
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index 655f3b1ca..4d96e0f06 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -1,6 +1,7 @@
-import { Component, EventEmitter, OnInit, Output } from '@angular/core'
+import { Component, Input, ElementRef, EventEmitter, OnInit, Output, QueryList, ViewChildren } from '@angular/core'
 import { TrainingPlanService } from './../../services/traininig-plan.service';
 import { FormControl } from '@angular/forms';
+import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service';
 
 @Component({
   selector: 'ws-app-filter',
@@ -8,21 +9,28 @@ import { FormControl } from '@angular/forms';
   styleUrls: ['./filter.component.scss'],
 })
 export class FilterComponent implements OnInit {
-  @Output() toggleFilter = new EventEmitter() 
+  @Output() toggleFilter = new EventEmitter()
   @Output() getFilterData = new EventEmitter();
+  @Input() clearFilterFlag:any;
   providersList: any[] = [];
   selectedProviders: any[] = [];
   competencyTypeList = [{ "id": "Behavioral", name: 'Behavioural' }, { "id": 'Functional', name: 'Functional' }, { "id": 'Domain', name: 'Domain' }];
   competencyList: any = [];
   competencyThemeList: any[] = [];
   competencySubThemeList: any[] = [];
-  filterObj:any = {"competencyArea":[], "competencyTheme": [], "competencySubTheme": []};
+  filterObj: any = { "competencyArea": [], "competencyTheme": [], "competencySubTheme": [], "providers": [] };
   searchThemeControl = new FormControl();
-  constructor(private trainingPlanService: TrainingPlanService) { }
+  @ViewChildren("checkboxes") checkboxes!: QueryList<ElementRef>;
+  constructor(private trainingPlanService: TrainingPlanService, private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
     this.getFilterEntity();
     this.getProviders();
+    this.trainingPlanDataSharingService.clearFilter.subscribe((result:any)=>{
+      if(result) {
+        this.clearFilter();
+      }
+    })
   }
 
   getFilterEntity() {
@@ -54,9 +62,12 @@ export class FilterComponent implements OnInit {
   checkedProviders(event: any, item: any) {
     if (event) {
       this.selectedProviders.push(item);
-      
+      this.filterObj['providers'].push(item.name);
     } else {
-      
+      if (this.filterObj['provider'].indexOf(item.name) > -1) {
+        const index = this.filterObj['providers'].findIndex((x: any) => x === item.name)
+        this.filterObj['providers'].splice(index, 1)
+      }
     }
   }
 
@@ -69,12 +80,14 @@ export class FilterComponent implements OnInit {
           citem.children.map((themechild: any) => {
             themechild['parent'] = ctype.id;
           })
-          this.filterObj['competencyArea'].push(citem.name);
+          if(this.filterObj['competencyArea']) {
+            this.filterObj['competencyArea'].push(citem.name);
+          }          
           this.competencyThemeList = this.competencyThemeList.concat(citem.children);
           console.log('competencyThemeList', this.competencyThemeList)
         }
       })
-    } else {
+    } else {     
       this.competencyThemeList = this.competencyThemeList.filter((sitem) => {
         return sitem.parent != ctype.id
       })
@@ -115,7 +128,7 @@ export class FilterComponent implements OnInit {
 
   manageCompetencySubTheme(event: any, csttype: any) {
     console.log('cstype, event --', event, csttype);
-    if(event.checked) {
+    if (event.checked) {
       this.filterObj['competencySubTheme'].push(csttype.name);
     } else {
       if (this.filterObj['competencySubTheme'].indexOf(csttype.name) > -1) {
@@ -123,11 +136,22 @@ export class FilterComponent implements OnInit {
         this.filterObj['competencySubTheme'].splice(index, 1)
       }
     }
-    
+
   }
 
   applyFilter() {
     this.getFilterData.emit(this.filterObj);
     this.toggleFilter.emit(false)
   }
+
+  clearFilter() {
+    console.log('this.clearFilter', this.checkboxes);
+    this.filterObj = {};
+    if(this.checkboxes) {
+      this.checkboxes.forEach((element: any) => {
+        element['checked'] = false;
+      });
+    }
+    
+  }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
index ebbce40bd..14aad3efd 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
@@ -19,6 +19,6 @@
         </button>
     </div>
 </div>
-<ng-container *ngIf="filterVisibilityFlag">
-    <ws-app-filter (toggleFilter)="hideFilter($event)" (getFilterData)="getFilterData($event)"></ws-app-filter>
-</ng-container>
\ No newline at end of file
+<div [hidden]="!filterVisibilityFlag">
+    <ws-app-filter (toggleFilter)="hideFilter($event)" (getFilterData)="getFilterData($event)" [clearFilterFlag]="clearFilter"></ws-app-filter>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index a420b2550..0e5f5c3f0 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -17,6 +17,7 @@ export class SearchComponent implements OnInit {
   @Output() handleApiData = new EventEmitter();
   searchText = ''
   filterVisibilityFlag = false
+  clearFilter = false;
   selectedDropDownValue: any
   constructor(@Inject(DOCUMENT) private document: Document,
     private trainingPlanService: TrainingPlanService,
@@ -50,6 +51,7 @@ export class SearchComponent implements OnInit {
 
   handleCategorySelection(event: any) {
     this.selectedDropDownValue = event
+    this.trainingPlanDataSharingService.clearFilter.next(true);
     switch (this.from) {
       case 'content':
         event = !event ? 'Course' : event
@@ -79,6 +81,7 @@ export class SearchComponent implements OnInit {
           "secureSettings": contentType === 'Moderated Course' ? true : false, // for moderated course
           "filters": {
             "primaryCategory": [contentType === 'Moderated Course' ? 'Course' : contentType],
+            "organisation":  applyFilterObj && applyFilterObj['providers'].length ? applyFilterObj['providers'] : [],
             "competencies_v5.competencyArea": applyFilterObj && applyFilterObj['competencyArea'].length ? applyFilterObj['competencyArea'] : [],
             "competencies_v5.competencyTheme": applyFilterObj && applyFilterObj['competencyTheme'].length ? applyFilterObj['competencyTheme'] : [],
             "competencies_v5.competencySubTheme" : applyFilterObj && applyFilterObj['competencySubTheme'].length ? applyFilterObj['competencySubTheme'] : []
@@ -104,7 +107,6 @@ export class SearchComponent implements OnInit {
         //       sitem
         //     })
         // }
-
         this.trainingPlanDataSharingService.trainingPlanContentData = { category: contentType, data: res }
         this.handleApiData.emit(true)
         this.loadingService.changeLoaderState(false)
@@ -118,7 +120,7 @@ export class SearchComponent implements OnInit {
     const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
     const filterObj = {
       request: {
-        query: '',
+        query: (this.searchText) ? this.searchText : '',
         filters: {
           rootOrgId,
           status: 1,
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
index f0faa4eac..f24ec674d 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
@@ -15,8 +15,8 @@ export class UserCardComponent implements OnInit, OnChanges {
   @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | any
   dataSource: any
   startIndex = 0;
-  lastIndex = 10;
-  pageSize = 10;
+  lastIndex = 20;
+  pageSize = 20;
   constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService, private changeDetectorRef: ChangeDetectorRef) { }
 
   ngOnInit() {
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
index 2eda93495..7ead62199 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
@@ -4,10 +4,10 @@
         back</button>
 </div>
 <div class="flex" *ngIf="from==='content'">
-    <ws-app-standard-card [checkboxVisibility]="false" [contentData]="contentData"></ws-app-standard-card>
+    <ws-app-standard-card [checkboxVisibility]="false" [contentData]="contentData" [showDeleteFlag]="true"></ws-app-standard-card>
 </div>
 <div class="flex" *ngIf="from==='assignee'">
-    <ws-app-user-card [checkboxVisibility]="false" [assigneeData]="assigneeData"></ws-app-user-card>
+    <ws-app-user-card [checkboxVisibility]="false" [assigneeData]="assigneeData" [showDeleteFlag]="true"></ws-app-user-card>
 </div>
 <div class="flex content-container" *ngIf="from === 'all'">
     <mat-chip-list [multiple]="true" [selectable]="true">
diff --git a/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts b/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
index 5b01c4805..6859fb801 100644
--- a/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
+++ b/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
@@ -5,11 +5,13 @@ import { Subject } from 'rxjs'
   providedIn: 'root',
 })
 export class TrainingPlanDataSharingService {
+  clearFilter = new Subject();
   trainingPlanCategoryChangeEvent = new Subject()
   moderatedCourseSelectStatus = new Subject()
   trainingPlanTitle = ''
   trainingPlanContentData: any
   trainingPlanAssigneeData: any
+  selectedTabType:any = '';
   trainingPlanStepperData: any = {
     name: '',
     contentType: '',

From f23fbba70ff481423b69516a9b4a36303f99f652 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Wed, 20 Dec 2023 10:34:05 +0530
Subject: [PATCH 355/887] changes for 19-12 done

---
 .../ws/app/src/lib/routes/home/home.module.ts |  3 +
 .../training-plan-dashboard.component.html    | 10 ++-
 .../training-plan-dashboard.component.ts      | 79 +++++++++++++++++--
 .../breadcrumb/breadcrumb.component.ts        |  6 +-
 .../confirmation-box.component.html           | 16 ++--
 .../confirmation-box.component.scss           | 16 +---
 .../confirmation.box.component.ts             |  9 ++-
 .../standard-card/standard-card.component.ts  | 16 ++--
 .../training-plan-home.component.ts           | 20 ++---
 9 files changed, 117 insertions(+), 58 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index 05d199224..c9f48dcb5 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -64,6 +64,7 @@ import { BlendedApprovalsComponent } from './routes/blended-approvals/blended-ap
 import { ReportsSectionComponent } from './routes/reports-section/reports-section.component'
 import { TrainingPlanDashboardComponent } from './routes/training-plan-dashboard/training-plan-dashboard.component'
 import { TrainingPlanDashboardService } from './services/training-plan-dashboard.service'
+import { ConfirmationBoxComponent } from '../training-plan/components/confirmation-box/confirmation.box.component'
 @NgModule({
   declarations: [
     HomeComponent,
@@ -88,6 +89,7 @@ import { TrainingPlanDashboardService } from './services/training-plan-dashboard
     BlendedApprovalsComponent,
     ReportsSectionComponent,
     TrainingPlanDashboardComponent,
+    ConfirmationBoxComponent
   ],
   imports: [
     CommonModule,
@@ -146,6 +148,7 @@ import { TrainingPlanDashboardService } from './services/training-plan-dashboard
     StaffdetailspopupComponent,
     BudgetschemepopupComponent,
     BudgetproofspopupComponent,
+    ConfirmationBoxComponent
   ],
   providers: [
     // CKEditorService,
diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html
index e7d9fe8bb..6e4fb8825 100644
--- a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html
@@ -16,12 +16,14 @@
       </div>
       <ng-container class="margin-top-l">
         <ws-widget-org-user-table [tableData]="tabledata" [data]="trainingPlanData" [isTrainingPlan]="true"
-          [trainingTagList]="tagListData" *ngIf="currentFilter === 'live'" (eOnButtonClick)="clickHandler($event)"
-          (actionsClick)="menuSelected($event)">
+          [trainingTagList]="tagListData" *ngIf="currentFilter === 'live' && fetchContentDone"
+          (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuSelected($event)"
+          (tagSelectedData)="filterDataAsPerTab($event)">
         </ws-widget-org-user-table>
         <ws-widget-org-user-table [tableData]="tabledata" [data]="trainingPlanData" [isTrainingPlan]="true"
-          [trainingTagList]="tagListData" *ngIf="currentFilter === 'draft'" (eOnButtonClick)="clickHandler($event)"
-          (actionsClick)="menuSelected($event)">
+          [trainingTagList]="tagListData" *ngIf="currentFilter === 'draft' && fetchContentDone"
+          (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuSelected($event)"
+          (tagSelectedData)="filterDataAsPerTab($event)">
         </ws-widget-org-user-table>
       </ng-container>
     </mat-card-content>
diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
index bcfc572a6..aec289940 100644
--- a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
@@ -7,7 +7,8 @@ import { TrainingPlanDashboardService } from '../../services/training-plan-dashb
 import moment from 'moment'
 import { LoaderService } from '../../../../../../../../../src/app/services/loader.service'
 import { TrainingPlanService } from '../../../training-plan/services/traininig-plan.service'
-import { MatSnackBar } from '@angular/material'
+import { MatDialog, MatSnackBar } from '@angular/material'
+import { ConfirmationBoxComponent } from '../../../training-plan/components/confirmation-box/confirmation.box.component'
 
 @Component({
   selector: 'ws-app-training-plan-dashboard',
@@ -23,7 +24,22 @@ export class TrainingPlanDashboardComponent implements OnInit {
   searchQuery = ''
   tabledata!: ITableData
   trainingPlanData: any = []
-  tagListData: any = ['Designation', 'All users', 'Custom users']
+  tagListData: any = [{
+    name: 'Designation',
+    value: 'Designation',
+    selected: true,
+  }, {
+    name: 'All users',
+    value: 'All Users',
+    selected: false,
+  }, {
+    name: 'Custom users',
+    value: 'Custom Users',
+    selected: false,
+  }]
+  fetchContentDone!: boolean
+  completeDataRes: any
+  dialogRef: any
 
   constructor(
     // private events: EventService,
@@ -32,6 +48,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
     private loaderService: LoaderService,
     private trainingPlanService: TrainingPlanService,
     private snackBar: MatSnackBar,
+    public dialog: MatDialog
   ) {
 
   }
@@ -72,6 +89,14 @@ export class TrainingPlanDashboardComponent implements OnInit {
   // }
 
   filter(filter: string) {
+    this.fetchContentDone = false
+    this.tagListData.map((item: any) => {
+      if (item.value === 'Designation') {
+        item.selected = true
+      } else {
+        item.selected = false
+      }
+    })
     this.currentFilter = filter
     this.filterData()
   }
@@ -108,7 +133,8 @@ export class TrainingPlanDashboardComponent implements OnInit {
     }
     const liveRes = await this.trainingDashboardSvc.getUserList(req).toPromise().catch(_error => { })
     if (liveRes.params && liveRes.params.status && liveRes.params.status === 'success') {
-      this.trainingPlanData = liveRes.result.content
+      this.completeDataRes = liveRes.result.content
+      this.trainingPlanData = this.completeDataRes.filter((v: any) => v.userType === 'Designation')
       this.convertDataAsPerTable()
     } else {
       this.loaderService.changeLoaderState(false)
@@ -127,7 +153,8 @@ export class TrainingPlanDashboardComponent implements OnInit {
     }
     const draftRes = await this.trainingDashboardSvc.getUserList(req).toPromise().catch(_error => { })
     if (draftRes.params && draftRes.params.status && draftRes.params.status === 'success') {
-      this.trainingPlanData = draftRes.result.content
+      this.completeDataRes = draftRes.result.content
+      this.trainingPlanData = this.completeDataRes.filter((v: any) => v.userType === 'Designation')
       this.convertDataAsPerTable()
     } else {
       this.loaderService.changeLoaderState(false)
@@ -141,6 +168,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
       res.endDate = (res.endDate) ? moment(res.endDate).format('MMM DD[,] YYYY') : ''
       res.createdAt = (res.createdAt) ? moment(res.createdAt).format('MMM DD[,] YYYY') : ''
     })
+    this.fetchContentDone = true
     this.loaderService.changeLoaderState(false)
   }
 
@@ -157,10 +185,10 @@ export class TrainingPlanDashboardComponent implements OnInit {
         this.editContentData(_event.row)
         break
       case 'deleteContent':
-        this.deleteContentData(_event.row)
+        this.showConformationModal(_event.row, _event.action)
         break
       case 'publishContent':
-        this.publishContentData(_event.row)
+        this.showConformationModal(_event.row, _event.action)
         break
     }
   }
@@ -173,6 +201,32 @@ export class TrainingPlanDashboardComponent implements OnInit {
     this.router.navigate(['app', 'training-plan', 'create-plan'], { queryParams: { planId: _selectedRow.id } })
   }
 
+  showConformationModal(_selectedRow: any, _type: any) {
+    this.dialogRef = this.dialog.open(ConfirmationBoxComponent, {
+      disableClose: true,
+      data: {
+        type: 'conformation',
+        icon: 'radio_on',
+        title: (_type === 'deleteContent') ? 'Are you sure you want to delete?' :
+          (_type === 'publishContent') ? 'Are you sure you want to publish?' : '',
+        subTitle: 'You wont be able to revert this',
+        primaryAction: (_type === 'deleteContent') ? 'Delete' : (_type === 'publishContent') ? 'Publish' : '',
+        secondaryAction: 'Cancel',
+      },
+      autoFocus: false,
+    })
+
+    this.dialogRef.afterClosed().subscribe((_res: any) => {
+      if (_res === 'confirmed') {
+        if (_type === 'deleteContent') {
+          this.deleteContentData(_selectedRow)
+        } else if (_type === 'publishContent') {
+          this.publishContentData(_selectedRow)
+        }
+      }
+    })
+  }
+
   deleteContentData(_selectedRow: any) {
     this.loaderService.changeLoaderState(true)
     const obj = {
@@ -184,7 +238,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
     this.trainingPlanService.archivePlan(obj).subscribe((_data: any) => {
       this.snackBar.open('CBP plan deleted successfully.')
       this.loaderService.changeLoaderState(false)
-    }, (_error) => {
+    }, _error => {
       this.loaderService.changeLoaderState(false)
     })
   }
@@ -218,4 +272,15 @@ export class TrainingPlanDashboardComponent implements OnInit {
     }
   }
 
+  filterDataAsPerTab(_event: any) {
+    this.tagListData.map((item: any) => {
+      if (item.value === _event) {
+        item.selected = true
+      } else {
+        item.selected = false
+      }
+    })
+    this.trainingPlanData = this.completeDataRes.filter((v: any) => v.userType === _event)
+  }
+
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
index 53e5a3568..d817ffc40 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
@@ -21,8 +21,8 @@ export class BreadcrumbComponent implements OnInit {
   tabType = TrainingPlanContent.TTabLabelKey
 
   constructor(private router: Router, public dialog: MatDialog,
-    public trainingPlanDataSharingService: TrainingPlanDataSharingService,
-    private trainingPlanService: TrainingPlanService) { }
+              public trainingPlanDataSharingService: TrainingPlanDataSharingService,
+              private trainingPlanService: TrainingPlanService) { }
 
   ngOnInit() {
     this.checkIfDisabled()
@@ -123,7 +123,7 @@ export class BreadcrumbComponent implements OnInit {
         this.dialogRef.close()
         this.trainingPlanDataSharingService.trainingPlanTitle = ''
         this.router.navigateByUrl('app/home/training-plan-dashboard')
-      }, 1000)
+      },         1000)
     })
   }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.html b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.html
index d169201b7..ff4c7ca95 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.html
@@ -1,4 +1,4 @@
-<div class="box-container" *ngIf="data?.type === 'normal'">
+<div class="box-container" *ngIf="data?.type === 'normal' || data?.type === 'conformation'">
     <!-- <div class="close-modal-container">
         <button mat-icon-button>
             <mat-icon>more_vert</mat-icon>
@@ -16,12 +16,10 @@
         {{data?.subTitle}}
     </div>
     <div mat-dialog-actions class="flex flex-1 flex-row action">
-        <div class="cancel cursor-pointer" [mat-dialog-close]="data?.secondaryAction">
-            <span>{{data?.secondaryAction}}</span>
-        </div>
-        <div class="primary cursor-pointer" (click)="performAction(data)">
-            <span>{{data?.primaryAction}}</span>
-        </div>
+        <button mat-button class="cancel" type="button"
+            [mat-dialog-close]="data?.secondaryAction">{{data?.secondaryAction}}</button>
+        <button mat-button class="primary margin-left-m" type="button"
+            (click)="performAction(data)">{{data?.primaryAction}}</button>
     </div>
 </div>
 
@@ -59,8 +57,6 @@
         <img src="assets/icons/{{data?.icon}}.svg" />
     </div>
     <div mat-dialog-actions class="flex flex-1 flex-row action">
-        <div class="primary cursor-pointer">
-            <span>{{data?.primaryAction}}</span>
-        </div>
+        <button mat-button class="primary" type="button">{{data?.primaryAction}}</button>
     </div>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.scss b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.scss
index 030a04aac..7de1bcd35 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.scss
@@ -37,24 +37,14 @@
     margin-top: 16px;
 }
 .cancel {
-    color: rgb(27, 76, 161);
+    color: rgb(27, 76, 161) !important;
     border: 1px solid rgb(27, 76, 161);
-    border-radius: 4px;
-    width: auto;
-    text-align: center;
-    padding: 10px;
 }
 
 
 .primary {
-    color: rgba(255, 255, 255);
-    border: 1px solid rgb(27, 76, 161);
-    border-radius: 4px;
-    width: auto;
-    text-align: center;
-    padding: 10px;
-    background-color: rgb(27, 76, 161);
-    margin-left: 16px;
+    color: rgba(255, 255, 255) !important;
+    background-color: rgb(27, 76, 161) !important;
 }
 
 .progress-title {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation.box.component.ts b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation.box.component.ts
index 2503644c7..5da503eaa 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation.box.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation.box.component.ts
@@ -22,8 +22,11 @@ export class ConfirmationBoxComponent implements OnInit {
   }
 
   performAction(data: any) {
-    this.dialogRef.close()
-    this.trainingPlanDataSharingService.trainingPlanCategoryChangeEvent.next(data)
-
+    if (data && data.type === 'conformation') {
+      this.dialogRef.close('confirmed')
+    } else {
+      this.dialogRef.close()
+      this.trainingPlanDataSharingService.trainingPlanCategoryChangeEvent.next(data)
+    }
   }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
index 6aea56b59..55e1d4ef6 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
@@ -15,13 +15,13 @@ export class StandardCardComponent implements OnInit, OnChanges {
   @Input() showPagination = false;
   @Output() handleSelectedChips = new EventEmitter()
   @ViewChild(MatPaginator, {static: false}) paginator: MatPaginator | any;
-  dataSource:any;
+  dataSource: any;
   selectedContent: any[] = []
-  startIndex= 0;
+  startIndex = 0;
   lastIndex = 10; 
   pageSize = 10;
   defaultThumbnail: SafeUrl | null = 'assets/instances/eagle/app_logos/KarmayogiBharat_Logo.svg'
-  constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService, private changeDetectorRef:ChangeDetectorRef ) { }
+  constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService, private changeDetectorRef: ChangeDetectorRef) { }
 
   ngOnInit() {
     
@@ -29,17 +29,17 @@ export class StandardCardComponent implements OnInit, OnChanges {
 
   ngOnChanges() {
     this.changeDetectorRef.detectChanges();
-    console.log('this.contentData',this.contentData)
-    this.dataSource= new MatTableDataSource<any>(this.contentData);
+    console.log('this.contentData', this.contentData)
+    this.dataSource = new MatTableDataSource<any>(this.contentData);
     this.dataSource.paginator = this.paginator;
     console.log('this.dataSource', this.dataSource);
   }
 
-  onChangePage(pe:PageEvent) {
+  onChangePage(pe: PageEvent) {
     console.log(pe.pageIndex);
     console.log(pe.pageSize);
-    this.startIndex = pe.pageIndex* pe.pageSize;
-    this.lastIndex =(pe.pageIndex+1)*pe.pageSize ;
+    this.startIndex = pe.pageIndex * pe.pageSize;
+    this.lastIndex = (pe.pageIndex + 1) * pe.pageSize ;
     
     // this.startIndex = this.pageIndex
   }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.ts
index 59fd244c2..c01a5acaf 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit, OnDestroy, AfterViewInit } from '@angular/core'
 /* tslint:disable */
 import _ from 'lodash'
 /* tslint:enable */
-import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service';
+import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
 @Component({
   selector: 'ws-app-training-plan-home',
   templateUrl: './training-plan-home.component.html',
@@ -12,17 +12,17 @@ import { TrainingPlanDataSharingService } from '../../services/training-plan-dat
   /* tslint:enable */
 })
 export class TrainingPlanHomeComponent implements OnInit, AfterViewInit, OnDestroy {
-  showModeratedNotification = false;
-  constructor( private trainingPlanDataSharingService: TrainingPlanDataSharingService
+  showModeratedNotification = false
+  constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService
   ) {
-    
+
   }
   ngOnInit() {
-    this.trainingPlanDataSharingService.moderatedCourseSelectStatus.subscribe((status)=>{
-      if(status) {
-          this.showModeratedNotification = true;
+    this.trainingPlanDataSharingService.moderatedCourseSelectStatus.subscribe(status => {
+      if (status) {
+          this.showModeratedNotification = true
       } else {
-        this.showModeratedNotification = false;
+        this.showModeratedNotification = false
       }
     })
   }
@@ -31,11 +31,11 @@ export class TrainingPlanHomeComponent implements OnInit, AfterViewInit, OnDestr
   }
 
   ngOnDestroy() {
-    this.trainingPlanDataSharingService.moderatedCourseSelectStatus.unsubscribe();
+    this.trainingPlanDataSharingService.moderatedCourseSelectStatus.unsubscribe()
   }
 
   removeNotification() {
-    this.showModeratedNotification = false;
+    this.showModeratedNotification = false
   }
 
 }

From a55315c0257b2f24136f7dec00c4abfb722b9793 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Wed, 20 Dec 2023 10:55:22 +0530
Subject: [PATCH 356/887] update for user search

---
 .../category-drop-down.component.ts                  |  8 +++++++-
 .../components/search/search.component.ts            | 12 +++++++++++-
 .../components/user-card/user-card.component.html    |  2 ++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
index 5bbcd6aa6..c321cbde5 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
@@ -23,7 +23,13 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
     // }
     this.trainingPlanDataSharingService.trainingPlanCategoryChangeEvent.subscribe((data: any) => {
       if (data && data.event) {
-        this.trainingPlanDataSharingService.trainingPlanStepperData.contentList = [];
+        if(data.event === 'Course' || data.event === 'Program' || data.event === 'Blended program' || data.event === 'Curated program' || data.event === 'Moderated Course') {
+          this.trainingPlanDataSharingService.trainingPlanStepperData.contentList = [];
+        } else if (data.event === 'Designation' || data.event === 'All Users' || data.event === 'Custom Users') {
+          this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo = [];
+        } 
+        
+        
         this.handleCategorySelection.emit(data.event)
       }
     })
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 0e5f5c3f0..1def289dc 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -146,7 +146,17 @@ export class SearchComponent implements OnInit {
     this.loadingService.changeLoaderState(true)
     this.trainingPlanService.getDesignations().subscribe((res: any) => {
       console.log('res', res)
-      this.trainingPlanDataSharingService.trainingPlanAssigneeData = { category: event, data: res.result.response.content }
+      if(this.searchText) {
+        let resArr = res.result.response.content.filter((ditem:any)=>{
+          if(ditem.name.includes(this.searchText)) {
+            return ditem;
+          }
+        })
+        this.trainingPlanDataSharingService.trainingPlanAssigneeData = { category: event, data: resArr }
+      } else {
+        this.trainingPlanDataSharingService.trainingPlanAssigneeData = { category: event, data: res.result.response.content }
+      }
+      
       this.handleApiData.emit(true)
       this.loadingService.changeLoaderState(false)
     })
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
index 299c85135..cde987e73 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
@@ -1,5 +1,6 @@
 <div class="flex flex-4 flex-row assignee-card-container flex-wrap" *ngIf="assigneeData?.category === 'Custom Users'">
     <ng-container *ngFor="let item of assigneeData?.data | slice : startIndex : lastIndex">
+        <!-- <ng-container *ngIf="item?.roles.length"> -->
         <div class="flex flex-4 assignee-card" [ngClass]="item?.selected ? 'active-card':''"
             [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
             <div class="avatar">
@@ -19,6 +20,7 @@
                     (change)="selectAssigneeItem($event, item)"></mat-checkbox>
             </div>
         </div>
+    <!-- </ng-container> -->
     </ng-container>
 </div>
 

From 059f66e359df5bcd152cdb1c83eaca42b8af636d Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Thu, 21 Dec 2023 17:32:32 +0530
Subject: [PATCH 357/887] update still working

---
 .../ws/app/src/lib/routes/home/home.module.ts |  7 +--
 .../training-plan-dashboard.component.ts      | 10 +--
 .../training-plan-dashboard.service.ts        |  3 +-
 .../add-plan-information.component.ts         | 19 +++---
 .../breadcrumb/breadcrumb.component.ts        | 16 ++---
 .../category-drop-down.component.ts           | 62 +++++++++----------
 .../components/chip/chip.component.html       |  2 +-
 .../components/chip/chip.component.ts         |  4 +-
 .../components/search/search.component.html   |  5 +-
 .../components/search/search.component.ts     | 49 +++++++--------
 .../components/stepper/stepper.component.ts   |  4 +-
 .../user-card/user-card.component.html        |  5 +-
 .../user-card/user-card.component.ts          |  6 +-
 .../resolvers/update-plan-resolve.service.ts  | 20 ++++++
 .../create-assignee.component.html            |  8 +--
 .../create-assignee.component.ts              | 16 ++---
 .../create-content.component.ts               | 23 ++++---
 .../create-plan/create-plan.component.ts      | 50 +++++----------
 .../create-timeline.component.ts              |  6 +-
 .../preview-plan/preview-plan.component.ts    |  6 +-
 .../services/traininig-plan.service.ts        | 10 +--
 .../training-plan/training-plan.module.ts     | 13 ++--
 .../training-plan.routing.module.ts           |  4 ++
 src/app/app-routing.module.ts                 |  2 +-
 src/app/app.module.ts                         |  3 +
 25 files changed, 178 insertions(+), 175 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/training-plan/resolvers/update-plan-resolve.service.ts

diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index c9f48dcb5..756998243 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -64,7 +64,6 @@ import { BlendedApprovalsComponent } from './routes/blended-approvals/blended-ap
 import { ReportsSectionComponent } from './routes/reports-section/reports-section.component'
 import { TrainingPlanDashboardComponent } from './routes/training-plan-dashboard/training-plan-dashboard.component'
 import { TrainingPlanDashboardService } from './services/training-plan-dashboard.service'
-import { ConfirmationBoxComponent } from '../training-plan/components/confirmation-box/confirmation.box.component'
 @NgModule({
   declarations: [
     HomeComponent,
@@ -88,8 +87,7 @@ import { ConfirmationBoxComponent } from '../training-plan/components/confirmati
     BudgetproofspopupComponent,
     BlendedApprovalsComponent,
     ReportsSectionComponent,
-    TrainingPlanDashboardComponent,
-    ConfirmationBoxComponent
+    TrainingPlanDashboardComponent
   ],
   imports: [
     CommonModule,
@@ -147,8 +145,7 @@ import { ConfirmationBoxComponent } from '../training-plan/components/confirmati
     AdduserpopupComponent,
     StaffdetailspopupComponent,
     BudgetschemepopupComponent,
-    BudgetproofspopupComponent,
-    ConfirmationBoxComponent
+    BudgetproofspopupComponent
   ],
   providers: [
     // CKEditorService,
diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
index 15670988f..3059ecca6 100644
--- a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
@@ -30,11 +30,11 @@ export class TrainingPlanDashboardComponent implements OnInit {
     selected: true,
   }, {
     name: 'All users',
-    value: 'All Users',
+    value: 'AllUser',
     selected: false,
   }, {
     name: 'Custom users',
-    value: 'Custom Users',
+    value: 'CustomUser',
     selected: false,
   }]
   fetchContentDone!: boolean
@@ -162,9 +162,9 @@ export class TrainingPlanDashboardComponent implements OnInit {
   }
 
   convertDataAsPerTable() {
-    this.trainingPlanData.map((res: any) => {
+    this.completeDataRes.map((res: any) => {
       res.contentCount = (res.contentList) ? res.contentList.length : 0
-      res.assigneeCount = (res.userDetails) ? res.userDetails.length : 0
+      res.assigneeCount = (res.userType === 'AllUser') ? 'All Users' : (res.userDetails) ? res.userDetails.length : 0
       res.endDate = (res.endDate) ? moment(res.endDate).format('MMM DD[,] YYYY') : ''
       res.createdAt = (res.createdAt) ? moment(res.createdAt).format('MMM DD[,] YYYY') : ''
     })
@@ -198,7 +198,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
   }
 
   editContentData(_selectedRow: any) {
-    this.router.navigate(['app', 'training-plan', 'create-plan'], { queryParams: { planId: _selectedRow.id } })
+    this.router.navigate(['app', 'training-plan', 'update-plan', _selectedRow.id])
   }
 
   showConformationModal(_selectedRow: any, _type: any) {
diff --git a/project/ws/app/src/lib/routes/home/services/training-plan-dashboard.service.ts b/project/ws/app/src/lib/routes/home/services/training-plan-dashboard.service.ts
index 5115826f8..940a023d9 100644
--- a/project/ws/app/src/lib/routes/home/services/training-plan-dashboard.service.ts
+++ b/project/ws/app/src/lib/routes/home/services/training-plan-dashboard.service.ts
@@ -1,6 +1,7 @@
 import { Injectable } from '@angular/core'
 import { HttpClient } from '@angular/common/http'
 import { Observable } from 'rxjs'
+import { retry } from 'rxjs/operators'
 
 const API_END_POINTS = {
   CBP_PLAN_LIST: '/apis/proxies/v8/cbplan/v1/list',
@@ -13,6 +14,6 @@ export class TrainingPlanDashboardService {
   constructor(private http: HttpClient) { }
 
   getUserList(req: any): Observable<any> {
-    return this.http.post<any>(API_END_POINTS.CBP_PLAN_LIST, req)
+    return this.http.post<any>(API_END_POINTS.CBP_PLAN_LIST, req).pipe(retry(1))
   }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
index 719d2b6a9..36e6b2fe3 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
@@ -16,26 +16,29 @@ export class AddPlanInformationComponent implements OnInit {
 
   constructor(
     private formBuilder: FormBuilder,
-    private trainingPlanDataSharingSvc: TrainingPlanDataSharingService
+    private tpdsSvc: TrainingPlanDataSharingService
   ) { }
 
   ngOnInit() {
-    if (!this.trainingPlanDataSharingSvc.trainingPlanTitle) {
+    if (!this.tpdsSvc.trainingPlanTitle) {
       this.planTitleInvalid.emit(true)
     }
     this.contentForm = this.formBuilder.group({
       name:
-        new FormControl((this.trainingPlanDataSharingSvc.trainingPlanTitle) ? this.trainingPlanDataSharingSvc.trainingPlanTitle : '',
-                        [Validators.required, Validators.minLength(10)]),
+        new FormControl('', [Validators.required, Validators.minLength(10)]),
     })
-    
-    this.contentForm.controls['name'].valueChanges.pipe(debounceTime(200)).subscribe((_ele: any) => {
+
+    this.contentForm.controls['name'].valueChanges.pipe(debounceTime(500)).subscribe((_ele: any) => {
       if (!this.contentForm.invalid) {
-        this.trainingPlanDataSharingSvc.trainingPlanTitle = _ele
-        this.trainingPlanDataSharingSvc.trainingPlanStepperData.name = _ele
+        this.tpdsSvc.trainingPlanTitle = _ele
+        this.tpdsSvc.trainingPlanStepperData.name = _ele
       }
       this.planTitleInvalid.emit(this.contentForm.invalid)
     })
+
+    if (this.tpdsSvc.trainingPlanTitle) {
+      this.contentForm.controls['name'].setValue(this.tpdsSvc.trainingPlanTitle)
+    }
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
index c0ebc84d6..c8210a19d 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
@@ -21,8 +21,8 @@ export class BreadcrumbComponent implements OnInit {
   tabType = TrainingPlanContent.TTabLabelKey
 
   constructor(private router: Router, public dialog: MatDialog,
-              public trainingPlanDataSharingService: TrainingPlanDataSharingService,
-              private trainingPlanService: TrainingPlanService) { }
+    public trainingPlanDataSharingService: TrainingPlanDataSharingService,
+    private trainingPlanService: TrainingPlanService) { }
 
   ngOnInit() {
     this.checkIfDisabled()
@@ -114,14 +114,10 @@ export class BreadcrumbComponent implements OnInit {
 
   createPlanDraftView() {
     this.trainingPlanDataSharingService.trainingPlanStepperData.name = this.trainingPlanDataSharingService.trainingPlanTitle
-    if(this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentType === 'All Users') {
-      this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentType = "allUsers";
+    if (this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentType === 'AllUser') {
       this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo = [
-        "allUsers"
-      ];
-    }
-    if(this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentType === 'Custom Users') {
-      this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentType = "custom";
+        "AllUser"
+      ]
     }
     const obj = { request: this.trainingPlanDataSharingService.trainingPlanStepperData }
     this.showDialogBox('progress')
@@ -132,7 +128,7 @@ export class BreadcrumbComponent implements OnInit {
         this.dialogRef.close()
         this.trainingPlanDataSharingService.trainingPlanTitle = ''
         this.router.navigateByUrl('app/home/training-plan-dashboard')
-      },         1000)
+      }, 1000)
     })
   }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
index 5bbcd6aa6..cf699e39f 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
@@ -23,7 +23,7 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
     // }
     this.trainingPlanDataSharingService.trainingPlanCategoryChangeEvent.subscribe((data: any) => {
       if (data && data.event) {
-        this.trainingPlanDataSharingService.trainingPlanStepperData.contentList = [];
+        this.trainingPlanDataSharingService.trainingPlanStepperData.contentList = []
         this.handleCategorySelection.emit(data.event)
       }
     })
@@ -51,12 +51,12 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['primaryAction'] = 'I understand, change content type'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Course'
-        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event;
-        this.trainingPlanDataSharingService.moderatedCourseSelectStatus.next(false);
-        if(this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.length) {
+        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event
+        this.trainingPlanDataSharingService.moderatedCourseSelectStatus.next(false)
+        if (this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.length) {
           this.openDialoagBox(dialogData)
         } else {
-          this.handleCategorySelection.emit(event);
+          this.handleCategorySelection.emit(event)
         }
         break
       case 'Program':
@@ -68,12 +68,12 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['primaryAction'] = 'I understand, change content type'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Program'
-        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event;
-        this.trainingPlanDataSharingService.moderatedCourseSelectStatus.next(false);
-        if(this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.length) {
+        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event
+        this.trainingPlanDataSharingService.moderatedCourseSelectStatus.next(false)
+        if (this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.length) {
           this.openDialoagBox(dialogData)
         } else {
-          this.handleCategorySelection.emit(event);
+          this.handleCategorySelection.emit(event)
         }
         break
       case 'Blended program':
@@ -86,11 +86,11 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Blended program'
         this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event
-        this.trainingPlanDataSharingService.moderatedCourseSelectStatus.next(false);
-        if(this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.length) {
+        this.trainingPlanDataSharingService.moderatedCourseSelectStatus.next(false)
+        if (this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.length) {
           this.openDialoagBox(dialogData)
         } else {
-          this.handleCategorySelection.emit(event);
+          this.handleCategorySelection.emit(event)
         }
         break
       case 'Curated program':
@@ -103,11 +103,11 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Curated program'
         this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event
-        this.trainingPlanDataSharingService.moderatedCourseSelectStatus.next(false);
-        if(this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.length) {
+        this.trainingPlanDataSharingService.moderatedCourseSelectStatus.next(false)
+        if (this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.length) {
           this.openDialoagBox(dialogData)
         } else {
-          this.handleCategorySelection.emit(event);
+          this.handleCategorySelection.emit(event)
         }
         break
       case 'Moderated Course':
@@ -119,12 +119,12 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['primaryAction'] = 'I understand, change content type'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Moderated Course'
-        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event;
-        if(this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.length) {
+        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event
+        if (this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.length) {
           this.openDialoagBox(dialogData)
         } else {
-          this.handleCategorySelection.emit(event);
-        }        
+          this.handleCategorySelection.emit(event)
+        }
         break
       case 'Designation':
         dialogData['type'] = 'normal'
@@ -136,13 +136,13 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Designation'
         this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType'] = event
-        if(this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.length) {
+        if (this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.length) {
           this.openDialoagBox(dialogData)
         } else {
-          this.handleCategorySelection.emit(event);
+          this.handleCategorySelection.emit(event)
         }
         break
-      case 'All Users':
+      case 'AllUser':
         dialogData['type'] = 'normal'
         dialogData['icon'] = 'radio_on'
         dialogData['title'] = 'You are attempting to change the selected user type?'
@@ -150,15 +150,15 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         If you want to select custom users or by designation, use the above option`
         dialogData['primaryAction'] = 'I understand, change user type'
         dialogData['secondaryAction'] = 'Cancel'
-        dialogData['event'] = 'All Users'
+        dialogData['event'] = 'AllUser'
         this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType'] = event
-        if(this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.length) {
+        if (this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.length) {
           this.openDialoagBox(dialogData)
         } else {
-          this.handleCategorySelection.emit(event);
+          this.handleCategorySelection.emit(event)
         }
         break
-      case 'Custom Users':
+      case 'CustomUser':
         dialogData['type'] = 'normal'
         dialogData['icon'] = 'radio_on'
         dialogData['title'] = 'You are attempting to change the selected user type?'
@@ -166,18 +166,18 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         If you want to select custom users or by designation, use the above option`
         dialogData['primaryAction'] = 'I understand, change user type'
         dialogData['secondaryAction'] = 'Cancel'
-        dialogData['event'] = 'Custom Users'
+        dialogData['event'] = 'CustomUser'
         this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType'] = event
-        if(this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.length) {
+        if (this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.length) {
           this.openDialoagBox(dialogData)
         } else {
-          this.handleCategorySelection.emit(event);
+          this.handleCategorySelection.emit(event)
         }
         break
     }
-    
+
     // this.handleCategorySelection.emit(event);
-   // this.openDialoagBox(dialogData)
+    // this.openDialoagBox(dialogData)
   }
 
   openDialoagBox(dialogData: any) {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
index 631c576f1..05d231a20 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
@@ -41,7 +41,7 @@
     </div>
 </div>
 <div class="flex flex-row chip-container"
-    *ngIf="selectAssigneeCount > 0 && from === 'assignee' && trainingPlanDataSharingService?.trainingPlanAssigneeData?.category === 'Custom Users'">
+    *ngIf="selectAssigneeCount > 0 && from === 'assignee' && trainingPlanDataSharingService?.trainingPlanAssigneeData?.category === 'CustomUser'">
     <div class="flex flex-2 left-section flex-middle">
         <div class="selected-item-label">Selected items - </div>
         <ng-container *ngFor="let item of selectedAssigneeChips | slice : 0 : 3">
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
index 9df8a7e35..c6b15c5df 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
@@ -41,7 +41,7 @@ export class ChipComponent implements OnInit, OnChanges {
             sitem['selected'] = false
           }
         })
-      } else if (this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Custom Users') {
+      } else if (this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'CustomUser') {
         this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
           if (sitem['selected']) {
             sitem['selected'] = false
@@ -80,7 +80,7 @@ export class ChipComponent implements OnInit, OnChanges {
           this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.findIndex((x: any) => x === item['id'])
         this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.splice(index, 1)
       }
-    } else if (this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Custom Users') {
+    } else if (this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'CustomUser') {
       this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
         if (sitem['selected'] && sitem['userId'] === item['userId']) {
           sitem['selected'] = false
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
index 14aad3efd..9d31cf319 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
@@ -13,12 +13,13 @@
         <button mat-button type="button" class="search-btn" (click)="searchData()">Search</button>
     </div>
     <div class="filter-section flex flex-end" *ngIf="!(trainingPlanDataSharingService?.trainingPlanAssigneeData?.category === 'Designation'
-    || trainingPlanDataSharingService?.trainingPlanAssigneeData?.category === 'All Users')">
+    || trainingPlanDataSharingService?.trainingPlanAssigneeData?.category === 'AllUser')">
         <button mat-button type="button" (click)="openFilter()" class="apply-filter">
             <mat-icon class="margin-right-xs">filter_list</mat-icon> Apply Filters
         </button>
     </div>
 </div>
 <div [hidden]="!filterVisibilityFlag">
-    <ws-app-filter (toggleFilter)="hideFilter($event)" (getFilterData)="getFilterData($event)" [clearFilterFlag]="clearFilter"></ws-app-filter>
+    <ws-app-filter (toggleFilter)="hideFilter($event)" (getFilterData)="getFilterData($event)"
+        [clearFilterFlag]="clearFilter"></ws-app-filter>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 0e5f5c3f0..8d0c3a068 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -22,7 +22,7 @@ export class SearchComponent implements OnInit {
   constructor(@Inject(DOCUMENT) private document: Document,
     private trainingPlanService: TrainingPlanService,
     private route: ActivatedRoute,
-    private trainingPlanDataSharingService: TrainingPlanDataSharingService,
+    private tpdsSvc: TrainingPlanDataSharingService,
     private loadingService: LoaderService
   ) { }
 
@@ -51,7 +51,7 @@ export class SearchComponent implements OnInit {
 
   handleCategorySelection(event: any) {
     this.selectedDropDownValue = event
-    this.trainingPlanDataSharingService.clearFilter.next(true);
+    this.tpdsSvc.clearFilter.next(true)
     switch (this.from) {
       case 'content':
         event = !event ? 'Course' : event
@@ -61,30 +61,30 @@ export class SearchComponent implements OnInit {
         event = !event ? 'Designation' : event
         if (event === 'Designation') {
           this.getDesignations(event)
-        } else if (event === 'Custom Users') {
+        } else if (event === 'CustomUser') {
           this.getCustomUsers(event)
-        } else if (event === 'All Users') {
+        } else if (event === 'AllUser') {
           this.getAllUsers(event)
         }
         break
     }
   }
 
-  getContent(contentType: any, applyFilterObj?:any) {
+  getContent(contentType: any, applyFilterObj?: any) {
     this.loadingService.changeLoaderState(true)
     if (contentType) {
       if (contentType === 'Moderated Course') {
-        this.trainingPlanDataSharingService.moderatedCourseSelectStatus.next(true)
+        this.tpdsSvc.moderatedCourseSelectStatus.next(true)
       }
       const filterObj = {
         "request": {
           "secureSettings": contentType === 'Moderated Course' ? true : false, // for moderated course
           "filters": {
             "primaryCategory": [contentType === 'Moderated Course' ? 'Course' : contentType],
-            "organisation":  applyFilterObj && applyFilterObj['providers'].length ? applyFilterObj['providers'] : [],
+            "organisation": applyFilterObj && applyFilterObj['providers'].length ? applyFilterObj['providers'] : [],
             "competencies_v5.competencyArea": applyFilterObj && applyFilterObj['competencyArea'].length ? applyFilterObj['competencyArea'] : [],
             "competencies_v5.competencyTheme": applyFilterObj && applyFilterObj['competencyTheme'].length ? applyFilterObj['competencyTheme'] : [],
-            "competencies_v5.competencySubTheme" : applyFilterObj && applyFilterObj['competencySubTheme'].length ? applyFilterObj['competencySubTheme'] : []
+            "competencies_v5.competencySubTheme": applyFilterObj && applyFilterObj['competencySubTheme'].length ? applyFilterObj['competencySubTheme'] : []
           },
           "offset": 0,
           "limit": 20,
@@ -97,17 +97,14 @@ export class SearchComponent implements OnInit {
         }, "query": ""
       }
       this.trainingPlanService.getAllContent(filterObj).subscribe((res: any) => {
-
-        // if(this.trainingPlanDataSharingService.trainingPlanContentData &&
-        //    this.trainingPlanDataSharingService.trainingPlanContentData['data'] &&
-        //    this.trainingPlanDataSharingService.trainingPlanContentData['data']['content'] &&
-        //    this.trainingPlanDataSharingService.trainingPlanContentData['data']['content'].length
-        //   ) {
-        //     res && res.content.map((sitem:any)=> {
-        //       sitem
-        //     })
-        // }
-        this.trainingPlanDataSharingService.trainingPlanContentData = { category: contentType, data: res }
+        if (this.tpdsSvc.trainingPlanContentData.data && this.tpdsSvc.trainingPlanContentData.data.content) {
+          this.tpdsSvc.trainingPlanContentData = {
+            category: contentType,
+            data: { content: _.uniqBy(_.concat(this.tpdsSvc.trainingPlanContentData.data.content, res.content), 'identifier') }
+          }
+        } else {
+          this.tpdsSvc.trainingPlanContentData = { category: contentType, data: res }
+        }
         this.handleApiData.emit(true)
         this.loadingService.changeLoaderState(false)
       })
@@ -130,7 +127,7 @@ export class SearchComponent implements OnInit {
       },
     }
     this.trainingPlanService.getCustomUsers(filterObj).subscribe((res: any) => {
-      this.trainingPlanDataSharingService.trainingPlanAssigneeData = { category: event, data: res.content }
+      this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: res.content }
       this.handleApiData.emit(true)
       this.loadingService.changeLoaderState(false)
     }, (_error: any) => {
@@ -138,7 +135,7 @@ export class SearchComponent implements OnInit {
   }
 
   getAllUsers(event: any) {
-    this.trainingPlanDataSharingService.trainingPlanAssigneeData = { category: event, data: [] }
+    this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: [] }
     this.handleApiData.emit(true)
   }
 
@@ -146,7 +143,7 @@ export class SearchComponent implements OnInit {
     this.loadingService.changeLoaderState(true)
     this.trainingPlanService.getDesignations().subscribe((res: any) => {
       console.log('res', res)
-      this.trainingPlanDataSharingService.trainingPlanAssigneeData = { category: event, data: res.result.response.content }
+      this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: res.result.response.content }
       this.handleApiData.emit(true)
       this.loadingService.changeLoaderState(false)
     })
@@ -164,17 +161,17 @@ export class SearchComponent implements OnInit {
       case 'Designation':
         this.getDesignations(this.selectedDropDownValue)
         break
-      case 'Custom Users':
+      case 'CustomUser':
         this.getCustomUsers(this.selectedDropDownValue)
         break
-      case 'All Users':
+      case 'AllUser':
         this.getAllUsers(this.selectedDropDownValue)
         break
     }
   }
 
-  getFilterData(event:any) {
-    this.getContent(this.selectedDropDownValue, event);
+  getFilterData(event: any) {
+    this.getContent(this.selectedDropDownValue, event)
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
index 05ddd71aa..722a1961b 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
@@ -20,10 +20,10 @@ export class StepperComponent implements OnInit, OnChanges {
   addAssigneeDisable = true
   addTimelineDisable = true
 
-  constructor() { }
+  constructor(
+  ) { }
 
   ngOnInit() {
-
   }
 
   ngOnChanges() {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
index 299c85135..274a76948 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
@@ -1,4 +1,4 @@
-<div class="flex flex-4 flex-row assignee-card-container flex-wrap" *ngIf="assigneeData?.category === 'Custom Users'">
+<div class="flex flex-4 flex-row assignee-card-container flex-wrap" *ngIf="assigneeData?.category === 'CustomUser'">
     <ng-container *ngFor="let item of assigneeData?.data | slice : startIndex : lastIndex">
         <div class="flex flex-4 assignee-card" [ngClass]="item?.selected ? 'active-card':''"
             [ngClass]="!checkboxVisibility ? 'assignee-card-without-checkbox' : ''">
@@ -46,5 +46,6 @@
 </div>
 
 <div *ngIf="showPagination" class="flex flex-row justify-center">
-    <mat-paginator [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 100]" [length]="contentData?.length" (page)="onChangePage($event)"></mat-paginator>
+    <mat-paginator [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 100]" [length]="contentData?.length"
+        (page)="onChangePage($event)"></mat-paginator>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
index f24ec674d..dbf2dc438 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
@@ -54,7 +54,7 @@ export class UserCardComponent implements OnInit, OnChanges {
           this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].push(item.name)
         }
       }
-      if (this.assigneeData && this.assigneeData.category === 'Custom Users') {
+      if (this.assigneeData && this.assigneeData.category === 'CustomUser') {
         this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any, index: any) => {
           if (sitem.userId === item.userId) {
             sitem['selected'] = true
@@ -81,7 +81,7 @@ export class UserCardComponent implements OnInit, OnChanges {
           }
         })
       }
-      if (this.assigneeData && this.assigneeData.category === 'Custom Users') {
+      if (this.assigneeData && this.assigneeData.category === 'CustomUser') {
         this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
           if (sitem.userId === item.userId) {
             sitem['selected'] = false
@@ -115,7 +115,7 @@ export class UserCardComponent implements OnInit, OnChanges {
           this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].splice(index, 1)
         }
       })
-    } else if (this.assigneeData && this.assigneeData.category === 'Custom Users') {
+    } else if (this.assigneeData && this.assigneeData.category === 'CustomUser') {
       this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
         if (sitem.userId === item.userId) {
           sitem['selected'] = false
diff --git a/project/ws/app/src/lib/routes/training-plan/resolvers/update-plan-resolve.service.ts b/project/ws/app/src/lib/routes/training-plan/resolvers/update-plan-resolve.service.ts
new file mode 100644
index 000000000..5c8d98bdf
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/resolvers/update-plan-resolve.service.ts
@@ -0,0 +1,20 @@
+import { Injectable } from '@angular/core'
+import { ActivatedRouteSnapshot, Resolve } from '@angular/router'
+import { Observable } from 'rxjs'
+import { TrainingPlanService } from '../services/traininig-plan.service'
+import { map, retry } from 'rxjs/operators'
+@Injectable()
+export class UpdatePlanResolveService
+  implements
+  Resolve<Observable<any>> {
+  constructor(
+    private tpSvc: TrainingPlanService,
+  ) { }
+  resolve(
+    _route: ActivatedRouteSnapshot
+  ): Observable<any> {
+    return this.tpSvc.readPlan(_route.paramMap.get('planId')).pipe(map((_res: any) => {
+      return _res.result.content
+    }), retry(1))
+  }
+}
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
index bb03afb60..c09d2de44 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
@@ -2,16 +2,16 @@
     <ws-app-search [categoryData]="categoryData" [from]="from" (handleApiData)="handleApiData($event)"></ws-app-search>
 </ng-container>
 <ng-container>
-    <ws-app-chip [selectedAssigneeChips]="selectedAssigneeChips" [from]="from" 
+    <ws-app-chip [selectedAssigneeChips]="selectedAssigneeChips" [from]="from"
         [selectAssigneeCount]="selectAssigneeCount"></ws-app-chip>
 </ng-container>
 <ng-container>
     <ws-app-user-card [assigneeData]="assigneeData" (handleSelectedChips)="handleSelectedChips($event)"
-        *ngIf="assigneeData?.category === 'Designation'" [showPagination]="true" ></ws-app-user-card>
+        *ngIf="assigneeData?.category === 'Designation'" [showPagination]="true"></ws-app-user-card>
     <ws-app-user-card [assigneeData]="assigneeData" (handleSelectedChips)="handleSelectedChips($event)"
-        *ngIf="assigneeData?.category === 'Custom Users'" [showPagination]="true" ></ws-app-user-card>
+        *ngIf="assigneeData?.category === 'CustomUser'" [showPagination]="true"></ws-app-user-card>
 </ng-container>
-<ng-container *ngIf="trainingPlanDataSharingService?.trainingPlanAssigneeData?.category === 'All Users'">
+<ng-container *ngIf="trainingPlanDataSharingService?.trainingPlanAssigneeData?.category === 'AllUser'">
     <div class="no-cbp-data margin-top-xl margin-bottom-xl">
         <div><img src="/assets/icons/no-data.svg"></div>
         <div class="mat-subheading-1 margin-remove">It will assign to all users</div>
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
index 14180fa1c..7443067d5 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
@@ -26,13 +26,13 @@ export class CreateAssigneeComponent implements OnInit {
       },
       {
         id: 2,
-        name: 'All Users',
-        value: 'All Users',
+        name: 'AllUser',
+        value: 'AllUser',
       },
       {
         id: 3,
-        name: 'Custom Users',
-        value: 'Custom Users',
+        name: 'CustomUser',
+        value: 'CustomUser',
       },
     ]
   }
@@ -50,7 +50,7 @@ export class CreateAssigneeComponent implements OnInit {
         this.assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData
         this.handleSelectedChips(true)
       } else if (this.trainingPlanDataSharingService.trainingPlanStepperData &&
-        this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Custom Users' &&
+        this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'CustomUser' &&
         this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo) {
         this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
           if (this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.indexOf(sitem.userId) > -1) {
@@ -63,7 +63,7 @@ export class CreateAssigneeComponent implements OnInit {
         this.assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData
       }
     }
-    if (this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'All Users') {
+    if (this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'AllUser') {
       this.addAssigneeInvalid.emit(false)
     }
   }
@@ -80,8 +80,8 @@ export class CreateAssigneeComponent implements OnInit {
             }
           })
         }
-      } else if (this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Custom Users') {
-        this.selectedAssigneeChips = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data;
+      } else if (this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'CustomUser') {
+        this.selectedAssigneeChips = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data
         if (this.selectedAssigneeChips) {
           this.selectedAssigneeChips.map((sitem: any) => {
             if (sitem.selected) {
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
index 6d9bf76a9..18181591d 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
@@ -14,7 +14,7 @@ export class CreateContentComponent implements OnInit {
   from = 'content'
   selectedContentChips: any[] = []
   selectContentCount = 0
-  constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
+  constructor(private tpdsSvc: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
     this.categoryData = [
@@ -44,25 +44,24 @@ export class CreateContentComponent implements OnInit {
         value: 'Moderated Course',
       },
     ]
-    this.handleApiData(true)
+    // this.handleApiData(true)
   }
 
   handleApiData(event: any) {
-    if (event && this.trainingPlanDataSharingService.trainingPlanContentData) {
-      if (this.trainingPlanDataSharingService.trainingPlanStepperData &&
-        this.trainingPlanDataSharingService.trainingPlanStepperData.contentList) {
-        if (this.trainingPlanDataSharingService.trainingPlanContentData &&
-          this.trainingPlanDataSharingService.trainingPlanContentData.data.content) {
-          this.trainingPlanDataSharingService.trainingPlanContentData.data.content.map((sitem: any) => {
-            if (this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.indexOf(sitem.identifier) > -1) {
+    if (event && this.tpdsSvc.trainingPlanContentData) {
+      if (this.tpdsSvc.trainingPlanStepperData &&
+        this.tpdsSvc.trainingPlanStepperData.contentList) {
+        if (this.tpdsSvc.trainingPlanContentData.data.content) {
+          this.tpdsSvc.trainingPlanContentData.data.content.map((sitem: any) => {
+            if (this.tpdsSvc.trainingPlanStepperData.contentList.filter((v: any) => v === sitem.identifier).length > 0) {
               sitem['selected'] = true
             }
           })
         }
-        this.contentData = this.trainingPlanDataSharingService.trainingPlanContentData.data.content
+        this.contentData = this.tpdsSvc.trainingPlanContentData.data.content
         this.handleSelectedChips(true)
       } else {
-        this.contentData = this.trainingPlanDataSharingService.trainingPlanContentData.data.content
+        this.contentData = this.tpdsSvc.trainingPlanContentData.data.content
       }
     }
   }
@@ -70,7 +69,7 @@ export class CreateContentComponent implements OnInit {
   handleSelectedChips(event: any) {
     this.selectContentCount = 0
     if (event) {
-      this.selectedContentChips = this.trainingPlanDataSharingService.trainingPlanContentData.data.content
+      this.selectedContentChips = this.tpdsSvc.trainingPlanContentData.data.content
       if (this.selectedContentChips) {
         this.selectedContentChips.map(sitem => {
           if (sitem.selected) {
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
index 73ccbf866..d21db49c3 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
@@ -1,7 +1,6 @@
 
 import { Component, OnDestroy, OnInit } from '@angular/core'
 import { ActivatedRoute } from '@angular/router'
-import { TrainingPlanService } from '../../services/traininig-plan.service'
 import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
 /* tslint:disable */
 import _ from 'lodash'
@@ -20,8 +19,7 @@ export class CreatePlanComponent implements OnInit, OnDestroy {
   planId = ''
   constructor(
     private route: ActivatedRoute,
-    private trainingPlanService: TrainingPlanService,
-    private trainingPlanDataSharingService: TrainingPlanDataSharingService) {
+    private tpdsSvc: TrainingPlanDataSharingService) {
   }
 
   ngOnDestroy() {
@@ -29,39 +27,23 @@ export class CreatePlanComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit() {
-    this.route.queryParams.subscribe((_res: any) => {
-      if (_res && _res.planId) {
-        this.getContentData(_res.planId)
+    const contentData = this.route.snapshot.data['contentData']
+    if (contentData) {
+      this.tpdsSvc.trainingPlanTitle = contentData.name
+      this.tpdsSvc.trainingPlanContentData = { data: { content: contentData.contentList } }
+      if (contentData.assignmentType === 'CustomUser') {
+        this.tpdsSvc.trainingPlanAssigneeData = { data: { content: contentData.assignmentTypeInfo } }
+      } else {
+        this.tpdsSvc.trainingPlanAssigneeData = contentData.assignmentTypeInfo
       }
-    })
-  }
-
-  getContentData(_id: string) {
-    this.trainingPlanService.readPlan(_id).subscribe((response: any) => {
-      console.log('read data', response)
-      if (response && response.result && response.result.content) {
-        console.log('read data', response)
-        if (response && response.result && response.result.content) {
-          console.log('trainingPlanDataSharingService', this.trainingPlanDataSharingService)
-          this.trainingPlanDataSharingService.trainingPlanTitle = response.result.content.name
-          this.trainingPlanDataSharingService.trainingPlanContentData = { data: { content: response.result.content.contentList } }
-          if (this.trainingPlanDataSharingService.trainingPlanAssigneeData) {
-            if (response.result.content.userType === 'custom') {
-              this.trainingPlanDataSharingService.trainingPlanAssigneeData['category'] = 'Custom Users'
-            } else {
-              this.trainingPlanDataSharingService.trainingPlanAssigneeData['category'] = response.result.content.userType
-            }
-          }
-          if (response.result.content.userType === 'custom') {
-            this.trainingPlanDataSharingService.trainingPlanAssigneeData = { data: { content: response.result.content.userDetails } }
-          } else {
-            this.trainingPlanDataSharingService.trainingPlanAssigneeData = response.result.content.userDetails
-          }
-          this.trainingPlanDataSharingService.trainingPlanStepperData['endDate'] = response.result.content.endDate
-          this.trainingPlanDataSharingService.trainingPlanStepperData['status'] = response.result.content.status
-        }
+      if (contentData.contentList && contentData.contentList.length > 0) {
+        contentData.contentList.forEach((ele: any) => {
+          this.tpdsSvc.trainingPlanStepperData['contentList'].push(ele.identifier)
+        })
       }
-    })
+      this.tpdsSvc.trainingPlanStepperData['endDate'] = contentData.endDate
+      this.tpdsSvc.trainingPlanStepperData['status'] = contentData.status
+    }
   }
 
   selectedTabAction(_event: any) {
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
index 788d81907..40232109e 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
@@ -33,14 +33,14 @@ export class CreateTimelineComponent implements OnInit {
     }
     if (this.trainingPlanDataSharingService.trainingPlanAssigneeData &&
       this.trainingPlanDataSharingService.trainingPlanAssigneeData.data &&
-      this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Custom Users'
+      this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'CustomUser'
     ) {
       const category = this.trainingPlanDataSharingService.trainingPlanAssigneeData.category
       const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
         return item.selected
       })
-      this.assigneeData = { category, data:  assigneeData  }
-      console.log('this.assigneeData',this.assigneeData);
+      this.assigneeData = { category, data: assigneeData }
+      console.log('this.assigneeData', this.assigneeData)
     }
   }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
index 5f20be35d..530a76804 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
@@ -35,11 +35,11 @@ export class PreviewPlanComponent implements OnInit {
           return item.selected
         })
         this.assigneeData = { category, data: assigneeData }
-      } else if (category === 'Custom Users') {
+      } else if (category === 'CustomUser') {
         const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
           return item.selected
         })
-        this.assigneeData = { category, data:  assigneeData }
+        this.assigneeData = { category, data: assigneeData }
       }
 
     } else if (this.from === 'all') {
@@ -58,7 +58,7 @@ export class PreviewPlanComponent implements OnInit {
       this.allContentChips = arr
       if (this.trainingPlanDataSharingService.trainingPlanAssigneeData) {
         const category = this.trainingPlanDataSharingService.trainingPlanAssigneeData.category
-        if (category === 'Custom Users') {
+        if (category === 'CustomUser') {
           const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
             return item.selected
           })
diff --git a/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts b/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
index c7dc10b2a..8e62dea20 100644
--- a/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
+++ b/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core'
 import { HttpClient, HttpHeaders } from '@angular/common/http'
 import { Observable } from 'rxjs'
-import { map } from 'rxjs/operators'
+import { map, retry } from 'rxjs/operators'
 // tslint:disable
 import _ from 'lodash'
 // tslint:enable
@@ -44,7 +44,7 @@ export class TrainingPlanService {
         'Content-Type': 'application/json',
       }),
       body: obj,
-    };
+    }
     return this.http.delete<any>(`${API_END_POINTS.ARCHIVE_PLAN}`, options)
   }
 
@@ -53,7 +53,7 @@ export class TrainingPlanService {
   }
 
   getAllContent(filter: object): Observable<any> {
-    return this.http.post<any>(`${API_END_POINTS.GET_ALL_CONTENT}`, filter).pipe(map(res => _.get(res, 'result')))
+    return this.http.post<any>(`${API_END_POINTS.GET_ALL_CONTENT}`, filter).pipe(map(res => _.get(res, 'result')), retry(1))
   }
 
   getCustomUsers(filter: object): Observable<any> {
@@ -64,12 +64,12 @@ export class TrainingPlanService {
     return this.http.get<any>(API_END_POINTS.GET_ALL_DESIGNATIONS)
   }
 
-  getFilterEntity(filter:object): Observable<any> {
+  getFilterEntity(filter: object): Observable<any> {
     return this.http.post<any>(`${API_END_POINTS.GET_FILTER_ENTITY}`, filter).pipe(map(res => _.get(res, 'result.competency')))
   }
 
   getProviders() {
-    return this.http.get<any>(API_END_POINTS.GET_PROVIDERS);
+    return this.http.get<any>(API_END_POINTS.GET_PROVIDERS)
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
index 74d4b142d..54a2afe8e 100644
--- a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
+++ b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
@@ -22,10 +22,10 @@ import {
   MatCheckboxModule,
   MatDatepickerModule,
 } from '@angular/material'
-import { PipePublicURLModule } from '../pipes/pipe-public-URL/pipe-public-URL.module';
-import { PipeDurationTransformModule } from '../pipes/pipe-duration-transform/pipe-duration-transform.module';
-import { DefaultThumbnailModule } from '../directives/default-thumbnail/default-thubnail.module';
-import { FilterSearchPipeModule } from '../pipes/filter-search/filter-search.module';
+import { PipePublicURLModule } from '../pipes/pipe-public-URL/pipe-public-URL.module'
+import { PipeDurationTransformModule } from '../pipes/pipe-duration-transform/pipe-duration-transform.module'
+import { DefaultThumbnailModule } from '../directives/default-thumbnail/default-thubnail.module'
+import { FilterSearchPipeModule } from '../pipes/filter-search/filter-search.module'
 import { MatMenuModule } from '@angular/material/menu'
 import { MatPaginatorModule } from '@angular/material/paginator'
 import { MatCardModule } from '@angular/material/card'
@@ -55,13 +55,13 @@ import { UserCardComponent } from './components/user-card/user-card.component'
 import { CreateTimelineComponent } from './routes/create-timeline/create-timeline.component'
 import { AddTimelineFormComponent } from './components/add-timeline-form/add-timeline-form.component'
 import { FilterComponent } from './components/filter/filter.component'
-import { ConfirmationBoxComponent } from './components/confirmation-box/confirmation.box.component'
 import { PreviewPlanComponent } from './routes/preview-plan/preview-plan.component'
 import { CreateContentComponent } from './routes/create-content/create-content.component'
 import { CategoryDropDownComponent } from './components/category-drop-down/category-drop-down.component'
 import { AddPlanInformationComponent } from './components/add-plan-information/add-plan-information.component'
 
 import { TrainingPlanService } from './services/traininig-plan.service'
+import { UpdatePlanResolveService } from './resolvers/update-plan-resolve.service'
 @NgModule({
   declarations: [
     TrainingPlanHomeComponent,
@@ -77,7 +77,6 @@ import { TrainingPlanService } from './services/traininig-plan.service'
     CreateTimelineComponent,
     AddTimelineFormComponent,
     FilterComponent,
-    ConfirmationBoxComponent,
     PreviewPlanComponent,
     CreateContentComponent,
     CategoryDropDownComponent,
@@ -137,11 +136,11 @@ import { TrainingPlanService } from './services/traininig-plan.service'
     FilterSearchPipeModule
   ],
   entryComponents: [
-    ConfirmationBoxComponent,
   ],
   providers: [
     InitResolver,
     TrainingPlanService,
+    UpdatePlanResolveService
   ],
 })
 export class TrainingPlanModule {
diff --git a/project/ws/app/src/lib/routes/training-plan/training-plan.routing.module.ts b/project/ws/app/src/lib/routes/training-plan/training-plan.routing.module.ts
index 6de84cc4a..dfbdeaf52 100644
--- a/project/ws/app/src/lib/routes/training-plan/training-plan.routing.module.ts
+++ b/project/ws/app/src/lib/routes/training-plan/training-plan.routing.module.ts
@@ -4,6 +4,7 @@ import { ConfigResolveService } from './resolvers/config-resolve.service'
 import { TrainingPlanHomeComponent } from './routes/training-plan-home/training-plan-home.component'
 import { CreatePlanComponent } from './routes/create-plan/create-plan.component'
 import { PreviewPlanComponent } from './routes/preview-plan/preview-plan.component'
+import { UpdatePlanResolveService } from './resolvers/update-plan-resolve.service'
 
 const routes: Routes = [
   {
@@ -33,6 +34,9 @@ const routes: Routes = [
           pageId: 'update-plan',
           module: 'Create Plan',
         },
+        resolve: {
+          contentData: UpdatePlanResolveService
+        }
       },
       {
         path: 'preview-plan',
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index bf318a755..293538097 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -57,7 +57,7 @@ const routes: Routes = [
     canActivate: [GeneralGuard],
     data: {
       pageType: 'feature',
-      pageKey: 'training-plan-home',
+      // pageKey: 'training-plan-homeeee',
     },
     resolve: {
       pageData: PageResolve,
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 6b1ec8f8d..e76f9764c 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -66,6 +66,7 @@ import { ServiceWorkerModule } from '@angular/service-worker'
 import { environment } from '../environments/environment'
 import { PublicLogoutModule } from './routes/public/public-logout/public-logout.module'
 import { LoaderService } from './services/loader.service'
+import { ConfirmationBoxComponent } from '../../project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation.box.component'
 @Injectable()
 export class HammerConfig extends GestureConfig {
   buildHammer(element: HTMLElement) {
@@ -98,6 +99,7 @@ const getBaseHref = (platformLocation: PlatformLocation): string => {
     DialogConfirmComponent,
     LoginRootComponent,
     LoginRootDirective,
+    ConfirmationBoxComponent
   ],
   imports: [
     FormsModule,
@@ -150,6 +152,7 @@ const getBaseHref = (platformLocation: PlatformLocation): string => {
   entryComponents: [
     DialogConfirmComponent,
     LoginComponent,
+    ConfirmationBoxComponent
   ],
   providers: [
     {

From 75f859ed153bb1d0a8d7f9603dad67b94902293c Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Thu, 21 Dec 2023 17:34:30 +0530
Subject: [PATCH 358/887] update for custom user filter and ui fixes

---
 .../ws/app/src/lib/routes/home/home.module.ts |  8 +-
 .../add-plan-information.component.ts         |  3 +-
 .../add-timeline-form.component.html          |  4 +-
 .../add-timeline-form.component.ts            |  3 +-
 .../category-drop-down.component.ts           |  4 +-
 .../components/chip/chip.component.html       |  8 +-
 .../components/filter/filter.component.html   | 52 +++++++-----
 .../components/filter/filter.component.scss   |  2 +-
 .../components/filter/filter.component.ts     | 81 +++++++++++++++++--
 .../components/search/search.component.html   |  6 +-
 .../components/search/search.component.ts     | 48 ++++++++---
 .../standard-card.component.html              |  4 +-
 .../standard-card/standard-card.component.ts  |  5 +-
 .../user-card/user-card.component.html        |  2 +-
 .../user-card/user-card.component.ts          | 23 +++---
 .../create-assignee.component.ts              |  3 +-
 .../create-content.component.ts               | 12 +--
 .../create-timeline.component.html            |  7 +-
 .../preview-plan/preview-plan.component.html  |  9 ++-
 19 files changed, 202 insertions(+), 82 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index c9f48dcb5..ae7acc264 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -64,7 +64,7 @@ import { BlendedApprovalsComponent } from './routes/blended-approvals/blended-ap
 import { ReportsSectionComponent } from './routes/reports-section/reports-section.component'
 import { TrainingPlanDashboardComponent } from './routes/training-plan-dashboard/training-plan-dashboard.component'
 import { TrainingPlanDashboardService } from './services/training-plan-dashboard.service'
-import { ConfirmationBoxComponent } from '../training-plan/components/confirmation-box/confirmation.box.component'
+// import { ConfirmationBoxComponent } from '../training-plan/components/confirmation-box/confirmation.box.component'
 @NgModule({
   declarations: [
     HomeComponent,
@@ -89,7 +89,7 @@ import { ConfirmationBoxComponent } from '../training-plan/components/confirmati
     BlendedApprovalsComponent,
     ReportsSectionComponent,
     TrainingPlanDashboardComponent,
-    ConfirmationBoxComponent
+    // ConfirmationBoxComponent
   ],
   imports: [
     CommonModule,
@@ -148,7 +148,7 @@ import { ConfirmationBoxComponent } from '../training-plan/components/confirmati
     StaffdetailspopupComponent,
     BudgetschemepopupComponent,
     BudgetproofspopupComponent,
-    ConfirmationBoxComponent
+    // ConfirmationBoxComponent
   ],
   providers: [
     // CKEditorService,
@@ -157,7 +157,7 @@ import { ConfirmationBoxComponent } from '../training-plan/components/confirmati
     MdoInfoService,
     UploadService,
     TrainingPlanDashboardService,
-  ],
+  ]
 })
 export class HomeModule {
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
index 719d2b6a9..f6c9f084e 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
@@ -20,13 +20,14 @@ export class AddPlanInformationComponent implements OnInit {
   ) { }
 
   ngOnInit() {
+    const noSpecialChar = new RegExp(/^[\u0900-\u097F\u0980-\u09FF\u0C00-\u0C7F\u0B80-\u0BFF\u0C80-\u0CFF\u0D00-\u0D7F\u0A80-\u0AFF\u0B00-\u0B7F\u0A00-\u0A7Fa-zA-Z0-9()$[\]\\.:,_/ -]*$/)
     if (!this.trainingPlanDataSharingSvc.trainingPlanTitle) {
       this.planTitleInvalid.emit(true)
     }
     this.contentForm = this.formBuilder.group({
       name:
         new FormControl((this.trainingPlanDataSharingSvc.trainingPlanTitle) ? this.trainingPlanDataSharingSvc.trainingPlanTitle : '',
-                        [Validators.required, Validators.minLength(10)]),
+                        [Validators.required, Validators.pattern(noSpecialChar), Validators.minLength(10)]),
     })
     
     this.contentForm.controls['name'].valueChanges.pipe(debounceTime(200)).subscribe((_ele: any) => {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html
index bf2352d37..2b376289c 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html
@@ -6,8 +6,8 @@
         <div class="fonm-element-label">Timeline <span class="required"></span></div>
         <div class="calender">
         <mat-form-field appearance="outline">
-            <mat-label>End date</mat-label>
-            <input matInput #ref [matDatepicker]="picker" [min]="todayDate" [(ngModel)]="todayDate" (dateChange)="changeTimeline(ref.value)">
+            <mat-label>Select date</mat-label>
+            <input matInput #ref [matDatepicker]="picker" [min]="minDate" [(ngModel)]="todayDate" (dateChange)="changeTimeline(ref.value)">
             <mat-datepicker-toggle matSuffix [for]="picker">
                 <mat-icon matDatepickerToggleIcon>calendar_today</mat-icon>
             </mat-datepicker-toggle>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
index d77595690..40e6af050 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
@@ -8,7 +8,8 @@ import { TrainingPlanDataSharingService } from '../../services/training-plan-dat
   providers: [DatePipe],
 })
 export class AddTimelineFormComponent implements OnInit {
-  todayDate: Date = new Date()
+  minDate: Date = new Date();
+  todayDate = undefined;
   constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService, private datePipe: DatePipe) { }
 
   ngOnInit() {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
index c321cbde5..5931db9ee 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
@@ -65,7 +65,7 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
           this.handleCategorySelection.emit(event);
         }
         break
-      case 'Program':
+      case 'Standalone Assessment':
         dialogData['type'] = 'normal'
         dialogData['icon'] = 'radio_on'
         dialogData['title'] = 'You are attempting to change the selected content type?'
@@ -73,7 +73,7 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         It's advisable to save the current one as a draft and create a new one instead.`
         dialogData['primaryAction'] = 'I understand, change content type'
         dialogData['secondaryAction'] = 'Cancel'
-        dialogData['event'] = 'Program'
+        dialogData['event'] = 'Standalone Assessment'
         this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event;
         this.trainingPlanDataSharingService.moderatedCourseSelectStatus.next(false);
         if(this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.length) {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
index 631c576f1..fa71b0c91 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
@@ -4,7 +4,7 @@
         <ng-container *ngFor="let item of selectedContentChips | slice : 0 : 3">
             <div class="chips flex flex-row" *ngIf="item?.selected">
                 <div class="chips-content">
-                    <span class="color-60">{{item?.name}}</span>
+                    <span class="color-60">{{item?.name | titlecase}}</span>
                 </div>
                 <div class="cross-icon" (click)="removeContent(item)">
                     <img class="cursor-pointer" src="assets/icons/close.svg" />
@@ -25,8 +25,8 @@
         <ng-container *ngFor="let item of selectedAssigneeChips | slice : 0 : 3">
             <div class="chips flex flex-row" *ngIf="item?.selected">
                 <div class="chips-content">
-                    <span class="color-60">{{(item?.name) ? item?.name : (item?.firstName) ? item?.firstName :
-                        ''}}</span>
+                    <span class="color-60">{{((item?.name) ? item?.name : (item?.firstName) ? item?.firstName :
+                        '') | titlecase}}</span>
                 </div>
                 <div class="cross-icon" (click)="removeAssignee(item)">
                     <img class="cursor-pointer" src="assets/icons/close.svg" />
@@ -47,7 +47,7 @@
         <ng-container *ngFor="let item of selectedAssigneeChips | slice : 0 : 3">
             <div class="chips flex flex-row" *ngIf="item?.selected">
                 <div class="chips-content">
-                    <span class="color-60">{{item?.firstName}}</span>
+                    <span class="color-60">{{item?.firstName | titlecase}}</span>
                 </div>
                 <div class="cross-icon" (click)="removeAssignee(item)">
                     <img class="cursor-pointer" src="assets/icons/close.svg" />
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
index 501ebb9d3..bf763ab7b 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
@@ -6,11 +6,9 @@
                 <div class="cross-filter cursor-pointer" (click)="hideFilter()"><img src="assets/icons/close.svg"></div>
             </div>
         </div>
-        <div class="filter-content-container">
+        <div class="filter-content-container" *ngIf="from === 'content'">
             <div class="filter-content flex flex-1">
                 <mat-accordion>
-                    <!-- (opened)="panelOpenState = true"
-                        (closed)="panelOpenState = false" -->
                     <mat-expansion-panel disableRipple [expanded]="true">
                         <mat-expansion-panel-header>
                             <mat-panel-title>
@@ -23,24 +21,6 @@
                     </mat-expansion-panel>
                 </mat-accordion>
             </div>
-            <!-- <div class="spacer"></div>
-            <div class="filter-content flex flex-1">
-                <mat-accordion>
-                    <mat-expansion-panel disableRipple [expanded]="true">
-                        <mat-expansion-panel-header >
-                            <mat-panel-title>
-                                Competency Type
-                            </mat-panel-title>
-                        </mat-expansion-panel-header>
-                        <div class="flex flex-1 flex-row category-item">
-                            <mat-checkbox disableRipple class="example-margin">Core</mat-checkbox>
-                        </div>
-                        <div class="flex flex-1 flex-row category-item">
-                            <mat-checkbox disableRipple class="example-margin">Leadership</mat-checkbox>
-                        </div>
-                    </mat-expansion-panel>
-                </mat-accordion>
-            </div> -->
             <div class="spacer" *ngIf="competencyThemeList.length"></div>
             <div class="filter-content flex flex-1" *ngIf="competencyThemeList.length">
                 <mat-accordion>
@@ -106,6 +86,36 @@
                 </mat-accordion>
             </div>
         </div>
+        <div class="filter-content-container" *ngIf="from === 'assignee'">
+            <div class="filter-content flex flex-1">
+                <mat-accordion>
+                    <mat-expansion-panel disableRipple [expanded]="true">
+                        <mat-expansion-panel-header>
+                            <mat-panel-title>
+                                Groups
+                            </mat-panel-title>
+                        </mat-expansion-panel-header>
+                        <div class="flex flex-1 flex-row category-item" *ngFor="let group of groupList">
+                            <mat-checkbox #checkboxes disableRipple class="example-margin" (change)="manageSelectedGroup($event, group)">{{group?.name}}</mat-checkbox>
+                        </div>
+                    </mat-expansion-panel>
+                </mat-accordion>
+            </div>
+            <div class="filter-content flex flex-1">
+                <mat-accordion>
+                    <mat-expansion-panel disableRipple [expanded]="true">
+                        <mat-expansion-panel-header>
+                            <mat-panel-title>
+                                Designation
+                            </mat-panel-title>
+                        </mat-expansion-panel-header>
+                        <div class="flex flex-1 flex-row category-item" *ngFor="let des of designationList">
+                            <mat-checkbox #checkboxes disableRipple class="example-margin" (change)="manageSelectedDesignation($event, des)">{{des?.name}}</mat-checkbox>
+                        </div>
+                    </mat-expansion-panel>
+                </mat-accordion>
+            </div>
+        </div>
         <div class="filter-footer flex flex-1">
             <div class="flex flex-2 flex-row">
                 <div class="filter-clear" (click)="clearFilter()">
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.scss b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.scss
index 163c778f0..f20dd30a0 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.scss
@@ -151,7 +151,7 @@
 }
 
 ::-webkit-scrollbar-track {
-    -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
+    -webkit-box-shadow: inset 0 0 4px rgba(0,0,0,0.16);
 }
 
 ::-webkit-scrollbar-thumb {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index 4d96e0f06..969f04293 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -12,23 +12,36 @@ export class FilterComponent implements OnInit {
   @Output() toggleFilter = new EventEmitter()
   @Output() getFilterData = new EventEmitter();
   @Input() clearFilterFlag:any;
+  @Input() from:any;
+  @Input() designationList:any;
   providersList: any[] = [];
   selectedProviders: any[] = [];
   competencyTypeList = [{ "id": "Behavioral", name: 'Behavioural' }, { "id": 'Functional', name: 'Functional' }, { "id": 'Domain', name: 'Domain' }];
+  groupList = [{ "id": "groupA", name: 'Group A' }, { "id": 'groupB', name: 'Group B' }, { "id": 'groupC', name: 'Group C' }, { "id": 'groupD', name: 'Group D' }, { "id": 'groupE', name: 'Group E' }];
   competencyList: any = [];
   competencyThemeList: any[] = [];
   competencySubThemeList: any[] = [];
   filterObj: any = { "competencyArea": [], "competencyTheme": [], "competencySubTheme": [], "providers": [] };
+  assigneeFilterObj:any = {"group": [], "designation": []}
   searchThemeControl = new FormControl();
   @ViewChildren("checkboxes") checkboxes!: QueryList<ElementRef>;
   constructor(private trainingPlanService: TrainingPlanService, private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
-    this.getFilterEntity();
-    this.getProviders();
+    if(this.from === 'content') {
+      this.getFilterEntity();
+      this.getProviders();
+    } else {
+      // if(this.trainingPlanDataSharingService.trainingPlanAssigneeData && 
+      //   this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Custom Users') {
+      //   this.getDesignation();
+      // }
+      
+    }
+    
     this.trainingPlanDataSharingService.clearFilter.subscribe((result:any)=>{
       if(result) {
-        this.clearFilter();
+        this.clearFilterWhileSearch();
       }
     })
   }
@@ -140,13 +153,27 @@ export class FilterComponent implements OnInit {
   }
 
   applyFilter() {
-    this.getFilterData.emit(this.filterObj);
+    if(this.from === 'content') {
+      this.getFilterData.emit(this.filterObj);
+    } else {
+      this.getFilterData.emit(this.assigneeFilterObj);
+    }
     this.toggleFilter.emit(false)
   }
 
   clearFilter() {
     console.log('this.clearFilter', this.checkboxes);
-    this.filterObj = {};
+    if(this.from === 'content') {
+      this.filterObj = {};
+    } else {
+      this.assigneeFilterObj = {};
+    }
+    
+    if(this.from === 'content') {
+      this.getFilterData.emit(this.filterObj);
+    } else {
+      this.getFilterData.emit(this.assigneeFilterObj);
+    }
     if(this.checkboxes) {
       this.checkboxes.forEach((element: any) => {
         element['checked'] = false;
@@ -154,4 +181,48 @@ export class FilterComponent implements OnInit {
     }
     
   }
+
+  clearFilterWhileSearch() {
+    if(this.checkboxes) {
+      this.checkboxes.forEach((element: any) => {
+        element['checked'] = false;
+      });
+    }
+  }
+
+  
+
+  // getDesignation() {
+  //   this.trainingPlanService.getDesignations().subscribe((res: any) => {
+  //     console.log('res', res)
+  //     if(res && res.result && res.result.response) {
+  //       this.designationList = res.result.response.content;
+  //     }
+      
+  //   })
+  // }
+
+  manageSelectedGroup(event:any, group:any) {
+    console.log(event,group);
+    if (event) {
+      this.assigneeFilterObj['group'].push(group.name);
+    } else {
+      if (this.assigneeFilterObj['group'].indexOf(group.name) > -1) {
+        const index = this.assigneeFilterObj['group'].findIndex((x: any) => x === group.name)
+        this.assigneeFilterObj['group'].splice(index, 1)
+      }
+    }
+  }
+
+  manageSelectedDesignation(event:any, designation:any) {
+    console.log(event,designation);
+    if (event) {
+      this.assigneeFilterObj['designation'].push(designation.name);
+    } else {
+      if (this.assigneeFilterObj['designation'].indexOf(designation.name) > -1) {
+        const index = this.assigneeFilterObj['designation'].findIndex((x: any) => x === designation.name)
+        this.assigneeFilterObj['designation'].splice(index, 1)
+      }
+    }
+  }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
index 14aad3efd..653162877 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
@@ -12,13 +12,13 @@
         </div>
         <button mat-button type="button" class="search-btn" (click)="searchData()">Search</button>
     </div>
-    <div class="filter-section flex flex-end" *ngIf="!(trainingPlanDataSharingService?.trainingPlanAssigneeData?.category === 'Designation'
-    || trainingPlanDataSharingService?.trainingPlanAssigneeData?.category === 'All Users')">
+    <div class="filter-section flex flex-end" *ngIf="(trainingPlanDataSharingService?.trainingPlanAssigneeData?.category !== 'Designation'
+    && trainingPlanDataSharingService?.trainingPlanAssigneeData?.category !== 'All Users') || from === 'content'">
         <button mat-button type="button" (click)="openFilter()" class="apply-filter">
             <mat-icon class="margin-right-xs">filter_list</mat-icon> Apply Filters
         </button>
     </div>
 </div>
 <div [hidden]="!filterVisibilityFlag">
-    <ws-app-filter (toggleFilter)="hideFilter($event)" (getFilterData)="getFilterData($event)" [clearFilterFlag]="clearFilter"></ws-app-filter>
+    <ws-app-filter (toggleFilter)="hideFilter($event)" [from]="from" [designationList]="designationList" (getFilterData)="getFilterData($event)" [clearFilterFlag]="clearFilter"></ws-app-filter>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 1def289dc..e60a7f558 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -19,6 +19,7 @@ export class SearchComponent implements OnInit {
   filterVisibilityFlag = false
   clearFilter = false;
   selectedDropDownValue: any
+  designationList:any[] = [];
   constructor(@Inject(DOCUMENT) private document: Document,
     private trainingPlanService: TrainingPlanService,
     private route: ActivatedRoute,
@@ -76,25 +77,29 @@ export class SearchComponent implements OnInit {
       if (contentType === 'Moderated Course') {
         this.trainingPlanDataSharingService.moderatedCourseSelectStatus.next(true)
       }
+      if(this.searchText) {        
+          this.trainingPlanDataSharingService.clearFilter.next(true);
+          applyFilterObj = {};
+      }
       const filterObj = {
         "request": {
           "secureSettings": contentType === 'Moderated Course' ? true : false, // for moderated course
           "filters": {
             "primaryCategory": [contentType === 'Moderated Course' ? 'Course' : contentType],
-            "organisation":  applyFilterObj && applyFilterObj['providers'].length ? applyFilterObj['providers'] : [],
-            "competencies_v5.competencyArea": applyFilterObj && applyFilterObj['competencyArea'].length ? applyFilterObj['competencyArea'] : [],
-            "competencies_v5.competencyTheme": applyFilterObj && applyFilterObj['competencyTheme'].length ? applyFilterObj['competencyTheme'] : [],
-            "competencies_v5.competencySubTheme" : applyFilterObj && applyFilterObj['competencySubTheme'].length ? applyFilterObj['competencySubTheme'] : []
+            "organisation":  applyFilterObj && applyFilterObj['providers'] && applyFilterObj['providers'].length ? applyFilterObj['providers'] : [],
+            "competencies_v5.competencyArea": applyFilterObj && applyFilterObj['competencyArea'] && applyFilterObj['competencyArea'].length ? applyFilterObj['competencyArea'] : [],
+            "competencies_v5.competencyTheme": applyFilterObj && applyFilterObj['competencyTheme'] && applyFilterObj['competencyTheme'].length ? applyFilterObj['competencyTheme'] : [],
+            "competencies_v5.competencySubTheme" : applyFilterObj && applyFilterObj['competencySubTheme'] && applyFilterObj['competencySubTheme'].length ? applyFilterObj['competencySubTheme'] : []
           },
           "offset": 0,
-          "limit": 20,
+          "limit": 500,
           "query": (this.searchText) ? this.searchText : '',
           "sort_by": { "lastUpdatedOn": "desc" },
           "fields": ["name", "appIcon", "instructions", "description", "purpose", "mimeType",
-            "gradeLevel", "identifier", "medium", "pkgVersion", "board", "subject", "resourceType",
-            "primaryCategory", "contentType", "channel", "organisation", "trackable", "license", "posterImage",
+            "gradeLevel", "identifier", "medium",  "resourceType",
+            "primaryCategory", "contentType", "channel", "organisation", "trackable", "posterImage",
             "idealScreenSize", "learningMode", "creatorLogo", "duration", "programDuration", "version", "avgRating", "competencies_v5"]
-        }, "query": ""
+        }
       }
       this.trainingPlanService.getAllContent(filterObj).subscribe((res: any) => {
 
@@ -115,17 +120,30 @@ export class SearchComponent implements OnInit {
 
   }
 
-  getCustomUsers(event: any) {
+  getCustomUsers(event: any, applyFilterObj?:any) {
     this.loadingService.changeLoaderState(true)
     const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
+    if(this.searchText) {      
+        this.trainingPlanDataSharingService.clearFilter.next(true);
+        applyFilterObj = {};
+    }
     const filterObj = {
       request: {
         query: (this.searchText) ? this.searchText : '',
         filters: {
           rootOrgId,
           status: 1,
+          "profileDetails.professionalDetails.designation": applyFilterObj && applyFilterObj.designation && applyFilterObj.designation.length ? applyFilterObj.designation : [],
+          "profileDetails.professionalDetails.group": applyFilterObj && applyFilterObj.group && applyFilterObj.group.length ? applyFilterObj.group : [],
         },
-        limit: 100,
+        "fields": [
+            "userId",
+            "firstName",
+            "rootOrgName",
+            "profileDetails",
+            "organisations"
+        ],
+        limit: 500,
         offset: 0,
       },
     }
@@ -155,6 +173,7 @@ export class SearchComponent implements OnInit {
         this.trainingPlanDataSharingService.trainingPlanAssigneeData = { category: event, data: resArr }
       } else {
         this.trainingPlanDataSharingService.trainingPlanAssigneeData = { category: event, data: res.result.response.content }
+        this.designationList = res.result.response.content;
       }
       
       this.handleApiData.emit(true)
@@ -165,7 +184,7 @@ export class SearchComponent implements OnInit {
   searchData() {
     switch (this.selectedDropDownValue) {
       case 'Course':
-      case 'Program':
+      case 'Standalone Assessment':
       case 'Blended program':
       case 'Curated program':
       case 'Moderated Course':
@@ -184,7 +203,12 @@ export class SearchComponent implements OnInit {
   }
 
   getFilterData(event:any) {
-    this.getContent(this.selectedDropDownValue, event);
+    if(this.from == 'content') {
+      this.getContent(this.selectedDropDownValue, event);
+    } else {
+      this.getCustomUsers(this.selectedDropDownValue, event);
+    }
+    
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
index fc6b5904b..90307d493 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
@@ -16,7 +16,7 @@
                             </div>
                             <img mat-card-image loading="lazy"
                                 class="card-img ws-mat-primary-lite-background margin-remove"
-                                [src]="item?.posterImage" />
+                                [src]="item?.posterImage" [wsUtilsDefaultThumbnail]="defaultPosterImage"/>
                         </ng-container>
                         <div class="duration-box right-corner"  *ngIf="item?.duration > 0">
                             <mat-icon class="mat-icon main_icon mr-1 notranslate material-icons mat-icon-no-color">access_time</mat-icon>
@@ -75,6 +75,6 @@
         
     </div>
     <div class="flex flex-row justify-center" *ngIf="showPagination">
-        <mat-paginator [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 100]" [length]="contentData?.length" (page)="onChangePage($event)"></mat-paginator>
+        <mat-paginator [pageSize]="pageSize" [pageSizeOptions]="[20,30,40]" (page)="onChangePage($event)"></mat-paginator>
     </div>
 </ng-container>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
index 55e1d4ef6..7fe52cc2b 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
@@ -18,8 +18,9 @@ export class StandardCardComponent implements OnInit, OnChanges {
   dataSource: any;
   selectedContent: any[] = []
   startIndex = 0;
-  lastIndex = 10; 
-  pageSize = 10;
+  lastIndex = 20; 
+  pageSize = 20;
+  defaultPosterImage: SafeUrl | null = '/assets/instances/eagle/app_logos/default.png';
   defaultThumbnail: SafeUrl | null = 'assets/instances/eagle/app_logos/KarmayogiBharat_Logo.svg'
   constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService, private changeDetectorRef: ChangeDetectorRef) { }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
index cde987e73..6bd23d57a 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
@@ -48,5 +48,5 @@
 </div>
 
 <div *ngIf="showPagination" class="flex flex-row justify-center">
-    <mat-paginator [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 100]" [length]="contentData?.length" (page)="onChangePage($event)"></mat-paginator>
+    <mat-paginator [pageSize]="pageSize" [pageSizeOptions]="[20,30,40]" (page)="onChangePage($event)"></mat-paginator>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
index f24ec674d..5e8fdc8a9 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
@@ -141,19 +141,22 @@ export class UserCardComponent implements OnInit, OnChanges {
       initials += array[0].charAt(0)
       initials += array[1].charAt(0)
     } else {
-      for (let i = 0; i < name.length; i += 1) {
-        if (name.charAt(i) === ' ') {
-          continue
-        }
-
-        if (name.charAt(i) === name.charAt(i)) {
-          initials += name.charAt(i)
-
-          if (initials.length === 2) {
-            break
+      if(name) {
+        for (let i = 0; i < name.length; i += 1) {
+          if (name.charAt(i) === ' ') {
+            continue
+          }
+  
+          if (name.charAt(i) === name.charAt(i)) {
+            initials += name.charAt(i)
+  
+            if (initials.length === 2) {
+              break
+            }
           }
         }
       }
+      
     }
     return initials.toUpperCase()
   }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
index 14180fa1c..0ec3a7dd1 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
@@ -43,7 +43,7 @@ export class CreateAssigneeComponent implements OnInit {
         this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Designation' &&
         this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo) {
         this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
-          if (this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.indexOf(sitem) > -1) {
+          if (this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.indexOf(sitem.name) > -1) {
             sitem['selected'] = true
           }
         })
@@ -61,6 +61,7 @@ export class CreateAssigneeComponent implements OnInit {
         this.handleSelectedChips(true)
       } else {
         this.assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData
+        console.log('this.assigneeData',this.assigneeData)
       }
     }
     if (this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'All Users') {
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
index 6d9bf76a9..d77188a18 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
@@ -20,27 +20,27 @@ export class CreateContentComponent implements OnInit {
     this.categoryData = [
       {
         id: 1,
-        name: 'Course',
+        name: 'Courses',
         value: 'Course',
       },
       {
         id: 4,
-        name: 'Curated program',
+        name: 'Curated programs',
         value: 'Curated program',
       },
       {
         id: 3,
-        name: 'Blended program',
+        name: 'Blended programs',
         value: 'Blended program',
       },
       {
         id: 2,
-        name: 'Program',
-        value: 'Program',
+        name: 'Standalone Assessments',
+        value: 'Standalone Assessment',
       },
       {
         id: 5,
-        name: 'Moderated Course',
+        name: 'Moderated Courses',
         value: 'Moderated Course',
       },
     ]
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
index 2c5169047..87ec14ae4 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
@@ -4,7 +4,7 @@
 <ng-container *ngIf="contentData.length">
     <div class="margin-top-xl">
         <div class="flex flex-middle flex-between">
-            <div class="mat-subheading-1 margin-remove">Selected Content</div>
+            <div class="mat-subheading-1 margin-remove">Selected Content <span *ngIf="contentData.length">( {{contentData.length }})</span></div>
             <a mat-button (click)="showAll('content')" class="show-all">Show all <mat-icon>keyboard_arrow_right</mat-icon></a>
         </div>
     </div>
@@ -13,7 +13,10 @@
 <ng-container *ngIf="assigneeData && (assigneeData?.data?.length || assigneeData?.data?.content.length)">
     <div class="margin-top-xl">
         <div class=" flex flex-middle flex-between">
-            <div class="mat-subheading-1 margin-remove">Selected Cards</div>
+            <div class="mat-subheading-1 margin-remove">Selected Assignee 
+                <span *ngIf="assigneeData && (assigneeData?.data?.length || assigneeData?.data?.content.length)">
+                    ( {{(assigneeData?.data?.length) || (assigneeData?.data?.content.length)}} )
+                </span></div>
             <a mat-button (click)="showAll('assignee')" class="show-all">Show all <mat-icon>keyboard_arrow_right</mat-icon></a>
         </div>
     </div>
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
index 7ead62199..b3f27805d 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
@@ -1,18 +1,23 @@
-<ws-app-breadcrumb [showBreadcrumbAction]="false"></ws-app-breadcrumb>
+<!-- <ws-app-breadcrumb [showBreadcrumbAction]="false"></ws-app-breadcrumb> -->
 <div class="flex margin-top-l">
     <button mat-stroked-button type="button" (click)="goBack()"><mat-icon>arrow_back</mat-icon> Go
         back</button>
 </div>
 <div class="flex" *ngIf="from==='content'">
+    <div class="mat-subheading-1 margin-remove">Selected Content <span *ngIf="contentData.length">( {{contentData.length}} )</span></div>
     <ws-app-standard-card [checkboxVisibility]="false" [contentData]="contentData" [showDeleteFlag]="true"></ws-app-standard-card>
 </div>
 <div class="flex" *ngIf="from==='assignee'">
+    <div class="mat-subheading-1 margin-remove">Selected Assignee <span *ngIf="contentData.length">( {{assigneeData.length}} )</span></div>
     <ws-app-user-card [checkboxVisibility]="false" [assigneeData]="assigneeData" [showDeleteFlag]="true"></ws-app-user-card>
 </div>
 <div class="flex content-container" *ngIf="from === 'all'">
     <mat-chip-list [multiple]="true" [selectable]="true">
         <mat-chip *ngFor="let item of allContentChips" [selected]="selectedTab == item.tab"
-            (click)="selectedTab = item.tab">{{item.name}}</mat-chip>
+            (click)="selectedTab = item.tab">{{item.name}} 
+        <span *ngIf="selectedTab === 'content'">( {{contentData.length}} )</span>
+        <span *ngIf="selectedTab === 'assignee'">( {{assigneeData.length}} )</span>
+        </mat-chip>
     </mat-chip-list>
 
 </div>

From 4cefc17d571c2964dbefd1801cbf25bc5814a2f7 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Thu, 21 Dec 2023 19:06:11 +0530
Subject: [PATCH 359/887] update for preview plan

---
 .../training-plan-dashboard.component.ts      |  3 +-
 .../preview-plan/preview-plan.component.html  |  4 +-
 .../preview-plan/preview-plan.component.ts    | 62 +++++++++----------
 .../training-plan.routing.module.ts           | 11 ++++
 4 files changed, 46 insertions(+), 34 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
index 3059ecca6..a07774792 100644
--- a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
@@ -194,7 +194,8 @@ export class TrainingPlanDashboardComponent implements OnInit {
   }
 
   previewData(_selectedRow: any) {
-    this.loaderService.changeLoaderState(true)
+    // this.loaderService.changeLoaderState(true)
+    this.router.navigate(['app', 'training-plan', 'preview-plan-for-dashboard', _selectedRow.id])
   }
 
   editContentData(_selectedRow: any) {
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
index b3f27805d..369fec59d 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
@@ -15,7 +15,7 @@
     <mat-chip-list [multiple]="true" [selectable]="true">
         <mat-chip *ngFor="let item of allContentChips" [selected]="selectedTab == item.tab"
             (click)="selectedTab = item.tab">{{item.name}} 
-        <span *ngIf="selectedTab === 'content'">( {{contentData.length}} )</span>
+        <span *ngIf="selectedTab === 'content'">( {{contentList.length}} )</span>
         <span *ngIf="selectedTab === 'assignee'">( {{assigneeData.length}} )</span>
         </mat-chip>
     </mat-chip-list>
@@ -23,7 +23,7 @@
 </div>
 <div class="content-container flex" *ngIf="from === 'all'">
     <ng-container *ngIf="selectedTab === 'content'">
-        <ws-app-standard-card [checkboxVisibility]="false" [contentData]="contentData"></ws-app-standard-card>
+        <ws-app-standard-card [checkboxVisibility]="false" [contentData]="contentList"></ws-app-standard-card>
     </ng-container>
     <ng-container *ngIf="selectedTab === 'assignee'">
         <ws-app-user-card [checkboxVisibility]="false" [assigneeData]="assigneeData"></ws-app-user-card>
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
index 530a76804..b6930e3cd 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
@@ -7,7 +7,7 @@ import { TrainingPlanDataSharingService } from '../../services/training-plan-dat
   styleUrls: ['./preview-plan.component.scss'],
 })
 export class PreviewPlanComponent implements OnInit {
-  contentData: any = []
+  contentList: any = []
   assigneeData: any = []
   from: any = ''
   tab: any = ''
@@ -21,66 +21,66 @@ export class PreviewPlanComponent implements OnInit {
   ngOnInit() {
     this.from = this.route.snapshot.queryParams['from']
     this.tab = this.selectedTab = this.route.snapshot.queryParams['tab']
-    if (this.from === 'content') {
-      if (this.trainingPlanDataSharingService.trainingPlanContentData &&
-        this.trainingPlanDataSharingService.trainingPlanContentData.data) {
-        this.contentData = this.trainingPlanDataSharingService.trainingPlanContentData.data.content.filter((item: any) => {
-          return item.selected
-        })
-      }
-    } else if (this.from === 'assignee') {
-      const category = this.trainingPlanDataSharingService.trainingPlanAssigneeData.category
-      if (category === 'Designation') {
-        const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
-          return item.selected
-        })
-        this.assigneeData = { category, data: assigneeData }
-      } else if (category === 'CustomUser') {
-        const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
-          return item.selected
-        })
-        this.assigneeData = { category, data: assigneeData }
-      }
-
-    } else if (this.from === 'all') {
+    const contentData = this.route.snapshot.data['contentData']
+    if (contentData) {
+      this.from = 'all';
+      console.log('contentData-->', contentData);
       const arr = []
       arr.push({
-        name: this.trainingPlanDataSharingService.trainingPlanStepperData.contentType,
+        name: contentData.contentType,
         tab: 'content',
         selected: (this.tab === 'content' ? true : false),
       })
       this.allContentChips = arr
       arr.push({
-        name: this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentType,
+        name: contentData.assignmentType,
         tab: 'assignee',
         selected: (this.tab === 'assignee' ? true : false),
       })
       this.allContentChips = arr
-      if (this.trainingPlanDataSharingService.trainingPlanAssigneeData) {
-        const category = this.trainingPlanDataSharingService.trainingPlanAssigneeData.category
-        if (category === 'CustomUser') {
-          const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
+      if (contentData.assignmentTypeInfo) {
+        const category = contentData.assignmentType
+        if (category === 'custom') {
+          const assigneeData = contentData.assignmentTypeInfo.filter((item: any) => {
             return item.selected
           })
           this.assigneeData = { category, data: assigneeData }
         }
         if (category === 'Designation') {
-          const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
+          const assigneeData = contentData.assignmentTypeInfo.filter((item: any) => {
             return item.selected
           })
           this.assigneeData = { category, data: assigneeData }
         }
       }
 
+      if (contentData &&
+        contentData.contentList) {
+          this.contentList = contentData.contentList;
+        console.log(this.contentList, contentData.contentList);
+      }
+    } else  if (this.from === 'content') {
       if (this.trainingPlanDataSharingService.trainingPlanContentData &&
         this.trainingPlanDataSharingService.trainingPlanContentData.data) {
         this.contentData = this.trainingPlanDataSharingService.trainingPlanContentData.data.content.filter((item: any) => {
           return item.selected
         })
       }
+    } else if (this.from === 'assignee') {
+      const category = this.trainingPlanDataSharingService.trainingPlanAssigneeData.category
+      if (category === 'Designation') {
+        const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
+          return item.selected
+        })
+        this.assigneeData = { category, data: assigneeData }
+      } else if (category === 'CustomUser') {
+        const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
+          return item.selected
+        })
+        this.assigneeData = { category, data: assigneeData }
+      }
 
     }
-
   }
 
   goBack() {
diff --git a/project/ws/app/src/lib/routes/training-plan/training-plan.routing.module.ts b/project/ws/app/src/lib/routes/training-plan/training-plan.routing.module.ts
index dfbdeaf52..c3ea3c7f0 100644
--- a/project/ws/app/src/lib/routes/training-plan/training-plan.routing.module.ts
+++ b/project/ws/app/src/lib/routes/training-plan/training-plan.routing.module.ts
@@ -46,6 +46,17 @@ const routes: Routes = [
           module: 'Preview Plan',
         },
       },
+      {
+        path: 'preview-plan-for-dashboard/:planId',
+        component: PreviewPlanComponent,
+        data: {
+          pageId: 'preview-plan',
+          module: 'Preview Plan',
+        },
+        resolve: {
+          contentData: UpdatePlanResolveService
+        }
+      },
     ],
   },
 ]

From bb6f9a9c13ee2f5bdaa4c45e9b54c55283536d73 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Fri, 22 Dec 2023 12:28:15 +0530
Subject: [PATCH 360/887] update for preview plan and filter style

---
 .../add-plan-information.component.ts         | 15 ++++--
 .../components/filter/filter.component.scss   |  7 ++-
 .../components/search/search.component.ts     |  2 +-
 .../preview-plan/preview-plan.component.html  |  6 +--
 .../preview-plan/preview-plan.component.scss  |  6 +++
 .../preview-plan/preview-plan.component.ts    | 47 ++++++++++++-------
 .../training-plan-home.component.ts           |  8 ++--
 7 files changed, 61 insertions(+), 30 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
index 6bd4d0fb5..826e09fad 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
@@ -2,6 +2,7 @@ import { Component, EventEmitter, OnInit, Output } from '@angular/core'
 import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'
 import { debounceTime } from 'rxjs/operators'
 import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
+import { Subscription } from 'rxjs'
 
 @Component({
   selector: 'ws-app-add-plan-information',
@@ -13,13 +14,14 @@ export class AddPlanInformationComponent implements OnInit {
   @Output() planTitleInvalid = new EventEmitter<any>()
 
   contentForm!: FormGroup
-
+  private subscr:Subscription = new Subscription();
   constructor(
     private formBuilder: FormBuilder,
     private tpdsSvc: TrainingPlanDataSharingService
   ) { }
 
   ngOnInit() {
+    
     const noSpecialChar = new RegExp(/^[\u0900-\u097F\u0980-\u09FF\u0C00-\u0C7F\u0B80-\u0BFF\u0C80-\u0CFF\u0D00-\u0D7F\u0A80-\u0AFF\u0B00-\u0B7F\u0A00-\u0A7Fa-zA-Z0-9()$[\]\\.:,_/ -]*$/)
     if (!this.tpdsSvc.trainingPlanTitle) {
       this.planTitleInvalid.emit(true)
@@ -29,19 +31,26 @@ export class AddPlanInformationComponent implements OnInit {
         new FormControl('', [Validators.required, Validators.pattern(noSpecialChar), Validators.minLength(10)]),
     })
 
-    this.contentForm.controls['name'].valueChanges.pipe(debounceTime(500)).subscribe((_ele: any) => {
+    this.subscr = this.subscr.add(this.contentForm.controls['name'].valueChanges.pipe(debounceTime(500)).subscribe((_ele: any) => {
       if (!this.contentForm.invalid) {
         this.tpdsSvc.trainingPlanTitle = _ele
         this.tpdsSvc.trainingPlanStepperData.name = _ele
       }
       this.planTitleInvalid.emit(this.contentForm.invalid)
-    })
+    }));
 
     if (this.tpdsSvc.trainingPlanTitle) {
       this.contentForm.controls['name'].setValue(this.tpdsSvc.trainingPlanTitle)
     }
   }
 
+  ngOnDestroy() {
+    if(this.subscr) {
+      this.subscr.unsubscribe();
+    }
+    
+  }
+
 }
 
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.scss b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.scss
index f20dd30a0..424f649ef 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.scss
@@ -110,9 +110,14 @@
 .category-item {
     color: rgba(0,0,0,0.6);
     padding: 12px 0;
+    width: 318px;
+    overflow: hidden;
 }
 
-
+::ng-deep .mat-checkbox-label {
+    width: 300px;
+    white-space: pre-wrap;
+}
 /** Search **/
 
 .rsearch {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index f93d1771f..a28d40ecf 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -102,7 +102,7 @@ export class SearchComponent implements OnInit {
         }
       }
       this.trainingPlanService.getAllContent(filterObj).subscribe((res: any) => {
-        if (this.tpdsSvc.trainingPlanContentData.data && this.tpdsSvc.trainingPlanContentData.data.content) {
+        if (this.tpdsSvc.trainingPlanContentData && this.tpdsSvc.trainingPlanContentData.data && this.tpdsSvc.trainingPlanContentData.data.content) {
           this.tpdsSvc.trainingPlanContentData = {
             category: contentType,
             data: { content: _.uniqBy(_.concat(this.tpdsSvc.trainingPlanContentData.data.content, res.content), 'identifier') }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
index 369fec59d..d46dd3464 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
@@ -13,10 +13,8 @@
 </div>
 <div class="flex content-container" *ngIf="from === 'all'">
     <mat-chip-list [multiple]="true" [selectable]="true">
-        <mat-chip *ngFor="let item of allContentChips" [selected]="selectedTab == item.tab"
-            (click)="selectedTab = item.tab">{{item.name}} 
-        <span *ngIf="selectedTab === 'content'">( {{contentList.length}} )</span>
-        <span *ngIf="selectedTab === 'assignee'">( {{assigneeData.length}} )</span>
+        <mat-chip [ngClass]="selectedTab == item.tab ? 'select-tab': ''" *ngFor="let item of allContentChips" [selected]="selectedTab == item.tab"
+            (click)="selectedTab = item.tab">{{item.name}} <span>( {{item?.count}} )</span>
         </mat-chip>
     </mat-chip-list>
 
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.scss b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.scss
index 75e2afbed..80724164c 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.scss
@@ -13,4 +13,10 @@
 
 .content-container {
     justify-content: center;
+}
+
+.select-tab {
+    border: 1px solid #1b4ca1;
+    background: rgba(0,116,182,.05)!important;
+    color: #1b4ca1!important;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
index b6930e3cd..c899e1533 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
@@ -19,27 +19,15 @@ export class PreviewPlanComponent implements OnInit {
     private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
-    this.from = this.route.snapshot.queryParams['from']
-    this.tab = this.selectedTab = this.route.snapshot.queryParams['tab']
+    this.from = this.route.snapshot.queryParams['from']    
     const contentData = this.route.snapshot.data['contentData']
+    const category = contentData.assignmentType
     if (contentData) {
       this.from = 'all';
       console.log('contentData-->', contentData);
-      const arr = []
-      arr.push({
-        name: contentData.contentType,
-        tab: 'content',
-        selected: (this.tab === 'content' ? true : false),
-      })
-      this.allContentChips = arr
-      arr.push({
-        name: contentData.assignmentType,
-        tab: 'assignee',
-        selected: (this.tab === 'assignee' ? true : false),
-      })
-      this.allContentChips = arr
-      if (contentData.assignmentTypeInfo) {
-        const category = contentData.assignmentType
+      const arr = [];      
+      this.tab = this.selectedTab = 'content';
+      if (contentData.assignmentTypeInfo) {        
         if (category === 'custom') {
           const assigneeData = contentData.assignmentTypeInfo.filter((item: any) => {
             return item.selected
@@ -59,10 +47,33 @@ export class PreviewPlanComponent implements OnInit {
           this.contentList = contentData.contentList;
         console.log(this.contentList, contentData.contentList);
       }
+      if(category.toLowerCase() !== 'alluser') {
+        arr.push({
+          name: contentData.contentType,
+          tab: 'content',
+          selected: (this.tab === 'content' ? true : false),
+          count: this.contentList.length
+        })
+        arr.push({
+          name: contentData.assignmentType,
+          tab: 'assignee',
+          selected: (this.tab === 'assignee' ? true : false),
+          count: this.assigneeData.data.length
+        })
+        this.allContentChips = arr
+      } else {
+        arr.push({
+          name: contentData.contentType,
+          tab: 'content',
+          selected: (this.tab === 'content' ? true : false),
+          count: this.contentList.length
+        })
+        this.allContentChips = arr
+      }
     } else  if (this.from === 'content') {
       if (this.trainingPlanDataSharingService.trainingPlanContentData &&
         this.trainingPlanDataSharingService.trainingPlanContentData.data) {
-        this.contentData = this.trainingPlanDataSharingService.trainingPlanContentData.data.content.filter((item: any) => {
+        this.contentList = this.trainingPlanDataSharingService.trainingPlanContentData.data.content.filter((item: any) => {
           return item.selected
         })
       }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.ts
index c01a5acaf..265d92d07 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.ts
@@ -3,6 +3,7 @@ import { Component, OnInit, OnDestroy, AfterViewInit } from '@angular/core'
 import _ from 'lodash'
 /* tslint:enable */
 import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
+import { Subscription } from 'rxjs';
 @Component({
   selector: 'ws-app-training-plan-home',
   templateUrl: './training-plan-home.component.html',
@@ -13,25 +14,26 @@ import { TrainingPlanDataSharingService } from '../../services/training-plan-dat
 })
 export class TrainingPlanHomeComponent implements OnInit, AfterViewInit, OnDestroy {
   showModeratedNotification = false
+  private subscr:Subscription = new Subscription();
   constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService
   ) {
 
   }
   ngOnInit() {
-    this.trainingPlanDataSharingService.moderatedCourseSelectStatus.subscribe(status => {
+    this.subscr = this.subscr.add(this.trainingPlanDataSharingService.moderatedCourseSelectStatus.subscribe(status => {
       if (status) {
           this.showModeratedNotification = true
       } else {
         this.showModeratedNotification = false
       }
-    })
+    }));
   }
 
   ngAfterViewInit() {
   }
 
   ngOnDestroy() {
-    this.trainingPlanDataSharingService.moderatedCourseSelectStatus.unsubscribe()
+    this.subscr.unsubscribe()
   }
 
   removeNotification() {

From 4d19d131c88e487556e5f25e376e8b1e58894ad9 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Fri, 22 Dec 2023 13:24:50 +0530
Subject: [PATCH 361/887] update for preview plan

---
 .../components/user-card/user-card.component.html     |  3 ++-
 .../routes/preview-plan/preview-plan.component.ts     | 11 +++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
index 21ef0bf11..98cc7cd07 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
@@ -8,7 +8,8 @@
             </div>
             <div class="assignee-desc">
                 <p>{{item?.firstName}} </p>
-                <p class="sub-heading">{{item?.rootOrgName}}</p>
+                <p class="sub-heading" *ngIf="item?.profileDetails?.professionalDetails && item?.profileDetails?.professionalDetails[0]">{{item?.profileDetails?.professionalDetails
+[0]?.designation }}</p>
             </div>
             <div class="card-cross-icon" *ngIf="showDeleteFlag">
                 <button mat-mini-fab class="card-cross-btn" type="button" (click)="deleteItem(item)">
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
index c899e1533..ba1bc9cd4 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
@@ -29,16 +29,15 @@ export class PreviewPlanComponent implements OnInit {
       this.tab = this.selectedTab = 'content';
       if (contentData.assignmentTypeInfo) {        
         if (category === 'custom') {
-          const assigneeData = contentData.assignmentTypeInfo.filter((item: any) => {
-            return item.selected
-          })
+          const assigneeData = contentData.assignmentTypeInfo;
           this.assigneeData = { category, data: assigneeData }
         }
         if (category === 'Designation') {
-          const assigneeData = contentData.assignmentTypeInfo.filter((item: any) => {
-            return item.selected
+          let assignmentDataArr:any = [];
+           contentData.assignmentTypeInfo.map((item: any) => {
+            assignmentDataArr.push({name:item})
           })
-          this.assigneeData = { category, data: assigneeData }
+          this.assigneeData = { category, data: assignmentDataArr }
         }
       }
 

From 02fedf4c1d4845174a2c80ef230da307ba8026ce Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Fri, 22 Dec 2023 14:13:42 +0530
Subject: [PATCH 362/887] update or assignee done working on timeline

---
 .../add-timeline-form.component.ts            |  8 ++-
 .../breadcrumb/breadcrumb.component.html      |  6 +-
 .../breadcrumb/breadcrumb.component.ts        | 32 ++++++----
 .../category-drop-down.component.html         |  2 +-
 .../category-drop-down.component.ts           | 27 +++++----
 .../components/chip/chip.component.ts         |  6 ++
 .../components/search/search.component.html   |  4 +-
 .../components/search/search.component.ts     | 58 +++++++++----------
 .../components/stepper/stepper.component.ts   | 24 +++++---
 .../create-plan/create-plan.component.ts      |  4 +-
 10 files changed, 107 insertions(+), 64 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
index 40e6af050..4b01b8f8c 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
@@ -9,11 +9,15 @@ import { TrainingPlanDataSharingService } from '../../services/training-plan-dat
 })
 export class AddTimelineFormComponent implements OnInit {
   minDate: Date = new Date();
-  todayDate = undefined;
+  todayDate: any
   constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService, private datePipe: DatePipe) { }
 
   ngOnInit() {
-    this.trainingPlanDataSharingService.trainingPlanStepperData['endDate'] = this.datePipe.transform(this.todayDate, 'yyyy-MM-dd')
+    if (this.trainingPlanDataSharingService.trainingPlanStepperData['endDate']) {
+      this.todayDate = new Date(this.trainingPlanDataSharingService.trainingPlanStepperData['endDate'])
+    } else {
+      this.trainingPlanDataSharingService.trainingPlanStepperData['endDate'] = this.datePipe.transform(this.todayDate, 'yyyy-MM-dd')
+    }
   }
 
   changeTimeline(timeline: any) {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
index d350d50bd..4b8564ce4 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
@@ -28,8 +28,12 @@
                 ? 'Add assignee' : (tabType.ADD_ASSIGNEE === selectedTab) ? 'Add timeline' : ''}}</span>
         </button>
         <button mat-button class="next-btn margin-left-m" (click)="createPlanDraftView()"
-            *ngIf="tabType.ADD_TIMELINE === selectedTab">
+            *ngIf="tabType.ADD_TIMELINE === selectedTab && !checkForDraftStatus()">
             <span>Save as draft</span>
         </button>
+        <button mat-button class="next-btn margin-left-m" (click)="updatePlan()"
+            *ngIf="tabType.ADD_TIMELINE === selectedTab && checkForDraftStatus()">
+            <span>Update Content</span>
+        </button>
     </div>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
index c8210a19d..aef64508e 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
@@ -21,15 +21,15 @@ export class BreadcrumbComponent implements OnInit {
   tabType = TrainingPlanContent.TTabLabelKey
 
   constructor(private router: Router, public dialog: MatDialog,
-    public trainingPlanDataSharingService: TrainingPlanDataSharingService,
-    private trainingPlanService: TrainingPlanService) { }
+    public tpdsSvc: TrainingPlanDataSharingService,
+    private tpSvc: TrainingPlanService) { }
 
   ngOnInit() {
     this.checkIfDisabled()
   }
 
   cancel() {
-    this.trainingPlanDataSharingService.trainingPlanTitle = ''
+    this.tpdsSvc.trainingPlanTitle = ''
     this.router.navigateByUrl('app/home/training-plan-dashboard')
   }
 
@@ -61,7 +61,7 @@ export class BreadcrumbComponent implements OnInit {
 
   performRoute(route: any) {
     if (route === 'list') {
-      this.trainingPlanDataSharingService.trainingPlanTitle = ''
+      this.tpdsSvc.trainingPlanTitle = ''
       this.router.navigateByUrl('app/home/training-plan-dashboard')
     } else {
       this.router.navigateByUrl(`app/training-plan/${route}`)
@@ -113,20 +113,20 @@ export class BreadcrumbComponent implements OnInit {
   }
 
   createPlanDraftView() {
-    this.trainingPlanDataSharingService.trainingPlanStepperData.name = this.trainingPlanDataSharingService.trainingPlanTitle
-    if (this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentType === 'AllUser') {
-      this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo = [
+    this.tpdsSvc.trainingPlanStepperData.name = this.tpdsSvc.trainingPlanTitle
+    if (this.tpdsSvc.trainingPlanStepperData.assignmentType === 'AllUser') {
+      this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo = [
         "AllUser"
       ]
     }
-    const obj = { request: this.trainingPlanDataSharingService.trainingPlanStepperData }
+    const obj = { request: this.tpdsSvc.trainingPlanStepperData }
     this.showDialogBox('progress')
-    this.trainingPlanService.createPlan(obj).subscribe((_data: any) => {
+    this.tpSvc.createPlan(obj).subscribe((_data: any) => {
       this.dialogRef.close()
       this.showDialogBox('progress-completed')
       setTimeout(() => {
         this.dialogRef.close()
-        this.trainingPlanDataSharingService.trainingPlanTitle = ''
+        this.tpdsSvc.trainingPlanTitle = ''
         this.router.navigateByUrl('app/home/training-plan-dashboard')
       }, 1000)
     })
@@ -144,4 +144,16 @@ export class BreadcrumbComponent implements OnInit {
     }
     return true
   }
+
+  checkForDraftStatus() {
+    if (this.tpdsSvc.trainingPlanStepperData && this.tpdsSvc.trainingPlanStepperData.status
+      && this.tpdsSvc.trainingPlanStepperData.status.toLowerCase() === 'draft') {
+      return true
+    }
+    return false
+  }
+
+  updatePlan() {
+
+  }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.html b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.html
index 3416b641b..d2020b7f3 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.html
@@ -1,5 +1,5 @@
 <div class="selectWrapper">
-    <select  #select class="selectBox" (change)="showDialogBox(select?.value)">
+    <select #select class="selectBox" (change)="showDialogBox(select?.value)" [(ngModel)]="selectedValue">
         <option *ngFor="let item of categoryData" [value]="item?.value">{{item?.name}}</option>
     </select>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
index 41bbdbe27..2f2e36f60 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
@@ -2,6 +2,7 @@ import { Component, EventEmitter, Input, Output, OnInit, OnChanges } from '@angu
 import { MatDialog } from '@angular/material'
 import { ConfirmationBoxComponent } from '../confirmation-box/confirmation.box.component'
 import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
+import { debounceTime } from 'rxjs/operators'
 
 @Component({
   selector: 'ws-app-category-drop-down',
@@ -13,6 +14,7 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
   @Input() from = ''
   @Output() handleCategorySelection: any = new EventEmitter()
   dialogRef: any
+  selectedValue: any
   constructor(public dialog: MatDialog, private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
@@ -21,13 +23,13 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
     // } else if(this.from === 'assignee') {
     //   this.handleCategorySelection.emit('Designation');
     // }
-    this.trainingPlanDataSharingService.trainingPlanCategoryChangeEvent.subscribe((data: any) => {
+    this.trainingPlanDataSharingService.trainingPlanCategoryChangeEvent.pipe(debounceTime(700)).subscribe((data: any) => {
       if (data && data.event) {
-        if(data.event === 'Course' || data.event === 'Standalone Assessment' || data.event === 'Blended program' || data.event === 'Curated program' || data.event === 'Moderated Course') {
-          this.trainingPlanDataSharingService.trainingPlanStepperData.contentList = [];
+        if (data.event === 'Course' || data.event === 'Standalone Assessment' || data.event === 'Blended program' || data.event === 'Curated program' || data.event === 'Moderated Course') {
+          this.trainingPlanDataSharingService.trainingPlanStepperData.contentList = []
         } else if (data.event === 'Designation' || data.event === 'All Users' || data.event === 'Custom Users') {
-          this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo = [];
-        } 
+          this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo = []
+        }
         this.handleCategorySelection.emit(data.event)
       }
     })
@@ -38,8 +40,13 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
       this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = 'Course'
       this.handleCategorySelection.emit('Course')
     } else if (this.from === 'assignee') {
-      this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType'] = 'Designation'
-      this.handleCategorySelection.emit('Designation')
+      if (this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType']) {
+        this.selectedValue = this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType']
+        this.handleCategorySelection.emit(this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType'])
+      } else {
+        this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType'] = 'Designation'
+        this.handleCategorySelection.emit('Designation')
+      }
     }
   }
 
@@ -72,9 +79,9 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['primaryAction'] = 'I understand, change content type'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Standalone Assessment'
-        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event;
-        this.trainingPlanDataSharingService.moderatedCourseSelectStatus.next(false);
-        if(this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.length) {
+        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event
+        this.trainingPlanDataSharingService.moderatedCourseSelectStatus.next(false)
+        if (this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.length) {
           this.openDialoagBox(dialogData)
         } else {
           this.handleCategorySelection.emit(event)
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
index c6b15c5df..c72d9b8b8 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
@@ -20,6 +20,12 @@ export class ChipComponent implements OnInit, OnChanges {
   }
 
   ngOnChanges() {
+    this.selectedAssigneeChips.map((sitem: any, index: any) => {
+      if (sitem.selected) {
+        this.selectedAssigneeChips.splice(index, 1)
+        this.selectedAssigneeChips.unshift(sitem)
+      }
+    })
   }
 
   clearAll() {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
index b856f563d..1bc28aecc 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
@@ -20,6 +20,6 @@
     </div>
 </div>
 <div [hidden]="!filterVisibilityFlag">
-    <ws-app-filter (toggleFilter)="hideFilter($event)" [from]="from" [designationList]="designationList" (getFilterData)="getFilterData($event)"
-        [clearFilterFlag]="clearFilter"></ws-app-filter>
+    <ws-app-filter (toggleFilter)="hideFilter($event)" [from]="from" [designationList]="designationList"
+        (getFilterData)="getFilterData($event)" [clearFilterFlag]="clearFilter"></ws-app-filter>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index f93d1771f..ce55e9882 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -19,7 +19,7 @@ export class SearchComponent implements OnInit {
   filterVisibilityFlag = false
   clearFilter = false;
   selectedDropDownValue: any
-  designationList:any[] = [];
+  designationList: any[] = [];
   constructor(@Inject(DOCUMENT) private document: Document,
     private trainingPlanService: TrainingPlanService,
     private route: ActivatedRoute,
@@ -77,26 +77,26 @@ export class SearchComponent implements OnInit {
       if (contentType === 'Moderated Course') {
         this.tpdsSvc.moderatedCourseSelectStatus.next(true)
       }
-      if(this.searchText) {        
-          this.tpdsSvc.clearFilter.next(true);
-          applyFilterObj = {};
+      if (this.searchText) {
+        this.tpdsSvc.clearFilter.next(true)
+        applyFilterObj = {}
       }
       const filterObj = {
         "request": {
           "secureSettings": contentType === 'Moderated Course' ? true : false, // for moderated course
           "filters": {
             "primaryCategory": [contentType === 'Moderated Course' ? 'Course' : contentType],
-            "organisation":  applyFilterObj && applyFilterObj['providers'] && applyFilterObj['providers'].length ? applyFilterObj['providers'] : [],
+            "organisation": applyFilterObj && applyFilterObj['providers'] && applyFilterObj['providers'].length ? applyFilterObj['providers'] : [],
             "competencies_v5.competencyArea": applyFilterObj && applyFilterObj['competencyArea'] && applyFilterObj['competencyArea'].length ? applyFilterObj['competencyArea'] : [],
             "competencies_v5.competencyTheme": applyFilterObj && applyFilterObj['competencyTheme'] && applyFilterObj['competencyTheme'].length ? applyFilterObj['competencyTheme'] : [],
-            "competencies_v5.competencySubTheme" : applyFilterObj && applyFilterObj['competencySubTheme'] && applyFilterObj['competencySubTheme'].length ? applyFilterObj['competencySubTheme'] : []
+            "competencies_v5.competencySubTheme": applyFilterObj && applyFilterObj['competencySubTheme'] && applyFilterObj['competencySubTheme'].length ? applyFilterObj['competencySubTheme'] : []
           },
           "offset": 0,
           "limit": 500,
           "query": (this.searchText) ? this.searchText : '',
           "sort_by": { "lastUpdatedOn": "desc" },
           "fields": ["name", "appIcon", "instructions", "description", "purpose", "mimeType",
-            "gradeLevel", "identifier", "medium",  "resourceType",
+            "gradeLevel", "identifier", "medium", "resourceType",
             "primaryCategory", "contentType", "channel", "organisation", "trackable", "posterImage",
             "idealScreenSize", "learningMode", "creatorLogo", "duration", "programDuration", "version", "avgRating", "competencies_v5"]
         }
@@ -117,12 +117,12 @@ export class SearchComponent implements OnInit {
 
   }
 
-  getCustomUsers(event: any, applyFilterObj?:any) {
+  getCustomUsers(event: any, applyFilterObj?: any) {
     this.loadingService.changeLoaderState(true)
     const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
-    if(this.searchText) {      
-        this.tpdsSvc.clearFilter.next(true);
-        applyFilterObj = {};
+    if (this.searchText) {
+      this.tpdsSvc.clearFilter.next(true)
+      applyFilterObj = {}
     }
     const filterObj = {
       request: {
@@ -134,11 +134,11 @@ export class SearchComponent implements OnInit {
           "profileDetails.professionalDetails.group": applyFilterObj && applyFilterObj.group && applyFilterObj.group.length ? applyFilterObj.group : [],
         },
         "fields": [
-            "userId",
-            "firstName",
-            "rootOrgName",
-            "profileDetails",
-            "organisations"
+          "userId",
+          "firstName",
+          "rootOrgName",
+          "profileDetails",
+          "organisations"
         ],
         limit: 500,
         offset: 0,
@@ -152,8 +152,8 @@ export class SearchComponent implements OnInit {
     })
   }
 
-  getAllUsers(event: any) {
-    this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: [] }
+  getAllUsers(_event: any) {
+    // this.tpdsSvc.trainingPlanAssigneeData = { category: _event, data: [_event] }
     this.handleApiData.emit(true)
   }
 
@@ -161,18 +161,18 @@ export class SearchComponent implements OnInit {
     this.loadingService.changeLoaderState(true)
     this.trainingPlanService.getDesignations().subscribe((res: any) => {
       console.log('res', res)
-      if(this.searchText) {
-        let resArr = res.result.response.content.filter((ditem:any)=>{
-          if(ditem.name.includes(this.searchText)) {
-            return ditem;
+      if (this.searchText) {
+        let resArr = res.result.response.content.filter((ditem: any) => {
+          if (ditem.name.includes(this.searchText)) {
+            return ditem
           }
         })
         this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: resArr }
       } else {
         this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: res.result.response.content }
-        this.designationList = res.result.response.content;
+        this.designationList = res.result.response.content
       }
-      
+
       this.handleApiData.emit(true)
       this.loadingService.changeLoaderState(false)
     })
@@ -199,13 +199,13 @@ export class SearchComponent implements OnInit {
     }
   }
 
-  getFilterData(event:any) {
-    if(this.from == 'content') {
-      this.getContent(this.selectedDropDownValue, event);
+  getFilterData(event: any) {
+    if (this.from == 'content') {
+      this.getContent(this.selectedDropDownValue, event)
     } else {
-      this.getCustomUsers(this.selectedDropDownValue, event);
+      this.getCustomUsers(this.selectedDropDownValue, event)
     }
-    
+
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
index 722a1961b..2af1cd30d 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
@@ -52,23 +52,31 @@ export class StepperComponent implements OnInit, OnChanges {
   }
 
   checkForPlanTitle(_event: any) {
-    this.addCotnentDisable = _event
-    this.titleInvalid.emit(_event)
+    setTimeout(() => {
+      this.addCotnentDisable = _event
+      this.titleInvalid.emit(_event)
+    }, 0)
   }
 
   checkForaddContent(_event: any) {
-    this.addAssigneeDisable = _event
-    this.addContentIsInvalid.emit(_event)
+    setTimeout(() => {
+      this.addAssigneeDisable = _event
+      this.addContentIsInvalid.emit(_event)
+    }, 0)
   }
 
   checkForaddAssignee(_event: any) {
-    this.addTimelineDisable = _event
-    this.addAssigneeIsInvalid.emit(_event)
+    setTimeout(() => {
+      this.addTimelineDisable = _event
+      this.addAssigneeIsInvalid.emit(_event)
+    }, 0)
   }
 
   tabChangeToTimeline(_event: any) {
-    this.addTimelineDisable = _event
-    this.addAssigneeIsInvalid.emit(_event)
+    setTimeout(() => {
+      this.addTimelineDisable = _event
+      this.addAssigneeIsInvalid.emit(_event)
+    }, 0)
     this.tabIndexValue = 3
   }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
index d21db49c3..77bd0394d 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
@@ -34,13 +34,15 @@ export class CreatePlanComponent implements OnInit, OnDestroy {
       if (contentData.assignmentType === 'CustomUser') {
         this.tpdsSvc.trainingPlanAssigneeData = { data: { content: contentData.assignmentTypeInfo } }
       } else {
-        this.tpdsSvc.trainingPlanAssigneeData = contentData.assignmentTypeInfo
+        this.tpdsSvc.trainingPlanAssigneeData = { category: contentData.assignmentType, data: [contentData.assignmentTypeInfo] }
       }
       if (contentData.contentList && contentData.contentList.length > 0) {
         contentData.contentList.forEach((ele: any) => {
           this.tpdsSvc.trainingPlanStepperData['contentList'].push(ele.identifier)
         })
       }
+      this.tpdsSvc.trainingPlanStepperData['assignmentType'] = contentData.assignmentType
+      this.tpdsSvc.trainingPlanStepperData['assignmentTypeInfo'] = contentData.assignmentTypeInfo
       this.tpdsSvc.trainingPlanStepperData['endDate'] = contentData.endDate
       this.tpdsSvc.trainingPlanStepperData['status'] = contentData.status
     }

From 81dc7d6404c913ed4ab8d3b7d6273e633eb07ef9 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Fri, 22 Dec 2023 14:32:42 +0530
Subject: [PATCH 363/887] added update plan

---
 .../breadcrumb/breadcrumb.component.ts        | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
index aef64508e..ce4b13fdf 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
@@ -1,6 +1,6 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
 import { MatDialog } from '@angular/material'
-import { Router } from '@angular/router'
+import { ActivatedRoute, Router } from '@angular/router'
 import { ConfirmationBoxComponent } from '../confirmation-box/confirmation.box.component'
 import { TrainingPlanContent } from '../../models/training-plan.model'
 import { TrainingPlanService } from '../../services/traininig-plan.service'
@@ -20,7 +20,10 @@ export class BreadcrumbComponent implements OnInit {
   public dialogRef: any
   tabType = TrainingPlanContent.TTabLabelKey
 
-  constructor(private router: Router, public dialog: MatDialog,
+  constructor(
+    private router: Router,
+    private activeRoute: ActivatedRoute,
+    public dialog: MatDialog,
     public tpdsSvc: TrainingPlanDataSharingService,
     private tpSvc: TrainingPlanService) { }
 
@@ -154,6 +157,23 @@ export class BreadcrumbComponent implements OnInit {
   }
 
   updatePlan() {
-
+    this.tpdsSvc.trainingPlanStepperData.name = this.tpdsSvc.trainingPlanTitle
+    if (this.tpdsSvc.trainingPlanStepperData.assignmentType === 'AllUser') {
+      this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo = [
+        "AllUser"
+      ]
+    }
+    const obj: any = { request: { ...this.tpdsSvc.trainingPlanStepperData, id: this.activeRoute.snapshot.data['contentData'].id } }
+    delete obj.request.status
+    this.showDialogBox('progress')
+    this.tpSvc.updatePlan(obj).subscribe((_data: any) => {
+      this.dialogRef.close()
+      this.showDialogBox('progress-completed')
+      setTimeout(() => {
+        this.dialogRef.close()
+        this.tpdsSvc.trainingPlanTitle = ''
+        this.router.navigateByUrl('app/home/training-plan-dashboard')
+      }, 1000)
+    })
   }
 }

From bd57de2534b3ad5bceb80db35cb1a806445ef2c5 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Fri, 22 Dec 2023 14:38:43 +0530
Subject: [PATCH 364/887] update for preview plan custom user

---
 .../routes/preview-plan/preview-plan.component.ts  | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
index ba1bc9cd4..553023f70 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
@@ -28,9 +28,15 @@ export class PreviewPlanComponent implements OnInit {
       const arr = [];      
       this.tab = this.selectedTab = 'content';
       if (contentData.assignmentTypeInfo) {        
-        if (category === 'custom') {
-          const assigneeData = contentData.assignmentTypeInfo;
-          this.assigneeData = { category, data: assigneeData }
+        if (category === 'CustomUser') {
+          let assignmentDataArr:any = [];
+          contentData.userDetails.map((item:any)=>{
+            item['profileDetails']['professionalDetails'][0] = item.designation;
+            assignmentDataArr.push(item);
+          })
+          console.log('assignmentDataArr',assignmentDataArr)
+          // const assigneeData = contentData.userDetails;
+          this.assigneeData = { category, data: assignmentDataArr }
         }
         if (category === 'Designation') {
           let assignmentDataArr:any = [];
@@ -57,7 +63,7 @@ export class PreviewPlanComponent implements OnInit {
           name: contentData.assignmentType,
           tab: 'assignee',
           selected: (this.tab === 'assignee' ? true : false),
-          count: this.assigneeData.data.length
+          count: this.assigneeData.data ? this.assigneeData.data.length : 0
         })
         this.allContentChips = arr
       } else {

From f7cbad423fe997cef8dab9275f06b95a2a8a11e7 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Fri, 22 Dec 2023 15:23:47 +0530
Subject: [PATCH 365/887] Udpated events duration fields

---
 .../events/routes/create-event/create-event.component.html   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.html b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.html
index 91fe1c5a9..b2fee9df8 100644
--- a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.html
+++ b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.html
@@ -268,7 +268,8 @@
                                                     <mat-form-field appearance="outline"
                                                         class="margin-right-l width-250 maxwidth-150">
                                                         <mat-select formControlName="eventDurationHours" #eventDuration>
-                                                            <mat-option *ngFor="let hourObj of [0,1,2,3,4,5,6,7,8,9,10]"
+                                                            <mat-option
+                                                                *ngFor="let hourObj of [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23]"
                                                                 [value]="hourObj">
                                                                 {{hourObj}}
                                                             </mat-option>
@@ -284,7 +285,7 @@
                                                     <mat-form-field appearance="outline" class="maxwidth-150">
                                                         <mat-select formControlName="eventDurationMinutes"
                                                             #eventDuration>
-                                                            <mat-option *ngFor="let minObj of [0,15,30,45,60]"
+                                                            <mat-option *ngFor="let minObj of [0,15,30,45,59]"
                                                                 [value]="minObj">
                                                                 {{minObj}}
                                                             </mat-option>

From 4d9f3ba52b80d6b671b31eff7521c4908141a8e1 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Fri, 22 Dec 2023 15:44:15 +0530
Subject: [PATCH 366/887] update for preview plan and default selected category

---
 .../category-drop-down/category-drop-down.component.ts          | 1 +
 .../training-plan/routes/preview-plan/preview-plan.component.ts | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
index 2f2e36f60..06483acdb 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
@@ -38,6 +38,7 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
   ngOnChanges() {
     if (this.from === 'content') {
       this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = 'Course'
+      this.selectedValue = this.trainingPlanDataSharingService.trainingPlanStepperData['contentType']
       this.handleCategorySelection.emit('Course')
     } else if (this.from === 'assignee') {
       if (this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType']) {
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
index 553023f70..42ba00ae3 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
@@ -30,7 +30,7 @@ export class PreviewPlanComponent implements OnInit {
       if (contentData.assignmentTypeInfo) {        
         if (category === 'CustomUser') {
           let assignmentDataArr:any = [];
-          contentData.userDetails.map((item:any)=>{
+          contentData && contentData.userDetails && contentData.userDetails.map((item:any)=>{
             item['profileDetails']['professionalDetails'][0] = item.designation;
             assignmentDataArr.push(item);
           })

From 9e39ed1d727f865c942e1caaed8e0bc8dea4c921 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Fri, 22 Dec 2023 16:08:09 +0530
Subject: [PATCH 367/887] Udpated events hours & mins fields

---
 .../events/routes/create-event/create-event.component.html   | 5 ++---
 .../events/routes/create-event/create-event.component.ts     | 3 +++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.html b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.html
index b2fee9df8..e057317cd 100644
--- a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.html
+++ b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.html
@@ -268,8 +268,7 @@
                                                     <mat-form-field appearance="outline"
                                                         class="margin-right-l width-250 maxwidth-150">
                                                         <mat-select formControlName="eventDurationHours" #eventDuration>
-                                                            <mat-option
-                                                                *ngFor="let hourObj of [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23]"
+                                                            <mat-option *ngFor="let hourObj of hoursList"
                                                                 [value]="hourObj">
                                                                 {{hourObj}}
                                                             </mat-option>
@@ -285,7 +284,7 @@
                                                     <mat-form-field appearance="outline" class="maxwidth-150">
                                                         <mat-select formControlName="eventDurationMinutes"
                                                             #eventDuration>
-                                                            <mat-option *ngFor="let minObj of [0,15,30,45,59]"
+                                                            <mat-option *ngFor="let minObj of minsList"
                                                                 [value]="minObj">
                                                                 {{minObj}}
                                                             </mat-option>
diff --git a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
index 4d6010b66..bc2fc13cb 100644
--- a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
+++ b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
@@ -66,6 +66,9 @@ export class CreateEventComponent implements OnInit {
     { value: '22:00' }, { value: '22:30' }, { value: '23:00' }, { value: '23:30' },
   ]
 
+  hoursList = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23]
+  minsList = [0, 15, 30, 45, 59]
+
   @ViewChild(MatPaginator, { static: true }) paginator!: MatPaginator
   @ViewChild(MatSort, { static: true }) sort?: MatSort
 

From 4ad9e84e399362387fc5f0a0a6bcb89b70901543 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Fri, 22 Dec 2023 17:14:02 +0530
Subject: [PATCH 368/887] update for create plan validation and preview plan

---
 .../add-plan-information.component.html            | 14 ++++++++++----
 .../add-plan-information.component.ts              |  1 +
 .../routes/create-plan/create-plan.component.html  |  2 +-
 .../preview-plan/preview-plan.component.html       |  2 +-
 .../routes/preview-plan/preview-plan.component.ts  | 12 ++++++++++--
 5 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.html b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.html
index 425b4bdf2..607f3e204 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.html
@@ -8,13 +8,19 @@
                 <div class="fonm-element-label">Plan title <span class="required"></span></div>
                 <mat-form-field appearance="outline" class="w-full" fxFlex="40">
                     <input class="w-full" matInput placeholder="Enter Plan title" formControlName="name" maxlength="70">
-                    <mat-hint align="end">{{ contentForm.controls['name'].value.length }} / 70</mat-hint>
-                    <mat-error *ngIf="contentForm.controls['name'].hasError('minlength')">
-                        Minimum 10 characters are required
-                    </mat-error>
+                    <mat-hint align="end">{{ contentForm.controls['name'].value.length }} / 70</mat-hint>                    
                     <mat-error *ngIf="contentForm.controls['name'].hasError('required')">
                         Plan title is mandatory
                     </mat-error>
+                    <mat-error
+                    *ngIf="contentForm.controls['name'].hasError('minlength') && !contentForm.controls['name'].errors?.pattern"
+                    i18n="name Error|Explains name is required">
+                    Minimum characters left to create {{10 - contentForm.controls['name'].value.length}}
+                  </mat-error>
+                  <mat-error *ngIf="contentForm.controls['name'].errors?.pattern"
+                    i18n="name Error|Explains name is required">
+                    Only {{specialCharList}} characters are supported
+                  </mat-error>
                 </mat-form-field>
             </div>
         </form>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
index 826e09fad..35c9b4b88 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
@@ -15,6 +15,7 @@ export class AddPlanInformationComponent implements OnInit {
 
   contentForm!: FormGroup
   private subscr:Subscription = new Subscription();
+  specialCharList = `( a-z/A-Z , 0-9 . _ - $ / \ : [ ]' ' !)`
   constructor(
     private formBuilder: FormBuilder,
     private tpdsSvc: TrainingPlanDataSharingService
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
index 36bf1ffc7..cfc31b502 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
@@ -1,5 +1,5 @@
 <div class="plan-container">
-    <ws-app-breadcrumb [selectedTab]="selectedTabData" [validationList]="createCheck"
+    <ws-app-breadcrumb [selectedTab]="selectedTabData" [validationList]=""
         (changeToNextTab)="changeTab($event)"></ws-app-breadcrumb>
     <ws-app-stepper (selectedTabType)="selectedTabAction($event)" [changeTabOnNext]="nextTab"
         (titleInvalid)="isPlanTitleInvalid($event)" (addContentIsInvalid)="isAddContentInvalid($event)"
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
index d46dd3464..61e79db95 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
@@ -14,7 +14,7 @@
 <div class="flex content-container" *ngIf="from === 'all'">
     <mat-chip-list [multiple]="true" [selectable]="true">
         <mat-chip [ngClass]="selectedTab == item.tab ? 'select-tab': ''" *ngFor="let item of allContentChips" [selected]="selectedTab == item.tab"
-            (click)="selectedTab = item.tab">{{item.name}} <span>( {{item?.count}} )</span>
+            (click)="selectedTab = item.tab">{{item.name}} <span *ngIf="item?.count">( {{item?.count}} )</span>
         </mat-chip>
     </mat-chip-list>
 
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
index 42ba00ae3..4af9166f9 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
@@ -30,9 +30,17 @@ export class PreviewPlanComponent implements OnInit {
       if (contentData.assignmentTypeInfo) {        
         if (category === 'CustomUser') {
           let assignmentDataArr:any = [];
+
+          let obj:any = {
+            "firstName": "",
+            "userId": "",
+            "profileDetails": {"professionalDetails": [{designation: ""}]
+          }};
           contentData && contentData.userDetails && contentData.userDetails.map((item:any)=>{
-            item['profileDetails']['professionalDetails'][0] = item.designation;
-            assignmentDataArr.push(item);
+            obj.firstName = item.firstName;
+            obj.profileDetails.professionalDetails[0]['designation']= item.designation;
+            obj.userId = item.userId;
+            assignmentDataArr.push(obj);
           })
           console.log('assignmentDataArr',assignmentDataArr)
           // const assigneeData = contentData.userDetails;

From c1b7664c158dafa60b0587b3564637696dc5d339 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Fri, 22 Dec 2023 17:17:16 +0530
Subject: [PATCH 369/887] update for create plan validation and preview plan

---
 .../training-plan/routes/create-plan/create-plan.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
index cfc31b502..36bf1ffc7 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
@@ -1,5 +1,5 @@
 <div class="plan-container">
-    <ws-app-breadcrumb [selectedTab]="selectedTabData" [validationList]=""
+    <ws-app-breadcrumb [selectedTab]="selectedTabData" [validationList]="createCheck"
         (changeToNextTab)="changeTab($event)"></ws-app-breadcrumb>
     <ws-app-stepper (selectedTabType)="selectedTabAction($event)" [changeTabOnNext]="nextTab"
         (titleInvalid)="isPlanTitleInvalid($event)" (addContentIsInvalid)="isAddContentInvalid($event)"

From 729018f64c7665c38e29223aef978d31bb310b7a Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Sat, 23 Dec 2023 16:51:51 +0530
Subject: [PATCH 370/887] routing and reset work

---
 .../category-drop-down.component.ts           |  2 +
 .../components/chip/chip.component.ts         |  6 +++
 .../components/search/search.component.ts     | 18 ++++----
 .../standard-card.component.html              | 44 +++++++++++--------
 .../reset-data-sharing-resolve.service.ts     | 18 ++++++++
 .../create-content.component.ts               |  6 +++
 .../create-plan/create-plan.component.ts      |  2 +-
 .../training-plan-data-share.service.ts       | 19 +++++++-
 .../training-plan/training-plan.module.ts     |  4 +-
 .../training-plan.routing.module.ts           |  5 +++
 10 files changed, 93 insertions(+), 31 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/training-plan/resolvers/reset-data-sharing-resolve.service.ts

diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
index 2f2e36f60..9fd5fd20c 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
@@ -38,6 +38,7 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
   ngOnChanges() {
     if (this.from === 'content') {
       this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = 'Course'
+      this.selectedValue = 'Course'
       this.handleCategorySelection.emit('Course')
     } else if (this.from === 'assignee') {
       if (this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType']) {
@@ -45,6 +46,7 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         this.handleCategorySelection.emit(this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType'])
       } else {
         this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType'] = 'Designation'
+        this.selectedValue = 'Designation'
         this.handleCategorySelection.emit('Designation')
       }
     }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
index c72d9b8b8..5476fcf07 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
@@ -20,6 +20,12 @@ export class ChipComponent implements OnInit, OnChanges {
   }
 
   ngOnChanges() {
+    this.selectedContentChips.map((sitem: any, index: any) => {
+      if (sitem.selected) {
+        this.selectedContentChips.splice(index, 1)
+        this.selectedContentChips.unshift(sitem)
+      }
+    })
     this.selectedAssigneeChips.map((sitem: any, index: any) => {
       if (sitem.selected) {
         this.selectedAssigneeChips.splice(index, 1)
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 44c45c8b0..456248e3f 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -98,18 +98,18 @@ export class SearchComponent implements OnInit {
           "fields": ["name", "appIcon", "instructions", "description", "purpose", "mimeType",
             "gradeLevel", "identifier", "medium", "resourceType",
             "primaryCategory", "contentType", "channel", "organisation", "trackable", "posterImage",
-            "idealScreenSize", "learningMode", "creatorLogo", "duration", "programDuration", "version", "avgRating", "competencies_v5"]
+            "idealScreenSize", "learningMode", "creatorLogo", "duration", "programDuration", "version", "avgRating", "competencies_v5", "secureSettings"]
         }
       }
       this.trainingPlanService.getAllContent(filterObj).subscribe((res: any) => {
-        if (this.tpdsSvc.trainingPlanContentData && this.tpdsSvc.trainingPlanContentData.data && this.tpdsSvc.trainingPlanContentData.data.content) {
-          this.tpdsSvc.trainingPlanContentData = {
-            category: contentType,
-            data: { content: _.uniqBy(_.concat(this.tpdsSvc.trainingPlanContentData.data.content, res.content), 'identifier') }
-          }
-        } else {
-          this.tpdsSvc.trainingPlanContentData = { category: contentType, data: res }
-        }
+        // if (this.tpdsSvc.trainingPlanContentData && this.tpdsSvc.trainingPlanContentData.data && this.tpdsSvc.trainingPlanContentData.data.content) {
+        //   this.tpdsSvc.trainingPlanContentData = {
+        //     category: contentType,
+        //     data: { content: _.uniqBy(_.concat(this.tpdsSvc.trainingPlanContentData.data.content, res.content), 'identifier') }
+        //   }
+        // } else {
+        this.tpdsSvc.trainingPlanContentData = { category: contentType, data: res }
+        // }
         this.handleApiData.emit(true)
         this.loadingService.changeLoaderState(false)
       })
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
index 90307d493..338be2f96 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
@@ -1,6 +1,6 @@
 <ng-container>
     <div class="flex flex-3 flex-row card-grid-container flex-wrap">
-        <div  class="flex course-card margin-right-xl" *ngFor="let item of contentData | slice : startIndex : lastIndex">
+        <div class="flex course-card margin-right-xl" *ngFor="let item of contentData | slice : startIndex : lastIndex">
             <mat-card [ngClass]="item?.selected ? 'active-card':''" class="card-standard-container mr-5 padding-remove">
                 <mat-card-content class="min-top">
                     <div style="position: relative; z-index: 1;">
@@ -15,27 +15,29 @@
                                 </button>
                             </div>
                             <img mat-card-image loading="lazy"
-                                class="card-img ws-mat-primary-lite-background margin-remove"
-                                [src]="item?.posterImage" [wsUtilsDefaultThumbnail]="defaultPosterImage"/>
+                                class="card-img ws-mat-primary-lite-background margin-remove" [src]="item?.posterImage"
+                                [wsUtilsDefaultThumbnail]="defaultPosterImage" />
                         </ng-container>
-                        <div class="duration-box right-corner"  *ngIf="item?.duration > 0">
-                            <mat-icon class="mat-icon main_icon mr-1 notranslate material-icons mat-icon-no-color">access_time</mat-icon>
-                            <span class=" ws-mat-white-text duration"> {{ (item?.duration || 120)| pipeDurationTransform: 'hms' }} </span>
+                        <div class="duration-box right-corner" *ngIf="item?.duration > 0">
+                            <mat-icon
+                                class="mat-icon main_icon mr-1 notranslate material-icons mat-icon-no-color">access_time</mat-icon>
+                            <span class=" ws-mat-white-text duration"> {{ (item?.duration || 120)|
+                                pipeDurationTransform: 'hms' }} </span>
                         </div>
-                        
-                          <div class="duration-box right-corner" *ngIf="item?.programDuration > 0">
+
+                        <div class="duration-box right-corner" *ngIf="item?.programDuration > 0">
                             <mat-icon class="mat-icon main_icon mr-1">access_time</mat-icon>
-                            <span class=" ws-mat-white-text duration"> 
-                              {{item?.programDuration}} {{item?.programDuration === 1 ? 'day' : 'days'}}
+                            <span class=" ws-mat-white-text duration">
+                                {{item?.programDuration}} {{item?.programDuration === 1 ? 'day' : 'days'}}
                             </span>
-                          </div>
+                        </div>
                     </div>
                     <div class="padding-m">
                         <div class="course_widget flex margin-remove">
                             <div class="flex flex-end course_v2">
                                 <mat-icon
                                     class="mat-icon main_icon ws-mat-default-text margin-right-xs">video_library</mat-icon>
-                                {{item?.contentType}}
+                                {{(item?.secureSettings) ? 'Moderated course' : item?.primaryCategory}}
                             </div>
                         </div>
                         <div class="mat-subheading-1 title-text ws-mat-text-block-fade-gradient">
@@ -43,7 +45,8 @@
                         </div>
                         <div class="flex w-full flex-wrap flex-middle">
                             <div class="course_logo_box">
-                                <img class="source-icon" [src]="item?.creatorLogo | pipePublicURL"  [alt]="item?.name" [wsUtilsDefaultThumbnail]="defaultThumbnail"/>
+                                <img class="source-icon" [src]="item?.creatorLogo | pipePublicURL" [alt]="item?.name"
+                                    [wsUtilsDefaultThumbnail]="defaultThumbnail" />
                                 <!-- <div *ngIf="this.data.value.content?.appIcon" class="float-left">
                                     <img [src]="this.data.value.content?.posterImage | pipePublicURL" class="app-icon course-image"
                                       [alt]="this.data.value.content.name || iGOT" />
@@ -59,12 +62,14 @@
                             </div>
                             <ng-container>
                                 <span class="most-enrolled-text margin-left-xs">
-                                    <ng-container *ngIf="item?.additionalTags && item?.additionalTags.includes('mostEnrolled')">
+                                    <ng-container
+                                        *ngIf="item?.additionalTags && item?.additionalTags.includes('mostEnrolled')">
                                         <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
-                                      </ng-container>
-                                      <ng-container *ngIf="item?.additionalTags && item?.additionalTags.includes('mostTrending')">
+                                    </ng-container>
+                                    <ng-container
+                                        *ngIf="item?.additionalTags && item?.additionalTags.includes('mostTrending')">
                                         <span class="most-enrolled-text margin-left-xs">Most trending</span>
-                                      </ng-container>
+                                    </ng-container>
                                 </span>
                             </ng-container>
                         </div>
@@ -72,9 +77,10 @@
                 </mat-card-content>
             </mat-card>
         </div>
-        
+
     </div>
     <div class="flex flex-row justify-center" *ngIf="showPagination">
-        <mat-paginator [pageSize]="pageSize" [pageSizeOptions]="[20,30,40]" (page)="onChangePage($event)"></mat-paginator>
+        <mat-paginator [pageSize]="pageSize" [pageSizeOptions]="[20,30,40]"
+            (page)="onChangePage($event)"></mat-paginator>
     </div>
 </ng-container>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/resolvers/reset-data-sharing-resolve.service.ts b/project/ws/app/src/lib/routes/training-plan/resolvers/reset-data-sharing-resolve.service.ts
new file mode 100644
index 000000000..7d83e5df3
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/resolvers/reset-data-sharing-resolve.service.ts
@@ -0,0 +1,18 @@
+import { Injectable } from '@angular/core'
+import { ActivatedRouteSnapshot, Resolve } from '@angular/router'
+import { Observable, of } from 'rxjs'
+import { TrainingPlanDataSharingService } from '../services/training-plan-data-share.service'
+@Injectable()
+export class ResetDataSharingResolveService
+  implements
+  Resolve<Observable<any>> {
+  constructor(
+    private tpdsSvc: TrainingPlanDataSharingService,
+  ) { }
+  resolve(
+    _route: ActivatedRouteSnapshot
+  ): Observable<any> {
+    this.tpdsSvc.resetAllObjects()
+    return of({})
+  }
+}
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
index 16e385964..1fdc9d682 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
@@ -57,6 +57,12 @@ export class CreateContentComponent implements OnInit {
               sitem['selected'] = true
             }
           })
+          this.tpdsSvc.trainingPlanContentData.data.content.map((sitem: any, index: any) => {
+            if (sitem.selected) {
+              this.tpdsSvc.trainingPlanContentData.data.content.splice(index, 1)
+              this.tpdsSvc.trainingPlanContentData.data.content.unshift(sitem)
+            }
+          })
         }
         this.contentData = this.tpdsSvc.trainingPlanContentData.data.content
         this.handleSelectedChips(true)
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
index 77bd0394d..c5c59b18e 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
@@ -30,7 +30,7 @@ export class CreatePlanComponent implements OnInit, OnDestroy {
     const contentData = this.route.snapshot.data['contentData']
     if (contentData) {
       this.tpdsSvc.trainingPlanTitle = contentData.name
-      this.tpdsSvc.trainingPlanContentData = { data: { content: contentData.contentList } }
+      // this.tpdsSvc.trainingPlanContentData = { data: { content: contentData.contentList } }
       if (contentData.assignmentType === 'CustomUser') {
         this.tpdsSvc.trainingPlanAssigneeData = { data: { content: contentData.assignmentTypeInfo } }
       } else {
diff --git a/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts b/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
index 6859fb801..c750ac119 100644
--- a/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
+++ b/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
@@ -11,7 +11,7 @@ export class TrainingPlanDataSharingService {
   trainingPlanTitle = ''
   trainingPlanContentData: any
   trainingPlanAssigneeData: any
-  selectedTabType:any = '';
+  selectedTabType: any = '';
   trainingPlanStepperData: any = {
     name: '',
     contentType: '',
@@ -25,4 +25,21 @@ export class TrainingPlanDataSharingService {
   constructor() {
 
   }
+
+  resetAllObjects() {
+    this.trainingPlanTitle = ''
+    this.trainingPlanContentData = {}
+    this.trainingPlanAssigneeData = {}
+    this.selectedTabType = ''
+    this.trainingPlanStepperData = {
+      name: '',
+      contentType: '',
+      contentList: [
+      ],
+      assignmentType: '',
+      assignmentTypeInfo: [
+      ],
+      endDate: '',
+    }
+  }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
index 54a2afe8e..d0a6e8b54 100644
--- a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
+++ b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
@@ -62,6 +62,7 @@ import { AddPlanInformationComponent } from './components/add-plan-information/a
 
 import { TrainingPlanService } from './services/traininig-plan.service'
 import { UpdatePlanResolveService } from './resolvers/update-plan-resolve.service'
+import { ResetDataSharingResolveService } from './resolvers/reset-data-sharing-resolve.service'
 @NgModule({
   declarations: [
     TrainingPlanHomeComponent,
@@ -140,7 +141,8 @@ import { UpdatePlanResolveService } from './resolvers/update-plan-resolve.servic
   providers: [
     InitResolver,
     TrainingPlanService,
-    UpdatePlanResolveService
+    UpdatePlanResolveService,
+    ResetDataSharingResolveService
   ],
 })
 export class TrainingPlanModule {
diff --git a/project/ws/app/src/lib/routes/training-plan/training-plan.routing.module.ts b/project/ws/app/src/lib/routes/training-plan/training-plan.routing.module.ts
index c3ea3c7f0..a84629ea9 100644
--- a/project/ws/app/src/lib/routes/training-plan/training-plan.routing.module.ts
+++ b/project/ws/app/src/lib/routes/training-plan/training-plan.routing.module.ts
@@ -5,6 +5,7 @@ import { TrainingPlanHomeComponent } from './routes/training-plan-home/training-
 import { CreatePlanComponent } from './routes/create-plan/create-plan.component'
 import { PreviewPlanComponent } from './routes/preview-plan/preview-plan.component'
 import { UpdatePlanResolveService } from './resolvers/update-plan-resolve.service'
+import { ResetDataSharingResolveService } from './resolvers/reset-data-sharing-resolve.service'
 
 const routes: Routes = [
   {
@@ -26,6 +27,9 @@ const routes: Routes = [
           pageId: 'create-plan',
           module: 'Create Plan',
         },
+        resolve: {
+          tpdsSvcReset: ResetDataSharingResolveService
+        }
       },
       {
         path: 'update-plan/:planId',
@@ -35,6 +39,7 @@ const routes: Routes = [
           module: 'Create Plan',
         },
         resolve: {
+          tpdsSvcReset: ResetDataSharingResolveService,
           contentData: UpdatePlanResolveService
         }
       },

From 3f7ece7ef4856261a1e54c1e6b39a8452a951c7f Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Sat, 23 Dec 2023 17:25:51 +0530
Subject: [PATCH 371/887] update for search

---
 .../routes/training-plan/components/search/search.component.ts  | 2 +-
 .../components/standard-card/standard-card.component.html       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 44c45c8b0..601442ba0 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -92,7 +92,7 @@ export class SearchComponent implements OnInit {
             "competencies_v5.competencySubTheme": applyFilterObj && applyFilterObj['competencySubTheme'] && applyFilterObj['competencySubTheme'].length ? applyFilterObj['competencySubTheme'] : []
           },
           "offset": 0,
-          "limit": 500,
+          "limit": 20,
           "query": (this.searchText) ? this.searchText : '',
           "sort_by": { "lastUpdatedOn": "desc" },
           "fields": ["name", "appIcon", "instructions", "description", "purpose", "mimeType",
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
index 90307d493..77bedd4bc 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
@@ -75,6 +75,6 @@
         
     </div>
     <div class="flex flex-row justify-center" *ngIf="showPagination">
-        <mat-paginator [pageSize]="pageSize" [pageSizeOptions]="[20,30,40]" (page)="onChangePage($event)"></mat-paginator>
+        <mat-paginator [pageSize]="pageSize" [length]="240"  [pageSizeOptions]="[20,30,40]" (page)="onChangePage($event)"></mat-paginator>
     </div>
 </ng-container>
\ No newline at end of file

From 85fe250be6b3066c863f38bf83755d22a07e8c59 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Sun, 24 Dec 2023 15:22:14 +0530
Subject: [PATCH 372/887] update for sanity fixes

---
 .../training-plan-dashboard.component.ts      | 10 +++----
 .../add-plan-information.component.html       |  8 ++---
 .../add-plan-information.component.scss       |  3 +-
 .../breadcrumb/breadcrumb.component.html      | 16 ++++++----
 .../breadcrumb/breadcrumb.component.scss      |  2 +-
 .../breadcrumb/breadcrumb.component.ts        |  3 +-
 .../category-drop-down.component.ts           | 20 ++++++++++++-
 .../components/chip/chip.component.html       |  4 +--
 .../competency-summary.component.scss         | 14 +++++++++
 .../components/filter/filter.component.html   |  4 +--
 .../components/search/search.component.ts     |  1 +
 .../standard-card.component.html              |  4 +--
 .../standard-card.component.scss              | 15 +++++++---
 .../standard-card/standard-card.component.ts  |  5 ++--
 .../components/stepper/stepper.component.html |  8 ++---
 .../components/stepper/stepper.component.ts   |  7 +++--
 .../user-card/user-card.component.html        |  4 +--
 .../create-assignee.component.html            |  1 +
 .../create-assignee.component.ts              | 10 ++++---
 .../create-content.component.ts               |  9 ++++--
 .../create-timeline.component.html            |  2 +-
 .../preview-plan/preview-plan.component.html  | 14 ++++-----
 .../preview-plan/preview-plan.component.ts    | 29 ++++++++++---------
 23 files changed, 127 insertions(+), 66 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
index a07774792..fa8a0fca7 100644
--- a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
@@ -63,11 +63,11 @@ export class TrainingPlanDashboardComponent implements OnInit {
         { displayName: 'Content type', key: 'contentType' },
         { displayName: 'Timeline', key: 'endDate' },
         { displayName: 'Created by', key: 'createdByName' },
-        { displayName: 'Created on', key: 'createdAt' },
+        { displayName: 'Created on', key: 'updatedAt' },
       ],
       needCheckBox: false,
       needHash: false,
-      sortColumn: 'dateCreatedOn',
+      sortColumn: 'updatedAt',
       sortState: 'desc',
       needUserMenus: false,
       actions: [],
@@ -166,7 +166,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
       res.contentCount = (res.contentList) ? res.contentList.length : 0
       res.assigneeCount = (res.userType === 'AllUser') ? 'All Users' : (res.userDetails) ? res.userDetails.length : 0
       res.endDate = (res.endDate) ? moment(res.endDate).format('MMM DD[,] YYYY') : ''
-      res.createdAt = (res.createdAt) ? moment(res.createdAt).format('MMM DD[,] YYYY') : ''
+      res.updatedAt = (res.updatedAt) ? moment(res.updatedAt).format('MMM DD[,] YYYY') : ''
     })
     this.fetchContentDone = true
     this.loaderService.changeLoaderState(false)
@@ -239,7 +239,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
     this.trainingPlanService.archivePlan(obj).subscribe((_data: any) => {
       this.snackBar.open('CBP plan deleted successfully.')
       this.loaderService.changeLoaderState(false)
-      this.getDraftData()
+      this.filterData()
     }, (_error) => {
       this.loaderService.changeLoaderState(false)
     })
@@ -257,7 +257,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
       if (data && data.params && data.params.status && data.params.status.toLowerCase() === 'success') {
         this.snackBar.open('CBP plan published successfully.')
         this.loaderService.changeLoaderState(false)
-        this.getDraftData()
+        this.filterData()
       } else {
         this.snackBar.open('Something went wrong while publishing CBP plan. Try again later')
         this.loaderService.changeLoaderState(false)
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.html b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.html
index 607f3e204..ab27a9076 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.html
@@ -1,16 +1,16 @@
 <div class="flex flex-1 flex-column form-container plan-info">
     <div class="label">
-        Plan information
+        Plan Information
     </div>
     <div class="form-element">
         <form [formGroup]="contentForm">
             <div class="title-name">
-                <div class="fonm-element-label">Plan title <span class="required"></span></div>
+                <div class="fonm-element-label">Plan Title <span class="required"></span></div>
                 <mat-form-field appearance="outline" class="w-full" fxFlex="40">
-                    <input class="w-full" matInput placeholder="Enter Plan title" formControlName="name" maxlength="70">
+                    <input class="w-full" matInput placeholder="Enter Plan Title" formControlName="name" maxlength="70">
                     <mat-hint align="end">{{ contentForm.controls['name'].value.length }} / 70</mat-hint>                    
                     <mat-error *ngIf="contentForm.controls['name'].hasError('required')">
-                        Plan title is mandatory
+                        Plan Title is Mandatory
                     </mat-error>
                     <mat-error
                     *ngIf="contentForm.controls['name'].hasError('minlength') && !contentForm.controls['name'].errors?.pattern"
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.scss b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.scss
index 02b703557..c95917b16 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.scss
@@ -22,8 +22,9 @@
 .fonm-element-label {
     font-size: 14px;
     font-weight: 700;
-    letter-spacing: 0.25;
+    letter-spacing: 0.25px;
     color: rgba(0,0,0,0.87);
+    margin-bottom: 10px;
 }
 
 .sinput {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
index 4b8564ce4..894d3346f 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
@@ -4,7 +4,7 @@
             <img src="/assets/icons/arrow-forward_small.svg" />
         </div>
         <div class="home cursor-pointer" (click)="changeTabFromBreadCrumb('createPlan')">
-            Create CBP Plan
+            <span *ngIf="!editState">Create</span> <span *ngIf="editState">Edit</span> CBP Plan
             <img src="/assets/icons/arrow-forward_small.svg"
                 *ngIf="selectedTab !== tabType.CREATE_PLAN && !validationList?.titleIsInvalid" />
         </div>
@@ -24,16 +24,22 @@
         <button mat-button class="next-btn margin-left-m" (click)="nextStep()" *ngIf="tabType.CREATE_PLAN === selectedTab || tabType.ADD_CONTENT === selectedTab
             || tabType.ADD_ASSIGNEE === selectedTab" [disabled]="checkIfDisabled()"
             [ngClass]="{'btn-disabled': checkIfDisabled()}">
-            <span>Next: {{(tabType.CREATE_PLAN === selectedTab) ? 'Add Content' : (tabType.ADD_CONTENT === selectedTab)
-                ? 'Add assignee' : (tabType.ADD_ASSIGNEE === selectedTab) ? 'Add timeline' : ''}}</span>
+            <span *ngIf="!editState">Next: {{(tabType.CREATE_PLAN === selectedTab) ? 'Add Content' : (tabType.ADD_CONTENT === selectedTab)
+                ? 'Add Assignee' : (tabType.ADD_ASSIGNEE === selectedTab) ? 'Add Timeline' : ''}}</span>
+            <span *ngIf="editState">Next: {{(tabType.CREATE_PLAN === selectedTab) ? 'Edit Content' : (tabType.ADD_CONTENT === selectedTab)
+                    ? 'Edit Assignee' : (tabType.ADD_ASSIGNEE === selectedTab) ? 'Edit Timeline' : ''}}</span>
         </button>
+        <ng-container *ngIf="!editState">
         <button mat-button class="next-btn margin-left-m" (click)="createPlanDraftView()"
             *ngIf="tabType.ADD_TIMELINE === selectedTab && !checkForDraftStatus()">
-            <span>Save as draft</span>
+            <span>Save as Draft</span>
         </button>
+    </ng-container>
+    <ng-container *ngIf="editState">
         <button mat-button class="next-btn margin-left-m" (click)="updatePlan()"
             *ngIf="tabType.ADD_TIMELINE === selectedTab && checkForDraftStatus()">
-            <span>Update Content</span>
+            <span>Update Draft</span>
         </button>
+    </ng-container>
     </div>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.scss b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.scss
index e5740f464..aecf16ad1 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.scss
@@ -52,5 +52,5 @@
 }
 
 .btn-disabled {
-    background: rgba(0, 0, 0, 0.16) !important
+    background: #999999 !important
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
index ce4b13fdf..bdcbac59b 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
@@ -19,7 +19,7 @@ export class BreadcrumbComponent implements OnInit {
 
   public dialogRef: any
   tabType = TrainingPlanContent.TTabLabelKey
-
+  editState = false;
   constructor(
     private router: Router,
     private activeRoute: ActivatedRoute,
@@ -28,6 +28,7 @@ export class BreadcrumbComponent implements OnInit {
     private tpSvc: TrainingPlanService) { }
 
   ngOnInit() {
+    this.editState = this.activeRoute.snapshot.data['contentData'] ? true :  false
     this.checkIfDisabled()
   }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
index 9fd5fd20c..3c5643c96 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
@@ -25,7 +25,7 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
     // }
     this.trainingPlanDataSharingService.trainingPlanCategoryChangeEvent.pipe(debounceTime(700)).subscribe((data: any) => {
       if (data && data.event) {
-        if (data.event === 'Course' || data.event === 'Standalone Assessment' || data.event === 'Blended program' || data.event === 'Curated program' || data.event === 'Moderated Course') {
+        if (data.event === 'Course' || data.event === 'Standalone Assessment' || data.event === 'Program' || data.event === 'Blended program' || data.event === 'Curated program' || data.event === 'Moderated Course') {
           this.trainingPlanDataSharingService.trainingPlanStepperData.contentList = []
         } else if (data.event === 'Designation' || data.event === 'All Users' || data.event === 'Custom Users') {
           this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo = []
@@ -89,6 +89,23 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
           this.handleCategorySelection.emit(event)
         }
         break
+      case 'Program':
+        dialogData['type'] = 'normal'
+        dialogData['icon'] = 'radio_on'
+        dialogData['title'] = 'You are attempting to change the selected content type?'
+        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection.
+        It's advisable to save the current one as a draft and create a new one instead.`
+        dialogData['primaryAction'] = 'I understand, change content type'
+        dialogData['secondaryAction'] = 'Cancel'
+        dialogData['event'] = 'Program'
+        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event
+        this.trainingPlanDataSharingService.moderatedCourseSelectStatus.next(false)
+        if (this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.length) {
+          this.openDialoagBox(dialogData)
+        } else {
+          this.handleCategorySelection.emit(event)
+        }
+        break
       case 'Blended program':
         dialogData['type'] = 'normal'
         dialogData['icon'] = 'radio_on'
@@ -164,6 +181,7 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['primaryAction'] = 'I understand, change user type'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'AllUser'
+        this.trainingPlanDataSharingService.trainingPlanAssigneeData.category = 'AllUser';
         this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType'] = event
         if (this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.length) {
           this.openDialoagBox(dialogData)
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
index 1dad472a8..676a76f54 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
@@ -34,7 +34,7 @@
             </div>
         </ng-container>
         <a mat-button class="select-more-link margin-left-m" *ngIf="selectAssigneeCount > 3"
-            (click)="navigateToPreviewPage()">+{{selectContentCount - 3}} more</a>
+            (click)="navigateToPreviewPage()">+{{selectAssigneeCount - 3}} more</a>
     </div>
     <div class="flex flex-1 flex-row right-section flex-middle">
         <a mat-button class="select-more-link" (click)="clearAll()">Clear all</a>
@@ -55,7 +55,7 @@
             </div>
         </ng-container>
         <a mat-button class="select-more-link margin-left-m" *ngIf="selectAssigneeCount > 3"
-            (click)="navigateToPreviewPage()">+{{selectContentCount - 3}} more</a>
+            (click)="navigateToPreviewPage()">+{{selectAssigneeCount - 3}} more</a>
     </div>
     <div class="flex flex-1 flex-row right-section flex-middle">
         <a mat-button class="select-more-link" (click)="clearAll()">Clear all</a>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.scss b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.scss
index 4a7ab286b..f147fabe5 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.scss
@@ -43,6 +43,20 @@
 }
 
 ::ng-deep .competency-tabs .mat-tab-label {
+    flex: 1;
+    color: rgba(0, 0, 0, 0.6);
+    opacity: 1 !important;
+    // padding: 0 24px 0 46px !important;
+
+    ::ng-deep .mat-tab-label-content {
+        background-color: transparent;
+        color: rgba(0, 0, 0, 0.6);
+        width: 100%;
+        height: 100%;
+    }
+}
+
+::ng-deep .competency-tabs .mat-tab-label-active{
     flex: 1;
     color: black;
     opacity: 1 !important;
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
index bf763ab7b..b8beaf505 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
@@ -33,7 +33,7 @@
                             <div class="search-container">
                                 <div class="rsearch"><mat-icon
                                     class="color-60 search-icon mat-icon notranslate material-icons mat-icon-no-color">search</mat-icon>
-                                <input #searchInput class="sinput color-60" label="" [formControl]='searchThemeControl' placeholder="Enter competency theme" type="Standard">
+                                <input #searchInput class="sinput color-60" label="" [formControl]='searchThemeControl' placeholder="Enter Competency Theme" type="Standard">
                                 </div>
                             </div>
                             <div class="category-content">
@@ -57,7 +57,7 @@
                         <div class="search-container">
                             <div class="rsearch"><mat-icon
                                 class="color-60 search-icon mat-icon notranslate material-icons mat-icon-no-color">search</mat-icon>
-                            <input #searchThemeInput class="sinput color-60" label="" placeholder="Enter competency sub-theme" type="Standard">
+                            <input #searchThemeInput class="sinput color-60" label="" placeholder="Enter Competency Sub-Theme" type="Standard">
                             </div>
                         </div>
                         <div class="category-content">
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 17c1c0d54..53ce044cb 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -182,6 +182,7 @@ export class SearchComponent implements OnInit {
     switch (this.selectedDropDownValue) {
       case 'Course':
       case 'Standalone Assessment':
+      case 'Program':
       case 'Blended program':
       case 'Curated program':
       case 'Moderated Course':
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
index 338be2f96..c246bff7e 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
@@ -64,11 +64,11 @@
                                 <span class="most-enrolled-text margin-left-xs">
                                     <ng-container
                                         *ngIf="item?.additionalTags && item?.additionalTags.includes('mostEnrolled')">
-                                        <span class="most-enrolled-text margin-left-xs">Most enrolled</span>
+                                        <span class="most-enrolled-text margin-left-xs">Most Enrolled</span>
                                     </ng-container>
                                     <ng-container
                                         *ngIf="item?.additionalTags && item?.additionalTags.includes('mostTrending')">
-                                        <span class="most-enrolled-text margin-left-xs">Most trending</span>
+                                        <span class="most-enrolled-text margin-left-xs">Most Trending</span>
                                     </ng-container>
                                 </span>
                             </ng-container>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
index d6bdf6b6a..7cd19e650 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
@@ -57,7 +57,10 @@ $secondary-color: #EF951E;
   
     &.right-corner {
       right: 4px;
-      bottom: 4px;
+      bottom: 0px;
+      min-height: 30px;
+      min-width: 79px;
+      justify-content: right;
     }
     .mat-icon {
       vertical-align: middle;
@@ -67,7 +70,7 @@ $secondary-color: #EF951E;
       font-size: 14px;
     }
     .duration{
-      font: 700 12px/16px Lato;
+      font: 700 14px/16px Lato;
       display: inline-block;
       margin: 0;
       padding: 0;
@@ -166,8 +169,8 @@ $secondary-color: #EF951E;
   }
 
   .card-img {
-    min-width: 307px;
-    max-width: 307px;
+    min-width: 305px;
+    max-width: 305px;
     max-height: 140px;
     min-height: 140px;
     display: block;
@@ -598,4 +601,8 @@ $title-line-count: 2;
 
 ::ng-deep .mat-checkbox-indeterminate.mat-accent .mat-checkbox-background, ::ng-deep .mat-checkbox-checked.mat-accent .mat-checkbox-background {
   background: #1b4ca1 !important;
+}
+
+::ng-deep .card-select-box .mat-checkbox-layout {
+  width: 16px;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
index 7fe52cc2b..58826e0db 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
@@ -2,6 +2,7 @@ import { Component, EventEmitter, Input, Output, OnInit, OnChanges, ChangeDetect
 import { MatTableDataSource, MatPaginator, PageEvent } from '@angular/material';
 import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
 import { SafeUrl } from '@angular/platform-browser'
+
 @Component({
   selector: 'ws-app-standard-card',
   templateUrl: './standard-card.component.html',
@@ -19,13 +20,13 @@ export class StandardCardComponent implements OnInit, OnChanges {
   selectedContent: any[] = []
   startIndex = 0;
   lastIndex = 20; 
-  pageSize = 20;
+  pageSize = 20;  
   defaultPosterImage: SafeUrl | null = '/assets/instances/eagle/app_logos/default.png';
   defaultThumbnail: SafeUrl | null = 'assets/instances/eagle/app_logos/KarmayogiBharat_Logo.svg'
   constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService, private changeDetectorRef: ChangeDetectorRef) { }
 
   ngOnInit() {
-    
+   
   }
 
   ngOnChanges() {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
index 24b1438bc..64b2deb48 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
@@ -3,7 +3,7 @@
         (selectedTabChange)="tabSelected($event)">
         <mat-tab [label]="tabType.CREATE_PLAN" [disabled]="false">
             <ng-template mat-tab-label>
-                1. Create a plan
+                1. <span *ngIf="!editState">Create</span><span *ngIf="editState">Edit</span>&nbsp; a Plan
             </ng-template>
             <ng-template matTabContent>
                 <ws-app-add-plan-information
@@ -12,7 +12,7 @@
         </mat-tab>
         <mat-tab [label]="tabType.ADD_CONTENT" [disabled]="addCotnentDisable">
             <ng-template mat-tab-label>
-                <span>2. Add Content
+                <span>2. <span *ngIf="!editState">Add</span><span *ngIf="editState">Edit</span> Content
                 </span>
             </ng-template>
             <ng-template matTabContent>
@@ -21,7 +21,7 @@
         </mat-tab>
         <mat-tab [label]="tabType.ADD_ASSIGNEE" [disabled]="addCotnentDisable || addAssigneeDisable">
             <ng-template mat-tab-label>
-                <span>3. Add Assignee</span>
+                <span>3.  <span *ngIf="!editState">Add</span><span *ngIf="editState">Edit</span> Assignee</span>
             </ng-template>
             <ng-template matTabContent>
                 <ws-app-create-assignee (addAssigneeInvalid)="checkForaddAssignee($event)"
@@ -31,7 +31,7 @@
         <mat-tab [label]="tabType.ADD_TIMELINE"
             [disabled]="addCotnentDisable || addAssigneeDisable || addTimelineDisable">
             <ng-template mat-tab-label>
-                <span>4. Add Timeline</span>
+                <span>4.  <span *ngIf="!editState">Add</span><span *ngIf="editState">Edit</span> Timeline</span>
             </ng-template>
             <ng-template matTabContent>
                 <ws-app-create-timeline></ws-app-create-timeline>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
index 2af1cd30d..7a5a332e2 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
@@ -1,6 +1,6 @@
 import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core'
 import { TrainingPlanContent } from '../../models/training-plan.model'
-
+import { ActivatedRoute } from '@angular/router'
 @Component({
   selector: 'ws-app-stepper',
   templateUrl: './stepper.component.html',
@@ -19,11 +19,12 @@ export class StepperComponent implements OnInit, OnChanges {
   addCotnentDisable = true
   addAssigneeDisable = true
   addTimelineDisable = true
-
-  constructor(
+  editState = false;
+  constructor( private route : ActivatedRoute
   ) { }
 
   ngOnInit() {
+    this.editState = this.route.snapshot.data['contentData'] ? true :  false
   }
 
   ngOnChanges() {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
index 98cc7cd07..5bdda518f 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
@@ -7,7 +7,7 @@
                 <div>{{createInititals(item?.firstName)}}</div>
             </div>
             <div class="assignee-desc">
-                <p>{{item?.firstName}} </p>
+                <p>{{item?.firstName | titlecase}} </p>
                 <p class="sub-heading" *ngIf="item?.profileDetails?.professionalDetails && item?.profileDetails?.professionalDetails[0]">{{item?.profileDetails?.professionalDetails
 [0]?.designation }}</p>
             </div>
@@ -37,7 +37,7 @@
                 </button>
             </div>
             <div class="custom-user-desc">
-                <p>{{item?.name}}</p>
+                <p>{{item?.name | titlecase}}</p>
             </div>
 
             <div class="check-action" *ngIf="checkboxVisibility">
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
index c09d2de44..933c94924 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
@@ -11,6 +11,7 @@
     <ws-app-user-card [assigneeData]="assigneeData" (handleSelectedChips)="handleSelectedChips($event)"
         *ngIf="assigneeData?.category === 'CustomUser'" [showPagination]="true"></ws-app-user-card>
 </ng-container>
+
 <ng-container *ngIf="trainingPlanDataSharingService?.trainingPlanAssigneeData?.category === 'AllUser'">
     <div class="no-cbp-data margin-top-xl margin-bottom-xl">
         <div><img src="/assets/icons/no-data.svg"></div>
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
index 26cf81de1..6c9fd63ae 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
@@ -61,12 +61,14 @@ export class CreateAssigneeComponent implements OnInit {
         this.handleSelectedChips(true)
       } else {
         this.assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData
-        console.log('this.assigneeData',this.assigneeData)
+        this.addAssigneeInvalid.emit(false)
+      }
+    } else {      
+      if (this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'AllUser') {
+        this.addAssigneeInvalid.emit(false)
       }
     }
-    if (this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'AllUser') {
-      this.addAssigneeInvalid.emit(false)
-    }
+    
   }
 
   handleSelectedChips(event: any) {
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
index 1fdc9d682..bebff7e38 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
@@ -25,12 +25,17 @@ export class CreateContentComponent implements OnInit {
       },
       {
         id: 4,
-        name: 'Curated programs',
+        name: 'Curated Programs',
         value: 'Curated program',
       },
+      {
+        id: 6,
+        name: 'Programs',
+        value: 'Program',
+      },
       {
         id: 3,
-        name: 'Blended programs',
+        name: 'Blended Programs',
         value: 'Blended program',
       },
       {
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
index 87ec14ae4..73bb9d755 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
@@ -4,7 +4,7 @@
 <ng-container *ngIf="contentData.length">
     <div class="margin-top-xl">
         <div class="flex flex-middle flex-between">
-            <div class="mat-subheading-1 margin-remove">Selected Content <span *ngIf="contentData.length">( {{contentData.length }})</span></div>
+            <div class="mat-subheading-1 margin-remove">Selected Content <span *ngIf="contentData.length">( {{contentData.length }} )</span></div>
             <a mat-button (click)="showAll('content')" class="show-all">Show all <mat-icon>keyboard_arrow_right</mat-icon></a>
         </div>
     </div>
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
index 61e79db95..ed57afafe 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
@@ -3,18 +3,18 @@
     <button mat-stroked-button type="button" (click)="goBack()"><mat-icon>arrow_back</mat-icon> Go
         back</button>
 </div>
-<div class="flex" *ngIf="from==='content'">
-    <div class="mat-subheading-1 margin-remove">Selected Content <span *ngIf="contentData.length">( {{contentData.length}} )</span></div>
-    <ws-app-standard-card [checkboxVisibility]="false" [contentData]="contentData" [showDeleteFlag]="true"></ws-app-standard-card>
+<div class="flex mt-10 flex-col" *ngIf="from==='content'">
+    <div class="mat-subheading-1 margin-remove">Selected Content <span *ngIf="contentList?.length"> ( {{contentList?.length}} )</span></div>
+    <div class="mt-10 flex flex-row justify-center"><ws-app-standard-card [checkboxVisibility]="false" [contentData]="contentList" [showDeleteFlag]="true"></ws-app-standard-card></div>
 </div>
-<div class="flex" *ngIf="from==='assignee'">
-    <div class="mat-subheading-1 margin-remove">Selected Assignee <span *ngIf="contentData.length">( {{assigneeData.length}} )</span></div>
-    <ws-app-user-card [checkboxVisibility]="false" [assigneeData]="assigneeData" [showDeleteFlag]="true"></ws-app-user-card>
+<div class="flex mt-10 flex-col" *ngIf="from==='assignee'">
+    <div class="mat-subheading-1 margin-remove">Selected Assignee <span *ngIf="assigneeData?.data?.length"> ( {{assigneeData?.data?.length}} )</span></div>
+    <div class="mt-10 flex flex-row justify-center"><ws-app-user-card [checkboxVisibility]="false" [assigneeData]="assigneeData" [showDeleteFlag]="true"></ws-app-user-card></div>
 </div>
 <div class="flex content-container" *ngIf="from === 'all'">
     <mat-chip-list [multiple]="true" [selectable]="true">
         <mat-chip [ngClass]="selectedTab == item.tab ? 'select-tab': ''" *ngFor="let item of allContentChips" [selected]="selectedTab == item.tab"
-            (click)="selectedTab = item.tab">{{item.name}} <span *ngIf="item?.count">( {{item?.count}} )</span>
+            (click)="selectedTab = item.tab"><span *ngIf="item?.count > 1">{{item.name | titlecase}}s</span> <span *ngIf="item?.count === 1">{{item.name | titlecase}}</span> <span *ngIf="item?.count"> &nbsp;&nbsp;({{item?.count}})</span>
         </mat-chip>
     </mat-chip-list>
 
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
index 4af9166f9..8096234ce 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
@@ -20,9 +20,9 @@ export class PreviewPlanComponent implements OnInit {
 
   ngOnInit() {
     this.from = this.route.snapshot.queryParams['from']    
-    const contentData = this.route.snapshot.data['contentData']
-    const category = contentData.assignmentType
+    const contentData = this.route.snapshot.data['contentData'];    
     if (contentData) {
+      const category = contentData.assignmentType
       this.from = 'all';
       console.log('contentData-->', contentData);
       const arr = [];      
@@ -91,18 +91,21 @@ export class PreviewPlanComponent implements OnInit {
         })
       }
     } else if (this.from === 'assignee') {
-      const category = this.trainingPlanDataSharingService.trainingPlanAssigneeData.category
-      if (category === 'Designation') {
-        const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
-          return item.selected
-        })
-        this.assigneeData = { category, data: assigneeData }
-      } else if (category === 'CustomUser') {
-        const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
-          return item.selected
-        })
-        this.assigneeData = { category, data: assigneeData }
+      if(this.trainingPlanDataSharingService.trainingPlanAssigneeData) {
+        const category = this.trainingPlanDataSharingService.trainingPlanAssigneeData.category
+        if (category === 'Designation') {
+          const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
+            return item.selected
+          })
+          this.assigneeData = { category, data: assigneeData }
+        } else if (category === 'CustomUser') {
+          const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
+            return item.selected
+          })
+          this.assigneeData = { category, data: assigneeData }
+        }
       }
+      
 
     }
   }

From 0a6cd28a0bf7a823f92b4387c1d9dbce27347c9f Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Mon, 25 Dec 2023 09:14:34 +0530
Subject: [PATCH 373/887] update for filer with search

---
 .../pipes/filter-search/filter-search.pipe.ts |  1 +
 .../breadcrumb/breadcrumb.component.html      |  4 +--
 .../components/filter/filter.component.html   | 10 ++++----
 .../components/filter/filter.component.ts     | 25 ++++++++++++++++++-
 .../components/search/search.component.html   |  2 +-
 .../components/search/search.component.ts     |  1 +
 .../create-content.component.html             |  3 +--
 7 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/project/ws/app/src/lib/routes/pipes/filter-search/filter-search.pipe.ts b/project/ws/app/src/lib/routes/pipes/filter-search/filter-search.pipe.ts
index 5cb32d1a8..c7aaabede 100644
--- a/project/ws/app/src/lib/routes/pipes/filter-search/filter-search.pipe.ts
+++ b/project/ws/app/src/lib/routes/pipes/filter-search/filter-search.pipe.ts
@@ -6,6 +6,7 @@ import { Pipe, PipeTransform } from '@angular/core'
 export class FilterSearchPipe implements PipeTransform {
 
     transform(items: any[], searchText: string): any {
+        console.log(items, searchText);
         if (!items) { return [] }
         if (!searchText) { return items }
         const searchTextLowerCase = searchText.toLowerCase()
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
index 894d3346f..31e630e39 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
@@ -12,9 +12,9 @@
             (tabType.ADD_CONTENT === selectedTab) ? 'Add content' : (tabType.ADD_ASSIGNEE === selectedTab) ? 'Add
             assignee' : (tabType.ADD_TIMELINE === selectedTab) ? 'Add timeline' : ''}}
         </div> -->
-        <div class="action" *ngIf="trainingPlanDataSharingService?.trainingPlanTitle &&
+        <div class="action" *ngIf="tpdsSvc?.trainingPlanTitle &&
         selectedTab !== tabType.CREATE_PLAN && !validationList?.titleIsInvalid">
-            {{trainingPlanDataSharingService?.trainingPlanTitle}}
+            {{tpdsSvc?.trainingPlanTitle}}
         </div>
     </div>
     <div class="flex flex-1 flex-row right-breadcrumb" *ngIf="showBreadcrumbAction">
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
index b8beaf505..5ee438da2 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
@@ -16,7 +16,7 @@
                             </mat-panel-title>
                         </mat-expansion-panel-header>
                         <div class="flex flex-1 flex-row category-item" *ngFor="let ctype of competencyTypeList">
-                            <mat-checkbox #checkboxes disableRipple class="example-margin" (change)="getCompetencyTheme($event, ctype)">{{ctype?.name}}</mat-checkbox>
+                            <mat-checkbox #checkboxes disableRipple class="example-margin" [checked]="ctype?.selected" (change)="getCompetencyTheme($event, ctype)">{{ctype?.name}}</mat-checkbox>
                         </div>
                     </mat-expansion-panel>
                 </mat-accordion>
@@ -33,12 +33,12 @@
                             <div class="search-container">
                                 <div class="rsearch"><mat-icon
                                     class="color-60 search-icon mat-icon notranslate material-icons mat-icon-no-color">search</mat-icon>
-                                <input #searchInput class="sinput color-60" label="" [formControl]='searchThemeControl' placeholder="Enter Competency Theme" type="Standard">
+                                <input #searchInput id="searchInput" class="sinput color-60" label="" [formControl]='searchThemeControl' placeholder="Enter Competency Theme" type="Standard">
                                 </div>
                             </div>
                             <div class="category-content">
                                 <div class="flex flex-1 flex-row category-item" *ngFor="let ctitem of competencyThemeList | filterSearch: searchInput.value">
-                                    <mat-checkbox #checkboxes disableRipple class="example-margin"  (change)="getCompetencySubTheme($event, ctitem)">{{ctitem?.name}}</mat-checkbox>
+                                    <mat-checkbox #checkboxes disableRipple class="example-margin"  [checked]="ctitem?.selected"  (change)="getCompetencySubTheme($event, ctitem)">{{ctitem?.name}}</mat-checkbox>
                                 </div>                               
                             </div>
                         
@@ -57,12 +57,12 @@
                         <div class="search-container">
                             <div class="rsearch"><mat-icon
                                 class="color-60 search-icon mat-icon notranslate material-icons mat-icon-no-color">search</mat-icon>
-                            <input #searchThemeInput class="sinput color-60" label="" placeholder="Enter Competency Sub-Theme" type="Standard">
+                            <input #searchThemeInput id="searchThemeInput" class="sinput color-60" label="" [formControl]='searchSubThemeControl' placeholder="Enter Competency Sub-Theme" type="Standard">
                             </div>
                         </div>
                         <div class="category-content">
                             <div class="flex flex-1 flex-row category-item" *ngFor="let cstitem of competencySubThemeList | filterSearch: searchThemeInput.value">
-                                <mat-checkbox #checkboxes disableRipple class="example-margin"  (change)="manageCompetencySubTheme($event, cstitem)">{{cstitem?.name}}</mat-checkbox>
+                                <mat-checkbox #checkboxes disableRipple class="example-margin" [checked]="cstitem?.selected"  (change)="manageCompetencySubTheme($event, cstitem)">{{cstitem?.name}}</mat-checkbox>
                             </div> 
                         </div>
                     </mat-expansion-panel>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index 969f04293..dd0ce9bbf 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -24,6 +24,7 @@ export class FilterComponent implements OnInit {
   filterObj: any = { "competencyArea": [], "competencyTheme": [], "competencySubTheme": [], "providers": [] };
   assigneeFilterObj:any = {"group": [], "designation": []}
   searchThemeControl = new FormControl();
+  searchSubThemeControl = new FormControl();
   @ViewChildren("checkboxes") checkboxes!: QueryList<ElementRef>;
   constructor(private trainingPlanService: TrainingPlanService, private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
 
@@ -89,6 +90,7 @@ export class FilterComponent implements OnInit {
     if (event.checked) {
       this.competencyList.map((citem: any) => {
         if (citem.name === ctype.id) {
+          citem['selected'] = true;
           console.log(citem.name, ctype.name, citem.children)
           citem.children.map((themechild: any) => {
             themechild['parent'] = ctype.id;
@@ -100,7 +102,12 @@ export class FilterComponent implements OnInit {
           console.log('competencyThemeList', this.competencyThemeList)
         }
       })
-    } else {     
+    } else {  
+      this.competencyList.map((citem: any) => {
+        if (citem.name === ctype.id) {
+          citem['selected'] = false;
+        }
+      });   
       this.competencyThemeList = this.competencyThemeList.filter((sitem) => {
         return sitem.parent != ctype.id
       })
@@ -117,6 +124,7 @@ export class FilterComponent implements OnInit {
     if (event.checked) {
       this.competencyThemeList.map((csitem: any) => {
         if (csitem.name === cstype.name) {
+          csitem['selected'] = true;
           csitem.children.map((subthemechild: any) => {
             subthemechild['parentType'] = csitem.parent;
             subthemechild['parent'] = csitem.name;
@@ -126,6 +134,11 @@ export class FilterComponent implements OnInit {
         }
       })
     } else {
+      this.competencyThemeList.map((csitem: any) => {
+        if (csitem.name === cstype.name) {
+          csitem['selected'] = false;
+        }
+      });
       this.competencySubThemeList = this.competencySubThemeList.filter((sitem) => {
         return sitem.parent != cstype.name
       })
@@ -142,8 +155,18 @@ export class FilterComponent implements OnInit {
   manageCompetencySubTheme(event: any, csttype: any) {
     console.log('cstype, event --', event, csttype);
     if (event.checked) {
+      this.competencySubThemeList.map((cstlitem:any)=>{
+        if (csttype.name === cstlitem.name) {
+          cstlitem['selected'] = true;
+        }
+      })
       this.filterObj['competencySubTheme'].push(csttype.name);
     } else {
+      this.competencySubThemeList.map((cstlitem:any)=>{
+        if (csttype.name === cstlitem.name) {
+          cstlitem['selected'] = false;
+        }
+      })
       if (this.filterObj['competencySubTheme'].indexOf(csttype.name) > -1) {
         const index = this.filterObj['competencySubTheme'].findIndex((x: any) => x === csttype.name)
         this.filterObj['competencySubTheme'].splice(index, 1)
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
index 1bc28aecc..e35019235 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
@@ -7,7 +7,7 @@
     <div class="search flex w-full margin-left-xl margin-right-xl">
         <div class="rsearch flex w-full"><mat-icon
                 class="color-60 search-icon mat-icon notranslate material-icons mat-icon-no-color">search</mat-icon>
-            <input class="sinput color-60 w-full margin-right-m" [(ngModel)]="searchText" label="" placeholder="Select"
+            <input class="sinput color-60 w-full margin-right-m" [(ngModel)]="searchText" (keyup.enter)="searchData()" label="" placeholder="Select"
                 type="Standard">
         </div>
         <button mat-button type="button" class="search-btn" (click)="searchData()">Search</button>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 53ce044cb..fbfa17742 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -108,6 +108,7 @@ export class SearchComponent implements OnInit {
         //     data: { content: _.uniqBy(_.concat(this.tpdsSvc.trainingPlanContentData.data.content, res.content), 'identifier') }
         //   }
         // } else {
+          console.log('this.tpdsSvc',this.tpdsSvc);
         this.tpdsSvc.trainingPlanContentData = { category: contentType, data: res }
         // }
         this.handleApiData.emit(true)
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
index 4762b90e1..ecb332e89 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
@@ -1,7 +1,6 @@
 <ng-container>
     <ws-app-search [categoryData]="categoryData" [from]="from" (handleApiData)="handleApiData($event)"></ws-app-search>
 </ng-container>
-
 <ng-container>
     <div class="flex flex-row" *ngIf="contentData?.length > 0">
         <div class="flex-1">
@@ -15,7 +14,7 @@
                 [selectContentCount]="selectContentCount"></ws-app-competency-summary>
         </div>
     </div>
-    <div class="no-cbp-data margin-top-xl margin-bottom-xl" *ngIf="contentData?.length === 0">
+    <div class="no-cbp-data margin-top-xl margin-bottom-xl" *ngIf="!(contentData) || !(contentData?.length)">
         <div><img src="/assets/icons/no-data.svg"></div>
         <div class="mat-subheading-1 margin-remove">No content avaliable.</div>
         <!-- <div>Create a content in CBP portal to get the contents.</div> -->

From b7af572fbd7e2f624d966610a8606321b3178af9 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Mon, 25 Dec 2023 16:31:20 +0530
Subject: [PATCH 374/887] update for pagination

---
 .../components/search/search.component.ts     | 32 ++++++++++++++++---
 .../standard-card.component.html              |  2 +-
 .../standard-card/standard-card.component.ts  | 25 +++++++++++----
 .../create-content.component.html             |  2 +-
 .../create-content.component.ts               |  6 ++++
 .../training-plan-data-share.service.ts       |  1 +
 6 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index fbfa17742..1bfec1591 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -20,6 +20,8 @@ export class SearchComponent implements OnInit {
   clearFilter = false;
   selectedDropDownValue: any
   designationList: any[] = [];
+  pageIndex = 0;
+  pageSize = 20;
   constructor(@Inject(DOCUMENT) private document: Document,
     private trainingPlanService: TrainingPlanService,
     private route: ActivatedRoute,
@@ -28,9 +30,18 @@ export class SearchComponent implements OnInit {
   ) { }
 
   ngOnInit() {
+    this.tpdsSvc.handleContentPageChange.subscribe((pageData:any)=>{
+      if(pageData) {
+        this.pageIndex = pageData.pageIndex;
+        this.pageSize = pageData.pageSize;
+        this.getContent(this.selectedDropDownValue);
+      }
+      
+    })
   }
 
   ngOnChanges() {
+    
   }
 
   openFilter() {
@@ -53,6 +64,7 @@ export class SearchComponent implements OnInit {
   handleCategorySelection(event: any) {
     this.selectedDropDownValue = event
     this.tpdsSvc.clearFilter.next(true)
+    this.resetPageIndex();
     switch (this.from) {
       case 'content':
         event = !event ? 'Course' : event
@@ -91,8 +103,8 @@ export class SearchComponent implements OnInit {
             "competencies_v5.competencyTheme": applyFilterObj && applyFilterObj['competencyTheme'] && applyFilterObj['competencyTheme'].length ? applyFilterObj['competencyTheme'] : [],
             "competencies_v5.competencySubTheme": applyFilterObj && applyFilterObj['competencySubTheme'] && applyFilterObj['competencySubTheme'].length ? applyFilterObj['competencySubTheme'] : []
           },
-          "offset": 0,
-          "limit": 20,
+          "offset": this.pageIndex,
+          "limit": this.pageSize,
           "query": (this.searchText) ? this.searchText : '',
           "sort_by": { "lastUpdatedOn": "desc" },
           "fields": ["name", "appIcon", "instructions", "description", "purpose", "mimeType",
@@ -108,8 +120,15 @@ export class SearchComponent implements OnInit {
         //     data: { content: _.uniqBy(_.concat(this.tpdsSvc.trainingPlanContentData.data.content, res.content), 'identifier') }
         //   }
         // } else {
-          console.log('this.tpdsSvc',this.tpdsSvc);
-        this.tpdsSvc.trainingPlanContentData = { category: contentType, data: res }
+          console.log('res', res, this.pageIndex);
+          if(this.pageIndex) {
+            let result = { count: res.count , content : this.tpdsSvc.trainingPlanContentData.data.content.concat(res.content) };
+            console.log(result);
+            this.tpdsSvc.trainingPlanContentData = { category: contentType, data: result, count: res.count }
+          } else {
+            this.tpdsSvc.trainingPlanContentData = { category: contentType, data: res, count: res.count }
+          }
+          console.log(this.tpdsSvc.trainingPlanContentData)
         // }
         this.handleApiData.emit(true)
         this.loadingService.changeLoaderState(false)
@@ -210,4 +229,9 @@ export class SearchComponent implements OnInit {
 
   }
 
+  resetPageIndex() {
+    this.pageIndex = 0;
+    this.pageSize = 20;
+  }
+
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
index c246bff7e..b81eed145 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
@@ -80,7 +80,7 @@
 
     </div>
     <div class="flex flex-row justify-center" *ngIf="showPagination">
-        <mat-paginator [pageSize]="pageSize" [pageSizeOptions]="[20,30,40]"
+        <mat-paginator [pageSize]="pageSize" [length]="count" [pageSizeOptions]="[20,30,40]"
             (page)="onChangePage($event)"></mat-paginator>
     </div>
 </ng-container>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
index 58826e0db..056077582 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, Output, OnInit, OnChanges, ChangeDetectorRef, ViewChild } from '@angular/core'
-import { MatTableDataSource, MatPaginator, PageEvent } from '@angular/material';
+import { MatPaginator, PageEvent } from '@angular/material';
 import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
 import { SafeUrl } from '@angular/platform-browser'
 
@@ -13,7 +13,8 @@ export class StandardCardComponent implements OnInit, OnChanges {
   @Input() checkboxVisibility: any = true
   @Input() contentData: any[] = []
   @Input() showDeleteFlag = false
-  @Input() showPagination = false;
+  @Input() showPagination = false;  
+  @Input() count = 0;
   @Output() handleSelectedChips = new EventEmitter()
   @ViewChild(MatPaginator, {static: false}) paginator: MatPaginator | any;
   dataSource: any;
@@ -26,23 +27,25 @@ export class StandardCardComponent implements OnInit, OnChanges {
   constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService, private changeDetectorRef: ChangeDetectorRef) { }
 
   ngOnInit() {
-   
+    this.trainingPlanDataSharingService.clearFilter.subscribe(()=>{
+      this.resetPageIndex();
+    })
   }
 
   ngOnChanges() {
     this.changeDetectorRef.detectChanges();
     console.log('this.contentData', this.contentData)
-    this.dataSource = new MatTableDataSource<any>(this.contentData);
-    this.dataSource.paginator = this.paginator;
+    // this.dataSource = new MatTableDataSource<any>(this.contentData);
+    // this.dataSource.paginator = this.paginator;
     console.log('this.dataSource', this.dataSource);
   }
 
   onChangePage(pe: PageEvent) {
     console.log(pe.pageIndex);
     console.log(pe.pageSize);
-    this.startIndex = pe.pageIndex * pe.pageSize;
+    this.startIndex = (pe.pageIndex) * pe.pageSize;
     this.lastIndex = (pe.pageIndex + 1) * pe.pageSize ;
-    
+    this.trainingPlanDataSharingService.handleContentPageChange.next({pageIndex: this.startIndex, pageSize: this.lastIndex});
     // this.startIndex = this.pageIndex
   }
 
@@ -95,4 +98,12 @@ export class StandardCardComponent implements OnInit, OnChanges {
     })
   }
 
+  resetPageIndex() {
+    this.startIndex = 0;
+    this.lastIndex = 20;
+    this.pageSize = 20;
+    this.paginator.pageIndex = 0;
+    this.paginator.pageSize = 20;
+  }
+
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
index ecb332e89..faf046de6 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
@@ -6,7 +6,7 @@
         <div class="flex-1">
             <ws-app-chip [selectedContentChips]="selectedContentChips" [from]="from"
                 [selectContentCount]="selectContentCount" (itemRemoved)="itemsRemovedFromChip()"></ws-app-chip>
-            <ws-app-standard-card [cardSize]="3" [contentData]="contentData" [showPagination]="true" 
+            <ws-app-standard-card [cardSize]="3" [contentData]="contentData" [showPagination]="true" [count]="count"
                 (handleSelectedChips)="handleSelectedChips($event)"></ws-app-standard-card>
         </div>
         <div class="flex-2 margin-left-s margin-top-s">
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
index bebff7e38..2091c482f 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
@@ -14,6 +14,9 @@ export class CreateContentComponent implements OnInit {
   from = 'content'
   selectedContentChips: any[] = []
   selectContentCount = 0
+  pageIndex:any;
+  pageSize:any;
+  count = 0;
   constructor(private tpdsSvc: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
@@ -70,9 +73,11 @@ export class CreateContentComponent implements OnInit {
           })
         }
         this.contentData = this.tpdsSvc.trainingPlanContentData.data.content
+        this.count = this.tpdsSvc.trainingPlanContentData.data.count;
         this.handleSelectedChips(true)
       } else {
         this.contentData = this.tpdsSvc.trainingPlanContentData.data.content
+        this.count = this.tpdsSvc.trainingPlanContentData.data.count;
       }
     }
   }
@@ -96,6 +101,7 @@ export class CreateContentComponent implements OnInit {
     }
   }
 
+
   itemsRemovedFromChip() {
     this.handleSelectedChips(true)
   }
diff --git a/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts b/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
index c750ac119..239b36cb7 100644
--- a/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
+++ b/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
@@ -8,6 +8,7 @@ export class TrainingPlanDataSharingService {
   clearFilter = new Subject();
   trainingPlanCategoryChangeEvent = new Subject()
   moderatedCourseSelectStatus = new Subject()
+  handleContentPageChange = new Subject();
   trainingPlanTitle = ''
   trainingPlanContentData: any
   trainingPlanAssigneeData: any

From adaaa5807b8ffe2e4f8cf7b89e9e20471fc9e3b1 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Mon, 25 Dec 2023 16:40:35 +0530
Subject: [PATCH 375/887] update for filter with integration

---
 .../components/filter/filter.component.html           |  2 +-
 .../components/filter/filter.component.ts             | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
index 5ee438da2..825ba6300 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
@@ -16,7 +16,7 @@
                             </mat-panel-title>
                         </mat-expansion-panel-header>
                         <div class="flex flex-1 flex-row category-item" *ngFor="let ctype of competencyTypeList">
-                            <mat-checkbox #checkboxes disableRipple class="example-margin" [checked]="ctype?.selected" (change)="getCompetencyTheme($event, ctype)">{{ctype?.name}}</mat-checkbox>
+                            <mat-checkbox #checkboxes disableRipple class="example-margin" (change)="getCompetencyTheme($event, ctype)">{{ctype?.name}}</mat-checkbox>
                         </div>
                     </mat-expansion-panel>
                 </mat-accordion>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index dd0ce9bbf..49a8e4f92 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -1,12 +1,13 @@
-import { Component, Input, ElementRef, EventEmitter, OnInit, Output, QueryList, ViewChildren } from '@angular/core'
+import { Component, Input, ElementRef, EventEmitter, OnInit, Output, QueryList, ViewChildren, ChangeDetectionStrategy } from '@angular/core'
 import { TrainingPlanService } from './../../services/traininig-plan.service';
 import { FormControl } from '@angular/forms';
 import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service';
-
+import { ChangeDetectorRef } from '@angular/core';
 @Component({
   selector: 'ws-app-filter',
   templateUrl: './filter.component.html',
   styleUrls: ['./filter.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class FilterComponent implements OnInit {
   @Output() toggleFilter = new EventEmitter()
@@ -26,7 +27,7 @@ export class FilterComponent implements OnInit {
   searchThemeControl = new FormControl();
   searchSubThemeControl = new FormControl();
   @ViewChildren("checkboxes") checkboxes!: QueryList<ElementRef>;
-  constructor(private trainingPlanService: TrainingPlanService, private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
+  constructor(private cdref: ChangeDetectorRef, private trainingPlanService: TrainingPlanService, private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
     if(this.from === 'content') {
@@ -47,6 +48,10 @@ export class FilterComponent implements OnInit {
     })
   }
 
+  ngAfterContentChecked() {
+    this.cdref.detectChanges();
+ }
+
   getFilterEntity() {
     let filterObj = {
       "search": {

From 62fafdea5b219b3d7dce619a6c359c38895ca7cc Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Tue, 26 Dec 2023 10:56:56 +0530
Subject: [PATCH 376/887] still working on the role changes

---
 .../src/lib/routes/home/home.rounting.module.ts  |  9 +++++++--
 .../training-plan-dashboard.component.html       |  2 +-
 .../training-plan-dashboard.component.ts         | 16 +++++++++++++++-
 .../components/search/search.component.ts        |  2 +-
 src/app/app-routing.module.ts                    |  2 +-
 5 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/home.rounting.module.ts b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
index 90c920bf7..cb220f494 100644
--- a/project/ws/app/src/lib/routes/home/home.rounting.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
@@ -139,9 +139,14 @@ const routes: Routes = [
         path: 'training-plan-dashboard',
         component: TrainingPlanDashboardComponent,
         data: {
-          pageId: 'training-plan',
-          module: 'Training Plan',
+          pageId: 'training-plan-dashboard',
+          pageType: 'feature',
+          pageKey: 'training-plan-dashboard',
         },
+        resolve: {
+          configService: ConfigResolveService,
+          pageData: PageResolve,
+        }
       },
     ],
   },
diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html
index 6e4fb8825..874db2e1d 100644
--- a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html
@@ -23,7 +23,7 @@
         <ws-widget-org-user-table [tableData]="tabledata" [data]="trainingPlanData" [isTrainingPlan]="true"
           [trainingTagList]="tagListData" *ngIf="currentFilter === 'draft' && fetchContentDone"
           (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuSelected($event)"
-          (tagSelectedData)="filterDataAsPerTab($event)">
+          (tagSelectedData)="filterDataAsPerTab($event)" [actionMenuItem]="pageConfig.data.actionMenu">
         </ws-widget-org-user-table>
       </ng-container>
     </mat-card-content>
diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
index a07774792..e8572ad37 100644
--- a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core'
-import { Router } from '@angular/router'
+import { ActivatedRoute, Router } from '@angular/router'
 // import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
 // import { EventService } from '@sunbird-cb/utils'
 import { ITableData } from '@sunbird-cb/collection/lib/ui-org-table/interface/interfaces'
@@ -40,10 +40,13 @@ export class TrainingPlanDashboardComponent implements OnInit {
   fetchContentDone!: boolean
   completeDataRes: any
   dialogRef: any
+  conficSvc: any
+  pageConfig: any
 
   constructor(
     // private events: EventService,
     private router: Router,
+    private activeRoute: ActivatedRoute,
     private trainingDashboardSvc: TrainingPlanDashboardService,
     private loaderService: LoaderService,
     private trainingPlanService: TrainingPlanService,
@@ -54,6 +57,9 @@ export class TrainingPlanDashboardComponent implements OnInit {
   }
 
   ngOnInit() {
+    this.conficSvc = this.activeRoute.snapshot.data['configService']
+    this.pageConfig = this.activeRoute.snapshot.data['pageData']
+    this.hasAccess()
     this.tabledata = {
       columns: [
         // { displayName: 'Id', key: 'identifier' },
@@ -285,4 +291,12 @@ export class TrainingPlanDashboardComponent implements OnInit {
     this.trainingPlanData = this.completeDataRes.filter((v: any) => v.userType === _event)
   }
 
+  hasAccess() {
+    if (this.pageConfig && this.pageConfig.data && this.pageConfig.data.actionMenu) {
+      this.pageConfig.data.actionMenu.map((_v: any) => {
+        debugger
+      })
+    }
+  }
+
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 456248e3f..631138501 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -153,7 +153,7 @@ export class SearchComponent implements OnInit {
   }
 
   getAllUsers(_event: any) {
-    // this.tpdsSvc.trainingPlanAssigneeData = { category: _event, data: [_event] }
+    this.tpdsSvc.trainingPlanAssigneeData = { category: _event, data: [_event] }
     this.handleApiData.emit(true)
   }
 
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 293538097..45955e0c7 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -57,7 +57,7 @@ const routes: Routes = [
     canActivate: [GeneralGuard],
     data: {
       pageType: 'feature',
-      // pageKey: 'training-plan-homeeee',
+      // pageKey: 'training-plan-home',
     },
     resolve: {
       pageData: PageResolve,

From bbcd9681dbc1abd5d5538eed2eb92a20205cabbf Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Tue, 26 Dec 2023 11:35:56 +0530
Subject: [PATCH 377/887] update for preview plan custom user data

---
 .../standard-card/standard-card.component.ts      |  7 +++++--
 .../routes/preview-plan/preview-plan.component.ts | 15 ++++++++-------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
index 056077582..0e81c81ef 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
@@ -102,8 +102,11 @@ export class StandardCardComponent implements OnInit, OnChanges {
     this.startIndex = 0;
     this.lastIndex = 20;
     this.pageSize = 20;
-    this.paginator.pageIndex = 0;
-    this.paginator.pageSize = 20;
+    if(this.paginator) {
+      this.paginator.pageIndex = 0;
+      this.paginator.pageSize = 20;
+    }
+   
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
index 8096234ce..3b288784a 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
@@ -27,16 +27,17 @@ export class PreviewPlanComponent implements OnInit {
       console.log('contentData-->', contentData);
       const arr = [];      
       this.tab = this.selectedTab = 'content';
-      if (contentData.assignmentTypeInfo) {        
+          
         if (category === 'CustomUser') {
           let assignmentDataArr:any = [];
 
-          let obj:any = {
-            "firstName": "",
-            "userId": "",
-            "profileDetails": {"professionalDetails": [{designation: ""}]
-          }};
+          
           contentData && contentData.userDetails && contentData.userDetails.map((item:any)=>{
+            let obj:any = {
+              "firstName": "",
+              "userId": "",
+              "profileDetails": {"professionalDetails": [{designation: ""}]
+            }};
             obj.firstName = item.firstName;
             obj.profileDetails.professionalDetails[0]['designation']= item.designation;
             obj.userId = item.userId;
@@ -53,7 +54,7 @@ export class PreviewPlanComponent implements OnInit {
           })
           this.assigneeData = { category, data: assignmentDataArr }
         }
-      }
+      
 
       if (contentData &&
         contentData.contentList) {

From ed09658b99a854f4b11e193592fa6d2561b577d6 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Tue, 26 Dec 2023 15:09:27 +0530
Subject: [PATCH 378/887] optional variable fixes

---
 .../competency-summary.component.html                  |  4 ++--
 .../competency-summary/competency-summary.component.ts |  3 +--
 .../components/filter/filter.component.html            |  6 +++---
 .../create-timeline/create-timeline.component.html     | 10 +++++-----
 .../routes/preview-plan/preview-plan.component.html    |  4 ++--
 .../routes/preview-plan/preview-plan.component.scss    |  4 ++++
 6 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.html b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.html
index d83a5adfd..d1a1f2e9e 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.html
@@ -79,7 +79,7 @@
                     {{item?.title | titlecase}} ({{item[item?.title]['count']}}) 
                 </ng-template>
                 <ng-template matTabContent>
-                    <ng-container *ngIf="item[item?.title]['listData'].length">
+                    <ng-container *ngIf="item[item?.title]['listData']?.length">
                     <div class="category-card flex flex-row" *ngFor="let sitem of item[item?.title]['listData']">
                         <div class="label">
                             {{sitem?.competencyTheme}}
@@ -89,7 +89,7 @@
                         </div>
                     </div>
                     </ng-container>
-                    <ng-container *ngIf="!(item[item?.title]['listData'].length)">
+                    <ng-container *ngIf="!(item[item?.title]['listData']?.length)">
                         <div class="default-tab-content">There are no competency added yet.</div>
                     </ng-container>
                 </ng-template>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
index f2d97d754..c13cf99d2 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
@@ -70,8 +70,7 @@ export class CompetencySummaryComponent implements OnInit, OnChanges {
       let fObj = {"competencyTheme": '', count: 0};
       this.selectedCardData.map((sitem: any) => {
         sitem && sitem.competencies_v5 && sitem.competencies_v5.map((fitem: any) => {
-          if (fitem.competencyArea.toLowerCase() === 'behavioural') {
-            this.competencySummaryObj[0]['behavioural']['count'] = this.competencySummaryObj[0]['behavioural']['count'] + 1
+          if (fitem.competencyArea.toLowerCase() === 'behavioral') {
             let result = this.checkIfThemeNameExists(this.competencySummaryObj[0]['behavioural']['listData'], fitem);
             fObj = {"competencyTheme": fitem.competencyTheme, count: 1};
             if(result) {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
index 825ba6300..425906672 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
@@ -22,7 +22,7 @@
                 </mat-accordion>
             </div>
             <div class="spacer" *ngIf="competencyThemeList.length"></div>
-            <div class="filter-content flex flex-1" *ngIf="competencyThemeList.length">
+            <div class="filter-content flex flex-1" *ngIf="competencyThemeList?.length">
                 <mat-accordion>
                     <mat-expansion-panel disableRipple [expanded]="true">
                         <mat-expansion-panel-header>
@@ -46,7 +46,7 @@
                 </mat-accordion>
             </div>
             <div class="spacer"  *ngIf="competencySubThemeList.length"></div>
-            <div class="filter-content flex flex-1" *ngIf="competencySubThemeList.length">
+            <div class="filter-content flex flex-1" *ngIf="competencySubThemeList?.length">
                 <mat-accordion>
                     <mat-expansion-panel disableRipple [expanded]="true">
                         <mat-expansion-panel-header>
@@ -69,7 +69,7 @@
                 </mat-accordion>
             </div>
             <div class="spacer" *ngIf="providersList.length"></div>
-            <div class="filter-content flex flex-1" *ngIf="providersList.length">
+            <div class="filter-content flex flex-1" *ngIf="providersList?.length">
                 <mat-accordion>
                     <mat-expansion-panel disableRipple [expanded]="true">
                         <mat-expansion-panel-header>
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
index 73bb9d755..62ffba59e 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
@@ -1,21 +1,21 @@
 <ng-container>
     <ws-app-add-timeline-form></ws-app-add-timeline-form>
 </ng-container>
-<ng-container *ngIf="contentData.length">
+<ng-container *ngIf="contentData?.length">
     <div class="margin-top-xl">
         <div class="flex flex-middle flex-between">
-            <div class="mat-subheading-1 margin-remove">Selected Content <span *ngIf="contentData.length">( {{contentData.length }} )</span></div>
+            <div class="mat-subheading-1 margin-remove">Selected Content <span *ngIf="contentData?.length">( {{contentData?.length }} )</span></div>
             <a mat-button (click)="showAll('content')" class="show-all">Show all <mat-icon>keyboard_arrow_right</mat-icon></a>
         </div>
     </div>
     <ws-app-standard-card [checkboxVisibility]="false" [contentData]="contentData" [showDeleteFlag]="true"></ws-app-standard-card>
 </ng-container>
-<ng-container *ngIf="assigneeData && (assigneeData?.data?.length || assigneeData?.data?.content.length)">
+<ng-container *ngIf="assigneeData && (assigneeData?.data?.length || assigneeData?.data?.content?.length)">
     <div class="margin-top-xl">
         <div class=" flex flex-middle flex-between">
             <div class="mat-subheading-1 margin-remove">Selected Assignee 
-                <span *ngIf="assigneeData && (assigneeData?.data?.length || assigneeData?.data?.content.length)">
-                    ( {{(assigneeData?.data?.length) || (assigneeData?.data?.content.length)}} )
+                <span *ngIf="assigneeData && (assigneeData?.data?.length || assigneeData?.data?.content?.length)">
+                    ( {{(assigneeData?.data?.length) || (assigneeData?.data?.content?.length)}} )
                 </span></div>
             <a mat-button (click)="showAll('assignee')" class="show-all">Show all <mat-icon>keyboard_arrow_right</mat-icon></a>
         </div>
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
index ed57afafe..a33f62f6f 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
@@ -13,8 +13,8 @@
 </div>
 <div class="flex content-container" *ngIf="from === 'all'">
     <mat-chip-list [multiple]="true" [selectable]="true">
-        <mat-chip [ngClass]="selectedTab == item.tab ? 'select-tab': ''" *ngFor="let item of allContentChips" [selected]="selectedTab == item.tab"
-            (click)="selectedTab = item.tab"><span *ngIf="item?.count > 1">{{item.name | titlecase}}s</span> <span *ngIf="item?.count === 1">{{item.name | titlecase}}</span> <span *ngIf="item?.count"> &nbsp;&nbsp;({{item?.count}})</span>
+        <mat-chip [ngClass]="selectedTab == item?.tab ? 'select-tab ': ''" *ngFor="let item of allContentChips" [selected]="selectedTab == item.tab"
+            (click)="selectedTab = item.tab"><span *ngIf="item?.count > 1">{{item?.name | titlecase}}s</span> <span *ngIf="item?.count === 1">{{item.name | titlecase}}</span> <span *ngIf="item?.count"> &nbsp;&nbsp;({{item?.count}})</span>
         </mat-chip>
     </mat-chip-list>
 
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.scss b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.scss
index 80724164c..c2120a3b5 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.scss
@@ -19,4 +19,8 @@
     border: 1px solid #1b4ca1;
     background: rgba(0,116,182,.05)!important;
     color: #1b4ca1!important;
+}
+
+::ng-deep .mat-standard-chip {
+    cursor: pointer !important;
 }
\ No newline at end of file

From d9440f22f2e92a702be83b7eb1e89a3bfa302670 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Tue, 26 Dec 2023 15:32:14 +0530
Subject: [PATCH 379/887] optional variable fixes

---
 .../routes/create-content/create-content.component.ts         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
index 2091c482f..78843628e 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
@@ -66,7 +66,7 @@ export class CreateContentComponent implements OnInit {
             }
           })
           this.tpdsSvc.trainingPlanContentData.data.content.map((sitem: any, index: any) => {
-            if (sitem.selected) {
+            if (sitem && sitem.selected) {
               this.tpdsSvc.trainingPlanContentData.data.content.splice(index, 1)
               this.tpdsSvc.trainingPlanContentData.data.content.unshift(sitem)
             }
@@ -88,7 +88,7 @@ export class CreateContentComponent implements OnInit {
       this.selectedContentChips = this.tpdsSvc.trainingPlanContentData.data.content
       if (this.selectedContentChips) {
         this.selectedContentChips.map(sitem => {
-          if (sitem.selected) {
+          if (sitem && sitem.selected) {
             this.selectContentCount = this.selectContentCount + 1
           }
         })

From 28dbcbf0735a1a8e4b7d5536df33d952cd28792d Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Tue, 26 Dec 2023 15:52:11 +0530
Subject: [PATCH 380/887] optional variable fixes

---
 .../components/breadcrumb/breadcrumb.component.html  |  2 +-
 .../components/filter/filter.component.html          | 12 ++++++------
 .../create-assignee/create-assignee.component.ts     |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
index 31e630e39..ea0d80d74 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
@@ -14,7 +14,7 @@
         </div> -->
         <div class="action" *ngIf="tpdsSvc?.trainingPlanTitle &&
         selectedTab !== tabType.CREATE_PLAN && !validationList?.titleIsInvalid">
-            {{tpdsSvc?.trainingPlanTitle}}
+            {{tpdsSvc?.trainingPlanTitle | titlecase}}
         </div>
     </div>
     <div class="flex flex-1 flex-row right-breadcrumb" *ngIf="showBreadcrumbAction">
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
index 425906672..b4dbfd3e5 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
@@ -16,7 +16,7 @@
                             </mat-panel-title>
                         </mat-expansion-panel-header>
                         <div class="flex flex-1 flex-row category-item" *ngFor="let ctype of competencyTypeList">
-                            <mat-checkbox #checkboxes disableRipple class="example-margin" (change)="getCompetencyTheme($event, ctype)">{{ctype?.name}}</mat-checkbox>
+                            <mat-checkbox #checkboxes disableRipple class="example-margin" (change)="getCompetencyTheme($event, ctype)">{{ctype?.name | titlecase }}</mat-checkbox>
                         </div>
                     </mat-expansion-panel>
                 </mat-accordion>
@@ -38,7 +38,7 @@
                             </div>
                             <div class="category-content">
                                 <div class="flex flex-1 flex-row category-item" *ngFor="let ctitem of competencyThemeList | filterSearch: searchInput.value">
-                                    <mat-checkbox #checkboxes disableRipple class="example-margin"  [checked]="ctitem?.selected"  (change)="getCompetencySubTheme($event, ctitem)">{{ctitem?.name}}</mat-checkbox>
+                                    <mat-checkbox #checkboxes disableRipple class="example-margin"  [checked]="ctitem?.selected"  (change)="getCompetencySubTheme($event, ctitem)">{{ctitem?.name | titlecase}}</mat-checkbox>
                                 </div>                               
                             </div>
                         
@@ -62,7 +62,7 @@
                         </div>
                         <div class="category-content">
                             <div class="flex flex-1 flex-row category-item" *ngFor="let cstitem of competencySubThemeList | filterSearch: searchThemeInput.value">
-                                <mat-checkbox #checkboxes disableRipple class="example-margin" [checked]="cstitem?.selected"  (change)="manageCompetencySubTheme($event, cstitem)">{{cstitem?.name}}</mat-checkbox>
+                                <mat-checkbox #checkboxes disableRipple class="example-margin" [checked]="cstitem?.selected"  (change)="manageCompetencySubTheme($event, cstitem)">{{cstitem?.name | titlecase}}</mat-checkbox>
                             </div> 
                         </div>
                     </mat-expansion-panel>
@@ -79,7 +79,7 @@
                         </mat-expansion-panel-header>
                         <div class="category-content">
                             <div class="flex flex-1 flex-row category-item" *ngFor="let item of providersList">
-                                <mat-checkbox #checkboxes disableRipple class="example-margin" (change)="checkedProviders($event, item?.name)">{{item?.name}}</mat-checkbox>
+                                <mat-checkbox #checkboxes disableRipple class="example-margin" (change)="checkedProviders($event, item?.name)">{{item?.name | titlecase}}</mat-checkbox>
                             </div>
                         </div>
                     </mat-expansion-panel>
@@ -96,7 +96,7 @@
                             </mat-panel-title>
                         </mat-expansion-panel-header>
                         <div class="flex flex-1 flex-row category-item" *ngFor="let group of groupList">
-                            <mat-checkbox #checkboxes disableRipple class="example-margin" (change)="manageSelectedGroup($event, group)">{{group?.name}}</mat-checkbox>
+                            <mat-checkbox #checkboxes disableRipple class="example-margin" (change)="manageSelectedGroup($event, group)">{{group?.name | titlecase}}</mat-checkbox>
                         </div>
                     </mat-expansion-panel>
                 </mat-accordion>
@@ -110,7 +110,7 @@
                             </mat-panel-title>
                         </mat-expansion-panel-header>
                         <div class="flex flex-1 flex-row category-item" *ngFor="let des of designationList">
-                            <mat-checkbox #checkboxes disableRipple class="example-margin" (change)="manageSelectedDesignation($event, des)">{{des?.name}}</mat-checkbox>
+                            <mat-checkbox #checkboxes disableRipple class="example-margin" (change)="manageSelectedDesignation($event, des)">{{des?.name | titlecase}}</mat-checkbox>
                         </div>
                     </mat-expansion-panel>
                 </mat-accordion>
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
index 6c9fd63ae..16828a912 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
@@ -26,12 +26,12 @@ export class CreateAssigneeComponent implements OnInit {
       },
       {
         id: 2,
-        name: 'AllUser',
+        name: 'All User',
         value: 'AllUser',
       },
       {
         id: 3,
-        name: 'CustomUser',
+        name: 'Custom User',
         value: 'CustomUser',
       },
     ]

From 6c05717339605838a1c7f9e98d242aa5638ef84a Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Tue, 26 Dec 2023 17:19:57 +0530
Subject: [PATCH 381/887] done few more changes

---
 .../training-plan-dashboard.component.html    | 29 ++++----
 .../training-plan-dashboard.component.ts      | 74 +++++++++++++++----
 .../breadcrumb/breadcrumb.component.html      | 30 ++++----
 .../breadcrumb/breadcrumb.component.ts        | 41 ++++++----
 .../category-drop-down.component.ts           | 13 +++-
 .../components/search/search.component.html   | 15 ++--
 .../components/search/search.component.scss   |  6 ++
 .../components/search/search.component.ts     | 42 ++++++-----
 .../components/stepper/stepper.component.html |  7 +-
 .../components/stepper/stepper.component.scss |  6 ++
 .../components/stepper/stepper.component.ts   | 10 ++-
 .../create-assignee.component.html            |  2 +-
 .../create-assignee.component.scss            |  2 +-
 .../create-content.component.html             |  2 +-
 .../create-content.component.scss             |  2 +-
 .../create-plan/create-plan.component.ts      |  1 +
 .../create-timeline.component.html            | 20 +++--
 .../create-timeline.component.scss            |  6 ++
 .../create-timeline.component.ts              |  5 ++
 19 files changed, 213 insertions(+), 100 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html
index 874db2e1d..cabd16484 100644
--- a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html
@@ -1,29 +1,32 @@
 <div class="flex flex-4 flex-column">
   <mat-card>
     <div class="flex flex-between mat-h2 margin-remove">Training plan
-      <button mat-button type="button" class="create-cbp-btn" (click)="createCbp()">Create CBP</button>
+      <button mat-button type="button" class="create-cbp-btn" (click)="createCbp()" *ngIf="checkIfEnaled()">Create
+        CBP</button>
     </div>
     <mat-card-content>
       <div class="flex flex-1 flex-column margin-fix">
         <div class="flex flex-1 filter max-height-60">
-          <a routerLinkActive="router-link-active" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'live',
-                    'ws-mat-accent-border font-medium':currentFilter !== 'live'}" mat-button
-            (click)="filter('live'); tabTelemetry('live', 0)" role="button">Live</a>
-          <a routerLinkActive="router-link-active" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'draft',
-                                'ws-mat-accent-border font-medium':currentFilter !== 'draft'}" mat-button
-            (click)="filter('draft'); tabTelemetry('draft', 1)" role="button">Drafts</a>
+          <a routerLinkActive="router-link-active" class="filter-option"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'live', 'ws-mat-accent-border font-medium':currentFilter !== 'live'}"
+            mat-button (click)="tabNavigate('live'); tabTelemetry('live', 0)" role="button">Live</a>
+          <a routerLinkActive="router-link-active" class="filter-option" *ngIf="checkIfEnaled()"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'draft', 'ws-mat-accent-border font-medium':currentFilter !== 'draft'}"
+            mat-button (click)="tabNavigate('draft'); tabTelemetry('draft', 1)" role="button">Drafts</a>
         </div>
       </div>
       <ng-container class="margin-top-l">
         <ws-widget-org-user-table [tableData]="tabledata" [data]="trainingPlanData" [isTrainingPlan]="true"
-          [trainingTagList]="tagListData" *ngIf="currentFilter === 'live' && fetchContentDone"
-          (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuSelected($event)"
-          (tagSelectedData)="filterDataAsPerTab($event)">
+          [trainingTagList]="tagListData" [actionMenuItem]="pageConfig.data.actionMenu" [userId]="currentUser"
+          [createCbpPlanEnable]="checkIfEnaled()" (eOnButtonClick)="clickHandler($event)"
+          (actionsClick)="menuSelected($event)" (tagSelectedData)="filterDataAsPerTab($event)"
+          *ngIf="currentFilter === 'live' && fetchContentDone">
         </ws-widget-org-user-table>
         <ws-widget-org-user-table [tableData]="tabledata" [data]="trainingPlanData" [isTrainingPlan]="true"
-          [trainingTagList]="tagListData" *ngIf="currentFilter === 'draft' && fetchContentDone"
-          (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuSelected($event)"
-          (tagSelectedData)="filterDataAsPerTab($event)" [actionMenuItem]="pageConfig.data.actionMenu">
+          [trainingTagList]="tagListData" [actionMenuItem]="pageConfig.data.actionMenu" [userId]="currentUser"
+          [createCbpPlanEnable]="checkIfEnaled()" (eOnButtonClick)="clickHandler($event)"
+          (actionsClick)="menuSelected($event)" (tagSelectedData)="filterDataAsPerTab($event)"
+          *ngIf="currentFilter === 'draft' && fetchContentDone">
         </ws-widget-org-user-table>
       </ng-container>
     </mat-card-content>
diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
index 6e4c7dff1..e1f2cbafa 100644
--- a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
@@ -27,7 +27,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
   tagListData: any = [{
     name: 'Designation',
     value: 'Designation',
-    selected: true,
+    selected: false,
   }, {
     name: 'All users',
     value: 'AllUser',
@@ -40,8 +40,11 @@ export class TrainingPlanDashboardComponent implements OnInit {
   fetchContentDone!: boolean
   completeDataRes: any
   dialogRef: any
-  conficSvc: any
+  configSvc: any
   pageConfig: any
+  currentUser: any
+  urlQueryParams: any
+  currentTab = 'Designation'
 
   constructor(
     // private events: EventService,
@@ -57,7 +60,14 @@ export class TrainingPlanDashboardComponent implements OnInit {
   }
 
   ngOnInit() {
-    this.conficSvc = this.activeRoute.snapshot.data['configService']
+    this.configSvc = this.activeRoute.snapshot.data['configService']
+    this.currentUser = this.configSvc.userProfile && this.configSvc.userProfile.userId
+    this.activeRoute.queryParams.subscribe((res: any) => {
+      this.urlQueryParams = res
+    })
+    if (Object.keys(this.urlQueryParams).length) {
+      this.currentFilter = this.urlQueryParams.type
+    }
     this.pageConfig = this.activeRoute.snapshot.data['pageData']
     this.hasAccess()
     this.tabledata = {
@@ -80,7 +90,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
       actionColumnName: 'Action',
       cbpPlanMenu: true,
     }
-    this.filter('live')
+    this.filter(this.currentFilter)
   }
 
   tabSelected(item: string) {
@@ -96,13 +106,23 @@ export class TrainingPlanDashboardComponent implements OnInit {
 
   filter(filter: string) {
     this.fetchContentDone = false
-    this.tagListData.map((item: any) => {
-      if (item.value === 'Designation') {
-        item.selected = true
-      } else {
-        item.selected = false
-      }
-    })
+    if (Object.keys(this.urlQueryParams).length) {
+      this.tagListData.map((ele: any) => {
+        ele.selected = false
+        if (this.urlQueryParams.tabSelected === ele.value) {
+          this.currentTab = ele.value
+          ele.selected = true
+        }
+      })
+    } else {
+      this.tagListData.map((item: any) => {
+        if (item.value === this.currentTab) {
+          item.selected = true
+        } else {
+          item.selected = false
+        }
+      })
+    }
     this.currentFilter = filter
     this.filterData()
   }
@@ -160,7 +180,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
     const draftRes = await this.trainingDashboardSvc.getUserList(req).toPromise().catch(_error => { })
     if (draftRes.params && draftRes.params.status && draftRes.params.status === 'success') {
       this.completeDataRes = draftRes.result.content
-      this.trainingPlanData = this.completeDataRes.filter((v: any) => v.userType === 'Designation')
+      this.trainingPlanData = this.completeDataRes.filter((v: any) => v.userType === this.currentTab)
       this.convertDataAsPerTable()
     } else {
       this.loaderService.changeLoaderState(false)
@@ -173,6 +193,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
       res.assigneeCount = (res.userType === 'AllUser') ? 'All Users' : (res.userDetails) ? res.userDetails.length : 0
       res.endDate = (res.endDate) ? moment(res.endDate).format('MMM DD[,] YYYY') : ''
       res.updatedAt = (res.updatedAt) ? moment(res.updatedAt).format('MMM DD[,] YYYY') : ''
+      res.createdByName = (res.createdBy === this.configSvc.userProfileV2.userId) ? 'You' : res.createdByName
     })
     this.fetchContentDone = true
     this.loaderService.changeLoaderState(false)
@@ -252,7 +273,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
   }
 
   publishContentData(_selectedRow: any) {
-    this.loaderService.changeLoaderState(false)
+    this.loaderService.changeLoaderState(true)
     const obj = {
       request: {
         id: _selectedRow.id,
@@ -263,7 +284,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
       if (data && data.params && data.params.status && data.params.status.toLowerCase() === 'success') {
         this.snackBar.open('CBP plan published successfully.')
         this.loaderService.changeLoaderState(false)
-        this.filterData()
+        this.tabNavigate('live', _selectedRow.assignmentType)
       } else {
         this.snackBar.open('Something went wrong while publishing CBP plan. Try again later')
         this.loaderService.changeLoaderState(false)
@@ -292,11 +313,34 @@ export class TrainingPlanDashboardComponent implements OnInit {
   }
 
   hasAccess() {
+    let flag = false
     if (this.pageConfig && this.pageConfig.data && this.pageConfig.data.actionMenu) {
       this.pageConfig.data.actionMenu.map((_v: any) => {
-        debugger
+        flag = false
+        _v.enabledFor.forEach((ele: any) => {
+          if (this.configSvc.userRoles.has(ele)) {
+            flag = true
+          }
+        })
+        _v.userAccess = flag
       })
     }
   }
 
+  checkIfEnaled() {
+    if (this.configSvc.userRoles.has('mdo_leader')) {
+      return true
+    }
+    return false
+  }
+
+  tabNavigate(_item: any, _tabSelected?: any) {
+    this.router.navigate(['app', 'home', 'training-plan-dashboard'], {
+      queryParams: {
+        type: _item,
+        tabSelected: _tabSelected
+      }
+    })
+    this.filter(_item)
+  }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
index 31e630e39..0e66ddda6 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
@@ -24,22 +24,24 @@
         <button mat-button class="next-btn margin-left-m" (click)="nextStep()" *ngIf="tabType.CREATE_PLAN === selectedTab || tabType.ADD_CONTENT === selectedTab
             || tabType.ADD_ASSIGNEE === selectedTab" [disabled]="checkIfDisabled()"
             [ngClass]="{'btn-disabled': checkIfDisabled()}">
-            <span *ngIf="!editState">Next: {{(tabType.CREATE_PLAN === selectedTab) ? 'Add Content' : (tabType.ADD_CONTENT === selectedTab)
+            <span *ngIf="!editState">Next: {{(tabType.CREATE_PLAN === selectedTab) ? 'Add Content' :
+                (tabType.ADD_CONTENT === selectedTab)
                 ? 'Add Assignee' : (tabType.ADD_ASSIGNEE === selectedTab) ? 'Add Timeline' : ''}}</span>
-            <span *ngIf="editState">Next: {{(tabType.CREATE_PLAN === selectedTab) ? 'Edit Content' : (tabType.ADD_CONTENT === selectedTab)
-                    ? 'Edit Assignee' : (tabType.ADD_ASSIGNEE === selectedTab) ? 'Edit Timeline' : ''}}</span>
+            <span *ngIf="editState">Next: {{(tabType.CREATE_PLAN === selectedTab) ? 'Edit Content' :
+                (tabType.ADD_CONTENT === selectedTab)
+                ? 'Edit Assignee' : (tabType.ADD_ASSIGNEE === selectedTab) ? 'Edit Timeline' : ''}}</span>
         </button>
         <ng-container *ngIf="!editState">
-        <button mat-button class="next-btn margin-left-m" (click)="createPlanDraftView()"
-            *ngIf="tabType.ADD_TIMELINE === selectedTab && !checkForDraftStatus()">
-            <span>Save as Draft</span>
-        </button>
-    </ng-container>
-    <ng-container *ngIf="editState">
-        <button mat-button class="next-btn margin-left-m" (click)="updatePlan()"
-            *ngIf="tabType.ADD_TIMELINE === selectedTab && checkForDraftStatus()">
-            <span>Update Draft</span>
-        </button>
-    </ng-container>
+            <button mat-button class="next-btn margin-left-m" (click)="createPlanDraftView()"
+                *ngIf="tabType.ADD_TIMELINE === selectedTab && !checkForDraftStatus()">
+                <span>Save as Draft</span>
+            </button>
+        </ng-container>
+        <ng-container *ngIf="editState">
+            <button mat-button class="next-btn margin-left-m" (click)="updatePlan()"
+                *ngIf="tabType.ADD_TIMELINE === selectedTab">
+                <span>Update Draft</span>
+            </button>
+        </ng-container>
     </div>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
index bdcbac59b..490791cfb 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
@@ -28,7 +28,7 @@ export class BreadcrumbComponent implements OnInit {
     private tpSvc: TrainingPlanService) { }
 
   ngOnInit() {
-    this.editState = this.activeRoute.snapshot.data['contentData'] ? true :  false
+    this.editState = this.activeRoute.snapshot.data['contentData'] ? true : false
     this.checkIfDisabled()
   }
 
@@ -65,8 +65,16 @@ export class BreadcrumbComponent implements OnInit {
 
   performRoute(route: any) {
     if (route === 'list') {
-      this.tpdsSvc.trainingPlanTitle = ''
-      this.router.navigateByUrl('app/home/training-plan-dashboard')
+      if (this.editState) {
+        this.router.navigate(['app', 'home', 'training-plan-dashboard'], {
+          queryParams: {
+            type: this.tpdsSvc.trainingPlanStepperData.status.toLowerCase(),
+            tabSelected: this.tpdsSvc.trainingPlanStepperData.assignmentType
+          }
+        })
+      } else {
+        this.router.navigate(['app', 'home', 'training-plan-dashboard'])
+      }
     } else {
       this.router.navigateByUrl(`app/training-plan/${route}`)
     }
@@ -131,7 +139,12 @@ export class BreadcrumbComponent implements OnInit {
       setTimeout(() => {
         this.dialogRef.close()
         this.tpdsSvc.trainingPlanTitle = ''
-        this.router.navigateByUrl('app/home/training-plan-dashboard')
+        this.router.navigate(['app', 'home', 'training-plan-dashboard'], {
+          queryParams: {
+            type: 'draft',
+            tabSelected: this.tpdsSvc.trainingPlanStepperData.assignmentType
+          }
+        })
       }, 1000)
     })
   }
@@ -149,14 +162,6 @@ export class BreadcrumbComponent implements OnInit {
     return true
   }
 
-  checkForDraftStatus() {
-    if (this.tpdsSvc.trainingPlanStepperData && this.tpdsSvc.trainingPlanStepperData.status
-      && this.tpdsSvc.trainingPlanStepperData.status.toLowerCase() === 'draft') {
-      return true
-    }
-    return false
-  }
-
   updatePlan() {
     this.tpdsSvc.trainingPlanStepperData.name = this.tpdsSvc.trainingPlanTitle
     if (this.tpdsSvc.trainingPlanStepperData.assignmentType === 'AllUser') {
@@ -165,6 +170,11 @@ export class BreadcrumbComponent implements OnInit {
       ]
     }
     const obj: any = { request: { ...this.tpdsSvc.trainingPlanStepperData, id: this.activeRoute.snapshot.data['contentData'].id } }
+    if (obj.request.status.toLowerCase() === 'live') {
+      delete obj.request.contentList
+      delete obj.request.contentType
+      delete obj.request.assignmentType
+    }
     delete obj.request.status
     this.showDialogBox('progress')
     this.tpSvc.updatePlan(obj).subscribe((_data: any) => {
@@ -173,7 +183,12 @@ export class BreadcrumbComponent implements OnInit {
       setTimeout(() => {
         this.dialogRef.close()
         this.tpdsSvc.trainingPlanTitle = ''
-        this.router.navigateByUrl('app/home/training-plan-dashboard')
+        this.router.navigate(['app', 'home', 'training-plan-dashboard'], {
+          queryParams: {
+            type: this.tpdsSvc.trainingPlanStepperData.status.toLowerCase(),
+            tabSelected: this.tpdsSvc.trainingPlanStepperData.assignmentType
+          }
+        })
       }, 1000)
     })
   }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
index 3c5643c96..1ca33e65d 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
@@ -37,9 +37,14 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
 
   ngOnChanges() {
     if (this.from === 'content') {
-      this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = 'Course'
-      this.selectedValue = 'Course'
-      this.handleCategorySelection.emit('Course')
+      if (this.trainingPlanDataSharingService.trainingPlanStepperData['contentType']) {
+        this.selectedValue = this.trainingPlanDataSharingService.trainingPlanStepperData['contentType']
+        this.handleCategorySelection.emit(this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'])
+      } else {
+        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = 'Course'
+        this.selectedValue = 'Course'
+        this.handleCategorySelection.emit('Course')
+      }
     } else if (this.from === 'assignee') {
       if (this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType']) {
         this.selectedValue = this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType']
@@ -181,7 +186,7 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['primaryAction'] = 'I understand, change user type'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'AllUser'
-        this.trainingPlanDataSharingService.trainingPlanAssigneeData.category = 'AllUser';
+        this.trainingPlanDataSharingService.trainingPlanAssigneeData.category = 'AllUser'
         this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType'] = event
         if (this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.length) {
           this.openDialoagBox(dialogData)
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
index e35019235..09f0d5e24 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
@@ -2,18 +2,21 @@
     <!-- Category Drop down -->
     <ng-container>
         <ws-app-category-drop-down [categoryData]="categoryData" [from]="from"
-            (handleCategorySelection)="handleCategorySelection($event)"></ws-app-category-drop-down>
+            (handleCategorySelection)="handleCategorySelection($event)"
+            [ngClass]="{'disable': isContentLive}"></ws-app-category-drop-down>
     </ng-container>
-    <div class="search flex w-full margin-left-xl margin-right-xl">
+    <div class="search flex w-full margin-left-xl margin-right-xl" [ngClass]="{'disable': isContentLive}">
         <div class="rsearch flex w-full"><mat-icon
                 class="color-60 search-icon mat-icon notranslate material-icons mat-icon-no-color">search</mat-icon>
-            <input class="sinput color-60 w-full margin-right-m" [(ngModel)]="searchText" (keyup.enter)="searchData()" label="" placeholder="Select"
-                type="Standard">
+            <input class="sinput color-60 w-full margin-right-m" [(ngModel)]="searchText" (keyup.enter)="searchData()"
+                label="" placeholder="Select" type="Standard" [ngClass]="{'disable': isContentLive}">
         </div>
-        <button mat-button type="button" class="search-btn" (click)="searchData()">Search</button>
+        <button mat-button type="button" class="search-btn" (click)="searchData()"
+            [ngClass]="{'disable': isContentLive}">Search</button>
     </div>
     <div class="filter-section flex flex-end" *ngIf="!(tpdsSvc?.trainingPlanAssigneeData?.category === 'Designation'
-    || tpdsSvc?.trainingPlanAssigneeData?.category === 'AllUser') || from === 'content'">
+    || tpdsSvc?.trainingPlanAssigneeData?.category === 'AllUser') || from === 'content'"
+        [ngClass]="{'disable': isContentLive}">
         <button mat-button type="button" (click)="openFilter()" class="apply-filter">
             <mat-icon class="margin-right-xs">filter_list</mat-icon> Apply Filters
         </button>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.scss b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.scss
index 800491838..e26021df2 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.scss
@@ -38,4 +38,10 @@
 
 .btn-disabled {
     background: rgba(0, 0, 0, 0.16) !important;
+}
+
+.disable {
+  opacity: 0.3;
+  pointer-events: none;
+  cursor: none;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 8270cbd6a..3f217a1fc 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -22,6 +22,7 @@ export class SearchComponent implements OnInit {
   designationList: any[] = [];
   pageIndex = 0;
   pageSize = 20;
+  isContentLive: boolean = false
   constructor(@Inject(DOCUMENT) private document: Document,
     private trainingPlanService: TrainingPlanService,
     private route: ActivatedRoute,
@@ -30,18 +31,21 @@ export class SearchComponent implements OnInit {
   ) { }
 
   ngOnInit() {
-    this.tpdsSvc.handleContentPageChange.subscribe((pageData:any)=>{
-      if(pageData) {
-        this.pageIndex = pageData.pageIndex;
-        this.pageSize = pageData.pageSize;
-        this.getContent(this.selectedDropDownValue);
+    this.tpdsSvc.handleContentPageChange.subscribe((pageData: any) => {
+      if (pageData) {
+        this.pageIndex = pageData.pageIndex
+        this.pageSize = pageData.pageSize
+        this.getContent(this.selectedDropDownValue)
       }
-      
+
     })
+    if (this.tpdsSvc.trainingPlanStepperData.status && this.tpdsSvc.trainingPlanStepperData.status.toLowerCase() === 'live') {
+      this.isContentLive = true
+    }
   }
 
   ngOnChanges() {
-    
+
   }
 
   openFilter() {
@@ -64,7 +68,7 @@ export class SearchComponent implements OnInit {
   handleCategorySelection(event: any) {
     this.selectedDropDownValue = event
     this.tpdsSvc.clearFilter.next(true)
-    this.resetPageIndex();
+    this.resetPageIndex()
     switch (this.from) {
       case 'content':
         event = !event ? 'Course' : event
@@ -120,15 +124,15 @@ export class SearchComponent implements OnInit {
         //     data: { content: _.uniqBy(_.concat(this.tpdsSvc.trainingPlanContentData.data.content, res.content), 'identifier') }
         //   }
         // } else {
-          console.log('res', res, this.pageIndex);
-          if(this.pageIndex) {
-            let result = { count: res.count , content : this.tpdsSvc.trainingPlanContentData.data.content.concat(res.content) };
-            console.log(result);
-            this.tpdsSvc.trainingPlanContentData = { category: contentType, data: result, count: res.count }
-          } else {
-            this.tpdsSvc.trainingPlanContentData = { category: contentType, data: res, count: res.count }
-          }
-          console.log(this.tpdsSvc.trainingPlanContentData)
+        console.log('res', res, this.pageIndex)
+        if (this.pageIndex) {
+          let result = { count: res.count, content: this.tpdsSvc.trainingPlanContentData.data.content.concat(res.content) }
+          console.log(result)
+          this.tpdsSvc.trainingPlanContentData = { category: contentType, data: result, count: res.count }
+        } else {
+          this.tpdsSvc.trainingPlanContentData = { category: contentType, data: res, count: res.count }
+        }
+        console.log(this.tpdsSvc.trainingPlanContentData)
         // }
         this.handleApiData.emit(true)
         this.loadingService.changeLoaderState(false)
@@ -230,8 +234,8 @@ export class SearchComponent implements OnInit {
   }
 
   resetPageIndex() {
-    this.pageIndex = 0;
-    this.pageSize = 20;
+    this.pageIndex = 0
+    this.pageSize = 20
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
index 64b2deb48..2a47274f7 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
@@ -16,12 +16,13 @@
                 </span>
             </ng-template>
             <ng-template matTabContent>
-                <ws-app-create-content (addContentInvalid)="checkForaddContent($event)"></ws-app-create-content>
+                <ws-app-create-content (addContentInvalid)="checkForaddContent($event)"
+                    [ngClass]="{'disable': isContentLive}"></ws-app-create-content>
             </ng-template>
         </mat-tab>
         <mat-tab [label]="tabType.ADD_ASSIGNEE" [disabled]="addCotnentDisable || addAssigneeDisable">
             <ng-template mat-tab-label>
-                <span>3.  <span *ngIf="!editState">Add</span><span *ngIf="editState">Edit</span> Assignee</span>
+                <span>3. <span *ngIf="!editState">Add</span><span *ngIf="editState">Edit</span> Assignee</span>
             </ng-template>
             <ng-template matTabContent>
                 <ws-app-create-assignee (addAssigneeInvalid)="checkForaddAssignee($event)"
@@ -31,7 +32,7 @@
         <mat-tab [label]="tabType.ADD_TIMELINE"
             [disabled]="addCotnentDisable || addAssigneeDisable || addTimelineDisable">
             <ng-template mat-tab-label>
-                <span>4.  <span *ngIf="!editState">Add</span><span *ngIf="editState">Edit</span> Timeline</span>
+                <span>4. <span *ngIf="!editState">Add</span><span *ngIf="editState">Edit</span> Timeline</span>
             </ng-template>
             <ng-template matTabContent>
                 <ws-app-create-timeline></ws-app-create-timeline>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.scss b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.scss
index 126153f7a..e50d22ba5 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.scss
@@ -141,4 +141,10 @@
 
 .overflow-none {
     overflow: unset !important;
+}
+
+.disable {
+  opacity: 0.3;
+  pointer-events: none;
+  cursor: none;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
index 7a5a332e2..a76910e2d 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
@@ -1,6 +1,7 @@
 import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core'
 import { TrainingPlanContent } from '../../models/training-plan.model'
 import { ActivatedRoute } from '@angular/router'
+import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
 @Component({
   selector: 'ws-app-stepper',
   templateUrl: './stepper.component.html',
@@ -20,11 +21,16 @@ export class StepperComponent implements OnInit, OnChanges {
   addAssigneeDisable = true
   addTimelineDisable = true
   editState = false;
-  constructor( private route : ActivatedRoute
+  isContentLive: boolean = false
+  constructor(private route: ActivatedRoute,
+    private tpdsSvc: TrainingPlanDataSharingService
   ) { }
 
   ngOnInit() {
-    this.editState = this.route.snapshot.data['contentData'] ? true :  false
+    this.editState = this.route.snapshot.data['contentData'] ? true : false
+    if (this.tpdsSvc.trainingPlanStepperData.status && this.tpdsSvc.trainingPlanStepperData.status.toLowerCase() === 'live') {
+      this.isContentLive = true
+    }
   }
 
   ngOnChanges() {
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
index 933c94924..ad40a049f 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
@@ -14,7 +14,7 @@
 
 <ng-container *ngIf="trainingPlanDataSharingService?.trainingPlanAssigneeData?.category === 'AllUser'">
     <div class="no-cbp-data margin-top-xl margin-bottom-xl">
-        <div><img src="/assets/icons/no-data.svg"></div>
+        <div><img src="/assets/images/no-content-data.svg"></div>
         <div class="mat-subheading-1 margin-remove">It will assign to all users</div>
         <div>By selecting all users, you've selected all the users from your Department of fisheries.</div>
         <div class="margin-top-m">
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.scss b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.scss
index 0b7b50228..8ea59d1c4 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.scss
@@ -4,7 +4,7 @@
   text-align: center;
 
   img {
-    width: 190px;
+    width: auto;
   }
 
   .small-text {
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
index faf046de6..1c9f580b3 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
@@ -15,7 +15,7 @@
         </div>
     </div>
     <div class="no-cbp-data margin-top-xl margin-bottom-xl" *ngIf="!(contentData) || !(contentData?.length)">
-        <div><img src="/assets/icons/no-data.svg"></div>
+        <div><img src="/assets/images/no-content-data.svg"></div>
         <div class="mat-subheading-1 margin-remove">No content avaliable.</div>
         <!-- <div>Create a content in CBP portal to get the contents.</div> -->
     </div>
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.scss b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.scss
index 0b7b50228..8ea59d1c4 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.scss
@@ -4,7 +4,7 @@
   text-align: center;
 
   img {
-    width: 190px;
+    width: auto;
   }
 
   .small-text {
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
index c5c59b18e..de4b0aa79 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
@@ -41,6 +41,7 @@ export class CreatePlanComponent implements OnInit, OnDestroy {
           this.tpdsSvc.trainingPlanStepperData['contentList'].push(ele.identifier)
         })
       }
+      this.tpdsSvc.trainingPlanStepperData['contentType'] = contentData.contentType
       this.tpdsSvc.trainingPlanStepperData['assignmentType'] = contentData.assignmentType
       this.tpdsSvc.trainingPlanStepperData['assignmentTypeInfo'] = contentData.assignmentTypeInfo
       this.tpdsSvc.trainingPlanStepperData['endDate'] = contentData.endDate
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
index 73bb9d755..7a9b29e6d 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
@@ -4,21 +4,27 @@
 <ng-container *ngIf="contentData.length">
     <div class="margin-top-xl">
         <div class="flex flex-middle flex-between">
-            <div class="mat-subheading-1 margin-remove">Selected Content <span *ngIf="contentData.length">( {{contentData.length }} )</span></div>
-            <a mat-button (click)="showAll('content')" class="show-all">Show all <mat-icon>keyboard_arrow_right</mat-icon></a>
+            <div class="mat-subheading-1 margin-remove">Selected Content <span *ngIf="contentData.length">(
+                    {{contentData.length }} )</span></div>
+            <a mat-button (click)="showAll('content')" class="show-all">Show all
+                <mat-icon>keyboard_arrow_right</mat-icon></a>
         </div>
     </div>
-    <ws-app-standard-card [checkboxVisibility]="false" [contentData]="contentData" [showDeleteFlag]="true"></ws-app-standard-card>
+    <ws-app-standard-card [checkboxVisibility]="false" [contentData]="contentData" [showDeleteFlag]="true"
+        [ngClass]="{'disable': isContentLive}"></ws-app-standard-card>
 </ng-container>
 <ng-container *ngIf="assigneeData && (assigneeData?.data?.length || assigneeData?.data?.content.length)">
     <div class="margin-top-xl">
         <div class=" flex flex-middle flex-between">
-            <div class="mat-subheading-1 margin-remove">Selected Assignee 
+            <div class="mat-subheading-1 margin-remove">Selected Assignee
                 <span *ngIf="assigneeData && (assigneeData?.data?.length || assigneeData?.data?.content.length)">
                     ( {{(assigneeData?.data?.length) || (assigneeData?.data?.content.length)}} )
-                </span></div>
-            <a mat-button (click)="showAll('assignee')" class="show-all">Show all <mat-icon>keyboard_arrow_right</mat-icon></a>
+                </span>
+            </div>
+            <a mat-button (click)="showAll('assignee')" class="show-all">Show all
+                <mat-icon>keyboard_arrow_right</mat-icon></a>
         </div>
     </div>
-    <ws-app-user-card [checkboxVisibility]="false" [assigneeData]="assigneeData" [showDeleteFlag]="true"></ws-app-user-card>
+    <ws-app-user-card [checkboxVisibility]="false" [assigneeData]="assigneeData"
+        [showDeleteFlag]="true"></ws-app-user-card>
 </ng-container>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.scss b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.scss
index 6cbf52325..5902073d2 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.scss
@@ -1,3 +1,9 @@
 .show-all {
     color: #1b4ca1 !important;
+}
+
+.disable {
+  opacity: 0.3;
+  pointer-events: none;
+  cursor: none;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
index 40232109e..a11b3f068 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
@@ -9,9 +9,14 @@ import { TrainingPlanDataSharingService } from '../../services/training-plan-dat
 export class CreateTimelineComponent implements OnInit {
   contentData: any[] = []
   assigneeData: any
+  isContentLive: boolean = false
   constructor(private router: Router, private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
+    if (this.trainingPlanDataSharingService.trainingPlanStepperData.status &&
+      this.trainingPlanDataSharingService.trainingPlanStepperData.status.toLowerCase() === 'live') {
+      this.isContentLive = true
+    }
     if (this.trainingPlanDataSharingService.trainingPlanContentData &&
       this.trainingPlanDataSharingService.trainingPlanContentData.data &&
       this.trainingPlanDataSharingService.trainingPlanContentData.data.content

From 4e6671af596951bad530226cc4069766144991ab Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Tue, 26 Dec 2023 20:36:33 +0530
Subject: [PATCH 382/887] some more changes after demo

---
 .../training-plan-dashboard.component.html     | 18 ++++++++----------
 .../training-plan-dashboard.component.ts       | 17 ++++++++---------
 .../breadcrumb/breadcrumb.component.html       |  2 +-
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html
index cabd16484..5c7e011a5 100644
--- a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html
@@ -1,7 +1,7 @@
 <div class="flex flex-4 flex-column">
   <mat-card>
     <div class="flex flex-between mat-h2 margin-remove">Training plan
-      <button mat-button type="button" class="create-cbp-btn" (click)="createCbp()" *ngIf="checkIfEnaled()">Create
+      <button mat-button type="button" class="create-cbp-btn" (click)="createCbp()">Create
         CBP</button>
     </div>
     <mat-card-content>
@@ -9,24 +9,22 @@
         <div class="flex flex-1 filter max-height-60">
           <a routerLinkActive="router-link-active" class="filter-option"
             [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'live', 'ws-mat-accent-border font-medium':currentFilter !== 'live'}"
-            mat-button (click)="tabNavigate('live'); tabTelemetry('live', 0)" role="button">Live</a>
-          <a routerLinkActive="router-link-active" class="filter-option" *ngIf="checkIfEnaled()"
+            mat-button (click)="tabNavigate('live', 'Designation'); tabTelemetry('live', 0)" role="button">Live</a>
+          <a routerLinkActive="router-link-active" class="filter-option"
             [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'draft', 'ws-mat-accent-border font-medium':currentFilter !== 'draft'}"
-            mat-button (click)="tabNavigate('draft'); tabTelemetry('draft', 1)" role="button">Drafts</a>
+            mat-button (click)="tabNavigate('draft', 'Designation'); tabTelemetry('draft', 1)" role="button">Drafts</a>
         </div>
       </div>
       <ng-container class="margin-top-l">
         <ws-widget-org-user-table [tableData]="tabledata" [data]="trainingPlanData" [isTrainingPlan]="true"
           [trainingTagList]="tagListData" [actionMenuItem]="pageConfig.data.actionMenu" [userId]="currentUser"
-          [createCbpPlanEnable]="checkIfEnaled()" (eOnButtonClick)="clickHandler($event)"
-          (actionsClick)="menuSelected($event)" (tagSelectedData)="filterDataAsPerTab($event)"
-          *ngIf="currentFilter === 'live' && fetchContentDone">
+          (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuSelected($event)"
+          (tagSelectedData)="filterDataAsPerTab($event)" *ngIf="currentFilter === 'live' && fetchContentDone">
         </ws-widget-org-user-table>
         <ws-widget-org-user-table [tableData]="tabledata" [data]="trainingPlanData" [isTrainingPlan]="true"
           [trainingTagList]="tagListData" [actionMenuItem]="pageConfig.data.actionMenu" [userId]="currentUser"
-          [createCbpPlanEnable]="checkIfEnaled()" (eOnButtonClick)="clickHandler($event)"
-          (actionsClick)="menuSelected($event)" (tagSelectedData)="filterDataAsPerTab($event)"
-          *ngIf="currentFilter === 'draft' && fetchContentDone">
+          (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuSelected($event)"
+          (tagSelectedData)="filterDataAsPerTab($event)" *ngIf="currentFilter === 'draft' && fetchContentDone">
         </ws-widget-org-user-table>
       </ng-container>
     </mat-card-content>
diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
index e1f2cbafa..db94a56b0 100644
--- a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
@@ -61,7 +61,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
 
   ngOnInit() {
     this.configSvc = this.activeRoute.snapshot.data['configService']
-    this.currentUser = this.configSvc.userProfile && this.configSvc.userProfile.userId
+    this.currentUser = this.configSvc.userProfileV2 && this.configSvc.userProfileV2.userId
     this.activeRoute.queryParams.subscribe((res: any) => {
       this.urlQueryParams = res
     })
@@ -193,7 +193,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
       res.assigneeCount = (res.userType === 'AllUser') ? 'All Users' : (res.userDetails) ? res.userDetails.length : 0
       res.endDate = (res.endDate) ? moment(res.endDate).format('MMM DD[,] YYYY') : ''
       res.updatedAt = (res.updatedAt) ? moment(res.updatedAt).format('MMM DD[,] YYYY') : ''
-      res.createdByName = (res.createdBy === this.configSvc.userProfileV2.userId) ? 'You' : res.createdByName
+      res.createdByName = (res.createdBy === this.currentUser) ? 'You' : res.createdByName
     })
     this.fetchContentDone = true
     this.loaderService.changeLoaderState(false)
@@ -320,6 +320,12 @@ export class TrainingPlanDashboardComponent implements OnInit {
         _v.enabledFor.forEach((ele: any) => {
           if (this.configSvc.userRoles.has(ele)) {
             flag = true
+            if (ele === 'mdo_leader') {
+              _v.isMdoLeader = true
+            }
+            if (ele === 'mdo_admin') {
+              _v.isMdoAdmin = true
+            }
           }
         })
         _v.userAccess = flag
@@ -327,13 +333,6 @@ export class TrainingPlanDashboardComponent implements OnInit {
     }
   }
 
-  checkIfEnaled() {
-    if (this.configSvc.userRoles.has('mdo_leader')) {
-      return true
-    }
-    return false
-  }
-
   tabNavigate(_item: any, _tabSelected?: any) {
     this.router.navigate(['app', 'home', 'training-plan-dashboard'], {
       queryParams: {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
index 217b31b1f..5cdb56b52 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
@@ -33,7 +33,7 @@
         </button>
         <ng-container *ngIf="!editState">
             <button mat-button class="next-btn margin-left-m" (click)="createPlanDraftView()"
-                *ngIf="tabType.ADD_TIMELINE === selectedTab && !checkForDraftStatus()">
+                *ngIf="tabType.ADD_TIMELINE === selectedTab">
                 <span>Save as Draft</span>
             </button>
         </ng-container>

From 970fc12fe6ba4c48a89bca6deb7650034bd0d185 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Tue, 26 Dec 2023 22:38:52 +0530
Subject: [PATCH 383/887] update flow for content and assignee

---
 .../training-plan-dashboard.component.html    |  4 +-
 .../components/search/search.component.ts     | 40 +++++++++++++++----
 .../standard-card/standard-card.component.ts  |  2 +-
 .../create-timeline.component.ts              |  1 +
 .../preview-plan/preview-plan.component.ts    | 11 +++--
 5 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html
index 5c7e011a5..5f1eb7094 100644
--- a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html
@@ -17,12 +17,12 @@
       </div>
       <ng-container class="margin-top-l">
         <ws-widget-org-user-table [tableData]="tabledata" [data]="trainingPlanData" [isTrainingPlan]="true"
-          [trainingTagList]="tagListData" [actionMenuItem]="pageConfig.data.actionMenu" [userId]="currentUser"
+          [trainingTagList]="tagListData" [actionMenuItem]="pageConfig?.data?.actionMenu" [userId]="currentUser"
           (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuSelected($event)"
           (tagSelectedData)="filterDataAsPerTab($event)" *ngIf="currentFilter === 'live' && fetchContentDone">
         </ws-widget-org-user-table>
         <ws-widget-org-user-table [tableData]="tabledata" [data]="trainingPlanData" [isTrainingPlan]="true"
-          [trainingTagList]="tagListData" [actionMenuItem]="pageConfig.data.actionMenu" [userId]="currentUser"
+          [trainingTagList]="tagListData" [actionMenuItem]="pageConfig?.data?.actionMenu" [userId]="currentUser"
           (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuSelected($event)"
           (tagSelectedData)="filterDataAsPerTab($event)" *ngIf="currentFilter === 'draft' && fetchContentDone">
         </ws-widget-org-user-table>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 3f217a1fc..79f55812a 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -66,15 +66,23 @@ export class SearchComponent implements OnInit {
   }
 
   handleCategorySelection(event: any) {
+      
     this.selectedDropDownValue = event
     this.tpdsSvc.clearFilter.next(true)
     this.resetPageIndex()
     switch (this.from) {
       case 'content':
+        if(this.tpdsSvc.trainingPlanContentData && this.tpdsSvc.trainingPlanContentData.data) {
+          this.tpdsSvc.trainingPlanContentData.data = []
+        } 
         event = !event ? 'Course' : event
         this.getContent(event)
         break
       case 'assignee':
+        if(this.tpdsSvc.trainingPlanAssigneeData && this.tpdsSvc.trainingPlanAssigneeData.data) {
+          this.tpdsSvc.trainingPlanAssigneeData.data = []
+          this.tpdsSvc.trainingPlanStepperData['assignmentTypeInfo']=[]
+        } 
         event = !event ? 'Designation' : event
         if (event === 'Designation') {
           this.getDesignations(event)
@@ -124,14 +132,20 @@ export class SearchComponent implements OnInit {
         //     data: { content: _.uniqBy(_.concat(this.tpdsSvc.trainingPlanContentData.data.content, res.content), 'identifier') }
         //   }
         // } else {
-        console.log('res', res, this.pageIndex)
-        if (this.pageIndex) {
-          let result = { count: res.count, content: this.tpdsSvc.trainingPlanContentData.data.content.concat(res.content) }
+        let finResult = [];
+        if(this.tpdsSvc.trainingPlanContentData.data && this.tpdsSvc.trainingPlanContentData.data && this.tpdsSvc.trainingPlanContentData.data.content) {
+          finResult = this.tpdsSvc.trainingPlanContentData.data.content.filter((sitem:any)=>{
+            return sitem.selected
+          })
+        }
+        console.log('finResult', finResult);
+          let result = { count: res.count, content: _.uniqBy(_.concat(finResult, res.content), 'identifier') }
           console.log(result)
           this.tpdsSvc.trainingPlanContentData = { category: contentType, data: result, count: res.count }
-        } else {
-          this.tpdsSvc.trainingPlanContentData = { category: contentType, data: res, count: res.count }
-        }
+        
+        // else {
+        //   this.tpdsSvc.trainingPlanContentData = { category: contentType, data: res, count: res.count }
+        // }
         console.log(this.tpdsSvc.trainingPlanContentData)
         // }
         this.handleApiData.emit(true)
@@ -191,7 +205,19 @@ export class SearchComponent implements OnInit {
             return ditem
           }
         })
-        this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: resArr }
+        console.log(this.tpdsSvc.trainingPlanAssigneeData.data);
+        if(this.tpdsSvc.trainingPlanAssigneeData.data) {
+          let finArr = this.tpdsSvc.trainingPlanAssigneeData.data.filter((sitem:any)=>{
+            if(sitem.selected) {
+              return sitem
+            }            
+          })
+          console.log(finArr,resArr );
+          this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: _.concat(finArr, resArr)}  
+        } else {
+          this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: resArr}
+        }
+        
       } else {
         this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: res.result.response.content }
         this.designationList = res.result.response.content
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
index 0e81c81ef..7baee4af8 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
@@ -63,7 +63,7 @@ export class StandardCardComponent implements OnInit, OnChanges {
       if (this.trainingPlanDataSharingService.trainingPlanStepperData['contentList']) {
         this.trainingPlanDataSharingService.trainingPlanStepperData['contentList'].push(item.identifier)
       }
-
+      console.log(this.trainingPlanDataSharingService.trainingPlanContentData)
     } else {
       // this.selectedContent = this.selectedContent.filter( sitem  => sitem.identifier !== item.identifier)
       this.trainingPlanDataSharingService.trainingPlanContentData.data.content.map((sitem: any) => {
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
index a11b3f068..d93511307 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
@@ -13,6 +13,7 @@ export class CreateTimelineComponent implements OnInit {
   constructor(private router: Router, private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
+    console.log(this.trainingPlanDataSharingService.trainingPlanContentData);
     if (this.trainingPlanDataSharingService.trainingPlanStepperData.status &&
       this.trainingPlanDataSharingService.trainingPlanStepperData.status.toLowerCase() === 'live') {
       this.isContentLive = true
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
index 3b288784a..956f0704f 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
@@ -38,10 +38,13 @@ export class PreviewPlanComponent implements OnInit {
               "userId": "",
               "profileDetails": {"professionalDetails": [{designation: ""}]
             }};
-            obj.firstName = item.firstName;
-            obj.profileDetails.professionalDetails[0]['designation']= item.designation;
-            obj.userId = item.userId;
-            assignmentDataArr.push(obj);
+            if(item) {
+              obj.firstName = item.firstName;
+              obj.profileDetails.professionalDetails[0]['designation']= item.designation;
+              obj.userId = item.userId;
+              assignmentDataArr.push(obj);
+            }
+            
           })
           console.log('assignmentDataArr',assignmentDataArr)
           // const assigneeData = contentData.userDetails;

From a5fb9a29b3d1ea9a9e9d3c82f2e0d6abc4fdfcab Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Wed, 27 Dec 2023 00:24:49 +0530
Subject: [PATCH 384/887] changes as per demo

---
 .../training-plan-dashboard.component.ts      |  3 +-
 .../breadcrumb/breadcrumb.component.html      |  6 +-
 .../breadcrumb/breadcrumb.component.ts        | 15 ++-
 .../components/chip/chip.component.ts         | 65 +++++++-----
 .../preview-dialog-box.component.html         |  8 ++
 .../preview-dialog-box.component.scss         |  6 ++
 .../preview-dialog-box.component.spec.ts      | 25 +++++
 .../preview-dialog-box.component.ts           | 24 +++++
 .../components/search/search.component.ts     |  3 +
 .../create-assignee.component.html            | 15 ++-
 .../create-timeline.component.html            | 12 +--
 .../create-timeline.component.ts              | 24 ++++-
 .../preview-plan/preview-plan.component.html  | 29 +++---
 .../preview-plan/preview-plan.component.scss  |  5 +
 .../preview-plan/preview-plan.component.ts    | 98 +++++++++++--------
 .../training-plan/training-plan.module.ts     |  3 +
 16 files changed, 240 insertions(+), 101 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/preview-dialog-box/preview-dialog-box.component.html
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/preview-dialog-box/preview-dialog-box.component.scss
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/preview-dialog-box/preview-dialog-box.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/preview-dialog-box/preview-dialog-box.component.ts

diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
index db94a56b0..ac30332cc 100644
--- a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
@@ -149,7 +149,6 @@ export class TrainingPlanDashboardComponent implements OnInit {
   async getLiveData() {
     this.loaderService.changeLoaderState(true)
     this.trainingPlanData = []
-    this.trainingPlanData = []
     const req = {
       request: {
         filters: {
@@ -160,7 +159,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
     const liveRes = await this.trainingDashboardSvc.getUserList(req).toPromise().catch(_error => { })
     if (liveRes.params && liveRes.params.status && liveRes.params.status === 'success') {
       this.completeDataRes = liveRes.result.content
-      this.trainingPlanData = this.completeDataRes.filter((v: any) => v.userType === 'Designation')
+      this.trainingPlanData = this.completeDataRes.filter((v: any) => v.userType === this.currentTab)
       this.convertDataAsPerTable()
     } else {
       this.loaderService.changeLoaderState(false)
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
index 5cdb56b52..35de72f6a 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
@@ -33,13 +33,15 @@
         </button>
         <ng-container *ngIf="!editState">
             <button mat-button class="next-btn margin-left-m" (click)="createPlanDraftView()"
-                *ngIf="tabType.ADD_TIMELINE === selectedTab">
+                *ngIf="tabType.ADD_TIMELINE === selectedTab" [ngClass]="{'btn-disabled': checkIfValid()}"
+                [disabled]="checkIfValid()">
                 <span>Save as Draft</span>
             </button>
         </ng-container>
         <ng-container *ngIf="editState">
             <button mat-button class="next-btn margin-left-m" (click)="updatePlan()"
-                *ngIf="tabType.ADD_TIMELINE === selectedTab">
+                *ngIf="tabType.ADD_TIMELINE === selectedTab" [ngClass]="{'btn-disabled': checkIfValid()}"
+                [disabled]="checkIfValid()">
                 <span>Update Draft</span>
             </button>
         </ng-container>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
index 490791cfb..5f0f9d44a 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
@@ -126,11 +126,6 @@ export class BreadcrumbComponent implements OnInit {
 
   createPlanDraftView() {
     this.tpdsSvc.trainingPlanStepperData.name = this.tpdsSvc.trainingPlanTitle
-    if (this.tpdsSvc.trainingPlanStepperData.assignmentType === 'AllUser') {
-      this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo = [
-        "AllUser"
-      ]
-    }
     const obj = { request: this.tpdsSvc.trainingPlanStepperData }
     this.showDialogBox('progress')
     this.tpSvc.createPlan(obj).subscribe((_data: any) => {
@@ -192,4 +187,14 @@ export class BreadcrumbComponent implements OnInit {
       }, 1000)
     })
   }
+
+  checkIfValid() {
+    if (this.tpdsSvc.trainingPlanStepperData.contentList.length === 0 ||
+      this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo.length === 0 ||
+      !this.tpdsSvc.trainingPlanStepperData.endDate
+    ) {
+      return true
+    }
+    return false
+  }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
index 5476fcf07..73bcfbc1d 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
@@ -1,6 +1,7 @@
 import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core'
 import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
-import { Router } from '@angular/router'
+import { MatDialog } from '@angular/material'
+import { PreviewDialogBoxComponent } from '../preview-dialog-box/preview-dialog-box.component'
 @Component({
   selector: 'ws-app-chip',
   templateUrl: './chip.component.html',
@@ -14,7 +15,12 @@ export class ChipComponent implements OnInit, OnChanges {
   @Input() selectAssigneeCount = 0
   @Output() itemRemoved = new EventEmitter<any>()
 
-  constructor(public trainingPlanDataSharingService: TrainingPlanDataSharingService, private router: Router) { }
+  dialogRef: any
+
+  constructor(
+    public tpdsSvc: TrainingPlanDataSharingService,
+    public dialog: MatDialog
+  ) { }
 
   ngOnInit() {
   }
@@ -37,78 +43,85 @@ export class ChipComponent implements OnInit, OnChanges {
   clearAll() {
     if (this.from === 'content') {
       this.selectContentCount = 0
-      this.trainingPlanDataSharingService.trainingPlanContentData.data.content.map((sitem: any) => {
+      this.tpdsSvc.trainingPlanContentData.data.content.map((sitem: any) => {
         if (sitem['selected']) {
           sitem['selected'] = false
         }
       })
-      this.trainingPlanDataSharingService.trainingPlanStepperData.contentList = []
-      this.trainingPlanDataSharingService.trainingPlanStepperData.contentType = ''
+      this.tpdsSvc.trainingPlanStepperData.contentList = []
+      this.tpdsSvc.trainingPlanStepperData.contentType = ''
     }
     if (this.from === 'assignee') {
       this.selectAssigneeCount = 0
-      if (this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Designation') {
-        this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
+      if (this.tpdsSvc.trainingPlanAssigneeData.category === 'Designation') {
+        this.tpdsSvc.trainingPlanAssigneeData.data.map((sitem: any) => {
           if (sitem['selected']) {
             sitem['selected'] = false
           }
         })
-      } else if (this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'CustomUser') {
-        this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
+      } else if (this.tpdsSvc.trainingPlanAssigneeData.category === 'CustomUser') {
+        this.tpdsSvc.trainingPlanAssigneeData.data.map((sitem: any) => {
           if (sitem['selected']) {
             sitem['selected'] = false
           }
         })
       }
 
-      this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo = []
-      this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentType = ''
+      this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo = []
+      this.tpdsSvc.trainingPlanStepperData.assignmentType = ''
     }
     this.itemRemoved.emit(true)
   }
 
   removeContent(item: any) {
-    this.trainingPlanDataSharingService.trainingPlanContentData.data.content.map((sitem: any) => {
+    this.tpdsSvc.trainingPlanContentData.data.content.map((sitem: any) => {
       if (sitem['selected'] && sitem['identifier'] === item['identifier']) {
         sitem['selected'] = false
       }
     })
-    if (this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.indexOf(item['identifier']) > -1) {
-      const index = this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.findIndex((x: any) => x === item['identifier'])
-      this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.splice(index, 1)
+    if (this.tpdsSvc.trainingPlanStepperData.contentList.indexOf(item['identifier']) > -1) {
+      const index = this.tpdsSvc.trainingPlanStepperData.contentList.findIndex((x: any) => x === item['identifier'])
+      this.tpdsSvc.trainingPlanStepperData.contentList.splice(index, 1)
     }
     this.itemRemoved.emit(true)
   }
 
   removeAssignee(item: any) {
-    if (this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Designation') {
-      this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
+    if (this.tpdsSvc.trainingPlanAssigneeData.category === 'Designation') {
+      this.tpdsSvc.trainingPlanAssigneeData.data.map((sitem: any) => {
         if (sitem['selected'] && sitem['id'] === item['id']) {
           sitem['selected'] = false
         }
       })
-      if (this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.indexOf(item['identifier']) > -1) {
+      if (this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo.indexOf(item['identifier']) > -1) {
         const index =
-          this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.findIndex((x: any) => x === item['id'])
-        this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.splice(index, 1)
+          this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo.findIndex((x: any) => x === item['id'])
+        this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo.splice(index, 1)
       }
-    } else if (this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'CustomUser') {
-      this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
+    } else if (this.tpdsSvc.trainingPlanAssigneeData.category === 'CustomUser') {
+      this.tpdsSvc.trainingPlanAssigneeData.data.map((sitem: any) => {
         if (sitem['selected'] && sitem['userId'] === item['userId']) {
           sitem['selected'] = false
         }
       })
-      if (this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.indexOf(item['identifier']) > -1) {
+      if (this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo.indexOf(item['identifier']) > -1) {
         const index =
-          this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.findIndex((x: any) => x === item['userId'])
-        this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.splice(index, 1)
+          this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo.findIndex((x: any) => x === item['userId'])
+        this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo.splice(index, 1)
       }
     }
 
   }
 
   navigateToPreviewPage() {
-    this.router.navigate(['app', 'training-plan', 'preview-plan'], { queryParams: { from: this.from } })
+    this.dialogRef = this.dialog.open(PreviewDialogBoxComponent, {
+      disableClose: true,
+      data: {
+        from: this.from
+      },
+      autoFocus: false,
+    })
+    // this.router.navigate(['app', 'training-plan', 'preview-plan'], { queryParams: { from: this.from } })
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/preview-dialog-box/preview-dialog-box.component.html b/project/ws/app/src/lib/routes/training-plan/components/preview-dialog-box/preview-dialog-box.component.html
new file mode 100644
index 000000000..2a11b1091
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/preview-dialog-box/preview-dialog-box.component.html
@@ -0,0 +1,8 @@
+<ng-container>
+    <ws-app-preview-plan [form]="contentForm"></ws-app-preview-plan>
+</ng-container>
+<ng-container>
+    <div class="flex flex-end margin-top-l">
+        <button mat-button class="close-btn" type="button" (click)="closeModal()">Close</button>
+    </div>
+</ng-container>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/preview-dialog-box/preview-dialog-box.component.scss b/project/ws/app/src/lib/routes/training-plan/components/preview-dialog-box/preview-dialog-box.component.scss
new file mode 100644
index 000000000..3dd16cd31
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/preview-dialog-box/preview-dialog-box.component.scss
@@ -0,0 +1,6 @@
+.close-btn {
+    color: #1b4ca1 !important;
+    border: 1px solid #1b4ca1;
+    border-radius: 4px;
+    min-width: 174px;
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/preview-dialog-box/preview-dialog-box.component.spec.ts b/project/ws/app/src/lib/routes/training-plan/components/preview-dialog-box/preview-dialog-box.component.spec.ts
new file mode 100644
index 000000000..e1d468814
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/preview-dialog-box/preview-dialog-box.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
+
+import { ConfirmationBoxComponent } from './confirmation.box.component'
+
+describe('ConfirmationBoxComponent', () => {
+  let component: ConfirmationBoxComponent
+  let fixture: ComponentFixture<ConfirmationBoxComponent>
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ConfirmationBoxComponent],
+    })
+    .compileComponents()
+  }))
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ConfirmationBoxComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
+
+  it('should create', () => {
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/training-plan/components/preview-dialog-box/preview-dialog-box.component.ts b/project/ws/app/src/lib/routes/training-plan/components/preview-dialog-box/preview-dialog-box.component.ts
new file mode 100644
index 000000000..af20d8436
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/preview-dialog-box/preview-dialog-box.component.ts
@@ -0,0 +1,24 @@
+import { Component, Inject, OnInit } from '@angular/core'
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'
+@Component({
+  selector: 'ws-app-preview-dialog-box',
+  templateUrl: './preview-dialog-box.component.html',
+  styleUrls: ['./preview-dialog-box.component.scss'],
+})
+export class PreviewDialogBoxComponent implements OnInit {
+
+  contentForm: any
+
+  constructor(
+    @Inject(MAT_DIALOG_DATA) public data: any,
+    private dialogRef: MatDialogRef<PreviewDialogBoxComponent>
+  ) { }
+
+  ngOnInit() {
+    this.contentForm = this.data.from
+  }
+
+  closeModal() {
+    this.dialogRef.close()
+  }
+}
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 3f217a1fc..99db57ed0 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -178,6 +178,9 @@ export class SearchComponent implements OnInit {
 
   getAllUsers(_event: any) {
     this.tpdsSvc.trainingPlanAssigneeData = { category: _event, data: [_event] }
+    this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo = [
+      "AllUser"
+    ]
     this.handleApiData.emit(true)
   }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
index ad40a049f..ebb4d5a4d 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
@@ -7,9 +7,20 @@
 </ng-container>
 <ng-container>
     <ws-app-user-card [assigneeData]="assigneeData" (handleSelectedChips)="handleSelectedChips($event)"
-        *ngIf="assigneeData?.category === 'Designation'" [showPagination]="true"></ws-app-user-card>
+        *ngIf="assigneeData?.category === 'Designation' && assigneeData?.data?.length !== 0"
+        [showPagination]="true"></ws-app-user-card>
     <ws-app-user-card [assigneeData]="assigneeData" (handleSelectedChips)="handleSelectedChips($event)"
-        *ngIf="assigneeData?.category === 'CustomUser'" [showPagination]="true"></ws-app-user-card>
+        *ngIf="assigneeData?.category === 'CustomUser' && assigneeData?.data?.length !== 0"
+        [showPagination]="true"></ws-app-user-card>
+</ng-container>
+
+<ng-container *ngIf="(assigneeData?.category === 'Designation' && assigneeData?.data?.length === 0) ||
+    (assigneeData?.category === 'CustomUser' && assigneeData?.data?.length === 0)">
+    <div class="no-cbp-data margin-top-xl margin-bottom-xl">
+        <div><img src="/assets/images/no-content-data.svg"></div>
+        <div class="mat-subheading-1 margin-remove">No assignee avaliable.</div>
+        <!-- <div>Create a content in CBP portal to get the contents.</div> -->
+    </div>
 </ng-container>
 
 <ng-container *ngIf="trainingPlanDataSharingService?.trainingPlanAssigneeData?.category === 'AllUser'">
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
index 048dde990..383f89cec 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
@@ -6,22 +6,22 @@
         <div class="flex flex-middle flex-between">
             <div class="mat-subheading-1 margin-remove">Selected Content <span *ngIf="contentData?.length">(
                     {{contentData?.length }} )</span></div>
-            <a mat-button (click)="showAll('content')" class="show-all">Show all
+            <a mat-button (click)="showAll('content')" class="show-all" *ngIf="contentData?.length > 4">Show all
                 <mat-icon>keyboard_arrow_right</mat-icon></a>
         </div>
     </div>
-    <ws-app-standard-card [checkboxVisibility]="false" [contentData]="contentData" [showDeleteFlag]="true"
-        [ngClass]="{'disable': isContentLive}"></ws-app-standard-card>
+    <ws-app-standard-card [checkboxVisibility]="false" [contentData]="contentData | slice : 0 : 4"
+        [showDeleteFlag]="true" [ngClass]="{'disable': isContentLive}"></ws-app-standard-card>
 </ng-container>
 <ng-container *ngIf="assigneeData && (assigneeData?.data?.length || assigneeData?.data?.content?.length)">
     <div class="margin-top-xl">
         <div class=" flex flex-middle flex-between">
             <div class="mat-subheading-1 margin-remove">Selected Assignee
-                <span *ngIf="assigneeData && (assigneeData?.data?.length || assigneeData?.data?.content?.length)">
-                    ( {{(assigneeData?.data?.length) || (assigneeData?.data?.content?.length)}} )
+                <span *ngIf="totalAssigneeCount > 0">
+                    ( {{totalAssigneeCount}} )
                 </span>
             </div>
-            <a mat-button (click)="showAll('assignee')" class="show-all">Show all
+            <a mat-button (click)="showAll('assignee')" class="show-all" *ngIf="totalAssigneeCount > 4">Show all
                 <mat-icon>keyboard_arrow_right</mat-icon></a>
         </div>
     </div>
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
index a11b3f068..f58b164bb 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
@@ -1,6 +1,7 @@
 import { Component, OnInit } from '@angular/core'
-import { Router } from '@angular/router'
 import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
+import { MatDialog } from '@angular/material'
+import { PreviewDialogBoxComponent } from '../../components/preview-dialog-box/preview-dialog-box.component'
 @Component({
   selector: 'ws-app-create-timeline',
   templateUrl: './create-timeline.component.html',
@@ -10,7 +11,11 @@ export class CreateTimelineComponent implements OnInit {
   contentData: any[] = []
   assigneeData: any
   isContentLive: boolean = false
-  constructor(private router: Router, private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
+  dialogRef: any
+  totalAssigneeCount: any = 0
+  constructor(
+    private trainingPlanDataSharingService: TrainingPlanDataSharingService,
+    public dialog: MatDialog) { }
 
   ngOnInit() {
     if (this.trainingPlanDataSharingService.trainingPlanStepperData.status &&
@@ -34,6 +39,8 @@ export class CreateTimelineComponent implements OnInit {
       const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
         return item.selected
       })
+      this.totalAssigneeCount = assigneeData.length
+      assigneeData.slice(0, 4)
       this.assigneeData = { category, data: assigneeData }
     }
     if (this.trainingPlanDataSharingService.trainingPlanAssigneeData &&
@@ -44,14 +51,23 @@ export class CreateTimelineComponent implements OnInit {
       const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
         return item.selected
       })
+      this.totalAssigneeCount = assigneeData.length
+      assigneeData.slice(0, 4)
       this.assigneeData = { category, data: assigneeData }
       console.log('this.assigneeData', this.assigneeData)
     }
   }
 
-  showAll(from: string, tab: string) {
+  showAll(from: string) {
+    this.dialogRef = this.dialog.open(PreviewDialogBoxComponent, {
+      disableClose: true,
+      data: {
+        from: from
+      },
+      autoFocus: false,
+    })
     // this.router.navigate(['app', 'training-plan', 'preview-plan'])
-    this.router.navigate(['app', 'training-plan', 'preview-plan'], { queryParams: { from, tab } })
+    // this.router.navigate(['app', 'training-plan', 'preview-plan'], { queryParams: { from, tab } })
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
index a33f62f6f..c72fb8e06 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
@@ -1,25 +1,32 @@
 <!-- <ws-app-breadcrumb [showBreadcrumbAction]="false"></ws-app-breadcrumb> -->
 <div class="flex margin-top-l">
-    <button mat-stroked-button type="button" (click)="goBack()"><mat-icon>arrow_back</mat-icon> Go
+    <button mat-stroked-button type="button" (click)="goBack()" *ngIf="showBackBtn"><mat-icon>arrow_back</mat-icon> Go
         back</button>
 </div>
-<div class="flex mt-10 flex-col" *ngIf="from==='content'">
-    <div class="mat-subheading-1 margin-remove">Selected Content <span *ngIf="contentList?.length"> ( {{contentList?.length}} )</span></div>
-    <div class="mt-10 flex flex-row justify-center"><ws-app-standard-card [checkboxVisibility]="false" [contentData]="contentList" [showDeleteFlag]="true"></ws-app-standard-card></div>
+<div class="flex flex-col" *ngIf="form==='content'">
+    <div class="mat-subheading-1 margin-remove margin-bottom-m">Selected Content <span *ngIf="contentList?.length"> (
+            {{contentList?.length}} )</span></div>
+    <div class="flex flex-row justify-center max-height-400"><ws-app-standard-card [checkboxVisibility]="false"
+            [contentData]="contentList" [showDeleteFlag]="true"></ws-app-standard-card></div>
 </div>
-<div class="flex mt-10 flex-col" *ngIf="from==='assignee'">
-    <div class="mat-subheading-1 margin-remove">Selected Assignee <span *ngIf="assigneeData?.data?.length"> ( {{assigneeData?.data?.length}} )</span></div>
-    <div class="mt-10 flex flex-row justify-center"><ws-app-user-card [checkboxVisibility]="false" [assigneeData]="assigneeData" [showDeleteFlag]="true"></ws-app-user-card></div>
+<div class="flex mt-10 flex-col" *ngIf="form==='assignee'">
+    <div class="mat-subheading-1 margin-remove margin-bottom-m">Selected Assignee <span
+            *ngIf="assigneeData?.data?.length"> (
+            {{assigneeData?.data?.length}} )</span></div>
+    <div class="mt-10 flex flex-row justify-center"><ws-app-user-card [checkboxVisibility]="false"
+            [assigneeData]="assigneeData" [showDeleteFlag]="true"></ws-app-user-card></div>
 </div>
-<div class="flex content-container" *ngIf="from === 'all'">
+<div class="flex content-container" *ngIf="form === 'all'">
     <mat-chip-list [multiple]="true" [selectable]="true">
-        <mat-chip [ngClass]="selectedTab == item?.tab ? 'select-tab ': ''" *ngFor="let item of allContentChips" [selected]="selectedTab == item.tab"
-            (click)="selectedTab = item.tab"><span *ngIf="item?.count > 1">{{item?.name | titlecase}}s</span> <span *ngIf="item?.count === 1">{{item.name | titlecase}}</span> <span *ngIf="item?.count"> &nbsp;&nbsp;({{item?.count}})</span>
+        <mat-chip [ngClass]="selectedTab == item?.tab ? 'select-tab ': ''" *ngFor="let item of allContentChips"
+            [selected]="selectedTab == item.tab" (click)="selectedTab = item.tab"><span
+                *ngIf="item?.count > 1">{{item?.name | titlecase}}s</span> <span *ngIf="item?.count === 1">{{item.name |
+                titlecase}}</span> <span *ngIf="item?.count"> &nbsp;&nbsp;({{item?.count}})</span>
         </mat-chip>
     </mat-chip-list>
 
 </div>
-<div class="content-container flex" *ngIf="from === 'all'">
+<div class="content-container flex" *ngIf="form === 'all'">
     <ng-container *ngIf="selectedTab === 'content'">
         <ws-app-standard-card [checkboxVisibility]="false" [contentData]="contentList"></ws-app-standard-card>
     </ng-container>
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.scss b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.scss
index c2120a3b5..47fa9f3b7 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.scss
@@ -23,4 +23,9 @@
 
 ::ng-deep .mat-standard-chip {
     cursor: pointer !important;
+}
+
+.max-height-400 {
+    max-height: 400px;
+    overflow: auto;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
index 3b288784a..2525198ef 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core'
+import { Component, Input, OnInit } from '@angular/core'
 import { Router, ActivatedRoute } from '@angular/router'
 import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
 @Component({
@@ -7,61 +7,73 @@ import { TrainingPlanDataSharingService } from '../../services/training-plan-dat
   styleUrls: ['./preview-plan.component.scss'],
 })
 export class PreviewPlanComponent implements OnInit {
+  @Input() form?: string
+
   contentList: any = []
   assigneeData: any = []
-  from: any = ''
   tab: any = ''
   allContentChips: any = []
   selectedTab = ''
+  showBackBtn: boolean = false
+  navUrl: any
   constructor(
     private router: Router,
     private route: ActivatedRoute,
     private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
-    this.from = this.route.snapshot.queryParams['from']    
-    const contentData = this.route.snapshot.data['contentData'];    
+    // this.from = this.route.snapshot.queryParams['from']
+    const contentData = this.route.snapshot.data['contentData']
     if (contentData) {
+      this.showBackBtn = true
+      this.navUrl = {
+        url: ['app', 'home', 'training-plan-dashboard'],
+        queryParams: {
+          type: contentData.status.toLowerCase(),
+          tabSelected: contentData.assignmentType
+        }
+      }
       const category = contentData.assignmentType
-      this.from = 'all';
-      console.log('contentData-->', contentData);
-      const arr = [];      
-      this.tab = this.selectedTab = 'content';
-          
-        if (category === 'CustomUser') {
-          let assignmentDataArr:any = [];
+      this.form = 'all'
+      console.log('contentData-->', contentData)
+      const arr = []
+      this.tab = this.selectedTab = 'content'
+
+      if (category === 'CustomUser') {
+        let assignmentDataArr: any = []
+
+
+        contentData && contentData.userDetails && contentData.userDetails.map((item: any) => {
+          let obj: any = {
+            "firstName": "",
+            "userId": "",
+            "profileDetails": {
+              "professionalDetails": [{ designation: "" }]
+            }
+          }
+          obj.firstName = (item) ? item.firstName : ''
+          obj.profileDetails.professionalDetails[0]['designation'] = (item) ? item.designation : ''
+          assignmentDataArr.push(obj)
+        })
+        console.log('assignmentDataArr', assignmentDataArr)
+        // const assigneeData = contentData.userDetails;
+        this.assigneeData = { category, data: assignmentDataArr }
+      }
+      if (category === 'Designation') {
+        let assignmentDataArr: any = []
+        contentData.assignmentTypeInfo.map((item: any) => {
+          assignmentDataArr.push({ name: item })
+        })
+        this.assigneeData = { category, data: assignmentDataArr }
+      }
 
-          
-          contentData && contentData.userDetails && contentData.userDetails.map((item:any)=>{
-            let obj:any = {
-              "firstName": "",
-              "userId": "",
-              "profileDetails": {"professionalDetails": [{designation: ""}]
-            }};
-            obj.firstName = item.firstName;
-            obj.profileDetails.professionalDetails[0]['designation']= item.designation;
-            obj.userId = item.userId;
-            assignmentDataArr.push(obj);
-          })
-          console.log('assignmentDataArr',assignmentDataArr)
-          // const assigneeData = contentData.userDetails;
-          this.assigneeData = { category, data: assignmentDataArr }
-        }
-        if (category === 'Designation') {
-          let assignmentDataArr:any = [];
-           contentData.assignmentTypeInfo.map((item: any) => {
-            assignmentDataArr.push({name:item})
-          })
-          this.assigneeData = { category, data: assignmentDataArr }
-        }
-      
 
       if (contentData &&
         contentData.contentList) {
-          this.contentList = contentData.contentList;
-        console.log(this.contentList, contentData.contentList);
+        this.contentList = contentData.contentList
+        console.log(this.contentList, contentData.contentList)
       }
-      if(category.toLowerCase() !== 'alluser') {
+      if (category.toLowerCase() !== 'alluser') {
         arr.push({
           name: contentData.contentType,
           tab: 'content',
@@ -84,15 +96,15 @@ export class PreviewPlanComponent implements OnInit {
         })
         this.allContentChips = arr
       }
-    } else  if (this.from === 'content') {
+    } else if (this.form === 'content') {
       if (this.trainingPlanDataSharingService.trainingPlanContentData &&
         this.trainingPlanDataSharingService.trainingPlanContentData.data) {
         this.contentList = this.trainingPlanDataSharingService.trainingPlanContentData.data.content.filter((item: any) => {
           return item.selected
         })
       }
-    } else if (this.from === 'assignee') {
-      if(this.trainingPlanDataSharingService.trainingPlanAssigneeData) {
+    } else if (this.form === 'assignee') {
+      if (this.trainingPlanDataSharingService.trainingPlanAssigneeData) {
         const category = this.trainingPlanDataSharingService.trainingPlanAssigneeData.category
         if (category === 'Designation') {
           const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
@@ -106,13 +118,13 @@ export class PreviewPlanComponent implements OnInit {
           this.assigneeData = { category, data: assigneeData }
         }
       }
-      
+
 
     }
   }
 
   goBack() {
-    this.router.navigateByUrl('/app/training-plan/create-plan')
+    this.router.navigate(this.navUrl.url, { queryParams: this.navUrl.queryParams })
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
index d0a6e8b54..4ec4402c4 100644
--- a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
+++ b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
@@ -63,6 +63,7 @@ import { AddPlanInformationComponent } from './components/add-plan-information/a
 import { TrainingPlanService } from './services/traininig-plan.service'
 import { UpdatePlanResolveService } from './resolvers/update-plan-resolve.service'
 import { ResetDataSharingResolveService } from './resolvers/reset-data-sharing-resolve.service'
+import { PreviewDialogBoxComponent } from './components/preview-dialog-box/preview-dialog-box.component'
 @NgModule({
   declarations: [
     TrainingPlanHomeComponent,
@@ -82,6 +83,7 @@ import { ResetDataSharingResolveService } from './resolvers/reset-data-sharing-r
     CreateContentComponent,
     CategoryDropDownComponent,
     AddPlanInformationComponent,
+    PreviewDialogBoxComponent
   ],
   imports: [
     CommonModule,
@@ -137,6 +139,7 @@ import { ResetDataSharingResolveService } from './resolvers/reset-data-sharing-r
     FilterSearchPipeModule
   ],
   entryComponents: [
+    PreviewDialogBoxComponent
   ],
   providers: [
     InitResolver,

From a5cc2761cf6dce8ef58feba71efc9a32d49effd0 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Wed, 27 Dec 2023 07:35:07 +0530
Subject: [PATCH 385/887] update for assignee custom user card

---
 .../category-drop-down.component.ts               |  3 +++
 .../components/chip/chip.component.html           |  4 ++--
 .../components/search/search.component.ts         | 15 ++++++++-------
 .../components/user-card/user-card.component.ts   |  8 ++++----
 .../create-assignee.component.html                |  1 +
 .../create-assignee/create-assignee.component.ts  |  1 +
 .../routes/create-plan/create-plan.component.ts   | 11 ++++++++++-
 7 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
index 1ca33e65d..3eb8da18b 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
@@ -27,8 +27,11 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
       if (data && data.event) {
         if (data.event === 'Course' || data.event === 'Standalone Assessment' || data.event === 'Program' || data.event === 'Blended program' || data.event === 'Curated program' || data.event === 'Moderated Course') {
           this.trainingPlanDataSharingService.trainingPlanStepperData.contentList = []
+          this.trainingPlanDataSharingService.trainingPlanContentData.data = []
         } else if (data.event === 'Designation' || data.event === 'All Users' || data.event === 'Custom Users') {
           this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo = []
+          this.trainingPlanDataSharingService.trainingPlanAssigneeData.data = []
+          this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo']=[]
         }
         this.handleCategorySelection.emit(data.event)
       }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
index 676a76f54..9fa4de9cb 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.html
@@ -19,7 +19,7 @@
     </div>
 </div>
 <div class="flex flex-row chip-container"
-    *ngIf="selectAssigneeCount > 0 && from === 'assignee' && trainingPlanDataSharingService?.trainingPlanAssigneeData?.category === 'Designation'">
+    *ngIf="selectAssigneeCount > 0 && from === 'assignee' && tpdsSvc?.trainingPlanAssigneeData?.category === 'Designation'">
     <div class="flex flex-2 left-section flex-middle">
         <div class="selected-item-label">Selected items - </div>
         <ng-container *ngFor="let item of selectedAssigneeChips | slice : 0 : 3">
@@ -41,7 +41,7 @@
     </div>
 </div>
 <div class="flex flex-row chip-container"
-    *ngIf="selectAssigneeCount > 0 && from === 'assignee' && trainingPlanDataSharingService?.trainingPlanAssigneeData?.category === 'CustomUser'">
+    *ngIf="selectAssigneeCount > 0 && from === 'assignee' && tpdsSvc?.trainingPlanAssigneeData?.category === 'CustomUser'">
     <div class="flex flex-2 left-section flex-middle">
         <div class="selected-item-label">Selected items - </div>
         <ng-container *ngFor="let item of selectedAssigneeChips | slice : 0 : 3">
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 9179eda92..ae8aeb511 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -72,17 +72,17 @@ export class SearchComponent implements OnInit {
     this.resetPageIndex()
     switch (this.from) {
       case 'content':
-        if(this.tpdsSvc.trainingPlanContentData && this.tpdsSvc.trainingPlanContentData.data) {
-          this.tpdsSvc.trainingPlanContentData.data = []
-        } 
+        // if(this.tpdsSvc.trainingPlanContentData && this.tpdsSvc.trainingPlanContentData.data) {
+        //   this.tpdsSvc.trainingPlanContentData.data = []
+        // } 
         event = !event ? 'Course' : event
         this.getContent(event)
         break
       case 'assignee':
-        if(this.tpdsSvc.trainingPlanAssigneeData && this.tpdsSvc.trainingPlanAssigneeData.data) {
-          this.tpdsSvc.trainingPlanAssigneeData.data = []
-          this.tpdsSvc.trainingPlanStepperData['assignmentTypeInfo']=[]
-        } 
+        // if(this.tpdsSvc.trainingPlanAssigneeData && this.tpdsSvc.trainingPlanAssigneeData.data) {
+        //   this.tpdsSvc.trainingPlanAssigneeData.data = []
+        //   this.tpdsSvc.trainingPlanStepperData['assignmentTypeInfo']=[]
+        // } 
         event = !event ? 'Designation' : event
         if (event === 'Designation') {
           this.getDesignations(event)
@@ -183,6 +183,7 @@ export class SearchComponent implements OnInit {
       },
     }
     this.trainingPlanService.getCustomUsers(filterObj).subscribe((res: any) => {
+      console.log(this.tpdsSvc.trainingPlanAssigneeData);
       this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: res.content }
       this.handleApiData.emit(true)
       this.loadingService.changeLoaderState(false)
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
index 3b167b96d..e0ebf25ae 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
@@ -75,7 +75,7 @@ export class UserCardComponent implements OnInit, OnChanges {
             sitem['selected'] = false
           }
         })
-        this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier: any, index: any) => {
+        this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'] && this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier: any, index: any) => {
           if (identifier === item.name) {
             this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].splice(index, 1)
           }
@@ -87,7 +87,7 @@ export class UserCardComponent implements OnInit, OnChanges {
             sitem['selected'] = false
           }
         })
-        this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier: any, index: any) => {
+        this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'] && this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier: any, index: any) => {
           if (identifier === item.userId) {
             this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].splice(index, 1)
           }
@@ -110,7 +110,7 @@ export class UserCardComponent implements OnInit, OnChanges {
           this.assigneeData.data.splice(index, 1)
         }
       })
-      this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier: any, index: any) => {
+      this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'] && this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier: any, index: any) => {
         if (identifier === item.name) {
           this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].splice(index, 1)
         }
@@ -126,7 +126,7 @@ export class UserCardComponent implements OnInit, OnChanges {
           this.assigneeData.data.splice(index, 1)
         }
       })
-      this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier: any, index: any) => {
+      this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'] && this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier: any, index: any) => {
         if (identifier === item.userId) {
           this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].splice(index, 1)
         }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
index ebb4d5a4d..ce856be41 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
@@ -9,6 +9,7 @@
     <ws-app-user-card [assigneeData]="assigneeData" (handleSelectedChips)="handleSelectedChips($event)"
         *ngIf="assigneeData?.category === 'Designation' && assigneeData?.data?.length !== 0"
         [showPagination]="true"></ws-app-user-card>
+        
     <ws-app-user-card [assigneeData]="assigneeData" (handleSelectedChips)="handleSelectedChips($event)"
         *ngIf="assigneeData?.category === 'CustomUser' && assigneeData?.data?.length !== 0"
         [showPagination]="true"></ws-app-user-card>
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
index 16828a912..0f12e2fdf 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
@@ -85,6 +85,7 @@ export class CreateAssigneeComponent implements OnInit {
         }
       } else if (this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'CustomUser') {
         this.selectedAssigneeChips = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data
+        console.log('this.trainingPlanDataSharingService.trainingPlanAssigneeData',this.trainingPlanDataSharingService.trainingPlanAssigneeData)
         if (this.selectedAssigneeChips) {
           this.selectedAssigneeChips.map((sitem: any) => {
             if (sitem.selected) {
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
index de4b0aa79..6e8630048 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
@@ -28,11 +28,19 @@ export class CreatePlanComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     const contentData = this.route.snapshot.data['contentData']
+    console.log('contentData',contentData);
     if (contentData) {
       this.tpdsSvc.trainingPlanTitle = contentData.name
       // this.tpdsSvc.trainingPlanContentData = { data: { content: contentData.contentList } }
       if (contentData.assignmentType === 'CustomUser') {
-        this.tpdsSvc.trainingPlanAssigneeData = { data: { content: contentData.assignmentTypeInfo } }
+        this.tpdsSvc.trainingPlanAssigneeData = { data: { content: contentData.userDetails } }
+        let arr:any = [];
+        contentData.userDetails.map((sitem:any)=>{
+          if(sitem && sitem.userId) {
+            arr.push(sitem.userId);
+          }          
+        })
+        contentData['assignmentTypeInfo'] = arr;
       } else {
         this.tpdsSvc.trainingPlanAssigneeData = { category: contentData.assignmentType, data: [contentData.assignmentTypeInfo] }
       }
@@ -47,6 +55,7 @@ export class CreatePlanComponent implements OnInit, OnDestroy {
       this.tpdsSvc.trainingPlanStepperData['endDate'] = contentData.endDate
       this.tpdsSvc.trainingPlanStepperData['status'] = contentData.status
     }
+    console.log()
   }
 
   selectedTabAction(_event: any) {

From 1c2b7823d40ba90ced11fd1506b440c5b4e5c9ed Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Wed, 27 Dec 2023 08:01:08 +0530
Subject: [PATCH 386/887] update for lint issues

---
 .../ws/app/src/lib/routes/home/home.module.ts |   6 +-
 .../lib/routes/home/home.rounting.module.ts   |   2 +-
 .../training-plan-dashboard.component.ts      |   8 +-
 .../pipes/filter-search/filter-search.pipe.ts |   1 -
 .../add-plan-information.component.ts         |  18 +-
 .../add-timeline-form.component.ts            |   2 +-
 .../breadcrumb/breadcrumb.component.ts        |  20 +-
 .../category-drop-down.component.ts           |   2 +-
 .../components/chip/chip.component.ts         |   2 +-
 .../competency-summary.component.ts           |  73 +++----
 .../components/filter/filter.component.ts     | 196 ++++++++----------
 .../standard-card/standard-card.component.ts  |  50 ++---
 .../components/stepper/stepper.component.ts   |  14 +-
 .../user-card/user-card.component.ts          |  70 ++++---
 .../resolvers/update-plan-resolve.service.ts  |   2 +-
 .../create-assignee.component.ts              |   6 +-
 .../create-content.component.ts               |  11 +-
 .../create-plan/create-plan.component.ts      |  14 +-
 .../create-timeline.component.ts              |   6 +-
 .../preview-plan/preview-plan.component.ts    |  50 ++---
 .../training-plan-home.component.ts           |   6 +-
 .../training-plan-data-share.service.ts       |   6 +-
 .../services/traininig-plan.service.ts        |   2 +-
 .../training-plan/training-plan.module.ts     |   8 +-
 .../training-plan.routing.module.ts           |  12 +-
 src/app/app.module.ts                         |   6 +-
 26 files changed, 284 insertions(+), 309 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index e3c45a352..05d199224 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -87,7 +87,7 @@ import { TrainingPlanDashboardService } from './services/training-plan-dashboard
     BudgetproofspopupComponent,
     BlendedApprovalsComponent,
     ReportsSectionComponent,
-    TrainingPlanDashboardComponent
+    TrainingPlanDashboardComponent,
   ],
   imports: [
     CommonModule,
@@ -145,7 +145,7 @@ import { TrainingPlanDashboardService } from './services/training-plan-dashboard
     AdduserpopupComponent,
     StaffdetailspopupComponent,
     BudgetschemepopupComponent,
-    BudgetproofspopupComponent
+    BudgetproofspopupComponent,
   ],
   providers: [
     // CKEditorService,
@@ -154,7 +154,7 @@ import { TrainingPlanDashboardService } from './services/training-plan-dashboard
     MdoInfoService,
     UploadService,
     TrainingPlanDashboardService,
-  ]
+  ],
 })
 export class HomeModule {
 
diff --git a/project/ws/app/src/lib/routes/home/home.rounting.module.ts b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
index cb220f494..ea67d54eb 100644
--- a/project/ws/app/src/lib/routes/home/home.rounting.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
@@ -146,7 +146,7 @@ const routes: Routes = [
         resolve: {
           configService: ConfigResolveService,
           pageData: PageResolve,
-        }
+        },
       },
     ],
   },
diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
index ac30332cc..bfd5a8ef8 100644
--- a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
@@ -266,7 +266,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
       this.snackBar.open('CBP plan deleted successfully.')
       this.loaderService.changeLoaderState(false)
       this.filterData()
-    }, (_error) => {
+    },                                                  _error => {
       this.loaderService.changeLoaderState(false)
     })
   }
@@ -288,7 +288,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
         this.snackBar.open('Something went wrong while publishing CBP plan. Try again later')
         this.loaderService.changeLoaderState(false)
       }
-    }, (_error: any) => {
+    },                                                  (_error: any) => {
       this.snackBar.open('Something went wrong while publishing CBP plan. Try again later')
       this.loaderService.changeLoaderState(false)
     })
@@ -336,8 +336,8 @@ export class TrainingPlanDashboardComponent implements OnInit {
     this.router.navigate(['app', 'home', 'training-plan-dashboard'], {
       queryParams: {
         type: _item,
-        tabSelected: _tabSelected
-      }
+        tabSelected: _tabSelected,
+      },
     })
     this.filter(_item)
   }
diff --git a/project/ws/app/src/lib/routes/pipes/filter-search/filter-search.pipe.ts b/project/ws/app/src/lib/routes/pipes/filter-search/filter-search.pipe.ts
index c7aaabede..5cb32d1a8 100644
--- a/project/ws/app/src/lib/routes/pipes/filter-search/filter-search.pipe.ts
+++ b/project/ws/app/src/lib/routes/pipes/filter-search/filter-search.pipe.ts
@@ -6,7 +6,6 @@ import { Pipe, PipeTransform } from '@angular/core'
 export class FilterSearchPipe implements PipeTransform {
 
     transform(items: any[], searchText: string): any {
-        console.log(items, searchText);
         if (!items) { return [] }
         if (!searchText) { return items }
         const searchTextLowerCase = searchText.toLowerCase()
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
index 35c9b4b88..686f434b8 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, OnInit, Output } from '@angular/core'
+import { Component, EventEmitter, OnDestroy, OnInit, Output } from '@angular/core'
 import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'
 import { debounceTime } from 'rxjs/operators'
 import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
@@ -9,12 +9,12 @@ import { Subscription } from 'rxjs'
   templateUrl: './add-plan-information.component.html',
   styleUrls: ['./add-plan-information.component.scss'],
 })
-export class AddPlanInformationComponent implements OnInit {
+export class AddPlanInformationComponent implements OnInit, OnDestroy {
 
   @Output() planTitleInvalid = new EventEmitter<any>()
 
   contentForm!: FormGroup
-  private subscr:Subscription = new Subscription();
+  private subscr: Subscription = new Subscription()
   specialCharList = `( a-z/A-Z , 0-9 . _ - $ / \ : [ ]' ' !)`
   constructor(
     private formBuilder: FormBuilder,
@@ -22,7 +22,7 @@ export class AddPlanInformationComponent implements OnInit {
   ) { }
 
   ngOnInit() {
-    
+
     const noSpecialChar = new RegExp(/^[\u0900-\u097F\u0980-\u09FF\u0C00-\u0C7F\u0B80-\u0BFF\u0C80-\u0CFF\u0D00-\u0D7F\u0A80-\u0AFF\u0B00-\u0B7F\u0A00-\u0A7Fa-zA-Z0-9()$[\]\\.:,_/ -]*$/)
     if (!this.tpdsSvc.trainingPlanTitle) {
       this.planTitleInvalid.emit(true)
@@ -38,7 +38,7 @@ export class AddPlanInformationComponent implements OnInit {
         this.tpdsSvc.trainingPlanStepperData.name = _ele
       }
       this.planTitleInvalid.emit(this.contentForm.invalid)
-    }));
+    }))
 
     if (this.tpdsSvc.trainingPlanTitle) {
       this.contentForm.controls['name'].setValue(this.tpdsSvc.trainingPlanTitle)
@@ -46,12 +46,10 @@ export class AddPlanInformationComponent implements OnInit {
   }
 
   ngOnDestroy() {
-    if(this.subscr) {
-      this.subscr.unsubscribe();
+    if (this.subscr) {
+      this.subscr.unsubscribe()
     }
-    
+
   }
 
 }
-
-
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
index 4b01b8f8c..3e9b7e55d 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
@@ -8,7 +8,7 @@ import { TrainingPlanDataSharingService } from '../../services/training-plan-dat
   providers: [DatePipe],
 })
 export class AddTimelineFormComponent implements OnInit {
-  minDate: Date = new Date();
+  minDate: Date = new Date()
   todayDate: any
   constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService, private datePipe: DatePipe) { }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
index 5f0f9d44a..da06906c0 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
@@ -19,7 +19,7 @@ export class BreadcrumbComponent implements OnInit {
 
   public dialogRef: any
   tabType = TrainingPlanContent.TTabLabelKey
-  editState = false;
+  editState = false
   constructor(
     private router: Router,
     private activeRoute: ActivatedRoute,
@@ -69,8 +69,8 @@ export class BreadcrumbComponent implements OnInit {
         this.router.navigate(['app', 'home', 'training-plan-dashboard'], {
           queryParams: {
             type: this.tpdsSvc.trainingPlanStepperData.status.toLowerCase(),
-            tabSelected: this.tpdsSvc.trainingPlanStepperData.assignmentType
-          }
+            tabSelected: this.tpdsSvc.trainingPlanStepperData.assignmentType,
+          },
         })
       } else {
         this.router.navigate(['app', 'home', 'training-plan-dashboard'])
@@ -137,10 +137,10 @@ export class BreadcrumbComponent implements OnInit {
         this.router.navigate(['app', 'home', 'training-plan-dashboard'], {
           queryParams: {
             type: 'draft',
-            tabSelected: this.tpdsSvc.trainingPlanStepperData.assignmentType
-          }
+            tabSelected: this.tpdsSvc.trainingPlanStepperData.assignmentType,
+          },
         })
-      }, 1000)
+      },         1000)
     })
   }
 
@@ -161,7 +161,7 @@ export class BreadcrumbComponent implements OnInit {
     this.tpdsSvc.trainingPlanStepperData.name = this.tpdsSvc.trainingPlanTitle
     if (this.tpdsSvc.trainingPlanStepperData.assignmentType === 'AllUser') {
       this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo = [
-        "AllUser"
+        'AllUser',
       ]
     }
     const obj: any = { request: { ...this.tpdsSvc.trainingPlanStepperData, id: this.activeRoute.snapshot.data['contentData'].id } }
@@ -181,10 +181,10 @@ export class BreadcrumbComponent implements OnInit {
         this.router.navigate(['app', 'home', 'training-plan-dashboard'], {
           queryParams: {
             type: this.tpdsSvc.trainingPlanStepperData.status.toLowerCase(),
-            tabSelected: this.tpdsSvc.trainingPlanStepperData.assignmentType
-          }
+            tabSelected: this.tpdsSvc.trainingPlanStepperData.assignmentType,
+          },
         })
-      }, 1000)
+      },         1000)
     })
   }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
index 3eb8da18b..67cc7b099 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
@@ -31,7 +31,7 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         } else if (data.event === 'Designation' || data.event === 'All Users' || data.event === 'Custom Users') {
           this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo = []
           this.trainingPlanDataSharingService.trainingPlanAssigneeData.data = []
-          this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo']=[]
+          this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'] = []
         }
         this.handleCategorySelection.emit(data.event)
       }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
index 73bcfbc1d..3726b35b9 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
@@ -117,7 +117,7 @@ export class ChipComponent implements OnInit, OnChanges {
     this.dialogRef = this.dialog.open(PreviewDialogBoxComponent, {
       disableClose: true,
       data: {
-        from: this.from
+        from: this.from,
       },
       autoFocus: false,
     })
diff --git a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
index c13cf99d2..7c5fbe9b9 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
@@ -67,52 +67,53 @@ export class CompetencySummaryComponent implements OnInit, OnChanges {
     // let competencyThemeObj = {};
 
     if (this.selectedCardData) {
-      let fObj = {"competencyTheme": '', count: 0};
+      let fObj = { competencyTheme: '', count: 0 }
       this.selectedCardData.map((sitem: any) => {
-        sitem && sitem.competencies_v5 && sitem.competencies_v5.map((fitem: any) => {
-          if (fitem.competencyArea.toLowerCase() === 'behavioral') {
-            let result = this.checkIfThemeNameExists(this.competencySummaryObj[0]['behavioural']['listData'], fitem);
-            fObj = {"competencyTheme": fitem.competencyTheme, count: 1};
-            if(result) {
-              this.competencySummaryObj[0]['behavioural']['count'] = this.competencySummaryObj[0]['behavioural']['count'] + 1;
-              this.competencySummaryObj[0]['behavioural']['listData'].push(fObj)
+        if (sitem && sitem.competencies_v5) {
+          sitem.competencies_v5.map((fitem: any) => {
+            if (fitem.competencyArea.toLowerCase() === 'behavioral') {
+              const result = this.checkIfThemeNameExists(this.competencySummaryObj[0]['behavioural']['listData'], fitem)
+              fObj = { competencyTheme: fitem.competencyTheme, count: 1 }
+              if (result) {
+                this.competencySummaryObj[0]['behavioural']['count'] = this.competencySummaryObj[0]['behavioural']['count'] + 1
+                this.competencySummaryObj[0]['behavioural']['listData'].push(fObj)
+              }
+              this.selectedIndex = 0
             }
-            this.selectedIndex = 0
-          }
-          if (fitem.competencyArea.toLowerCase() === 'functional') {            
-            let result = this.checkIfThemeNameExists(this.competencySummaryObj[1]['functional']['listData'], fitem);
-            fObj = {"competencyTheme": fitem.competencyTheme, count: 1};
-            if(result) {
-              this.competencySummaryObj[1]['functional']['count'] = this.competencySummaryObj[1]['functional']['count'] + 1;
-              this.competencySummaryObj[1]['functional']['listData'].push(fObj)
+            if (fitem.competencyArea.toLowerCase() === 'functional') {
+              const result = this.checkIfThemeNameExists(this.competencySummaryObj[1]['functional']['listData'], fitem)
+              fObj = { competencyTheme: fitem.competencyTheme, count: 1 }
+              if (result) {
+                this.competencySummaryObj[1]['functional']['count'] = this.competencySummaryObj[1]['functional']['count'] + 1
+                this.competencySummaryObj[1]['functional']['listData'].push(fObj)
+              }
+              this.selectedIndex = 1
             }
-            this.selectedIndex = 1
-          }
-          if (fitem.competencyArea.toLowerCase() === 'domain') {
-            let result = this.checkIfThemeNameExists(this.competencySummaryObj[2]['domain']['listData'], fitem);
-            fObj = {"competencyTheme": fitem.competencyTheme, count: 1};
-            if(result) {
-              this.competencySummaryObj[2]['domain']['count'] = this.competencySummaryObj[2]['domain']['count'] + 1;
-              this.competencySummaryObj[2]['domain']['listData'].push(fObj)
+            if (fitem.competencyArea.toLowerCase() === 'domain') {
+              const result = this.checkIfThemeNameExists(this.competencySummaryObj[2]['domain']['listData'], fitem)
+              fObj = { competencyTheme: fitem.competencyTheme, count: 1 }
+              if (result) {
+                this.competencySummaryObj[2]['domain']['count'] = this.competencySummaryObj[2]['domain']['count'] + 1
+                this.competencySummaryObj[2]['domain']['listData'].push(fObj)
+              }
+              this.selectedIndex = 2
             }
-            this.selectedIndex = 2
-          }
-        })
+          })
+        }
+
       })
     }
   }
 
-
-
-  checkIfThemeNameExists(arr:any, fitem:any):boolean {
-    let flag = true;
-    arr.map((sitem:any)=>{
-      if(sitem.competencyTheme === fitem.competencyTheme) {
-        sitem['count'] = sitem['count']+1;
-        flag = false;
+  checkIfThemeNameExists(arr: any, fitem: any): boolean {
+    let flag = true
+    arr.map((sitem: any) => {
+      if (sitem.competencyTheme === fitem.competencyTheme) {
+        sitem['count'] = sitem['count'] + 1
+        flag = false
       }
     })
-    return flag;
+    return flag
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index 49a8e4f92..5a848c9a7 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -1,76 +1,74 @@
-import { Component, Input, ElementRef, EventEmitter, OnInit, Output, QueryList, ViewChildren, ChangeDetectionStrategy } from '@angular/core'
-import { TrainingPlanService } from './../../services/traininig-plan.service';
-import { FormControl } from '@angular/forms';
-import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service';
-import { ChangeDetectorRef } from '@angular/core';
+import { Component, ChangeDetectorRef, Input, ElementRef, EventEmitter, OnInit, Output, QueryList, ViewChildren, ChangeDetectionStrategy, AfterContentChecked } from '@angular/core'
+import { TrainingPlanService } from './../../services/traininig-plan.service'
+import { FormControl } from '@angular/forms'
+import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
 @Component({
   selector: 'ws-app-filter',
   templateUrl: './filter.component.html',
   styleUrls: ['./filter.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class FilterComponent implements OnInit {
+export class FilterComponent implements OnInit, AfterContentChecked {
   @Output() toggleFilter = new EventEmitter()
-  @Output() getFilterData = new EventEmitter();
-  @Input() clearFilterFlag:any;
-  @Input() from:any;
-  @Input() designationList:any;
-  providersList: any[] = [];
-  selectedProviders: any[] = [];
-  competencyTypeList = [{ "id": "Behavioral", name: 'Behavioural' }, { "id": 'Functional', name: 'Functional' }, { "id": 'Domain', name: 'Domain' }];
-  groupList = [{ "id": "groupA", name: 'Group A' }, { "id": 'groupB', name: 'Group B' }, { "id": 'groupC', name: 'Group C' }, { "id": 'groupD', name: 'Group D' }, { "id": 'groupE', name: 'Group E' }];
-  competencyList: any = [];
-  competencyThemeList: any[] = [];
-  competencySubThemeList: any[] = [];
-  filterObj: any = { "competencyArea": [], "competencyTheme": [], "competencySubTheme": [], "providers": [] };
-  assigneeFilterObj:any = {"group": [], "designation": []}
-  searchThemeControl = new FormControl();
-  searchSubThemeControl = new FormControl();
-  @ViewChildren("checkboxes") checkboxes!: QueryList<ElementRef>;
+  @Output() getFilterData = new EventEmitter()
+  @Input() clearFilterFlag: any
+  @Input() from: any
+  @Input() designationList: any
+  providersList: any[] = []
+  selectedProviders: any[] = []
+  competencyTypeList = [{ id: 'Behavioral', name: 'Behavioural' }, { id: 'Functional', name: 'Functional' }, { id: 'Domain', name: 'Domain' }]
+  groupList = [{ id: 'groupA', name: 'Group A' }, { id: 'groupB', name: 'Group B' }, { id: 'groupC', name: 'Group C' }, { id: 'groupD', name: 'Group D' }, { id: 'groupE', name: 'Group E' }]
+  competencyList: any = []
+  competencyThemeList: any[] = []
+  competencySubThemeList: any[] = []
+  filterObj: any = { competencyArea: [], competencyTheme: [], competencySubTheme: [], providers: [] }
+  assigneeFilterObj: any = { group: [], designation: [] }
+  searchThemeControl = new FormControl()
+  searchSubThemeControl = new FormControl()
+  @ViewChildren('checkboxes') checkboxes!: QueryList<ElementRef>
   constructor(private cdref: ChangeDetectorRef, private trainingPlanService: TrainingPlanService, private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
-    if(this.from === 'content') {
-      this.getFilterEntity();
-      this.getProviders();
+    if (this.from === 'content') {
+      this.getFilterEntity()
+      this.getProviders()
     } else {
-      // if(this.trainingPlanDataSharingService.trainingPlanAssigneeData && 
+      // if(this.trainingPlanDataSharingService.trainingPlanAssigneeData &&
       //   this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Custom Users') {
       //   this.getDesignation();
       // }
-      
+
     }
-    
-    this.trainingPlanDataSharingService.clearFilter.subscribe((result:any)=>{
-      if(result) {
-        this.clearFilterWhileSearch();
+
+    this.trainingPlanDataSharingService.clearFilter.subscribe((result: any) => {
+      if (result) {
+        this.clearFilterWhileSearch()
       }
     })
   }
 
   ngAfterContentChecked() {
-    this.cdref.detectChanges();
+    this.cdref.detectChanges()
  }
 
   getFilterEntity() {
-    let filterObj = {
-      "search": {
-        "type": "Competency Area"
+    const filterObj = {
+      search: {
+        type: 'Competency Area',
+      },
+      filter: {
+        isDetail: true,
       },
-      "filter": {
-        "isDetail": true
-      }
     }
     this.trainingPlanService.getFilterEntity(filterObj).subscribe((res: any) => {
-      console.log('entity,', res);
-      this.competencyList = res;
+
+      this.competencyList = res
 
     })
   }
   getProviders() {
     this.trainingPlanService.getProviders().subscribe((res: any) => {
-      console.log('providers,', res);
-      this.providersList = res;
+      this.providersList = res
     })
   }
 
@@ -80,8 +78,8 @@ export class FilterComponent implements OnInit {
 
   checkedProviders(event: any, item: any) {
     if (event) {
-      this.selectedProviders.push(item);
-      this.filterObj['providers'].push(item.name);
+      this.selectedProviders.push(item)
+      this.filterObj['providers'].push(item.name)
     } else {
       if (this.filterObj['provider'].indexOf(item.name) > -1) {
         const index = this.filterObj['providers'].findIndex((x: any) => x === item.name)
@@ -91,85 +89,76 @@ export class FilterComponent implements OnInit {
   }
 
   getCompetencyTheme(event: any, ctype: any) {
-    console.log('ctype', ctype, this.competencyList, event);
     if (event.checked) {
       this.competencyList.map((citem: any) => {
         if (citem.name === ctype.id) {
-          citem['selected'] = true;
-          console.log(citem.name, ctype.name, citem.children)
+          citem['selected'] = true
           citem.children.map((themechild: any) => {
-            themechild['parent'] = ctype.id;
+            themechild['parent'] = ctype.id
           })
-          if(this.filterObj['competencyArea']) {
-            this.filterObj['competencyArea'].push(citem.name);
-          }          
-          this.competencyThemeList = this.competencyThemeList.concat(citem.children);
-          console.log('competencyThemeList', this.competencyThemeList)
+          if (this.filterObj['competencyArea']) {
+            this.filterObj['competencyArea'].push(citem.name)
+          }
+          this.competencyThemeList = this.competencyThemeList.concat(citem.children)
         }
       })
-    } else {  
+    } else {
       this.competencyList.map((citem: any) => {
         if (citem.name === ctype.id) {
-          citem['selected'] = false;
+          citem['selected'] = false
         }
-      });   
-      this.competencyThemeList = this.competencyThemeList.filter((sitem) => {
-        return sitem.parent != ctype.id
+      })
+      this.competencyThemeList = this.competencyThemeList.filter(sitem => {
+        return sitem.parent !== ctype.id
       })
       if (this.filterObj['competencyArea'].indexOf(ctype.id) > -1) {
         const index = this.filterObj['competencyArea'].findIndex((x: any) => x === ctype.id)
-        this.filterObj['competencyArea'].splice(index, 1);
+        this.filterObj['competencyArea'].splice(index, 1)
       }
     }
-    console.log('competencyThemeList', this.competencyThemeList)
   }
 
   getCompetencySubTheme(event: any, cstype: any) {
-    console.log('cstype.parent', cstype.name)
     if (event.checked) {
       this.competencyThemeList.map((csitem: any) => {
         if (csitem.name === cstype.name) {
-          csitem['selected'] = true;
+          csitem['selected'] = true
           csitem.children.map((subthemechild: any) => {
-            subthemechild['parentType'] = csitem.parent;
-            subthemechild['parent'] = csitem.name;
+            subthemechild['parentType'] = csitem.parent
+            subthemechild['parent'] = csitem.name
           })
-          this.competencySubThemeList = this.competencySubThemeList.concat(csitem.children);
-          this.filterObj['competencyTheme'].push(cstype.name);
+          this.competencySubThemeList = this.competencySubThemeList.concat(csitem.children)
+          this.filterObj['competencyTheme'].push(cstype.name)
         }
       })
     } else {
       this.competencyThemeList.map((csitem: any) => {
         if (csitem.name === cstype.name) {
-          csitem['selected'] = false;
+          csitem['selected'] = false
         }
-      });
-      this.competencySubThemeList = this.competencySubThemeList.filter((sitem) => {
-        return sitem.parent != cstype.name
+      })
+      this.competencySubThemeList = this.competencySubThemeList.filter(sitem => {
+        return sitem.parent !== cstype.name
       })
       if (this.filterObj['competencyTheme'].indexOf(cstype.name) > -1) {
         const index = this.filterObj['competencyTheme'].findIndex((x: any) => x === cstype.name)
         this.filterObj['competencyTheme'].splice(index, 1)
       }
     }
-    console.log('this.competencySubThemeList', this.competencySubThemeList);
   }
 
-
-
   manageCompetencySubTheme(event: any, csttype: any) {
-    console.log('cstype, event --', event, csttype);
     if (event.checked) {
-      this.competencySubThemeList.map((cstlitem:any)=>{
+      this.competencySubThemeList.map((cstlitem: any) => {
         if (csttype.name === cstlitem.name) {
-          cstlitem['selected'] = true;
+          cstlitem['selected'] = true
         }
       })
-      this.filterObj['competencySubTheme'].push(csttype.name);
+      this.filterObj['competencySubTheme'].push(csttype.name)
     } else {
-      this.competencySubThemeList.map((cstlitem:any)=>{
+      this.competencySubThemeList.map((cstlitem: any) => {
         if (csttype.name === cstlitem.name) {
-          cstlitem['selected'] = false;
+          cstlitem['selected'] = false
         }
       })
       if (this.filterObj['competencySubTheme'].indexOf(csttype.name) > -1) {
@@ -181,59 +170,55 @@ export class FilterComponent implements OnInit {
   }
 
   applyFilter() {
-    if(this.from === 'content') {
-      this.getFilterData.emit(this.filterObj);
+    if (this.from === 'content') {
+      this.getFilterData.emit(this.filterObj)
     } else {
-      this.getFilterData.emit(this.assigneeFilterObj);
+      this.getFilterData.emit(this.assigneeFilterObj)
     }
     this.toggleFilter.emit(false)
   }
 
   clearFilter() {
-    console.log('this.clearFilter', this.checkboxes);
-    if(this.from === 'content') {
-      this.filterObj = {};
+    if (this.from === 'content') {
+      this.filterObj = {}
     } else {
-      this.assigneeFilterObj = {};
+      this.assigneeFilterObj = {}
     }
-    
-    if(this.from === 'content') {
-      this.getFilterData.emit(this.filterObj);
+
+    if (this.from === 'content') {
+      this.getFilterData.emit(this.filterObj)
     } else {
-      this.getFilterData.emit(this.assigneeFilterObj);
+      this.getFilterData.emit(this.assigneeFilterObj)
     }
-    if(this.checkboxes) {
+    if (this.checkboxes) {
       this.checkboxes.forEach((element: any) => {
-        element['checked'] = false;
-      });
+        element['checked'] = false
+      })
     }
-    
+
   }
 
   clearFilterWhileSearch() {
-    if(this.checkboxes) {
+    if (this.checkboxes) {
       this.checkboxes.forEach((element: any) => {
-        element['checked'] = false;
-      });
+        element['checked'] = false
+      })
     }
   }
 
-  
-
   // getDesignation() {
   //   this.trainingPlanService.getDesignations().subscribe((res: any) => {
   //     console.log('res', res)
   //     if(res && res.result && res.result.response) {
   //       this.designationList = res.result.response.content;
   //     }
-      
+
   //   })
   // }
 
-  manageSelectedGroup(event:any, group:any) {
-    console.log(event,group);
+  manageSelectedGroup(event: any, group: any) {
     if (event) {
-      this.assigneeFilterObj['group'].push(group.name);
+      this.assigneeFilterObj['group'].push(group.name)
     } else {
       if (this.assigneeFilterObj['group'].indexOf(group.name) > -1) {
         const index = this.assigneeFilterObj['group'].findIndex((x: any) => x === group.name)
@@ -242,10 +227,9 @@ export class FilterComponent implements OnInit {
     }
   }
 
-  manageSelectedDesignation(event:any, designation:any) {
-    console.log(event,designation);
+  manageSelectedDesignation(event: any, designation: any) {
     if (event) {
-      this.assigneeFilterObj['designation'].push(designation.name);
+      this.assigneeFilterObj['designation'].push(designation.name)
     } else {
       if (this.assigneeFilterObj['designation'].indexOf(designation.name) > -1) {
         const index = this.assigneeFilterObj['designation'].findIndex((x: any) => x === designation.name)
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
index 7baee4af8..51cc46b77 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, Output, OnInit, OnChanges, ChangeDetectorRef, ViewChild } from '@angular/core'
-import { MatPaginator, PageEvent } from '@angular/material';
+import { MatPaginator, PageEvent } from '@angular/material'
 import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
 import { SafeUrl } from '@angular/platform-browser'
 
@@ -13,39 +13,36 @@ export class StandardCardComponent implements OnInit, OnChanges {
   @Input() checkboxVisibility: any = true
   @Input() contentData: any[] = []
   @Input() showDeleteFlag = false
-  @Input() showPagination = false;  
-  @Input() count = 0;
+  @Input() showPagination = false
+  @Input() count = 0
   @Output() handleSelectedChips = new EventEmitter()
-  @ViewChild(MatPaginator, {static: false}) paginator: MatPaginator | any;
-  dataSource: any;
+  @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | any
+  dataSource: any
   selectedContent: any[] = []
-  startIndex = 0;
-  lastIndex = 20; 
-  pageSize = 20;  
-  defaultPosterImage: SafeUrl | null = '/assets/instances/eagle/app_logos/default.png';
+  startIndex = 0
+  lastIndex = 20
+  pageSize = 20
+  defaultPosterImage: SafeUrl | null = '/assets/instances/eagle/app_logos/default.png'
   defaultThumbnail: SafeUrl | null = 'assets/instances/eagle/app_logos/KarmayogiBharat_Logo.svg'
   constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService, private changeDetectorRef: ChangeDetectorRef) { }
 
   ngOnInit() {
-    this.trainingPlanDataSharingService.clearFilter.subscribe(()=>{
-      this.resetPageIndex();
+    this.trainingPlanDataSharingService.clearFilter.subscribe(() => {
+      this.resetPageIndex()
     })
   }
 
   ngOnChanges() {
-    this.changeDetectorRef.detectChanges();
-    console.log('this.contentData', this.contentData)
+    this.changeDetectorRef.detectChanges()
+
     // this.dataSource = new MatTableDataSource<any>(this.contentData);
     // this.dataSource.paginator = this.paginator;
-    console.log('this.dataSource', this.dataSource);
   }
 
   onChangePage(pe: PageEvent) {
-    console.log(pe.pageIndex);
-    console.log(pe.pageSize);
-    this.startIndex = (pe.pageIndex) * pe.pageSize;
-    this.lastIndex = (pe.pageIndex + 1) * pe.pageSize ;
-    this.trainingPlanDataSharingService.handleContentPageChange.next({pageIndex: this.startIndex, pageSize: this.lastIndex});
+    this.startIndex = (pe.pageIndex) * pe.pageSize
+    this.lastIndex = (pe.pageIndex + 1) * pe.pageSize
+    this.trainingPlanDataSharingService.handleContentPageChange.next({ pageIndex: this.startIndex, pageSize: this.lastIndex })
     // this.startIndex = this.pageIndex
   }
 
@@ -63,7 +60,6 @@ export class StandardCardComponent implements OnInit, OnChanges {
       if (this.trainingPlanDataSharingService.trainingPlanStepperData['contentList']) {
         this.trainingPlanDataSharingService.trainingPlanStepperData['contentList'].push(item.identifier)
       }
-      console.log(this.trainingPlanDataSharingService.trainingPlanContentData)
     } else {
       // this.selectedContent = this.selectedContent.filter( sitem  => sitem.identifier !== item.identifier)
       this.trainingPlanDataSharingService.trainingPlanContentData.data.content.map((sitem: any) => {
@@ -99,14 +95,14 @@ export class StandardCardComponent implements OnInit, OnChanges {
   }
 
   resetPageIndex() {
-    this.startIndex = 0;
-    this.lastIndex = 20;
-    this.pageSize = 20;
-    if(this.paginator) {
-      this.paginator.pageIndex = 0;
-      this.paginator.pageSize = 20;
+    this.startIndex = 0
+    this.lastIndex = 20
+    this.pageSize = 20
+    if (this.paginator) {
+      this.paginator.pageIndex = 0
+      this.paginator.pageSize = 20
     }
-   
+
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
index a76910e2d..14a85c100 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
@@ -20,10 +20,10 @@ export class StepperComponent implements OnInit, OnChanges {
   addCotnentDisable = true
   addAssigneeDisable = true
   addTimelineDisable = true
-  editState = false;
-  isContentLive: boolean = false
+  editState = false
+  isContentLive = false
   constructor(private route: ActivatedRoute,
-    private tpdsSvc: TrainingPlanDataSharingService
+              private tpdsSvc: TrainingPlanDataSharingService
   ) { }
 
   ngOnInit() {
@@ -62,28 +62,28 @@ export class StepperComponent implements OnInit, OnChanges {
     setTimeout(() => {
       this.addCotnentDisable = _event
       this.titleInvalid.emit(_event)
-    }, 0)
+    },         0)
   }
 
   checkForaddContent(_event: any) {
     setTimeout(() => {
       this.addAssigneeDisable = _event
       this.addContentIsInvalid.emit(_event)
-    }, 0)
+    },         0)
   }
 
   checkForaddAssignee(_event: any) {
     setTimeout(() => {
       this.addTimelineDisable = _event
       this.addAssigneeIsInvalid.emit(_event)
-    }, 0)
+    },         0)
   }
 
   tabChangeToTimeline(_event: any) {
     setTimeout(() => {
       this.addTimelineDisable = _event
       this.addAssigneeIsInvalid.emit(_event)
-    }, 0)
+    },         0)
     this.tabIndexValue = 3
   }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
index e0ebf25ae..db30b9be2 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
@@ -10,13 +10,13 @@ export class UserCardComponent implements OnInit, OnChanges {
   @Input() checkboxVisibility = true
   @Input() showDeleteFlag = false
   @Input() assigneeData: any
-  @Input() showPagination = false;
+  @Input() showPagination = false
   @Output() handleSelectedChips = new EventEmitter()
   @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | any
   dataSource: any
-  startIndex = 0;
-  lastIndex = 20;
-  pageSize = 20;
+  startIndex = 0
+  lastIndex = 20
+  pageSize = 20
   constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService, private changeDetectorRef: ChangeDetectorRef) { }
 
   ngOnInit() {
@@ -24,15 +24,11 @@ export class UserCardComponent implements OnInit, OnChanges {
 
   ngOnChanges() {
     this.changeDetectorRef.detectChanges()
-    console.log('this.assigneeData', this.assigneeData)
     this.dataSource = new MatTableDataSource<any>(this.assigneeData.data)
     this.dataSource.paginator = this.paginator
-    console.log('this.dataSource', this.dataSource)
   }
 
   onChangePage(pe: PageEvent) {
-    console.log(pe.pageIndex)
-    console.log(pe.pageSize)
     this.startIndex = pe.pageIndex * pe.pageSize
     this.lastIndex = (pe.pageIndex + 1) * pe.pageSize
 
@@ -75,11 +71,14 @@ export class UserCardComponent implements OnInit, OnChanges {
             sitem['selected'] = false
           }
         })
-        this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'] && this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier: any, index: any) => {
-          if (identifier === item.name) {
-            this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].splice(index, 1)
-          }
-        })
+        if (this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'] && this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo']) {
+          this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier: any, index: any) => {
+            if (identifier === item.name) {
+              this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].splice(index, 1)
+            }
+          })
+        }
+
       }
       if (this.assigneeData && this.assigneeData.category === 'CustomUser') {
         this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
@@ -87,11 +86,14 @@ export class UserCardComponent implements OnInit, OnChanges {
             sitem['selected'] = false
           }
         })
-        this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'] && this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier: any, index: any) => {
-          if (identifier === item.userId) {
-            this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].splice(index, 1)
-          }
-        })
+        if (this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo']) {
+          this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier: any, index: any) => {
+            if (identifier === item.userId) {
+              this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].splice(index, 1)
+            }
+          })
+        }
+
       }
 
     }
@@ -110,11 +112,13 @@ export class UserCardComponent implements OnInit, OnChanges {
           this.assigneeData.data.splice(index, 1)
         }
       })
-      this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'] && this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier: any, index: any) => {
-        if (identifier === item.name) {
-          this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].splice(index, 1)
-        }
-      })
+      if(this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo']) {
+        this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier: any, index: any) => {
+          if (identifier === item.name) {
+            this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].splice(index, 1)
+          }
+        })
+      }
     } else if (this.assigneeData && this.assigneeData.category === 'CustomUser') {
       this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
         if (sitem.userId === item.userId) {
@@ -126,11 +130,13 @@ export class UserCardComponent implements OnInit, OnChanges {
           this.assigneeData.data.splice(index, 1)
         }
       })
-      this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'] && this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier: any, index: any) => {
-        if (identifier === item.userId) {
-          this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].splice(index, 1)
-        }
-      })
+      if (this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo']) {
+        this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier: any, index: any) => {
+          if (identifier === item.userId) {
+            this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].splice(index, 1)
+          }
+        })
+      }
     }
   }
 
@@ -141,22 +147,22 @@ export class UserCardComponent implements OnInit, OnChanges {
       initials += array[0].charAt(0)
       initials += array[1].charAt(0)
     } else {
-      if(name) {
+      if (name) {
         for (let i = 0; i < name.length; i += 1) {
           if (name.charAt(i) === ' ') {
             continue
           }
-  
+
           if (name.charAt(i) === name.charAt(i)) {
             initials += name.charAt(i)
-  
+
             if (initials.length === 2) {
               break
             }
           }
         }
       }
-      
+
     }
     return initials.toUpperCase()
   }
diff --git a/project/ws/app/src/lib/routes/training-plan/resolvers/update-plan-resolve.service.ts b/project/ws/app/src/lib/routes/training-plan/resolvers/update-plan-resolve.service.ts
index 5c8d98bdf..fdc392241 100644
--- a/project/ws/app/src/lib/routes/training-plan/resolvers/update-plan-resolve.service.ts
+++ b/project/ws/app/src/lib/routes/training-plan/resolvers/update-plan-resolve.service.ts
@@ -15,6 +15,6 @@ export class UpdatePlanResolveService
   ): Observable<any> {
     return this.tpSvc.readPlan(_route.paramMap.get('planId')).pipe(map((_res: any) => {
       return _res.result.content
-    }), retry(1))
+    }),                                                            retry(1))
   }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
index 0f12e2fdf..f3067fbba 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
@@ -63,12 +63,12 @@ export class CreateAssigneeComponent implements OnInit {
         this.assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData
         this.addAssigneeInvalid.emit(false)
       }
-    } else {      
+    } else {
       if (this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'AllUser') {
         this.addAssigneeInvalid.emit(false)
       }
     }
-    
+
   }
 
   handleSelectedChips(event: any) {
@@ -85,7 +85,7 @@ export class CreateAssigneeComponent implements OnInit {
         }
       } else if (this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'CustomUser') {
         this.selectedAssigneeChips = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data
-        console.log('this.trainingPlanDataSharingService.trainingPlanAssigneeData',this.trainingPlanDataSharingService.trainingPlanAssigneeData)
+
         if (this.selectedAssigneeChips) {
           this.selectedAssigneeChips.map((sitem: any) => {
             if (sitem.selected) {
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
index 78843628e..9e4ff1825 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
@@ -14,9 +14,9 @@ export class CreateContentComponent implements OnInit {
   from = 'content'
   selectedContentChips: any[] = []
   selectContentCount = 0
-  pageIndex:any;
-  pageSize:any;
-  count = 0;
+  pageIndex: any
+  pageSize: any
+  count = 0
   constructor(private tpdsSvc: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
@@ -73,11 +73,11 @@ export class CreateContentComponent implements OnInit {
           })
         }
         this.contentData = this.tpdsSvc.trainingPlanContentData.data.content
-        this.count = this.tpdsSvc.trainingPlanContentData.data.count;
+        this.count = this.tpdsSvc.trainingPlanContentData.data.count
         this.handleSelectedChips(true)
       } else {
         this.contentData = this.tpdsSvc.trainingPlanContentData.data.content
-        this.count = this.tpdsSvc.trainingPlanContentData.data.count;
+        this.count = this.tpdsSvc.trainingPlanContentData.data.count
       }
     }
   }
@@ -101,7 +101,6 @@ export class CreateContentComponent implements OnInit {
     }
   }
 
-
   itemsRemovedFromChip() {
     this.handleSelectedChips(true)
   }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
index 6e8630048..f82483bf2 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
@@ -28,19 +28,18 @@ export class CreatePlanComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     const contentData = this.route.snapshot.data['contentData']
-    console.log('contentData',contentData);
     if (contentData) {
       this.tpdsSvc.trainingPlanTitle = contentData.name
       // this.tpdsSvc.trainingPlanContentData = { data: { content: contentData.contentList } }
       if (contentData.assignmentType === 'CustomUser') {
         this.tpdsSvc.trainingPlanAssigneeData = { data: { content: contentData.userDetails } }
-        let arr:any = [];
-        contentData.userDetails.map((sitem:any)=>{
-          if(sitem && sitem.userId) {
-            arr.push(sitem.userId);
-          }          
+        const arr: any = []
+        contentData.userDetails.map((sitem: any) => {
+          if (sitem && sitem.userId) {
+            arr.push(sitem.userId)
+          }
         })
-        contentData['assignmentTypeInfo'] = arr;
+        contentData['assignmentTypeInfo'] = arr
       } else {
         this.tpdsSvc.trainingPlanAssigneeData = { category: contentData.assignmentType, data: [contentData.assignmentTypeInfo] }
       }
@@ -55,7 +54,6 @@ export class CreatePlanComponent implements OnInit, OnDestroy {
       this.tpdsSvc.trainingPlanStepperData['endDate'] = contentData.endDate
       this.tpdsSvc.trainingPlanStepperData['status'] = contentData.status
     }
-    console.log()
   }
 
   selectedTabAction(_event: any) {
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
index dc5ae60ec..1c8f86014 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
@@ -10,7 +10,7 @@ import { PreviewDialogBoxComponent } from '../../components/preview-dialog-box/p
 export class CreateTimelineComponent implements OnInit {
   contentData: any[] = []
   assigneeData: any
-  isContentLive: boolean = false
+  isContentLive = false
   dialogRef: any
   totalAssigneeCount: any = 0
   constructor(
@@ -18,7 +18,6 @@ export class CreateTimelineComponent implements OnInit {
     public dialog: MatDialog) { }
 
   ngOnInit() {
-    console.log(this.trainingPlanDataSharingService.trainingPlanContentData);
     if (this.trainingPlanDataSharingService.trainingPlanStepperData.status &&
       this.trainingPlanDataSharingService.trainingPlanStepperData.status.toLowerCase() === 'live') {
       this.isContentLive = true
@@ -55,7 +54,6 @@ export class CreateTimelineComponent implements OnInit {
       this.totalAssigneeCount = assigneeData.length
       assigneeData.slice(0, 4)
       this.assigneeData = { category, data: assigneeData }
-      console.log('this.assigneeData', this.assigneeData)
     }
   }
 
@@ -63,7 +61,7 @@ export class CreateTimelineComponent implements OnInit {
     this.dialogRef = this.dialog.open(PreviewDialogBoxComponent, {
       disableClose: true,
       data: {
-        from: from
+        from,
       },
       autoFocus: false,
     })
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
index 4afc18a4a..7382ada26 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
@@ -14,7 +14,7 @@ export class PreviewPlanComponent implements OnInit {
   tab: any = ''
   allContentChips: any = []
   selectedTab = ''
-  showBackBtn: boolean = false
+  showBackBtn = false
   navUrl: any
   constructor(
     private router: Router,
@@ -30,37 +30,35 @@ export class PreviewPlanComponent implements OnInit {
         url: ['app', 'home', 'training-plan-dashboard'],
         queryParams: {
           type: contentData.status.toLowerCase(),
-          tabSelected: contentData.assignmentType
-        }
+          tabSelected: contentData.assignmentType,
+        },
       }
       const category = contentData.assignmentType
       this.form = 'all'
-      console.log('contentData-->', contentData)
       const arr = []
       this.tab = this.selectedTab = 'content'
 
       if (category === 'CustomUser') {
-        let assignmentDataArr: any = []
-
-
-        contentData && contentData.userDetails && contentData.userDetails.map((item: any) => {
-          let obj: any = {
-            "firstName": "",
-            "userId": "",
-            "profileDetails": {
-              "professionalDetails": [{ designation: "" }]
+        const assignmentDataArr: any = []
+        if (contentData && contentData.userDetails) {
+          contentData.userDetails.map((item: any) => {
+            const obj: any = {
+              firstName: '',
+              userId: '',
+              profileDetails: {
+                professionalDetails: [{ designation: '' }],
+              },
             }
-          }
-          obj.firstName = (item) ? item.firstName : ''
-          obj.profileDetails.professionalDetails[0]['designation'] = (item) ? item.designation : ''
-          assignmentDataArr.push(obj)
-        })
-        console.log('assignmentDataArr', assignmentDataArr)
-        // const assigneeData = contentData.userDetails;
-        this.assigneeData = { category, data: assignmentDataArr }
+            obj.firstName = (item) ? item.firstName : ''
+            obj.profileDetails.professionalDetails[0]['designation'] = (item) ? item.designation : ''
+            assignmentDataArr.push(obj)
+          })
+          // const assigneeData = contentData.userDetails;
+          this.assigneeData = { category, data: assignmentDataArr }
+        }
       }
       if (category === 'Designation') {
-        let assignmentDataArr: any = []
+        const assignmentDataArr: any = []
         contentData.assignmentTypeInfo.map((item: any) => {
           assignmentDataArr.push({ name: item })
         })
@@ -69,20 +67,19 @@ export class PreviewPlanComponent implements OnInit {
       if (contentData &&
         contentData.contentList) {
         this.contentList = contentData.contentList
-        console.log(this.contentList, contentData.contentList)
       }
       if (category.toLowerCase() !== 'alluser') {
         arr.push({
           name: contentData.contentType,
           tab: 'content',
           selected: (this.tab === 'content' ? true : false),
-          count: this.contentList.length
+          count: this.contentList.length,
         })
         arr.push({
           name: contentData.assignmentType,
           tab: 'assignee',
           selected: (this.tab === 'assignee' ? true : false),
-          count: this.assigneeData.data ? this.assigneeData.data.length : 0
+          count: this.assigneeData.data ? this.assigneeData.data.length : 0,
         })
         this.allContentChips = arr
       } else {
@@ -90,7 +87,7 @@ export class PreviewPlanComponent implements OnInit {
           name: contentData.contentType,
           tab: 'content',
           selected: (this.tab === 'content' ? true : false),
-          count: this.contentList.length
+          count: this.contentList.length,
         })
         this.allContentChips = arr
       }
@@ -117,7 +114,6 @@ export class PreviewPlanComponent implements OnInit {
         }
       }
 
-
     }
   }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.ts
index 265d92d07..6531fa7e5 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.ts
@@ -3,7 +3,7 @@ import { Component, OnInit, OnDestroy, AfterViewInit } from '@angular/core'
 import _ from 'lodash'
 /* tslint:enable */
 import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
-import { Subscription } from 'rxjs';
+import { Subscription } from 'rxjs'
 @Component({
   selector: 'ws-app-training-plan-home',
   templateUrl: './training-plan-home.component.html',
@@ -14,7 +14,7 @@ import { Subscription } from 'rxjs';
 })
 export class TrainingPlanHomeComponent implements OnInit, AfterViewInit, OnDestroy {
   showModeratedNotification = false
-  private subscr:Subscription = new Subscription();
+  private subscr: Subscription = new Subscription()
   constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService
   ) {
 
@@ -26,7 +26,7 @@ export class TrainingPlanHomeComponent implements OnInit, AfterViewInit, OnDestr
       } else {
         this.showModeratedNotification = false
       }
-    }));
+    }))
   }
 
   ngAfterViewInit() {
diff --git a/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts b/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
index 239b36cb7..222d4c10d 100644
--- a/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
+++ b/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
@@ -5,14 +5,14 @@ import { Subject } from 'rxjs'
   providedIn: 'root',
 })
 export class TrainingPlanDataSharingService {
-  clearFilter = new Subject();
+  clearFilter = new Subject()
   trainingPlanCategoryChangeEvent = new Subject()
   moderatedCourseSelectStatus = new Subject()
-  handleContentPageChange = new Subject();
+  handleContentPageChange = new Subject()
   trainingPlanTitle = ''
   trainingPlanContentData: any
   trainingPlanAssigneeData: any
-  selectedTabType: any = '';
+  selectedTabType: any = ''
   trainingPlanStepperData: any = {
     name: '',
     contentType: '',
diff --git a/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts b/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
index 8e62dea20..1fc9ce6ac 100644
--- a/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
+++ b/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
@@ -16,7 +16,7 @@ const API_END_POINTS = {
   GET_ALL_USERS: 'apis/proxies/v8/user/v1/search',
   GET_ALL_DESIGNATIONS: 'apis/proxies/v8/masterData/v2/deptPosition',
   GET_PROVIDERS: 'apis/proxies/v8/searchBy/provider',
-  GET_FILTER_ENTITY: 'apis/proxies/v8/competency/v4/search'
+  GET_FILTER_ENTITY: 'apis/proxies/v8/competency/v4/search',
 }
 @Injectable({
   providedIn: 'root',
diff --git a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
index 4ec4402c4..6c5053b08 100644
--- a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
+++ b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
@@ -83,7 +83,7 @@ import { PreviewDialogBoxComponent } from './components/preview-dialog-box/previ
     CreateContentComponent,
     CategoryDropDownComponent,
     AddPlanInformationComponent,
-    PreviewDialogBoxComponent
+    PreviewDialogBoxComponent,
   ],
   imports: [
     CommonModule,
@@ -136,16 +136,16 @@ import { PreviewDialogBoxComponent } from './components/preview-dialog-box/previ
     PipePublicURLModule,
     PipeDurationTransformModule,
     DefaultThumbnailModule,
-    FilterSearchPipeModule
+    FilterSearchPipeModule,
   ],
   entryComponents: [
-    PreviewDialogBoxComponent
+    PreviewDialogBoxComponent,
   ],
   providers: [
     InitResolver,
     TrainingPlanService,
     UpdatePlanResolveService,
-    ResetDataSharingResolveService
+    ResetDataSharingResolveService,
   ],
 })
 export class TrainingPlanModule {
diff --git a/project/ws/app/src/lib/routes/training-plan/training-plan.routing.module.ts b/project/ws/app/src/lib/routes/training-plan/training-plan.routing.module.ts
index a84629ea9..4f938f06d 100644
--- a/project/ws/app/src/lib/routes/training-plan/training-plan.routing.module.ts
+++ b/project/ws/app/src/lib/routes/training-plan/training-plan.routing.module.ts
@@ -28,8 +28,8 @@ const routes: Routes = [
           module: 'Create Plan',
         },
         resolve: {
-          tpdsSvcReset: ResetDataSharingResolveService
-        }
+          tpdsSvcReset: ResetDataSharingResolveService,
+        },
       },
       {
         path: 'update-plan/:planId',
@@ -40,8 +40,8 @@ const routes: Routes = [
         },
         resolve: {
           tpdsSvcReset: ResetDataSharingResolveService,
-          contentData: UpdatePlanResolveService
-        }
+          contentData: UpdatePlanResolveService,
+        },
       },
       {
         path: 'preview-plan',
@@ -59,8 +59,8 @@ const routes: Routes = [
           module: 'Preview Plan',
         },
         resolve: {
-          contentData: UpdatePlanResolveService
-        }
+          contentData: UpdatePlanResolveService,
+        },
       },
     ],
   },
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index e76f9764c..7085ea286 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -99,7 +99,7 @@ const getBaseHref = (platformLocation: PlatformLocation): string => {
     DialogConfirmComponent,
     LoginRootComponent,
     LoginRootDirective,
-    ConfirmationBoxComponent
+    ConfirmationBoxComponent,
   ],
   imports: [
     FormsModule,
@@ -152,7 +152,7 @@ const getBaseHref = (platformLocation: PlatformLocation): string => {
   entryComponents: [
     DialogConfirmComponent,
     LoginComponent,
-    ConfirmationBoxComponent
+    ConfirmationBoxComponent,
   ],
   providers: [
     {
@@ -188,7 +188,7 @@ const getBaseHref = (platformLocation: PlatformLocation): string => {
     { provide: ErrorHandler, useClass: GlobalErrorHandlingService },
     MatDatepickerModule, MatNativeDateModule,
     { provide: 'environment', useValue: environment },
-    LoaderService
+    LoaderService,
   ],
 })
 export class AppModule { }

From 69e737d52e4baa58c2cf96e7178601e314f7c9cf Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Wed, 27 Dec 2023 10:59:52 +0530
Subject: [PATCH 387/887] lint and build issues fix

---
 .../add-plan-information.component.ts         |  2 +-
 .../add-timeline-form.component.ts            | 10 +--
 .../category-drop-down.component.ts           | 86 ++++++++++---------
 .../confirmation.box.component.ts             |  4 +-
 .../components/filter/filter.component.ts     | 27 ++++--
 .../components/search/search.component.ts     | 44 +++++-----
 .../standard-card/standard-card.component.ts  | 31 ++++---
 .../user-card/user-card.component.ts          | 57 ++++++------
 .../create-assignee.component.html            |  4 +-
 .../create-assignee.component.ts              | 40 ++++-----
 .../create-timeline.component.ts              | 34 ++++----
 .../preview-plan/preview-plan.component.ts    | 16 ++--
 .../training-plan-home.component.ts           |  6 +-
 .../services/traininig-plan.service.ts        |  2 +-
 14 files changed, 194 insertions(+), 169 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
index 686f434b8..d494d0b98 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-plan-information/add-plan-information.component.ts
@@ -22,7 +22,7 @@ export class AddPlanInformationComponent implements OnInit, OnDestroy {
   ) { }
 
   ngOnInit() {
-
+    // tslint:disable-next-line: max-line-length
     const noSpecialChar = new RegExp(/^[\u0900-\u097F\u0980-\u09FF\u0C00-\u0C7F\u0B80-\u0BFF\u0C80-\u0CFF\u0D00-\u0D7F\u0A80-\u0AFF\u0B00-\u0B7F\u0A00-\u0A7Fa-zA-Z0-9()$[\]\\.:,_/ -]*$/)
     if (!this.tpdsSvc.trainingPlanTitle) {
       this.planTitleInvalid.emit(true)
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
index 3e9b7e55d..b0e70ddd5 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
@@ -10,18 +10,18 @@ import { TrainingPlanDataSharingService } from '../../services/training-plan-dat
 export class AddTimelineFormComponent implements OnInit {
   minDate: Date = new Date()
   todayDate: any
-  constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService, private datePipe: DatePipe) { }
+  constructor(private tpdsSvc: TrainingPlanDataSharingService, private datePipe: DatePipe) { }
 
   ngOnInit() {
-    if (this.trainingPlanDataSharingService.trainingPlanStepperData['endDate']) {
-      this.todayDate = new Date(this.trainingPlanDataSharingService.trainingPlanStepperData['endDate'])
+    if (this.tpdsSvc.trainingPlanStepperData['endDate']) {
+      this.todayDate = new Date(this.tpdsSvc.trainingPlanStepperData['endDate'])
     } else {
-      this.trainingPlanDataSharingService.trainingPlanStepperData['endDate'] = this.datePipe.transform(this.todayDate, 'yyyy-MM-dd')
+      this.tpdsSvc.trainingPlanStepperData['endDate'] = this.datePipe.transform(this.todayDate, 'yyyy-MM-dd')
     }
   }
 
   changeTimeline(timeline: any) {
-    this.trainingPlanDataSharingService.trainingPlanStepperData['endDate'] = this.datePipe.transform(timeline, 'yyyy-MM-dd')
+    this.tpdsSvc.trainingPlanStepperData['endDate'] = this.datePipe.transform(timeline, 'yyyy-MM-dd')
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
index 67cc7b099..d0f13ceaf 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
@@ -15,7 +15,7 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
   @Output() handleCategorySelection: any = new EventEmitter()
   dialogRef: any
   selectedValue: any
-  constructor(public dialog: MatDialog, private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
+  constructor(public dialog: MatDialog, private tpdsSvc: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
     // if(this.from === 'content') {
@@ -23,15 +23,21 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
     // } else if(this.from === 'assignee') {
     //   this.handleCategorySelection.emit('Designation');
     // }
-    this.trainingPlanDataSharingService.trainingPlanCategoryChangeEvent.pipe(debounceTime(700)).subscribe((data: any) => {
+    this.tpdsSvc.trainingPlanCategoryChangeEvent.pipe(debounceTime(700)).subscribe((data: any) => {
       if (data && data.event) {
-        if (data.event === 'Course' || data.event === 'Standalone Assessment' || data.event === 'Program' || data.event === 'Blended program' || data.event === 'Curated program' || data.event === 'Moderated Course') {
-          this.trainingPlanDataSharingService.trainingPlanStepperData.contentList = []
-          this.trainingPlanDataSharingService.trainingPlanContentData.data = []
+        if (data.event === 'Course' ||
+          data.event === 'Standalone Assessment' ||
+          data.event === 'Program' ||
+          data.event === 'Blended program' ||
+          data.event === 'Curated program' ||
+          data.event === 'Moderated Course'
+        ) {
+          this.tpdsSvc.trainingPlanStepperData.contentList = []
+          this.tpdsSvc.trainingPlanContentData.data = []
         } else if (data.event === 'Designation' || data.event === 'All Users' || data.event === 'Custom Users') {
-          this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo = []
-          this.trainingPlanDataSharingService.trainingPlanAssigneeData.data = []
-          this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'] = []
+          this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo = []
+          this.tpdsSvc.trainingPlanAssigneeData.data = []
+          this.tpdsSvc.trainingPlanStepperData['assignmentTypeInfo'] = []
         }
         this.handleCategorySelection.emit(data.event)
       }
@@ -40,20 +46,20 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
 
   ngOnChanges() {
     if (this.from === 'content') {
-      if (this.trainingPlanDataSharingService.trainingPlanStepperData['contentType']) {
-        this.selectedValue = this.trainingPlanDataSharingService.trainingPlanStepperData['contentType']
-        this.handleCategorySelection.emit(this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'])
+      if (this.tpdsSvc.trainingPlanStepperData['contentType']) {
+        this.selectedValue = this.tpdsSvc.trainingPlanStepperData['contentType']
+        this.handleCategorySelection.emit(this.tpdsSvc.trainingPlanStepperData['contentType'])
       } else {
-        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = 'Course'
+        this.tpdsSvc.trainingPlanStepperData['contentType'] = 'Course'
         this.selectedValue = 'Course'
         this.handleCategorySelection.emit('Course')
       }
     } else if (this.from === 'assignee') {
-      if (this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType']) {
-        this.selectedValue = this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType']
-        this.handleCategorySelection.emit(this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType'])
+      if (this.tpdsSvc.trainingPlanStepperData['assignmentType']) {
+        this.selectedValue = this.tpdsSvc.trainingPlanStepperData['assignmentType']
+        this.handleCategorySelection.emit(this.tpdsSvc.trainingPlanStepperData['assignmentType'])
       } else {
-        this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType'] = 'Designation'
+        this.tpdsSvc.trainingPlanStepperData['assignmentType'] = 'Designation'
         this.selectedValue = 'Designation'
         this.handleCategorySelection.emit('Designation')
       }
@@ -72,9 +78,9 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['primaryAction'] = 'I understand, change content type'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Course'
-        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event
-        this.trainingPlanDataSharingService.moderatedCourseSelectStatus.next(false)
-        if (this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.length) {
+        this.tpdsSvc.trainingPlanStepperData['contentType'] = event
+        this.tpdsSvc.moderatedCourseSelectStatus.next(false)
+        if (this.tpdsSvc.trainingPlanStepperData.contentList.length) {
           this.openDialoagBox(dialogData)
         } else {
           this.handleCategorySelection.emit(event)
@@ -89,9 +95,9 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['primaryAction'] = 'I understand, change content type'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Standalone Assessment'
-        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event
-        this.trainingPlanDataSharingService.moderatedCourseSelectStatus.next(false)
-        if (this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.length) {
+        this.tpdsSvc.trainingPlanStepperData['contentType'] = event
+        this.tpdsSvc.moderatedCourseSelectStatus.next(false)
+        if (this.tpdsSvc.trainingPlanStepperData.contentList.length) {
           this.openDialoagBox(dialogData)
         } else {
           this.handleCategorySelection.emit(event)
@@ -106,9 +112,9 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['primaryAction'] = 'I understand, change content type'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Program'
-        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event
-        this.trainingPlanDataSharingService.moderatedCourseSelectStatus.next(false)
-        if (this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.length) {
+        this.tpdsSvc.trainingPlanStepperData['contentType'] = event
+        this.tpdsSvc.moderatedCourseSelectStatus.next(false)
+        if (this.tpdsSvc.trainingPlanStepperData.contentList.length) {
           this.openDialoagBox(dialogData)
         } else {
           this.handleCategorySelection.emit(event)
@@ -123,9 +129,9 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['primaryAction'] = 'I understand, change content type'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Blended program'
-        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event
-        this.trainingPlanDataSharingService.moderatedCourseSelectStatus.next(false)
-        if (this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.length) {
+        this.tpdsSvc.trainingPlanStepperData['contentType'] = event
+        this.tpdsSvc.moderatedCourseSelectStatus.next(false)
+        if (this.tpdsSvc.trainingPlanStepperData.contentList.length) {
           this.openDialoagBox(dialogData)
         } else {
           this.handleCategorySelection.emit(event)
@@ -140,9 +146,9 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['primaryAction'] = 'I understand, change content type'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Curated program'
-        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event
-        this.trainingPlanDataSharingService.moderatedCourseSelectStatus.next(false)
-        if (this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.length) {
+        this.tpdsSvc.trainingPlanStepperData['contentType'] = event
+        this.tpdsSvc.moderatedCourseSelectStatus.next(false)
+        if (this.tpdsSvc.trainingPlanStepperData.contentList.length) {
           this.openDialoagBox(dialogData)
         } else {
           this.handleCategorySelection.emit(event)
@@ -157,8 +163,8 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['primaryAction'] = 'I understand, change content type'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Moderated Course'
-        this.trainingPlanDataSharingService.trainingPlanStepperData['contentType'] = event
-        if (this.trainingPlanDataSharingService.trainingPlanStepperData.contentList.length) {
+        this.tpdsSvc.trainingPlanStepperData['contentType'] = event
+        if (this.tpdsSvc.trainingPlanStepperData.contentList.length) {
           this.openDialoagBox(dialogData)
         } else {
           this.handleCategorySelection.emit(event)
@@ -173,8 +179,8 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['primaryAction'] = 'I understand, change user type'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Designation'
-        this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType'] = event
-        if (this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.length) {
+        this.tpdsSvc.trainingPlanStepperData['assignmentType'] = event
+        if (this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo.length) {
           this.openDialoagBox(dialogData)
         } else {
           this.handleCategorySelection.emit(event)
@@ -189,9 +195,9 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['primaryAction'] = 'I understand, change user type'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'AllUser'
-        this.trainingPlanDataSharingService.trainingPlanAssigneeData.category = 'AllUser'
-        this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType'] = event
-        if (this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.length) {
+        this.tpdsSvc.trainingPlanAssigneeData.category = 'AllUser'
+        this.tpdsSvc.trainingPlanStepperData['assignmentType'] = event
+        if (this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo.length) {
           this.openDialoagBox(dialogData)
         } else {
           this.handleCategorySelection.emit(event)
@@ -206,8 +212,8 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['primaryAction'] = 'I understand, change user type'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'CustomUser'
-        this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentType'] = event
-        if (this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.length) {
+        this.tpdsSvc.trainingPlanStepperData['assignmentType'] = event
+        if (this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo.length) {
           this.openDialoagBox(dialogData)
         } else {
           this.handleCategorySelection.emit(event)
diff --git a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation.box.component.ts b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation.box.component.ts
index 5da503eaa..ab5c28ff5 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation.box.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation.box.component.ts
@@ -11,7 +11,7 @@ export class ConfirmationBoxComponent implements OnInit {
   constructor(
     @Inject(MAT_DIALOG_DATA) public data: any,
     private dialogRef: MatDialogRef<ConfirmationBoxComponent>,
-    private trainingPlanDataSharingService: TrainingPlanDataSharingService
+    private tpdsSvc: TrainingPlanDataSharingService
   ) { }
 
   ngOnInit() {
@@ -26,7 +26,7 @@ export class ConfirmationBoxComponent implements OnInit {
       this.dialogRef.close('confirmed')
     } else {
       this.dialogRef.close()
-      this.trainingPlanDataSharingService.trainingPlanCategoryChangeEvent.next(data)
+      this.tpdsSvc.trainingPlanCategoryChangeEvent.next(data)
     }
   }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index 5a848c9a7..5456e2dd7 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -16,8 +16,18 @@ export class FilterComponent implements OnInit, AfterContentChecked {
   @Input() designationList: any
   providersList: any[] = []
   selectedProviders: any[] = []
-  competencyTypeList = [{ id: 'Behavioral', name: 'Behavioural' }, { id: 'Functional', name: 'Functional' }, { id: 'Domain', name: 'Domain' }]
-  groupList = [{ id: 'groupA', name: 'Group A' }, { id: 'groupB', name: 'Group B' }, { id: 'groupC', name: 'Group C' }, { id: 'groupD', name: 'Group D' }, { id: 'groupE', name: 'Group E' }]
+  competencyTypeList = [
+    { id: 'Behavioral', name: 'Behavioural' },
+    { id: 'Functional', name: 'Functional' },
+    { id: 'Domain', name: 'Domain' },
+  ]
+  groupList = [
+    { id: 'groupA', name: 'Group A' },
+    { id: 'groupB', name: 'Group B' },
+    { id: 'groupC', name: 'Group C' },
+    { id: 'groupD', name: 'Group D' },
+    { id: 'groupE', name: 'Group E' },
+  ]
   competencyList: any = []
   competencyThemeList: any[] = []
   competencySubThemeList: any[] = []
@@ -26,21 +36,24 @@ export class FilterComponent implements OnInit, AfterContentChecked {
   searchThemeControl = new FormControl()
   searchSubThemeControl = new FormControl()
   @ViewChildren('checkboxes') checkboxes!: QueryList<ElementRef>
-  constructor(private cdref: ChangeDetectorRef, private trainingPlanService: TrainingPlanService, private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
+  constructor(
+    private cdref: ChangeDetectorRef,
+    private trainingPlanService: TrainingPlanService,
+    private tpdsSvc: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
     if (this.from === 'content') {
       this.getFilterEntity()
       this.getProviders()
     } else {
-      // if(this.trainingPlanDataSharingService.trainingPlanAssigneeData &&
-      //   this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Custom Users') {
+      // if(this.tpdsSvc.trainingPlanAssigneeData &&
+      //   this.tpdsSvc.trainingPlanAssigneeData.category === 'Custom Users') {
       //   this.getDesignation();
       // }
 
     }
 
-    this.trainingPlanDataSharingService.clearFilter.subscribe((result: any) => {
+    this.tpdsSvc.clearFilter.subscribe((result: any) => {
       if (result) {
         this.clearFilterWhileSearch()
       }
@@ -49,7 +62,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
 
   ngAfterContentChecked() {
     this.cdref.detectChanges()
- }
+  }
 
   getFilterEntity() {
     const filterObj = {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index ae8aeb511..c64605e77 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -26,7 +26,7 @@ export class SearchComponent implements OnInit {
   constructor(@Inject(DOCUMENT) private document: Document,
     private trainingPlanService: TrainingPlanService,
     private route: ActivatedRoute,
-    private tpdsSvc: TrainingPlanDataSharingService,
+    public tpdsSvc: TrainingPlanDataSharingService,
     private loadingService: LoaderService
   ) { }
 
@@ -66,7 +66,7 @@ export class SearchComponent implements OnInit {
   }
 
   handleCategorySelection(event: any) {
-      
+
     this.selectedDropDownValue = event
     this.tpdsSvc.clearFilter.next(true)
     this.resetPageIndex()
@@ -74,7 +74,7 @@ export class SearchComponent implements OnInit {
       case 'content':
         // if(this.tpdsSvc.trainingPlanContentData && this.tpdsSvc.trainingPlanContentData.data) {
         //   this.tpdsSvc.trainingPlanContentData.data = []
-        // } 
+        // }
         event = !event ? 'Course' : event
         this.getContent(event)
         break
@@ -82,7 +82,7 @@ export class SearchComponent implements OnInit {
         // if(this.tpdsSvc.trainingPlanAssigneeData && this.tpdsSvc.trainingPlanAssigneeData.data) {
         //   this.tpdsSvc.trainingPlanAssigneeData.data = []
         //   this.tpdsSvc.trainingPlanStepperData['assignmentTypeInfo']=[]
-        // } 
+        // }
         event = !event ? 'Designation' : event
         if (event === 'Designation') {
           this.getDesignations(event)
@@ -132,17 +132,17 @@ export class SearchComponent implements OnInit {
         //     data: { content: _.uniqBy(_.concat(this.tpdsSvc.trainingPlanContentData.data.content, res.content), 'identifier') }
         //   }
         // } else {
-        let finResult = [];
-        if(this.tpdsSvc.trainingPlanContentData.data && this.tpdsSvc.trainingPlanContentData.data && this.tpdsSvc.trainingPlanContentData.data.content) {
-          finResult = this.tpdsSvc.trainingPlanContentData.data.content.filter((sitem:any)=>{
+        let finResult = []
+        if (this.tpdsSvc.trainingPlanContentData.data && this.tpdsSvc.trainingPlanContentData.data && this.tpdsSvc.trainingPlanContentData.data.content) {
+          finResult = this.tpdsSvc.trainingPlanContentData.data.content.filter((sitem: any) => {
             return sitem.selected
           })
         }
-        console.log('finResult', finResult);
-          let result = { count: res.count, content: _.uniqBy(_.concat(finResult, res.content), 'identifier') }
-          console.log(result)
-          this.tpdsSvc.trainingPlanContentData = { category: contentType, data: result, count: res.count }
-        
+        console.log('finResult', finResult)
+        let result = { count: res.count, content: _.uniqBy(_.concat(finResult, res.content), 'identifier') }
+        console.log(result)
+        this.tpdsSvc.trainingPlanContentData = { category: contentType, data: result, count: res.count }
+
         // else {
         //   this.tpdsSvc.trainingPlanContentData = { category: contentType, data: res, count: res.count }
         // }
@@ -183,7 +183,7 @@ export class SearchComponent implements OnInit {
       },
     }
     this.trainingPlanService.getCustomUsers(filterObj).subscribe((res: any) => {
-      console.log(this.tpdsSvc.trainingPlanAssigneeData);
+      console.log(this.tpdsSvc.trainingPlanAssigneeData)
       this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: res.content }
       this.handleApiData.emit(true)
       this.loadingService.changeLoaderState(false)
@@ -209,19 +209,19 @@ export class SearchComponent implements OnInit {
             return ditem
           }
         })
-        console.log(this.tpdsSvc.trainingPlanAssigneeData.data);
-        if(this.tpdsSvc.trainingPlanAssigneeData.data) {
-          let finArr = this.tpdsSvc.trainingPlanAssigneeData.data.filter((sitem:any)=>{
-            if(sitem.selected) {
+        console.log(this.tpdsSvc.trainingPlanAssigneeData.data)
+        if (this.tpdsSvc.trainingPlanAssigneeData.data) {
+          let finArr = this.tpdsSvc.trainingPlanAssigneeData.data.filter((sitem: any) => {
+            if (sitem.selected) {
               return sitem
-            }            
+            }
           })
-          console.log(finArr,resArr );
-          this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: _.concat(finArr, resArr)}  
+          console.log(finArr, resArr)
+          this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: _.concat(finArr, resArr) }
         } else {
-          this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: resArr}
+          this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: resArr }
         }
-        
+
       } else {
         this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: res.result.response.content }
         this.designationList = res.result.response.content
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
index 51cc46b77..14fabe4a6 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
@@ -24,10 +24,13 @@ export class StandardCardComponent implements OnInit, OnChanges {
   pageSize = 20
   defaultPosterImage: SafeUrl | null = '/assets/instances/eagle/app_logos/default.png'
   defaultThumbnail: SafeUrl | null = 'assets/instances/eagle/app_logos/KarmayogiBharat_Logo.svg'
-  constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService, private changeDetectorRef: ChangeDetectorRef) { }
+  constructor(
+    private tpdsSvc: TrainingPlanDataSharingService,
+    private changeDetectorRef: ChangeDetectorRef
+  ) { }
 
   ngOnInit() {
-    this.trainingPlanDataSharingService.clearFilter.subscribe(() => {
+    this.tpdsSvc.clearFilter.subscribe(() => {
       this.resetPageIndex()
     })
   }
@@ -42,34 +45,34 @@ export class StandardCardComponent implements OnInit, OnChanges {
   onChangePage(pe: PageEvent) {
     this.startIndex = (pe.pageIndex) * pe.pageSize
     this.lastIndex = (pe.pageIndex + 1) * pe.pageSize
-    this.trainingPlanDataSharingService.handleContentPageChange.next({ pageIndex: this.startIndex, pageSize: this.lastIndex })
+    this.tpdsSvc.handleContentPageChange.next({ pageIndex: this.startIndex, pageSize: this.lastIndex })
     // this.startIndex = this.pageIndex
   }
 
   selectContentItem(event: any, item: any) {
     if (event.checked) {
       // this.selectedContent.push(item);
-      this.trainingPlanDataSharingService.trainingPlanContentData.data.content.map((sitem: any, index: any) => {
+      this.tpdsSvc.trainingPlanContentData.data.content.map((sitem: any, index: any) => {
         if (sitem.identifier === item.identifier) {
           sitem['selected'] = true
-          this.trainingPlanDataSharingService.trainingPlanContentData.data.content.splice(index, 1)
-          this.trainingPlanDataSharingService.trainingPlanContentData.data.content.unshift(sitem)
+          this.tpdsSvc.trainingPlanContentData.data.content.splice(index, 1)
+          this.tpdsSvc.trainingPlanContentData.data.content.unshift(sitem)
         }
       })
 
-      if (this.trainingPlanDataSharingService.trainingPlanStepperData['contentList']) {
-        this.trainingPlanDataSharingService.trainingPlanStepperData['contentList'].push(item.identifier)
+      if (this.tpdsSvc.trainingPlanStepperData['contentList']) {
+        this.tpdsSvc.trainingPlanStepperData['contentList'].push(item.identifier)
       }
     } else {
       // this.selectedContent = this.selectedContent.filter( sitem  => sitem.identifier !== item.identifier)
-      this.trainingPlanDataSharingService.trainingPlanContentData.data.content.map((sitem: any) => {
+      this.tpdsSvc.trainingPlanContentData.data.content.map((sitem: any) => {
         if (sitem.identifier === item.identifier) {
           sitem['selected'] = false
         }
       })
-      this.trainingPlanDataSharingService.trainingPlanStepperData['contentList'].filter((identifier: any, index: any) => {
+      this.tpdsSvc.trainingPlanStepperData['contentList'].filter((identifier: any, index: any) => {
         if (identifier === item.identifier) {
-          this.trainingPlanDataSharingService.trainingPlanStepperData['contentList'].splice(index, 1)
+          this.tpdsSvc.trainingPlanStepperData['contentList'].splice(index, 1)
         }
       })
     }
@@ -77,7 +80,7 @@ export class StandardCardComponent implements OnInit, OnChanges {
   }
 
   deleteItem(item: any) {
-    this.trainingPlanDataSharingService.trainingPlanContentData.data.content.map((sitem: any) => {
+    this.tpdsSvc.trainingPlanContentData.data.content.map((sitem: any) => {
       if (sitem.identifier === item.identifier) {
         sitem['selected'] = false
       }
@@ -87,9 +90,9 @@ export class StandardCardComponent implements OnInit, OnChanges {
         this.contentData.splice(index, 1)
       }
     })
-    this.trainingPlanDataSharingService.trainingPlanStepperData['contentList'].filter((identifier: any, index: any) => {
+    this.tpdsSvc.trainingPlanStepperData['contentList'].filter((identifier: any, index: any) => {
       if (identifier === item.identifier) {
-        this.trainingPlanDataSharingService.trainingPlanStepperData['contentList'].splice(index, 1)
+        this.tpdsSvc.trainingPlanStepperData['contentList'].splice(index, 1)
       }
     })
   }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
index db30b9be2..01441f3e3 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
@@ -17,7 +17,10 @@ export class UserCardComponent implements OnInit, OnChanges {
   startIndex = 0
   lastIndex = 20
   pageSize = 20
-  constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService, private changeDetectorRef: ChangeDetectorRef) { }
+  constructor(
+    private tpdsSvc: TrainingPlanDataSharingService,
+    private changeDetectorRef: ChangeDetectorRef
+  ) { }
 
   ngOnInit() {
   }
@@ -39,57 +42,57 @@ export class UserCardComponent implements OnInit, OnChanges {
     if (event.checked) {
       // this.selectedContent.push(item);
       if (this.assigneeData && this.assigneeData.category === 'Designation') {
-        this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any, index: any) => {
+        this.tpdsSvc.trainingPlanAssigneeData.data.map((sitem: any, index: any) => {
           if (sitem.name === item.name) {
             sitem['selected'] = true
-            this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.splice(index, 1)
-            this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.unshift(sitem)
+            this.tpdsSvc.trainingPlanAssigneeData.data.splice(index, 1)
+            this.tpdsSvc.trainingPlanAssigneeData.data.unshift(sitem)
           }
         })
-        if (this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo']) {
-          this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].push(item.name)
+        if (this.tpdsSvc.trainingPlanStepperData['assignmentTypeInfo']) {
+          this.tpdsSvc.trainingPlanStepperData['assignmentTypeInfo'].push(item.name)
         }
       }
       if (this.assigneeData && this.assigneeData.category === 'CustomUser') {
-        this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any, index: any) => {
+        this.tpdsSvc.trainingPlanAssigneeData.data.map((sitem: any, index: any) => {
           if (sitem.userId === item.userId) {
             sitem['selected'] = true
-            this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.splice(index, 1)
-            this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.unshift(sitem)
+            this.tpdsSvc.trainingPlanAssigneeData.data.splice(index, 1)
+            this.tpdsSvc.trainingPlanAssigneeData.data.unshift(sitem)
           }
         })
-        if (this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo']) {
-          this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].push(item.userId)
+        if (this.tpdsSvc.trainingPlanStepperData['assignmentTypeInfo']) {
+          this.tpdsSvc.trainingPlanStepperData['assignmentTypeInfo'].push(item.userId)
         }
       }
 
     } else {
       // this.selectedContent = this.selectedContent.filter( sitem  => sitem.identifier !== item.identifier)
       if (this.assigneeData && this.assigneeData.category === 'Designation') {
-        this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
+        this.tpdsSvc.trainingPlanAssigneeData.data.map((sitem: any) => {
           if (sitem.name === item.name) {
             sitem['selected'] = false
           }
         })
-        if (this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'] && this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo']) {
-          this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier: any, index: any) => {
+        if (this.tpdsSvc.trainingPlanStepperData['assignmentTypeInfo'] && this.tpdsSvc.trainingPlanStepperData['assignmentTypeInfo']) {
+          this.tpdsSvc.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier: any, index: any) => {
             if (identifier === item.name) {
-              this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].splice(index, 1)
+              this.tpdsSvc.trainingPlanStepperData['assignmentTypeInfo'].splice(index, 1)
             }
           })
         }
 
       }
       if (this.assigneeData && this.assigneeData.category === 'CustomUser') {
-        this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
+        this.tpdsSvc.trainingPlanAssigneeData.data.map((sitem: any) => {
           if (sitem.userId === item.userId) {
             sitem['selected'] = false
           }
         })
-        if (this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo']) {
-          this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier: any, index: any) => {
+        if (this.tpdsSvc.trainingPlanStepperData['assignmentTypeInfo']) {
+          this.tpdsSvc.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier: any, index: any) => {
             if (identifier === item.userId) {
-              this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].splice(index, 1)
+              this.tpdsSvc.trainingPlanStepperData['assignmentTypeInfo'].splice(index, 1)
             }
           })
         }
@@ -102,7 +105,7 @@ export class UserCardComponent implements OnInit, OnChanges {
 
   deleteItem(item: any) {
     if (this.assigneeData && this.assigneeData.category === 'Designation') {
-      this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
+      this.tpdsSvc.trainingPlanAssigneeData.data.map((sitem: any) => {
         if (sitem.name === item.name) {
           sitem['selected'] = false
         }
@@ -112,15 +115,15 @@ export class UserCardComponent implements OnInit, OnChanges {
           this.assigneeData.data.splice(index, 1)
         }
       })
-      if(this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo']) {
-        this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier: any, index: any) => {
+      if (this.tpdsSvc.trainingPlanStepperData['assignmentTypeInfo']) {
+        this.tpdsSvc.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier: any, index: any) => {
           if (identifier === item.name) {
-            this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].splice(index, 1)
+            this.tpdsSvc.trainingPlanStepperData['assignmentTypeInfo'].splice(index, 1)
           }
         })
       }
     } else if (this.assigneeData && this.assigneeData.category === 'CustomUser') {
-      this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
+      this.tpdsSvc.trainingPlanAssigneeData.data.map((sitem: any) => {
         if (sitem.userId === item.userId) {
           sitem['selected'] = false
         }
@@ -130,10 +133,10 @@ export class UserCardComponent implements OnInit, OnChanges {
           this.assigneeData.data.splice(index, 1)
         }
       })
-      if (this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo']) {
-        this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier: any, index: any) => {
+      if (this.tpdsSvc.trainingPlanStepperData['assignmentTypeInfo']) {
+        this.tpdsSvc.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier: any, index: any) => {
           if (identifier === item.userId) {
-            this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].splice(index, 1)
+            this.tpdsSvc.trainingPlanStepperData['assignmentTypeInfo'].splice(index, 1)
           }
         })
       }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
index ce856be41..787df88f7 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
@@ -9,7 +9,7 @@
     <ws-app-user-card [assigneeData]="assigneeData" (handleSelectedChips)="handleSelectedChips($event)"
         *ngIf="assigneeData?.category === 'Designation' && assigneeData?.data?.length !== 0"
         [showPagination]="true"></ws-app-user-card>
-        
+
     <ws-app-user-card [assigneeData]="assigneeData" (handleSelectedChips)="handleSelectedChips($event)"
         *ngIf="assigneeData?.category === 'CustomUser' && assigneeData?.data?.length !== 0"
         [showPagination]="true"></ws-app-user-card>
@@ -24,7 +24,7 @@
     </div>
 </ng-container>
 
-<ng-container *ngIf="trainingPlanDataSharingService?.trainingPlanAssigneeData?.category === 'AllUser'">
+<ng-container *ngIf="tpdsSvc?.trainingPlanAssigneeData?.category === 'AllUser'">
     <div class="no-cbp-data margin-top-xl margin-bottom-xl">
         <div><img src="/assets/images/no-content-data.svg"></div>
         <div class="mat-subheading-1 margin-remove">It will assign to all users</div>
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
index f3067fbba..19e559c81 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
@@ -15,7 +15,7 @@ export class CreateAssigneeComponent implements OnInit {
   assigneeData: any
   selectAssigneeCount = 0
   selectedAssigneeChips: any[] = []
-  constructor(public trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
+  constructor(public tpdsSvc: TrainingPlanDataSharingService) { }
   from = 'assignee'
   ngOnInit() {
     this.categoryData = [
@@ -38,33 +38,33 @@ export class CreateAssigneeComponent implements OnInit {
   }
 
   handleApiData(event: any) {
-    if (event && this.trainingPlanDataSharingService.trainingPlanAssigneeData) {
-      if (this.trainingPlanDataSharingService.trainingPlanStepperData &&
-        this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Designation' &&
-        this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo) {
-        this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
-          if (this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.indexOf(sitem.name) > -1) {
+    if (event && this.tpdsSvc.trainingPlanAssigneeData) {
+      if (this.tpdsSvc.trainingPlanStepperData &&
+        this.tpdsSvc.trainingPlanAssigneeData.category === 'Designation' &&
+        this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo) {
+        this.tpdsSvc.trainingPlanAssigneeData.data.map((sitem: any) => {
+          if (this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo.indexOf(sitem.name) > -1) {
             sitem['selected'] = true
           }
         })
-        this.assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData
+        this.assigneeData = this.tpdsSvc.trainingPlanAssigneeData
         this.handleSelectedChips(true)
-      } else if (this.trainingPlanDataSharingService.trainingPlanStepperData &&
-        this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'CustomUser' &&
-        this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo) {
-        this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
-          if (this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.indexOf(sitem.userId) > -1) {
+      } else if (this.tpdsSvc.trainingPlanStepperData &&
+        this.tpdsSvc.trainingPlanAssigneeData.category === 'CustomUser' &&
+        this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo) {
+        this.tpdsSvc.trainingPlanAssigneeData.data.map((sitem: any) => {
+          if (this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo.indexOf(sitem.userId) > -1) {
             sitem['selected'] = true
           }
         })
-        this.assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData
+        this.assigneeData = this.tpdsSvc.trainingPlanAssigneeData
         this.handleSelectedChips(true)
       } else {
-        this.assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData
+        this.assigneeData = this.tpdsSvc.trainingPlanAssigneeData
         this.addAssigneeInvalid.emit(false)
       }
     } else {
-      if (this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'AllUser') {
+      if (this.tpdsSvc.trainingPlanAssigneeData.category === 'AllUser') {
         this.addAssigneeInvalid.emit(false)
       }
     }
@@ -74,8 +74,8 @@ export class CreateAssigneeComponent implements OnInit {
   handleSelectedChips(event: any) {
     this.selectAssigneeCount = 0
     if (event) {
-      if (this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Designation') {
-        this.selectedAssigneeChips = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data
+      if (this.tpdsSvc.trainingPlanAssigneeData.category === 'Designation') {
+        this.selectedAssigneeChips = this.tpdsSvc.trainingPlanAssigneeData.data
         if (this.selectedAssigneeChips) {
           this.selectedAssigneeChips.map((sitem: any) => {
             if (sitem.selected) {
@@ -83,8 +83,8 @@ export class CreateAssigneeComponent implements OnInit {
             }
           })
         }
-      } else if (this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'CustomUser') {
-        this.selectedAssigneeChips = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data
+      } else if (this.tpdsSvc.trainingPlanAssigneeData.category === 'CustomUser') {
+        this.selectedAssigneeChips = this.tpdsSvc.trainingPlanAssigneeData.data
 
         if (this.selectedAssigneeChips) {
           this.selectedAssigneeChips.map((sitem: any) => {
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
index 1c8f86014..31bfa706d 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
@@ -14,41 +14,41 @@ export class CreateTimelineComponent implements OnInit {
   dialogRef: any
   totalAssigneeCount: any = 0
   constructor(
-    private trainingPlanDataSharingService: TrainingPlanDataSharingService,
+    private tpdsSvc: TrainingPlanDataSharingService,
     public dialog: MatDialog) { }
 
   ngOnInit() {
-    if (this.trainingPlanDataSharingService.trainingPlanStepperData.status &&
-      this.trainingPlanDataSharingService.trainingPlanStepperData.status.toLowerCase() === 'live') {
+    if (this.tpdsSvc.trainingPlanStepperData.status &&
+      this.tpdsSvc.trainingPlanStepperData.status.toLowerCase() === 'live') {
       this.isContentLive = true
     }
-    if (this.trainingPlanDataSharingService.trainingPlanContentData &&
-      this.trainingPlanDataSharingService.trainingPlanContentData.data &&
-      this.trainingPlanDataSharingService.trainingPlanContentData.data.content
+    if (this.tpdsSvc.trainingPlanContentData &&
+      this.tpdsSvc.trainingPlanContentData.data &&
+      this.tpdsSvc.trainingPlanContentData.data.content
     ) {
-      this.contentData = this.trainingPlanDataSharingService.trainingPlanContentData.data.content.filter((item: any) => {
+      this.contentData = this.tpdsSvc.trainingPlanContentData.data.content.filter((item: any) => {
         return item.selected
       })
 
     }
-    if (this.trainingPlanDataSharingService.trainingPlanAssigneeData &&
-      this.trainingPlanDataSharingService.trainingPlanAssigneeData.data &&
-      this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Designation'
+    if (this.tpdsSvc.trainingPlanAssigneeData &&
+      this.tpdsSvc.trainingPlanAssigneeData.data &&
+      this.tpdsSvc.trainingPlanAssigneeData.category === 'Designation'
     ) {
-      const category = this.trainingPlanDataSharingService.trainingPlanAssigneeData.category
-      const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
+      const category = this.tpdsSvc.trainingPlanAssigneeData.category
+      const assigneeData = this.tpdsSvc.trainingPlanAssigneeData.data.filter((item: any) => {
         return item.selected
       })
       this.totalAssigneeCount = assigneeData.length
       assigneeData.slice(0, 4)
       this.assigneeData = { category, data: assigneeData }
     }
-    if (this.trainingPlanDataSharingService.trainingPlanAssigneeData &&
-      this.trainingPlanDataSharingService.trainingPlanAssigneeData.data &&
-      this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'CustomUser'
+    if (this.tpdsSvc.trainingPlanAssigneeData &&
+      this.tpdsSvc.trainingPlanAssigneeData.data &&
+      this.tpdsSvc.trainingPlanAssigneeData.category === 'CustomUser'
     ) {
-      const category = this.trainingPlanDataSharingService.trainingPlanAssigneeData.category
-      const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
+      const category = this.tpdsSvc.trainingPlanAssigneeData.category
+      const assigneeData = this.tpdsSvc.trainingPlanAssigneeData.data.filter((item: any) => {
         return item.selected
       })
       this.totalAssigneeCount = assigneeData.length
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
index 7382ada26..a1dbe5e5d 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
@@ -19,7 +19,7 @@ export class PreviewPlanComponent implements OnInit {
   constructor(
     private router: Router,
     private route: ActivatedRoute,
-    private trainingPlanDataSharingService: TrainingPlanDataSharingService) { }
+    private tpdsSvc: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
     // this.from = this.route.snapshot.queryParams['from']
@@ -92,22 +92,22 @@ export class PreviewPlanComponent implements OnInit {
         this.allContentChips = arr
       }
     } else if (this.form === 'content') {
-      if (this.trainingPlanDataSharingService.trainingPlanContentData &&
-        this.trainingPlanDataSharingService.trainingPlanContentData.data) {
-        this.contentList = this.trainingPlanDataSharingService.trainingPlanContentData.data.content.filter((item: any) => {
+      if (this.tpdsSvc.trainingPlanContentData &&
+        this.tpdsSvc.trainingPlanContentData.data) {
+        this.contentList = this.tpdsSvc.trainingPlanContentData.data.content.filter((item: any) => {
           return item.selected
         })
       }
     } else if (this.form === 'assignee') {
-      if (this.trainingPlanDataSharingService.trainingPlanAssigneeData) {
-        const category = this.trainingPlanDataSharingService.trainingPlanAssigneeData.category
+      if (this.tpdsSvc.trainingPlanAssigneeData) {
+        const category = this.tpdsSvc.trainingPlanAssigneeData.category
         if (category === 'Designation') {
-          const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
+          const assigneeData = this.tpdsSvc.trainingPlanAssigneeData.data.filter((item: any) => {
             return item.selected
           })
           this.assigneeData = { category, data: assigneeData }
         } else if (category === 'CustomUser') {
-          const assigneeData = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.filter((item: any) => {
+          const assigneeData = this.tpdsSvc.trainingPlanAssigneeData.data.filter((item: any) => {
             return item.selected
           })
           this.assigneeData = { category, data: assigneeData }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.ts
index 6531fa7e5..5511dbe86 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.ts
@@ -15,14 +15,14 @@ import { Subscription } from 'rxjs'
 export class TrainingPlanHomeComponent implements OnInit, AfterViewInit, OnDestroy {
   showModeratedNotification = false
   private subscr: Subscription = new Subscription()
-  constructor(private trainingPlanDataSharingService: TrainingPlanDataSharingService
+  constructor(private tpdsSvc: TrainingPlanDataSharingService
   ) {
 
   }
   ngOnInit() {
-    this.subscr = this.subscr.add(this.trainingPlanDataSharingService.moderatedCourseSelectStatus.subscribe(status => {
+    this.subscr = this.subscr.add(this.tpdsSvc.moderatedCourseSelectStatus.subscribe(status => {
       if (status) {
-          this.showModeratedNotification = true
+        this.showModeratedNotification = true
       } else {
         this.showModeratedNotification = false
       }
diff --git a/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts b/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
index 1fc9ce6ac..b0ab808a8 100644
--- a/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
+++ b/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
@@ -31,7 +31,7 @@ export class TrainingPlanService {
   }
 
   readPlan(planId: any) {
-    return this.http.get<any>(API_END_POINTS.READ_PLAN + `/${planId}`)
+    return this.http.get<any>(`${API_END_POINTS.READ_PLAN}/${planId}`)
   }
 
   updatePlan(obj: any) {

From 01133eec87f3517dc99b5b7864b38e2abf1039c9 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Wed, 27 Dec 2023 12:04:58 +0530
Subject: [PATCH 388/887] update for optional checks

---
 .../components/chip/chip.component.ts         | 10 ++++-----
 .../components/filter/filter.component.ts     | 22 +++++++++----------
 .../components/search/search.component.ts     | 16 +++++++++-----
 .../user-card/user-card.component.ts          |  2 +-
 .../create-assignee.component.ts              |  8 +++----
 5 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
index 3726b35b9..eedafc258 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
@@ -27,13 +27,13 @@ export class ChipComponent implements OnInit, OnChanges {
 
   ngOnChanges() {
     this.selectedContentChips.map((sitem: any, index: any) => {
-      if (sitem.selected) {
+      if (sitem && sitem.selected) {
         this.selectedContentChips.splice(index, 1)
         this.selectedContentChips.unshift(sitem)
       }
     })
     this.selectedAssigneeChips.map((sitem: any, index: any) => {
-      if (sitem.selected) {
+      if (sitem && sitem.selected) {
         this.selectedAssigneeChips.splice(index, 1)
         this.selectedAssigneeChips.unshift(sitem)
       }
@@ -44,7 +44,7 @@ export class ChipComponent implements OnInit, OnChanges {
     if (this.from === 'content') {
       this.selectContentCount = 0
       this.tpdsSvc.trainingPlanContentData.data.content.map((sitem: any) => {
-        if (sitem['selected']) {
+        if (sitem && sitem['selected']) {
           sitem['selected'] = false
         }
       })
@@ -75,7 +75,7 @@ export class ChipComponent implements OnInit, OnChanges {
 
   removeContent(item: any) {
     this.tpdsSvc.trainingPlanContentData.data.content.map((sitem: any) => {
-      if (sitem['selected'] && sitem['identifier'] === item['identifier']) {
+      if (sitem && sitem['selected'] && sitem['identifier'] === item['identifier']) {
         sitem['selected'] = false
       }
     })
@@ -100,7 +100,7 @@ export class ChipComponent implements OnInit, OnChanges {
       }
     } else if (this.tpdsSvc.trainingPlanAssigneeData.category === 'CustomUser') {
       this.tpdsSvc.trainingPlanAssigneeData.data.map((sitem: any) => {
-        if (sitem['selected'] && sitem['userId'] === item['userId']) {
+        if (sitem && sitem['selected'] && sitem['userId'] === item['userId']) {
           sitem['selected'] = false
         }
       })
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index 5a848c9a7..5a2bccb57 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -13,7 +13,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
   @Output() getFilterData = new EventEmitter()
   @Input() clearFilterFlag: any
   @Input() from: any
-  @Input() designationList: any
+  @Input() designationList: any = []
   providersList: any[] = []
   selectedProviders: any[] = []
   competencyTypeList = [{ id: 'Behavioral', name: 'Behavioural' }, { id: 'Functional', name: 'Functional' }, { id: 'Domain', name: 'Domain' }]
@@ -37,6 +37,9 @@ export class FilterComponent implements OnInit, AfterContentChecked {
       //   this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Custom Users') {
       //   this.getDesignation();
       // }
+      if (!this.designationList.length) {
+        this.getDesignation()
+      }
 
     }
 
@@ -175,7 +178,6 @@ export class FilterComponent implements OnInit, AfterContentChecked {
     } else {
       this.getFilterData.emit(this.assigneeFilterObj)
     }
-    this.toggleFilter.emit(false)
   }
 
   clearFilter() {
@@ -195,7 +197,6 @@ export class FilterComponent implements OnInit, AfterContentChecked {
         element['checked'] = false
       })
     }
-
   }
 
   clearFilterWhileSearch() {
@@ -206,15 +207,14 @@ export class FilterComponent implements OnInit, AfterContentChecked {
     }
   }
 
-  // getDesignation() {
-  //   this.trainingPlanService.getDesignations().subscribe((res: any) => {
-  //     console.log('res', res)
-  //     if(res && res.result && res.result.response) {
-  //       this.designationList = res.result.response.content;
-  //     }
+  getDesignation() {
+    this.trainingPlanService.getDesignations().subscribe((res: any) => {
+      if (res && res.result && res.result.response) {
+        this.designationList = res.result.response.content
+      }
 
-  //   })
-  // }
+    })
+  }
 
   manageSelectedGroup(event: any, group: any) {
     if (event) {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index ae8aeb511..05162e49b 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -183,8 +183,17 @@ export class SearchComponent implements OnInit {
       },
     }
     this.trainingPlanService.getCustomUsers(filterObj).subscribe((res: any) => {
-      console.log(this.tpdsSvc.trainingPlanAssigneeData);
-      this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: res.content }
+      if(this.tpdsSvc.trainingPlanAssigneeData.data && this.tpdsSvc.trainingPlanAssigneeData.data.content) {
+        let finArr = this.tpdsSvc.trainingPlanAssigneeData.data.content.map((sitem:any)=>{
+          if(sitem) {
+            sitem['selected'] = true;
+          }            
+        })
+        this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: _.concat(finArr, res.content)}  
+      } else {
+        this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: res.content }
+      }
+      
       this.handleApiData.emit(true)
       this.loadingService.changeLoaderState(false)
     }, (_error: any) => {
@@ -202,21 +211,18 @@ export class SearchComponent implements OnInit {
   getDesignations(event: any) {
     this.loadingService.changeLoaderState(true)
     this.trainingPlanService.getDesignations().subscribe((res: any) => {
-      console.log('res', res)
       if (this.searchText) {
         let resArr = res.result.response.content.filter((ditem: any) => {
           if (ditem.name.includes(this.searchText)) {
             return ditem
           }
         })
-        console.log(this.tpdsSvc.trainingPlanAssigneeData.data);
         if(this.tpdsSvc.trainingPlanAssigneeData.data) {
           let finArr = this.tpdsSvc.trainingPlanAssigneeData.data.filter((sitem:any)=>{
             if(sitem.selected) {
               return sitem
             }            
           })
-          console.log(finArr,resArr );
           this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: _.concat(finArr, resArr)}  
         } else {
           this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: resArr}
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
index db30b9be2..a67267897 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
@@ -112,7 +112,7 @@ export class UserCardComponent implements OnInit, OnChanges {
           this.assigneeData.data.splice(index, 1)
         }
       })
-      if(this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo']) {
+      if (this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo']) {
         this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].filter((identifier: any, index: any) => {
           if (identifier === item.name) {
             this.trainingPlanDataSharingService.trainingPlanStepperData['assignmentTypeInfo'].splice(index, 1)
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
index f3067fbba..a410c782a 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
@@ -43,7 +43,7 @@ export class CreateAssigneeComponent implements OnInit {
         this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'Designation' &&
         this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo) {
         this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
-          if (this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.indexOf(sitem.name) > -1) {
+          if (sitem && this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.indexOf(sitem.name) > -1) {
             sitem['selected'] = true
           }
         })
@@ -53,7 +53,7 @@ export class CreateAssigneeComponent implements OnInit {
         this.trainingPlanDataSharingService.trainingPlanAssigneeData.category === 'CustomUser' &&
         this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo) {
         this.trainingPlanDataSharingService.trainingPlanAssigneeData.data.map((sitem: any) => {
-          if (this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.indexOf(sitem.userId) > -1) {
+          if (sitem && this.trainingPlanDataSharingService.trainingPlanStepperData.assignmentTypeInfo.indexOf(sitem.userId) > -1) {
             sitem['selected'] = true
           }
         })
@@ -78,7 +78,7 @@ export class CreateAssigneeComponent implements OnInit {
         this.selectedAssigneeChips = this.trainingPlanDataSharingService.trainingPlanAssigneeData.data
         if (this.selectedAssigneeChips) {
           this.selectedAssigneeChips.map((sitem: any) => {
-            if (sitem.selected) {
+            if (sitem && sitem.selected) {
               this.selectAssigneeCount = this.selectAssigneeCount + 1
             }
           })
@@ -88,7 +88,7 @@ export class CreateAssigneeComponent implements OnInit {
 
         if (this.selectedAssigneeChips) {
           this.selectedAssigneeChips.map((sitem: any) => {
-            if (sitem.selected) {
+            if (sitem && sitem.selected) {
               this.selectAssigneeCount = this.selectAssigneeCount + 1
             }
           })

From 03aba8a49dda2dc44649de12f815c2475509cda7 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Wed, 27 Dec 2023 13:00:50 +0530
Subject: [PATCH 389/887] updated package version

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index d939e7193..9351e39ca 100644
--- a/package.json
+++ b/package.json
@@ -42,11 +42,11 @@
     "@angular/router": "~8.2.1",
     "@angular/service-worker": "~8.2.1",
     "@project-sunbird/telemetry-sdk": "0.0.26",
-    "@sunbird-cb/collection": "^1.0.35",
+    "@sunbird-cb/collection": "^1.0.38",
     "@sunbird-cb/design-system": "0.0.1",
     "@sunbird-cb/rain-dashboards": "0.4.22-rc.1",
     "@sunbird-cb/resolver": "^1.0.0",
-    "@sunbird-cb/utils": "^1.0.14",
+    "@sunbird-cb/utils": "^1.0.15",
     "@types/file-saver": "^2.0.1",
     "@sunbird-cb/micro-surveys": "2.0.13",
     "brace": "^0.11.1",

From 433970e1eb2e1ebdea74a960ca1eef26d92d86e1 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Wed, 27 Dec 2023 15:06:30 +0530
Subject: [PATCH 390/887] blocker fix for moderated course

---
 .../components/search/search.component.ts     | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 16a04dd8f..6a1299ee6 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -5,6 +5,7 @@ import { TrainingPlanService } from './../../services/traininig-plan.service'
 import { TrainingPlanDataSharingService } from './../../services/training-plan-data-share.service'
 /* tslint:disable */
 import _ from 'lodash'
+/* tslint:enable */
 import { LoaderService } from '../../../../../../../../../src/app/services/loader.service'
 @Component({
   selector: 'ws-app-search',
@@ -126,28 +127,14 @@ export class SearchComponent implements OnInit {
         }
       }
       this.trainingPlanService.getAllContent(filterObj).subscribe((res: any) => {
-        // if (this.tpdsSvc.trainingPlanContentData && this.tpdsSvc.trainingPlanContentData.data && this.tpdsSvc.trainingPlanContentData.data.content) {
-        //   this.tpdsSvc.trainingPlanContentData = {
-        //     category: contentType,
-        //     data: { content: _.uniqBy(_.concat(this.tpdsSvc.trainingPlanContentData.data.content, res.content), 'identifier') }
-        //   }
-        // } else {
         let finResult = []
         if (this.tpdsSvc.trainingPlanContentData.data && this.tpdsSvc.trainingPlanContentData.data && this.tpdsSvc.trainingPlanContentData.data.content) {
           finResult = this.tpdsSvc.trainingPlanContentData.data.content.filter((sitem: any) => {
             return sitem.selected
           })
         }
-        console.log('finResult', finResult)
-        let result = { count: res.count, content: _.uniqBy(_.concat(finResult, res.content), 'identifier') }
-        console.log(result)
+        let result = { count: res.count, content: _.uniqBy(_.concat(finResult, (res.content) ? res.content : []), 'identifier') }
         this.tpdsSvc.trainingPlanContentData = { category: contentType, data: result, count: res.count }
-
-        // else {
-        //   this.tpdsSvc.trainingPlanContentData = { category: contentType, data: res, count: res.count }
-        // }
-        console.log(this.tpdsSvc.trainingPlanContentData)
-        // }
         this.handleApiData.emit(true)
         this.loadingService.changeLoaderState(false)
       })
@@ -183,7 +170,6 @@ export class SearchComponent implements OnInit {
       },
     }
     this.trainingPlanService.getCustomUsers(filterObj).subscribe((res: any) => {
-      console.log(this.tpdsSvc.trainingPlanAssigneeData)
       this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: res.content }
       this.handleApiData.emit(true)
       this.loadingService.changeLoaderState(false)
@@ -208,7 +194,6 @@ export class SearchComponent implements OnInit {
             return ditem
           }
         })
-        console.log(this.tpdsSvc.trainingPlanAssigneeData.data)
         if (this.tpdsSvc.trainingPlanAssigneeData.data) {
           let finArr = this.tpdsSvc.trainingPlanAssigneeData.data.filter((sitem: any) => {
             if (sitem && sitem.selected) {

From f609724120e766242bfc00fc00df794090bfa178 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Wed, 27 Dec 2023 16:05:10 +0530
Subject: [PATCH 391/887] fix lint errors

---
 .../components/search/search.component.ts     | 105 ++++++++++--------
 1 file changed, 58 insertions(+), 47 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 6a1299ee6..23ed5fe13 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -14,21 +14,21 @@ import { LoaderService } from '../../../../../../../../../src/app/services/loade
 })
 export class SearchComponent implements OnInit {
   @Input() categoryData: any = []
-  @Input() from: any = '';
-  @Output() handleApiData = new EventEmitter();
+  @Input() from: any = ''
+  @Output() handleApiData = new EventEmitter()
   searchText = ''
   filterVisibilityFlag = false
-  clearFilter = false;
+  clearFilter = false
   selectedDropDownValue: any
-  designationList: any[] = [];
-  pageIndex = 0;
-  pageSize = 20;
-  isContentLive: boolean = false
+  designationList: any[] = []
+  pageIndex = 0
+  pageSize = 20
+  isContentLive = false
   constructor(@Inject(DOCUMENT) private document: Document,
-    private trainingPlanService: TrainingPlanService,
-    private route: ActivatedRoute,
-    public tpdsSvc: TrainingPlanDataSharingService,
-    private loadingService: LoaderService
+              private trainingPlanService: TrainingPlanService,
+              private route: ActivatedRoute,
+              public tpdsSvc: TrainingPlanDataSharingService,
+              private loadingService: LoaderService
   ) { }
 
   ngOnInit() {
@@ -45,10 +45,6 @@ export class SearchComponent implements OnInit {
     }
   }
 
-  ngOnChanges() {
-
-  }
-
   openFilter() {
     this.filterVisibilityFlag = true
     if (this.document.getElementById('top-nav-bar')) {
@@ -76,7 +72,9 @@ export class SearchComponent implements OnInit {
         // if(this.tpdsSvc.trainingPlanContentData && this.tpdsSvc.trainingPlanContentData.data) {
         //   this.tpdsSvc.trainingPlanContentData.data = []
         // }
+        /* tslint:disable */
         event = !event ? 'Course' : event
+        /* tslint:enable */
         this.getContent(event)
         break
       case 'assignee':
@@ -84,7 +82,9 @@ export class SearchComponent implements OnInit {
         //   this.tpdsSvc.trainingPlanAssigneeData.data = []
         //   this.tpdsSvc.trainingPlanStepperData['assignmentTypeInfo']=[]
         // }
+        /* tslint:disable */
         event = !event ? 'Designation' : event
+        /* tslint:enable */
         if (event === 'Designation') {
           this.getDesignations(event)
         } else if (event === 'CustomUser') {
@@ -104,36 +104,43 @@ export class SearchComponent implements OnInit {
       }
       if (this.searchText) {
         this.tpdsSvc.clearFilter.next(true)
+        /* tslint:disable */
         applyFilterObj = {}
+        /* tslint:enable */
       }
       const filterObj = {
-        "request": {
-          "secureSettings": contentType === 'Moderated Course' ? true : false, // for moderated course
-          "filters": {
-            "primaryCategory": [contentType === 'Moderated Course' ? 'Course' : contentType],
-            "organisation": applyFilterObj && applyFilterObj['providers'] && applyFilterObj['providers'].length ? applyFilterObj['providers'] : [],
-            "competencies_v5.competencyArea": applyFilterObj && applyFilterObj['competencyArea'] && applyFilterObj['competencyArea'].length ? applyFilterObj['competencyArea'] : [],
-            "competencies_v5.competencyTheme": applyFilterObj && applyFilterObj['competencyTheme'] && applyFilterObj['competencyTheme'].length ? applyFilterObj['competencyTheme'] : [],
-            "competencies_v5.competencySubTheme": applyFilterObj && applyFilterObj['competencySubTheme'] && applyFilterObj['competencySubTheme'].length ? applyFilterObj['competencySubTheme'] : []
+        request: {
+          secureSettings: contentType === 'Moderated Course' ? true : false, // for moderated course
+          filters: {
+            primaryCategory: [contentType === 'Moderated Course' ? 'Course' : contentType],
+            /* tslint:disable */
+            organisation: applyFilterObj && applyFilterObj['providers'] && applyFilterObj['providers'].length ? applyFilterObj['providers'] : [],
+            'competencies_v5.competencyArea': applyFilterObj && applyFilterObj['competencyArea'] && applyFilterObj['competencyArea'].length ? applyFilterObj['competencyArea'] : [],
+            'competencies_v5.competencyTheme': applyFilterObj && applyFilterObj['competencyTheme'] && applyFilterObj['competencyTheme'].length ? applyFilterObj['competencyTheme'] : [],
+            'competencies_v5.competencySubTheme': applyFilterObj && applyFilterObj['competencySubTheme'] && applyFilterObj['competencySubTheme'].length ? applyFilterObj['competencySubTheme'] : [],
+            /* tslint:enable */
           },
-          "offset": this.pageIndex,
-          "limit": this.pageSize,
-          "query": (this.searchText) ? this.searchText : '',
-          "sort_by": { "lastUpdatedOn": "desc" },
-          "fields": ["name", "appIcon", "instructions", "description", "purpose", "mimeType",
-            "gradeLevel", "identifier", "medium", "resourceType",
-            "primaryCategory", "contentType", "channel", "organisation", "trackable", "posterImage",
-            "idealScreenSize", "learningMode", "creatorLogo", "duration", "programDuration", "version", "avgRating", "competencies_v5", "secureSettings"]
-        }
+          offset: this.pageIndex,
+          limit: this.pageSize,
+          query: (this.searchText) ? this.searchText : '',
+          sort_by: { lastUpdatedOn: 'desc' },
+          fields: ['name', 'appIcon', 'instructions', 'description', 'purpose', 'mimeType',
+            'gradeLevel', 'identifier', 'medium', 'resourceType',
+            'primaryCategory', 'contentType', 'channel', 'organisation', 'trackable', 'posterImage',
+            'idealScreenSize', 'learningMode', 'creatorLogo', 'duration', 'programDuration',
+            'version', 'avgRating', 'competencies_v5', 'secureSettings'],
+        },
       }
       this.trainingPlanService.getAllContent(filterObj).subscribe((res: any) => {
         let finResult = []
-        if (this.tpdsSvc.trainingPlanContentData.data && this.tpdsSvc.trainingPlanContentData.data && this.tpdsSvc.trainingPlanContentData.data.content) {
+        if (this.tpdsSvc.trainingPlanContentData.data
+          && this.tpdsSvc.trainingPlanContentData.data
+          && this.tpdsSvc.trainingPlanContentData.data.content) {
           finResult = this.tpdsSvc.trainingPlanContentData.data.content.filter((sitem: any) => {
             return sitem.selected
           })
         }
-        let result = { count: res.count, content: _.uniqBy(_.concat(finResult, (res.content) ? res.content : []), 'identifier') }
+        const result = { count: res.count, content: _.uniqBy(_.concat(finResult, (res.content) ? res.content : []), 'identifier') }
         this.tpdsSvc.trainingPlanContentData = { category: contentType, data: result, count: res.count }
         this.handleApiData.emit(true)
         this.loadingService.changeLoaderState(false)
@@ -147,7 +154,9 @@ export class SearchComponent implements OnInit {
     const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
     if (this.searchText) {
       this.tpdsSvc.clearFilter.next(true)
+      /* tslint:disable */
       applyFilterObj = {}
+      /* tslint:enable */
     }
     const filterObj = {
       request: {
@@ -155,15 +164,17 @@ export class SearchComponent implements OnInit {
         filters: {
           rootOrgId,
           status: 1,
-          "profileDetails.professionalDetails.designation": applyFilterObj && applyFilterObj.designation && applyFilterObj.designation.length ? applyFilterObj.designation : [],
-          "profileDetails.professionalDetails.group": applyFilterObj && applyFilterObj.group && applyFilterObj.group.length ? applyFilterObj.group : [],
+          /* tslint:disable */
+          'profileDetails.professionalDetails.designation': applyFilterObj && applyFilterObj.designation && applyFilterObj.designation.length ? applyFilterObj.designation : [],
+          'profileDetails.professionalDetails.group': applyFilterObj && applyFilterObj.group && applyFilterObj.group.length ? applyFilterObj.group : [],
+          /* tslint:disable */
         },
-        "fields": [
-          "userId",
-          "firstName",
-          "rootOrgName",
-          "profileDetails",
-          "organisations"
+        fields: [
+          'userId',
+          'firstName',
+          'rootOrgName',
+          'profileDetails',
+          'organisations',
         ],
         limit: 500,
         offset: 0,
@@ -173,14 +184,14 @@ export class SearchComponent implements OnInit {
       this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: res.content }
       this.handleApiData.emit(true)
       this.loadingService.changeLoaderState(false)
-    }, (_error: any) => {
+    },                                                           (_error: any) => {
     })
   }
 
   getAllUsers(_event: any) {
     this.tpdsSvc.trainingPlanAssigneeData = { category: _event, data: [_event] }
     this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo = [
-      "AllUser"
+      'AllUser',
     ]
     this.handleApiData.emit(true)
   }
@@ -189,13 +200,13 @@ export class SearchComponent implements OnInit {
     this.loadingService.changeLoaderState(true)
     this.trainingPlanService.getDesignations().subscribe((res: any) => {
       if (this.searchText) {
-        let resArr = res.result.response.content.filter((ditem: any) => {
+        const resArr = res.result.response.content.filter((ditem: any) => {
           if (ditem.name.includes(this.searchText)) {
             return ditem
           }
         })
         if (this.tpdsSvc.trainingPlanAssigneeData.data) {
-          let finArr = this.tpdsSvc.trainingPlanAssigneeData.data.filter((sitem: any) => {
+          const finArr = this.tpdsSvc.trainingPlanAssigneeData.data.filter((sitem: any) => {
             if (sitem && sitem.selected) {
               return sitem
             }
@@ -238,7 +249,7 @@ export class SearchComponent implements OnInit {
   }
 
   getFilterData(event: any) {
-    if (this.from == 'content') {
+    if (this.from === 'content') {
       this.getContent(this.selectedDropDownValue, event)
     } else {
       this.getCustomUsers(this.selectedDropDownValue, event)

From 019698e60ea5f5897a6cfd9f0cbc47d5f8b02b13 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Thu, 28 Dec 2023 08:53:36 +0530
Subject: [PATCH 392/887] updated the live update and publish and few other
 changes

---
 .../breadcrumb/breadcrumb.component.html      |  9 ++-
 .../breadcrumb/breadcrumb.component.ts        | 70 +++++++++++++++----
 .../standard-card/standard-card.component.ts  |  3 +
 .../user-card/user-card.component.scss        |  4 +-
 .../create-timeline.component.html            |  2 +-
 .../create-timeline.component.ts              | 16 ++---
 .../preview-plan/preview-plan.component.html  |  7 +-
 7 files changed, 81 insertions(+), 30 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
index 35de72f6a..3755ab919 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
@@ -40,10 +40,15 @@
         </ng-container>
         <ng-container *ngIf="editState">
             <button mat-button class="next-btn margin-left-m" (click)="updatePlan()"
-                *ngIf="tabType.ADD_TIMELINE === selectedTab" [ngClass]="{'btn-disabled': checkIfValid()}"
-                [disabled]="checkIfValid()">
+                *ngIf="tabType.ADD_TIMELINE === selectedTab && !isLiveContent"
+                [ngClass]="{'btn-disabled': checkIfValid()}" [disabled]="checkIfValid()">
                 <span>Update Draft</span>
             </button>
+            <button mat-button class="next-btn margin-left-m" (click)="updatePlan()"
+                *ngIf="tabType.ADD_TIMELINE === selectedTab && isLiveContent"
+                [ngClass]="{'btn-disabled': checkIfValid()}" [disabled]="checkIfValid()">
+                <span>Update and publish</span>
+            </button>
         </ng-container>
     </div>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
index da06906c0..3fb63677e 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
-import { MatDialog } from '@angular/material'
+import { MatDialog, MatSnackBar } from '@angular/material'
 import { ActivatedRoute, Router } from '@angular/router'
 import { ConfirmationBoxComponent } from '../confirmation-box/confirmation.box.component'
 import { TrainingPlanContent } from '../../models/training-plan.model'
@@ -20,15 +20,25 @@ export class BreadcrumbComponent implements OnInit {
   public dialogRef: any
   tabType = TrainingPlanContent.TTabLabelKey
   editState = false
+  isLiveContent = false
+  contentData: any
   constructor(
     private router: Router,
     private activeRoute: ActivatedRoute,
     public dialog: MatDialog,
     public tpdsSvc: TrainingPlanDataSharingService,
-    private tpSvc: TrainingPlanService) { }
+    private tpSvc: TrainingPlanService,
+    private snackBar: MatSnackBar,
+  ) { }
 
   ngOnInit() {
     this.editState = this.activeRoute.snapshot.data['contentData'] ? true : false
+    this.contentData = this.activeRoute.snapshot.data['contentData']
+    if (this.contentData) {
+      if (this.contentData.status.toLowerCase() === 'live') {
+        this.isLiveContent = true
+      }
+    }
     this.checkIfDisabled()
   }
 
@@ -140,7 +150,7 @@ export class BreadcrumbComponent implements OnInit {
             tabSelected: this.tpdsSvc.trainingPlanStepperData.assignmentType,
           },
         })
-      },         1000)
+      }, 1000)
     })
   }
 
@@ -174,17 +184,51 @@ export class BreadcrumbComponent implements OnInit {
     this.showDialogBox('progress')
     this.tpSvc.updatePlan(obj).subscribe((_data: any) => {
       this.dialogRef.close()
-      this.showDialogBox('progress-completed')
-      setTimeout(() => {
+      if (this.isLiveContent) {
+        this.publishPlan()
+      } else {
+        this.showDialogBox('progress-completed')
+        setTimeout(() => {
+          this.dialogRef.close()
+          this.tpdsSvc.trainingPlanTitle = ''
+          this.router.navigate(['app', 'home', 'training-plan-dashboard'], {
+            queryParams: {
+              type: this.tpdsSvc.trainingPlanStepperData.status.toLowerCase(),
+              tabSelected: this.tpdsSvc.trainingPlanStepperData.assignmentType,
+            },
+          })
+        }, 1000)
+      }
+    })
+  }
+
+  publishPlan() {
+    const obj = {
+      request: {
+        id: this.contentData.id,
+        comment: 'CBP plan approved',
+      },
+    }
+    this.tpSvc.publishPlan(obj).subscribe((data: any) => {
+      if (data && data.params && data.params.status && data.params.status.toLowerCase() === 'success') {
+        this.showDialogBox('progress-completed')
+        setTimeout(() => {
+          this.dialogRef.close()
+          this.tpdsSvc.trainingPlanTitle = ''
+          this.router.navigate(['app', 'home', 'training-plan-dashboard'], {
+            queryParams: {
+              type: this.tpdsSvc.trainingPlanStepperData.status.toLowerCase(),
+              tabSelected: this.tpdsSvc.trainingPlanStepperData.assignmentType,
+            },
+          })
+        }, 1000)
+      } else {
+        this.snackBar.open('Something went wrong while publishing CBP plan. Try again later')
         this.dialogRef.close()
-        this.tpdsSvc.trainingPlanTitle = ''
-        this.router.navigate(['app', 'home', 'training-plan-dashboard'], {
-          queryParams: {
-            type: this.tpdsSvc.trainingPlanStepperData.status.toLowerCase(),
-            tabSelected: this.tpdsSvc.trainingPlanStepperData.assignmentType,
-          },
-        })
-      },         1000)
+      }
+    }, (_error: any) => {
+      this.snackBar.open('Something went wrong while publishing CBP plan. Try again later')
+      this.dialogRef.close()
     })
   }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
index 14fabe4a6..91deba209 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
@@ -33,6 +33,9 @@ export class StandardCardComponent implements OnInit, OnChanges {
     this.tpdsSvc.clearFilter.subscribe(() => {
       this.resetPageIndex()
     })
+    if (this.tpdsSvc.trainingPlanStepperData.status && this.tpdsSvc.trainingPlanStepperData.status.toLowerCase() === 'live') {
+      this.showDeleteFlag = false
+    }
   }
 
   ngOnChanges() {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
index 0ee43e25f..620419dee 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
@@ -1,5 +1,5 @@
 .assignee-card-container {
-    margin-top: 20px
+    margin-top: 30px
 }
 
 .assignee-card {
@@ -65,7 +65,7 @@
 /** Custom User **/
 
 .custom-user-card-container {
-    margin-top: 20px
+    margin-top: 30px
 }
 
 .custom-user-card {
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
index 383f89cec..50b710fde 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
@@ -14,7 +14,7 @@
         [showDeleteFlag]="true" [ngClass]="{'disable': isContentLive}"></ws-app-standard-card>
 </ng-container>
 <ng-container *ngIf="assigneeData && (assigneeData?.data?.length || assigneeData?.data?.content?.length)">
-    <div class="margin-top-xl">
+    <div class="margin-top-m">
         <div class=" flex flex-middle flex-between">
             <div class="mat-subheading-1 margin-remove">Selected Assignee
                 <span *ngIf="totalAssigneeCount > 0">
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
index 31bfa706d..adf4eff19 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
@@ -36,24 +36,24 @@ export class CreateTimelineComponent implements OnInit {
       this.tpdsSvc.trainingPlanAssigneeData.category === 'Designation'
     ) {
       const category = this.tpdsSvc.trainingPlanAssigneeData.category
-      const assigneeData = this.tpdsSvc.trainingPlanAssigneeData.data.filter((item: any) => {
+      let assigneeDataSelected = this.tpdsSvc.trainingPlanAssigneeData.data.filter((item: any) => {
         return item.selected
       })
-      this.totalAssigneeCount = assigneeData.length
-      assigneeData.slice(0, 4)
-      this.assigneeData = { category, data: assigneeData }
+      this.totalAssigneeCount = assigneeDataSelected.length
+      assigneeDataSelected = assigneeDataSelected.slice(0, 4)
+      this.assigneeData = { category, data: assigneeDataSelected }
     }
     if (this.tpdsSvc.trainingPlanAssigneeData &&
       this.tpdsSvc.trainingPlanAssigneeData.data &&
       this.tpdsSvc.trainingPlanAssigneeData.category === 'CustomUser'
     ) {
       const category = this.tpdsSvc.trainingPlanAssigneeData.category
-      const assigneeData = this.tpdsSvc.trainingPlanAssigneeData.data.filter((item: any) => {
+      let assigneeDataSelected = this.tpdsSvc.trainingPlanAssigneeData.data.filter((item: any) => {
         return item.selected
       })
-      this.totalAssigneeCount = assigneeData.length
-      assigneeData.slice(0, 4)
-      this.assigneeData = { category, data: assigneeData }
+      this.totalAssigneeCount = assigneeDataSelected.length
+      assigneeDataSelected = assigneeDataSelected.slice(0, 4)
+      this.assigneeData = { category, data: assigneeDataSelected }
     }
   }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
index c72fb8e06..c2766e1aa 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
@@ -9,11 +9,10 @@
     <div class="flex flex-row justify-center max-height-400"><ws-app-standard-card [checkboxVisibility]="false"
             [contentData]="contentList" [showDeleteFlag]="true"></ws-app-standard-card></div>
 </div>
-<div class="flex mt-10 flex-col" *ngIf="form==='assignee'">
-    <div class="mat-subheading-1 margin-remove margin-bottom-m">Selected Assignee <span
-            *ngIf="assigneeData?.data?.length"> (
+<div class="flex flex-col" *ngIf="form==='assignee'">
+    <div class="mat-subheading-1 margin-remove">Selected Assignee <span *ngIf="assigneeData?.data?.length"> (
             {{assigneeData?.data?.length}} )</span></div>
-    <div class="mt-10 flex flex-row justify-center"><ws-app-user-card [checkboxVisibility]="false"
+    <div class="mt-4 flex flex-row justify-center"><ws-app-user-card [checkboxVisibility]="false"
             [assigneeData]="assigneeData" [showDeleteFlag]="true"></ws-app-user-card></div>
 </div>
 <div class="flex content-container" *ngIf="form === 'all'">

From f5afb66ab625e184ada0f9441b5d73bddd384c9e Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Thu, 28 Dec 2023 09:24:44 +0530
Subject: [PATCH 393/887] updated collection version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9351e39ca..799a62ba0 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@angular/router": "~8.2.1",
     "@angular/service-worker": "~8.2.1",
     "@project-sunbird/telemetry-sdk": "0.0.26",
-    "@sunbird-cb/collection": "^1.0.38",
+    "@sunbird-cb/collection": "^1.0.39",
     "@sunbird-cb/design-system": "0.0.1",
     "@sunbird-cb/rain-dashboards": "0.4.22-rc.1",
     "@sunbird-cb/resolver": "^1.0.0",

From e1e19aa6b7726065a336620750305ea2886d51f5 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Thu, 28 Dec 2023 11:29:56 +0530
Subject: [PATCH 394/887] update for go back count

---
 .../training-plan/components/chip/chip.component.ts    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
index eedafc258..385095c9d 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
@@ -83,7 +83,12 @@ export class ChipComponent implements OnInit, OnChanges {
       const index = this.tpdsSvc.trainingPlanStepperData.contentList.findIndex((x: any) => x === item['identifier'])
       this.tpdsSvc.trainingPlanStepperData.contentList.splice(index, 1)
     }
+    if(this.selectContentCount) {
+      this.selectContentCount = this.selectContentCount - 1;
+    }
+    
     this.itemRemoved.emit(true)
+    
   }
 
   removeAssignee(item: any) {
@@ -110,7 +115,10 @@ export class ChipComponent implements OnInit, OnChanges {
         this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo.splice(index, 1)
       }
     }
-
+    if(this.selectAssigneeCount) {
+      this.selectAssigneeCount = this.selectAssigneeCount - 1;
+    }
+    
   }
 
   navigateToPreviewPage() {

From 24269479a3a5e21a834c510fafe42ea50c7587a1 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Thu, 28 Dec 2023 18:15:34 +0530
Subject: [PATCH 395/887] Added request new content dialog & code

---
 .../add-content-dialog.component.html         |  65 ++++++++
 .../add-content-dialog.component.scss         |  47 ++++++
 .../add-content-dialog.component.ts           | 148 ++++++++++++++++++
 .../create-content.component.html             |   7 +-
 .../create-content.component.scss             |   2 +-
 .../create-content.component.ts               |  15 +-
 .../training-plan/training-plan.module.ts     |   6 +-
 7 files changed, 284 insertions(+), 6 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.html
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.scss
 create mode 100644 project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts

diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.html b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.html
new file mode 100644
index 000000000..6a2143d49
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.html
@@ -0,0 +1,65 @@
+<div class="margin-bottom-m margin-top-l" id="addcontent">
+  <div class="mat-title">
+    Content request form
+  </div>
+  <form [formGroup]="contentForm">
+    <div class="margin-bottom-m">
+      <div class="margin-bottom-m">
+        <p class="mat-subheading-2 required">Competency area</p>
+        <mat-radio-group name="competencyArea" class="flex tgl-group margin-top-s flex-wrap"
+          formControlName="competencyArea">
+          <mat-radio-button matInput [name]="'radio-' + option.name"
+            class="flex flex-row itm-center ws-mat-accent-border margin-right-s" *ngFor="let option of allCompetencies"
+            [value]="option.name" (change)="compAreaSelected(option)">
+            <span class="mat-body-2">{{option.name}}</span>
+          </mat-radio-button>
+        </mat-radio-group>
+      </div>
+
+      <div class="margin-bottom-m" *ngIf="allCompetencyTheme && allCompetencyTheme.length > 0">
+        <p class="mat-subheading-2 required">Competency theme</p>
+        <div>
+          <span class="display-inline-block complabels mat-caption cursor-pointer"
+            [ngClass]="{active: (seletedCompetencyTheme && option.id === seletedCompetencyTheme.id)}"
+            (click)="compThemeSelected(option)" *ngFor="let option of allCompetencyTheme">{{option.name}}</span>
+        </div>
+      </div>
+
+      <div class="margin-bottom-m" *ngIf="allCompetencySubtheme && allCompetencySubtheme.length > 0">
+        <p class="mat-subheading-2 required">Competency sub theme</p>
+        <div>
+          <span class="display-inline-block complabels mat-caption cursor-pointer"
+            [ngClass]="{active: (seletedCompetencySubTheme && option.id === seletedCompetencySubTheme.id)}"
+            (click)="compSubThemeSelected(option)" *ngFor="let option of allCompetencySubtheme">{{option.name}}</span>
+        </div>
+      </div>
+    </div>
+
+    <div class="margin-bottom-m">
+      <label class="mat-subheading-2 required">List of Providers</label>
+      <mat-form-field appearance="outline" class="margin-top-s full-width">
+        <input id="provider" matInput tab-directive type="text" placeholder="Select your provider"
+          i18n-placeholder="Providers list" formControlName="provider" [matAutocomplete]="providerAutocomplete"
+          i18n-aria-label aria-label="Providers list" i18n-aria-label aria-label="providers input" maxlength="250" />
+      </mat-form-field>
+      <mat-autocomplete #providerAutocomplete="matAutocomplete" autoActiveFirstOption="true" i18n-aria-label
+        aria-label="Providers list" [displayWith]="displayFnState" (optionSelected)="providerSelected($event.option)">
+        <mat-option *ngFor="let option of providersList" [value]="option.name" i18n-aria-label
+          aria-label="Providers list autocomplete option">
+          {{ option.name }}
+        </mat-option>
+      </mat-autocomplete>
+    </div>
+
+    <div class="margin-bottom-m">
+      <label class="flex mat-subheading-2 required">Description of the requested content</label>
+      <textarea class="full-width margin-top-xs" formControlName="contentdescription" id="" cols="30"
+        rows="10"></textarea>
+    </div>
+
+    <div class="flex flex-end margin-top-l">
+      <button mat-button class="close-btn margin-right-xs" type="button" (click)="closeModal()">Close</button>
+      <button mat-button class="submit-btn" type="button" (click)="submit()">Send mail</button>
+    </div>
+  </form>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.scss b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.scss
new file mode 100644
index 000000000..062f75c32
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.scss
@@ -0,0 +1,47 @@
+#addcontent {
+  .full-width {
+    width: 100% !important;
+  }
+  .ws-mat-accent-border.mat-radio-checked {
+      border-color: rgb(27, 76, 161) !important;
+  }
+
+  .theme-igot.day-mode .ws-mat-accent-border {
+      border: 1px solid rgba(0, 0, 0, 0.16);
+      padding: 8px 12px !important;
+      border-radius: 4px !important;
+  }
+
+  .complabels {
+    border: 1px solid rgba(0, 0, 0, 0.16);
+    padding: 5px 10px;
+    border-radius: 4px;
+    margin: 4px 8px 4px 0;
+  }
+
+  .complabels.active {
+    background: rgb(27, 76, 161);
+    color: rgb(255, 255, 255) !important;
+    border: 1px solid rgb(27, 76, 161);
+  }
+
+  .close-btn {
+      color: #1b4ca1!important;
+      border: 1px solid #1b4ca1;
+      border-radius: 4px;
+      width: auto;
+  }
+
+  .submit-btn {
+    width: auto;
+    background: #1b4ca1 !important;
+    color: white !important;
+    font-family: 'Lato';
+    font-weight: 700;
+    font-size: 14px;
+  }
+
+  .mat-form-field-appearance-outline .mat-form-field-flex, .mat-form-field-flex {
+    width: 100% !important;
+  }
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
new file mode 100644
index 000000000..234e862f1
--- /dev/null
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
@@ -0,0 +1,148 @@
+import { Component, Inject, OnInit } from '@angular/core'
+import { FormControl, FormGroup, Validators } from '@angular/forms'
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'
+import { TrainingPlanService } from '../../services/traininig-plan.service'
+@Component({
+  selector: 'ws-app-add-content-dialog',
+  templateUrl: './add-content-dialog.component.html',
+  styleUrls: ['./add-content-dialog.component.scss'],
+})
+export class AddContentDialogComponent implements OnInit {
+  contentForm!: FormGroup
+  specialCharList = `( a-z/A-Z , 0-9 . - _ $ / \ : [ ]' ' !)`
+  filteredCompetencies!: any[]
+  allCompetencies: any = []
+  allCompetencyTheme: any = []
+  filteredallCompetencyTheme: any = []
+  allCompetencySubtheme: any = []
+  filteredallCompetencySubtheme: any = []
+  enableCompetencyAdd = false
+  seletedCompetencyArea: any
+  seletedCompetencyTheme: any
+  seletedCompetencySubTheme: any
+  providersList: any
+
+  constructor(
+    @Inject(MAT_DIALOG_DATA) public data: any,
+    private dialogRef: MatDialogRef<AddContentDialogComponent>,
+    private trainingplanSvc: TrainingPlanService
+  ) {
+    this.contentForm = new FormGroup({
+      competencyArea: new FormControl('', Validators.required),
+      provider: new FormControl('', Validators.required),
+      contentdescription: new FormControl('', Validators.required),
+    })
+  }
+
+  ngOnInit() {
+    this.getCompetencies()
+    this.getProviders()
+    // this.contentForm = this.data.from
+    // this.competencyArea.valueChanges.subscribe((newValue: any) => {
+    //   if (newValue) {
+    //     this.filteredallCompetencies = this.allCompetencies
+    //   }
+    // })
+    // this.competencyTheme.valueChanges.subscribe((newValue: any) => {
+    //   this.filteredallCompetencyTheme = this.filterValues(newValue, this.allCompetencyTheme)
+    // })
+    // this.competencySubtheme.valueChanges.subscribe((newValue: any) => {
+    //   this.filteredallCompetencySubtheme = this.filterValues(newValue, this.allCompetencySubtheme)
+    // })
+  }
+
+  filterValues(searchValue: string, array: any) {
+    return array.filter((value: any) =>
+      // value.name.toLowerCase().indexOf(searchValue.toLowerCase()) === 0)
+      value.name.toLowerCase().includes(searchValue.toLowerCase()))
+  }
+
+  closeModal() {
+    this.dialogRef.close()
+  }
+
+  getCompetencies() {
+    const searchObj = {
+      search: {
+        type: 'Competency Area',
+      },
+      filter: {
+        isDetail: true,
+      },
+    }
+    this.trainingplanSvc.getFilterEntity(searchObj).subscribe((res: any) => {
+      this.allCompetencies = res
+    })
+  }
+
+  getProviders() {
+    this.trainingplanSvc.getProviders().subscribe((res: any) => {
+      this.providersList = res
+    })
+  }
+
+  compAreaSelected(option: any) {
+    this.resetCompSubfields()
+    this.allCompetencies.forEach((val: any) => {
+      if (option.name === val.name) {
+        this.seletedCompetencyArea = val
+        this.allCompetencyTheme = val.children
+      }
+    })
+  }
+
+  compThemeSelected(option: any) {
+    this.enableCompetencyAdd = false
+    this.allCompetencyTheme.forEach((val: any) => {
+      if (option.name === val.name) {
+        this.seletedCompetencyTheme = val
+        this.allCompetencySubtheme = val.children
+      }
+    })
+  }
+
+  compSubThemeSelected(option: any) {
+    this.enableCompetencyAdd = true
+    this.allCompetencySubtheme.forEach((val: any) => {
+      if (option.name === val.name) {
+        this.seletedCompetencySubTheme = val
+      }
+    })
+  }
+
+  resetCompfields() {
+    this.enableCompetencyAdd = false
+    this.contentForm.reset()
+    this.allCompetencyTheme = []
+    this.allCompetencySubtheme = []
+  }
+
+  resetCompSubfields() {
+    this.enableCompetencyAdd = false
+    this.allCompetencySubtheme = []
+    this.seletedCompetencyTheme = ''
+    this.seletedCompetencySubTheme = ''
+  }
+
+  providerSelected(option: any) {
+    console.log(option)
+  }
+
+  submit() {
+    console.log('submit -----------', this.contentForm.value)
+    if (this.contentForm && this.contentForm.valid) {
+      const req = {
+        competencyArea: this.seletedCompetencyArea.name,
+        competencyAreaId: this.seletedCompetencyArea.id,
+        competencyTheme: this.seletedCompetencyTheme.name,
+        competencyThemeId: this.seletedCompetencyTheme.id,
+        competencySubTheme: this.seletedCompetencySubTheme.name,
+        competencySubThemeId: this.seletedCompetencySubTheme.id,
+        listOfProviders: this.contentForm.value.provider,
+        descriptionOfTheContent: this.contentForm.value.contentdescription || ''
+      }
+      console.log('req', req)
+    }
+
+  }
+}
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
index 1c9f580b3..3fb49cc38 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
@@ -15,9 +15,12 @@
         </div>
     </div>
     <div class="no-cbp-data margin-top-xl margin-bottom-xl" *ngIf="!(contentData) || !(contentData?.length)">
-        <div><img src="/assets/images/no-content-data.svg"></div>
-        <div class="mat-subheading-1 margin-remove">No content avaliable.</div>
+        <div class="customimg"><img src="/assets/images/nocontent.svg"></div>
+        <!-- <div class="mat-subheading-1 margin-remove">No content avaliable.</div> -->
         <!-- <div>Create a content in CBP portal to get the contents.</div> -->
+        <div class="mat-subheading-1 margin-top-m margin-bottom-m">Can't find content?</div>
+        <button mat-button type="button" class="create-btn" (click)="showAddContentDialog()">Request for new
+            content</button>
     </div>
 
 </ng-container>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.scss b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.scss
index 8ea59d1c4..53d4c76b0 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.scss
@@ -4,7 +4,7 @@
   text-align: center;
 
   img {
-    width: auto;
+    width: 200px;
   }
 
   .small-text {
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
index 9e4ff1825..ff34cac60 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
@@ -1,12 +1,13 @@
 import { Component, EventEmitter, OnInit, Output } from '@angular/core'
 import { TrainingPlanDataSharingService } from './../../services/training-plan-data-share.service'
+import { MatDialog } from '@angular/material'
+import { AddContentDialogComponent } from '../../components/add-content-dialog/add-content-dialog.component'
 @Component({
   selector: 'ws-app-create-content',
   templateUrl: './create-content.component.html',
   styleUrls: ['./create-content.component.scss'],
 })
 export class CreateContentComponent implements OnInit {
-
   @Output() addContentInvalid = new EventEmitter<any>()
 
   categoryData: any[] = []
@@ -17,7 +18,7 @@ export class CreateContentComponent implements OnInit {
   pageIndex: any
   pageSize: any
   count = 0
-  constructor(private tpdsSvc: TrainingPlanDataSharingService) { }
+  constructor(private tpdsSvc: TrainingPlanDataSharingService, public dialog: MatDialog) { }
 
   ngOnInit() {
     this.categoryData = [
@@ -105,4 +106,14 @@ export class CreateContentComponent implements OnInit {
     this.handleSelectedChips(true)
   }
 
+  showAddContentDialog() {
+    const dialogRef = this.dialog.open(AddContentDialogComponent, {
+      maxHeight: 'auto',
+      height: '75%',
+      width: '60%',
+    })
+    dialogRef.afterClosed().subscribe((res: any) => {
+      console.log('res', res)
+    })
+  }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
index 6c5053b08..a38348e39 100644
--- a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
+++ b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
@@ -21,6 +21,7 @@ import {
   MatTabsModule,
   MatCheckboxModule,
   MatDatepickerModule,
+  MatAutocompleteModule,
 } from '@angular/material'
 import { PipePublicURLModule } from '../pipes/pipe-public-URL/pipe-public-URL.module'
 import { PipeDurationTransformModule } from '../pipes/pipe-duration-transform/pipe-duration-transform.module'
@@ -64,6 +65,7 @@ import { TrainingPlanService } from './services/traininig-plan.service'
 import { UpdatePlanResolveService } from './resolvers/update-plan-resolve.service'
 import { ResetDataSharingResolveService } from './resolvers/reset-data-sharing-resolve.service'
 import { PreviewDialogBoxComponent } from './components/preview-dialog-box/preview-dialog-box.component'
+import { AddContentDialogComponent } from './components/add-content-dialog/add-content-dialog.component'
 @NgModule({
   declarations: [
     TrainingPlanHomeComponent,
@@ -84,13 +86,13 @@ import { PreviewDialogBoxComponent } from './components/preview-dialog-box/previ
     CategoryDropDownComponent,
     AddPlanInformationComponent,
     PreviewDialogBoxComponent,
+    AddContentDialogComponent,
   ],
   imports: [
     CommonModule,
     Ng2SearchPipeModule,
     UIORGTableModule,
     WidgetResolverModule,
-    ReactiveFormsModule,
     TrainingPlanRoutingModule,
     LeftMenuModule,
     FormsModule,
@@ -137,9 +139,11 @@ import { PreviewDialogBoxComponent } from './components/preview-dialog-box/previ
     PipeDurationTransformModule,
     DefaultThumbnailModule,
     FilterSearchPipeModule,
+    MatAutocompleteModule,
   ],
   entryComponents: [
     PreviewDialogBoxComponent,
+    AddContentDialogComponent,
   ],
   providers: [
     InitResolver,

From 83ce1f905238cea727fa6ebad192b274f1a08b4f Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Fri, 29 Dec 2023 19:44:47 +0530
Subject: [PATCH 396/887] Added multi select providers & competencies logic &
 conditions

---
 .../add-content-dialog.component.html         |  45 ++++++-
 .../add-content-dialog.component.scss         |  31 ++++-
 .../add-content-dialog.component.ts           | 126 +++++++++++++++---
 .../services/traininig-plan.service.ts        |   5 +
 4 files changed, 176 insertions(+), 31 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.html b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.html
index 6a2143d49..9010989a7 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.html
@@ -20,8 +20,8 @@
         <p class="mat-subheading-2 required">Competency theme</p>
         <div>
           <span class="display-inline-block complabels mat-caption cursor-pointer"
-            [ngClass]="{active: (seletedCompetencyTheme && option.id === seletedCompetencyTheme.id)}"
-            (click)="compThemeSelected(option)" *ngFor="let option of allCompetencyTheme">{{option.name}}</span>
+            [ngClass]="{active: (option.selected === true)}" (click)="compThemeSelected(option)"
+            *ngFor="let option of allCompetencyTheme">{{option.name}}</span>
         </div>
       </div>
 
@@ -29,13 +29,13 @@
         <p class="mat-subheading-2 required">Competency sub theme</p>
         <div>
           <span class="display-inline-block complabels mat-caption cursor-pointer"
-            [ngClass]="{active: (seletedCompetencySubTheme && option.id === seletedCompetencySubTheme.id)}"
-            (click)="compSubThemeSelected(option)" *ngFor="let option of allCompetencySubtheme">{{option.name}}</span>
+            [ngClass]="{active: (option.selected === true)}" (click)="compSubThemeSelected(option)"
+            *ngFor="let option of allCompetencySubtheme">{{option.name}}</span>
         </div>
       </div>
     </div>
 
-    <div class="margin-bottom-m">
+    <!-- <div class="margin-bottom-m">
       <label class="mat-subheading-2 required">List of Providers</label>
       <mat-form-field appearance="outline" class="margin-top-s full-width">
         <input id="provider" matInput tab-directive type="text" placeholder="Select your provider"
@@ -49,17 +49,48 @@
           {{ option.name }}
         </mat-option>
       </mat-autocomplete>
+    </div> -->
+
+    <div class="margin-bottom-m">
+      <label class="mat-subheading-2 required">List of Providers</label>
+      <mat-form-field class="full-width">
+        <mat-select (openedChange)="openedChange($event)" placeholder="Select" formControlName="provider" multiple>
+          <!-- <mat-select-trigger>{{provider.value ? provider.value[0] : ''}}
+            <span *ngIf="provider.value?.length > 1" class="additional-selection">
+              (+{{provider.value.length - 1}} {{provider.value?.length === 2 ? 'other' : 'others'}})
+            </span>
+          </mat-select-trigger> -->
+          <div class="select-container">
+            <mat-optgroup>
+              <mat-form-field>
+                <input #search autocomplete="off" placeholder="Search" aria-label="Search"
+                  formControlName="providerText" matInput>
+                <button [disableRipple]="true" *ngIf="search.value" matSuffix mat-icon-button aria-label="Clear"
+                  (click)="clearSearch($event)"><mat-icon>close</mat-icon></button>
+              </mat-form-field>
+            </mat-optgroup>
+            <mat-optgroup *ngIf="(providersList).length == 0">
+              <div>No results found!</div>
+            </mat-optgroup>
+            <mat-option (onSelectionChange)="selectionChange($event, option)" *ngFor="let option of providersList"
+              [value]="option.name">{{option.name}}
+            </mat-option>
+          </div>
+        </mat-select>
+      </mat-form-field>
+      <!-- <div *ngIf="provider.value">{{ 'You have choosen ' + provider.value }}</div> -->
     </div>
 
     <div class="margin-bottom-m">
       <label class="flex mat-subheading-2 required">Description of the requested content</label>
       <textarea class="full-width margin-top-xs" formControlName="contentdescription" id="" cols="30"
-        rows="10"></textarea>
+        rows="4"></textarea>
     </div>
 
     <div class="flex flex-end margin-top-l">
       <button mat-button class="close-btn margin-right-xs" type="button" (click)="closeModal()">Close</button>
-      <button mat-button class="submit-btn" type="button" (click)="submit()">Send mail</button>
+      <button mat-button class="submit-btn" type="button" (click)="submit()" [disabled]="contentForm.invalid">Send
+        mail</button>
     </div>
   </form>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.scss b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.scss
index 062f75c32..4634bd02c 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.scss
@@ -1,4 +1,12 @@
 #addcontent {
+  .additional-selection {
+    opacity: 0.75;
+    font-size: 0.75em;
+  }
+  .select-container{
+    margin-top:10px;
+  }
+
   .full-width {
     width: 100% !important;
   }
@@ -6,12 +14,6 @@
       border-color: rgb(27, 76, 161) !important;
   }
 
-  .theme-igot.day-mode .ws-mat-accent-border {
-      border: 1px solid rgba(0, 0, 0, 0.16);
-      padding: 8px 12px !important;
-      border-radius: 4px !important;
-  }
-
   .complabels {
     border: 1px solid rgba(0, 0, 0, 0.16);
     padding: 5px 10px;
@@ -44,4 +46,21 @@
   .mat-form-field-appearance-outline .mat-form-field-flex, .mat-form-field-flex {
     width: 100% !important;
   }
+}
+::ng-deep.mat-pseudo-checkbox-checked {
+  background: #0074b6 !important;
+}
+
+::ng-deep.mat-radio-inner-circle {
+    background-color: #0074b6!important;
+}
+
+::ng-deep.ws-mat-accent-border {
+    border: 1px solid rgba(0, 0, 0, 0.16);
+    padding: 8px 12px !important;
+    border-radius: 4px !important;
+}
+
+::ng-deep.mat-option.mat-selected:not(.mat-option-disabled) {
+  color: rgba(0, 0, 0, 0.87) !important;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
index 234e862f1..436c52d15 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
@@ -2,6 +2,7 @@ import { Component, Inject, OnInit } from '@angular/core'
 import { FormControl, FormGroup, Validators } from '@angular/forms'
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'
 import { TrainingPlanService } from '../../services/traininig-plan.service'
+import { map, startWith } from 'rxjs/operators'
 @Component({
   selector: 'ws-app-add-content-dialog',
   templateUrl: './add-content-dialog.component.html',
@@ -18,9 +19,15 @@ export class AddContentDialogComponent implements OnInit {
   filteredallCompetencySubtheme: any = []
   enableCompetencyAdd = false
   seletedCompetencyArea: any
-  seletedCompetencyTheme: any
-  seletedCompetencySubTheme: any
-  providersList: any
+  seletedCompetencyTheme: any = []
+  seletedCompetencySubTheme: any = []
+  providersList: any = []
+  filteredProviders: any = []
+  selectedValues = [];
+
+  checkedList: any = []
+  currentSelected: any
+  selectedProvidersList: any = []
 
   constructor(
     @Inject(MAT_DIALOG_DATA) public data: any,
@@ -30,6 +37,7 @@ export class AddContentDialogComponent implements OnInit {
     this.contentForm = new FormGroup({
       competencyArea: new FormControl('', Validators.required),
       provider: new FormControl('', Validators.required),
+      providerText: new FormControl('', Validators.required),
       contentdescription: new FormControl('', Validators.required),
     })
   }
@@ -49,6 +57,21 @@ export class AddContentDialogComponent implements OnInit {
     // this.competencySubtheme.valueChanges.subscribe((newValue: any) => {
     //   this.filteredallCompetencySubtheme = this.filterValues(newValue, this.allCompetencySubtheme)
     // })
+
+    this.filteredProviders = this.contentForm.controls['providerText'].valueChanges
+      .pipe(
+        startWith<string>(''),
+        map((name: any) => this._filter(name))
+      )
+  }
+
+  private _filter(name: string): String[] {
+    const filterValue = name.toLowerCase()
+    // Set selected values to retain the selected checkbox state
+    this.setSelectedValues()
+    this.contentForm.controls['provider'].patchValue(this.selectedValues)
+    let filteredList = this.data.filter((option: any) => option.toLowerCase().indexOf(filterValue) === 0)
+    return filteredList
   }
 
   filterValues(searchValue: string, array: any) {
@@ -78,6 +101,9 @@ export class AddContentDialogComponent implements OnInit {
   getProviders() {
     this.trainingplanSvc.getProviders().subscribe((res: any) => {
       this.providersList = res
+      this.providersList.forEach((val: any) => {
+        val.checked = false
+      })
     })
   }
 
@@ -86,7 +112,11 @@ export class AddContentDialogComponent implements OnInit {
     this.allCompetencies.forEach((val: any) => {
       if (option.name === val.name) {
         this.seletedCompetencyArea = val
-        this.allCompetencyTheme = val.children
+        // this.allCompetencyTheme = val.children
+        val.children.forEach((item: any) => {
+          item.selected = false
+          this.allCompetencyTheme.push(item)
+        })
       }
     })
   }
@@ -95,8 +125,13 @@ export class AddContentDialogComponent implements OnInit {
     this.enableCompetencyAdd = false
     this.allCompetencyTheme.forEach((val: any) => {
       if (option.name === val.name) {
-        this.seletedCompetencyTheme = val
-        this.allCompetencySubtheme = val.children
+        val.selected = true
+        this.seletedCompetencyTheme.push(val)
+        // this.allCompetencySubtheme = val.children
+        val.children.forEach((item: any) => {
+          item.selected = false
+          this.allCompetencySubtheme.push(item)
+        })
       }
     })
   }
@@ -105,7 +140,8 @@ export class AddContentDialogComponent implements OnInit {
     this.enableCompetencyAdd = true
     this.allCompetencySubtheme.forEach((val: any) => {
       if (option.name === val.name) {
-        this.seletedCompetencySubTheme = val
+        val.selected = true
+        this.seletedCompetencySubTheme.push(val)
       }
     })
   }
@@ -120,28 +156,82 @@ export class AddContentDialogComponent implements OnInit {
   resetCompSubfields() {
     this.enableCompetencyAdd = false
     this.allCompetencySubtheme = []
-    this.seletedCompetencyTheme = ''
-    this.seletedCompetencySubTheme = ''
+    this.seletedCompetencyTheme = []
+    this.seletedCompetencySubTheme = []
+  }
+
+  openedChange(e: any) {
+    console.log('e', e)
+    // Set search textbox value as empty while opening selectbox
+    this.contentForm.controls['providerText'].patchValue('')
+    // Focus to search textbox while clicking on selectbox
+    if (e == true) {
+      // this.contentForm.value.provider.focus()
+    }
+  }
+
+  clearSearch(event: any) {
+    event.stopPropagation()
+    this.contentForm.controls['providerText'].patchValue('')
   }
 
-  providerSelected(option: any) {
-    console.log(option)
+  setSelectedValues() {
+    if (this.contentForm.value.provider && this.contentForm.value.provider.length > 0) {
+      this.contentForm.value.provider.forEach((e: any) => {
+        if (this.contentForm.value.provider.indexOf(e) == -1) {
+          this.contentForm.value.provider.push(e)
+          this.selectedProvidersList.push(e)
+        }
+      })
+    }
+  }
+
+  selectionChange(event: any, option: any) {
+    console.log('event', event)
+    if (event.isUserInput) {
+      let index = this.selectedProvidersList.findIndex((object: any) => object.id === option.orgId)
+      if (index === -1) {
+        this.selectedProvidersList.push(option)
+      } else {
+        this.selectedProvidersList.splice(index, 1)
+      }
+      this.contentForm.value.provider = this.selectedProvidersList
+    }
   }
 
   submit() {
-    console.log('submit -----------', this.contentForm.value)
-    if (this.contentForm && this.contentForm.valid) {
+    const themeNames: any[] = []
+    const themeIds: any[] = []
+    const subthemeNames: any[] = []
+    const subthemeIds: any[] = []
+    const providersIds: any[] = []
+    this.seletedCompetencyTheme.forEach((item: any) => {
+      themeNames.push(item.name)
+      themeIds.push(item.id)
+    })
+
+    this.seletedCompetencySubTheme.forEach((item: any) => {
+      subthemeNames.push(item.name)
+      subthemeIds.push(item.id)
+    })
+    this.selectedProvidersList.forEach((item: any) => {
+      providersIds.push(item.orgId)
+    })
+    if (this.contentForm && this.contentForm.value) {
       const req = {
         competencyArea: this.seletedCompetencyArea.name,
         competencyAreaId: this.seletedCompetencyArea.id,
-        competencyTheme: this.seletedCompetencyTheme.name,
-        competencyThemeId: this.seletedCompetencyTheme.id,
-        competencySubTheme: this.seletedCompetencySubTheme.name,
-        competencySubThemeId: this.seletedCompetencySubTheme.id,
-        listOfProviders: this.contentForm.value.provider,
+        competencyTheme: themeNames,
+        competencyThemeId: themeIds,
+        competencySubTheme: subthemeNames,
+        competencySubThemeId: subthemeIds,
+        listOfProviders: providersIds,
         descriptionOfTheContent: this.contentForm.value.contentdescription || ''
       }
       console.log('req', req)
+      this.trainingplanSvc.createNewContentrequest(req).subscribe((result: any) => {
+        console.log('result', result)
+      })
     }
 
   }
diff --git a/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts b/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
index b0ab808a8..2bbf6fe16 100644
--- a/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
+++ b/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
@@ -17,6 +17,7 @@ const API_END_POINTS = {
   GET_ALL_DESIGNATIONS: 'apis/proxies/v8/masterData/v2/deptPosition',
   GET_PROVIDERS: 'apis/proxies/v8/searchBy/provider',
   GET_FILTER_ENTITY: 'apis/proxies/v8/competency/v4/search',
+  CREATE_NEWCONTENT: 'apis/proxies/v8/workflow/requestcbplancontent'
 }
 @Injectable({
   providedIn: 'root',
@@ -72,4 +73,8 @@ export class TrainingPlanService {
     return this.http.get<any>(API_END_POINTS.GET_PROVIDERS)
   }
 
+  createNewContentrequest(obj: any) {
+    return this.http.post<any>(`${API_END_POINTS.CREATE_NEWCONTENT}`, obj).pipe(map(res => _.get(res, 'result')))
+  }
+
 }

From 3f5db85911f4509f9cf9a0aeb5df6bb6b6fab1a2 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Sat, 30 Dec 2023 10:25:12 +0530
Subject: [PATCH 397/887] bug fixes

---
 .../category-drop-down.component.ts           |  2 +-
 .../components/chip/chip.component.ts         | 13 +++--
 .../components/filter/filter.component.ts     |  1 +
 .../components/search/search.component.ts     | 11 ++--
 .../standard-card.component.html              |  7 +--
 .../standard-card.component.scss              | 12 +++--
 .../standard-card/standard-card.component.ts  |  5 +-
 .../components/stepper/stepper.component.html |  2 +-
 .../components/stepper/stepper.component.ts   | 26 +++++----
 .../user-card/user-card.component.html        | 18 ++++---
 .../user-card/user-card.component.scss        | 10 +++-
 .../user-card/user-card.component.ts          |  2 +
 .../create-assignee.component.html            |  2 +-
 .../create-assignee.component.ts              |  5 +-
 .../create-timeline.component.html            | 14 ++---
 .../create-timeline.component.ts              | 54 +++++++++++++++++--
 .../preview-plan/preview-plan.component.html  | 32 ++++++++---
 17 files changed, 154 insertions(+), 62 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
index d0f13ceaf..ea5ea7e96 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
@@ -34,7 +34,7 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         ) {
           this.tpdsSvc.trainingPlanStepperData.contentList = []
           this.tpdsSvc.trainingPlanContentData.data = []
-        } else if (data.event === 'Designation' || data.event === 'All Users' || data.event === 'Custom Users') {
+        } else if (data.event === 'Designation' || data.event === 'AllUser' || data.event === 'CustomUser') {
           this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo = []
           this.tpdsSvc.trainingPlanAssigneeData.data = []
           this.tpdsSvc.trainingPlanStepperData['assignmentTypeInfo'] = []
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
index eedafc258..00609a9f9 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
@@ -89,15 +89,16 @@ export class ChipComponent implements OnInit, OnChanges {
   removeAssignee(item: any) {
     if (this.tpdsSvc.trainingPlanAssigneeData.category === 'Designation') {
       this.tpdsSvc.trainingPlanAssigneeData.data.map((sitem: any) => {
-        if (sitem['selected'] && sitem['id'] === item['id']) {
+        if (sitem.name === item.name && sitem['selected']) {
           sitem['selected'] = false
         }
       })
-      if (this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo.indexOf(item['identifier']) > -1) {
+      if (this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo.indexOf(item['name']) > -1) {
         const index =
-          this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo.findIndex((x: any) => x === item['id'])
+          this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo.findIndex((x: any) => x === item['name'])
         this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo.splice(index, 1)
       }
+      this.itemRemoved.emit(true)
     } else if (this.tpdsSvc.trainingPlanAssigneeData.category === 'CustomUser') {
       this.tpdsSvc.trainingPlanAssigneeData.data.map((sitem: any) => {
         if (sitem && sitem['selected'] && sitem['userId'] === item['userId']) {
@@ -109,8 +110,8 @@ export class ChipComponent implements OnInit, OnChanges {
           this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo.findIndex((x: any) => x === item['userId'])
         this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo.splice(index, 1)
       }
+      this.itemRemoved.emit(true)
     }
-
   }
 
   navigateToPreviewPage() {
@@ -120,6 +121,10 @@ export class ChipComponent implements OnInit, OnChanges {
         from: this.from,
       },
       autoFocus: false,
+      width: '90%'
+    })
+    this.dialogRef.afterClosed().subscribe(() => {
+      this.itemRemoved.emit(true)
     })
     // this.router.navigate(['app', 'training-plan', 'preview-plan'], { queryParams: { from: this.from } })
   }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index 03982b6ec..b01005532 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -191,6 +191,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
     } else {
       this.getFilterData.emit(this.assigneeFilterObj)
     }
+    this.hideFilter()
   }
 
   clearFilter() {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 23ed5fe13..7e54f0d15 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -25,10 +25,10 @@ export class SearchComponent implements OnInit {
   pageSize = 20
   isContentLive = false
   constructor(@Inject(DOCUMENT) private document: Document,
-              private trainingPlanService: TrainingPlanService,
-              private route: ActivatedRoute,
-              public tpdsSvc: TrainingPlanDataSharingService,
-              private loadingService: LoaderService
+    private trainingPlanService: TrainingPlanService,
+    private route: ActivatedRoute,
+    public tpdsSvc: TrainingPlanDataSharingService,
+    private loadingService: LoaderService
   ) { }
 
   ngOnInit() {
@@ -63,7 +63,6 @@ export class SearchComponent implements OnInit {
   }
 
   handleCategorySelection(event: any) {
-
     this.selectedDropDownValue = event
     this.tpdsSvc.clearFilter.next(true)
     this.resetPageIndex()
@@ -184,7 +183,7 @@ export class SearchComponent implements OnInit {
       this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: res.content }
       this.handleApiData.emit(true)
       this.loadingService.changeLoaderState(false)
-    },                                                           (_error: any) => {
+    }, (_error: any) => {
     })
   }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
index b81eed145..457da114c 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
@@ -1,6 +1,6 @@
 <ng-container>
     <div class="flex flex-3 flex-row card-grid-container flex-wrap">
-        <div class="flex course-card margin-right-xl" *ngFor="let item of contentData | slice : startIndex : lastIndex">
+        <div class="flex course-card margin-right-xl" *ngFor="let item of contentData">
             <mat-card [ngClass]="item?.selected ? 'active-card':''" class="card-standard-container mr-5 padding-remove">
                 <mat-card-content class="min-top">
                     <div style="position: relative; z-index: 1;">
@@ -10,8 +10,9 @@
                                     (change)="selectContentItem($event, item)"></mat-checkbox>
                             </div>
                             <div class="card-cross-icon" *ngIf="showDeleteFlag">
-                                <button mat-mini-fab class="card-cross-btn" type="button" (click)="deleteItem(item)">
-                                    <mat-icon>close</mat-icon>
+                                <button mat-mini-fab class="card-cross-btn flex flex-middle flex-center" type="button"
+                                    (click)="deleteItem(item)">
+                                    <mat-icon class="font-size-20">close</mat-icon>
                                 </button>
                             </div>
                             <img mat-card-image loading="lazy"
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
index 7cd19e650..bcbe342c1 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
@@ -9,10 +9,6 @@ $secondary-color: #EF951E;
     width:100%;
 }
 
-
-.card-grid-container {
-}
-
 .card-standard-container {
   $card-padding: $size-m;
   $action-btn-size: 2.5 * $size-m;
@@ -54,7 +50,7 @@ $secondary-color: #EF951E;
     align-items: center;
     padding: 4px;
     border-radius: 4px;
-  
+
     &.right-corner {
       right: 4px;
       bottom: 0px;
@@ -588,6 +584,8 @@ $title-line-count: 2;
 
 .card-cross-btn {
   background: white !important;
+  width: 35px !important;
+  height: 35px !important;
 }
 
 .active-card {
@@ -605,4 +603,8 @@ $title-line-count: 2;
 
 ::ng-deep .card-select-box .mat-checkbox-layout {
   width: 16px;
+}
+
+.font-size-20 {
+    font-size: 20px;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
index 91deba209..e8090af5c 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
@@ -16,6 +16,7 @@ export class StandardCardComponent implements OnInit, OnChanges {
   @Input() showPagination = false
   @Input() count = 0
   @Output() handleSelectedChips = new EventEmitter()
+  @Output() selectedContentRemoved = new EventEmitter<any>()
   @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | any
   dataSource: any
   selectedContent: any[] = []
@@ -40,9 +41,6 @@ export class StandardCardComponent implements OnInit, OnChanges {
 
   ngOnChanges() {
     this.changeDetectorRef.detectChanges()
-
-    // this.dataSource = new MatTableDataSource<any>(this.contentData);
-    // this.dataSource.paginator = this.paginator;
   }
 
   onChangePage(pe: PageEvent) {
@@ -98,6 +96,7 @@ export class StandardCardComponent implements OnInit, OnChanges {
         this.tpdsSvc.trainingPlanStepperData['contentList'].splice(index, 1)
       }
     })
+    this.selectedContentRemoved.emit(true)
   }
 
   resetPageIndex() {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
index 2a47274f7..18467e582 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
@@ -10,7 +10,7 @@
                     (planTitleInvalid)="checkForPlanTitle($event)"></ws-app-add-plan-information>
             </ng-template>
         </mat-tab>
-        <mat-tab [label]="tabType.ADD_CONTENT" [disabled]="addCotnentDisable">
+        <mat-tab [label]="tabType.ADD_CONTENT" [disabled]="addCotnentDisable" class="disable">
             <ng-template mat-tab-label>
                 <span>2. <span *ngIf="!editState">Add</span><span *ngIf="editState">Edit</span> Content
                 </span>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
index 14a85c100..2ddd3b4d0 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core'
+import { AfterViewInit, Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core'
 import { TrainingPlanContent } from '../../models/training-plan.model'
 import { ActivatedRoute } from '@angular/router'
 import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
@@ -7,7 +7,7 @@ import { TrainingPlanDataSharingService } from '../../services/training-plan-dat
   templateUrl: './stepper.component.html',
   styleUrls: ['./stepper.component.scss'],
 })
-export class StepperComponent implements OnInit, OnChanges {
+export class StepperComponent implements OnInit, OnChanges, AfterViewInit {
 
   @Input() changeTabOnNext!: string
   @Output() selectedTabType = new EventEmitter<any>()
@@ -17,13 +17,13 @@ export class StepperComponent implements OnInit, OnChanges {
 
   tabType = TrainingPlanContent.TTabLabelKey
   tabIndexValue = 0
-  addCotnentDisable = true
-  addAssigneeDisable = true
-  addTimelineDisable = true
+  addCotnentDisable!: boolean
+  addAssigneeDisable!: boolean
+  addTimelineDisable!: boolean
   editState = false
   isContentLive = false
   constructor(private route: ActivatedRoute,
-              private tpdsSvc: TrainingPlanDataSharingService
+    private tpdsSvc: TrainingPlanDataSharingService
   ) { }
 
   ngOnInit() {
@@ -33,6 +33,12 @@ export class StepperComponent implements OnInit, OnChanges {
     }
   }
 
+  ngAfterViewInit() {
+    this.addCotnentDisable = true
+    this.addAssigneeDisable = true
+    this.addTimelineDisable = true
+  }
+
   ngOnChanges() {
     if (this.changeTabOnNext) {
       switch (this.changeTabOnNext) {
@@ -62,28 +68,28 @@ export class StepperComponent implements OnInit, OnChanges {
     setTimeout(() => {
       this.addCotnentDisable = _event
       this.titleInvalid.emit(_event)
-    },         0)
+    }, 0)
   }
 
   checkForaddContent(_event: any) {
     setTimeout(() => {
       this.addAssigneeDisable = _event
       this.addContentIsInvalid.emit(_event)
-    },         0)
+    }, 0)
   }
 
   checkForaddAssignee(_event: any) {
     setTimeout(() => {
       this.addTimelineDisable = _event
       this.addAssigneeIsInvalid.emit(_event)
-    },         0)
+    }, 0)
   }
 
   tabChangeToTimeline(_event: any) {
     setTimeout(() => {
       this.addTimelineDisable = _event
       this.addAssigneeIsInvalid.emit(_event)
-    },         0)
+    }, 0)
     this.tabIndexValue = 3
   }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
index 5bdda518f..82e225387 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.html
@@ -8,12 +8,15 @@
             </div>
             <div class="assignee-desc">
                 <p>{{item?.firstName | titlecase}} </p>
-                <p class="sub-heading" *ngIf="item?.profileDetails?.professionalDetails && item?.profileDetails?.professionalDetails[0]">{{item?.profileDetails?.professionalDetails
-[0]?.designation }}</p>
+                <p class="sub-heading"
+                    *ngIf="item?.profileDetails?.professionalDetails && item?.profileDetails?.professionalDetails[0]">
+                    {{item?.profileDetails?.professionalDetails
+                    [0]?.designation }}</p>
             </div>
             <div class="card-cross-icon" *ngIf="showDeleteFlag">
-                <button mat-mini-fab class="card-cross-btn" type="button" (click)="deleteItem(item)">
-                    <mat-icon>close</mat-icon>
+                <button mat-mini-fab class="card-cross-btn flex flex-middle flex-center" type="button"
+                    (click)="deleteItem(item)">
+                    <mat-icon class="font-size-20">close</mat-icon>
                 </button>
             </div>
             <div class="check-action" *ngIf="checkboxVisibility">
@@ -21,7 +24,7 @@
                     (change)="selectAssigneeItem($event, item)"></mat-checkbox>
             </div>
         </div>
-    <!-- </ng-container> -->
+        <!-- </ng-container> -->
     </ng-container>
 </div>
 
@@ -32,8 +35,9 @@
     <ng-container *ngFor="let item of assigneeData?.data | slice : startIndex : lastIndex">
         <div class="flex flex-4 custom-user-card" [ngClass]="item?.selected ? 'active-card':''">
             <div class="card-cross-icon" *ngIf="showDeleteFlag">
-                <button mat-mini-fab class="card-cross-btn" type="button" (click)="deleteItem(item)">
-                    <mat-icon>close</mat-icon>
+                <button mat-mini-fab class="card-cross-btn flex flex-middle flex-center" type="button"
+                    (click)="deleteItem(item)">
+                    <mat-icon class="font-size-20">close</mat-icon>
                 </button>
             </div>
             <div class="custom-user-desc">
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
index 620419dee..03ab26371 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.scss
@@ -105,12 +105,18 @@
 
 }
 
+.font-size-20 {
+    font-size: 20px;
+}
+
 .card-cross-icon {
     position: absolute;
-    right: -10px;
-    top:-20px;
+    right: -12px;
+    top:-12px;
 }
 
 .card-cross-btn  {
     background: white !important;
+    width: 35px !important;
+    height: 35px !important;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
index 01441f3e3..729b80142 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
@@ -12,6 +12,7 @@ export class UserCardComponent implements OnInit, OnChanges {
   @Input() assigneeData: any
   @Input() showPagination = false
   @Output() handleSelectedChips = new EventEmitter()
+  @Output() userRemoved = new EventEmitter<any>()
   @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | any
   dataSource: any
   startIndex = 0
@@ -141,6 +142,7 @@ export class UserCardComponent implements OnInit, OnChanges {
         })
       }
     }
+    this.userRemoved.emit(true)
   }
 
   createInititals(name: string): string {
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
index 787df88f7..cb93fc70a 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
@@ -3,7 +3,7 @@
 </ng-container>
 <ng-container>
     <ws-app-chip [selectedAssigneeChips]="selectedAssigneeChips" [from]="from"
-        [selectAssigneeCount]="selectAssigneeCount"></ws-app-chip>
+        [selectAssigneeCount]="selectAssigneeCount" (itemRemoved)="itemsRemovedFromChip()"></ws-app-chip>
 </ng-container>
 <ng-container>
     <ws-app-user-card [assigneeData]="assigneeData" (handleSelectedChips)="handleSelectedChips($event)"
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
index 037a32657..f9e8ecaf5 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
@@ -85,7 +85,6 @@ export class CreateAssigneeComponent implements OnInit {
         }
       } else if (this.tpdsSvc.trainingPlanAssigneeData.category === 'CustomUser') {
         this.selectedAssigneeChips = this.tpdsSvc.trainingPlanAssigneeData.data
-
         if (this.selectedAssigneeChips) {
           this.selectedAssigneeChips.map((sitem: any) => {
             if (sitem && sitem.selected) {
@@ -103,6 +102,10 @@ export class CreateAssigneeComponent implements OnInit {
     }
   }
 
+  itemsRemovedFromChip() {
+    this.handleSelectedChips(true)
+  }
+
   changeTab() {
     this.changeTabToTimeline.emit(false)
   }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
index 50b710fde..53d21317e 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.html
@@ -4,14 +4,14 @@
 <ng-container *ngIf="contentData?.length">
     <div class="margin-top-xl">
         <div class="flex flex-middle flex-between">
-            <div class="mat-subheading-1 margin-remove">Selected Content <span *ngIf="contentData?.length">(
-                    {{contentData?.length }} )</span></div>
-            <a mat-button (click)="showAll('content')" class="show-all" *ngIf="contentData?.length > 4">Show all
+            <div class="mat-subheading-1 margin-remove">Selected Content <span *ngIf="totalContentCount">(
+                    {{totalContentCount }} )</span></div>
+            <a mat-button (click)="showAll('content')" class="show-all" *ngIf="totalContentCount > 4">Show all
                 <mat-icon>keyboard_arrow_right</mat-icon></a>
         </div>
     </div>
-    <ws-app-standard-card [checkboxVisibility]="false" [contentData]="contentData | slice : 0 : 4"
-        [showDeleteFlag]="true" [ngClass]="{'disable': isContentLive}"></ws-app-standard-card>
+    <ws-app-standard-card [checkboxVisibility]="false" [contentData]="contentData" [showDeleteFlag]="true"
+        [ngClass]="{'disable': isContentLive}" (selectedContentRemoved)="contentRemoved()"></ws-app-standard-card>
 </ng-container>
 <ng-container *ngIf="assigneeData && (assigneeData?.data?.length || assigneeData?.data?.content?.length)">
     <div class="margin-top-m">
@@ -25,6 +25,6 @@
                 <mat-icon>keyboard_arrow_right</mat-icon></a>
         </div>
     </div>
-    <ws-app-user-card [checkboxVisibility]="false" [assigneeData]="assigneeData"
-        [showDeleteFlag]="true"></ws-app-user-card>
+    <ws-app-user-card [checkboxVisibility]="false" [assigneeData]="assigneeData" [showDeleteFlag]="true"
+        (userRemoved)="selectedUserRemoved()"></ws-app-user-card>
 </ng-container>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
index adf4eff19..71302bb53 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
@@ -13,6 +13,7 @@ export class CreateTimelineComponent implements OnInit {
   isContentLive = false
   dialogRef: any
   totalAssigneeCount: any = 0
+  totalContentCount: any
   constructor(
     private tpdsSvc: TrainingPlanDataSharingService,
     public dialog: MatDialog) { }
@@ -22,15 +23,32 @@ export class CreateTimelineComponent implements OnInit {
       this.tpdsSvc.trainingPlanStepperData.status.toLowerCase() === 'live') {
       this.isContentLive = true
     }
+    this.getContentData()
+    switch (this.tpdsSvc.trainingPlanStepperData.assignmentType) {
+      case 'Designation':
+        this.getDesignationData()
+        break
+      case 'CustomUser':
+        this.getCustomUserData()
+        break
+    }
+  }
+
+  getContentData() {
     if (this.tpdsSvc.trainingPlanContentData &&
       this.tpdsSvc.trainingPlanContentData.data &&
       this.tpdsSvc.trainingPlanContentData.data.content
     ) {
-      this.contentData = this.tpdsSvc.trainingPlanContentData.data.content.filter((item: any) => {
+      let contentDataSelected = this.tpdsSvc.trainingPlanContentData.data.content.filter((item: any) => {
         return item.selected
       })
-
+      this.totalContentCount = contentDataSelected.length
+      contentDataSelected = contentDataSelected.slice(0, 4)
+      this.contentData = contentDataSelected
     }
+  }
+
+  getDesignationData() {
     if (this.tpdsSvc.trainingPlanAssigneeData &&
       this.tpdsSvc.trainingPlanAssigneeData.data &&
       this.tpdsSvc.trainingPlanAssigneeData.category === 'Designation'
@@ -43,6 +61,9 @@ export class CreateTimelineComponent implements OnInit {
       assigneeDataSelected = assigneeDataSelected.slice(0, 4)
       this.assigneeData = { category, data: assigneeDataSelected }
     }
+  }
+
+  getCustomUserData() {
     if (this.tpdsSvc.trainingPlanAssigneeData &&
       this.tpdsSvc.trainingPlanAssigneeData.data &&
       this.tpdsSvc.trainingPlanAssigneeData.category === 'CustomUser'
@@ -64,9 +85,34 @@ export class CreateTimelineComponent implements OnInit {
         from,
       },
       autoFocus: false,
+      width: '90%'
+    })
+    this.dialogRef.afterClosed().subscribe(() => {
+      this.getContentData()
+      switch (this.tpdsSvc.trainingPlanStepperData.assignmentType) {
+        case 'Designation':
+          this.getDesignationData()
+          break
+        case 'CustomUser':
+          this.getCustomUserData()
+          break
+      }
     })
-    // this.router.navigate(['app', 'training-plan', 'preview-plan'])
-    // this.router.navigate(['app', 'training-plan', 'preview-plan'], { queryParams: { from, tab } })
+  }
+
+  contentRemoved() {
+    this.getContentData()
+  }
+
+  selectedUserRemoved() {
+    switch (this.tpdsSvc.trainingPlanStepperData.assignmentType) {
+      case 'Designation':
+        this.getDesignationData()
+        break
+      case 'CustomUser':
+        this.getCustomUserData()
+        break
+    }
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
index c2766e1aa..5d80bde3a 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
@@ -4,16 +4,34 @@
         back</button>
 </div>
 <div class="flex flex-col" *ngIf="form==='content'">
-    <div class="mat-subheading-1 margin-remove margin-bottom-m">Selected Content <span *ngIf="contentList?.length"> (
+    <div class="mat-subheading-1 margin-remove margin-bottom-m" *ngIf="contentList?.length">Selected Content <span> (
             {{contentList?.length}} )</span></div>
-    <div class="flex flex-row justify-center max-height-400"><ws-app-standard-card [checkboxVisibility]="false"
-            [contentData]="contentList" [showDeleteFlag]="true"></ws-app-standard-card></div>
+    <div class="flex flex-row justify-center max-height-400">
+        <ws-app-standard-card [checkboxVisibility]="false" [contentData]="contentList" [showDeleteFlag]="true"
+            [showPagination]="(contentList?.length > 20) ? true : false">
+        </ws-app-standard-card>
+    </div>
+    <div class="no-cbp-data margin-top-xl margin-bottom-xl text-center"
+        *ngIf="!(contentList) || !(contentList?.length)">
+        <div><img src="/assets/images/no-content-data.svg"></div>
+        <div class="mat-subheading-1 margin-remove">No content avaliable.</div>
+        <!-- <div>Create a content in CBP portal to get the contents.</div> -->
+    </div>
 </div>
 <div class="flex flex-col" *ngIf="form==='assignee'">
-    <div class="mat-subheading-1 margin-remove">Selected Assignee <span *ngIf="assigneeData?.data?.length"> (
-            {{assigneeData?.data?.length}} )</span></div>
-    <div class="mt-4 flex flex-row justify-center"><ws-app-user-card [checkboxVisibility]="false"
-            [assigneeData]="assigneeData" [showDeleteFlag]="true"></ws-app-user-card></div>
+    <div class="mat-subheading-1 margin-remove" *ngIf="assigneeData?.data?.length">Selected Assignee <span> (
+            {{assigneeData?.data?.length}} )</span>
+    </div>
+    <div class="mt-4 flex flex-row justify-center max-height-400" *ngIf="assigneeData?.data?.length">
+        <ws-app-user-card [checkboxVisibility]="false" [assigneeData]="assigneeData" [showDeleteFlag]="true"
+            [showPagination]="(assigneeData?.data?.length > 20) ? true : false">
+        </ws-app-user-card>
+    </div>
+    <div class="no-cbp-data margin-top-xl margin-bottom-xl text-center" *ngIf="!assigneeData?.data?.length">
+        <div><img src="/assets/images/no-content-data.svg"></div>
+        <div class="mat-subheading-1 margin-remove">No assignee avaliable.</div>
+        <!-- <div>Create a content in CBP portal to get the contents.</div> -->
+    </div>
 </div>
 <div class="flex content-container" *ngIf="form === 'all'">
     <mat-chip-list [multiple]="true" [selectable]="true">

From 0db9448fb93c74570b22524564ee133c218c198a Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Sat, 30 Dec 2023 10:59:08 +0530
Subject: [PATCH 398/887] update for search issue 1800, 1801, 1804

---
 .../category-drop-down.component.scss         |  7 ++
 .../components/chip/chip.component.ts         |  3 +
 .../components/filter/filter.component.html   |  3 +-
 .../components/filter/filter.component.ts     | 89 +++++++++++++------
 .../components/search/search.component.html   | 20 ++++-
 .../components/search/search.component.ts     | 46 ++++++----
 .../standard-card.component.html              |  2 +-
 .../standard-card/standard-card.component.ts  |  5 +-
 .../create-content.component.html             |  2 +-
 .../create-content.component.ts               |  1 +
 .../create-plan/create-plan.component.html    |  3 +
 .../create-plan/create-plan.component.ts      | 10 +++
 .../training-plan-data-share.service.ts       |  2 +
 13 files changed, 139 insertions(+), 54 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.scss b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.scss
index 3a9dbfc44..2632ba580 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.scss
@@ -23,4 +23,11 @@ select {
     border: 1px solid rgba(0, 0, 0, 0.16) !important;
     border-radius: 2px !important;
     padding: 1rem !important;
+}
+
+.selectBox option {
+    font-size: 14px !important;
+    font-family: 'Lato';
+    font-weight: 400;
+    color: rgba(0, 0, 0, 0.87);
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
index 385095c9d..41e48f534 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
@@ -43,11 +43,14 @@ export class ChipComponent implements OnInit, OnChanges {
   clearAll() {
     if (this.from === 'content') {
       this.selectContentCount = 0
+      let selectedIndex:any = [];
       this.tpdsSvc.trainingPlanContentData.data.content.map((sitem: any) => {
         if (sitem && sitem['selected']) {
+          selectedIndex.push(sitem['identifier'])
           sitem['selected'] = false
         }
       })
+      
       this.tpdsSvc.trainingPlanStepperData.contentList = []
       this.tpdsSvc.trainingPlanStepperData.contentType = ''
     }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
index b4dbfd3e5..0ee00b73b 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
@@ -126,4 +126,5 @@
                 </div>
             </div>
         </div>
-    </div>
\ No newline at end of file
+    </div>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index 03982b6ec..78ccbc648 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -10,10 +10,9 @@ import { TrainingPlanDataSharingService } from '../../services/training-plan-dat
 })
 export class FilterComponent implements OnInit, AfterContentChecked {
   @Output() toggleFilter = new EventEmitter()
-  @Output() getFilterData = new EventEmitter()
-  @Input() clearFilterFlag: any
+  // @Output() getFilterData = new EventEmitter()
   @Input() from: any
-  @Input() designationList: any = []
+  designationList: any = []
   providersList: any[] = []
   selectedProviders: any[] = []
   competencyTypeList = [
@@ -42,19 +41,24 @@ export class FilterComponent implements OnInit, AfterContentChecked {
     private tpdsSvc: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
-    if (this.from === 'content') {
-      this.getFilterEntity()
-      this.getProviders()
-    } else {
-      // if(this.tpdsSvc.trainingPlanAssigneeData &&
-      //   this.tpdsSvc.trainingPlanAssigneeData.category === 'Custom Users') {
-      //   this.getDesignation();
-      // }
-      if (!this.designationList.length) {
-        this.getDesignation()
+    this.tpdsSvc.filterToggle.subscribe((data:any)=>{
+      if(data && data.status) {
+        if (data.from === 'content') {
+          this.getFilterEntity()
+          this.getProviders()
+        } else {
+          // if(this.tpdsSvc.trainingPlanAssigneeData &&
+          //   this.tpdsSvc.trainingPlanAssigneeData.category === 'Custom Users') {
+          //   this.getDesignation();
+          // }
+          if (!this.designationList.length) {
+            this.getDesignation()
+          }
+    
+        }
       }
-
-    }
+    });
+   
 
     this.tpdsSvc.clearFilter.subscribe((result: any) => {
       if (result) {
@@ -89,7 +93,8 @@ export class FilterComponent implements OnInit, AfterContentChecked {
   }
 
   hideFilter() {
-    this.toggleFilter.emit(false)
+    // this.toggleFilter.emit(false)
+    this.tpdsSvc.filterToggle.next({from:'',status: false});
   }
 
   checkedProviders(event: any, item: any) {
@@ -125,9 +130,19 @@ export class FilterComponent implements OnInit, AfterContentChecked {
         }
       })
       this.competencyThemeList = this.competencyThemeList.filter(sitem => {
+        if(sitem.parent === ctype.id) {
+          sitem['selected'] = false;
+        }        
         return sitem.parent !== ctype.id
       })
-      if (this.filterObj['competencyArea'].indexOf(ctype.id) > -1) {
+      this.competencySubThemeList  = this.competencySubThemeList.filter(pitem=> {
+        if(pitem.parentType === ctype.id) {
+          pitem['selected'] = false;
+        }
+        return pitem.parentType !== ctype.id 
+      })
+      if (this.filterObj['competencyArea'] && 
+          this.filterObj['competencyArea'].indexOf(ctype.id) > -1) {
         const index = this.filterObj['competencyArea'].findIndex((x: any) => x === ctype.id)
         this.filterObj['competencyArea'].splice(index, 1)
       }
@@ -144,7 +159,10 @@ export class FilterComponent implements OnInit, AfterContentChecked {
             subthemechild['parent'] = csitem.name
           })
           this.competencySubThemeList = this.competencySubThemeList.concat(csitem.children)
-          this.filterObj['competencyTheme'].push(cstype.name)
+          if(this.filterObj['competencyTheme']) {
+            this.filterObj['competencyTheme'].push(cstype.name)
+          }
+          
         }
       })
     } else {
@@ -153,10 +171,12 @@ export class FilterComponent implements OnInit, AfterContentChecked {
           csitem['selected'] = false
         }
       })
+      
       this.competencySubThemeList = this.competencySubThemeList.filter(sitem => {
         return sitem.parent !== cstype.name
       })
-      if (this.filterObj['competencyTheme'].indexOf(cstype.name) > -1) {
+      if (this.filterObj['competencyTheme'] && 
+          this.filterObj['competencyTheme'].indexOf(cstype.name) > -1) {
         const index = this.filterObj['competencyTheme'].findIndex((x: any) => x === cstype.name)
         this.filterObj['competencyTheme'].splice(index, 1)
       }
@@ -170,14 +190,18 @@ export class FilterComponent implements OnInit, AfterContentChecked {
           cstlitem['selected'] = true
         }
       })
-      this.filterObj['competencySubTheme'].push(csttype.name)
+      if(this.filterObj['competencySubTheme']) {
+        this.filterObj['competencySubTheme'].push(csttype.name)
+      }
+      
     } else {
       this.competencySubThemeList.map((cstlitem: any) => {
         if (csttype.name === cstlitem.name) {
           cstlitem['selected'] = false
         }
       })
-      if (this.filterObj['competencySubTheme'].indexOf(csttype.name) > -1) {
+      if (this.filterObj['competencySubTheme'] &&
+         this.filterObj['competencySubTheme'].indexOf(csttype.name) > -1) {
         const index = this.filterObj['competencySubTheme'].findIndex((x: any) => x === csttype.name)
         this.filterObj['competencySubTheme'].splice(index, 1)
       }
@@ -187,23 +211,28 @@ export class FilterComponent implements OnInit, AfterContentChecked {
 
   applyFilter() {
     if (this.from === 'content') {
-      this.getFilterData.emit(this.filterObj)
+      // this.getFilterData.emit(this.filterObj)      
+      this.tpdsSvc.getFilterDataObject.next(this.filterObj);
     } else {
-      this.getFilterData.emit(this.assigneeFilterObj)
+      this.tpdsSvc.getFilterDataObject.next(this.assigneeFilterObj);
+      // this.getFilterData.emit(this.assigneeFilterObj)
     }
+    this.tpdsSvc.filterToggle.next({from:'',status: false});
   }
 
   clearFilter() {
     if (this.from === 'content') {
-      this.filterObj = {}
+      this.filterObj = { competencyArea: [], competencyTheme: [], competencySubTheme: [], providers: [] }
     } else {
-      this.assigneeFilterObj = {}
+      this.assigneeFilterObj = { group: [], designation: [] }
     }
 
     if (this.from === 'content') {
-      this.getFilterData.emit(this.filterObj)
+      // this.getFilterData.emit(this.filterObj)
+      this.tpdsSvc.getFilterDataObject.next(this.filterObj);
     } else {
-      this.getFilterData.emit(this.assigneeFilterObj)
+      // this.getFilterData.emit(this.assigneeFilterObj)
+      this.tpdsSvc.getFilterDataObject.next(this.assigneeFilterObj);
     }
     if (this.checkboxes) {
       this.checkboxes.forEach((element: any) => {
@@ -233,7 +262,8 @@ export class FilterComponent implements OnInit, AfterContentChecked {
     if (event) {
       this.assigneeFilterObj['group'].push(group.name)
     } else {
-      if (this.assigneeFilterObj['group'].indexOf(group.name) > -1) {
+      if (this.assigneeFilterObj['group'] && 
+          this.assigneeFilterObj['group'].indexOf(group.name) > -1) {
         const index = this.assigneeFilterObj['group'].findIndex((x: any) => x === group.name)
         this.assigneeFilterObj['group'].splice(index, 1)
       }
@@ -244,7 +274,8 @@ export class FilterComponent implements OnInit, AfterContentChecked {
     if (event) {
       this.assigneeFilterObj['designation'].push(designation.name)
     } else {
-      if (this.assigneeFilterObj['designation'].indexOf(designation.name) > -1) {
+      if (this.assigneeFilterObj['designation'] && 
+          this.assigneeFilterObj['designation'].indexOf(designation.name) > -1) {
         const index = this.assigneeFilterObj['designation'].findIndex((x: any) => x === designation.name)
         this.assigneeFilterObj['designation'].splice(index, 1)
       }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
index 09f0d5e24..8e93137d6 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.html
@@ -22,7 +22,23 @@
         </button>
     </div>
 </div>
-<div [hidden]="!filterVisibilityFlag">
+<!-- <div [hidden]="!filterVisibilityFlag">
     <ws-app-filter (toggleFilter)="hideFilter($event)" [from]="from" [designationList]="designationList"
         (getFilterData)="getFilterData($event)" [clearFilterFlag]="clearFilter"></ws-app-filter>
-</div>
\ No newline at end of file
+</div> -->
+
+<!-- <mat-drawer-container class="example-container" autosize>
+    <mat-drawer #drawer class="example-sidenav" mode="side">      
+      <button (click)="showFiller = !showFiller" mat-raised-button>
+        Toggle extra text
+      </button>
+    </mat-drawer>
+    <div class="example-sidenav-content">
+        <button type="button" mat-button (click)="drawer.toggle()">
+          Toggle sidenav
+        </button>
+      </div>
+   
+  
+  </mat-drawer-container> -->
+   
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 23ed5fe13..01e635dcb 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -40,6 +40,15 @@ export class SearchComponent implements OnInit {
       }
 
     })
+
+    this.tpdsSvc.getFilterDataObject.subscribe((event)=>{
+      console.log('filterObj' , event);
+      if (this.from === 'content') {
+        this.getContent(this.selectedDropDownValue, event)
+      } else {
+        this.getCustomUsers(this.selectedDropDownValue, event)
+      }
+    })
     if (this.tpdsSvc.trainingPlanStepperData.status && this.tpdsSvc.trainingPlanStepperData.status.toLowerCase() === 'live') {
       this.isContentLive = true
     }
@@ -47,19 +56,21 @@ export class SearchComponent implements OnInit {
 
   openFilter() {
     this.filterVisibilityFlag = true
-    if (this.document.getElementById('top-nav-bar')) {
-      const ele: any = this.document.getElementById('top-nav-bar')
-      ele.style.zIndex = '1'
-    }
+    this.tpdsSvc.filterToggle.next({from:this.from,status: true});
+    // if (this.document.getElementById('top-nav-bar')) {
+    //   const ele: any = this.document.getElementById('top-nav-bar')
+    //   ele.style.zIndex = '1'
+    // }
 
   }
 
   hideFilter(event: any) {
     this.filterVisibilityFlag = event
-    if (this.document.getElementById('top-nav-bar')) {
-      const ele: any = this.document.getElementById('top-nav-bar')
-      ele.style.zIndex = '1000'
-    }
+    this.tpdsSvc.filterToggle.next({from:'',status:false});
+    // if (this.document.getElementById('top-nav-bar')) {
+    //   const ele: any = this.document.getElementById('top-nav-bar')
+    //   ele.style.zIndex = '1000'
+    // }
   }
 
   handleCategorySelection(event: any) {
@@ -139,8 +150,8 @@ export class SearchComponent implements OnInit {
           finResult = this.tpdsSvc.trainingPlanContentData.data.content.filter((sitem: any) => {
             return sitem.selected
           })
-        }
-        const result = { count: res.count, content: _.uniqBy(_.concat(finResult, (res.content) ? res.content : []), 'identifier') }
+        }         
+        const result = { count: res.count, content: _.uniqBy(_.concat(finResult, res.content), 'identifier') }
         this.tpdsSvc.trainingPlanContentData = { category: contentType, data: result, count: res.count }
         this.handleApiData.emit(true)
         this.loadingService.changeLoaderState(false)
@@ -248,14 +259,13 @@ export class SearchComponent implements OnInit {
     }
   }
 
-  getFilterData(event: any) {
-    if (this.from === 'content') {
-      this.getContent(this.selectedDropDownValue, event)
-    } else {
-      this.getCustomUsers(this.selectedDropDownValue, event)
-    }
-
-  }
+  // getFilterData(event: any) {
+  //   if (this.from === 'content') {
+  //     this.getContent(this.selectedDropDownValue, event)
+  //   } else {
+  //     this.getCustomUsers(this.selectedDropDownValue, event)
+  //   }
+  // }
 
   resetPageIndex() {
     this.pageIndex = 0
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
index b81eed145..fce1d3cd1 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
@@ -1,6 +1,6 @@
 <ng-container>
     <div class="flex flex-3 flex-row card-grid-container flex-wrap">
-        <div class="flex course-card margin-right-xl" *ngFor="let item of contentData | slice : startIndex : lastIndex">
+        <div class="flex course-card margin-right-xl" *ngFor="let item of contentData">
             <mat-card [ngClass]="item?.selected ? 'active-card':''" class="card-standard-container mr-5 padding-remove">
                 <mat-card-content class="min-top">
                     <div style="position: relative; z-index: 1;">
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
index 91deba209..58831b454 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
@@ -39,6 +39,7 @@ export class StandardCardComponent implements OnInit, OnChanges {
   }
 
   ngOnChanges() {
+    console.log('this.contentData', this.contentData);
     this.changeDetectorRef.detectChanges()
 
     // this.dataSource = new MatTableDataSource<any>(this.contentData);
@@ -47,8 +48,8 @@ export class StandardCardComponent implements OnInit, OnChanges {
 
   onChangePage(pe: PageEvent) {
     this.startIndex = (pe.pageIndex) * pe.pageSize
-    this.lastIndex = (pe.pageIndex + 1) * pe.pageSize
-    this.tpdsSvc.handleContentPageChange.next({ pageIndex: this.startIndex, pageSize: this.lastIndex })
+    this.lastIndex = pe.pageSize
+    this.tpdsSvc.handleContentPageChange.next({ pageIndex: this.startIndex, pageSize: pe.pageSize})
     // this.startIndex = this.pageIndex
   }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
index 1c9f580b3..b4d38ed6f 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
@@ -20,4 +20,4 @@
         <!-- <div>Create a content in CBP portal to get the contents.</div> -->
     </div>
 
-</ng-container>
\ No newline at end of file
+</ng-container>
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
index 9e4ff1825..1867b1f4e 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
@@ -79,6 +79,7 @@ export class CreateContentComponent implements OnInit {
         this.contentData = this.tpdsSvc.trainingPlanContentData.data.content
         this.count = this.tpdsSvc.trainingPlanContentData.data.count
       }
+      console.log('this.contentData',this.contentData)
     }
   }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
index 36bf1ffc7..e72b8e97f 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
@@ -4,4 +4,7 @@
     <ws-app-stepper (selectedTabType)="selectedTabAction($event)" [changeTabOnNext]="nextTab"
         (titleInvalid)="isPlanTitleInvalid($event)" (addContentIsInvalid)="isAddContentInvalid($event)"
         (addAssigneeIsInvalid)="isAddAssigneeInvalid($event)"></ws-app-stepper>
+</div>
+<div [hidden]="!filterVisibilityFlag">
+    <ws-app-filter (toggleFilter)="hideFilter($event)" [from]="from"></ws-app-filter>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
index f82483bf2..bd27712b7 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
@@ -17,6 +17,8 @@ export class CreatePlanComponent implements OnInit, OnDestroy {
   nextTab = ''
   createCheck: any
   planId = ''
+  filterVisibilityFlag = false;
+  from = '';
   constructor(
     private route: ActivatedRoute,
     private tpdsSvc: TrainingPlanDataSharingService) {
@@ -54,6 +56,14 @@ export class CreatePlanComponent implements OnInit, OnDestroy {
       this.tpdsSvc.trainingPlanStepperData['endDate'] = contentData.endDate
       this.tpdsSvc.trainingPlanStepperData['status'] = contentData.status
     }
+
+    this.tpdsSvc.filterToggle.subscribe((data:any)=>{
+      if(data) {
+        this.filterVisibilityFlag = data.status;
+        this.from = data.from;
+      }
+      
+    })
   }
 
   selectedTabAction(_event: any) {
diff --git a/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts b/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
index 222d4c10d..0f2cc3b3a 100644
--- a/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
+++ b/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
@@ -9,6 +9,8 @@ export class TrainingPlanDataSharingService {
   trainingPlanCategoryChangeEvent = new Subject()
   moderatedCourseSelectStatus = new Subject()
   handleContentPageChange = new Subject()
+  filterToggle = new Subject();
+  getFilterDataObject = new Subject();
   trainingPlanTitle = ''
   trainingPlanContentData: any
   trainingPlanAssigneeData: any

From 37a397343e460e90c45d6b0d81d286495e97c421 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Mon, 1 Jan 2024 12:33:03 +0530
Subject: [PATCH 399/887] verified karmayogi fixes

---
 .../needs-approval/needs-approval.component.html       | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.html b/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.html
index d87214cf8..f5ef521d3 100644
--- a/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.html
+++ b/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.html
@@ -14,11 +14,15 @@
         <div class="flex flex-wrap mobile-break">
           <div class="w-full profile-cols-full bg-grey" *ngIf="needApprovalList.length>0">
             <ng-container *ngFor="let field of needApprovalList">
-              <div class="appr-label">
+              <div class="appr-label" *ngIf="field.fieldKey !== 'verifiedKarmayogi'">
                 <label class="appr-text-label">{{field.label}}</label>
               </div>
-              <div>
-                <input type="text" class="appr-text-field" [value]="field.value">
+              <div [class.mt-4]="field.fieldKey === 'verifiedKarmayogi'">
+                <span [hidden]="field.fieldKey === 'verifiedKarmayogi'">
+                  <input type="text" class="appr-text-field" [value]="field.value">
+                </span>
+                <label class="appr-text-label mt-2" *ngIf="field.fieldKey === 'verifiedKarmayogi'">{{field.label}}
+                </label>
                 <button mat-icon-button aria-label="Reject" id="reject" (click)="onClickHandleWorkflow(field,'REJECT')">
                   <mat-icon class="reject">close</mat-icon>
                 </button>

From 096f21814c33fbc88116fe3c8d6e5d4ddbb80877 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Mon, 1 Jan 2024 13:11:22 +0530
Subject: [PATCH 400/887] update for issue 1809

---
 .../training-plan/components/search/search.component.ts    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index b02967ff8..2095cb49b 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -1,6 +1,5 @@
-import { Component, EventEmitter, Input, Inject, Output, OnInit } from '@angular/core'
+import { Component, EventEmitter, Input, Output, OnInit } from '@angular/core'
 import { ActivatedRoute } from '@angular/router'
-import { DOCUMENT } from '@angular/common'
 import { TrainingPlanService } from './../../services/traininig-plan.service'
 import { TrainingPlanDataSharingService } from './../../services/training-plan-data-share.service'
 /* tslint:disable */
@@ -24,7 +23,7 @@ export class SearchComponent implements OnInit {
   pageIndex = 0
   pageSize = 20
   isContentLive = false
-  constructor(@Inject(DOCUMENT) private document: Document,
+  constructor(
     private trainingPlanService: TrainingPlanService,
     private route: ActivatedRoute,
     public tpdsSvc: TrainingPlanDataSharingService,
@@ -211,7 +210,7 @@ export class SearchComponent implements OnInit {
     this.trainingPlanService.getDesignations().subscribe((res: any) => {
       if (this.searchText) {
         const resArr = res.result.response.content.filter((ditem: any) => {
-          if (ditem.name.includes(this.searchText)) {
+          if (ditem.name.toLowerCase().includes(this.searchText.toLowerCase())) {
             return ditem
           }
         })

From 76ac0c45f041e7024513f5e3f189c0a28cb64b50 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Mon, 1 Jan 2024 13:11:59 +0530
Subject: [PATCH 401/887] update for issue 1809

---
 .../routes/training-plan/components/search/search.component.ts   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 2095cb49b..f88d63ecf 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -41,7 +41,6 @@ export class SearchComponent implements OnInit {
     })
 
     this.tpdsSvc.getFilterDataObject.subscribe((event)=>{
-      console.log('filterObj' , event);
       if (this.from === 'content') {
         this.getContent(this.selectedDropDownValue, event)
       } else {

From 9067c3c337e84b8d852c251c29ee0f89f7df8853 Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Mon, 1 Jan 2024 15:52:37 +0530
Subject: [PATCH 402/887] lint error resolved

---
 .../routes/approvals/approvals.component.ts   | 33 ++++++++++++++-----
 .../workallocation.component.html             | 12 ++++++-
 .../workallocation.component.ts               | 16 +++++++++
 3 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
index bf469e1bc..c2841410c 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
@@ -2,18 +2,21 @@
 import { Component, OnDestroy, OnInit } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
 import { ApprovalsService } from '../../services/approvals.service'
-import moment from 'moment'
+// import moment from 'moment'
 import { ITableData } from '@sunbird-cb/collection/lib/ui-org-table/interface/interfaces'
 import { MatSnackBar } from '@angular/material'
 /* tslint:disable */
 import _ from 'lodash'
 import { EventService } from '@sunbird-cb/utils'
 import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
+// import { DatePipe } from '@angular/common'
+// import moment from 'moment'
 /* tslint:enable */
 @Component({
   selector: 'ws-app-approvals',
   templateUrl: './approvals.component.html',
   styleUrls: ['./approvals.component.scss'],
+  // providers: [CustomeDatePipePipe],
 })
 export class ApprovalsComponent implements OnInit, OnDestroy {
   data: any[] = []
@@ -45,6 +48,7 @@ export class ApprovalsComponent implements OnInit, OnDestroy {
     private activeRouter: ActivatedRoute,
     private route: ActivatedRoute,
     private events: EventService,
+    // private datePipe: DatePipe,
     // private telemetrySvc: TelemetryService,
     private snackbar: MatSnackBar) {
     this.configSvc = this.route.parent && this.route.parent.snapshot.data.configService
@@ -56,6 +60,7 @@ export class ApprovalsComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit() {
+
   }
 
   filter(key: string | 'timestamp' | 'best' | 'saved') {
@@ -147,14 +152,18 @@ export class ApprovalsComponent implements OnInit, OnDestroy {
           })
 
           this.data.push({
+
             fullname: approval.userInfo ? `${approval.userInfo.first_name}` : '--',
             // fullname: approval.userInfo ? `${approval.userInfo.first_name} ${approval.userInfo.last_name}` : '--',
-            requestedon: `${currentdate.getDate()}
-          ${moment(currentdate.getMonth() + 1, 'MM').format('MMM')}
-          ${currentdate.getFullYear()}
-          ${currentdate.getHours()} :
-          ${currentdate.getMinutes()} :
-          ${currentdate.getSeconds()}`,
+            // requestedon: `${currentdate.getDate()}
+            //   requestedon: `${currentdate.getDate()}
+            // ${moment(currentdate.getMonth() + 1, 'MM').format('MMM')}
+            // ${currentdate.getFullYear()}
+            // ${currentdate.getHours()} :
+            // ${currentdate.getMinutes()} :
+            // ${currentdate.getSeconds()}`,
+            // requestedon: this.datePipe.transform(currentdate, 'dd MMM y'),
+            requestedon: currentdate,
             fields: keys.slice(0, -1),
             userWorkflow: approval,
             tag: (approval.userInfo && approval.userInfo.tag) ? `${approval.userInfo.tag}` : '',
@@ -167,7 +176,15 @@ export class ApprovalsComponent implements OnInit, OnDestroy {
   }
 
   get getTableData() {
-    // console.log("table data", this.data)
+    // console.log("table data++++++", this.data)
+    if (this.data.length > 0) {
+      this.data.forEach(element => {
+        // element.requestedon = this.datePipe.transform(element.requestedon, 'dd MMM y')
+        element.requestedon = element.requestedon
+      })
+    }
+    // console.log("table data--------", this.data)
+    // requestedon: this.datePipe.transform(currentdate, 'dd MMM y'),
     return this.data
   }
 
diff --git a/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.html b/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.html
index 019876c26..d3c9fc0c2 100644
--- a/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.html
@@ -61,8 +61,18 @@
           </div>
         </div>
         <div id="loader"></div>
-        <ws-work-allocation-table [tableData]='tabledata' [data]='getTableData' *ngIf="currentFilter !== 'Archived'"
+        <!-- <ws-work-allocation-table [tableData]='tabledata' [data]='getTableData' *ngIf="currentFilter !== 'Archived'"
           (eOnRowClick)="onRoleClick($event)" [needAddAdmin]='false' [needCreateUser]='false'>
+        </ws-work-allocation-table> -->
+
+        <ws-work-allocation-table [tableData]='tabledata' [data]='getTableData'
+          *ngIf="currentFilter !== 'Archived' && currentFilter !== 'Published'" (eOnRowClick)="onRoleClick($event)"
+          [needAddAdmin]='false' [needCreateUser]='false'>
+        </ws-work-allocation-table>
+
+        <ws-work-allocation-table [tableData]='tabledataPublished' [data]='getTableData'
+          *ngIf="currentFilter !== 'Archived' && currentFilter !== 'Draft'" (eOnRowClick)="onRoleClick($event)"
+          [needAddAdmin]='false' [needCreateUser]='false'>
         </ws-work-allocation-table>
         <div class="text-center margin-m" *ngIf="currentFilter === 'Archived'">
           <img class="block mx-auto mb-3" src="/assets/instances/eagle/app_logos/allocation_empty.svg"
diff --git a/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.ts b/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.ts
index 6ae97ce91..80c3d02c7 100644
--- a/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/workallocation/workallocation.component.ts
@@ -21,6 +21,7 @@ export class WorkallocationComponent implements OnInit, OnDestroy {
   tabs: any
   currentUser!: string | null
   tabledata!: ITableData
+  tabledataPublished!: ITableData
   data: any = []
   term!: string | null
   length!: number
@@ -92,6 +93,21 @@ export class WorkallocationComponent implements OnInit, OnDestroy {
       sortState: 'asc',
       needUserMenus: true,
     }
+    this.tabledataPublished = {
+      actions: [],
+      columns: [
+        { displayName: 'Work order', key: 'workorders' },
+        { displayName: 'Officers', key: 'officers' },
+        { displayName: 'Last updated on', key: 'lastupdatedon' },
+        { displayName: 'Last updated by', key: 'lastupdatedby' },
+
+      ],
+      needCheckBox: false,
+      needHash: false,
+      sortColumn: 'workorders',
+      sortState: 'asc',
+      needUserMenus: true,
+    }
     this.configSvc = this.route.parent && this.route.parent.snapshot.data.configService
     const paramsMap = this.activeRoute.snapshot.params.tab
     if (paramsMap === 'published') {

From 013a96f63262625cbdd28c2e71667d330e265bed Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Mon, 1 Jan 2024 16:35:04 +0530
Subject: [PATCH 403/887] update for provider search issue

---
 .../components/filter/filter.component.html            | 10 ++++++++--
 .../components/filter/filter.component.ts              |  2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
index 0ee00b73b..4e0fb2910 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
@@ -77,9 +77,15 @@
                                 Provider
                             </mat-panel-title>
                         </mat-expansion-panel-header>
+                        <div class="search-container">
+                            <div class="rsearch"><mat-icon
+                                class="color-60 search-icon mat-icon notranslate material-icons mat-icon-no-color">search</mat-icon>
+                            <input #searchProviderInput id="searchProviderInput" class="sinput color-60" label="" [formControl]='searchThemeControl' placeholder="Enter Competency Theme" type="Standard">
+                            </div>
+                        </div>
                         <div class="category-content">
-                            <div class="flex flex-1 flex-row category-item" *ngFor="let item of providersList">
-                                <mat-checkbox #checkboxes disableRipple class="example-margin" (change)="checkedProviders($event, item?.name)">{{item?.name | titlecase}}</mat-checkbox>
+                            <div class="flex flex-1 flex-row category-item" *ngFor="let item of providersList | filterSearch: searchProviderInput.value">
+                                <mat-checkbox #checkboxes disableRipple class="example-margin" [checked]="item?.selected" (change)="checkedProviders($event, item?.name)">{{item?.name | titlecase}}</mat-checkbox>
                             </div>
                         </div>
                     </mat-expansion-panel>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index 78ccbc648..246bbfbbc 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -100,10 +100,12 @@ export class FilterComponent implements OnInit, AfterContentChecked {
   checkedProviders(event: any, item: any) {
     if (event) {
       this.selectedProviders.push(item)
+      item['selected'] = true;
       this.filterObj['providers'].push(item.name)
     } else {
       if (this.filterObj['provider'].indexOf(item.name) > -1) {
         const index = this.filterObj['providers'].findIndex((x: any) => x === item.name)
+        item['selected'] = false;
         this.filterObj['providers'].splice(index, 1)
       }
     }

From ceab2e5831b724d4a9ea17dc6ad6c8aa2f412d93 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Mon, 1 Jan 2024 16:45:49 +0530
Subject: [PATCH 404/887] lint issues

---
 .../add-content-dialog.component.ts           | 20 ++++++++-----------
 .../breadcrumb/breadcrumb.component.ts        |  8 ++++----
 .../components/chip/chip.component.ts         |  2 +-
 .../components/search/search.component.ts     |  8 ++++----
 .../components/stepper/stepper.component.ts   | 10 +++++-----
 .../create-content.component.ts               |  4 +---
 .../create-timeline.component.ts              |  2 +-
 .../services/traininig-plan.service.ts        |  2 +-
 8 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
index 436c52d15..69ae56f9b 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
@@ -23,7 +23,7 @@ export class AddContentDialogComponent implements OnInit {
   seletedCompetencySubTheme: any = []
   providersList: any = []
   filteredProviders: any = []
-  selectedValues = [];
+  selectedValues = []
 
   checkedList: any = []
   currentSelected: any
@@ -61,16 +61,16 @@ export class AddContentDialogComponent implements OnInit {
     this.filteredProviders = this.contentForm.controls['providerText'].valueChanges
       .pipe(
         startWith<string>(''),
-        map((name: any) => this._filter(name))
+        map((name: any) => this.filter(name))
       )
   }
 
-  private _filter(name: string): String[] {
+  filter(name: string): String[] {
     const filterValue = name.toLowerCase()
     // Set selected values to retain the selected checkbox state
     this.setSelectedValues()
     this.contentForm.controls['provider'].patchValue(this.selectedValues)
-    let filteredList = this.data.filter((option: any) => option.toLowerCase().indexOf(filterValue) === 0)
+    const filteredList = this.data.filter((option: any) => option.toLowerCase().indexOf(filterValue) === 0)
     return filteredList
   }
 
@@ -161,11 +161,10 @@ export class AddContentDialogComponent implements OnInit {
   }
 
   openedChange(e: any) {
-    console.log('e', e)
     // Set search textbox value as empty while opening selectbox
     this.contentForm.controls['providerText'].patchValue('')
     // Focus to search textbox while clicking on selectbox
-    if (e == true) {
+    if (e === true) {
       // this.contentForm.value.provider.focus()
     }
   }
@@ -178,7 +177,7 @@ export class AddContentDialogComponent implements OnInit {
   setSelectedValues() {
     if (this.contentForm.value.provider && this.contentForm.value.provider.length > 0) {
       this.contentForm.value.provider.forEach((e: any) => {
-        if (this.contentForm.value.provider.indexOf(e) == -1) {
+        if (this.contentForm.value.provider.indexOf(e) === -1) {
           this.contentForm.value.provider.push(e)
           this.selectedProvidersList.push(e)
         }
@@ -187,9 +186,8 @@ export class AddContentDialogComponent implements OnInit {
   }
 
   selectionChange(event: any, option: any) {
-    console.log('event', event)
     if (event.isUserInput) {
-      let index = this.selectedProvidersList.findIndex((object: any) => object.id === option.orgId)
+      const index = this.selectedProvidersList.findIndex((object: any) => object.id === option.orgId)
       if (index === -1) {
         this.selectedProvidersList.push(option)
       } else {
@@ -226,11 +224,9 @@ export class AddContentDialogComponent implements OnInit {
         competencySubTheme: subthemeNames,
         competencySubThemeId: subthemeIds,
         listOfProviders: providersIds,
-        descriptionOfTheContent: this.contentForm.value.contentdescription || ''
+        descriptionOfTheContent: this.contentForm.value.contentdescription || '',
       }
-      console.log('req', req)
       this.trainingplanSvc.createNewContentrequest(req).subscribe((result: any) => {
-        console.log('result', result)
       })
     }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
index 3fb63677e..b52947726 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
@@ -150,7 +150,7 @@ export class BreadcrumbComponent implements OnInit {
             tabSelected: this.tpdsSvc.trainingPlanStepperData.assignmentType,
           },
         })
-      }, 1000)
+      },         1000)
     })
   }
 
@@ -197,7 +197,7 @@ export class BreadcrumbComponent implements OnInit {
               tabSelected: this.tpdsSvc.trainingPlanStepperData.assignmentType,
             },
           })
-        }, 1000)
+        },         1000)
       }
     })
   }
@@ -221,12 +221,12 @@ export class BreadcrumbComponent implements OnInit {
               tabSelected: this.tpdsSvc.trainingPlanStepperData.assignmentType,
             },
           })
-        }, 1000)
+        },         1000)
       } else {
         this.snackBar.open('Something went wrong while publishing CBP plan. Try again later')
         this.dialogRef.close()
       }
-    }, (_error: any) => {
+    },                                    (_error: any) => {
       this.snackBar.open('Something went wrong while publishing CBP plan. Try again later')
       this.dialogRef.close()
     })
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
index 37d12a235..ed4a02de4 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
@@ -126,7 +126,7 @@ export class ChipComponent implements OnInit, OnChanges {
         from: this.from,
       },
       autoFocus: false,
-      width: '90%'
+      width: '90%',
     })
     this.dialogRef.afterClosed().subscribe(() => {
       this.itemRemoved.emit(true)
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 7e54f0d15..9db3cef3e 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -25,10 +25,10 @@ export class SearchComponent implements OnInit {
   pageSize = 20
   isContentLive = false
   constructor(@Inject(DOCUMENT) private document: Document,
-    private trainingPlanService: TrainingPlanService,
-    private route: ActivatedRoute,
-    public tpdsSvc: TrainingPlanDataSharingService,
-    private loadingService: LoaderService
+              private trainingPlanService: TrainingPlanService,
+              private route: ActivatedRoute,
+              public tpdsSvc: TrainingPlanDataSharingService,
+              private loadingService: LoaderService
   ) { }
 
   ngOnInit() {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
index 2ddd3b4d0..36a930a93 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
@@ -23,7 +23,7 @@ export class StepperComponent implements OnInit, OnChanges, AfterViewInit {
   editState = false
   isContentLive = false
   constructor(private route: ActivatedRoute,
-    private tpdsSvc: TrainingPlanDataSharingService
+              private tpdsSvc: TrainingPlanDataSharingService
   ) { }
 
   ngOnInit() {
@@ -68,28 +68,28 @@ export class StepperComponent implements OnInit, OnChanges, AfterViewInit {
     setTimeout(() => {
       this.addCotnentDisable = _event
       this.titleInvalid.emit(_event)
-    }, 0)
+    },         0)
   }
 
   checkForaddContent(_event: any) {
     setTimeout(() => {
       this.addAssigneeDisable = _event
       this.addContentIsInvalid.emit(_event)
-    }, 0)
+    },         0)
   }
 
   checkForaddAssignee(_event: any) {
     setTimeout(() => {
       this.addTimelineDisable = _event
       this.addAssigneeIsInvalid.emit(_event)
-    }, 0)
+    },         0)
   }
 
   tabChangeToTimeline(_event: any) {
     setTimeout(() => {
       this.addTimelineDisable = _event
       this.addAssigneeIsInvalid.emit(_event)
-    }, 0)
+    },         0)
     this.tabIndexValue = 3
   }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
index ff34cac60..889d73e6c 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
@@ -112,8 +112,6 @@ export class CreateContentComponent implements OnInit {
       height: '75%',
       width: '60%',
     })
-    dialogRef.afterClosed().subscribe((res: any) => {
-      console.log('res', res)
-    })
+    dialogRef.afterClosed().subscribe()
   }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
index 71302bb53..c60a75e1e 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
@@ -85,7 +85,7 @@ export class CreateTimelineComponent implements OnInit {
         from,
       },
       autoFocus: false,
-      width: '90%'
+      width: '90%',
     })
     this.dialogRef.afterClosed().subscribe(() => {
       this.getContentData()
diff --git a/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts b/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
index 2bbf6fe16..2deda5a75 100644
--- a/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
+++ b/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
@@ -17,7 +17,7 @@ const API_END_POINTS = {
   GET_ALL_DESIGNATIONS: 'apis/proxies/v8/masterData/v2/deptPosition',
   GET_PROVIDERS: 'apis/proxies/v8/searchBy/provider',
   GET_FILTER_ENTITY: 'apis/proxies/v8/competency/v4/search',
-  CREATE_NEWCONTENT: 'apis/proxies/v8/workflow/requestcbplancontent'
+  CREATE_NEWCONTENT: 'apis/proxies/v8/workflow/requestcbplancontent',
 }
 @Injectable({
   providedIn: 'root',

From f215b7f17fbe66ee9d82c9b679191c31a18c68c0 Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Mon, 1 Jan 2024 18:02:41 +0530
Subject: [PATCH 405/887] table sorting for work allocation

---
 .../work-allocation-list/table.component.ts            | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/head/work-allocation-table/work-allocation-list/table.component.ts b/project/ws/app/src/lib/head/work-allocation-table/work-allocation-list/table.component.ts
index 1468dc197..25adb5dd6 100644
--- a/project/ws/app/src/lib/head/work-allocation-table/work-allocation-list/table.component.ts
+++ b/project/ws/app/src/lib/head/work-allocation-table/work-allocation-list/table.component.ts
@@ -49,7 +49,13 @@ export class WorkAllocationTableComponent implements OnInit, OnChanges {
   }
   downloaddata: any = []
   @ViewChild(MatPaginator, { static: true }) paginator!: MatPaginator
-  @ViewChild(MatSort, { static: true }) sort?: MatSort
+  // @ViewChild(MatSort, { static: true }) sort?: MatSort
+  @ViewChild(MatSort, { static: false }) set matSort(sort: MatSort) {
+    if (!this.dataSource.sort) {
+      this.dataSource.sort = sort
+    }
+  }
+
   selection = new SelectionModel<any>(true, [])
   constructor(
     private router: Router, public dialog: MatDialog,
@@ -70,7 +76,7 @@ export class WorkAllocationTableComponent implements OnInit, OnChanges {
     }
     this.dataSource.data = this.data
     this.dataSource.paginator = this.paginator
-    this.dataSource.sort = this.sort
+    // this.dataSource.sort = this.sort
     this.viewPaginator = true
     this.activatedRoute.params.subscribe(params => {
       this.departmentRole = params['currentDept']

From 4c7c37cf057e5a643caf604d4c61042ca7aadfa2 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Mon, 1 Jan 2024 18:11:15 +0530
Subject: [PATCH 406/887] lint issues

---
 .../add-content-dialog/add-content-dialog.component.ts         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
index 69ae56f9b..abed36f73 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
@@ -226,8 +226,7 @@ export class AddContentDialogComponent implements OnInit {
         listOfProviders: providersIds,
         descriptionOfTheContent: this.contentForm.value.contentdescription || '',
       }
-      this.trainingplanSvc.createNewContentrequest(req).subscribe((result: any) => {
-      })
+      this.trainingplanSvc.createNewContentrequest(req).subscribe()
     }
 
   }

From 459d2d7a614a3cc802b883914782467718df9833 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Mon, 1 Jan 2024 20:36:54 +0530
Subject: [PATCH 407/887] provider search issue

---
 .../training-plan/components/filter/filter.component.html       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
index 4e0fb2910..6c1bd3203 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
@@ -80,7 +80,7 @@
                         <div class="search-container">
                             <div class="rsearch"><mat-icon
                                 class="color-60 search-icon mat-icon notranslate material-icons mat-icon-no-color">search</mat-icon>
-                            <input #searchProviderInput id="searchProviderInput" class="sinput color-60" label="" [formControl]='searchThemeControl' placeholder="Enter Competency Theme" type="Standard">
+                            <input #searchProviderInput id="searchProviderInput" class="sinput color-60" label="" [formControl]='searchThemeControl' placeholder="Enter Provider" type="Standard">
                             </div>
                         </div>
                         <div class="category-content">

From 9679d72d69ee1f3ead0b050d312a2a3a97344f1c Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Mon, 1 Jan 2024 22:21:23 +0530
Subject: [PATCH 408/887] approval list pagination

---
 .../routes/approvals/approvals.component.html |  5 ++-
 .../routes/approvals/approvals.component.ts   | 38 ++++++++++---------
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.html
index 613e1cad4..027964540 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.html
@@ -24,8 +24,9 @@
         </div>
       </div>
       <ng-container *ngIf="getTableData && getTableData.length>0">
-        <ws-widget-org-user-table [tableData]='tabledata' [data]='getTableData' (eOnRowClick)="onApprovalClick($event)">
-        </ws-widget-org-user-table>
+        <ws-widget-org-user-table-v2 [tableData]="tabledata" [data]="data" (eOnRowClick)="onApprovalClick($event)"
+          [totalRecords]="approvalTotalCount" (pageChangeClick)="onPaginateChange($event)">
+        </ws-widget-org-user-table-v2>
       </ng-container>
       <ng-container *ngIf="!getTableData || getTableData.length<=0">
         <p class="text-center">No approvals pending</p>
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
index c2841410c..6f186c465 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
@@ -4,26 +4,27 @@ import { ActivatedRoute, Router } from '@angular/router'
 import { ApprovalsService } from '../../services/approvals.service'
 // import moment from 'moment'
 import { ITableData } from '@sunbird-cb/collection/lib/ui-org-table/interface/interfaces'
-import { MatSnackBar } from '@angular/material'
+import { MatSnackBar, PageEvent } from '@angular/material'
 /* tslint:disable */
 import _ from 'lodash'
 import { EventService } from '@sunbird-cb/utils'
 import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
-// import { DatePipe } from '@angular/common'
-// import moment from 'moment'
 /* tslint:enable */
 @Component({
   selector: 'ws-app-approvals',
   templateUrl: './approvals.component.html',
   styleUrls: ['./approvals.component.scss'],
-  // providers: [CustomeDatePipePipe],
 })
 export class ApprovalsComponent implements OnInit, OnDestroy {
-  data: any[] = []
+  data: any = []
   currentFilter = 'toapprove'
   discussionList!: any
   discussProfileData!: any
   departName = ''
+  approvalTotalCount = 0
+  limit = 20
+  pageIndex = 0
+  currentOffset = 0
   tabledata: ITableData = {
     // actions: [{ name: 'Approve', label: 'Approve', icon: 'remove_red_eye', type: 'Approve' },
     // { name: 'Reject', label: 'Reject', icon: 'remove_red_eye', type: 'Reject' }],
@@ -48,19 +49,16 @@ export class ApprovalsComponent implements OnInit, OnDestroy {
     private activeRouter: ActivatedRoute,
     private route: ActivatedRoute,
     private events: EventService,
-    // private datePipe: DatePipe,
-    // private telemetrySvc: TelemetryService,
     private snackbar: MatSnackBar) {
     this.configSvc = this.route.parent && this.route.parent.snapshot.data.configService
     if (this.activeRouter.parent && this.activeRouter.parent.snapshot.data.configService.unMappedUser.channel
     ) {
       this.departName = _.get(this.activeRouter, 'parent.snapshot.data.configService.unMappedUser.channel')
     }
-    this.fetchApprovals()
   }
 
   ngOnInit() {
-
+    this.fetchApprovals()
   }
 
   filter(key: string | 'timestamp' | 'best' | 'saved') {
@@ -126,13 +124,15 @@ export class ApprovalsComponent implements OnInit, OnDestroy {
         serviceName: 'profile',
         applicationStatus: 'SEND_FOR_APPROVAL',
         deptName: this.departName,
-        offset: 0,
-        limit: 100,
+        offset: this.currentOffset,
+        limit: this.limit,
       }
       this.apprService.getApprovals(req).subscribe(res => {
+        this.data = []
         let currentdate: Date
-        // console.log("result ", res)
-        res.result.data.forEach((approval: any) => {
+        this.approvalTotalCount = res.result.count
+        const resData = res.result.data
+        resData.forEach((approval: any) => {
           let keys = ''
           approval.wfInfo.forEach((wf: any) => {
             currentdate = new Date(wf.createdOn)
@@ -176,17 +176,21 @@ export class ApprovalsComponent implements OnInit, OnDestroy {
   }
 
   get getTableData() {
-    // console.log("table data++++++", this.data)
     if (this.data.length > 0) {
-      this.data.forEach(element => {
+      this.data.forEach((element: any) => {
         // element.requestedon = this.datePipe.transform(element.requestedon, 'dd MMM y')
         element.requestedon = element.requestedon
       })
     }
-    // console.log("table data--------", this.data)
-    // requestedon: this.datePipe.transform(currentdate, 'dd MMM y'),
     return this.data
   }
 
+  onPaginateChange(event: PageEvent) {
+    this.pageIndex = event.pageIndex
+    this.limit = event.pageSize
+    this.currentOffset = event.pageIndex
+    this.fetchApprovals()
+  }
+
   ngOnDestroy(): void { }
 }

From 8c2ec4f8b718b25b8a9be4d4712387107137ca96 Mon Sep 17 00:00:00 2001
From: dakshayini-krishnappa <dakshayini.krishnappa@tarento.com>
Date: Tue, 2 Jan 2024 13:35:30 +0530
Subject: [PATCH 409/887] mdo_leader issue

---
 .../lib/routes/users/routes/view-user/view-user.component.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
index c7cb46b6f..139ee758d 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
@@ -482,7 +482,7 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
           request: {
             organisationId: this.department,
             userId: this.userID,
-            roles: form.value.roles,
+            roles: Array.from(this.userRoles),
           },
         }
 

From 43ce0ddb92b45e79f41d263250ed56125da55ff9 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Tue, 2 Jan 2024 14:15:58 +0530
Subject: [PATCH 410/887] update for pagination issue

---
 .../components/filter/filter.component.html              | 2 +-
 .../training-plan/components/filter/filter.component.ts  | 9 +++++++--
 .../components/standard-card/standard-card.component.ts  | 1 -
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
index 6c1bd3203..8ab5dba15 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
@@ -85,7 +85,7 @@
                         </div>
                         <div class="category-content">
                             <div class="flex flex-1 flex-row category-item" *ngFor="let item of providersList | filterSearch: searchProviderInput.value">
-                                <mat-checkbox #checkboxes disableRipple class="example-margin" [checked]="item?.selected" (change)="checkedProviders($event, item?.name)">{{item?.name | titlecase}}</mat-checkbox>
+                                <mat-checkbox #checkboxes disableRipple class="example-margin" [checked]="item?.selected" (change)="checkedProviders($event, item)">{{item?.name | titlecase}}</mat-checkbox>
                             </div>
                         </div>
                     </mat-expansion-panel>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index 246bbfbbc..05fc11c31 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -41,6 +41,8 @@ export class FilterComponent implements OnInit, AfterContentChecked {
     private tpdsSvc: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
+    // this.filterObj = [];
+    // this.assigneeFilterObj = [];
     this.tpdsSvc.filterToggle.subscribe((data:any)=>{
       if(data && data.status) {
         if (data.from === 'content') {
@@ -99,9 +101,11 @@ export class FilterComponent implements OnInit, AfterContentChecked {
 
   checkedProviders(event: any, item: any) {
     if (event) {
-      this.selectedProviders.push(item)
+      this.selectedProviders.push(item.name)
       item['selected'] = true;
-      this.filterObj['providers'].push(item.name)
+      if(this.filterObj['providers']) {
+        this.filterObj['providers'].push(item.name)
+      }      
     } else {
       if (this.filterObj['provider'].indexOf(item.name) > -1) {
         const index = this.filterObj['providers'].findIndex((x: any) => x === item.name)
@@ -109,6 +113,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
         this.filterObj['providers'].splice(index, 1)
       }
     }
+    console.log(this.filterObj);
   }
 
   getCompetencyTheme(event: any, ctype: any) {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
index 36b15339f..e1261327d 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
@@ -40,7 +40,6 @@ export class StandardCardComponent implements OnInit, OnChanges {
   }
 
   ngOnChanges() {
-    console.log('this.contentData', this.contentData);
     this.changeDetectorRef.detectChanges()
   }
 

From 860e0061dd0f7f25f752529832a206a6d2b66a62 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Tue, 2 Jan 2024 14:26:20 +0530
Subject: [PATCH 411/887] update for pagination issue

---
 .../training-plan/components/filter/filter.component.html   | 2 +-
 .../training-plan/components/filter/filter.component.ts     | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
index 8ab5dba15..8e6aa959b 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
@@ -80,7 +80,7 @@
                         <div class="search-container">
                             <div class="rsearch"><mat-icon
                                 class="color-60 search-icon mat-icon notranslate material-icons mat-icon-no-color">search</mat-icon>
-                            <input #searchProviderInput id="searchProviderInput" class="sinput color-60" label="" [formControl]='searchThemeControl' placeholder="Enter Provider" type="Standard">
+                            <input #searchProviderInput id="searchProviderInput" class="sinput color-60" label="" [formControl]='searchProviderControl' placeholder="Enter Provider" type="Standard">
                             </div>
                         </div>
                         <div class="category-content">
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index 05fc11c31..e548412b4 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -34,6 +34,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
   assigneeFilterObj: any = { group: [], designation: [] }
   searchThemeControl = new FormControl()
   searchSubThemeControl = new FormControl()
+  searchProviderControl = new FormControl();
   @ViewChildren('checkboxes') checkboxes!: QueryList<ElementRef>
   constructor(
     private cdref: ChangeDetectorRef,
@@ -116,7 +117,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
     console.log(this.filterObj);
   }
 
-  getCompetencyTheme(event: any, ctype: any) {
+  getCompetencyTheme(event: any, ctype: any) {    
     if (event.checked) {
       this.competencyList.map((citem: any) => {
         if (citem.name === ctype.id) {
@@ -153,6 +154,8 @@ export class FilterComponent implements OnInit, AfterContentChecked {
         const index = this.filterObj['competencyArea'].findIndex((x: any) => x === ctype.id)
         this.filterObj['competencyArea'].splice(index, 1)
       }
+      this.searchThemeControl.reset();
+      this.searchSubThemeControl.reset();
     }
   }
 
@@ -187,6 +190,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
         const index = this.filterObj['competencyTheme'].findIndex((x: any) => x === cstype.name)
         this.filterObj['competencyTheme'].splice(index, 1)
       }
+      this.searchSubThemeControl.reset();
     }
   }
 

From 39a10889e768144b422ff2807557f7fba97a45e2 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Tue, 2 Jan 2024 15:06:31 +0530
Subject: [PATCH 412/887] update for pagination issue

---
 .../competency-summary.component.ts           |  2 +-
 .../components/filter/filter.component.html   |  4 +-
 .../components/filter/filter.component.ts     | 65 +++++++++++++++++--
 .../components/search/search.component.ts     | 16 +++--
 4 files changed, 73 insertions(+), 14 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
index 7c5fbe9b9..e191ef240 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
@@ -59,7 +59,7 @@ export class CompetencySummaryComponent implements OnInit, OnChanges {
     ]
     if (this.contentData) {
       this.contentData.map((item: any) => {
-        if (item.selected) {
+        if (item && item.selected) {
           this.selectedCardData.push(item)
         }
       })
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
index 8e6aa959b..33ac3a595 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
@@ -16,7 +16,7 @@
                             </mat-panel-title>
                         </mat-expansion-panel-header>
                         <div class="flex flex-1 flex-row category-item" *ngFor="let ctype of competencyTypeList">
-                            <mat-checkbox #checkboxes disableRipple class="example-margin" (change)="getCompetencyTheme($event, ctype)">{{ctype?.name | titlecase }}</mat-checkbox>
+                            <mat-checkbox #checkboxes disableRipple class="example-margin" [checked]="ctype?.selected" (change)="getCompetencyTheme($event, ctype)">{{ctype?.name | titlecase }}</mat-checkbox>
                         </div>
                     </mat-expansion-panel>
                 </mat-accordion>
@@ -83,7 +83,7 @@
                             <input #searchProviderInput id="searchProviderInput" class="sinput color-60" label="" [formControl]='searchProviderControl' placeholder="Enter Provider" type="Standard">
                             </div>
                         </div>
-                        <div class="category-content">
+                        <div class="category-content">                    
                             <div class="flex flex-1 flex-row category-item" *ngFor="let item of providersList | filterSearch: searchProviderInput.value">
                                 <mat-checkbox #checkboxes disableRipple class="example-margin" [checked]="item?.selected" (change)="checkedProviders($event, item)">{{item?.name | titlecase}}</mat-checkbox>
                             </div>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index e548412b4..2050205a7 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -41,9 +41,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
     private trainingPlanService: TrainingPlanService,
     private tpdsSvc: TrainingPlanDataSharingService) { }
 
-  ngOnInit() {
-    // this.filterObj = [];
-    // this.assigneeFilterObj = [];
+  ngOnInit() {    
     this.tpdsSvc.filterToggle.subscribe((data:any)=>{
       if(data && data.status) {
         if (data.from === 'content') {
@@ -68,6 +66,8 @@ export class FilterComponent implements OnInit, AfterContentChecked {
         this.clearFilterWhileSearch()
       }
     })
+
+    this.resetFilter();
   }
 
   ngAfterContentChecked() {
@@ -92,7 +92,15 @@ export class FilterComponent implements OnInit, AfterContentChecked {
   getProviders() {
     this.trainingPlanService.getProviders().subscribe((res: any) => {
       this.providersList = res
+      this.providersList.map((pitem:any)=>{
+        if(this.filterObj['providers'] && pitem && this.filterObj['providers'].indexOf(pitem.name) > -1) {
+          pitem['selected'] = true;        
+        } else {
+          pitem['selected'] = false;        
+        }         
+      })
     })
+    
   }
 
   hideFilter() {
@@ -101,24 +109,34 @@ export class FilterComponent implements OnInit, AfterContentChecked {
   }
 
   checkedProviders(event: any, item: any) {
-    if (event) {
-      this.selectedProviders.push(item.name)
-      item['selected'] = true;
+    if (event.checked) {
+      item['checked'] = true;
+      this.providersList.map((pitem:any)=>{
+        if(item.name === pitem.name) {
+          pitem['selected'] = true;        } 
+        
+      })
       if(this.filterObj['providers']) {
         this.filterObj['providers'].push(item.name)
       }      
     } else {
+      item['checked'] = false;
+      this.providersList.map((pitem:any)=>{
+        if(item.name === pitem.name) {
+          pitem['selected'] = false;
+        }         
+      })
       if (this.filterObj['provider'].indexOf(item.name) > -1) {
         const index = this.filterObj['providers'].findIndex((x: any) => x === item.name)
         item['selected'] = false;
         this.filterObj['providers'].splice(index, 1)
       }
     }
-    console.log(this.filterObj);
   }
 
   getCompetencyTheme(event: any, ctype: any) {    
     if (event.checked) {
+      ctype['selected'] = true;
       this.competencyList.map((citem: any) => {
         if (citem.name === ctype.id) {
           citem['selected'] = true
@@ -132,6 +150,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
         }
       })
     } else {
+      ctype['selected'] = false;
       this.competencyList.map((citem: any) => {
         if (citem.name === ctype.id) {
           citem['selected'] = false
@@ -292,4 +311,36 @@ export class FilterComponent implements OnInit, AfterContentChecked {
       }
     }
   }
+
+  resetFilter() {
+    if(this.competencyTypeList) {
+      this.competencyTypeList.map((citem:any)=>{
+        if(citem && citem['selected']) {
+          citem['selected'] = false;
+        }
+      })
+    }
+    if(this.competencyThemeList) {
+      this.competencyThemeList.map((titem:any)=>{
+        if(titem && titem['selected']) {
+          titem['selected'] = false;
+        }
+      })
+    }
+    if(this.competencySubThemeList) {
+      this.competencySubThemeList.map((sitem:any)=>{
+        if(sitem && sitem['selected']) {
+          sitem['selected'] = false;
+        }
+      })
+    }
+    if(this.providersList) {
+      this.providersList.map((pitem:any)=>{
+        if(pitem && pitem['selected']) {
+          pitem['selected'] = false;
+        }
+      })
+    }
+    
+  }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index f25acb979..602c1a3ab 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -145,12 +145,20 @@ export class SearchComponent implements OnInit {
           && this.tpdsSvc.trainingPlanContentData.data
           && this.tpdsSvc.trainingPlanContentData.data.content) {
           finResult = this.tpdsSvc.trainingPlanContentData.data.content.filter((sitem: any) => {
-            return sitem.selected
+            if(sitem) {
+              return sitem.selected
+            }            
           })
         }         
-        const result = { count: res.count, content: _.uniqBy(_.concat(finResult, res.content), 'identifier') }
-        this.tpdsSvc.trainingPlanContentData = { category: contentType, data: result, count: res.count }
-        this.handleApiData.emit(true)
+        if(res && res.content ) {
+          const result = { count: res.count, content: _.uniqBy(_.concat(finResult, res.content), 'identifier') }       
+          this.tpdsSvc.trainingPlanContentData = { category: contentType, data: result, count: res.count }
+                   
+        } else {
+          const result = { count: res.count, content: _.uniqBy(_.concat(finResult, []), 'identifier') }       
+          this.tpdsSvc.trainingPlanContentData = { category: contentType, data: result, count: res.count }
+        }
+        this.handleApiData.emit(true) 
         this.loadingService.changeLoaderState(false)
       })
     }

From 84bf0af63e279f04151bab49f088175be3101276 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Tue, 2 Jan 2024 15:14:52 +0530
Subject: [PATCH 413/887] update for pagination issue

---
 .../routes/training-plan/components/filter/filter.component.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index 2050205a7..0910e2d98 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -126,7 +126,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
           pitem['selected'] = false;
         }         
       })
-      if (this.filterObj['provider'].indexOf(item.name) > -1) {
+      if (this.filterObj['providers'].indexOf(item.name) > -1) {
         const index = this.filterObj['providers'].findIndex((x: any) => x === item.name)
         item['selected'] = false;
         this.filterObj['providers'].splice(index, 1)

From a06467797fab5ac231e5c7148898b9fbb97995b6 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Tue, 2 Jan 2024 16:38:37 +0530
Subject: [PATCH 414/887] search for dashboard with hidden column

---
 .../training-plan-dashboard.component.ts      | 32 ++++++++++++++++---
 .../standard-card/standard-card.component.ts  |  3 +-
 .../create-content.component.ts               |  1 -
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
index bfd5a8ef8..c1365b93c 100644
--- a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
@@ -9,6 +9,9 @@ import { LoaderService } from '../../../../../../../../../src/app/services/loade
 import { TrainingPlanService } from '../../../training-plan/services/traininig-plan.service'
 import { MatDialog, MatSnackBar } from '@angular/material'
 import { ConfirmationBoxComponent } from '../../../training-plan/components/confirmation-box/confirmation.box.component'
+/* tslint:disable */
+import _ from 'lodash'
+/* tslint:enable */
 
 @Component({
   selector: 'ws-app-training-plan-dashboard',
@@ -79,7 +82,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
         { displayName: 'Content type', key: 'contentType' },
         { displayName: 'Timeline', key: 'endDate' },
         { displayName: 'Created by', key: 'createdByName' },
-        { displayName: 'Created on', key: 'updatedAt' },
+        { displayName: 'Created on', key: 'updatedAt' }
       ],
       needCheckBox: false,
       needHash: false,
@@ -88,7 +91,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
       needUserMenus: false,
       actions: [],
       actionColumnName: 'Action',
-      cbpPlanMenu: true,
+      cbpPlanMenu: true
     }
     this.filter(this.currentFilter)
   }
@@ -193,6 +196,27 @@ export class TrainingPlanDashboardComponent implements OnInit {
       res.endDate = (res.endDate) ? moment(res.endDate).format('MMM DD[,] YYYY') : ''
       res.updatedAt = (res.updatedAt) ? moment(res.updatedAt).format('MMM DD[,] YYYY') : ''
       res.createdByName = (res.createdBy === this.currentUser) ? 'You' : res.createdByName
+      let compyData: any = []
+      if (res.contentList && res.contentList.length > 0) {
+        res.contentList.forEach((contentEle: any) => {
+          if (contentEle.competencies_v5 && contentEle.competencies_v5.length > 0) {
+            contentEle.competencies_v5.forEach((compeEle: any) => {
+              compyData.push(compeEle.competencyArea)
+            })
+          }
+        })
+        res.competencies = _.uniq(compyData)
+      }
+      let userName: any = []
+      let userDesignation: any = []
+      if (res.userType === 'CustomUser' && res.userDetails && res.userDetails.length > 0) {
+        res.userDetails.forEach((ele: any) => {
+          userName.push((ele && ele.firstName) ? ele.firstName : '')
+          userDesignation.push((ele && ele.designation) ? ele.designation : '')
+        })
+      }
+      res.userNameList = userName
+      res.userDesignationList = userDesignation
     })
     this.fetchContentDone = true
     this.loaderService.changeLoaderState(false)
@@ -266,7 +290,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
       this.snackBar.open('CBP plan deleted successfully.')
       this.loaderService.changeLoaderState(false)
       this.filterData()
-    },                                                  _error => {
+    }, _error => {
       this.loaderService.changeLoaderState(false)
     })
   }
@@ -288,7 +312,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
         this.snackBar.open('Something went wrong while publishing CBP plan. Try again later')
         this.loaderService.changeLoaderState(false)
       }
-    },                                                  (_error: any) => {
+    }, (_error: any) => {
       this.snackBar.open('Something went wrong while publishing CBP plan. Try again later')
       this.loaderService.changeLoaderState(false)
     })
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
index 36b15339f..97a63467e 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
@@ -40,14 +40,13 @@ export class StandardCardComponent implements OnInit, OnChanges {
   }
 
   ngOnChanges() {
-    console.log('this.contentData', this.contentData);
     this.changeDetectorRef.detectChanges()
   }
 
   onChangePage(pe: PageEvent) {
     this.startIndex = (pe.pageIndex) * pe.pageSize
     this.lastIndex = pe.pageSize
-    this.tpdsSvc.handleContentPageChange.next({ pageIndex: this.startIndex, pageSize: pe.pageSize})
+    this.tpdsSvc.handleContentPageChange.next({ pageIndex: this.startIndex, pageSize: pe.pageSize })
     // this.startIndex = this.pageIndex
   }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
index 669c91006..889d73e6c 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
@@ -80,7 +80,6 @@ export class CreateContentComponent implements OnInit {
         this.contentData = this.tpdsSvc.trainingPlanContentData.data.content
         this.count = this.tpdsSvc.trainingPlanContentData.data.count
       }
-      console.log('this.contentData',this.contentData)
     }
   }
 

From 7859d83c5c4771f7dacb72f6b93a1f524d1fdd9d Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Tue, 2 Jan 2024 17:50:46 +0530
Subject: [PATCH 415/887] update for competency summary

---
 .../competency-summary.component.html         | 33 +++++++++-
 .../competency-summary.component.scss         | 60 +++++++++++++++++--
 .../components/filter/filter.component.ts     |  3 +-
 .../standard-card/standard-card.component.ts  |  6 +-
 4 files changed, 91 insertions(+), 11 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.html b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.html
index d1a1f2e9e..95591b46d 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.html
@@ -72,7 +72,7 @@
 <div class="competency-summary">
     <div class="competency-summary-header">Competency summary</div>
     <div class="competency-tabs">
-        <mat-tab-group [selectedIndex]="selectedIndex" class="margin-top-m" >
+        <!-- <mat-tab-group [selectedIndex]="selectedIndex" class="margin-top-m" >
             <ng-container *ngFor="let item of competencySummaryObj">
             <mat-tab [disabled]="!(item[item?.title]['count'])">
                 <ng-template mat-tab-label>
@@ -95,6 +95,35 @@
                 </ng-template>
             </mat-tab>        
         </ng-container>   
-        </mat-tab-group>
+        </mat-tab-group> -->
+        <div class="filter-content flex flex-1 flex-col">
+            <ng-container *ngFor="let item of competencySummaryObj">
+                <mat-accordion>
+                    <mat-expansion-panel disableRipple [disabled]="!(item[item?.title]['count'])" [expanded]="false">
+                        <mat-expansion-panel-header>
+                            <mat-panel-title>
+                                {{item?.title | titlecase}} ({{item[item?.title]['count']}}) 
+                            </mat-panel-title>
+                        </mat-expansion-panel-header>                    
+                        <div class="category-content">                    
+                            <ng-container *ngIf="item[item?.title]['listData']?.length">
+                                <div class="category-card flex flex-row" *ngFor="let sitem of item[item?.title]['listData']">
+                                    <div class="label">
+                                        {{sitem?.competencyTheme}}
+                                    </div>
+                                    <div>
+                                    <span class="count" *ngIf="sitem?.count">({{sitem?.count}})</span> 
+                                    </div>
+                                </div>
+                                </ng-container>
+                                <ng-container *ngIf="!(item[item?.title]['listData']?.length)">
+                                    <div class="default-tab-content">There are no competency added yet.</div>
+                                </ng-container>
+                        </div>
+                    </mat-expansion-panel>
+                </mat-accordion>
+                <div class="spacer"></div>
+            </ng-container>
+        </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.scss b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.scss
index f147fabe5..75133fd89 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.scss
@@ -1,7 +1,8 @@
 
 .competency-summary {
     // margin-top: 24px;
-    max-width: 363px;
+    // max-width: 363px;
+    width: 363px;
     border: 1px solid rgb(0,0,0,0.16);
     min-height: 300px;
     // margin-left: 25px;
@@ -25,14 +26,16 @@
 }
 
 .category-card {
-    margin: 16px;
-    border: 1px solid #ccc;
-    border-radius: 4px;
-    padding: 16px;
+    margin: 8px 0 0 8px;
+    // border: 1px solid #ccc;
+    // border-radius: 4px;
+    padding: 8px;
 }
 
 .category-card .label {
     width:90%;
+    font-size: 14px;
+    font-family: 'Lato';
 }
 
 
@@ -97,4 +100,51 @@
 
 ::ng-deep .competency-tabs .mat-tab-label-active::before {
     display: none;
+}
+
+.spacer {
+    height: 1px;
+    margin: 16px;
+    background: rgba(0,0,0,0.16);
+}
+
+::ng-deep .mat-expansion-panel {
+    box-shadow: none !important;
+}
+
+::ng-deep .mat-expansion-panel-header {
+    padding:0 !important;
+}
+
+::ng-deep .mat-expansion-panel-header-title {
+    font-weight: 700;
+    font-size: 14px;
+    width: 250px;
+    margin-left: 16px;
+    font-family: 'Lato';
+}
+
+
+::ng-deep .mat-expansion-panel:not(.mat-expanded) .mat-expansion-panel-header:not([aria-disabled=true]).cdk-keyboard-focused, .mat-expansion-panel:not(.mat-expanded) .mat-expansion-panel-header:not([aria-disabled=true]).cdk-program-focused, .mat-expansion-panel:not(.mat-expanded) .mat-expansion-panel-header:hover {
+    background:none !important;
+}
+
+::ng-deep .mat-expansion-panel-body {
+    padding: 0 !important;
+}
+
+::ng-deep .mat-expansion-panel-header {
+    height: 24px !important; 
+}
+
+.competency-tabs {
+    margin-right: 16px;
+}
+
+.count {
+    font-weight: 700;
+    font-size: 14px;
+    width: 250px;
+    margin-left: 16px;
+    font-family: 'Lato';
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index 0910e2d98..8e426a833 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -66,8 +66,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
         this.clearFilterWhileSearch()
       }
     })
-
-    this.resetFilter();
+    
   }
 
   ngAfterContentChecked() {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
index e1261327d..956336db9 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
@@ -16,7 +16,6 @@ export class StandardCardComponent implements OnInit, OnChanges {
   @Input() showPagination = false
   @Input() count = 0
   @Output() handleSelectedChips = new EventEmitter()
-  @Output() selectedContentRemoved = new EventEmitter<any>()
   @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | any
   dataSource: any
   selectedContent: any[] = []
@@ -40,7 +39,11 @@ export class StandardCardComponent implements OnInit, OnChanges {
   }
 
   ngOnChanges() {
+    // console.log('this.contentData', this.contentData);
     this.changeDetectorRef.detectChanges()
+
+    // this.dataSource = new MatTableDataSource<any>(this.contentData);
+    // this.dataSource.paginator = this.paginator;
   }
 
   onChangePage(pe: PageEvent) {
@@ -96,7 +99,6 @@ export class StandardCardComponent implements OnInit, OnChanges {
         this.tpdsSvc.trainingPlanStepperData['contentList'].splice(index, 1)
       }
     })
-    this.selectedContentRemoved.emit(true)
   }
 
   resetPageIndex() {

From 6a92ce122df7052e9b912d88619de892b2faac4d Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Tue, 2 Jan 2024 17:53:14 +0530
Subject: [PATCH 416/887] update for competency summary

---
 .../components/standard-card/standard-card.component.ts   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
index 956336db9..0789d3bbf 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
@@ -16,7 +16,8 @@ export class StandardCardComponent implements OnInit, OnChanges {
   @Input() showPagination = false
   @Input() count = 0
   @Output() handleSelectedChips = new EventEmitter()
-  @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | any
+  @Output() selectedContentRemoved = new EventEmitter<any>()
+  @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator | any
   dataSource: any
   selectedContent: any[] = []
   startIndex = 0
@@ -39,11 +40,7 @@ export class StandardCardComponent implements OnInit, OnChanges {
   }
 
   ngOnChanges() {
-    // console.log('this.contentData', this.contentData);
     this.changeDetectorRef.detectChanges()
-
-    // this.dataSource = new MatTableDataSource<any>(this.contentData);
-    // this.dataSource.paginator = this.paginator;
   }
 
   onChangePage(pe: PageEvent) {
@@ -99,6 +96,7 @@ export class StandardCardComponent implements OnInit, OnChanges {
         this.tpdsSvc.trainingPlanStepperData['contentList'].splice(index, 1)
       }
     })
+    this.selectedContentRemoved.emit(true)
   }
 
   resetPageIndex() {

From 2bb8acd07c9524e165ce151834406a4c42f9257e Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Tue, 2 Jan 2024 17:54:17 +0530
Subject: [PATCH 417/887] update for competency summary

---
 .../routes/training-plan/components/filter/filter.component.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index 8e426a833..0910e2d98 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -66,7 +66,8 @@ export class FilterComponent implements OnInit, AfterContentChecked {
         this.clearFilterWhileSearch()
       }
     })
-    
+
+    this.resetFilter();
   }
 
   ngAfterContentChecked() {

From c666d5c38550a614c6a9285b71a4ac40215312bf Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Tue, 2 Jan 2024 19:06:07 +0530
Subject: [PATCH 418/887] still working

---
 .../components/filter/filter.component.html   |  65 +++++++----
 .../components/filter/filter.component.ts     | 105 +++++++++++-------
 .../standard-card/standard-card.component.ts  |   2 +-
 .../create-content.component.html             |   4 +-
 4 files changed, 110 insertions(+), 66 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
index 6c1bd3203..a66a58162 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
@@ -16,7 +16,8 @@
                             </mat-panel-title>
                         </mat-expansion-panel-header>
                         <div class="flex flex-1 flex-row category-item" *ngFor="let ctype of competencyTypeList">
-                            <mat-checkbox #checkboxes disableRipple class="example-margin" (change)="getCompetencyTheme($event, ctype)">{{ctype?.name | titlecase }}</mat-checkbox>
+                            <mat-checkbox #checkboxes disableRipple class="example-margin"
+                                (change)="getCompetencyTheme($event, ctype)">{{ctype?.name | titlecase }}</mat-checkbox>
                         </div>
                     </mat-expansion-panel>
                 </mat-accordion>
@@ -30,22 +31,28 @@
                                 Competency Theme
                             </mat-panel-title>
                         </mat-expansion-panel-header>
-                            <div class="search-container">
-                                <div class="rsearch"><mat-icon
+                        <div class="search-container">
+                            <div class="rsearch"><mat-icon
                                     class="color-60 search-icon mat-icon notranslate material-icons mat-icon-no-color">search</mat-icon>
-                                <input #searchInput id="searchInput" class="sinput color-60" label="" [formControl]='searchThemeControl' placeholder="Enter Competency Theme" type="Standard">
-                                </div>
+                                <input #searchInput id="searchInput" class="sinput color-60" label=""
+                                    [formControl]='searchThemeControl' placeholder="Enter Competency Theme"
+                                    type="Standard">
                             </div>
-                            <div class="category-content">
-                                <div class="flex flex-1 flex-row category-item" *ngFor="let ctitem of competencyThemeList | filterSearch: searchInput.value">
-                                    <mat-checkbox #checkboxes disableRipple class="example-margin"  [checked]="ctitem?.selected"  (change)="getCompetencySubTheme($event, ctitem)">{{ctitem?.name | titlecase}}</mat-checkbox>
-                                </div>                               
+                        </div>
+                        <div class="category-content">
+                            <div class="flex flex-1 flex-row category-item"
+                                *ngFor="let ctitem of competencyThemeList | filterSearch: searchInput.value">
+                                <mat-checkbox #checkboxes disableRipple class="example-margin"
+                                    [checked]="ctitem?.selected"
+                                    (change)="getCompetencySubTheme($event, ctitem)">{{ctitem?.name |
+                                    titlecase}}</mat-checkbox>
                             </div>
-                        
+                        </div>
+
                     </mat-expansion-panel>
                 </mat-accordion>
             </div>
-            <div class="spacer"  *ngIf="competencySubThemeList.length"></div>
+            <div class="spacer" *ngIf="competencySubThemeList.length"></div>
             <div class="filter-content flex flex-1" *ngIf="competencySubThemeList?.length">
                 <mat-accordion>
                     <mat-expansion-panel disableRipple [expanded]="true">
@@ -56,14 +63,20 @@
                         </mat-expansion-panel-header>
                         <div class="search-container">
                             <div class="rsearch"><mat-icon
-                                class="color-60 search-icon mat-icon notranslate material-icons mat-icon-no-color">search</mat-icon>
-                            <input #searchThemeInput id="searchThemeInput" class="sinput color-60" label="" [formControl]='searchSubThemeControl' placeholder="Enter Competency Sub-Theme" type="Standard">
+                                    class="color-60 search-icon mat-icon notranslate material-icons mat-icon-no-color">search</mat-icon>
+                                <input #searchThemeInput id="searchThemeInput" class="sinput color-60" label=""
+                                    [formControl]='searchSubThemeControl' placeholder="Enter Competency Sub-Theme"
+                                    type="Standard">
                             </div>
                         </div>
                         <div class="category-content">
-                            <div class="flex flex-1 flex-row category-item" *ngFor="let cstitem of competencySubThemeList | filterSearch: searchThemeInput.value">
-                                <mat-checkbox #checkboxes disableRipple class="example-margin" [checked]="cstitem?.selected"  (change)="manageCompetencySubTheme($event, cstitem)">{{cstitem?.name | titlecase}}</mat-checkbox>
-                            </div> 
+                            <div class="flex flex-1 flex-row category-item"
+                                *ngFor="let cstitem of competencySubThemeList | filterSearch: searchThemeInput.value">
+                                <mat-checkbox #checkboxes disableRipple class="example-margin"
+                                    [checked]="cstitem?.selected"
+                                    (change)="manageCompetencySubTheme($event, cstitem)">{{cstitem?.name |
+                                    titlecase}}</mat-checkbox>
+                            </div>
                         </div>
                     </mat-expansion-panel>
                 </mat-accordion>
@@ -79,13 +92,18 @@
                         </mat-expansion-panel-header>
                         <div class="search-container">
                             <div class="rsearch"><mat-icon
-                                class="color-60 search-icon mat-icon notranslate material-icons mat-icon-no-color">search</mat-icon>
-                            <input #searchProviderInput id="searchProviderInput" class="sinput color-60" label="" [formControl]='searchThemeControl' placeholder="Enter Provider" type="Standard">
+                                    class="color-60 search-icon mat-icon notranslate material-icons mat-icon-no-color">search</mat-icon>
+                                <input #searchProviderInput id="searchProviderInput" class="sinput color-60" label=""
+                                    [formControl]='searchThemeControl' placeholder="Enter Provider" type="Standard">
                             </div>
                         </div>
                         <div class="category-content">
-                            <div class="flex flex-1 flex-row category-item" *ngFor="let item of providersList | filterSearch: searchProviderInput.value">
-                                <mat-checkbox #checkboxes disableRipple class="example-margin" [checked]="item?.selected" (change)="checkedProviders($event, item?.name)">{{item?.name | titlecase}}</mat-checkbox>
+                            <div class="flex flex-1 flex-row category-item"
+                                *ngFor="let item of providersList | filterSearch: searchProviderInput.value">
+                                <mat-checkbox #checkboxes disableRipple class="example-margin"
+                                    [checked]="item?.selected"
+                                    (change)="checkedProviders($event, item?.name)">{{item?.name |
+                                    titlecase}}</mat-checkbox>
                             </div>
                         </div>
                     </mat-expansion-panel>
@@ -102,7 +120,8 @@
                             </mat-panel-title>
                         </mat-expansion-panel-header>
                         <div class="flex flex-1 flex-row category-item" *ngFor="let group of groupList">
-                            <mat-checkbox #checkboxes disableRipple class="example-margin" (change)="manageSelectedGroup($event, group)">{{group?.name | titlecase}}</mat-checkbox>
+                            <mat-checkbox #checkboxes disableRipple class="example-margin"
+                                (change)="manageSelectedGroup($event, group)">{{group?.name | titlecase}}</mat-checkbox>
                         </div>
                     </mat-expansion-panel>
                 </mat-accordion>
@@ -116,7 +135,9 @@
                             </mat-panel-title>
                         </mat-expansion-panel-header>
                         <div class="flex flex-1 flex-row category-item" *ngFor="let des of designationList">
-                            <mat-checkbox #checkboxes disableRipple class="example-margin" (change)="manageSelectedDesignation($event, des)">{{des?.name | titlecase}}</mat-checkbox>
+                            <mat-checkbox #checkboxes disableRipple class="example-margin"
+                                (change)="manageSelectedDesignation($event, des)">{{des?.name |
+                                titlecase}}</mat-checkbox>
                         </div>
                     </mat-expansion-panel>
                 </mat-accordion>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index 246bbfbbc..4f516986b 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -41,8 +41,8 @@ export class FilterComponent implements OnInit, AfterContentChecked {
     private tpdsSvc: TrainingPlanDataSharingService) { }
 
   ngOnInit() {
-    this.tpdsSvc.filterToggle.subscribe((data:any)=>{
-      if(data && data.status) {
+    this.tpdsSvc.filterToggle.subscribe((data: any) => {
+      if (data && data.status) {
         if (data.from === 'content') {
           this.getFilterEntity()
           this.getProviders()
@@ -54,11 +54,11 @@ export class FilterComponent implements OnInit, AfterContentChecked {
           if (!this.designationList.length) {
             this.getDesignation()
           }
-    
+
         }
       }
-    });
-   
+    })
+
 
     this.tpdsSvc.clearFilter.subscribe((result: any) => {
       if (result) {
@@ -89,29 +89,51 @@ export class FilterComponent implements OnInit, AfterContentChecked {
   getProviders() {
     this.trainingPlanService.getProviders().subscribe((res: any) => {
       this.providersList = res
+      this.providersList.map((ele: any) => {
+        if (this.selectedProviders.length > 0 &&
+          this.selectedProviders.filter((v: any) => v.name.toLowerCase() === ele.name.toLowerCase() && v.selected).length > 0) {
+          ele.selected = true
+        } else {
+          ele.selected = false
+        }
+      })
     })
+
   }
 
   hideFilter() {
     // this.toggleFilter.emit(false)
-    this.tpdsSvc.filterToggle.next({from:'',status: false});
+    this.tpdsSvc.filterToggle.next({ from: '', status: false })
   }
 
   checkedProviders(event: any, item: any) {
-    if (event) {
-      this.selectedProviders.push(item)
-      item['selected'] = true;
-      this.filterObj['providers'].push(item.name)
+    let tempData: any
+    if (event.checked) {
+      tempData = {
+        name: item,
+        selected: event.checked
+      }
+      this.selectedProviders.push(tempData)
+      this.filterObj['providers'].push(tempData.name)
     } else {
-      if (this.filterObj['provider'].indexOf(item.name) > -1) {
-        const index = this.filterObj['providers'].findIndex((x: any) => x === item.name)
-        item['selected'] = false;
-        this.filterObj['providers'].splice(index, 1)
+      tempData = {
+        name: item,
+        selected: event.checked
+      }
+      if (this.selectedProviders && this.selectedProviders.length > 0) {
+        this.selectedProviders.map((v: any) => {
+          if (v.name.toLowerCase() === tempData.name.toLowerCase()) {
+            v.selected = tempData.selected
+          }
+        })
       }
+      const index = this.filterObj['providers'].findIndex((x: any) => x === tempData.name)
+      this.filterObj['providers'].splice(index, 1)
     }
   }
 
   getCompetencyTheme(event: any, ctype: any) {
+    debugger
     if (event.checked) {
       this.competencyList.map((citem: any) => {
         if (citem.name === ctype.id) {
@@ -132,19 +154,19 @@ export class FilterComponent implements OnInit, AfterContentChecked {
         }
       })
       this.competencyThemeList = this.competencyThemeList.filter(sitem => {
-        if(sitem.parent === ctype.id) {
-          sitem['selected'] = false;
-        }        
+        if (sitem.parent === ctype.id) {
+          sitem['selected'] = false
+        }
         return sitem.parent !== ctype.id
       })
-      this.competencySubThemeList  = this.competencySubThemeList.filter(pitem=> {
-        if(pitem.parentType === ctype.id) {
-          pitem['selected'] = false;
+      this.competencySubThemeList = this.competencySubThemeList.filter(pitem => {
+        if (pitem.parentType === ctype.id) {
+          pitem['selected'] = false
         }
-        return pitem.parentType !== ctype.id 
+        return pitem.parentType !== ctype.id
       })
-      if (this.filterObj['competencyArea'] && 
-          this.filterObj['competencyArea'].indexOf(ctype.id) > -1) {
+      if (this.filterObj['competencyArea'] &&
+        this.filterObj['competencyArea'].indexOf(ctype.id) > -1) {
         const index = this.filterObj['competencyArea'].findIndex((x: any) => x === ctype.id)
         this.filterObj['competencyArea'].splice(index, 1)
       }
@@ -161,10 +183,10 @@ export class FilterComponent implements OnInit, AfterContentChecked {
             subthemechild['parent'] = csitem.name
           })
           this.competencySubThemeList = this.competencySubThemeList.concat(csitem.children)
-          if(this.filterObj['competencyTheme']) {
+          if (this.filterObj['competencyTheme']) {
             this.filterObj['competencyTheme'].push(cstype.name)
           }
-          
+
         }
       })
     } else {
@@ -173,12 +195,12 @@ export class FilterComponent implements OnInit, AfterContentChecked {
           csitem['selected'] = false
         }
       })
-      
+
       this.competencySubThemeList = this.competencySubThemeList.filter(sitem => {
         return sitem.parent !== cstype.name
       })
-      if (this.filterObj['competencyTheme'] && 
-          this.filterObj['competencyTheme'].indexOf(cstype.name) > -1) {
+      if (this.filterObj['competencyTheme'] &&
+        this.filterObj['competencyTheme'].indexOf(cstype.name) > -1) {
         const index = this.filterObj['competencyTheme'].findIndex((x: any) => x === cstype.name)
         this.filterObj['competencyTheme'].splice(index, 1)
       }
@@ -192,10 +214,10 @@ export class FilterComponent implements OnInit, AfterContentChecked {
           cstlitem['selected'] = true
         }
       })
-      if(this.filterObj['competencySubTheme']) {
+      if (this.filterObj['competencySubTheme']) {
         this.filterObj['competencySubTheme'].push(csttype.name)
       }
-      
+
     } else {
       this.competencySubThemeList.map((cstlitem: any) => {
         if (csttype.name === cstlitem.name) {
@@ -203,7 +225,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
         }
       })
       if (this.filterObj['competencySubTheme'] &&
-         this.filterObj['competencySubTheme'].indexOf(csttype.name) > -1) {
+        this.filterObj['competencySubTheme'].indexOf(csttype.name) > -1) {
         const index = this.filterObj['competencySubTheme'].findIndex((x: any) => x === csttype.name)
         this.filterObj['competencySubTheme'].splice(index, 1)
       }
@@ -213,28 +235,29 @@ export class FilterComponent implements OnInit, AfterContentChecked {
 
   applyFilter() {
     if (this.from === 'content') {
-      // this.getFilterData.emit(this.filterObj)      
-      this.tpdsSvc.getFilterDataObject.next(this.filterObj);
+      // this.getFilterData.emit(this.filterObj)
+      this.tpdsSvc.getFilterDataObject.next(this.filterObj)
     } else {
-      this.tpdsSvc.getFilterDataObject.next(this.assigneeFilterObj);
+      this.tpdsSvc.getFilterDataObject.next(this.assigneeFilterObj)
       // this.getFilterData.emit(this.assigneeFilterObj)
     }
-    this.tpdsSvc.filterToggle.next({from:'',status: false});
+    this.tpdsSvc.filterToggle.next({ from: '', status: false })
   }
 
   clearFilter() {
     if (this.from === 'content') {
       this.filterObj = { competencyArea: [], competencyTheme: [], competencySubTheme: [], providers: [] }
+      this.selectedProviders = []
     } else {
       this.assigneeFilterObj = { group: [], designation: [] }
     }
 
     if (this.from === 'content') {
       // this.getFilterData.emit(this.filterObj)
-      this.tpdsSvc.getFilterDataObject.next(this.filterObj);
+      this.tpdsSvc.getFilterDataObject.next(this.filterObj)
     } else {
       // this.getFilterData.emit(this.assigneeFilterObj)
-      this.tpdsSvc.getFilterDataObject.next(this.assigneeFilterObj);
+      this.tpdsSvc.getFilterDataObject.next(this.assigneeFilterObj)
     }
     if (this.checkboxes) {
       this.checkboxes.forEach((element: any) => {
@@ -264,8 +287,8 @@ export class FilterComponent implements OnInit, AfterContentChecked {
     if (event) {
       this.assigneeFilterObj['group'].push(group.name)
     } else {
-      if (this.assigneeFilterObj['group'] && 
-          this.assigneeFilterObj['group'].indexOf(group.name) > -1) {
+      if (this.assigneeFilterObj['group'] &&
+        this.assigneeFilterObj['group'].indexOf(group.name) > -1) {
         const index = this.assigneeFilterObj['group'].findIndex((x: any) => x === group.name)
         this.assigneeFilterObj['group'].splice(index, 1)
       }
@@ -276,8 +299,8 @@ export class FilterComponent implements OnInit, AfterContentChecked {
     if (event) {
       this.assigneeFilterObj['designation'].push(designation.name)
     } else {
-      if (this.assigneeFilterObj['designation'] && 
-          this.assigneeFilterObj['designation'].indexOf(designation.name) > -1) {
+      if (this.assigneeFilterObj['designation'] &&
+        this.assigneeFilterObj['designation'].indexOf(designation.name) > -1) {
         const index = this.assigneeFilterObj['designation'].findIndex((x: any) => x === designation.name)
         this.assigneeFilterObj['designation'].splice(index, 1)
       }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
index 97a63467e..01398fc1b 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
@@ -17,7 +17,7 @@ export class StandardCardComponent implements OnInit, OnChanges {
   @Input() count = 0
   @Output() handleSelectedChips = new EventEmitter()
   @Output() selectedContentRemoved = new EventEmitter<any>()
-  @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | any
+  @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator | any
   dataSource: any
   selectedContent: any[] = []
   startIndex = 0
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
index 29d3cfa31..b30d3422a 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
@@ -15,7 +15,7 @@
         </div>
     </div>
     <div class="no-cbp-data margin-top-xl margin-bottom-xl" *ngIf="!(contentData) || !(contentData?.length)">
-        <div class="customimg"><img src="/assets/images/nocontent.svg"></div>
+        <div class="customimg"><img src="/assets/images/no-content-data.svg"></div>
         <!-- <div class="mat-subheading-1 margin-remove">No content avaliable.</div> -->
         <!-- <div>Create a content in CBP portal to get the contents.</div> -->
         <div class="mat-subheading-1 margin-top-m margin-bottom-m">Can't find content?</div>
@@ -23,4 +23,4 @@
             content</button>
     </div>
 
-</ng-container>
+</ng-container>
\ No newline at end of file

From 753b99e3782c5f93e919b306459fb75502b6a1de Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Tue, 2 Jan 2024 19:22:55 +0530
Subject: [PATCH 419/887] fixes

---
 .../training-plan/components/filter/filter.component.html  | 7 +++----
 .../routes/create-content/create-content.component.ts      | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
index a66a58162..9651e8483 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
@@ -16,7 +16,7 @@
                             </mat-panel-title>
                         </mat-expansion-panel-header>
                         <div class="flex flex-1 flex-row category-item" *ngFor="let ctype of competencyTypeList">
-                            <mat-checkbox #checkboxes disableRipple class="example-margin"
+                            <mat-checkbox #checkboxes disableRipple class="example-margin" [checked]="ctype?.selected"
                                 (change)="getCompetencyTheme($event, ctype)">{{ctype?.name | titlecase }}</mat-checkbox>
                         </div>
                     </mat-expansion-panel>
@@ -94,15 +94,14 @@
                             <div class="rsearch"><mat-icon
                                     class="color-60 search-icon mat-icon notranslate material-icons mat-icon-no-color">search</mat-icon>
                                 <input #searchProviderInput id="searchProviderInput" class="sinput color-60" label=""
-                                    [formControl]='searchThemeControl' placeholder="Enter Provider" type="Standard">
+                                    [formControl]='searchProviderControl' placeholder="Enter Provider" type="Standard">
                             </div>
                         </div>
                         <div class="category-content">
                             <div class="flex flex-1 flex-row category-item"
                                 *ngFor="let item of providersList | filterSearch: searchProviderInput.value">
                                 <mat-checkbox #checkboxes disableRipple class="example-margin"
-                                    [checked]="item?.selected"
-                                    (change)="checkedProviders($event, item?.name)">{{item?.name |
+                                    [checked]="item?.selected" (change)="checkedProviders($event, item)">{{item?.name |
                                     titlecase}}</mat-checkbox>
                             </div>
                         </div>
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
index 889d73e6c..19450c5be 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
@@ -62,7 +62,7 @@ export class CreateContentComponent implements OnInit {
         this.tpdsSvc.trainingPlanStepperData.contentList) {
         if (this.tpdsSvc.trainingPlanContentData.data.content) {
           this.tpdsSvc.trainingPlanContentData.data.content.map((sitem: any) => {
-            if (this.tpdsSvc.trainingPlanStepperData.contentList.filter((v: any) => v === sitem.identifier).length > 0) {
+            if (this.tpdsSvc.trainingPlanStepperData.contentList.filter((v: any) => (sitem && v === sitem.identifier)).length > 0) {
               sitem['selected'] = true
             }
           })

From a9989657de43053cf597f1ef3e93ae262af6961f Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Wed, 3 Jan 2024 15:57:13 +0530
Subject: [PATCH 420/887] update for issue 1827, 1829, 1835

---
 .../components/chip/chip.component.ts         |  4 +--
 .../components/filter/filter.component.html   |  2 +-
 .../components/filter/filter.component.ts     | 25 +++++++++++++++++--
 .../components/search/search.component.ts     |  1 +
 .../components/stepper/stepper.component.html |  8 +++---
 5 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
index 064b831c0..5e68f93e1 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
@@ -107,13 +107,13 @@ export class ChipComponent implements OnInit, OnChanges {
         this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo.splice(index, 1)
       }
       this.itemRemoved.emit(true)
-    } else if (this.tpdsSvc.trainingPlanAssigneeData.category === 'CustomUser') {
+    } else if (this.tpdsSvc.trainingPlanAssigneeData.category === 'CustomUser') {      
       this.tpdsSvc.trainingPlanAssigneeData.data.map((sitem: any) => {
         if (sitem && sitem['selected'] && sitem['userId'] === item['userId']) {
           sitem['selected'] = false
         }
       })
-      if (this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo.indexOf(item['identifier']) > -1) {
+      if (this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo.indexOf(item['userId']) > -1) {
         const index =
           this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo.findIndex((x: any) => x === item['userId'])
         this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo.splice(index, 1)
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
index 33ac3a595..aca67cb8e 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
@@ -116,7 +116,7 @@
                             </mat-panel-title>
                         </mat-expansion-panel-header>
                         <div class="flex flex-1 flex-row category-item" *ngFor="let des of designationList">
-                            <mat-checkbox #checkboxes disableRipple class="example-margin" (change)="manageSelectedDesignation($event, des)">{{des?.name | titlecase}}</mat-checkbox>
+                            <mat-checkbox #checkboxes disableRipple class="example-margin" [checked]="des?.selected" (change)="manageSelectedDesignation($event, des)">{{des?.name | titlecase}}</mat-checkbox>
                         </div>
                     </mat-expansion-panel>
                 </mat-accordion>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index 0910e2d98..058e23af3 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -54,6 +54,15 @@ export class FilterComponent implements OnInit, AfterContentChecked {
           // }
           if (!this.designationList.length) {
             this.getDesignation()
+          } else {
+            console.log(this.assigneeFilterObj, this.designationList);
+            this.designationList.map((pitem:any)=>{
+              if(pitem && this.assigneeFilterObj['designation'] && this.assigneeFilterObj['designation'].indexOf(pitem.name) > -1) {
+                pitem['selected'] = true;        
+              } else {
+                pitem['selected'] = false;        
+              }         
+            })
           }
     
         }
@@ -244,6 +253,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
       // this.getFilterData.emit(this.filterObj)      
       this.tpdsSvc.getFilterDataObject.next(this.filterObj);
     } else {
+      console.log('this.assigneeFilterObj',this.assigneeFilterObj);
       this.tpdsSvc.getFilterDataObject.next(this.assigneeFilterObj);
       // this.getFilterData.emit(this.assigneeFilterObj)
     }
@@ -289,7 +299,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
   }
 
   manageSelectedGroup(event: any, group: any) {
-    if (event) {
+    if (event.checked) {
       this.assigneeFilterObj['group'].push(group.name)
     } else {
       if (this.assigneeFilterObj['group'] && 
@@ -301,9 +311,20 @@ export class FilterComponent implements OnInit, AfterContentChecked {
   }
 
   manageSelectedDesignation(event: any, designation: any) {
-    if (event) {
+    if (event.checked) {
+      this.designationList.map((ditem:any)=>{
+        if(ditem && ditem['name'] === designation.name) {
+          ditem['selected'] = true;
+        }
+      })
+      
       this.assigneeFilterObj['designation'].push(designation.name)
     } else {
+      this.designationList.map((ditem:any)=>{
+        if(ditem && ditem['name'] === designation.name) {
+          ditem['selected'] = false;
+        }
+      })
       if (this.assigneeFilterObj['designation'] && 
           this.assigneeFilterObj['designation'].indexOf(designation.name) > -1) {
         const index = this.assigneeFilterObj['designation'].findIndex((x: any) => x === designation.name)
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 602c1a3ab..9b59ca81a 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -83,6 +83,7 @@ export class SearchComponent implements OnInit {
         /* tslint:disable */
         event = !event ? 'Course' : event
         /* tslint:enable */
+        this.searchText = '';
         this.getContent(event)
         break
       case 'assignee':
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
index 18467e582..b93173a84 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.html
@@ -3,7 +3,7 @@
         (selectedTabChange)="tabSelected($event)">
         <mat-tab [label]="tabType.CREATE_PLAN" [disabled]="false">
             <ng-template mat-tab-label>
-                1. <span *ngIf="!editState">Create</span><span *ngIf="editState">Edit</span>&nbsp; a Plan
+                1.&nbsp;<span *ngIf="!editState">Create</span><span *ngIf="editState">Edit</span>&nbsp;a Plan
             </ng-template>
             <ng-template matTabContent>
                 <ws-app-add-plan-information
@@ -12,7 +12,7 @@
         </mat-tab>
         <mat-tab [label]="tabType.ADD_CONTENT" [disabled]="addCotnentDisable" class="disable">
             <ng-template mat-tab-label>
-                <span>2. <span *ngIf="!editState">Add</span><span *ngIf="editState">Edit</span> Content
+                <span>2.&nbsp;<span *ngIf="!editState">Add</span><span *ngIf="editState">Edit</span> Content
                 </span>
             </ng-template>
             <ng-template matTabContent>
@@ -22,7 +22,7 @@
         </mat-tab>
         <mat-tab [label]="tabType.ADD_ASSIGNEE" [disabled]="addCotnentDisable || addAssigneeDisable">
             <ng-template mat-tab-label>
-                <span>3. <span *ngIf="!editState">Add</span><span *ngIf="editState">Edit</span> Assignee</span>
+                <span>3.&nbsp;<span *ngIf="!editState">Add</span><span *ngIf="editState">Edit</span> Assignee</span>
             </ng-template>
             <ng-template matTabContent>
                 <ws-app-create-assignee (addAssigneeInvalid)="checkForaddAssignee($event)"
@@ -32,7 +32,7 @@
         <mat-tab [label]="tabType.ADD_TIMELINE"
             [disabled]="addCotnentDisable || addAssigneeDisable || addTimelineDisable">
             <ng-template mat-tab-label>
-                <span>4. <span *ngIf="!editState">Add</span><span *ngIf="editState">Edit</span> Timeline</span>
+                <span>4.&nbsp;<span *ngIf="!editState">Add</span><span *ngIf="editState">Edit</span> Timeline</span>
             </ng-template>
             <ng-template matTabContent>
                 <ws-app-create-timeline></ws-app-create-timeline>

From 0b067bc7f0aea6266e4cc407626bc50374e19b6b Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Wed, 3 Jan 2024 16:01:08 +0530
Subject: [PATCH 421/887] update for issue 1827, 1829, 1835

---
 .../routes/training-plan/components/filter/filter.component.ts   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index 0059a9600..e1d0c9a8e 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -55,7 +55,6 @@ export class FilterComponent implements OnInit, AfterContentChecked {
           if (!this.designationList.length) {
             this.getDesignation()
           } else {
-            console.log(this.assigneeFilterObj, this.designationList);
             this.designationList.map((pitem:any)=>{
               if(pitem && this.assigneeFilterObj['designation'] && this.assigneeFilterObj['designation'].indexOf(pitem.name) > -1) {
                 pitem['selected'] = true;        

From 9a568ea078f144a6c16a4ab3f6cbb2c99aba3316 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Wed, 3 Jan 2024 16:11:07 +0530
Subject: [PATCH 422/887] update for issue 1857

---
 .../training-plan/components/filter/filter.component.html     | 2 +-
 .../training-plan/components/filter/filter.component.scss     | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
index 0363148fb..f30ae4c09 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
@@ -97,7 +97,7 @@
                                     [formControl]='searchProviderControl' placeholder="Enter Provider" type="Standard">
                             </div>
                         </div>
-                        <div class="category-content">
+                        <div [ngClass]="(!(competencyThemeList?.length) && !(competencySubThemeList?.length)) ? 'category-content-without-theme': 'category-content'">
                             <div class="flex flex-1 flex-row category-item"
                                 *ngFor="let item of providersList | filterSearch: searchProviderInput.value">
                                 <mat-checkbox #checkboxes disableRipple class="example-margin"
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.scss b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.scss
index 424f649ef..29a876084 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.scss
@@ -151,6 +151,10 @@
     overflow-y: auto;
 }
 
+.filter .category-content-without-theme {
+    overflow-y: auto;
+}
+
 ::-webkit-scrollbar {
     width: 4px;
 }

From 79cc10be70c247420b234b8a1cb65dcca433b06a Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Thu, 4 Jan 2024 10:16:37 +0530
Subject: [PATCH 423/887] bug fixes

---
 .../components/breadcrumb/breadcrumb.component.ts    |  9 +++++----
 .../create-assignee/create-assignee.component.ts     | 12 ++++++++++++
 .../create-timeline/create-timeline.component.ts     |  4 ++--
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
index b52947726..3ffe76013 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
@@ -150,7 +150,7 @@ export class BreadcrumbComponent implements OnInit {
             tabSelected: this.tpdsSvc.trainingPlanStepperData.assignmentType,
           },
         })
-      },         1000)
+      }, 1000)
     })
   }
 
@@ -180,6 +180,7 @@ export class BreadcrumbComponent implements OnInit {
       delete obj.request.contentType
       delete obj.request.assignmentType
     }
+    debugger
     delete obj.request.status
     this.showDialogBox('progress')
     this.tpSvc.updatePlan(obj).subscribe((_data: any) => {
@@ -197,7 +198,7 @@ export class BreadcrumbComponent implements OnInit {
               tabSelected: this.tpdsSvc.trainingPlanStepperData.assignmentType,
             },
           })
-        },         1000)
+        }, 1000)
       }
     })
   }
@@ -221,12 +222,12 @@ export class BreadcrumbComponent implements OnInit {
               tabSelected: this.tpdsSvc.trainingPlanStepperData.assignmentType,
             },
           })
-        },         1000)
+        }, 1000)
       } else {
         this.snackBar.open('Something went wrong while publishing CBP plan. Try again later')
         this.dialogRef.close()
       }
-    },                                    (_error: any) => {
+    }, (_error: any) => {
       this.snackBar.open('Something went wrong while publishing CBP plan. Try again later')
       this.dialogRef.close()
     })
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
index f9e8ecaf5..9714e9c50 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.ts
@@ -47,6 +47,12 @@ export class CreateAssigneeComponent implements OnInit {
             sitem['selected'] = true
           }
         })
+        this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo = []
+        this.tpdsSvc.trainingPlanAssigneeData.data.map((sitem: any) => {
+          if (sitem && sitem.selected) {
+            this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo.push(sitem.name)
+          }
+        })
         this.assigneeData = this.tpdsSvc.trainingPlanAssigneeData
         this.handleSelectedChips(true)
       } else if (this.tpdsSvc.trainingPlanStepperData &&
@@ -57,6 +63,12 @@ export class CreateAssigneeComponent implements OnInit {
             sitem['selected'] = true
           }
         })
+        this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo = []
+        this.tpdsSvc.trainingPlanAssigneeData.data.map((sitem: any) => {
+          if (sitem && sitem.selected) {
+            this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo.push(sitem.userId)
+          }
+        })
         this.assigneeData = this.tpdsSvc.trainingPlanAssigneeData
         this.handleSelectedChips(true)
       } else {
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
index c60a75e1e..030cbb321 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-timeline/create-timeline.component.ts
@@ -55,7 +55,7 @@ export class CreateTimelineComponent implements OnInit {
     ) {
       const category = this.tpdsSvc.trainingPlanAssigneeData.category
       let assigneeDataSelected = this.tpdsSvc.trainingPlanAssigneeData.data.filter((item: any) => {
-        return item.selected
+        return (item && item.selected) ? item.selected : false
       })
       this.totalAssigneeCount = assigneeDataSelected.length
       assigneeDataSelected = assigneeDataSelected.slice(0, 4)
@@ -70,7 +70,7 @@ export class CreateTimelineComponent implements OnInit {
     ) {
       const category = this.tpdsSvc.trainingPlanAssigneeData.category
       let assigneeDataSelected = this.tpdsSvc.trainingPlanAssigneeData.data.filter((item: any) => {
-        return item.selected
+        return (item && item.selected) ? item.selected : false
       })
       this.totalAssigneeCount = assigneeDataSelected.length
       assigneeDataSelected = assigneeDataSelected.slice(0, 4)

From fff5dc0b468f23a824695b4305d4a3653d459d49 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Thu, 4 Jan 2024 10:18:59 +0530
Subject: [PATCH 424/887] bug fix

---
 .../public-logout.component.html              | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/app/routes/public/public-logout/public-logout.component.html b/src/app/routes/public/public-logout/public-logout.component.html
index dce28db21..f7af14bea 100644
--- a/src/app/routes/public/public-logout/public-logout.component.html
+++ b/src/app/routes/public/public-logout/public-logout.component.html
@@ -1,4 +1,5 @@
-<div class="main_container flex flex-row" style=" background: url(assets/instances/eagle/banners/home/9/Login_background.png) no-repeat center center fixed;">
+<div class="main_container flex flex-row"
+  style=" background: url(assets/instances/eagle/banners/home/9/Login_background.png) no-repeat center center fixed;">
   <div class="left_container flex flex-col items-center justify-center">
     <div class="logo_box flex items-center">
       <img src="/assets/instances/eagle/app_logos/dopt_logo.png" alt="logo" class="logo_img">
@@ -6,7 +7,7 @@
 
     <div class="slideshow-container">
 
-       <div class="mySlides">
+      <div class="mySlides">
         <img src="/assets/instances/eagle/app_logos/Hexagon.png" alt="karmayogi">
         <!-- <img src="/assets/instances/eagle/app_logos/card3.png" alt="slide 1"> -->
 
@@ -24,10 +25,10 @@
 
 
 
-      </div>
-      <br>
+    </div>
+    <br>
 
-      <!-- <div style="text-align:center">
+    <!-- <div style="text-align:center">
         <span class="dot"></span>
         <span class="dot"></span>
 
@@ -36,11 +37,7 @@
   <div class=" right_container flex flex-col items-center justify-center">
     <div class="right_inner_container">
       <div class="right_logo_box right_logo_box flex items-center justify-center">
-<<<<<<< HEAD
-       <img src="/assets/instances/eagle/app_logos/eagle-logo-transparent.svg" alt="logo" class="logout_logo">
-=======
-      <img src="/assets/instances/eagle/app_logos/eagle-logo-transparent.svg" alt="logo" class="logout_logo">
->>>>>>> 12f8eccd29a4ba7093bad36231e271c971ab70fa
+        <img src="/assets/instances/eagle/app_logos/eagle-logo-transparent.svg" alt="logo" class="logout_logo">
       </div>
       <div class="text_box flex items-center justify-center">
         <h2 class="mat-h2">Welcome to MDO Portal!</h2>
@@ -52,4 +49,4 @@ <h2 class="mat-h2">Welcome to MDO Portal!</h2>
     </div>
 
   </div>
-</div>
+</div>
\ No newline at end of file

From c13951bfd6a6d6426acfd10ea04257303a6966d7 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Thu, 4 Jan 2024 10:36:22 +0530
Subject: [PATCH 425/887] update for issue 1841

---
 .../routes/create-content/create-content.component.ts  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
index 19450c5be..0dc37e65a 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
@@ -32,11 +32,11 @@ export class CreateContentComponent implements OnInit {
         name: 'Curated Programs',
         value: 'Curated program',
       },
-      {
-        id: 6,
-        name: 'Programs',
-        value: 'Program',
-      },
+      // {
+      //   id: 6,
+      //   name: 'Programs',
+      //   value: 'Program',
+      // },
       {
         id: 3,
         name: 'Blended Programs',

From e971822769748f76ae466f20046043e7d794747c Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Thu, 4 Jan 2024 14:27:52 +0530
Subject: [PATCH 426/887] bug fix

---
 .../add-timeline-form.component.html          | 17 +++++++-------
 .../category-drop-down.component.ts           | 22 +++++++++----------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html
index 2b376289c..51a724af5 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html
@@ -5,14 +5,15 @@
     <div class="form-element">
         <div class="fonm-element-label">Timeline <span class="required"></span></div>
         <div class="calender">
-        <mat-form-field appearance="outline">
-            <mat-label>Select date</mat-label>
-            <input matInput #ref [matDatepicker]="picker" [min]="minDate" [(ngModel)]="todayDate" (dateChange)="changeTimeline(ref.value)">
-            <mat-datepicker-toggle matSuffix [for]="picker">
-                <mat-icon matDatepickerToggleIcon>calendar_today</mat-icon>
-            </mat-datepicker-toggle>
-            <mat-datepicker #picker></mat-datepicker>
-          </mat-form-field>
+            <mat-form-field appearance="outline">
+                <mat-label>Select date</mat-label>
+                <input matInput #ref [matDatepicker]="picker" [min]="minDate" [(ngModel)]="todayDate"
+                    (dateChange)="changeTimeline(ref.value)" disabled>
+                <mat-datepicker-toggle matSuffix [for]="picker">
+                    <mat-icon matDatepickerToggleIcon>calendar_today</mat-icon>
+                </mat-datepicker-toggle>
+                <mat-datepicker #picker disabled="false"></mat-datepicker>
+            </mat-form-field>
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
index ea5ea7e96..28e10fe81 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
@@ -3,6 +3,7 @@ import { MatDialog } from '@angular/material'
 import { ConfirmationBoxComponent } from '../confirmation-box/confirmation.box.component'
 import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
 import { debounceTime } from 'rxjs/operators'
+import { D } from '@angular/cdk/keycodes'
 
 @Component({
   selector: 'ws-app-category-drop-down',
@@ -32,10 +33,11 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
           data.event === 'Curated program' ||
           data.event === 'Moderated Course'
         ) {
+          this.tpdsSvc.trainingPlanStepperData['contentType'] = data.event
           this.tpdsSvc.trainingPlanStepperData.contentList = []
           this.tpdsSvc.trainingPlanContentData.data = []
         } else if (data.event === 'Designation' || data.event === 'AllUser' || data.event === 'CustomUser') {
-          this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo = []
+          this.tpdsSvc.trainingPlanStepperData['assignmentType'] = data.event
           this.tpdsSvc.trainingPlanAssigneeData.data = []
           this.tpdsSvc.trainingPlanStepperData['assignmentTypeInfo'] = []
         }
@@ -45,6 +47,10 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
   }
 
   ngOnChanges() {
+    this.checkForContent()
+  }
+
+  checkForContent() {
     if (this.from === 'content') {
       if (this.tpdsSvc.trainingPlanStepperData['contentType']) {
         this.selectedValue = this.tpdsSvc.trainingPlanStepperData['contentType']
@@ -78,7 +84,6 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['primaryAction'] = 'I understand, change content type'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Course'
-        this.tpdsSvc.trainingPlanStepperData['contentType'] = event
         this.tpdsSvc.moderatedCourseSelectStatus.next(false)
         if (this.tpdsSvc.trainingPlanStepperData.contentList.length) {
           this.openDialoagBox(dialogData)
@@ -95,7 +100,6 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['primaryAction'] = 'I understand, change content type'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Standalone Assessment'
-        this.tpdsSvc.trainingPlanStepperData['contentType'] = event
         this.tpdsSvc.moderatedCourseSelectStatus.next(false)
         if (this.tpdsSvc.trainingPlanStepperData.contentList.length) {
           this.openDialoagBox(dialogData)
@@ -112,7 +116,6 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['primaryAction'] = 'I understand, change content type'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Program'
-        this.tpdsSvc.trainingPlanStepperData['contentType'] = event
         this.tpdsSvc.moderatedCourseSelectStatus.next(false)
         if (this.tpdsSvc.trainingPlanStepperData.contentList.length) {
           this.openDialoagBox(dialogData)
@@ -129,7 +132,6 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['primaryAction'] = 'I understand, change content type'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Blended program'
-        this.tpdsSvc.trainingPlanStepperData['contentType'] = event
         this.tpdsSvc.moderatedCourseSelectStatus.next(false)
         if (this.tpdsSvc.trainingPlanStepperData.contentList.length) {
           this.openDialoagBox(dialogData)
@@ -146,7 +148,6 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['primaryAction'] = 'I understand, change content type'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Curated program'
-        this.tpdsSvc.trainingPlanStepperData['contentType'] = event
         this.tpdsSvc.moderatedCourseSelectStatus.next(false)
         if (this.tpdsSvc.trainingPlanStepperData.contentList.length) {
           this.openDialoagBox(dialogData)
@@ -163,7 +164,6 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['primaryAction'] = 'I understand, change content type'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Moderated Course'
-        this.tpdsSvc.trainingPlanStepperData['contentType'] = event
         if (this.tpdsSvc.trainingPlanStepperData.contentList.length) {
           this.openDialoagBox(dialogData)
         } else {
@@ -179,7 +179,6 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['primaryAction'] = 'I understand, change user type'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Designation'
-        this.tpdsSvc.trainingPlanStepperData['assignmentType'] = event
         if (this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo.length) {
           this.openDialoagBox(dialogData)
         } else {
@@ -196,7 +195,6 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'AllUser'
         this.tpdsSvc.trainingPlanAssigneeData.category = 'AllUser'
-        this.tpdsSvc.trainingPlanStepperData['assignmentType'] = event
         if (this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo.length) {
           this.openDialoagBox(dialogData)
         } else {
@@ -212,7 +210,6 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['primaryAction'] = 'I understand, change user type'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'CustomUser'
-        this.tpdsSvc.trainingPlanStepperData['assignmentType'] = event
         if (this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo.length) {
           this.openDialoagBox(dialogData)
         } else {
@@ -238,7 +235,10 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
       },
     })
 
-    this.dialogRef.afterClosed().subscribe(() => {
+    this.dialogRef.afterClosed().subscribe((res: any) => {
+      if (res && res.toLowerCase() === 'cancel') {
+        this.checkForContent()
+      }
     })
   }
 

From 02093b04fe696515f01d3ab92aa298ea9375faf2 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Thu, 4 Jan 2024 14:36:10 +0530
Subject: [PATCH 427/887] lint issue fix

---
 .../category-drop-down/category-drop-down.component.ts           | 1 -
 1 file changed, 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
index 28e10fe81..87b3740a2 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
@@ -3,7 +3,6 @@ import { MatDialog } from '@angular/material'
 import { ConfirmationBoxComponent } from '../confirmation-box/confirmation.box.component'
 import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
 import { debounceTime } from 'rxjs/operators'
-import { D } from '@angular/cdk/keycodes'
 
 @Component({
   selector: 'ws-app-category-drop-down',

From ffceffdc52ca60ef8218d0944af85e0728a6caeb Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Thu, 4 Jan 2024 16:01:20 +0530
Subject: [PATCH 428/887] bug fix

---
 .../training-plan-dashboard.component.ts      | 13 ++++++------
 .../breadcrumb/breadcrumb.component.ts        |  1 -
 .../category-drop-down.component.ts           | 21 ++++++++++++++++---
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
index c1365b93c..1b4c5f83e 100644
--- a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
@@ -67,10 +67,11 @@ export class TrainingPlanDashboardComponent implements OnInit {
     this.currentUser = this.configSvc.userProfileV2 && this.configSvc.userProfileV2.userId
     this.activeRoute.queryParams.subscribe((res: any) => {
       this.urlQueryParams = res
+      if (Object.keys(this.urlQueryParams).length) {
+        this.currentFilter = this.urlQueryParams.type
+      }
+      this.filter(this.currentFilter)
     })
-    if (Object.keys(this.urlQueryParams).length) {
-      this.currentFilter = this.urlQueryParams.type
-    }
     this.pageConfig = this.activeRoute.snapshot.data['pageData']
     this.hasAccess()
     this.tabledata = {
@@ -93,7 +94,6 @@ export class TrainingPlanDashboardComponent implements OnInit {
       actionColumnName: 'Action',
       cbpPlanMenu: true
     }
-    this.filter(this.currentFilter)
   }
 
   tabSelected(item: string) {
@@ -289,7 +289,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
     this.trainingPlanService.archivePlan(obj).subscribe((_data: any) => {
       this.snackBar.open('CBP plan deleted successfully.')
       this.loaderService.changeLoaderState(false)
-      this.filterData()
+      this.tabNavigate(_selectedRow.status.toLowerCase(), _selectedRow.userType)
     }, _error => {
       this.loaderService.changeLoaderState(false)
     })
@@ -307,7 +307,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
       if (data && data.params && data.params.status && data.params.status.toLowerCase() === 'success') {
         this.snackBar.open('CBP plan published successfully.')
         this.loaderService.changeLoaderState(false)
-        this.tabNavigate('live', _selectedRow.assignmentType)
+        this.tabNavigate('live', _selectedRow.userType)
       } else {
         this.snackBar.open('Something went wrong while publishing CBP plan. Try again later')
         this.loaderService.changeLoaderState(false)
@@ -363,6 +363,5 @@ export class TrainingPlanDashboardComponent implements OnInit {
         tabSelected: _tabSelected,
       },
     })
-    this.filter(_item)
   }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
index 3ffe76013..3fb63677e 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
@@ -180,7 +180,6 @@ export class BreadcrumbComponent implements OnInit {
       delete obj.request.contentType
       delete obj.request.assignmentType
     }
-    debugger
     delete obj.request.status
     this.showDialogBox('progress')
     this.tpSvc.updatePlan(obj).subscribe((_data: any) => {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
index 87b3740a2..2c886b9dc 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
@@ -32,11 +32,10 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
           data.event === 'Curated program' ||
           data.event === 'Moderated Course'
         ) {
-          this.tpdsSvc.trainingPlanStepperData['contentType'] = data.event
           this.tpdsSvc.trainingPlanStepperData.contentList = []
           this.tpdsSvc.trainingPlanContentData.data = []
         } else if (data.event === 'Designation' || data.event === 'AllUser' || data.event === 'CustomUser') {
-          this.tpdsSvc.trainingPlanStepperData['assignmentType'] = data.event
+          this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo = []
           this.tpdsSvc.trainingPlanAssigneeData.data = []
           this.tpdsSvc.trainingPlanStepperData['assignmentTypeInfo'] = []
         }
@@ -83,6 +82,7 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['primaryAction'] = 'I understand, change content type'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Course'
+        this.tpdsSvc.trainingPlanStepperData['contentType'] = event
         this.tpdsSvc.moderatedCourseSelectStatus.next(false)
         if (this.tpdsSvc.trainingPlanStepperData.contentList.length) {
           this.openDialoagBox(dialogData)
@@ -99,6 +99,7 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['primaryAction'] = 'I understand, change content type'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Standalone Assessment'
+        this.tpdsSvc.trainingPlanStepperData['contentType'] = event
         this.tpdsSvc.moderatedCourseSelectStatus.next(false)
         if (this.tpdsSvc.trainingPlanStepperData.contentList.length) {
           this.openDialoagBox(dialogData)
@@ -115,6 +116,7 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['primaryAction'] = 'I understand, change content type'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Program'
+        this.tpdsSvc.trainingPlanStepperData['contentType'] = event
         this.tpdsSvc.moderatedCourseSelectStatus.next(false)
         if (this.tpdsSvc.trainingPlanStepperData.contentList.length) {
           this.openDialoagBox(dialogData)
@@ -131,6 +133,7 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['primaryAction'] = 'I understand, change content type'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Blended program'
+        this.tpdsSvc.trainingPlanStepperData['contentType'] = event
         this.tpdsSvc.moderatedCourseSelectStatus.next(false)
         if (this.tpdsSvc.trainingPlanStepperData.contentList.length) {
           this.openDialoagBox(dialogData)
@@ -147,6 +150,7 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['primaryAction'] = 'I understand, change content type'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Curated program'
+        this.tpdsSvc.trainingPlanStepperData['contentType'] = event
         this.tpdsSvc.moderatedCourseSelectStatus.next(false)
         if (this.tpdsSvc.trainingPlanStepperData.contentList.length) {
           this.openDialoagBox(dialogData)
@@ -163,6 +167,7 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['primaryAction'] = 'I understand, change content type'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Moderated Course'
+        this.tpdsSvc.trainingPlanStepperData['contentType'] = event
         if (this.tpdsSvc.trainingPlanStepperData.contentList.length) {
           this.openDialoagBox(dialogData)
         } else {
@@ -178,6 +183,7 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['primaryAction'] = 'I understand, change user type'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Designation'
+        this.tpdsSvc.trainingPlanStepperData['assignmentType'] = event
         if (this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo.length) {
           this.openDialoagBox(dialogData)
         } else {
@@ -194,6 +200,7 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'AllUser'
         this.tpdsSvc.trainingPlanAssigneeData.category = 'AllUser'
+        this.tpdsSvc.trainingPlanStepperData['assignmentType'] = event
         if (this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo.length) {
           this.openDialoagBox(dialogData)
         } else {
@@ -209,6 +216,7 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['primaryAction'] = 'I understand, change user type'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'CustomUser'
+        this.tpdsSvc.trainingPlanStepperData['assignmentType'] = event
         if (this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo.length) {
           this.openDialoagBox(dialogData)
         } else {
@@ -236,7 +244,14 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
 
     this.dialogRef.afterClosed().subscribe((res: any) => {
       if (res && res.toLowerCase() === 'cancel') {
-        this.checkForContent()
+        if (this.from === 'content') {
+          this.selectedValue = this.tpdsSvc.trainingPlanContentData.category
+          this.tpdsSvc.trainingPlanStepperData['contentType'] = this.selectedValue
+        } else if (this.from === 'assignee') {
+          this.selectedValue = this.tpdsSvc.trainingPlanAssigneeData.category
+          this.tpdsSvc.trainingPlanStepperData['assignmentType'] = this.selectedValue
+        }
+
       }
     })
   }

From 447cbd2948f3b25db8851b4170c1073d7bdf7b9a Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Thu, 4 Jan 2024 16:39:24 +0530
Subject: [PATCH 429/887] update for filter unselect issue

---
 .../components/filter/filter.component.ts     | 31 ++++++++++++++++---
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index e1d0c9a8e..0557e435f 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -165,6 +165,32 @@ export class FilterComponent implements OnInit, AfterContentChecked {
           citem['selected'] = false
         }
       })
+      
+      if (this.filterObj['competencyArea'] &&
+        this.filterObj['competencyArea'].indexOf(ctype.id) > -1) {
+        const index = this.filterObj['competencyArea'].findIndex((x: any) => x === ctype.id)
+        this.filterObj['competencyArea'].splice(index, 1)
+      }
+      if (this.filterObj['competencyTheme']) {
+        this.competencyThemeList.map(sitem => {
+          if (sitem.parent === ctype.id) {
+            if(this.filterObj['competencyTheme'].indexOf(sitem.name) > -1) {
+              const index = this.filterObj['competencyTheme'].findIndex((x: any) => x === sitem.name) 
+              this.filterObj['competencyTheme'].splice(index, 1)
+            }
+          }
+        })
+      }
+      if (this.filterObj['competencySubTheme']) {
+        this.competencySubThemeList.map(ssitem => {
+          if (ssitem.parentType === ctype.id) {
+            if(this.filterObj['competencySubTheme'].indexOf(ssitem.name) > -1) {
+              const index = this.filterObj['competencySubTheme'].findIndex((x: any) => x === ssitem.name) 
+              this.filterObj['competencySubTheme'].splice(index, 1)
+            }
+          }
+        })
+      }
       this.competencyThemeList = this.competencyThemeList.filter(sitem => {
         if (sitem.parent === ctype.id) {
           sitem['selected'] = false
@@ -177,11 +203,6 @@ export class FilterComponent implements OnInit, AfterContentChecked {
         }
         return pitem.parentType !== ctype.id
       })
-      if (this.filterObj['competencyArea'] &&
-        this.filterObj['competencyArea'].indexOf(ctype.id) > -1) {
-        const index = this.filterObj['competencyArea'].findIndex((x: any) => x === ctype.id)
-        this.filterObj['competencyArea'].splice(index, 1)
-      }
       this.searchThemeControl.reset()
       this.searchSubThemeControl.reset()
     }

From 9e08c495ae91b2e193e976c5f906e2fb56c3483b Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Thu, 4 Jan 2024 17:11:43 +0530
Subject: [PATCH 430/887] bug fix and lint issue fix

---
 .../training-plan-dashboard.component.ts      | 14 +++----
 .../breadcrumb/breadcrumb.component.ts        |  8 ++--
 .../components/chip/chip.component.ts         |  6 +--
 .../components/filter/filter.component.ts     | 41 ++++++++++---------
 .../components/search/search.component.ts     | 33 +++++++--------
 .../create-plan/create-plan.component.html    |  2 +-
 .../create-plan/create-plan.component.ts      | 14 +++----
 .../training-plan-data-share.service.ts       |  4 +-
 8 files changed, 63 insertions(+), 59 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
index 1b4c5f83e..a6a3420b9 100644
--- a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
@@ -83,7 +83,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
         { displayName: 'Content type', key: 'contentType' },
         { displayName: 'Timeline', key: 'endDate' },
         { displayName: 'Created by', key: 'createdByName' },
-        { displayName: 'Created on', key: 'updatedAt' }
+        { displayName: 'Created on', key: 'updatedAt' },
       ],
       needCheckBox: false,
       needHash: false,
@@ -92,7 +92,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
       needUserMenus: false,
       actions: [],
       actionColumnName: 'Action',
-      cbpPlanMenu: true
+      cbpPlanMenu: true,
     }
   }
 
@@ -196,7 +196,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
       res.endDate = (res.endDate) ? moment(res.endDate).format('MMM DD[,] YYYY') : ''
       res.updatedAt = (res.updatedAt) ? moment(res.updatedAt).format('MMM DD[,] YYYY') : ''
       res.createdByName = (res.createdBy === this.currentUser) ? 'You' : res.createdByName
-      let compyData: any = []
+      const compyData: any = []
       if (res.contentList && res.contentList.length > 0) {
         res.contentList.forEach((contentEle: any) => {
           if (contentEle.competencies_v5 && contentEle.competencies_v5.length > 0) {
@@ -207,8 +207,8 @@ export class TrainingPlanDashboardComponent implements OnInit {
         })
         res.competencies = _.uniq(compyData)
       }
-      let userName: any = []
-      let userDesignation: any = []
+      const userName: any = []
+      const userDesignation: any = []
       if (res.userType === 'CustomUser' && res.userDetails && res.userDetails.length > 0) {
         res.userDetails.forEach((ele: any) => {
           userName.push((ele && ele.firstName) ? ele.firstName : '')
@@ -290,7 +290,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
       this.snackBar.open('CBP plan deleted successfully.')
       this.loaderService.changeLoaderState(false)
       this.tabNavigate(_selectedRow.status.toLowerCase(), _selectedRow.userType)
-    }, _error => {
+    },                                                  _error => {
       this.loaderService.changeLoaderState(false)
     })
   }
@@ -312,7 +312,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
         this.snackBar.open('Something went wrong while publishing CBP plan. Try again later')
         this.loaderService.changeLoaderState(false)
       }
-    }, (_error: any) => {
+    },                                                  (_error: any) => {
       this.snackBar.open('Something went wrong while publishing CBP plan. Try again later')
       this.loaderService.changeLoaderState(false)
     })
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
index 3fb63677e..b52947726 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
@@ -150,7 +150,7 @@ export class BreadcrumbComponent implements OnInit {
             tabSelected: this.tpdsSvc.trainingPlanStepperData.assignmentType,
           },
         })
-      }, 1000)
+      },         1000)
     })
   }
 
@@ -197,7 +197,7 @@ export class BreadcrumbComponent implements OnInit {
               tabSelected: this.tpdsSvc.trainingPlanStepperData.assignmentType,
             },
           })
-        }, 1000)
+        },         1000)
       }
     })
   }
@@ -221,12 +221,12 @@ export class BreadcrumbComponent implements OnInit {
               tabSelected: this.tpdsSvc.trainingPlanStepperData.assignmentType,
             },
           })
-        }, 1000)
+        },         1000)
       } else {
         this.snackBar.open('Something went wrong while publishing CBP plan. Try again later')
         this.dialogRef.close()
       }
-    }, (_error: any) => {
+    },                                    (_error: any) => {
       this.snackBar.open('Something went wrong while publishing CBP plan. Try again later')
       this.dialogRef.close()
     })
diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
index 5e68f93e1..f907ed042 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
@@ -43,14 +43,14 @@ export class ChipComponent implements OnInit, OnChanges {
   clearAll() {
     if (this.from === 'content') {
       this.selectContentCount = 0
-      let selectedIndex:any = [];
+      const selectedIndex: any = []
       this.tpdsSvc.trainingPlanContentData.data.content.map((sitem: any) => {
         if (sitem && sitem['selected']) {
           selectedIndex.push(sitem['identifier'])
           sitem['selected'] = false
         }
       })
-      
+
       this.tpdsSvc.trainingPlanStepperData.contentList = []
       this.tpdsSvc.trainingPlanStepperData.contentType = ''
     }
@@ -107,7 +107,7 @@ export class ChipComponent implements OnInit, OnChanges {
         this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo.splice(index, 1)
       }
       this.itemRemoved.emit(true)
-    } else if (this.tpdsSvc.trainingPlanAssigneeData.category === 'CustomUser') {      
+    } else if (this.tpdsSvc.trainingPlanAssigneeData.category === 'CustomUser') {
       this.tpdsSvc.trainingPlanAssigneeData.data.map((sitem: any) => {
         if (sitem && sitem['selected'] && sitem['userId'] === item['userId']) {
           sitem['selected'] = false
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index 0557e435f..3a24a61dd 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -55,12 +55,12 @@ export class FilterComponent implements OnInit, AfterContentChecked {
           if (!this.designationList.length) {
             this.getDesignation()
           } else {
-            this.designationList.map((pitem:any)=>{
-              if(pitem && this.assigneeFilterObj['designation'] && this.assigneeFilterObj['designation'].indexOf(pitem.name) > -1) {
-                pitem['selected'] = true;        
+            this.designationList.map((pitem: any) => {
+              if (pitem && this.assigneeFilterObj['designation'] && this.assigneeFilterObj['designation'].indexOf(pitem.name) > -1) {
+                pitem['selected'] = true
               } else {
-                pitem['selected'] = false;        
-              }         
+                pitem['selected'] = false
+              }
             })
           }
 
@@ -165,7 +165,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
           citem['selected'] = false
         }
       })
-      
+
       if (this.filterObj['competencyArea'] &&
         this.filterObj['competencyArea'].indexOf(ctype.id) > -1) {
         const index = this.filterObj['competencyArea'].findIndex((x: any) => x === ctype.id)
@@ -174,8 +174,8 @@ export class FilterComponent implements OnInit, AfterContentChecked {
       if (this.filterObj['competencyTheme']) {
         this.competencyThemeList.map(sitem => {
           if (sitem.parent === ctype.id) {
-            if(this.filterObj['competencyTheme'].indexOf(sitem.name) > -1) {
-              const index = this.filterObj['competencyTheme'].findIndex((x: any) => x === sitem.name) 
+            if (this.filterObj['competencyTheme'].indexOf(sitem.name) > -1) {
+              const index = this.filterObj['competencyTheme'].findIndex((x: any) => x === sitem.name)
               this.filterObj['competencyTheme'].splice(index, 1)
             }
           }
@@ -184,8 +184,8 @@ export class FilterComponent implements OnInit, AfterContentChecked {
       if (this.filterObj['competencySubTheme']) {
         this.competencySubThemeList.map(ssitem => {
           if (ssitem.parentType === ctype.id) {
-            if(this.filterObj['competencySubTheme'].indexOf(ssitem.name) > -1) {
-              const index = this.filterObj['competencySubTheme'].findIndex((x: any) => x === ssitem.name) 
+            if (this.filterObj['competencySubTheme'].indexOf(ssitem.name) > -1) {
+              const index = this.filterObj['competencySubTheme'].findIndex((x: any) => x === ssitem.name)
               this.filterObj['competencySubTheme'].splice(index, 1)
             }
           }
@@ -284,6 +284,9 @@ export class FilterComponent implements OnInit, AfterContentChecked {
     if (this.from === 'content') {
       this.filterObj = { competencyArea: [], competencyTheme: [], competencySubTheme: [], providers: [] }
       this.selectedProviders = []
+      this.competencyThemeList = []
+      this.competencySubThemeList = []
+      this.resetFilter()
     } else {
       this.assigneeFilterObj = { group: [], designation: [] }
     }
@@ -333,21 +336,21 @@ export class FilterComponent implements OnInit, AfterContentChecked {
 
   manageSelectedDesignation(event: any, designation: any) {
     if (event.checked) {
-      this.designationList.map((ditem:any)=>{
-        if(ditem && ditem['name'] === designation.name) {
-          ditem['selected'] = true;
+      this.designationList.map((ditem: any) => {
+        if (ditem && ditem['name'] === designation.name) {
+          ditem['selected'] = true
         }
       })
-      
+
       this.assigneeFilterObj['designation'].push(designation.name)
     } else {
-      this.designationList.map((ditem:any)=>{
-        if(ditem && ditem['name'] === designation.name) {
-          ditem['selected'] = false;
+      this.designationList.map((ditem: any) => {
+        if (ditem && ditem['name'] === designation.name) {
+          ditem['selected'] = false
         }
       })
-      if (this.assigneeFilterObj['designation'] && 
-          this.assigneeFilterObj['designation'].indexOf(designation.name) > -1) {
+      if (this.assigneeFilterObj['designation'] &&
+        this.assigneeFilterObj['designation'].indexOf(designation.name) > -1) {
         const index = this.assigneeFilterObj['designation'].findIndex((x: any) => x === designation.name)
         this.assigneeFilterObj['designation'].splice(index, 1)
       }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 9b59ca81a..180886d27 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -24,10 +24,10 @@ export class SearchComponent implements OnInit {
   pageSize = 20
   isContentLive = false
   constructor(
-              private trainingPlanService: TrainingPlanService,
-              private route: ActivatedRoute,
-              public tpdsSvc: TrainingPlanDataSharingService,
-              private loadingService: LoaderService
+    private trainingPlanService: TrainingPlanService,
+    private route: ActivatedRoute,
+    public tpdsSvc: TrainingPlanDataSharingService,
+    private loadingService: LoaderService
   ) { }
 
   ngOnInit() {
@@ -40,7 +40,7 @@ export class SearchComponent implements OnInit {
 
     })
 
-    this.tpdsSvc.getFilterDataObject.subscribe((event)=>{
+    this.tpdsSvc.getFilterDataObject.subscribe(event => {
       if (this.from === 'content') {
         this.getContent(this.selectedDropDownValue, event)
       } else {
@@ -54,7 +54,7 @@ export class SearchComponent implements OnInit {
 
   openFilter() {
     this.filterVisibilityFlag = true
-    this.tpdsSvc.filterToggle.next({from:this.from,status: true});
+    this.tpdsSvc.filterToggle.next({ from: this.from, status: true })
     // if (this.document.getElementById('top-nav-bar')) {
     //   const ele: any = this.document.getElementById('top-nav-bar')
     //   ele.style.zIndex = '1'
@@ -64,7 +64,7 @@ export class SearchComponent implements OnInit {
 
   hideFilter(event: any) {
     this.filterVisibilityFlag = event
-    this.tpdsSvc.filterToggle.next({from:'',status:false});
+    this.tpdsSvc.filterToggle.next({ from: '', status: false })
     // if (this.document.getElementById('top-nav-bar')) {
     //   const ele: any = this.document.getElementById('top-nav-bar')
     //   ele.style.zIndex = '1000'
@@ -83,7 +83,7 @@ export class SearchComponent implements OnInit {
         /* tslint:disable */
         event = !event ? 'Course' : event
         /* tslint:enable */
-        this.searchText = '';
+        this.searchText = ''
         this.getContent(event)
         break
       case 'assignee':
@@ -92,6 +92,7 @@ export class SearchComponent implements OnInit {
         //   this.tpdsSvc.trainingPlanStepperData['assignmentTypeInfo']=[]
         // }
         /* tslint:disable */
+        this.searchText = ''
         event = !event ? 'Designation' : event
         /* tslint:enable */
         if (event === 'Designation') {
@@ -146,20 +147,20 @@ export class SearchComponent implements OnInit {
           && this.tpdsSvc.trainingPlanContentData.data
           && this.tpdsSvc.trainingPlanContentData.data.content) {
           finResult = this.tpdsSvc.trainingPlanContentData.data.content.filter((sitem: any) => {
-            if(sitem) {
+            if (sitem) {
               return sitem.selected
-            }            
+            }
           })
-        }         
-        if(res && res.content ) {
-          const result = { count: res.count, content: _.uniqBy(_.concat(finResult, res.content), 'identifier') }       
+        }
+        if (res && res.content) {
+          const result = { count: res.count, content: _.uniqBy(_.concat(finResult, res.content), 'identifier') }
           this.tpdsSvc.trainingPlanContentData = { category: contentType, data: result, count: res.count }
-                   
+
         } else {
-          const result = { count: res.count, content: _.uniqBy(_.concat(finResult, []), 'identifier') }       
+          const result = { count: res.count, content: _.uniqBy(_.concat(finResult, []), 'identifier') }
           this.tpdsSvc.trainingPlanContentData = { category: contentType, data: result, count: res.count }
         }
-        this.handleApiData.emit(true) 
+        this.handleApiData.emit(true)
         this.loadingService.changeLoaderState(false)
       })
     }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
index e72b8e97f..bbfb2d734 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.html
@@ -6,5 +6,5 @@
         (addAssigneeIsInvalid)="isAddAssigneeInvalid($event)"></ws-app-stepper>
 </div>
 <div [hidden]="!filterVisibilityFlag">
-    <ws-app-filter (toggleFilter)="hideFilter($event)" [from]="from"></ws-app-filter>
+    <ws-app-filter [from]="from"></ws-app-filter>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
index bd27712b7..a3d81de18 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
@@ -17,8 +17,8 @@ export class CreatePlanComponent implements OnInit, OnDestroy {
   nextTab = ''
   createCheck: any
   planId = ''
-  filterVisibilityFlag = false;
-  from = '';
+  filterVisibilityFlag = false
+  from = ''
   constructor(
     private route: ActivatedRoute,
     private tpdsSvc: TrainingPlanDataSharingService) {
@@ -57,12 +57,12 @@ export class CreatePlanComponent implements OnInit, OnDestroy {
       this.tpdsSvc.trainingPlanStepperData['status'] = contentData.status
     }
 
-    this.tpdsSvc.filterToggle.subscribe((data:any)=>{
-      if(data) {
-        this.filterVisibilityFlag = data.status;
-        this.from = data.from;
+    this.tpdsSvc.filterToggle.subscribe((data: any) => {
+      if (data) {
+        this.filterVisibilityFlag = data.status
+        this.from = data.from
       }
-      
+
     })
   }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts b/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
index 0f2cc3b3a..4183d75a8 100644
--- a/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
+++ b/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
@@ -9,8 +9,8 @@ export class TrainingPlanDataSharingService {
   trainingPlanCategoryChangeEvent = new Subject()
   moderatedCourseSelectStatus = new Subject()
   handleContentPageChange = new Subject()
-  filterToggle = new Subject();
-  getFilterDataObject = new Subject();
+  filterToggle = new Subject()
+  getFilterDataObject = new Subject()
   trainingPlanTitle = ''
   trainingPlanContentData: any
   trainingPlanAssigneeData: any

From b5d0b4355eae9478cd68f871304a91f7e356480a Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Thu, 4 Jan 2024 17:18:56 +0530
Subject: [PATCH 431/887] lint issue fix

---
 .../routes/training-plan/components/filter/filter.component.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index 3a24a61dd..4a0e5dcf8 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -34,7 +34,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
   assigneeFilterObj: any = { group: [], designation: [] }
   searchThemeControl = new FormControl()
   searchSubThemeControl = new FormControl()
-  searchProviderControl = new FormControl();
+  searchProviderControl = new FormControl()
   @ViewChildren('checkboxes') checkboxes!: QueryList<ElementRef>
   constructor(
     private cdref: ChangeDetectorRef,
@@ -68,7 +68,6 @@ export class FilterComponent implements OnInit, AfterContentChecked {
       }
     })
 
-
     this.tpdsSvc.clearFilter.subscribe((result: any) => {
       if (result) {
         this.clearFilterWhileSearch()

From 01fcb837e3f92d77d43a4627aef41d86f343b150 Mon Sep 17 00:00:00 2001
From: dakshayini-krishnappa <dakshayini.krishnappa@tarento.com>
Date: Fri, 5 Jan 2024 09:51:21 +0530
Subject: [PATCH 432/887] data format issue fix in event creation

---
 .../create-event/create-event.component.html  |  2 +-
 .../create-event/create-event.component.ts    | 24 +++++++++++++++----
 .../routes/list/list-event.component.ts       |  9 ++++---
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.html b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.html
index e057317cd..00e60ab7b 100644
--- a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.html
+++ b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.html
@@ -203,7 +203,7 @@
                                                 <mat-form-field color="accent" appearance="outline">
                                                     <input matInput [matDatepicker]="eventDate"
                                                         formControlName="eventDate" [min]="minDate" [max]="maxDate"
-                                                        [(ngModel)]="todayDate" (dateChange)="updateDate($event)">
+                                                        (dateChange)="updateDate($event)">
                                                     <mat-datepicker-toggle matSuffix [for]="eventDate">
                                                     </mat-datepicker-toggle>
                                                     <mat-datepicker #eventDate></mat-datepicker>
diff --git a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
index bc2fc13cb..fc32af108 100644
--- a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
+++ b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
@@ -14,14 +14,32 @@ import * as moment from 'moment'
 import _ from 'lodash'
 import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
 import { ProfileV2UtillService } from '../../../home/services/home-utill.service'
+import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE } from '@angular/material/core'
+import { MomentDateAdapter } from '@angular/material-moment-adapter'
 /* tslint:enable */
+export const MY_FORMATS = {
+  parse: {
+    dateInput: 'LL',
+  },
+  display: {
+    dateInput: 'DD-MM-YYYY',
+    monthYearLabel: 'YYYY',
+    dateA11yLabel: 'LL',
+    monthYearA11yLabel: 'YYYY',
+  },
+}
+
 @Component({
   selector: 'ws-app-create-event',
   templateUrl: './create-event.component.html',
   styleUrls: ['./create-event.component.scss'],
+  providers: [
+    { provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE] },
+    { provide: MAT_DATE_FORMATS, useValue: MY_FORMATS },
+  ],
 })
-export class CreateEventComponent implements OnInit {
 
+export class CreateEventComponent implements OnInit {
   artifactURL: any
   participantsArr: any = []
   presentersArr: any = []
@@ -87,7 +105,6 @@ export class CreateEventComponent implements OnInit {
   username: any
   minDate: any
   maxDate: any
-  todayDate: any
   todayTime: any
   eventimageURL: any
   departmentID: any
@@ -130,7 +147,7 @@ export class CreateEventComponent implements OnInit {
       description: new FormControl('', [Validators.required]),
       agenda: new FormControl('', [Validators.required]),
       eventType: new FormControl('', [Validators.required]),
-      eventDate: new FormControl('', [Validators.required]),
+      eventDate: new FormControl(moment(), [Validators.required]),
       eventTime: new FormControl('', [Validators.required]),
       eventDurationHours: new FormControl('', [Validators.required]),
       eventDurationMinutes: new FormControl('', [Validators.required]),
@@ -145,7 +162,6 @@ export class CreateEventComponent implements OnInit {
     const maxNewDate = new Date()
     this.minDate = minCurrentDate
     this.maxDate = maxNewDate.setMonth(maxNewDate.getMonth() + 1)
-    this.todayDate = new Date((new Date().getTime()))
     this.todayTime = '00:00'
   }
 
diff --git a/project/ws/app/src/lib/routes/events/routes/list/list-event.component.ts b/project/ws/app/src/lib/routes/events/routes/list/list-event.component.ts
index 91c434300..a070f94b2 100644
--- a/project/ws/app/src/lib/routes/events/routes/list/list-event.component.ts
+++ b/project/ws/app/src/lib/routes/events/routes/list/list-event.component.ts
@@ -6,6 +6,8 @@ import * as moment from 'moment'
 /* tslint:disable */
 import _ from 'lodash'
 import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
+import { DatePipe } from '@angular/common'
+
 /* tslint:enable */
 @Component({
     selector: 'ws-app-list-event',
@@ -34,7 +36,8 @@ export class ListEventComponent implements OnInit, AfterViewInit, OnDestroy {
         private eventSvc: EventsService,
         private configSvc: ConfigurationsService,
         private activeRoute: ActivatedRoute,
-        private events: EventService
+        private events: EventService,
+        private datePipe: DatePipe
     ) {
         this.math = Math
         this.configService = this.activeRoute.snapshot.data.configService
@@ -132,7 +135,7 @@ export class ListEventComponent implements OnInit, AfterViewInit, OnDestroy {
                     const creatorDetails = str && str.length > 0 ? JSON.parse(str) : creatordata
                     const eventDataObj = {
                         eventName: obj.name.substring(0, 100),
-                        eventStartDate: this.customDateFormat(obj.startDate, obj.startTime),
+                        eventStartDate: this.customDateFormat(this.datePipe.transform(obj.startDate, 'MMM dd, yyyy'), obj.startTime),
                         eventCreatedOn: this.allEventDateFormat(obj.createdOn),
                         eventDuration: duration,
                         eventjoined: (creatorDetails !== undefined && creatorDetails.length > 0) ?
@@ -221,7 +224,7 @@ export class ListEventComponent implements OnInit, AfterViewInit, OnDestroy {
         const formatedDate = new Date(year, month, date, hours, minutes, seconds, 0)
         // let format = 'YYYY-MM-DD hh:mm a'
         // if (!timeAllow) {
-        const format = 'YYYY-MM-DD'
+        const format = 'MMM DD, yyyy'
         // }
         const readableDateMonth = moment(formatedDate).format(format)
         const finalDateTimeValue = `${readableDateMonth}`

From dc70c91da603eb9af1a996d508d8a091c700acd8 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Fri, 5 Jan 2024 10:46:52 +0530
Subject: [PATCH 433/887] update for timeline and dropdown ui issue

---
 .../add-timeline-form.component.html          |  2 +-
 .../add-timeline-form.component.scss          | 14 ++++++-
 .../category-drop-down.component.html         | 13 +++++-
 .../category-drop-down.component.scss         | 40 +++++++++----------
 .../components/filter/filter.component.ts     |  5 +++
 5 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html
index 2b376289c..0f6873f19 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html
@@ -9,7 +9,7 @@
             <mat-label>Select date</mat-label>
             <input matInput #ref [matDatepicker]="picker" [min]="minDate" [(ngModel)]="todayDate" (dateChange)="changeTimeline(ref.value)">
             <mat-datepicker-toggle matSuffix [for]="picker">
-                <mat-icon matDatepickerToggleIcon>calendar_today</mat-icon>
+                <!-- <mat-icon matDatepickerToggleIcon>calendar_today</mat-icon> -->
             </mat-datepicker-toggle>
             <mat-datepicker #picker></mat-datepicker>
           </mat-form-field>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.scss b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.scss
index ab002076a..db61ba6f2 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.scss
@@ -34,4 +34,16 @@
     color: rgba(0, 0, 0, 0.87);
     font-size: 14px;
     font-weight: 400;
-}
\ No newline at end of file
+}
+
+.calender ::ng-deep .mat-form-field-outline {
+    height: 48px;
+}
+
+.calender ::ng-deep .mat-form-field-infix {
+    line-height: 1 !important;
+}
+
+.calender ::ng-deep .mat-form-field-appearance-outline .mat-form-field-infix {
+    padding: 0.5em 0 0.5em 0;
+}
diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.html b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.html
index d2020b7f3..73263ebd8 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.html
@@ -1,5 +1,16 @@
-<div class="selectWrapper">
+<!-- <div class="selectWrapper">
     <select #select class="selectBox" (change)="showDialogBox(select?.value)" [(ngModel)]="selectedValue">
         <option *ngFor="let item of categoryData" [value]="item?.value">{{item?.name}}</option>
     </select>
+</div> -->
+<div class="category-box">
+<mat-form-field appearance="outline">
+    <mat-select 
+        [(ngModel)]="selectedValue">
+        <mat-option *ngFor="let item of categoryData"
+            [value]="item?.value">
+            {{item?.name}}
+        </mat-option>
+    </mat-select>
+</mat-form-field>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.scss b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.scss
index 2632ba580..9f3100b25 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.scss
@@ -1,33 +1,29 @@
-.selectWrapper {
-    border-radius: 4px;
+.category-box {
     display: inline-block;
     width: 11%;
+    min-height: 48px;
 }
 
-.selectBox {
+.category-box ::ng-deep .mat-form-field-appearance-outline .mat-form-field-flex {
     width: 192px;
+    min-height: 48px;
+}
+
+.category-box ::ng-deep .mat-form-field-appearance-outline .mat-form-field-wrapper {
+    padding: 0;
+    margin: 0;
     height: 48px;
-    border: 0px;
-    outline: none;
-    background: none;
 }
 
-select {
-    -webkit-appearance: none;
-    -moz-appearance: none;
-    background: transparent !important;
-    background-image: url("data:image/svg+xml;utf8,<svg fill='black' height='24' viewBox='0 0 24 24' width='24' xmlns='http://www.w3.org/2000/svg'><path d='M7 10l5 5 5-5z'/><path d='M0 0h24v24H0z' fill='none'/></svg>") !important;
-    background-repeat: no-repeat !important;
-    background-position-x: 100% !important;
-    background-position-y: 10px !important;
-    border: 1px solid rgba(0, 0, 0, 0.16) !important;
-    border-radius: 2px !important;
-    padding: 1rem !important;
+.category-box ::ng-deep .mat-form-field-appearance-outline .mat-form-field-infix {
+    padding: 0.25em 0 0.75em 0 !important;
 }
 
-.selectBox option {
-    font-size: 14px !important;
-    font-family: 'Lato';
-    font-weight: 400;
-    color: rgba(0, 0, 0, 0.87);
+.category-box ::ng-deep .mat-form-field-appearance-outline .mat-form-field-infix .mat-select-arrow-wrapper {
+    vertical-align: inherit !important;
+}
+
+.category-box  ::ng-deep .mat-form-field-flex {
+    min-height: 48px;
+    border-radius: 4px;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index 0557e435f..de345f308 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -284,6 +284,11 @@ export class FilterComponent implements OnInit, AfterContentChecked {
     if (this.from === 'content') {
       this.filterObj = { competencyArea: [], competencyTheme: [], competencySubTheme: [], providers: [] }
       this.selectedProviders = []
+      this.competencyThemeList = [];
+      this.competencySubThemeList = [];
+      this.searchThemeControl.reset();
+      this.searchSubThemeControl.reset();
+      this.searchProviderControl.reset();
     } else {
       this.assigneeFilterObj = { group: [], designation: [] }
     }

From 2c63c86580f880e8dd5e2408384e5d6a04e54ec9 Mon Sep 17 00:00:00 2001
From: dakshayini-krishnappa <dakshayini.krishnappa@tarento.com>
Date: Fri, 5 Jan 2024 13:08:51 +0530
Subject: [PATCH 434/887] date formate function separation

---
 .../create-event/create-event.component.html  |  1 +
 .../create-event/create-event.component.ts    | 19 ++-----
 .../routes/events/routes/format-datepicker.ts | 49 +++++++++++++++++++
 3 files changed, 54 insertions(+), 15 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/events/routes/format-datepicker.ts

diff --git a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.html b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.html
index 00e60ab7b..6f025e09c 100644
--- a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.html
+++ b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.html
@@ -202,6 +202,7 @@
                                                 </label>
                                                 <mat-form-field color="accent" appearance="outline">
                                                     <input matInput [matDatepicker]="eventDate"
+                                                        placeholder="Choose Date(dd-mm-yyyy)"
                                                         formControlName="eventDate" [min]="minDate" [max]="maxDate"
                                                         (dateChange)="updateDate($event)">
                                                     <mat-datepicker-toggle matSuffix [for]="eventDate">
diff --git a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
index fc32af108..0a71a8b04 100644
--- a/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
+++ b/project/ws/app/src/lib/routes/events/routes/create-event/create-event.component.ts
@@ -14,28 +14,17 @@ import * as moment from 'moment'
 import _ from 'lodash'
 import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
 import { ProfileV2UtillService } from '../../../home/services/home-utill.service'
-import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE } from '@angular/material/core'
-import { MomentDateAdapter } from '@angular/material-moment-adapter'
+import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material/core'
+import { AppDateAdapter, APP_DATE_FORMATS } from '../format-datepicker'
 /* tslint:enable */
-export const MY_FORMATS = {
-  parse: {
-    dateInput: 'LL',
-  },
-  display: {
-    dateInput: 'DD-MM-YYYY',
-    monthYearLabel: 'YYYY',
-    dateA11yLabel: 'LL',
-    monthYearA11yLabel: 'YYYY',
-  },
-}
 
 @Component({
   selector: 'ws-app-create-event',
   templateUrl: './create-event.component.html',
   styleUrls: ['./create-event.component.scss'],
   providers: [
-    { provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE] },
-    { provide: MAT_DATE_FORMATS, useValue: MY_FORMATS },
+    { provide: DateAdapter, useClass: AppDateAdapter },
+    { provide: MAT_DATE_FORMATS, useValue: APP_DATE_FORMATS },
   ],
 })
 
diff --git a/project/ws/app/src/lib/routes/events/routes/format-datepicker.ts b/project/ws/app/src/lib/routes/events/routes/format-datepicker.ts
new file mode 100644
index 000000000..eed881fed
--- /dev/null
+++ b/project/ws/app/src/lib/routes/events/routes/format-datepicker.ts
@@ -0,0 +1,49 @@
+import { NativeDateAdapter } from '@angular/material'
+import { MatDateFormats } from '@angular/material/core'
+
+export class AppDateAdapter extends NativeDateAdapter {
+  format(date: Date, displayFormat: Object): string {
+    if (displayFormat === 'input') {
+      let day: string = date.getDate().toString()
+      day = +day < 10 ? `0${day}` : day
+      let month: string = (date.getMonth() + 1).toString()
+      month = +month < 10 ? `0${month}` : month
+      const year = date.getFullYear()
+      // return `${year}-${month}-${day}`
+      return `${day}-${month}-${year}`
+    }
+    return date.toDateString()
+  }
+}
+
+export const APP_DATE_FORMATS: MatDateFormats = {
+  parse: {
+    dateInput: { month: 'short', year: 'numeric', day: 'numeric' },
+  },
+  display: {
+    dateInput: 'input',
+    monthYearLabel: { year: 'numeric', month: 'numeric' },
+    dateA11yLabel: { year: 'numeric', month: 'long', day: 'numeric',
+    },
+    monthYearA11yLabel: { year: 'numeric', month: 'long' },
+  },
+}
+
+export function changeformat(date: Date): string {
+    let day: string = date.getDate().toString()
+    day = +day < 10 ? `0${day}` : day
+    let month: string = (date.getMonth() + 1).toString()
+    month = +month < 10 ? `0${month}` : month
+    const year = date.getFullYear()
+    // return `${year}-${month}-${day}`
+    return `${day}-${month}-${year}`
+}
+
+export function startWithYearformat(date: Date): string {
+  let day: string = date.getDate().toString()
+  day = +day < 10 ? `0${day}` : day
+  let month: string = (date.getMonth() + 1).toString()
+  month = +month < 10 ? `0${month}` : month
+  const year = date.getFullYear()
+  return `${year}-${month}-${day}`
+}

From db01d42c481bd2b26c116f6bb4312b00260d690e Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Fri, 5 Jan 2024 13:40:17 +0530
Subject: [PATCH 435/887] bug fixex

---
 .../breadcrumb/breadcrumb.component.html      |  8 +--
 .../breadcrumb/breadcrumb.component.scss      |  7 ++
 .../breadcrumb/breadcrumb.component.ts        | 68 +++++++++++++++++--
 3 files changed, 75 insertions(+), 8 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
index 3755ab919..21bcdc6b3 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
@@ -12,7 +12,7 @@
             (tabType.ADD_CONTENT === selectedTab) ? 'Add content' : (tabType.ADD_ASSIGNEE === selectedTab) ? 'Add
             assignee' : (tabType.ADD_TIMELINE === selectedTab) ? 'Add timeline' : ''}}
         </div> -->
-        <div class="action" *ngIf="tpdsSvc?.trainingPlanTitle &&
+        <div class="action title-txt-ellipsis" *ngIf="tpdsSvc?.trainingPlanTitle &&
         selectedTab !== tabType.CREATE_PLAN && !validationList?.titleIsInvalid">
             {{tpdsSvc?.trainingPlanTitle | titlecase}}
         </div>
@@ -32,19 +32,19 @@
                 ? 'Edit Assignee' : (tabType.ADD_ASSIGNEE === selectedTab) ? 'Edit Timeline' : ''}}</span>
         </button>
         <ng-container *ngIf="!editState">
-            <button mat-button class="next-btn margin-left-m" (click)="createPlanDraftView()"
+            <button mat-button class="next-btn margin-left-m" (click)="showConformationPopUp('saveToDraft')"
                 *ngIf="tabType.ADD_TIMELINE === selectedTab" [ngClass]="{'btn-disabled': checkIfValid()}"
                 [disabled]="checkIfValid()">
                 <span>Save as Draft</span>
             </button>
         </ng-container>
         <ng-container *ngIf="editState">
-            <button mat-button class="next-btn margin-left-m" (click)="updatePlan()"
+            <button mat-button class="next-btn margin-left-m" (click)="showConformationPopUp('update')"
                 *ngIf="tabType.ADD_TIMELINE === selectedTab && !isLiveContent"
                 [ngClass]="{'btn-disabled': checkIfValid()}" [disabled]="checkIfValid()">
                 <span>Update Draft</span>
             </button>
-            <button mat-button class="next-btn margin-left-m" (click)="updatePlan()"
+            <button mat-button class="next-btn margin-left-m" (click)="showConformationPopUp('updateAndPublish')"
                 *ngIf="tabType.ADD_TIMELINE === selectedTab && isLiveContent"
                 [ngClass]="{'btn-disabled': checkIfValid()}" [disabled]="checkIfValid()">
                 <span>Update and publish</span>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.scss b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.scss
index aecf16ad1..e6cf0c32a 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.scss
@@ -53,4 +53,11 @@
 
 .btn-disabled {
     background: #999999 !important
+}
+
+.title-txt-ellipsis {
+    max-width: 250px;
+    overflow: hidden;
+    text-wrap: nowrap;
+    text-overflow: ellipsis;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
index b52947726..bd816becb 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
@@ -150,7 +150,7 @@ export class BreadcrumbComponent implements OnInit {
             tabSelected: this.tpdsSvc.trainingPlanStepperData.assignmentType,
           },
         })
-      },         1000)
+      }, 1000)
     })
   }
 
@@ -197,7 +197,7 @@ export class BreadcrumbComponent implements OnInit {
               tabSelected: this.tpdsSvc.trainingPlanStepperData.assignmentType,
             },
           })
-        },         1000)
+        }, 1000)
       }
     })
   }
@@ -221,12 +221,12 @@ export class BreadcrumbComponent implements OnInit {
               tabSelected: this.tpdsSvc.trainingPlanStepperData.assignmentType,
             },
           })
-        },         1000)
+        }, 1000)
       } else {
         this.snackBar.open('Something went wrong while publishing CBP plan. Try again later')
         this.dialogRef.close()
       }
-    },                                    (_error: any) => {
+    }, (_error: any) => {
       this.snackBar.open('Something went wrong while publishing CBP plan. Try again later')
       this.dialogRef.close()
     })
@@ -241,4 +241,64 @@ export class BreadcrumbComponent implements OnInit {
     }
     return false
   }
+
+  showConformationPopUp(_type: string) {
+    switch (_type) {
+      case 'saveToDraft':
+        this.dialogRef = this.dialog.open(ConfirmationBoxComponent, {
+          disableClose: true,
+          data: {
+            type: 'conformation',
+            icon: 'radio_on',
+            title: 'Are you sure you want to save as draft?',
+            // subTitle: 'You wont be able to revert this',
+            primaryAction: 'Save',
+            secondaryAction: 'Cancel',
+          },
+          autoFocus: false,
+        })
+        break
+      case 'update':
+        this.dialogRef = this.dialog.open(ConfirmationBoxComponent, {
+          disableClose: true,
+          data: {
+            type: 'conformation',
+            icon: 'radio_on',
+            title: 'Are you sure you want to update the content?',
+            // subTitle: 'You wont be able to revert this',
+            primaryAction: 'Update',
+            secondaryAction: 'Cancel',
+          },
+          autoFocus: false,
+        })
+        break
+      case 'updateAndPublish':
+        this.dialogRef = this.dialog.open(ConfirmationBoxComponent, {
+          disableClose: true,
+          data: {
+            type: 'conformation',
+            icon: 'radio_on',
+            title: 'Are you sure you want to update and publish the content?',
+            // subTitle: 'You wont be able to revert this',
+            primaryAction: 'Update and publish',
+            secondaryAction: 'Cancel',
+          },
+          autoFocus: false,
+        })
+        break
+    }
+    this.dialogRef.afterClosed().subscribe((_res: any) => {
+      if (_res === 'confirmed') {
+        switch (_type) {
+          case 'saveToDraft':
+            this.createPlanDraftView()
+            break
+          case 'update':
+          case 'updateAndPublish':
+            this.updatePlan()
+            break
+        }
+      }
+    })
+  }
 }

From fc2daa1093a9767bad6870ab2bededd03e2f2eb8 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Fri, 5 Jan 2024 13:41:20 +0530
Subject: [PATCH 436/887] bug fix for preview

---
 src/styles/styles.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/styles/styles.scss b/src/styles/styles.scss
index 05b7fcad4..f6475ba48 100644
--- a/src/styles/styles.scss
+++ b/src/styles/styles.scss
@@ -176,6 +176,7 @@ iframe {
 
 .mat-menu-panel {
   max-width: 290px !important;
+  min-height: 55px !important;
 }
 
 // Material Over-rides

From a97f19270bd86d41d06b31900b0343de83fb15a8 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Fri, 5 Jan 2024 13:51:04 +0530
Subject: [PATCH 437/887] bug fixes for flicker

---
 src/app/component/root/root.component.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/component/root/root.component.scss b/src/app/component/root/root.component.scss
index 05d5c11ce..3717fd1ca 100644
--- a/src/app/component/root/root.component.scss
+++ b/src/app/component/root/root.component.scss
@@ -105,7 +105,7 @@ router-outlet+* {
   align-items: center;
   justify-content: center;
   z-index: 2000 !important;
-  background: rgba(0,0,0,0.3);
+  // background: rgba(0,0,0,0.3);
 }
 
 .loader-container {

From fe2cc38f8b671594cc3fa36ef82ddf254d89d6b2 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Fri, 5 Jan 2024 14:28:08 +0530
Subject: [PATCH 438/887] lint issue changes

---
 .../components/breadcrumb/breadcrumb.component.ts      |  8 ++++----
 .../components/filter/filter.component.ts              | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
index bd816becb..115abb2e2 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
@@ -150,7 +150,7 @@ export class BreadcrumbComponent implements OnInit {
             tabSelected: this.tpdsSvc.trainingPlanStepperData.assignmentType,
           },
         })
-      }, 1000)
+      },         1000)
     })
   }
 
@@ -197,7 +197,7 @@ export class BreadcrumbComponent implements OnInit {
               tabSelected: this.tpdsSvc.trainingPlanStepperData.assignmentType,
             },
           })
-        }, 1000)
+        },         1000)
       }
     })
   }
@@ -221,12 +221,12 @@ export class BreadcrumbComponent implements OnInit {
               tabSelected: this.tpdsSvc.trainingPlanStepperData.assignmentType,
             },
           })
-        }, 1000)
+        },         1000)
       } else {
         this.snackBar.open('Something went wrong while publishing CBP plan. Try again later')
         this.dialogRef.close()
       }
-    }, (_error: any) => {
+    },                                    (_error: any) => {
       this.snackBar.open('Something went wrong while publishing CBP plan. Try again later')
       this.dialogRef.close()
     })
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index 92c15340a..531a2162b 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -283,11 +283,11 @@ export class FilterComponent implements OnInit, AfterContentChecked {
     if (this.from === 'content') {
       this.filterObj = { competencyArea: [], competencyTheme: [], competencySubTheme: [], providers: [] }
       this.selectedProviders = []
-      this.competencyThemeList = [];
-      this.competencySubThemeList = [];
-      this.searchThemeControl.reset();
-      this.searchSubThemeControl.reset();
-      this.searchProviderControl.reset();
+      this.competencyThemeList = []
+      this.competencySubThemeList = []
+      this.searchThemeControl.reset()
+      this.searchSubThemeControl.reset()
+      this.searchProviderControl.reset()
       this.resetFilter()
     } else {
       this.assigneeFilterObj = { group: [], designation: [] }

From df1c7d95c585594cd4bd806215d4c9c02d840305 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Fri, 5 Jan 2024 17:24:26 +0530
Subject: [PATCH 439/887] bug fixes

---
 .../components/breadcrumb/breadcrumb.component.html        | 7 ++++---
 .../components/standard-card/standard-card.component.scss  | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
index 21bcdc6b3..089b21e6f 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
@@ -1,10 +1,11 @@
 <div class="flex flex-1 flex-row breadcrumb">
     <div class="flex flex-2 flex-row left-breadcrumb">
-        <div class="home cursor-pointer" (click)="performRoute('list')">Training Plans
+        <div class="home cursor-pointer" (click)="performRoute('list')">Training plans
             <img src="/assets/icons/arrow-forward_small.svg" />
         </div>
-        <div class="home cursor-pointer" (click)="changeTabFromBreadCrumb('createPlan')">
-            <span *ngIf="!editState">Create</span> <span *ngIf="editState">Edit</span> CBP Plan
+        <div class="home cursor-pointer" (click)="changeTabFromBreadCrumb('createPlan')"
+            [ngClass]="{'action': selectedTab === tabType.CREATE_PLAN}">
+            <span *ngIf="!editState">Create</span> <span *ngIf="editState">Edit</span> CBP plan
             <img src="/assets/icons/arrow-forward_small.svg"
                 *ngIf="selectedTab !== tabType.CREATE_PLAN && !validationList?.titleIsInvalid" />
         </div>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
index bcbe342c1..d3c3042a0 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.scss
@@ -14,7 +14,7 @@ $secondary-color: #EF951E;
   $action-btn-size: 2.5 * $size-m;
   // $card-standard-width-: 331px;
   position: relative;
-  width: 307px;
+  width: 230px;
   border-radius: 8px;
   box-sizing: border-box;
   box-shadow: 0px 10px 30px #99999933;
@@ -165,8 +165,8 @@ $secondary-color: #EF951E;
   }
 
   .card-img {
-    min-width: 305px;
-    max-width: 305px;
+    min-width: 228px;
+    max-width: 228px;
     max-height: 140px;
     min-height: 140px;
     display: block;

From 30258fc8f6189f23cd4bf2e006e58f4b27deeaf8 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Fri, 5 Jan 2024 17:34:33 +0530
Subject: [PATCH 440/887] bug fix for setting default date

---
 .../components/add-timeline-form/add-timeline-form.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
index b0e70ddd5..c2a23cd88 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
@@ -9,7 +9,7 @@ import { TrainingPlanDataSharingService } from '../../services/training-plan-dat
 })
 export class AddTimelineFormComponent implements OnInit {
   minDate: Date = new Date()
-  todayDate: any
+  todayDate: Date = new Date()
   constructor(private tpdsSvc: TrainingPlanDataSharingService, private datePipe: DatePipe) { }
 
   ngOnInit() {

From b18f3839239de18d92942ca2db1135ff33c840b2 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Fri, 5 Jan 2024 17:47:07 +0530
Subject: [PATCH 441/887] update for dropdown selection change

---
 .../category-drop-down/category-drop-down.component.html        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.html b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.html
index 73263ebd8..658e100ab 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.html
@@ -6,7 +6,7 @@
 <div class="category-box">
 <mat-form-field appearance="outline">
     <mat-select 
-        [(ngModel)]="selectedValue">
+        [(ngModel)]="selectedValue" (selectionChange)="showDialogBox($event.value)">
         <mat-option *ngFor="let item of categoryData"
             [value]="item?.value">
             {{item?.name}}

From 766671ab3226fc6b7a7b09b16a4ea547b130b54c Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Fri, 5 Jan 2024 18:43:52 +0530
Subject: [PATCH 442/887] Updated request new content API payload structure &
 validations

---
 .../add-content-dialog.component.html         |  13 +-
 .../add-content-dialog.component.scss         |   3 +
 .../add-content-dialog.component.ts           | 140 +++++++++++-------
 .../create-content.component.html             |   2 +-
 .../create-content.component.ts               |   6 +-
 .../services/traininig-plan.service.ts        |   3 +-
 6 files changed, 102 insertions(+), 65 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.html b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.html
index 9010989a7..27decec2a 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.html
@@ -52,14 +52,10 @@
     </div> -->
 
     <div class="margin-bottom-m">
-      <label class="mat-subheading-2 required">List of Providers</label>
-      <mat-form-field class="full-width">
-        <mat-select (openedChange)="openedChange($event)" placeholder="Select" formControlName="provider" multiple>
-          <!-- <mat-select-trigger>{{provider.value ? provider.value[0] : ''}}
-            <span *ngIf="provider.value?.length > 1" class="additional-selection">
-              (+{{provider.value.length - 1}} {{provider.value?.length === 2 ? 'other' : 'others'}})
-            </span>
-          </mat-select-trigger> -->
+      <mat-label class="mat-subheading-2 required">List of Providers</mat-label>
+      <mat-form-field class="full-width" floatLabel="never">
+        <mat-select (openedChange)="openedChange($event)" placeholder="List of providers" formControlName="provider"
+          multiple>
           <div class="select-container">
             <mat-optgroup>
               <mat-form-field>
@@ -78,7 +74,6 @@
           </div>
         </mat-select>
       </mat-form-field>
-      <!-- <div *ngIf="provider.value">{{ 'You have choosen ' + provider.value }}</div> -->
     </div>
 
     <div class="margin-bottom-m">
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.scss b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.scss
index 4634bd02c..4402ac728 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.scss
@@ -63,4 +63,7 @@
 
 ::ng-deep.mat-option.mat-selected:not(.mat-option-disabled) {
   color: rgba(0, 0, 0, 0.87) !important;
+}
+.mat-button[disabled] {
+  opacity: 0.6;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
index abed36f73..83417b117 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
@@ -28,6 +28,7 @@ export class AddContentDialogComponent implements OnInit {
   checkedList: any = []
   currentSelected: any
   selectedProvidersList: any = []
+  competencyObj: any
 
   constructor(
     @Inject(MAT_DIALOG_DATA) public data: any,
@@ -37,7 +38,7 @@ export class AddContentDialogComponent implements OnInit {
     this.contentForm = new FormGroup({
       competencyArea: new FormControl('', Validators.required),
       provider: new FormControl('', Validators.required),
-      providerText: new FormControl('', Validators.required),
+      providerText: new FormControl(''),
       contentdescription: new FormControl('', Validators.required),
     })
   }
@@ -45,19 +46,6 @@ export class AddContentDialogComponent implements OnInit {
   ngOnInit() {
     this.getCompetencies()
     this.getProviders()
-    // this.contentForm = this.data.from
-    // this.competencyArea.valueChanges.subscribe((newValue: any) => {
-    //   if (newValue) {
-    //     this.filteredallCompetencies = this.allCompetencies
-    //   }
-    // })
-    // this.competencyTheme.valueChanges.subscribe((newValue: any) => {
-    //   this.filteredallCompetencyTheme = this.filterValues(newValue, this.allCompetencyTheme)
-    // })
-    // this.competencySubtheme.valueChanges.subscribe((newValue: any) => {
-    //   this.filteredallCompetencySubtheme = this.filterValues(newValue, this.allCompetencySubtheme)
-    // })
-
     this.filteredProviders = this.contentForm.controls['providerText'].valueChanges
       .pipe(
         startWith<string>(''),
@@ -108,6 +96,7 @@ export class AddContentDialogComponent implements OnInit {
   }
 
   compAreaSelected(option: any) {
+    this.allCompetencyTheme = []
     this.resetCompSubfields()
     this.allCompetencies.forEach((val: any) => {
       if (option.name === val.name) {
@@ -123,27 +112,47 @@ export class AddContentDialogComponent implements OnInit {
 
   compThemeSelected(option: any) {
     this.enableCompetencyAdd = false
-    this.allCompetencyTheme.forEach((val: any) => {
-      if (option.name === val.name) {
-        val.selected = true
-        this.seletedCompetencyTheme.push(val)
-        // this.allCompetencySubtheme = val.children
-        val.children.forEach((item: any) => {
-          item.selected = false
-          this.allCompetencySubtheme.push(item)
-        })
-      }
-    })
+    const index = this.seletedCompetencyTheme.findIndex((object: any) => object.name === option.name)
+    if (index === -1) {
+      this.allCompetencyTheme.forEach((val: any) => {
+        if (option.name === val.name) {
+          val.selected = true
+          this.seletedCompetencyTheme.push(val)
+          // this.allCompetencySubtheme = val.children
+          val.children.forEach((item: any) => {
+            item.selected = false
+            item.compThemeID = val.id
+            this.allCompetencySubtheme.push(item)
+          })
+        }
+      })
+    } else {
+      this.seletedCompetencyTheme[index].selected = false
+      this.seletedCompetencyTheme.splice(index, 1)
+
+      const id = this.seletedCompetencyTheme[index].id
+      this.allCompetencySubtheme.forEach((item: any, i: any) => {
+        if (item.compThemeID === id) {
+          this.allCompetencySubtheme.splice(i, 1)
+        }
+      })
+    }
   }
 
   compSubThemeSelected(option: any) {
     this.enableCompetencyAdd = true
-    this.allCompetencySubtheme.forEach((val: any) => {
-      if (option.name === val.name) {
-        val.selected = true
-        this.seletedCompetencySubTheme.push(val)
-      }
-    })
+    const index = this.seletedCompetencySubTheme.findIndex((object: any) => object.name === option.name)
+    if (index === -1) {
+      this.allCompetencySubtheme.forEach((val: any) => {
+        if (option.name === val.name) {
+          val.selected = true
+          this.seletedCompetencySubTheme.push(val)
+        }
+      })
+    } else {
+      this.seletedCompetencySubTheme[index].selected = false
+      this.seletedCompetencySubTheme.splice(index, 1)
+    }
   }
 
   resetCompfields() {
@@ -198,35 +207,60 @@ export class AddContentDialogComponent implements OnInit {
   }
 
   submit() {
-    const themeNames: any[] = []
-    const themeIds: any[] = []
-    const subthemeNames: any[] = []
-    const subthemeIds: any[] = []
     const providersIds: any[] = []
-    this.seletedCompetencyTheme.forEach((item: any) => {
-      themeNames.push(item.name)
-      themeIds.push(item.id)
+    this.selectedProvidersList.forEach((item: any) => {
+      providersIds.push(item.orgId)
     })
 
-    this.seletedCompetencySubTheme.forEach((item: any) => {
-      subthemeNames.push(item.name)
-      subthemeIds.push(item.id)
+    this.competencyObj = {
+      id: this.seletedCompetencyArea.id,
+      type: this.seletedCompetencyArea.type,
+      name: this.seletedCompetencyArea.name,
+      children: []
+    }
+    const compTheme: any[] = []
+    this.seletedCompetencyTheme.forEach((item: any) => {
+      const obj = {
+        id: item.id,
+        type: item.type,
+        name: item.name,
+        children: []
+      }
+      compTheme.push(obj)
     })
-    this.selectedProvidersList.forEach((item: any) => {
-      providersIds.push(item.orgId)
+    this.competencyObj.children = compTheme
+
+    this.competencyObj.children.forEach((item: any) => {
+      this.seletedCompetencySubTheme.forEach((subitem: any) => {
+        if (subitem.compThemeID === item.id) {
+          const subobj = {
+            id: subitem.id,
+            type: subitem.type,
+            name: subitem.name,
+          }
+          item.children.push(subobj)
+        }
+      })
     })
-    if (this.contentForm && this.contentForm.value) {
+
+    if (this.contentForm && this.contentForm.valid) {
       const req = {
-        competencyArea: this.seletedCompetencyArea.name,
-        competencyAreaId: this.seletedCompetencyArea.id,
-        competencyTheme: themeNames,
-        competencyThemeId: themeIds,
-        competencySubTheme: subthemeNames,
-        competencySubThemeId: subthemeIds,
-        listOfProviders: providersIds,
-        descriptionOfTheContent: this.contentForm.value.contentdescription || '',
+        request: {
+          competency: this.competencyObj,
+          providerList: providersIds,
+          description: this.contentForm.value.contentdescription || '',
+        }
       }
-      this.trainingplanSvc.createNewContentrequest(req).subscribe()
+      console.log('----------------', req)
+      this.trainingplanSvc.createNewContentrequest(req).subscribe((response: any) => {
+        if (response) {
+          console.log('========', response)
+
+          this.dialogRef.close({ event: 'close', data: response })
+        } else {
+          this.closeModal()
+        }
+      })
     }
 
   }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
index b30d3422a..3fb49cc38 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
@@ -15,7 +15,7 @@
         </div>
     </div>
     <div class="no-cbp-data margin-top-xl margin-bottom-xl" *ngIf="!(contentData) || !(contentData?.length)">
-        <div class="customimg"><img src="/assets/images/no-content-data.svg"></div>
+        <div class="customimg"><img src="/assets/images/nocontent.svg"></div>
         <!-- <div class="mat-subheading-1 margin-remove">No content avaliable.</div> -->
         <!-- <div>Create a content in CBP portal to get the contents.</div> -->
         <div class="mat-subheading-1 margin-top-m margin-bottom-m">Can't find content?</div>
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
index 0dc37e65a..14948715d 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
@@ -112,6 +112,10 @@ export class CreateContentComponent implements OnInit {
       height: '75%',
       width: '60%',
     })
-    dialogRef.afterClosed().subscribe()
+    dialogRef.afterClosed().subscribe((response: any) => {
+      if (response) {
+        console.log('+++', response)
+      }
+    })
   }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts b/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
index 2deda5a75..cb625378d 100644
--- a/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
+++ b/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
@@ -17,7 +17,8 @@ const API_END_POINTS = {
   GET_ALL_DESIGNATIONS: 'apis/proxies/v8/masterData/v2/deptPosition',
   GET_PROVIDERS: 'apis/proxies/v8/searchBy/provider',
   GET_FILTER_ENTITY: 'apis/proxies/v8/competency/v4/search',
-  CREATE_NEWCONTENT: 'apis/proxies/v8/workflow/requestcbplancontent',
+  CREATE_NEWCONTENT: 'apis/proxies/v8/cbplan/v1/admin/requestcontent',
+
 }
 @Injectable({
   providedIn: 'root',

From e87553b460013603e143fa482b5ee8df8b1068b2 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Mon, 8 Jan 2024 12:26:25 +0530
Subject: [PATCH 443/887] Added success message for request new content API

---
 .../add-content-dialog/add-content-dialog.component.ts |  3 ---
 .../routes/create-content/create-content.component.ts  | 10 ++++++----
 .../training-plan/services/traininig-plan.service.ts   |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
index 83417b117..230fe102a 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
@@ -251,11 +251,8 @@ export class AddContentDialogComponent implements OnInit {
           description: this.contentForm.value.contentdescription || '',
         }
       }
-      console.log('----------------', req)
       this.trainingplanSvc.createNewContentrequest(req).subscribe((response: any) => {
         if (response) {
-          console.log('========', response)
-
           this.dialogRef.close({ event: 'close', data: response })
         } else {
           this.closeModal()
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
index 14948715d..07283d1d6 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
@@ -1,6 +1,6 @@
 import { Component, EventEmitter, OnInit, Output } from '@angular/core'
 import { TrainingPlanDataSharingService } from './../../services/training-plan-data-share.service'
-import { MatDialog } from '@angular/material'
+import { MatDialog, MatSnackBar } from '@angular/material'
 import { AddContentDialogComponent } from '../../components/add-content-dialog/add-content-dialog.component'
 @Component({
   selector: 'ws-app-create-content',
@@ -18,7 +18,7 @@ export class CreateContentComponent implements OnInit {
   pageIndex: any
   pageSize: any
   count = 0
-  constructor(private tpdsSvc: TrainingPlanDataSharingService, public dialog: MatDialog) { }
+  constructor(private tpdsSvc: TrainingPlanDataSharingService, public dialog: MatDialog, private snackbar: MatSnackBar) { }
 
   ngOnInit() {
     this.categoryData = [
@@ -113,8 +113,10 @@ export class CreateContentComponent implements OnInit {
       width: '60%',
     })
     dialogRef.afterClosed().subscribe((response: any) => {
-      if (response) {
-        console.log('+++', response)
+      if (response && response.data.responseCode === 'OK') {
+        this.snackbar.open('Request shared successfully')
+      } else {
+        this.snackbar.open('Something went wrong please try again later!!')
       }
     })
   }
diff --git a/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts b/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
index cb625378d..1458bfbf5 100644
--- a/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
+++ b/project/ws/app/src/lib/routes/training-plan/services/traininig-plan.service.ts
@@ -75,7 +75,7 @@ export class TrainingPlanService {
   }
 
   createNewContentrequest(obj: any) {
-    return this.http.post<any>(`${API_END_POINTS.CREATE_NEWCONTENT}`, obj).pipe(map(res => _.get(res, 'result')))
+    return this.http.post<any>(`${API_END_POINTS.CREATE_NEWCONTENT}`, obj)
   }
 
 }

From f0b7f3457c05f09f313c4b061437a8d53920a2cb Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Mon, 8 Jan 2024 12:30:45 +0530
Subject: [PATCH 444/887] img change to auto

---
 .../routes/create-content/create-content.component.scss         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.scss b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.scss
index 53d4c76b0..8ea59d1c4 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.scss
@@ -4,7 +4,7 @@
   text-align: center;
 
   img {
-    width: 200px;
+    width: auto;
   }
 
   .small-text {

From 0425d185bfa883762d9ec3e841db4b6a1175ee71 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Mon, 8 Jan 2024 12:36:38 +0530
Subject: [PATCH 445/887] Updated success message for request new content API

---
 .../routes/create-content/create-content.component.ts  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
index 07283d1d6..16f6148ce 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
@@ -113,10 +113,12 @@ export class CreateContentComponent implements OnInit {
       width: '60%',
     })
     dialogRef.afterClosed().subscribe((response: any) => {
-      if (response && response.data.responseCode === 'OK') {
-        this.snackbar.open('Request shared successfully')
-      } else {
-        this.snackbar.open('Something went wrong please try again later!!')
+      if (response) {
+        if (response.data.responseCode === 'OK') {
+          this.snackbar.open('Request shared successfully')
+        } else {
+          this.snackbar.open('Something went wrong please try again later!!')
+        }
       }
     })
   }

From 41fc637ac9c07598502f35db110fec474a55c777 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Mon, 8 Jan 2024 14:00:20 +0530
Subject: [PATCH 446/887] package update

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 799a62ba0..f5cc35a71 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@angular/router": "~8.2.1",
     "@angular/service-worker": "~8.2.1",
     "@project-sunbird/telemetry-sdk": "0.0.26",
-    "@sunbird-cb/collection": "^1.0.39",
+    "@sunbird-cb/collection": "^1.0.41",
     "@sunbird-cb/design-system": "0.0.1",
     "@sunbird-cb/rain-dashboards": "0.4.22-rc.1",
     "@sunbird-cb/resolver": "^1.0.0",

From d477f9058ffe6f1ce72808ebcd3737ff6f188fe7 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Mon, 8 Jan 2024 15:48:25 +0530
Subject: [PATCH 447/887] Updated form validations & fixes

---
 .../acsending-order.pipe.spec.ts              |  8 +++++++
 .../acsending-order.pipe.ts                   | 20 +++++++++++++++++
 .../pipe-ascendingorder.module.ts             | 12 ++++++++++
 .../add-content-dialog.component.html         | 10 ++++-----
 .../add-content-dialog.component.scss         | 20 +++++++++++++++++
 .../add-content-dialog.component.ts           | 22 +++++--------------
 .../training-plan/training-plan.module.ts     |  2 ++
 7 files changed, 72 insertions(+), 22 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/pipes/pipe-ascendingorder/acsending-order.pipe.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/pipes/pipe-ascendingorder/acsending-order.pipe.ts
 create mode 100644 project/ws/app/src/lib/routes/pipes/pipe-ascendingorder/pipe-ascendingorder.module.ts

diff --git a/project/ws/app/src/lib/routes/pipes/pipe-ascendingorder/acsending-order.pipe.spec.ts b/project/ws/app/src/lib/routes/pipes/pipe-ascendingorder/acsending-order.pipe.spec.ts
new file mode 100644
index 000000000..d9914c797
--- /dev/null
+++ b/project/ws/app/src/lib/routes/pipes/pipe-ascendingorder/acsending-order.pipe.spec.ts
@@ -0,0 +1,8 @@
+import { AcsendingOrderPipe } from './acsending-order.pipe'
+
+describe('AcsendingOrderPipe', () => {
+  it('create an instance', () => {
+    const pipe = new AcsendingOrderPipe()
+    expect(pipe).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/pipes/pipe-ascendingorder/acsending-order.pipe.ts b/project/ws/app/src/lib/routes/pipes/pipe-ascendingorder/acsending-order.pipe.ts
new file mode 100644
index 000000000..7a25f33c0
--- /dev/null
+++ b/project/ws/app/src/lib/routes/pipes/pipe-ascendingorder/acsending-order.pipe.ts
@@ -0,0 +1,20 @@
+import { Pipe, PipeTransform } from '@angular/core'
+import { orderBy } from 'lodash'
+
+@Pipe({
+  name: 'acsendingOrder',
+})
+export class AcsendingOrderPipe implements PipeTransform {
+
+  transform(value: any[], order: any = '', column: string = ''): any[] {
+    if (!value || order === '' || !order) { return value } // no array
+    if (!column || column === '') {
+      // const sorted = this.sortOnCaseSensitivity(value, caseInsensitive)
+      if (order === 'asc') { return value.sort() }
+      return value.sort().reverse()
+    } // sort 1d array
+    if (value.length <= 1) { return value } // array with only one item
+    return orderBy(value, [column], [order])
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/pipes/pipe-ascendingorder/pipe-ascendingorder.module.ts b/project/ws/app/src/lib/routes/pipes/pipe-ascendingorder/pipe-ascendingorder.module.ts
new file mode 100644
index 000000000..70c53830e
--- /dev/null
+++ b/project/ws/app/src/lib/routes/pipes/pipe-ascendingorder/pipe-ascendingorder.module.ts
@@ -0,0 +1,12 @@
+import { NgModule } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { AcsendingOrderPipe } from './acsending-order.pipe'
+
+@NgModule({
+  declarations: [AcsendingOrderPipe],
+  imports: [
+    CommonModule,
+  ],
+  exports: [AcsendingOrderPipe],
+})
+export class PipeAcsendingOrderModule { }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.html b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.html
index 27decec2a..4ca1852ae 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.html
@@ -58,17 +58,17 @@
           multiple>
           <div class="select-container">
             <mat-optgroup>
-              <mat-form-field>
-                <input #search autocomplete="off" placeholder="Search" aria-label="Search"
-                  formControlName="providerText" matInput>
+              <mat-form-field floatLabel="never">
+                <input #search autocomplete="off" placeholder="Search" formControlName="providerText" matInput>
                 <button [disableRipple]="true" *ngIf="search.value" matSuffix mat-icon-button aria-label="Clear"
                   (click)="clearSearch($event)"><mat-icon>close</mat-icon></button>
               </mat-form-field>
             </mat-optgroup>
-            <mat-optgroup *ngIf="(providersList).length == 0">
+            <mat-optgroup *ngIf="filteredProviders.length == 0">
               <div>No results found!</div>
             </mat-optgroup>
-            <mat-option (onSelectionChange)="selectionChange($event, option)" *ngFor="let option of providersList"
+            <mat-option (onSelectionChange)="selectionChange($event, option)"
+              *ngFor="let option of filteredProviders | acsendingOrder:'asc':'name'"
               [value]="option.name">{{option.name}}
             </mat-option>
           </div>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.scss b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.scss
index 4402ac728..5bd1336c1 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.scss
@@ -66,4 +66,24 @@
 }
 .mat-button[disabled] {
   opacity: 0.6;
+}
+
+::ng-deep.mat-select-panel-wrap {
+    flex-basis: 92%;
+    margin-left: 5%;
+    margin-top: 5%;
+}
+
+::ng-deep.mat-select-panel .mat-optgroup-label {
+  margin-top: 10px;
+}
+
+::ng-deep.select-container .mat-form-field {
+  width: 100%;
+}
+
+::ng-deep.select-container .mat-form-field-infix {
+    padding: 0.4375em 0;
+    border-top: 1px solid transparent;
+    border-bottom: 1px solid rgba(0, 0, 0, 0.16) !important;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
index 230fe102a..da5cedee7 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
@@ -2,7 +2,6 @@ import { Component, Inject, OnInit } from '@angular/core'
 import { FormControl, FormGroup, Validators } from '@angular/forms'
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'
 import { TrainingPlanService } from '../../services/traininig-plan.service'
-import { map, startWith } from 'rxjs/operators'
 @Component({
   selector: 'ws-app-add-content-dialog',
   templateUrl: './add-content-dialog.component.html',
@@ -41,30 +40,19 @@ export class AddContentDialogComponent implements OnInit {
       providerText: new FormControl(''),
       contentdescription: new FormControl('', Validators.required),
     })
+    this.contentForm.markAsPristine()
   }
 
   ngOnInit() {
     this.getCompetencies()
     this.getProviders()
-    this.filteredProviders = this.contentForm.controls['providerText'].valueChanges
-      .pipe(
-        startWith<string>(''),
-        map((name: any) => this.filter(name))
-      )
-  }
-
-  filter(name: string): String[] {
-    const filterValue = name.toLowerCase()
-    // Set selected values to retain the selected checkbox state
-    this.setSelectedValues()
-    this.contentForm.controls['provider'].patchValue(this.selectedValues)
-    const filteredList = this.data.filter((option: any) => option.toLowerCase().indexOf(filterValue) === 0)
-    return filteredList
+    this.contentForm.controls['providerText'].valueChanges.subscribe((newValue: any) => {
+      this.filteredProviders = this.filterValues(newValue, this.providersList)
+    })
   }
 
   filterValues(searchValue: string, array: any) {
     return array.filter((value: any) =>
-      // value.name.toLowerCase().indexOf(searchValue.toLowerCase()) === 0)
       value.name.toLowerCase().includes(searchValue.toLowerCase()))
   }
 
@@ -92,6 +80,7 @@ export class AddContentDialogComponent implements OnInit {
       this.providersList.forEach((val: any) => {
         val.checked = false
       })
+      this.filteredProviders = this.providersList
     })
   }
 
@@ -259,6 +248,5 @@ export class AddContentDialogComponent implements OnInit {
         }
       })
     }
-
   }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
index a38348e39..7d76e476b 100644
--- a/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
+++ b/project/ws/app/src/lib/routes/training-plan/training-plan.module.ts
@@ -66,6 +66,7 @@ import { UpdatePlanResolveService } from './resolvers/update-plan-resolve.servic
 import { ResetDataSharingResolveService } from './resolvers/reset-data-sharing-resolve.service'
 import { PreviewDialogBoxComponent } from './components/preview-dialog-box/preview-dialog-box.component'
 import { AddContentDialogComponent } from './components/add-content-dialog/add-content-dialog.component'
+import { PipeAcsendingOrderModule } from '../pipes/pipe-ascendingorder/pipe-ascendingorder.module'
 @NgModule({
   declarations: [
     TrainingPlanHomeComponent,
@@ -140,6 +141,7 @@ import { AddContentDialogComponent } from './components/add-content-dialog/add-c
     DefaultThumbnailModule,
     FilterSearchPipeModule,
     MatAutocompleteModule,
+    PipeAcsendingOrderModule,
   ],
   entryComponents: [
     PreviewDialogBoxComponent,

From dc4822744ebe7faebd3a52bdbe9eaf77b58d9ee6 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Mon, 8 Jan 2024 16:19:16 +0530
Subject: [PATCH 448/887] Updated unselect theme flow condition

---
 .../add-content-dialog/add-content-dialog.component.ts    | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
index da5cedee7..07704e9c1 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
@@ -117,14 +117,10 @@ export class AddContentDialogComponent implements OnInit {
       })
     } else {
       this.seletedCompetencyTheme[index].selected = false
-      this.seletedCompetencyTheme.splice(index, 1)
 
       const id = this.seletedCompetencyTheme[index].id
-      this.allCompetencySubtheme.forEach((item: any, i: any) => {
-        if (item.compThemeID === id) {
-          this.allCompetencySubtheme.splice(i, 1)
-        }
-      })
+      this.seletedCompetencyTheme.splice(index, 1)
+      this.allCompetencySubtheme = this.allCompetencySubtheme.filter((item: any) => item.compThemeID !== id)
     }
   }
 

From a79dd5cf0335a3c4827e566ba13bb9480953a9c6 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Mon, 8 Jan 2024 17:40:29 +0530
Subject: [PATCH 449/887] bug fix for reopened bug

---
 .../add-timeline-form/add-timeline-form.component.html         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html
index 8be78e631..7e06cb552 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html
@@ -10,7 +10,8 @@
                 <input matInput #ref [matDatepicker]="picker" [min]="minDate" [(ngModel)]="todayDate"
                     (dateChange)="changeTimeline(ref.value)" disabled>
                 <mat-datepicker-toggle matSuffix [for]="picker">
-                    <!-- <mat-icon matDatepickerToggleIcon>calendar_today</mat-icon> -->
+                    <mat-icon matDatepickerToggleIcon *ngIf="todayDate">event</mat-icon>
+                    <mat-icon matDatepickerToggleIcon *ngIf="!todayDate">date_range</mat-icon>
                 </mat-datepicker-toggle>
                 <mat-datepicker #picker disabled="false"></mat-datepicker>
             </mat-form-field>

From 8b5ff558176f769132f02be9bd9aa076d51c628d Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Tue, 9 Jan 2024 14:52:59 +0530
Subject: [PATCH 450/887] bug fixes

---
 .../training-plan-dashboard.component.ts      |  6 ++---
 .../add-timeline-form.component.ts            | 23 ++++++++++++++++++-
 .../category-drop-down.component.ts           |  9 +++++---
 .../training-plan-home.component.ts           | 10 +++++++-
 .../training-plan-data-share.service.ts       |  1 +
 5 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
index a6a3420b9..35593ee1f 100644
--- a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
@@ -199,7 +199,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
       const compyData: any = []
       if (res.contentList && res.contentList.length > 0) {
         res.contentList.forEach((contentEle: any) => {
-          if (contentEle.competencies_v5 && contentEle.competencies_v5.length > 0) {
+          if (contentEle && contentEle.competencies_v5 && contentEle.competencies_v5.length > 0) {
             contentEle.competencies_v5.forEach((compeEle: any) => {
               compyData.push(compeEle.competencyArea)
             })
@@ -290,7 +290,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
       this.snackBar.open('CBP plan deleted successfully.')
       this.loaderService.changeLoaderState(false)
       this.tabNavigate(_selectedRow.status.toLowerCase(), _selectedRow.userType)
-    },                                                  _error => {
+    }, _error => {
       this.loaderService.changeLoaderState(false)
     })
   }
@@ -312,7 +312,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
         this.snackBar.open('Something went wrong while publishing CBP plan. Try again later')
         this.loaderService.changeLoaderState(false)
       }
-    },                                                  (_error: any) => {
+    }, (_error: any) => {
       this.snackBar.open('Something went wrong while publishing CBP plan. Try again later')
       this.loaderService.changeLoaderState(false)
     })
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
index c2a23cd88..c9b46b9c7 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
@@ -1,13 +1,34 @@
 import { Component, OnInit } from '@angular/core'
 import { DatePipe } from '@angular/common'
 import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
+import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE } from '@angular/material/core'
+import { MomentDateAdapter, MAT_MOMENT_DATE_ADAPTER_OPTIONS } from '@angular/material-moment-adapter'
+export const MY_FORMATS = {
+  parse: {
+    dateInput: 'LL',
+  },
+  display: {
+    dateInput: 'DD MMM, YYYY',
+    monthYearLabel: 'MMM YYYY',
+    dateA11yLabel: 'LL',
+    monthYearA11yLabel: 'MMM YYYY',
+  },
+}
 @Component({
   selector: 'ws-app-add-timeline-form',
   templateUrl: './add-timeline-form.component.html',
   styleUrls: ['./add-timeline-form.component.scss'],
-  providers: [DatePipe],
+  providers: [DatePipe,
+    {
+      provide: DateAdapter,
+      useClass: MomentDateAdapter,
+      deps: [MAT_DATE_LOCALE, MAT_MOMENT_DATE_ADAPTER_OPTIONS],
+    },
+    { provide: MAT_DATE_FORMATS, useValue: MY_FORMATS },],
 })
+
 export class AddTimelineFormComponent implements OnInit {
+
   minDate: Date = new Date()
   todayDate: Date = new Date()
   constructor(private tpdsSvc: TrainingPlanDataSharingService, private datePipe: DatePipe) { }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
index 2c886b9dc..4b7401862 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
@@ -178,7 +178,8 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['type'] = 'normal'
         dialogData['icon'] = 'radio_on'
         dialogData['title'] = 'You are attempting to change the selected user type?'
-        dialogData['subTitle'] = `By selecting all users, you've selected all the users from your Department of fisheries.;
+        dialogData['subTitle'] = `By selecting all users, you've selected all the users from your Department of
+         ${(this.tpdsSvc.currentUserDepartment) ? this.tpdsSvc.currentUserDepartment : ''}.
         If you want to select custom users or by designation, use the above option`
         dialogData['primaryAction'] = 'I understand, change user type'
         dialogData['secondaryAction'] = 'Cancel'
@@ -194,7 +195,8 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['type'] = 'normal'
         dialogData['icon'] = 'radio_on'
         dialogData['title'] = 'You are attempting to change the selected user type?'
-        dialogData['subTitle'] = `By selecting all users, you've selected all the users from your Department of fisheries.;
+        dialogData['subTitle'] = `By selecting all users, you've selected all the users from your Department of
+        ${(this.tpdsSvc.currentUserDepartment) ? this.tpdsSvc.currentUserDepartment : ''}.
         If you want to select custom users or by designation, use the above option`
         dialogData['primaryAction'] = 'I understand, change user type'
         dialogData['secondaryAction'] = 'Cancel'
@@ -211,7 +213,8 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         dialogData['type'] = 'normal'
         dialogData['icon'] = 'radio_on'
         dialogData['title'] = 'You are attempting to change the selected user type?'
-        dialogData['subTitle'] = `By selecting all users, you've selected all the users from your Department of fisheries.;
+        dialogData['subTitle'] = `By selecting all users, you've selected all the users from your Department of
+        ${(this.tpdsSvc.currentUserDepartment) ? this.tpdsSvc.currentUserDepartment : ''}.
         If you want to select custom users or by designation, use the above option`
         dialogData['primaryAction'] = 'I understand, change user type'
         dialogData['secondaryAction'] = 'Cancel'
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.ts
index 5511dbe86..12993b535 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/training-plan-home/training-plan-home.component.ts
@@ -4,6 +4,7 @@ import _ from 'lodash'
 /* tslint:enable */
 import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
 import { Subscription } from 'rxjs'
+import { ActivatedRoute } from '@angular/router'
 @Component({
   selector: 'ws-app-training-plan-home',
   templateUrl: './training-plan-home.component.html',
@@ -15,11 +16,18 @@ import { Subscription } from 'rxjs'
 export class TrainingPlanHomeComponent implements OnInit, AfterViewInit, OnDestroy {
   showModeratedNotification = false
   private subscr: Subscription = new Subscription()
-  constructor(private tpdsSvc: TrainingPlanDataSharingService
+  configSvc: any
+  constructor(
+    private tpdsSvc: TrainingPlanDataSharingService,
+    private activeRoute: ActivatedRoute,
   ) {
 
   }
   ngOnInit() {
+    this.configSvc = this.activeRoute.snapshot.data['configService']
+    this.tpdsSvc.currentUserDepartment = (this.configSvc &&
+      this.configSvc.userProfileV2 &&
+      this.configSvc.userProfileV2.departmentName) ? this.configSvc.userProfileV2.departmentName : ''
     this.subscr = this.subscr.add(this.tpdsSvc.moderatedCourseSelectStatus.subscribe(status => {
       if (status) {
         this.showModeratedNotification = true
diff --git a/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts b/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
index 4183d75a8..9b98b8c29 100644
--- a/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
+++ b/project/ws/app/src/lib/routes/training-plan/services/training-plan-data-share.service.ts
@@ -15,6 +15,7 @@ export class TrainingPlanDataSharingService {
   trainingPlanContentData: any
   trainingPlanAssigneeData: any
   selectedTabType: any = ''
+  currentUserDepartment = ''
   trainingPlanStepperData: any = {
     name: '',
     contentType: '',

From 84a39151819518b90dec19de3070304227fd7f50 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Tue, 9 Jan 2024 19:03:13 +0530
Subject: [PATCH 451/887] update for issue 1845

---
 .../components/filter/filter.component.html    |  2 +-
 .../components/filter/filter.component.ts      | 18 +++++++++++++++++-
 .../standard-card/standard-card.component.ts   |  2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
index f30ae4c09..18c1b9a44 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.html
@@ -119,7 +119,7 @@
                             </mat-panel-title>
                         </mat-expansion-panel-header>
                         <div class="flex flex-1 flex-row category-item" *ngFor="let group of groupList">
-                            <mat-checkbox #checkboxes disableRipple class="example-margin"
+                            <mat-checkbox #checkboxes disableRipple class="example-margin" [checked]="group?.selected"
                                 (change)="manageSelectedGroup($event, group)">{{group?.name | titlecase}}</mat-checkbox>
                         </div>
                     </mat-expansion-panel>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index 531a2162b..f20739040 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -20,7 +20,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
     { id: 'Functional', name: 'Functional' },
     { id: 'Domain', name: 'Domain' },
   ]
-  groupList = [
+  groupList:any = [
     { id: 'groupA', name: 'Group A' },
     { id: 'groupB', name: 'Group B' },
     { id: 'groupC', name: 'Group C' },
@@ -326,6 +326,14 @@ export class FilterComponent implements OnInit, AfterContentChecked {
 
   manageSelectedGroup(event: any, group: any) {
     if (event.checked) {
+      this.groupList.map((grp:any, index:any)=>{
+        if(grp && grp.name === group.name) {
+          this.groupList[index]['selected'] = true;
+        }
+      })
+      if(group) {
+        group['selected'] = true;
+      }
       this.assigneeFilterObj['group'].push(group.name)
     } else {
       if (this.assigneeFilterObj['group'] &&
@@ -333,6 +341,14 @@ export class FilterComponent implements OnInit, AfterContentChecked {
         const index = this.assigneeFilterObj['group'].findIndex((x: any) => x === group.name)
         this.assigneeFilterObj['group'].splice(index, 1)
       }
+      this.groupList.map((grp:any, index:any)=>{
+        if(grp && grp.name === group.name) {
+          this.groupList[index]['selected'] = false;
+        }
+      })
+      if(group) {
+        group['selected'] = false;
+      }
     }
   }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
index 01398fc1b..97a63467e 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
@@ -17,7 +17,7 @@ export class StandardCardComponent implements OnInit, OnChanges {
   @Input() count = 0
   @Output() handleSelectedChips = new EventEmitter()
   @Output() selectedContentRemoved = new EventEmitter<any>()
-  @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator | any
+  @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | any
   dataSource: any
   selectedContent: any[] = []
   startIndex = 0

From ccb504f678d5fa2406dc585fc811314dc15b0566 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Tue, 9 Jan 2024 21:06:51 +0530
Subject: [PATCH 452/887] fix lint errors

---
 .../training-plan-dashboard.component.ts      |  4 ++--
 .../add-content-dialog.component.ts           |  6 ++---
 .../add-timeline-form.component.ts            |  3 ++-
 .../components/filter/filter.component.ts     | 22 +++++++++----------
 .../standard-card.component.html              |  4 ++--
 .../user-card/user-card.component.ts          |  2 +-
 6 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
index 35593ee1f..ce2e94c3a 100644
--- a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
@@ -290,7 +290,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
       this.snackBar.open('CBP plan deleted successfully.')
       this.loaderService.changeLoaderState(false)
       this.tabNavigate(_selectedRow.status.toLowerCase(), _selectedRow.userType)
-    }, _error => {
+    },                                                  _error => {
       this.loaderService.changeLoaderState(false)
     })
   }
@@ -312,7 +312,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
         this.snackBar.open('Something went wrong while publishing CBP plan. Try again later')
         this.loaderService.changeLoaderState(false)
       }
-    }, (_error: any) => {
+    },                                                  (_error: any) => {
       this.snackBar.open('Something went wrong while publishing CBP plan. Try again later')
       this.loaderService.changeLoaderState(false)
     })
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
index 07704e9c1..6b73987af 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
@@ -201,7 +201,7 @@ export class AddContentDialogComponent implements OnInit {
       id: this.seletedCompetencyArea.id,
       type: this.seletedCompetencyArea.type,
       name: this.seletedCompetencyArea.name,
-      children: []
+      children: [],
     }
     const compTheme: any[] = []
     this.seletedCompetencyTheme.forEach((item: any) => {
@@ -209,7 +209,7 @@ export class AddContentDialogComponent implements OnInit {
         id: item.id,
         type: item.type,
         name: item.name,
-        children: []
+        children: [],
       }
       compTheme.push(obj)
     })
@@ -234,7 +234,7 @@ export class AddContentDialogComponent implements OnInit {
           competency: this.competencyObj,
           providerList: providersIds,
           description: this.contentForm.value.contentdescription || '',
-        }
+        },
       }
       this.trainingplanSvc.createNewContentrequest(req).subscribe((response: any) => {
         if (response) {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
index c9b46b9c7..fe85a9a27 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
@@ -24,7 +24,8 @@ export const MY_FORMATS = {
       useClass: MomentDateAdapter,
       deps: [MAT_DATE_LOCALE, MAT_MOMENT_DATE_ADAPTER_OPTIONS],
     },
-    { provide: MAT_DATE_FORMATS, useValue: MY_FORMATS },],
+    { provide: MAT_DATE_FORMATS, useValue: MY_FORMATS },
+  ],
 })
 
 export class AddTimelineFormComponent implements OnInit {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index f20739040..6ee30c86d 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -20,7 +20,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
     { id: 'Functional', name: 'Functional' },
     { id: 'Domain', name: 'Domain' },
   ]
-  groupList:any = [
+  groupList: any = [
     { id: 'groupA', name: 'Group A' },
     { id: 'groupB', name: 'Group B' },
     { id: 'groupC', name: 'Group C' },
@@ -326,13 +326,13 @@ export class FilterComponent implements OnInit, AfterContentChecked {
 
   manageSelectedGroup(event: any, group: any) {
     if (event.checked) {
-      this.groupList.map((grp:any, index:any)=>{
-        if(grp && grp.name === group.name) {
-          this.groupList[index]['selected'] = true;
+      this.groupList.map((grp: any, index: any) => {
+        if (grp && grp.name === group.name) {
+          this.groupList[index]['selected'] = true
         }
       })
-      if(group) {
-        group['selected'] = true;
+      if (group) {
+        group['selected'] = true
       }
       this.assigneeFilterObj['group'].push(group.name)
     } else {
@@ -341,13 +341,13 @@ export class FilterComponent implements OnInit, AfterContentChecked {
         const index = this.assigneeFilterObj['group'].findIndex((x: any) => x === group.name)
         this.assigneeFilterObj['group'].splice(index, 1)
       }
-      this.groupList.map((grp:any, index:any)=>{
-        if(grp && grp.name === group.name) {
-          this.groupList[index]['selected'] = false;
+      this.groupList.map((grp: any, index: any) => {
+        if (grp && grp.name === group.name) {
+          this.groupList[index]['selected'] = false
         }
       })
-      if(group) {
-        group['selected'] = false;
+      if (group) {
+        group['selected'] = false
       }
     }
   }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
index 457da114c..280c96009 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
@@ -80,8 +80,8 @@
         </div>
 
     </div>
-    <div class="flex flex-row justify-center" *ngIf="showPagination">
+    <div class="flex flex-row justify-center" [hidden]="!contentData.length">
         <mat-paginator [pageSize]="pageSize" [length]="count" [pageSizeOptions]="[20,30,40]"
-            (page)="onChangePage($event)"></mat-paginator>
+            (page)="pageEvent = onChangePage($event)" showFirstLastButtons="false"></mat-paginator>
     </div>
 </ng-container>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
index 729b80142..d59368996 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
@@ -27,9 +27,9 @@ export class UserCardComponent implements OnInit, OnChanges {
   }
 
   ngOnChanges() {
-    this.changeDetectorRef.detectChanges()
     this.dataSource = new MatTableDataSource<any>(this.assigneeData.data)
     this.dataSource.paginator = this.paginator
+    this.changeDetectorRef.detectChanges()
   }
 
   onChangePage(pe: PageEvent) {

From 63aaf0dfe7789b64fb8ce459ac2bbf780c7455c9 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Tue, 9 Jan 2024 21:09:43 +0530
Subject: [PATCH 453/887] fix lint errors

---
 .../components/standard-card/standard-card.component.html     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
index 280c96009..457da114c 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.html
@@ -80,8 +80,8 @@
         </div>
 
     </div>
-    <div class="flex flex-row justify-center" [hidden]="!contentData.length">
+    <div class="flex flex-row justify-center" *ngIf="showPagination">
         <mat-paginator [pageSize]="pageSize" [length]="count" [pageSizeOptions]="[20,30,40]"
-            (page)="pageEvent = onChangePage($event)" showFirstLastButtons="false"></mat-paginator>
+            (page)="onChangePage($event)"></mat-paginator>
     </div>
 </ng-container>
\ No newline at end of file

From 8a487f0bba4e8bd7f79e4cc0bb404860f7033828 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Tue, 9 Jan 2024 21:10:46 +0530
Subject: [PATCH 454/887] fix lint errors

---
 .../training-plan/components/user-card/user-card.component.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
index d59368996..5f4b14482 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
@@ -27,9 +27,9 @@ export class UserCardComponent implements OnInit, OnChanges {
   }
 
   ngOnChanges() {
-    this.dataSource = new MatTableDataSource<any>(this.assigneeData.data)
-    this.dataSource.paginator = this.paginator
     this.changeDetectorRef.detectChanges()
+    this.dataSource = new MatTableDataSource<any>(this.assigneeData.data)
+    this.dataSource.paginator = this.paginator    
   }
 
   onChangePage(pe: PageEvent) {

From 63e7f530c04b39e59970e5409b4380717e80b64a Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Wed, 10 Jan 2024 10:16:16 +0530
Subject: [PATCH 455/887] updated the collection version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f5cc35a71..ebede0c1b 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@angular/router": "~8.2.1",
     "@angular/service-worker": "~8.2.1",
     "@project-sunbird/telemetry-sdk": "0.0.26",
-    "@sunbird-cb/collection": "^1.0.41",
+    "@sunbird-cb/collection": "^1.0.42",
     "@sunbird-cb/design-system": "0.0.1",
     "@sunbird-cb/rain-dashboards": "0.4.22-rc.1",
     "@sunbird-cb/resolver": "^1.0.0",

From f8d3f9f78dc83364cbdb2a4c8341153818861396 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Wed, 10 Jan 2024 11:17:12 +0530
Subject: [PATCH 456/887] ug fix 1961

---
 .../routes/preview-plan/preview-plan.component.html           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
index 5d80bde3a..9bbb21177 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.html
@@ -8,7 +8,7 @@
             {{contentList?.length}} )</span></div>
     <div class="flex flex-row justify-center max-height-400">
         <ws-app-standard-card [checkboxVisibility]="false" [contentData]="contentList" [showDeleteFlag]="true"
-            [showPagination]="(contentList?.length > 20) ? true : false">
+            [showPagination]="false">
         </ws-app-standard-card>
     </div>
     <div class="no-cbp-data margin-top-xl margin-bottom-xl text-center"
@@ -24,7 +24,7 @@
     </div>
     <div class="mt-4 flex flex-row justify-center max-height-400" *ngIf="assigneeData?.data?.length">
         <ws-app-user-card [checkboxVisibility]="false" [assigneeData]="assigneeData" [showDeleteFlag]="true"
-            [showPagination]="(assigneeData?.data?.length > 20) ? true : false">
+            [showPagination]="false">
         </ws-app-user-card>
     </div>
     <div class="no-cbp-data margin-top-xl margin-bottom-xl text-center" *ngIf="!assigneeData?.data?.length">

From 5a721a042acd1bd7cd3ffbe468bfa08325b1c1c6 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Wed, 10 Jan 2024 12:46:44 +0530
Subject: [PATCH 457/887] update for group filter

---
 .../routes/training-plan/components/filter/filter.component.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index 6ee30c86d..52ba89b13 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -25,7 +25,8 @@ export class FilterComponent implements OnInit, AfterContentChecked {
     { id: 'groupB', name: 'Group B' },
     { id: 'groupC', name: 'Group C' },
     { id: 'groupD', name: 'Group D' },
-    { id: 'groupE', name: 'Group E' },
+    { id: 'contractualStaff', name: 'Contractual Staff' },
+    { id: 'Others', name: 'Others' },
   ]
   competencyList: any = []
   competencyThemeList: any[] = []

From 21e380dbb60a8d36aa04d5824e1b531d056bace8 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Wed, 10 Jan 2024 12:48:52 +0530
Subject: [PATCH 458/887] update for group filter

---
 .../routes/training-plan/components/filter/filter.component.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index 52ba89b13..0f8070752 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -26,7 +26,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
     { id: 'groupC', name: 'Group C' },
     { id: 'groupD', name: 'Group D' },
     { id: 'contractualStaff', name: 'Contractual Staff' },
-    { id: 'Others', name: 'Others' },
+    { id: 'others', name: 'Others' },
   ]
   competencyList: any = []
   competencyThemeList: any[] = []

From 2562812659a004835d3cf06a4752dc26922bede9 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Wed, 10 Jan 2024 13:13:37 +0530
Subject: [PATCH 459/887] package update

---
 package.json                                                    | 2 +-
 .../training-plan/components/user-card/user-card.component.ts   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index ebede0c1b..6a3f76491 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@angular/router": "~8.2.1",
     "@angular/service-worker": "~8.2.1",
     "@project-sunbird/telemetry-sdk": "0.0.26",
-    "@sunbird-cb/collection": "^1.0.42",
+    "@sunbird-cb/collection": "^1.0.43",
     "@sunbird-cb/design-system": "0.0.1",
     "@sunbird-cb/rain-dashboards": "0.4.22-rc.1",
     "@sunbird-cb/resolver": "^1.0.0",
diff --git a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
index 5f4b14482..729b80142 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/user-card/user-card.component.ts
@@ -29,7 +29,7 @@ export class UserCardComponent implements OnInit, OnChanges {
   ngOnChanges() {
     this.changeDetectorRef.detectChanges()
     this.dataSource = new MatTableDataSource<any>(this.assigneeData.data)
-    this.dataSource.paginator = this.paginator    
+    this.dataSource.paginator = this.paginator
   }
 
   onChangePage(pe: PageEvent) {

From 92fc9963e78fa335f117e6cbd7fc1a89a2512ce1 Mon Sep 17 00:00:00 2001
From: Bharath Kumar <bharathkumar@TI-MAC-087.local>
Date: Wed, 10 Jan 2024 13:48:07 +0530
Subject: [PATCH 460/887] changes in rain dashboard version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6a3f76491..d0ded538c 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "@project-sunbird/telemetry-sdk": "0.0.26",
     "@sunbird-cb/collection": "^1.0.43",
     "@sunbird-cb/design-system": "0.0.1",
-    "@sunbird-cb/rain-dashboards": "0.4.22-rc.1",
+    "@sunbird-cb/rain-dashboards": "0.4.33",
     "@sunbird-cb/resolver": "^1.0.0",
     "@sunbird-cb/utils": "^1.0.15",
     "@types/file-saver": "^2.0.1",

From c437b53653e1a33e902bdc58b2a433f5becda6d3 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Wed, 10 Jan 2024 17:18:50 +0530
Subject: [PATCH 461/887] updated the conformation message

---
 .../training-plan-dashboard.component.ts      | 10 +++++-----
 .../breadcrumb/breadcrumb.component.ts        | 20 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
index ce2e94c3a..649495bc9 100644
--- a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
@@ -258,10 +258,10 @@ export class TrainingPlanDashboardComponent implements OnInit {
       data: {
         type: 'conformation',
         icon: 'radio_on',
-        title: (_type === 'deleteContent') ? 'Are you sure you want to delete?' :
-          (_type === 'publishContent') ? 'Are you sure you want to publish?' : '',
+        title: (_type === 'deleteContent') ? 'Are you sure you want to delete the plan?' :
+          (_type === 'publishContent') ? 'Are you sure you want to publish the plan?' : '',
         subTitle: 'You wont be able to revert this',
-        primaryAction: (_type === 'deleteContent') ? 'Delete' : (_type === 'publishContent') ? 'Publish' : '',
+        primaryAction: 'Confirm',
         secondaryAction: 'Cancel',
       },
       autoFocus: false,
@@ -290,7 +290,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
       this.snackBar.open('CBP plan deleted successfully.')
       this.loaderService.changeLoaderState(false)
       this.tabNavigate(_selectedRow.status.toLowerCase(), _selectedRow.userType)
-    },                                                  _error => {
+    }, _error => {
       this.loaderService.changeLoaderState(false)
     })
   }
@@ -312,7 +312,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
         this.snackBar.open('Something went wrong while publishing CBP plan. Try again later')
         this.loaderService.changeLoaderState(false)
       }
-    },                                                  (_error: any) => {
+    }, (_error: any) => {
       this.snackBar.open('Something went wrong while publishing CBP plan. Try again later')
       this.loaderService.changeLoaderState(false)
     })
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
index 115abb2e2..6ebfcca55 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
@@ -150,7 +150,7 @@ export class BreadcrumbComponent implements OnInit {
             tabSelected: this.tpdsSvc.trainingPlanStepperData.assignmentType,
           },
         })
-      },         1000)
+      }, 1000)
     })
   }
 
@@ -197,7 +197,7 @@ export class BreadcrumbComponent implements OnInit {
               tabSelected: this.tpdsSvc.trainingPlanStepperData.assignmentType,
             },
           })
-        },         1000)
+        }, 1000)
       }
     })
   }
@@ -221,12 +221,12 @@ export class BreadcrumbComponent implements OnInit {
               tabSelected: this.tpdsSvc.trainingPlanStepperData.assignmentType,
             },
           })
-        },         1000)
+        }, 1000)
       } else {
         this.snackBar.open('Something went wrong while publishing CBP plan. Try again later')
         this.dialogRef.close()
       }
-    },                                    (_error: any) => {
+    }, (_error: any) => {
       this.snackBar.open('Something went wrong while publishing CBP plan. Try again later')
       this.dialogRef.close()
     })
@@ -250,9 +250,9 @@ export class BreadcrumbComponent implements OnInit {
           data: {
             type: 'conformation',
             icon: 'radio_on',
-            title: 'Are you sure you want to save as draft?',
+            title: 'Are you sure you want to save the plan?',
             // subTitle: 'You wont be able to revert this',
-            primaryAction: 'Save',
+            primaryAction: 'Confirm',
             secondaryAction: 'Cancel',
           },
           autoFocus: false,
@@ -264,9 +264,9 @@ export class BreadcrumbComponent implements OnInit {
           data: {
             type: 'conformation',
             icon: 'radio_on',
-            title: 'Are you sure you want to update the content?',
+            title: 'Are you sure you want to update the plan?',
             // subTitle: 'You wont be able to revert this',
-            primaryAction: 'Update',
+            primaryAction: 'Confirm',
             secondaryAction: 'Cancel',
           },
           autoFocus: false,
@@ -278,9 +278,9 @@ export class BreadcrumbComponent implements OnInit {
           data: {
             type: 'conformation',
             icon: 'radio_on',
-            title: 'Are you sure you want to update and publish the content?',
+            title: 'Are you sure you want to update and publish the plan?',
             // subTitle: 'You wont be able to revert this',
-            primaryAction: 'Update and publish',
+            primaryAction: 'Confirm',
             secondaryAction: 'Cancel',
           },
           autoFocus: false,

From e6c0c9a7f45622ee7cbcb9ac8c7f4c84e134cdb3 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Thu, 11 Jan 2024 11:36:38 +0530
Subject: [PATCH 462/887] date and reopen ug fix

---
 .../add-timeline-form/add-timeline-form.component.ts          | 4 +---
 .../routes/create-assignee/create-assignee.component.html     | 3 ++-
 .../routes/create-content/create-content.component.scss       | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
index fe85a9a27..388cee53d 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.ts
@@ -31,14 +31,12 @@ export const MY_FORMATS = {
 export class AddTimelineFormComponent implements OnInit {
 
   minDate: Date = new Date()
-  todayDate: Date = new Date()
+  todayDate: any
   constructor(private tpdsSvc: TrainingPlanDataSharingService, private datePipe: DatePipe) { }
 
   ngOnInit() {
     if (this.tpdsSvc.trainingPlanStepperData['endDate']) {
       this.todayDate = new Date(this.tpdsSvc.trainingPlanStepperData['endDate'])
-    } else {
-      this.tpdsSvc.trainingPlanStepperData['endDate'] = this.datePipe.transform(this.todayDate, 'yyyy-MM-dd')
     }
   }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
index cb93fc70a..723adc09f 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
@@ -28,7 +28,8 @@
     <div class="no-cbp-data margin-top-xl margin-bottom-xl">
         <div><img src="/assets/images/no-content-data.svg"></div>
         <div class="mat-subheading-1 margin-remove">It will assign to all users</div>
-        <div>By selecting all users, you've selected all the users from your Department of fisheries.</div>
+        <div>By selecting all users, you've selected all the users from your Department of
+            {{tpdsSvc.currentUserDepartment}}.</div>
         <div class="margin-top-m">
             <button mat-button type="button" class="create-btn" (click)="changeTab()">
                 Next: Add timeline
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.scss b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.scss
index 8ea59d1c4..3074d44e6 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.scss
@@ -4,7 +4,7 @@
   text-align: center;
 
   img {
-    width: auto;
+    width: 320px;
   }
 
   .small-text {

From ef887b4e1f3f77b64a3f1159d1192ccc3043bd96 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Thu, 11 Jan 2024 11:45:40 +0530
Subject: [PATCH 463/887] bug fixes

---
 .../add-timeline-form/add-timeline-form.component.html          | 2 +-
 .../routes/create-assignee/create-assignee.component.html       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html
index 7e06cb552..78ff08769 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html
@@ -8,7 +8,7 @@
             <mat-form-field appearance="outline">
                 <mat-label>Select date</mat-label>
                 <input matInput #ref [matDatepicker]="picker" [min]="minDate" [(ngModel)]="todayDate"
-                    (dateChange)="changeTimeline(ref.value)" disabled>
+                    (dateChange)="changeTimeline(ref.value)" readonly>
                 <mat-datepicker-toggle matSuffix [for]="picker">
                     <mat-icon matDatepickerToggleIcon *ngIf="todayDate">event</mat-icon>
                     <mat-icon matDatepickerToggleIcon *ngIf="!todayDate">date_range</mat-icon>
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
index 723adc09f..b037ae7fa 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-assignee/create-assignee.component.html
@@ -19,7 +19,7 @@
     (assigneeData?.category === 'CustomUser' && assigneeData?.data?.length === 0)">
     <div class="no-cbp-data margin-top-xl margin-bottom-xl">
         <div><img src="/assets/images/no-content-data.svg"></div>
-        <div class="mat-subheading-1 margin-remove">No assignee avaliable.</div>
+        <div class="mat-subheading-1 margin-remove">No assignee available.</div>
         <!-- <div>Create a content in CBP portal to get the contents.</div> -->
     </div>
 </ng-container>

From 828eec00e76e3ed8c57ec71cf134a9a2fc0d79de Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Thu, 11 Jan 2024 12:14:24 +0530
Subject: [PATCH 464/887] update for issue 2007, 1908

---
 .../components/breadcrumb/breadcrumb.component.html          | 2 +-
 .../category-drop-down/category-drop-down.component.scss     | 5 +++++
 .../routes/preview-plan/preview-plan.component.ts            | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
index 089b21e6f..5eac09955 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.html
@@ -15,7 +15,7 @@
         </div> -->
         <div class="action title-txt-ellipsis" *ngIf="tpdsSvc?.trainingPlanTitle &&
         selectedTab !== tabType.CREATE_PLAN && !validationList?.titleIsInvalid">
-            {{tpdsSvc?.trainingPlanTitle | titlecase}}
+            {{tpdsSvc?.trainingPlanTitle}}
         </div>
     </div>
     <div class="flex flex-1 flex-row right-breadcrumb" *ngIf="showBreadcrumbAction">
diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.scss b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.scss
index 9f3100b25..9fa9f5af5 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.scss
@@ -21,9 +21,14 @@
 
 .category-box ::ng-deep .mat-form-field-appearance-outline .mat-form-field-infix .mat-select-arrow-wrapper {
     vertical-align: inherit !important;
+    transform: translateY(2%) !important;
 }
 
 .category-box  ::ng-deep .mat-form-field-flex {
     min-height: 48px;
     border-radius: 4px;
+}
+
+.category-box ::ng-deep.mat-form-field.mat-focused.mat-primary .mat-select-arrow {
+  color: rgba(0, 0, 0, 0.54) !important;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
index a1dbe5e5d..1524e0da3 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
@@ -76,7 +76,7 @@ export class PreviewPlanComponent implements OnInit {
           count: this.contentList.length,
         })
         arr.push({
-          name: contentData.assignmentType,
+          name: contentData.assignmentType && contentData.assignmentType.toLowerCase() === 'customuser' ? 'Custom User': contentData.assignmentType,
           tab: 'assignee',
           selected: (this.tab === 'assignee' ? true : false),
           count: this.assigneeData.data ? this.assigneeData.data.length : 0,

From 3248361627757fdf7c343f57eab43ccd35370f13 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Thu, 11 Jan 2024 12:15:24 +0530
Subject: [PATCH 465/887] bug fix

---
 .../training-plan-dashboard.component.ts              |  1 +
 .../components/search/search.component.ts             | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
index 649495bc9..020d97268 100644
--- a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
@@ -289,6 +289,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
     this.trainingPlanService.archivePlan(obj).subscribe((_data: any) => {
       this.snackBar.open('CBP plan deleted successfully.')
       this.loaderService.changeLoaderState(false)
+      this.filter(this.currentFilter)
       this.tabNavigate(_selectedRow.status.toLowerCase(), _selectedRow.userType)
     }, _error => {
       this.loaderService.changeLoaderState(false)
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 180886d27..49dbb15e1 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -199,7 +199,16 @@ export class SearchComponent implements OnInit {
       },
     }
     this.trainingPlanService.getCustomUsers(filterObj).subscribe((res: any) => {
-      this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: res.content }
+      if (this.tpdsSvc.trainingPlanAssigneeData.data) {
+        const finArr = this.tpdsSvc.trainingPlanAssigneeData.data.filter((sitem: any) => {
+          if (sitem && sitem.selected) {
+            return sitem
+          }
+        })
+        this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: _.uniqBy(_.concat(finArr, res.content), 'userId') }
+      } else {
+        this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: res.content }
+      }
       this.handleApiData.emit(true)
       this.loadingService.changeLoaderState(false)
     }, (_error: any) => {

From 5cdb2d7bd6ca68c1e1286e90ce1e7fb238283974 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Thu, 11 Jan 2024 12:29:17 +0530
Subject: [PATCH 466/887] bug fix

---
 .../approvals/routes/position/position.component.html       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/approvals/routes/position/position.component.html b/project/ws/app/src/lib/routes/approvals/routes/position/position.component.html
index 5f2d32bdc..d58d2184c 100644
--- a/project/ws/app/src/lib/routes/approvals/routes/position/position.component.html
+++ b/project/ws/app/src/lib/routes/approvals/routes/position/position.component.html
@@ -23,7 +23,7 @@
                 <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                   <label class="appr-text-label">MDO</label>
                   <input type="text" [disabled]="true" class="appr-text-field"
-                    [value]="employmentDetails.departmentName">
+                    [value]="employmentDetails?.departmentName">
                 </mat-grid-tile>
                 <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                   <label class="appr-text-label">Industry</label>
@@ -32,8 +32,8 @@
                 </mat-grid-tile>
                 <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                   <label class="appr-text-label">Group</label>
-                  <input type="text" [disabled]="true" [value]="professionalDetails.group ? professionalDetails.group : ''"
-                    class="appr-text-field">
+                  <input type="text" [disabled]="true"
+                    [value]="professionalDetails.group ? professionalDetails.group : ''" class="appr-text-field">
                 </mat-grid-tile>
                 <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                   <label class="appr-text-label">Designation</label>

From daf85714d93c2a62ac082ba0dbfb700524b33b6b Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Thu, 11 Jan 2024 13:18:41 +0530
Subject: [PATCH 467/887] bug fix

---
 .../training-plan/routes/create-plan/create-plan.component.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
index a3d81de18..681b94384 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
@@ -34,7 +34,7 @@ export class CreatePlanComponent implements OnInit, OnDestroy {
       this.tpdsSvc.trainingPlanTitle = contentData.name
       // this.tpdsSvc.trainingPlanContentData = { data: { content: contentData.contentList } }
       if (contentData.assignmentType === 'CustomUser') {
-        this.tpdsSvc.trainingPlanAssigneeData = { data: { content: contentData.userDetails } }
+        this.tpdsSvc.trainingPlanAssigneeData = { data: contentData.userDetails }
         const arr: any = []
         contentData.userDetails.map((sitem: any) => {
           if (sitem && sitem.userId) {

From 76d933443065fa732685bbe2d45c3ca52c5a3999 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Thu, 11 Jan 2024 13:23:47 +0530
Subject: [PATCH 468/887] bug fix

---
 .../components/stepper/stepper.component.ts   | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
index 36a930a93..b24092e73 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
@@ -23,7 +23,7 @@ export class StepperComponent implements OnInit, OnChanges, AfterViewInit {
   editState = false
   isContentLive = false
   constructor(private route: ActivatedRoute,
-              private tpdsSvc: TrainingPlanDataSharingService
+    private tpdsSvc: TrainingPlanDataSharingService
   ) { }
 
   ngOnInit() {
@@ -34,9 +34,15 @@ export class StepperComponent implements OnInit, OnChanges, AfterViewInit {
   }
 
   ngAfterViewInit() {
-    this.addCotnentDisable = true
-    this.addAssigneeDisable = true
-    this.addTimelineDisable = true
+    if (!this.editState) {
+      this.addCotnentDisable = true
+      this.addAssigneeDisable = true
+      this.addTimelineDisable = true
+    } else {
+      this.addCotnentDisable = false
+      this.addAssigneeDisable = false
+      this.addTimelineDisable = false
+    }
   }
 
   ngOnChanges() {
@@ -68,28 +74,28 @@ export class StepperComponent implements OnInit, OnChanges, AfterViewInit {
     setTimeout(() => {
       this.addCotnentDisable = _event
       this.titleInvalid.emit(_event)
-    },         0)
+    }, 0)
   }
 
   checkForaddContent(_event: any) {
     setTimeout(() => {
       this.addAssigneeDisable = _event
       this.addContentIsInvalid.emit(_event)
-    },         0)
+    }, 0)
   }
 
   checkForaddAssignee(_event: any) {
     setTimeout(() => {
       this.addTimelineDisable = _event
       this.addAssigneeIsInvalid.emit(_event)
-    },         0)
+    }, 0)
   }
 
   tabChangeToTimeline(_event: any) {
     setTimeout(() => {
       this.addTimelineDisable = _event
       this.addAssigneeIsInvalid.emit(_event)
-    },         0)
+    }, 0)
     this.tabIndexValue = 3
   }
 }

From d74171fb4ac7a2a6af4d5ab1890b5d0b53c0573e Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Thu, 11 Jan 2024 13:29:33 +0530
Subject: [PATCH 469/887] bug fix

---
 .../training-plan-dashboard.component.html                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html
index 5f1eb7094..99aad8367 100644
--- a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.html
@@ -1,6 +1,6 @@
 <div class="flex flex-4 flex-column">
   <mat-card>
-    <div class="flex flex-between mat-h2 margin-remove">Training plan
+    <div class="flex flex-between mat-h2 margin-remove">Training Plan
       <button mat-button type="button" class="create-cbp-btn" (click)="createCbp()">Create
         CBP</button>
     </div>

From ad4b230964e86cbfefcbd1e41befe85ba8ce5a0a Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Thu, 11 Jan 2024 13:32:28 +0530
Subject: [PATCH 470/887] bug fix

---
 .../components/stepper/stepper.component.ts          | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
index b24092e73..2ddd3b4d0 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
@@ -34,15 +34,9 @@ export class StepperComponent implements OnInit, OnChanges, AfterViewInit {
   }
 
   ngAfterViewInit() {
-    if (!this.editState) {
-      this.addCotnentDisable = true
-      this.addAssigneeDisable = true
-      this.addTimelineDisable = true
-    } else {
-      this.addCotnentDisable = false
-      this.addAssigneeDisable = false
-      this.addTimelineDisable = false
-    }
+    this.addCotnentDisable = true
+    this.addAssigneeDisable = true
+    this.addTimelineDisable = true
   }
 
   ngOnChanges() {

From ead037fd95f56e84d3a54bac3a04496e4c95adf2 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Thu, 11 Jan 2024 15:15:39 +0530
Subject: [PATCH 471/887] update for issue 2007, 1908

---
 .../training-plan/components/search/search.component.ts  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 49dbb15e1..38aea8d72 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -199,7 +199,14 @@ export class SearchComponent implements OnInit {
       },
     }
     this.trainingPlanService.getCustomUsers(filterObj).subscribe((res: any) => {
-      if (this.tpdsSvc.trainingPlanAssigneeData.data) {
+      if (this.tpdsSvc.trainingPlanAssigneeData.data && this.tpdsSvc.trainingPlanAssigneeData.data && this.tpdsSvc.trainingPlanAssigneeData.data.content) {
+        const finArr = this.tpdsSvc.trainingPlanAssigneeData.data.content.filter((sitem: any) => {
+          if (sitem && sitem.selected) {
+            return sitem
+          }
+        })
+        this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: _.uniqBy(_.concat(finArr, res.content), 'userId') }
+      } else if (this.tpdsSvc.trainingPlanAssigneeData.data && this.tpdsSvc.trainingPlanAssigneeData.data) {
         const finArr = this.tpdsSvc.trainingPlanAssigneeData.data.filter((sitem: any) => {
           if (sitem && sitem.selected) {
             return sitem

From a476e3ebc65025656efc009c345a6713bd757618 Mon Sep 17 00:00:00 2001
From: Bharath Kumar <bharathkumar@TI-MAC-087.local>
Date: Thu, 11 Jan 2024 15:41:17 +0530
Subject: [PATCH 472/887] addedd the values in the update function

---
 .../lib/routes/users/routes/view-user/view-user.component.ts  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
index 7c16dda85..1781b65cd 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
@@ -441,6 +441,10 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
               professionalDetails: [
                 {
                   designation: this.updateProfessionalForm.controls['designation'].value,
+                  ...(this.professionalDetails.group ? { group: this.professionalDetails.group } : null),
+                  ...(this.professionalDetails.description ? { description: this.professionalDetails.description } : null),
+                  ...(this.professionalDetails.location ? { location: this.professionalDetails.location } : null),
+                  ...(this.professionalDetails.industry ? { industry: this.professionalDetails.industry } : null),
                 },
               ],
               additionalProperties: {

From 397287b1b2cfd985d88e435fd32eae3a46b71124 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Thu, 11 Jan 2024 19:32:25 +0530
Subject: [PATCH 473/887] fix lint errors

---
 .../training-plan-dashboard.component.ts               |  4 ++--
 .../components/breadcrumb/breadcrumb.component.ts      |  8 ++++----
 .../components/stepper/stepper.component.ts            | 10 +++++-----
 .../routes/preview-plan/preview-plan.component.ts      |  4 +++-
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
index 020d97268..ad0bfd9f0 100644
--- a/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/training-plan-dashboard/training-plan-dashboard.component.ts
@@ -291,7 +291,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
       this.loaderService.changeLoaderState(false)
       this.filter(this.currentFilter)
       this.tabNavigate(_selectedRow.status.toLowerCase(), _selectedRow.userType)
-    }, _error => {
+    },                                                  _error => {
       this.loaderService.changeLoaderState(false)
     })
   }
@@ -313,7 +313,7 @@ export class TrainingPlanDashboardComponent implements OnInit {
         this.snackBar.open('Something went wrong while publishing CBP plan. Try again later')
         this.loaderService.changeLoaderState(false)
       }
-    }, (_error: any) => {
+    },                                                  (_error: any) => {
       this.snackBar.open('Something went wrong while publishing CBP plan. Try again later')
       this.loaderService.changeLoaderState(false)
     })
diff --git a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
index 6ebfcca55..f2292487f 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/breadcrumb/breadcrumb.component.ts
@@ -150,7 +150,7 @@ export class BreadcrumbComponent implements OnInit {
             tabSelected: this.tpdsSvc.trainingPlanStepperData.assignmentType,
           },
         })
-      }, 1000)
+      },         1000)
     })
   }
 
@@ -197,7 +197,7 @@ export class BreadcrumbComponent implements OnInit {
               tabSelected: this.tpdsSvc.trainingPlanStepperData.assignmentType,
             },
           })
-        }, 1000)
+        },         1000)
       }
     })
   }
@@ -221,12 +221,12 @@ export class BreadcrumbComponent implements OnInit {
               tabSelected: this.tpdsSvc.trainingPlanStepperData.assignmentType,
             },
           })
-        }, 1000)
+        },         1000)
       } else {
         this.snackBar.open('Something went wrong while publishing CBP plan. Try again later')
         this.dialogRef.close()
       }
-    }, (_error: any) => {
+    },                                    (_error: any) => {
       this.snackBar.open('Something went wrong while publishing CBP plan. Try again later')
       this.dialogRef.close()
     })
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
index 2ddd3b4d0..36a930a93 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
@@ -23,7 +23,7 @@ export class StepperComponent implements OnInit, OnChanges, AfterViewInit {
   editState = false
   isContentLive = false
   constructor(private route: ActivatedRoute,
-    private tpdsSvc: TrainingPlanDataSharingService
+              private tpdsSvc: TrainingPlanDataSharingService
   ) { }
 
   ngOnInit() {
@@ -68,28 +68,28 @@ export class StepperComponent implements OnInit, OnChanges, AfterViewInit {
     setTimeout(() => {
       this.addCotnentDisable = _event
       this.titleInvalid.emit(_event)
-    }, 0)
+    },         0)
   }
 
   checkForaddContent(_event: any) {
     setTimeout(() => {
       this.addAssigneeDisable = _event
       this.addContentIsInvalid.emit(_event)
-    }, 0)
+    },         0)
   }
 
   checkForaddAssignee(_event: any) {
     setTimeout(() => {
       this.addTimelineDisable = _event
       this.addAssigneeIsInvalid.emit(_event)
-    }, 0)
+    },         0)
   }
 
   tabChangeToTimeline(_event: any) {
     setTimeout(() => {
       this.addTimelineDisable = _event
       this.addAssigneeIsInvalid.emit(_event)
-    }, 0)
+    },         0)
     this.tabIndexValue = 3
   }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
index 1524e0da3..6f6156a33 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/preview-plan/preview-plan.component.ts
@@ -76,7 +76,9 @@ export class PreviewPlanComponent implements OnInit {
           count: this.contentList.length,
         })
         arr.push({
-          name: contentData.assignmentType && contentData.assignmentType.toLowerCase() === 'customuser' ? 'Custom User': contentData.assignmentType,
+          /* tslint:disable */
+          name: contentData.assignmentType && contentData.assignmentType.toLowerCase() === 'customuser' ? 'Custom User' : contentData.assignmentType,
+          /* tslint:enable */
           tab: 'assignee',
           selected: (this.tab === 'assignee' ? true : false),
           count: this.assigneeData.data ? this.assigneeData.data.length : 0,

From aeacda655976f22d96e063643d5a8e0d2b52ca3f Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Mon, 15 Jan 2024 17:29:10 +0530
Subject: [PATCH 474/887] Bug fixes - KB-2058, KB-2059, KB-2060, and KB-2062

---
 .../add-content-dialog.component.html               | 13 ++++++++++---
 .../add-content-dialog.component.ts                 | 11 ++++++++++-
 .../create-content/create-content.component.html    |  4 +++-
 .../create-content/create-content.component.scss    |  9 ++++++++-
 4 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.html b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.html
index 4ca1852ae..a1e35e24b 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.html
@@ -54,7 +54,7 @@
     <div class="margin-bottom-m">
       <mat-label class="mat-subheading-2 required">List of Providers</mat-label>
       <mat-form-field class="full-width" floatLabel="never">
-        <mat-select (openedChange)="openedChange($event)" placeholder="List of providers" formControlName="provider"
+        <mat-select (openedChange)="openedChange($event)" placeholder="List of Providers" formControlName="provider"
           multiple>
           <div class="select-container">
             <mat-optgroup>
@@ -80,11 +80,18 @@
       <label class="flex mat-subheading-2 required">Description of the requested content</label>
       <textarea class="full-width margin-top-xs" formControlName="contentdescription" id="" cols="30"
         rows="4"></textarea>
+      <mat-error *ngIf="contentForm.controls['contentdescription'].touched &&
+          contentForm.controls['contentdescription'].hasError('required')">
+        Description is mandatory
+      </mat-error>
+      <mat-error *ngIf="contentForm.controls['contentdescription'].hasError('maxlength')">
+        Description cannot exceed 1000 characters
+      </mat-error>
     </div>
 
     <div class="flex flex-end margin-top-l">
-      <button mat-button class="close-btn margin-right-xs" type="button" (click)="closeModal()">Close</button>
-      <button mat-button class="submit-btn" type="button" (click)="submit()" [disabled]="contentForm.invalid">Send
+      <button mat-button class="close-btn margin-right-xs" type="button" (click)="closeModal()">Cancel</button>
+      <button mat-button class="submit-btn" type="button" (click)="submit()" [disabled]="isFormInValid()">Send
         mail</button>
     </div>
   </form>
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
index 6b73987af..b8f6f982c 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
@@ -38,7 +38,7 @@ export class AddContentDialogComponent implements OnInit {
       competencyArea: new FormControl('', Validators.required),
       provider: new FormControl('', Validators.required),
       providerText: new FormControl(''),
-      contentdescription: new FormControl('', Validators.required),
+      contentdescription: new FormControl('', [Validators.required, Validators.maxLength(1000)]),
     })
     this.contentForm.markAsPristine()
   }
@@ -245,4 +245,13 @@ export class AddContentDialogComponent implements OnInit {
       })
     }
   }
+
+  isFormInValid() {
+    if (this.contentForm.invalid || !this.seletedCompetencyArea ||
+      this.seletedCompetencyTheme.length === 0 || this.seletedCompetencySubTheme.length === 0) {
+      return true
+    }
+    return false
+  }
+
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
index 3fb49cc38..27c4c518c 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.html
@@ -15,7 +15,9 @@
         </div>
     </div>
     <div class="no-cbp-data margin-top-xl margin-bottom-xl" *ngIf="!(contentData) || !(contentData?.length)">
-        <div class="customimg"><img src="/assets/images/nocontent.svg"></div>
+        <div class="customimg"><img src="/assets/images/nocontent.svg">
+            <span class="nocontent-question-mark">?</span>
+        </div>
         <!-- <div class="mat-subheading-1 margin-remove">No content avaliable.</div> -->
         <!-- <div>Create a content in CBP portal to get the contents.</div> -->
         <div class="mat-subheading-1 margin-top-m margin-bottom-m">Can't find content?</div>
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.scss b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.scss
index 3074d44e6..3ac779123 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.scss
@@ -20,4 +20,11 @@
   font-family: 'Lato';
   font-weight: 700;
   font-size: 14px;
-}
\ No newline at end of file
+}
+.nocontent-question-mark {
+  position: absolute;
+  top: 42%;
+  left: 49%;
+  font-size: 40px;
+  color: #1b4ca1 !important;
+}

From 8a271c4e7c8bec319bb54fe39aa7aecda1bf369a Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Mon, 15 Jan 2024 17:46:18 +0530
Subject: [PATCH 475/887] content fix

---
 .../routes/create-content/create-content.component.scss         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.scss b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.scss
index 3ac779123..8ea793913 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.scss
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.scss
@@ -25,6 +25,6 @@
   position: absolute;
   top: 42%;
   left: 49%;
-  font-size: 40px;
+  font-size: 60px;
   color: #1b4ca1 !important;
 }

From 11a920873cf32c0db372df6cadfc4a6c8b017983 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Tue, 16 Jan 2024 12:11:53 +0530
Subject: [PATCH 476/887] Bug fixes - KB-2063, KB-2060 and KB-2126

---
 .../reports-section/reports-section.component.html |  2 +-
 .../reports-section/reports-section.component.scss | 14 +++++++++++++-
 .../add-content-dialog.component.html              |  8 ++++----
 .../add-content-dialog.component.ts                |  5 +++++
 .../create-content/create-content.component.ts     |  2 +-
 5 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html
index f5bbd3471..6646faa96 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html
@@ -1,4 +1,4 @@
-<div class="flex flex-4 flex-column">
+<div class="flex flex-4 flex-column reports-section">
   <mat-card>
     <div class="flex-4 mobile-margin text-capitalize mat-h2">Reports</div>
     <mat-card-content>
diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.scss b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.scss
index 11b1caea6..6d96884a4 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.scss
@@ -16,4 +16,16 @@
     text-decoration: underline !important;
     color: #0075B7 !important;
   }
-}
\ No newline at end of file
+}
+
+::ng-deep .reports-section .cdk-column-reportName .textclass {
+  cursor: default!important;
+}
+
+::ng-deep .reports-section .cdk-column-reportType .textclass {
+  cursor: default!important;
+}
+
+::ng-deep .reports-section .cdk-column-reportUpdatedOn .textclass {
+  cursor: default!important;
+}
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.html b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.html
index a1e35e24b..c594c1e74 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.html
@@ -55,7 +55,7 @@
       <mat-label class="mat-subheading-2 required">List of Providers</mat-label>
       <mat-form-field class="full-width" floatLabel="never">
         <mat-select (openedChange)="openedChange($event)" placeholder="List of Providers" formControlName="provider"
-          multiple>
+          multiple tabindex="-1">
           <div class="select-container">
             <mat-optgroup>
               <mat-form-field floatLabel="never">
@@ -64,7 +64,7 @@
                   (click)="clearSearch($event)"><mat-icon>close</mat-icon></button>
               </mat-form-field>
             </mat-optgroup>
-            <mat-optgroup *ngIf="filteredProviders.length == 0">
+            <mat-optgroup *ngIf="filteredProviders.length === 0">
               <div>No results found!</div>
             </mat-optgroup>
             <mat-option (onSelectionChange)="selectionChange($event, option)"
@@ -78,8 +78,8 @@
 
     <div class="margin-bottom-m">
       <label class="flex mat-subheading-2 required">Description of the requested content</label>
-      <textarea class="full-width margin-top-xs" formControlName="contentdescription" id="" cols="30"
-        rows="4"></textarea>
+      <textarea class="full-width margin-top-xs" formControlName="contentdescription" id="" cols="30" rows="4"
+        tabindex="-1"></textarea>
       <mat-error *ngIf="contentForm.controls['contentdescription'].touched &&
           contentForm.controls['contentdescription'].hasError('required')">
         Description is mandatory
diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
index b8f6f982c..ecc8953a2 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
@@ -41,6 +41,7 @@ export class AddContentDialogComponent implements OnInit {
       contentdescription: new FormControl('', [Validators.required, Validators.maxLength(1000)]),
     })
     this.contentForm.markAsPristine()
+    this.contentForm.markAsUntouched()
   }
 
   ngOnInit() {
@@ -120,7 +121,11 @@ export class AddContentDialogComponent implements OnInit {
 
       const id = this.seletedCompetencyTheme[index].id
       this.seletedCompetencyTheme.splice(index, 1)
+      if (this.seletedCompetencyTheme.length === 0) {
+        this.seletedCompetencySubTheme = []
+      }
       this.allCompetencySubtheme = this.allCompetencySubtheme.filter((item: any) => item.compThemeID !== id)
+      this.seletedCompetencySubTheme = this.seletedCompetencySubTheme.filter((item: any) => item.compThemeID !== id)
     }
   }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
index 16f6148ce..ffd474460 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
@@ -109,7 +109,7 @@ export class CreateContentComponent implements OnInit {
   showAddContentDialog() {
     const dialogRef = this.dialog.open(AddContentDialogComponent, {
       maxHeight: 'auto',
-      height: '75%',
+      height: '60%',
       width: '60%',
     })
     dialogRef.afterClosed().subscribe((response: any) => {

From 64e634f6e56cfa044e3c05952160404b4c829133 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Tue, 16 Jan 2024 17:59:38 +0530
Subject: [PATCH 477/887] update for date time picker issue

---
 .../add-timeline-form/add-timeline-form.component.html          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html
index 78ff08769..d0ebdf367 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-timeline-form/add-timeline-form.component.html
@@ -5,7 +5,7 @@
     <div class="form-element">
         <div class="fonm-element-label">Timeline <span class="required"></span></div>
         <div class="calender">
-            <mat-form-field appearance="outline">
+            <mat-form-field color="accent" appearance="outline">
                 <mat-label>Select date</mat-label>
                 <input matInput #ref [matDatepicker]="picker" [min]="minDate" [(ngModel)]="todayDate"
                     (dateChange)="changeTimeline(ref.value)" readonly>

From 6df649e90ca279a9637260e02b5f57bd1e717f8e Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Thu, 18 Jan 2024 12:39:06 +0530
Subject: [PATCH 478/887] bug fix and ui-collection update

---
 package.json                                  |  2 +-
 .../category-drop-down.component.ts           | 69 ++++++++-----------
 2 files changed, 29 insertions(+), 42 deletions(-)

diff --git a/package.json b/package.json
index d0ded538c..6fdd85adf 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@angular/router": "~8.2.1",
     "@angular/service-worker": "~8.2.1",
     "@project-sunbird/telemetry-sdk": "0.0.26",
-    "@sunbird-cb/collection": "^1.0.43",
+    "@sunbird-cb/collection": "^1.0.44",
     "@sunbird-cb/design-system": "0.0.1",
     "@sunbird-cb/rain-dashboards": "0.4.33",
     "@sunbird-cb/resolver": "^1.0.0",
diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
index 4b7401862..02b342238 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
@@ -76,10 +76,9 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
       case 'Course':
         dialogData['type'] = 'normal'
         dialogData['icon'] = 'radio_on'
-        dialogData['title'] = 'You are attempting to change the selected content type?'
-        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection.
-        It's advisable to save the current one as a draft and create a new one instead.`
-        dialogData['primaryAction'] = 'I understand, change content type'
+        dialogData['title'] = 'Are you sure you want to alter the content type?'
+        dialogData['subTitle'] = `This action will result in the loss of your currently selected content.`
+        dialogData['primaryAction'] = 'Confirm'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Course'
         this.tpdsSvc.trainingPlanStepperData['contentType'] = event
@@ -93,10 +92,9 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
       case 'Standalone Assessment':
         dialogData['type'] = 'normal'
         dialogData['icon'] = 'radio_on'
-        dialogData['title'] = 'You are attempting to change the selected content type?'
-        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection.
-        It's advisable to save the current one as a draft and create a new one instead.`
-        dialogData['primaryAction'] = 'I understand, change content type'
+        dialogData['title'] = 'Are you sure you want to alter the content type?'
+        dialogData['subTitle'] = `This action will result in the loss of your currently selected content.`
+        dialogData['primaryAction'] = 'Confirm'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Standalone Assessment'
         this.tpdsSvc.trainingPlanStepperData['contentType'] = event
@@ -110,10 +108,9 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
       case 'Program':
         dialogData['type'] = 'normal'
         dialogData['icon'] = 'radio_on'
-        dialogData['title'] = 'You are attempting to change the selected content type?'
-        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection.
-        It's advisable to save the current one as a draft and create a new one instead.`
-        dialogData['primaryAction'] = 'I understand, change content type'
+        dialogData['title'] = 'Are you sure you want to alter the content type?'
+        dialogData['subTitle'] = `This action will result in the loss of your currently selected content.`
+        dialogData['primaryAction'] = 'Confirm'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Program'
         this.tpdsSvc.trainingPlanStepperData['contentType'] = event
@@ -127,10 +124,9 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
       case 'Blended program':
         dialogData['type'] = 'normal'
         dialogData['icon'] = 'radio_on'
-        dialogData['title'] = 'You are attempting to change the selected content type?'
-        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection.
-        It's advisable to save the current one as a draft and create a new one instead.`
-        dialogData['primaryAction'] = 'I understand, change content type'
+        dialogData['title'] = 'Are you sure you want to alter the content type?'
+        dialogData['subTitle'] = `This action will result in the loss of your currently selected content.`
+        dialogData['primaryAction'] = 'Confirm'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Blended program'
         this.tpdsSvc.trainingPlanStepperData['contentType'] = event
@@ -144,10 +140,9 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
       case 'Curated program':
         dialogData['type'] = 'normal'
         dialogData['icon'] = 'radio_on'
-        dialogData['title'] = 'You are attempting to change the selected content type?'
-        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection.
-         It's advisable to save the current one as a draft and create a new one instead.`
-        dialogData['primaryAction'] = 'I understand, change content type'
+        dialogData['title'] = 'Are you sure you want to alter the content type?'
+        dialogData['subTitle'] = `This action will result in the loss of your currently selected content.`
+        dialogData['primaryAction'] = 'Confirm'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Curated program'
         this.tpdsSvc.trainingPlanStepperData['contentType'] = event
@@ -161,10 +156,9 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
       case 'Moderated Course':
         dialogData['type'] = 'normal'
         dialogData['icon'] = 'radio_on'
-        dialogData['title'] = 'You are attempting to change the selected content type?'
-        dialogData['subTitle'] = `Changing it now will result in the loss of your current selection.
-        It's advisable to save the current one as a draft and create a new one instead.`
-        dialogData['primaryAction'] = 'I understand, change content type'
+        dialogData['title'] = 'Are you sure you want to alter the content type?'
+        dialogData['subTitle'] = `This action will result in the loss of your currently selected content.`
+        dialogData['primaryAction'] = 'Confirm'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Moderated Course'
         this.tpdsSvc.trainingPlanStepperData['contentType'] = event
@@ -177,11 +171,9 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
       case 'Designation':
         dialogData['type'] = 'normal'
         dialogData['icon'] = 'radio_on'
-        dialogData['title'] = 'You are attempting to change the selected user type?'
-        dialogData['subTitle'] = `By selecting all users, you've selected all the users from your Department of
-         ${(this.tpdsSvc.currentUserDepartment) ? this.tpdsSvc.currentUserDepartment : ''}.
-        If you want to select custom users or by designation, use the above option`
-        dialogData['primaryAction'] = 'I understand, change user type'
+        dialogData['title'] = 'Are you sure you want to alter the type?'
+        dialogData['subTitle'] = `This action will result in the loss of your currently selected content.`
+        dialogData['primaryAction'] = 'Confirm'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'Designation'
         this.tpdsSvc.trainingPlanStepperData['assignmentType'] = event
@@ -194,14 +186,11 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
       case 'AllUser':
         dialogData['type'] = 'normal'
         dialogData['icon'] = 'radio_on'
-        dialogData['title'] = 'You are attempting to change the selected user type?'
-        dialogData['subTitle'] = `By selecting all users, you've selected all the users from your Department of
-        ${(this.tpdsSvc.currentUserDepartment) ? this.tpdsSvc.currentUserDepartment : ''}.
-        If you want to select custom users or by designation, use the above option`
-        dialogData['primaryAction'] = 'I understand, change user type'
+        dialogData['title'] = 'Are you sure you want to alter the type?'
+        dialogData['subTitle'] = `This action will result in the loss of your currently selected content.`
+        dialogData['primaryAction'] = 'Confirm'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'AllUser'
-        this.tpdsSvc.trainingPlanAssigneeData.category = 'AllUser'
         this.tpdsSvc.trainingPlanStepperData['assignmentType'] = event
         if (this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo.length) {
           this.openDialoagBox(dialogData)
@@ -212,11 +201,9 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
       case 'CustomUser':
         dialogData['type'] = 'normal'
         dialogData['icon'] = 'radio_on'
-        dialogData['title'] = 'You are attempting to change the selected user type?'
-        dialogData['subTitle'] = `By selecting all users, you've selected all the users from your Department of
-        ${(this.tpdsSvc.currentUserDepartment) ? this.tpdsSvc.currentUserDepartment : ''}.
-        If you want to select custom users or by designation, use the above option`
-        dialogData['primaryAction'] = 'I understand, change user type'
+        dialogData['title'] = 'Are you sure you want to alter the type?'
+        dialogData['subTitle'] = `This action will result in the loss of your currently selected content.`
+        dialogData['primaryAction'] = 'Confirm'
         dialogData['secondaryAction'] = 'Cancel'
         dialogData['event'] = 'CustomUser'
         this.tpdsSvc.trainingPlanStepperData['assignmentType'] = event
@@ -243,6 +230,7 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         secondaryAction: dialogData.secondaryAction,
         event: dialogData.event,
       },
+      autoFocus: false
     })
 
     this.dialogRef.afterClosed().subscribe((res: any) => {
@@ -254,7 +242,6 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
           this.selectedValue = this.tpdsSvc.trainingPlanAssigneeData.category
           this.tpdsSvc.trainingPlanStepperData['assignmentType'] = this.selectedValue
         }
-
       }
     })
   }

From 55d5f8fd2a91cc4b2ca3c668a9002043725f3051 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Mon, 22 Jan 2024 11:46:15 +0530
Subject: [PATCH 479/887] issue fixed for 2203

---
 .../competency-summary/competency-summary.component.ts          | 2 +-
 .../routes/training-plan/components/filter/filter.component.ts  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
index e191ef240..76ac21457 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/competency-summary/competency-summary.component.ts
@@ -71,7 +71,7 @@ export class CompetencySummaryComponent implements OnInit, OnChanges {
       this.selectedCardData.map((sitem: any) => {
         if (sitem && sitem.competencies_v5) {
           sitem.competencies_v5.map((fitem: any) => {
-            if (fitem.competencyArea.toLowerCase() === 'behavioral') {
+            if (fitem.competencyArea.toLowerCase() === 'behavioural') {
               const result = this.checkIfThemeNameExists(this.competencySummaryObj[0]['behavioural']['listData'], fitem)
               fObj = { competencyTheme: fitem.competencyTheme, count: 1 }
               if (result) {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index 0f8070752..c2f9c8223 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -16,7 +16,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
   providersList: any[] = []
   selectedProviders: any[] = []
   competencyTypeList = [
-    { id: 'Behavioral', name: 'Behavioural' },
+    { id: 'Behavioural', name: 'Behavioural' },
     { id: 'Functional', name: 'Functional' },
     { id: 'Domain', name: 'Domain' },
   ]

From 3754d480572dab3665e0b62ffba421d9457d9e36 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Mon, 22 Jan 2024 18:37:59 +0530
Subject: [PATCH 480/887] update for issue 220

---
 .../components/filter/filter.component.ts     |  8 ++++---
 .../components/search/search.component.ts     | 22 ++++++++++++++-----
 .../components/stepper/stepper.component.ts   |  1 +
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index c2f9c8223..0752667a0 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -70,8 +70,9 @@ export class FilterComponent implements OnInit, AfterContentChecked {
     })
 
     this.tpdsSvc.clearFilter.subscribe((result: any) => {
-      if (result) {
-        this.clearFilterWhileSearch()
+      if (result && result.status) {
+        this.from = result.from;
+        this.clearFilter()
       }
     })
 
@@ -280,7 +281,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
     this.tpdsSvc.filterToggle.next({ from: '', status: false })
   }
 
-  clearFilter() {
+  clearFilter() {    
     if (this.from === 'content') {
       this.filterObj = { competencyArea: [], competencyTheme: [], competencySubTheme: [], providers: [] }
       this.selectedProviders = []
@@ -301,6 +302,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
       // this.getFilterData.emit(this.assigneeFilterObj)
       this.tpdsSvc.getFilterDataObject.next(this.assigneeFilterObj)
     }
+    
     if (this.checkboxes) {
       this.checkboxes.forEach((element: any) => {
         element['checked'] = false
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 38aea8d72..4ad520939 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -41,11 +41,19 @@ export class SearchComponent implements OnInit {
     })
 
     this.tpdsSvc.getFilterDataObject.subscribe(event => {
-      if (this.from === 'content') {
+      if (this.selectedDropDownValue === 'Course' ||
+          this.selectedDropDownValue === 'Standalone Assessment' ||
+          this.selectedDropDownValue === 'Program' ||
+          this.selectedDropDownValue === 'Blended program' ||
+          this.selectedDropDownValue === 'Curated program' ||
+          this.selectedDropDownValue === 'Moderated Course'
+      ) {
         this.getContent(this.selectedDropDownValue, event)
-      } else {
+      } 
+      if (this.selectedDropDownValue === 'CustomUser') {
         this.getCustomUsers(this.selectedDropDownValue, event)
       }
+      
     })
     if (this.tpdsSvc.trainingPlanStepperData.status && this.tpdsSvc.trainingPlanStepperData.status.toLowerCase() === 'live') {
       this.isContentLive = true
@@ -73,8 +81,6 @@ export class SearchComponent implements OnInit {
 
   handleCategorySelection(event: any) {
     this.selectedDropDownValue = event
-    this.tpdsSvc.clearFilter.next(true)
-    this.resetPageIndex()
     switch (this.from) {
       case 'content':
         // if(this.tpdsSvc.trainingPlanContentData && this.tpdsSvc.trainingPlanContentData.data) {
@@ -84,6 +90,8 @@ export class SearchComponent implements OnInit {
         event = !event ? 'Course' : event
         /* tslint:enable */
         this.searchText = ''
+        this.tpdsSvc.clearFilter.next({from:'content', status: true})
+        this.resetPageIndex()
         this.getContent(event)
         break
       case 'assignee':
@@ -92,6 +100,8 @@ export class SearchComponent implements OnInit {
         //   this.tpdsSvc.trainingPlanStepperData['assignmentTypeInfo']=[]
         // }
         /* tslint:disable */
+        this.tpdsSvc.clearFilter.next({from:'assignee', status: true})
+        this.resetPageIndex()
         this.searchText = ''
         event = !event ? 'Designation' : event
         /* tslint:enable */
@@ -113,7 +123,7 @@ export class SearchComponent implements OnInit {
         this.tpdsSvc.moderatedCourseSelectStatus.next(true)
       }
       if (this.searchText) {
-        this.tpdsSvc.clearFilter.next(true)
+        this.tpdsSvc.clearFilter.next({from:'content', status: true})
         /* tslint:disable */
         applyFilterObj = {}
         /* tslint:enable */
@@ -171,7 +181,7 @@ export class SearchComponent implements OnInit {
     this.loadingService.changeLoaderState(true)
     const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
     if (this.searchText) {
-      this.tpdsSvc.clearFilter.next(true)
+      this.tpdsSvc.clearFilter.next({from:'assignee', status: true})
       /* tslint:disable */
       applyFilterObj = {}
       /* tslint:enable */
diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
index 36a930a93..8901ea947 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
@@ -59,6 +59,7 @@ export class StepperComponent implements OnInit, OnChanges, AfterViewInit {
   }
 
   tabSelected(_event: any) {
+    alert(1)
     this.tabIndexValue = _event.index
     const tempData = _event.tab.textLabel
     this.selectedTabType.emit(tempData)

From 75d9bde3c7d9369437a36382cfc261056f1a9e20 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Mon, 22 Jan 2024 18:40:57 +0530
Subject: [PATCH 481/887] update for issue 2200

---
 .../routes/training-plan/components/stepper/stepper.component.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
index 8901ea947..36a930a93 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/stepper/stepper.component.ts
@@ -59,7 +59,6 @@ export class StepperComponent implements OnInit, OnChanges, AfterViewInit {
   }
 
   tabSelected(_event: any) {
-    alert(1)
     this.tabIndexValue = _event.index
     const tempData = _event.tab.textLabel
     this.selectedTabType.emit(tempData)

From a5200db444c171464f655d6d56579696ff131edd Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Mon, 22 Jan 2024 18:59:20 +0530
Subject: [PATCH 482/887] update for issue 2200

---
 .../training-plan/components/search/search.component.ts       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 4ad520939..91de365bf 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -89,7 +89,7 @@ export class SearchComponent implements OnInit {
         /* tslint:disable */
         event = !event ? 'Course' : event
         /* tslint:enable */
-        this.searchText = ''
+        this.searchText = '';
         this.tpdsSvc.clearFilter.next({from:'content', status: true})
         this.resetPageIndex()
         this.getContent(event)
@@ -100,7 +100,7 @@ export class SearchComponent implements OnInit {
         //   this.tpdsSvc.trainingPlanStepperData['assignmentTypeInfo']=[]
         // }
         /* tslint:disable */
-        this.tpdsSvc.clearFilter.next({from:'assignee', status: true})
+        this.tpdsSvc.clearFilter.next({from:'assignee', status: true})        
         this.resetPageIndex()
         this.searchText = ''
         event = !event ? 'Designation' : event

From fec1880554acf3edcae88466b3951b01031400b1 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Wed, 31 Jan 2024 11:53:24 +0530
Subject: [PATCH 483/887] update for search filter issue

---
 .../components/filter/filter.component.ts     | 29 ++++++++++++++---
 .../components/search/search.component.ts     | 32 +++++++++++--------
 2 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index 0752667a0..225eae7f7 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -71,7 +71,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
 
     this.tpdsSvc.clearFilter.subscribe((result: any) => {
       if (result && result.status) {
-        this.from = result.from;
+        this.from = result.from
         this.clearFilter()
       }
     })
@@ -281,7 +281,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
     this.tpdsSvc.filterToggle.next({ from: '', status: false })
   }
 
-  clearFilter() {    
+  clearFilter() {
     if (this.from === 'content') {
       this.filterObj = { competencyArea: [], competencyTheme: [], competencySubTheme: [], providers: [] }
       this.selectedProviders = []
@@ -293,16 +293,17 @@ export class FilterComponent implements OnInit, AfterContentChecked {
       this.resetFilter()
     } else {
       this.assigneeFilterObj = { group: [], designation: [] }
+      this.resetAssigneeFilter()
     }
 
     if (this.from === 'content') {
       // this.getFilterData.emit(this.filterObj)
-      this.tpdsSvc.getFilterDataObject.next(this.filterObj)
+      //this.tpdsSvc.getFilterDataObject.next(this.filterObj)
     } else {
       // this.getFilterData.emit(this.assigneeFilterObj)
-      this.tpdsSvc.getFilterDataObject.next(this.assigneeFilterObj)
+      //this.tpdsSvc.getFilterDataObject.next(this.assigneeFilterObj)
     }
-    
+
     if (this.checkboxes) {
       this.checkboxes.forEach((element: any) => {
         element['checked'] = false
@@ -409,4 +410,22 @@ export class FilterComponent implements OnInit, AfterContentChecked {
     }
 
   }
+
+  resetAssigneeFilter() {
+    if (this.groupList) {
+      this.groupList.map((pitem: any) => {
+        if (pitem && pitem['selected']) {
+          pitem['selected'] = false
+        }
+      })
+    }
+
+    if (this.designationList) {
+      this.designationList.map((pitem: any) => {
+        if (pitem && pitem['selected']) {
+          pitem['selected'] = false
+        }
+      })
+    }
+  }
 }
diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 91de365bf..810c6b754 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -42,18 +42,18 @@ export class SearchComponent implements OnInit {
 
     this.tpdsSvc.getFilterDataObject.subscribe(event => {
       if (this.selectedDropDownValue === 'Course' ||
-          this.selectedDropDownValue === 'Standalone Assessment' ||
-          this.selectedDropDownValue === 'Program' ||
-          this.selectedDropDownValue === 'Blended program' ||
-          this.selectedDropDownValue === 'Curated program' ||
-          this.selectedDropDownValue === 'Moderated Course'
+        this.selectedDropDownValue === 'Standalone Assessment' ||
+        this.selectedDropDownValue === 'Program' ||
+        this.selectedDropDownValue === 'Blended program' ||
+        this.selectedDropDownValue === 'Curated program' ||
+        this.selectedDropDownValue === 'Moderated Course'
       ) {
         this.getContent(this.selectedDropDownValue, event)
-      } 
+      }
       if (this.selectedDropDownValue === 'CustomUser') {
         this.getCustomUsers(this.selectedDropDownValue, event)
       }
-      
+
     })
     if (this.tpdsSvc.trainingPlanStepperData.status && this.tpdsSvc.trainingPlanStepperData.status.toLowerCase() === 'live') {
       this.isContentLive = true
@@ -89,8 +89,8 @@ export class SearchComponent implements OnInit {
         /* tslint:disable */
         event = !event ? 'Course' : event
         /* tslint:enable */
-        this.searchText = '';
-        this.tpdsSvc.clearFilter.next({from:'content', status: true})
+        this.searchText = ''
+        this.tpdsSvc.clearFilter.next({ from: 'content', status: true })
         this.resetPageIndex()
         this.getContent(event)
         break
@@ -100,7 +100,7 @@ export class SearchComponent implements OnInit {
         //   this.tpdsSvc.trainingPlanStepperData['assignmentTypeInfo']=[]
         // }
         /* tslint:disable */
-        this.tpdsSvc.clearFilter.next({from:'assignee', status: true})        
+        this.tpdsSvc.clearFilter.next({ from: 'assignee', status: true })
         this.resetPageIndex()
         this.searchText = ''
         event = !event ? 'Designation' : event
@@ -122,8 +122,11 @@ export class SearchComponent implements OnInit {
       if (contentType === 'Moderated Course') {
         this.tpdsSvc.moderatedCourseSelectStatus.next(true)
       }
+      if (applyFilterObj && Object.keys(applyFilterObj).length) {
+        this.searchText = ''
+      }
       if (this.searchText) {
-        this.tpdsSvc.clearFilter.next({from:'content', status: true})
+        this.tpdsSvc.clearFilter.next({ from: 'content', status: true })
         /* tslint:disable */
         applyFilterObj = {}
         /* tslint:enable */
@@ -180,8 +183,11 @@ export class SearchComponent implements OnInit {
   getCustomUsers(event: any, applyFilterObj?: any) {
     this.loadingService.changeLoaderState(true)
     const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
+    if (applyFilterObj && Object.keys(applyFilterObj).length) {
+      this.searchText = ''
+    }
     if (this.searchText) {
-      this.tpdsSvc.clearFilter.next({from:'assignee', status: true})
+      this.tpdsSvc.clearFilter.next({ from: 'assignee', status: true })
       /* tslint:disable */
       applyFilterObj = {}
       /* tslint:enable */
@@ -204,7 +210,7 @@ export class SearchComponent implements OnInit {
           'profileDetails',
           'organisations',
         ],
-        limit: 500,
+        limit: 100000,
         offset: 0,
       },
     }

From 6e25f24a838f8f602a7c6ff86044496f6d3c4023 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Wed, 31 Jan 2024 14:10:04 +0530
Subject: [PATCH 484/887] update for user count

---
 .../routes/training-plan/components/search/search.component.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 810c6b754..05db59846 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -210,7 +210,7 @@ export class SearchComponent implements OnInit {
           'profileDetails',
           'organisations',
         ],
-        limit: 100000,
+        limit: 10000,
         offset: 0,
       },
     }

From 7987c2b58e33052048a245d3471fbe0cb9879ea9 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Fri, 2 Feb 2024 19:27:24 +0530
Subject: [PATCH 485/887] Bug fix - filter organisation who's org id is null

---
 .../add-content-dialog/add-content-dialog.component.ts           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
index ecc8953a2..e8e50e969 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
@@ -78,6 +78,7 @@ export class AddContentDialogComponent implements OnInit {
   getProviders() {
     this.trainingplanSvc.getProviders().subscribe((res: any) => {
       this.providersList = res
+      this.providersList = this.providersList.filter((ele: any) => ele.orgId)
       this.providersList.forEach((val: any) => {
         val.checked = false
       })

From e7e943f055ec24d0eeb7acc4a25f7e1957e2c3d0 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Mon, 5 Feb 2024 14:53:10 +0530
Subject: [PATCH 486/887] Fix - duplicate providers in request for new content

---
 .../add-content-dialog/add-content-dialog.component.ts          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
index e8e50e969..b038e67a9 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/add-content-dialog/add-content-dialog.component.ts
@@ -187,7 +187,7 @@ export class AddContentDialogComponent implements OnInit {
 
   selectionChange(event: any, option: any) {
     if (event.isUserInput) {
-      const index = this.selectedProvidersList.findIndex((object: any) => object.id === option.orgId)
+      const index = this.selectedProvidersList.findIndex((object: any) => object.orgId === option.orgId)
       if (index === -1) {
         this.selectedProvidersList.push(option)
       } else {

From fd8e8ba5039e1f18c0c0dcecf5f30ccaad3084e5 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Mon, 5 Feb 2024 16:42:46 +0530
Subject: [PATCH 487/887] clear all designation not working

---
 .../routes/training-plan/components/chip/chip.component.ts    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
index f907ed042..9bdaec5d5 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/chip/chip.component.ts
@@ -52,7 +52,7 @@ export class ChipComponent implements OnInit, OnChanges {
       })
 
       this.tpdsSvc.trainingPlanStepperData.contentList = []
-      this.tpdsSvc.trainingPlanStepperData.contentType = ''
+      // this.tpdsSvc.trainingPlanStepperData.contentType = ''
     }
     if (this.from === 'assignee') {
       this.selectAssigneeCount = 0
@@ -71,7 +71,7 @@ export class ChipComponent implements OnInit, OnChanges {
       }
 
       this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo = []
-      this.tpdsSvc.trainingPlanStepperData.assignmentType = ''
+      // this.tpdsSvc.trainingPlanStepperData.assignmentType = ''
     }
     this.itemRemoved.emit(true)
   }

From f15c61f7fb385065bd52fde196a8b197d627e622 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Wed, 7 Feb 2024 16:08:20 +0530
Subject: [PATCH 488/887] hide change log on approval page

---
 .../src/lib/routes/approvals/routes/home/home.component.html    | 2 +-
 .../app/src/lib/routes/approvals/routes/home/home.component.ts  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/approvals/routes/home/home.component.html b/project/ws/app/src/lib/routes/approvals/routes/home/home.component.html
index 32a462713..753628446 100644
--- a/project/ws/app/src/lib/routes/approvals/routes/home/home.component.html
+++ b/project/ws/app/src/lib/routes/approvals/routes/home/home.component.html
@@ -33,7 +33,7 @@
         </div>
       </div>
     </div>
-    <div class="flex-1" style="border-left: 1px solid #0000000f;">
+    <div class="flex-1" style="border-left: 1px solid #0000000f;" *ngIf="isChangeLog">
       <ng-container id="changelog">
         <div>
           <label class="change-log-text margin-top-l margin-bottom-l margin-left-m margin-right-m">Change log</label>
diff --git a/project/ws/app/src/lib/routes/approvals/routes/home/home.component.ts b/project/ws/app/src/lib/routes/approvals/routes/home/home.component.ts
index 5ed9626fa..dd68c5e1a 100644
--- a/project/ws/app/src/lib/routes/approvals/routes/home/home.component.ts
+++ b/project/ws/app/src/lib/routes/approvals/routes/home/home.component.ts
@@ -25,6 +25,7 @@ export class HomeComponent implements OnInit, AfterViewInit, OnDestroy {
   profileData: any[] = []
   profileDataKeys: any[] = []
   configSvc: any
+  isChangeLog = false
 
   @HostListener('window:scroll', ['$event'])
   handleScroll() {

From afc0c3466fcbe32c88b50c6800f82dddd87fb2fd Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Wed, 7 Feb 2024 16:11:03 +0530
Subject: [PATCH 489/887] lint fixed

---
 .../category-drop-down/category-drop-down.component.ts        | 2 +-
 .../training-plan/components/filter/filter.component.ts       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
index 02b342238..6b107c0e2 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/category-drop-down/category-drop-down.component.ts
@@ -230,7 +230,7 @@ export class CategoryDropDownComponent implements OnInit, OnChanges {
         secondaryAction: dialogData.secondaryAction,
         event: dialogData.event,
       },
-      autoFocus: false
+      autoFocus: false,
     })
 
     this.dialogRef.afterClosed().subscribe((res: any) => {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
index 225eae7f7..71df843f2 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/filter/filter.component.ts
@@ -298,10 +298,10 @@ export class FilterComponent implements OnInit, AfterContentChecked {
 
     if (this.from === 'content') {
       // this.getFilterData.emit(this.filterObj)
-      //this.tpdsSvc.getFilterDataObject.next(this.filterObj)
+      // this.tpdsSvc.getFilterDataObject.next(this.filterObj)
     } else {
       // this.getFilterData.emit(this.assigneeFilterObj)
-      //this.tpdsSvc.getFilterDataObject.next(this.assigneeFilterObj)
+      // this.tpdsSvc.getFilterDataObject.next(this.assigneeFilterObj)
     }
 
     if (this.checkboxes) {

From ccc7970c4193a1643e9b755a9109071a5a17aa48 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Wed, 7 Feb 2024 16:27:50 +0530
Subject: [PATCH 490/887] removed inline css

---
 .../src/lib/routes/approvals/routes/home/home.component.html   | 2 +-
 .../src/lib/routes/approvals/routes/home/home.component.scss   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/approvals/routes/home/home.component.html b/project/ws/app/src/lib/routes/approvals/routes/home/home.component.html
index 753628446..26bb58e79 100644
--- a/project/ws/app/src/lib/routes/approvals/routes/home/home.component.html
+++ b/project/ws/app/src/lib/routes/approvals/routes/home/home.component.html
@@ -33,7 +33,7 @@
         </div>
       </div>
     </div>
-    <div class="flex-1" style="border-left: 1px solid #0000000f;" *ngIf="isChangeLog">
+    <div class="flex-1 change-log-main" *ngIf="isChangeLog">
       <ng-container id="changelog">
         <div>
           <label class="change-log-text margin-top-l margin-bottom-l margin-left-m margin-right-m">Change log</label>
diff --git a/project/ws/app/src/lib/routes/approvals/routes/home/home.component.scss b/project/ws/app/src/lib/routes/approvals/routes/home/home.component.scss
index 3a6462316..0c9128d7b 100644
--- a/project/ws/app/src/lib/routes/approvals/routes/home/home.component.scss
+++ b/project/ws/app/src/lib/routes/approvals/routes/home/home.component.scss
@@ -330,6 +330,9 @@ a:not([href]):not([tabindex]) {
   color: #999999
 
 }
+.change-log-main {
+  border-left: 1px solid #0000000f;
+}
 
 .change-log-wrapper{
   border-bottom: 1px solid #ebe5e5;

From af1f02eb0daebd8c3517d99604465f4eba4cbac6 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Wed, 21 Feb 2024 15:00:00 +0530
Subject: [PATCH 491/887] approval label fixed-KAR-314

---
 .../routes/basic-info/basic-info.component.html    | 10 +++++-----
 .../routes/position/position.component.html        |  6 +++---
 .../blended-home/blended-home.component.scss       |  2 ++
 .../routes/view-event/view-event.component.html    | 12 ++++++------
 .../routes/view-user/view-user.component.html      | 14 +++++++-------
 5 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.html b/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.html
index 16ef60d3a..addc2e8fa 100644
--- a/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.html
+++ b/project/ws/app/src/lib/routes/approvals/routes/basic-info/basic-info.component.html
@@ -68,13 +68,13 @@
                 </mat-grid-tile>
 
                 <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                  <label class="appr-text-label">Domicile medium (Mother tongue)</label>
+                  <label class="appr-text-label">Mother tongue</label>
                   <input type="text" [disabled]="true"
                     [value]="basicInfo.domicileMedium ? basicInfo.domicileMedium : ''" class="appr-text-field">
                 </mat-grid-tile>
 
                 <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                  <label class="appr-text-label">Other languages known</label>
+                  <label class="appr-text-label">Other Known Languages</label>
                   <input type="text" [disabled]="true"
                     [value]="basicInfo.knownLanguages ? basicInfo.knownLanguages : ''" class="appr-text-field">
                 </mat-grid-tile>
@@ -102,13 +102,13 @@
                 </mat-grid-tile>
 
                 <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                  <label class="appr-text-label">Postal address</label>
+                  <label class="appr-text-label">Official Postal address</label>
                   <textarea [disabled]="true" rows="2" [value]="basicInfo.postalAddress"
                     class="appr-text-field"></textarea>
                 </mat-grid-tile>
 
-                <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                  <label class="appr-text-label">Pin code</label>
+                <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper mt-1">
+                  <label class="appr-text-label">Pin Code</label>
                   <input type="text" [disabled]="true" [value]="basicInfo.pincode" class="appr-text-field">
                 </mat-grid-tile>
 
diff --git a/project/ws/app/src/lib/routes/approvals/routes/position/position.component.html b/project/ws/app/src/lib/routes/approvals/routes/position/position.component.html
index d58d2184c..d5628ef00 100644
--- a/project/ws/app/src/lib/routes/approvals/routes/position/position.component.html
+++ b/project/ws/app/src/lib/routes/approvals/routes/position/position.component.html
@@ -48,7 +48,7 @@
                 </mat-grid-tile>
                 <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                   <label class="appr-text-label">Description</label>
-                  <textarea [disabled]="true" rows="3"
+                  <textarea [disabled]="true" rows="2"
                     [value]="professionalDetails.description ? professionalDetails.description : ''"
                     class="appr-text-field"></textarea>
                 </mat-grid-tile>
@@ -103,8 +103,8 @@
                     [value]="professionalDetails.location ? professionalDetails.location : ''" class="appr-text-field">
                 </mat-grid-tile>
                 <mat-grid-tile [colspan]="2" [rowspan]="1" class="input-wrapper">
-                  <label class="appr-text-label">Official postal address</label>
-                  <textarea [disabled]="true" rows="3"
+                  <label class="appr-text-label">Official Postal address</label>
+                  <textarea [disabled]="true" rows="2"
                     [value]="professionalDetails.completePostalAddress ? professionalDetails.completePostalAddress : ''"
                     class="appr-text-field"></textarea>
                 </mat-grid-tile>
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.scss b/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.scss
index 8778775bc..faa45f858 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.scss
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/blended-home/blended-home.component.scss
@@ -7,6 +7,8 @@
   height: auto;
   min-height: 85vh;
   padding: 5px 15px;
+  padding: 5px 0px;
+
   // box-sizing: border-box;
   // width: 100%!important;
   // margin-left: auto!important;
diff --git a/project/ws/app/src/lib/routes/events/routes/view-event/view-event.component.html b/project/ws/app/src/lib/routes/events/routes/view-event/view-event.component.html
index 9ffe433bb..55ce6440c 100644
--- a/project/ws/app/src/lib/routes/events/routes/view-event/view-event.component.html
+++ b/project/ws/app/src/lib/routes/events/routes/view-event/view-event.component.html
@@ -91,13 +91,13 @@
                               </mat-grid-tile>
 
                               <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                                <label class="appr-text-label">Domicile medium (Mother tongue)</label>
+                                <label class="appr-text-label">Mother tongue</label>
                                 <input type="text" [disabled]="true" [value]="basicInfo.domicileMedium"
                                   class="appr-text-field">
                               </mat-grid-tile>
 
                               <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                                <label class="appr-text-label">Other languages known</label>
+                                <label class="appr-text-label">Other Known Languages</label>
                                 <input type="text" [disabled]="true" [value]="basicInfo.knownLanguages"
                                   class="appr-text-field">
                               </mat-grid-tile>
@@ -132,7 +132,7 @@
                               </mat-grid-tile>
 
                               <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                                <label class="appr-text-label">Pin code</label>
+                                <label class="appr-text-label">Pin Code</label>
                                 <input type="text" [disabled]="true" [value]="basicInfo.pincode"
                                   class="appr-text-field">
                               </mat-grid-tile>
@@ -302,7 +302,7 @@
                               </mat-grid-tile>
                               <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                                 <label class="appr-text-label">Description</label>
-                                <textarea [disabled]="true" rows="3" [value]="professionalDetails.description"
+                                <textarea [disabled]="true" rows="2" [value]="professionalDetails.description"
                                   class="appr-text-field"></textarea>
                               </mat-grid-tile>
                             </mat-grid-list>
@@ -356,12 +356,12 @@
                                   class="appr-text-field">
                               </mat-grid-tile>
                               <mat-grid-tile [colspan]="2" [rowspan]="1" class="input-wrapper">
-                                <label class="appr-text-label">Official postal address</label>
+                                <label class="appr-text-label">Official Postal address</label>
                                 <textarea [disabled]="true" rows="3" [value]="professionalDetails.completePostalAddress"
                                   class="appr-text-field"></textarea>
                               </mat-grid-tile>
                               <mat-grid-tile [colspan]="2" [rowspan]="1" class="input-wrapper">
-                                <label class="appr-text-label">Pin code</label>
+                                <label class="appr-text-label">Pin Code</label>
                                 <input type="text" [disabled]="true" [value]="professionalDetails.industry"
                                   class="appr-text-field">
                               </mat-grid-tile>
diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
index e7783c603..fcfa49382 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.html
@@ -93,14 +93,14 @@
                               </mat-grid-tile>
 
                               <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                                <label class="appr-text-label">Domicile medium (Mother tongue)</label>
+                                <label class="appr-text-label">Mother tongue</label>
                                 <input type="text" [disabled]="true"
                                   [value]="basicInfo.domicileMedium ? basicInfo.domicileMedium : ''"
                                   class="appr-text-field">
                               </mat-grid-tile>
 
                               <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                                <label class="appr-text-label">Other languages known</label>
+                                <label class="appr-text-label">Other Known Languages</label>
                                 <input type="text" [disabled]="true"
                                   [value]="basicInfo.knownLanguages ? basicInfo.knownLanguages : ''"
                                   class="appr-text-field">
@@ -140,7 +140,7 @@
                               </mat-grid-tile>
 
                               <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                                <label class="appr-text-label">Pin code</label>
+                                <label class="appr-text-label">Pin Code</label>
                                 <input type="text" [disabled]="true"
                                   [value]="basicInfo.pincode ? basicInfo.pincode : ''" class="appr-text-field">
                               </mat-grid-tile>
@@ -324,7 +324,7 @@
                                 </mat-grid-tile>
                                 <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                                   <label class="appr-text-label">Description</label>
-                                  <textarea [disabled]="true" rows="3"
+                                  <textarea [disabled]="true" rows="2"
                                     [value]="professionalDetails.description ? professionalDetails.description : ''"
                                     class="appr-text-field"></textarea>
                                 </mat-grid-tile>
@@ -385,14 +385,14 @@
                                   <input type="text" [disabled]="true" [value]="professionalDetails.location"
                                     class="appr-text-field">
                                 </mat-grid-tile> -->
-                                <mat-grid-tile [colspan]="2" [rowspan]="1" class="input-wrapper">
-                                  <label class="appr-text-label">Official postal address</label>
+                                <mat-grid-tile rowHeight="110px" [colspan]="2" [rowspan]="1" class="input-wrapper">
+                                  <label class="appr-text-label">Office Postal Address</label>
                                   <textarea [disabled]="true" rows="3"
                                     [value]="employmentDetails && employmentDetails.officialPostalAddress ? employmentDetails.officialPostalAddress : ''"
                                     class="appr-text-field"></textarea>
                                 </mat-grid-tile>
                                 <mat-grid-tile [colspan]="2" [rowspan]="1" class="input-wrapper">
-                                  <label class="appr-text-label">Pin code</label>
+                                  <label class="appr-text-label">Office Pin Code</label>
                                   <input type="text" [disabled]="true"
                                     [value]="employmentDetails && employmentDetails.pinCode ? employmentDetails.pinCode : ''"
                                     class="appr-text-field">

From 42e16511b032ca8f054d4a76d8bfc38a1d17c1df Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Tue, 27 Feb 2024 17:57:09 +0530
Subject: [PATCH 492/887] KAR-348 archived batches fixed

---
 .../batch-list/batch-list.component.html      | 37 ++++++++
 .../batch-list/batch-list.component.ts        | 89 ++++++++++---------
 2 files changed, 85 insertions(+), 41 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
index 0b5edd9f8..d63548922 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
@@ -37,6 +37,43 @@
           </div>
         </div>
       </ng-container>
+
+
+      <ng-container>
+        <div class="flex-4 mobile-margin mat-h2 margin-top-m">
+          Archived batches
+        </div>
+        <div class="batches-lsit" *ngIf="programData && arcBatchList && arcBatchList.length > 0">
+          <div class="grey-box ws-mat-accent-border cursor-pointer margin-bottom-m margin-right-l demo-section"
+            (click)="viewDetails(batch)" *ngFor="let batch of arcBatchList" [matBadge]="batch.newrequestsCount"
+            matBadgeColor="warn">
+            <div class="padding-left-s padding-right-s padding-top-s margin-remove title-div">
+              <span class="float-left mat-subheading-1 margin-remove">
+                <span *ngIf="batch.newrequestsCount > 0" class="circle"></span>
+                {{batch.name}}
+              </span>
+
+            </div>
+            <div class="padding-left-s padding-right-s mat-body-2">
+              <p class="margin-remove sub-header">Start date and end date</p>
+              <p class="margin-remove"><mat-icon>event</mat-icon> {{batch.startDate | date: 'dd/MMM/yyyy'}} -
+                {{batch.endDate | date: 'dd/MMM/yyyy'}}</p>
+              <p class="margin-remove  extra-padding sub-header">Last enrolment date</p>
+              <p class="margin-remove"><mat-icon>event</mat-icon> {{batch.enrollmentEndDate | date:'dd/MMM/yyyy'}}</p>
+            </div>
+            <div class="padding-left-s padding-right-s mat-body-2 extra-padding">
+              <p class="margin-remove"><mat-icon>person</mat-icon>
+                {{batch.learnersCount}}/{{batch.batchAttributes?.currentBatchSize || 50}} learners enrolled
+              </p>
+            </div>
+          </div>
+        </div>
+        <div class="batches-lsit" *ngIf="arcBatchList && arcBatchList.length === 0">
+          <div class="margin-top-l">
+            No Archived batches yet
+          </div>
+        </div>
+      </ng-container>
     </mat-card-content>
   </mat-card>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
index cb8b24887..679921ebf 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
@@ -15,6 +15,8 @@ export class BatchListComponent implements OnInit {
   breadcrumbs: any
   userProfile: any
   batchesList: any = []
+  arcBatchList: any = []
+
 
   constructor(private router: Router, private activeRouter: ActivatedRoute, private bpService: BlendedApporvalService) {
     const currentState = this.router.getCurrentNavigation()
@@ -34,30 +36,32 @@ export class BatchListComponent implements OnInit {
           this.programData.batches.forEach((b: any) => {
             // b.newrequestsCount = this.getNewRequestsList(b.batchId)
             const allowedBatch = today.isSameOrBefore(moment(b.endDate || new Date()), 'day')
+            const archivedBatch = today.isAfter(moment(b.endDate || new Date()), 'day')
             if (allowedBatch) {
               this.batchesList.push(b)
-              const request = {
-                serviceName: 'blendedprogram',
-                applicationStatus: 'SEND_FOR_MDO_APPROVAL',
-                applicationIds: [b.batchId],
-                limit: 100,
-                offset: 0,
-                deptName: this.userProfile.channel,
-              }
-              // b.newrequestsCount = Math.floor(Math.random() * (100 - 0 + 0)) + 0
-              b.learnersCount = 0
-              this.bpService.getRequests(request).subscribe((resnew: any) => {
-                if (resnew && resnew.result && resnew.result.data && resnew.result.data.length > 0) {
-                  b.newrequestsCount = resnew.result.data.length
-                }
-              })
-              this.bpService.getLearners(b.batchId, this.userProfile.channel).subscribe((r: any) => {
-                if (r && r.length > 0) {
-                  b.learnersCount = r.length
-                }
-              })
+            } else if (archivedBatch) {
+              this.arcBatchList.push(b)
             }
-
+            const request = {
+              serviceName: 'blendedprogram',
+              applicationStatus: 'SEND_FOR_MDO_APPROVAL',
+              applicationIds: [b.batchId],
+              limit: 100,
+              offset: 0,
+              deptName: this.userProfile.channel,
+            }
+            // b.newrequestsCount = Math.floor(Math.random() * (100 - 0 + 0)) + 0
+            b.learnersCount = 0
+            this.bpService.getRequests(request).subscribe((resnew: any) => {
+              if (resnew && resnew.result && resnew.result.data && resnew.result.data.length > 0) {
+                b.newrequestsCount = resnew.result.data.length
+              }
+            })
+            this.bpService.getLearners(b.batchId, this.userProfile.channel).subscribe((r: any) => {
+              if (r && r.length > 0) {
+                b.learnersCount = r.length
+              }
+            })
           })
         }
       }
@@ -85,30 +89,33 @@ export class BatchListComponent implements OnInit {
           const today = moment(new Date())
           this.programData.batches.forEach((b: any) => {
             const allowedBatch = today.isSameOrBefore(moment(b.endDate || new Date()), 'day')
+            const archivedBatch = today.isAfter(moment(b.endDate || new Date()), 'day')
             // b.newrequestsCount = this.getNewRequestsList(b.batchId)
             if (allowedBatch) {
               this.batchesList.push(b)
-              const request = {
-                serviceName: 'blendedprogram',
-                applicationStatus: 'SEND_FOR_MDO_APPROVAL',
-                applicationIds: [b.batchId],
-                limit: 100,
-                offset: 0,
-                deptName: this.userProfile.channel,
-              }
-              b.learnersCount = 0
-              // b.newrequestsCount = Math.floor(Math.random() * (100 - 0 + 0)) + 0
-              this.bpService.getRequests(request).subscribe((resnew: any) => {
-                if (resnew && resnew.result && resnew.result.data && resnew.result.data.length > 0) {
-                  b.newrequestsCount = resnew.result.data.length
-                }
-              })
-              this.bpService.getLearners(b.batchId, this.userProfile.channel).subscribe((r: any) => {
-                if (r && r.length > 0) {
-                  b.learnersCount = r.length
-                }
-              })
+            } else if (archivedBatch) {
+              this.arcBatchList.push(b)
+            }
+            const request = {
+              serviceName: 'blendedprogram',
+              applicationStatus: 'SEND_FOR_MDO_APPROVAL',
+              applicationIds: [b.batchId],
+              limit: 100,
+              offset: 0,
+              deptName: this.userProfile.channel,
             }
+            b.learnersCount = 0
+            // b.newrequestsCount = Math.floor(Math.random() * (100 - 0 + 0)) + 0
+            this.bpService.getRequests(request).subscribe((resnew: any) => {
+              if (resnew && resnew.result && resnew.result.data && resnew.result.data.length > 0) {
+                b.newrequestsCount = resnew.result.data.length
+              }
+            })
+            this.bpService.getLearners(b.batchId, this.userProfile.channel).subscribe((r: any) => {
+              if (r && r.length > 0) {
+                b.learnersCount = r.length
+              }
+            })
           })
         }
       }

From ec03d6b3ef2ce1d33809e89a3e018d939295815a Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Tue, 27 Feb 2024 17:58:59 +0530
Subject: [PATCH 493/887] lint fixed

---
 .../components/batch-list/batch-list.component.ts                | 1 -
 1 file changed, 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
index 679921ebf..25cb68c0f 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.ts
@@ -17,7 +17,6 @@ export class BatchListComponent implements OnInit {
   batchesList: any = []
   arcBatchList: any = []
 
-
   constructor(private router: Router, private activeRouter: ActivatedRoute, private bpService: BlendedApporvalService) {
     const currentState = this.router.getCurrentNavigation()
     this.programID = this.activeRouter.snapshot.params.id

From 3bdc5dbbd8ea89a327dc66fcaf27bf2896123fb7 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Thu, 29 Feb 2024 10:37:32 +0530
Subject: [PATCH 494/887] bug fix kar-384

---
 .../training-plan/components/search/search.component.ts   | 4 +---
 .../components/standard-card/standard-card.component.ts   | 8 ++++----
 .../routes/create-plan/create-plan.component.ts           | 3 +++
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
index 05db59846..6c5e9342f 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/search/search.component.ts
@@ -156,9 +156,7 @@ export class SearchComponent implements OnInit {
       }
       this.trainingPlanService.getAllContent(filterObj).subscribe((res: any) => {
         let finResult = []
-        if (this.tpdsSvc.trainingPlanContentData.data
-          && this.tpdsSvc.trainingPlanContentData.data
-          && this.tpdsSvc.trainingPlanContentData.data.content) {
+        if (this.tpdsSvc.trainingPlanContentData.data && this.tpdsSvc.trainingPlanContentData.data.content) {
           finResult = this.tpdsSvc.trainingPlanContentData.data.content.filter((sitem: any) => {
             if (sitem) {
               return sitem.selected
diff --git a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
index 97a63467e..9cfaec858 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/components/standard-card/standard-card.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, Output, OnInit, OnChanges, ChangeDetectorRef, ViewChild } from '@angular/core'
+import { Component, EventEmitter, Input, Output, OnInit, ChangeDetectorRef, ViewChild, AfterViewChecked } from '@angular/core'
 import { MatPaginator, PageEvent } from '@angular/material'
 import { TrainingPlanDataSharingService } from '../../services/training-plan-data-share.service'
 import { SafeUrl } from '@angular/platform-browser'
@@ -8,7 +8,7 @@ import { SafeUrl } from '@angular/platform-browser'
   templateUrl: './standard-card.component.html',
   styleUrls: ['./standard-card.component.scss'],
 })
-export class StandardCardComponent implements OnInit, OnChanges {
+export class StandardCardComponent implements OnInit, AfterViewChecked {
   @Input() cardSize: any
   @Input() checkboxVisibility: any = true
   @Input() contentData: any[] = []
@@ -17,7 +17,7 @@ export class StandardCardComponent implements OnInit, OnChanges {
   @Input() count = 0
   @Output() handleSelectedChips = new EventEmitter()
   @Output() selectedContentRemoved = new EventEmitter<any>()
-  @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | any
+  @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator | any
   dataSource: any
   selectedContent: any[] = []
   startIndex = 0
@@ -39,7 +39,7 @@ export class StandardCardComponent implements OnInit, OnChanges {
     }
   }
 
-  ngOnChanges() {
+  ngAfterViewChecked(): void {
     this.changeDetectorRef.detectChanges()
   }
 
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
index 681b94384..4d0c4b91f 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-plan/create-plan.component.ts
@@ -48,7 +48,10 @@ export class CreatePlanComponent implements OnInit, OnDestroy {
       if (contentData.contentList && contentData.contentList.length > 0) {
         contentData.contentList.forEach((ele: any) => {
           this.tpdsSvc.trainingPlanStepperData['contentList'].push(ele.identifier)
+          ele.selected = true
         })
+        this.tpdsSvc.trainingPlanContentData = { data: { content: contentData.contentList } }
+
       }
       this.tpdsSvc.trainingPlanStepperData['contentType'] = contentData.contentType
       this.tpdsSvc.trainingPlanStepperData['assignmentType'] = contentData.assignmentType

From 401f0002a01dda5741ce82e1972a91b6ba2ee744 Mon Sep 17 00:00:00 2001
From: abhishek-K-P <abishek.koira@tarento.com>
Date: Thu, 29 Feb 2024 11:00:48 +0530
Subject: [PATCH 495/887] in users changed tab name to Registered

---
 .../lib/routes/home/routes/users-view/users-view.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index 52f19d9e2..042896b61 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -20,7 +20,7 @@
             (click)="filter('underreview')" role="button">Under review</a> -->
           <a routerLink="/app/home/users/active" routerLinkActive="router-link-active" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'active',
               'ws-mat-accent-border font-medium':currentFilter !== 'active'}" mat-button
-            (click)="filter('active'); tabTelemetry('active', 0)" role="button">Active</a>
+            (click)="filter('active'); tabTelemetry('active', 0)" role="button">Registered</a>
           <a routerLink="/app/home/users/inactive" routerLinkActive="router-link-active" class="filter-option"
             [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'inactive',
                           'ws-mat-accent-border font-medium':currentFilter !== 'inactive'}" mat-button

From cf3c17e1612c25ec5fd4c50ed95fd9fa79eda4d4 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Thu, 29 Feb 2024 13:10:37 +0530
Subject: [PATCH 496/887] approval label changes on list

---
 .../routes/approvals/approvals.component.ts   | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
index 6f186c465..e00b48b73 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
@@ -119,6 +119,20 @@ export class ApprovalsComponent implements OnInit, OnDestroy {
   }
 
   fetchApprovals() {
+    const conditions = [
+      ['location', 'Country'],
+      ['designation', 'Designation'],
+      ['group', 'Group'],
+      ['name', 'Organisation Name'],
+      ['orgNameOther', 'Other Organisation Name'],
+      ['industry', 'Industry'],
+      ['industryOther', 'Other Industry'],
+      ['doj', 'Date of Joining'],
+      ['organisationType', 'Type of Organisation'],
+      ['orgDesc', 'Organisation Description'],
+      ['verifiedKarmayogi', 'Verified Karmayogi'],
+    ]
+
     if (this.departName) {
       const req = {
         serviceName: 'profile',
@@ -163,8 +177,9 @@ export class ApprovalsComponent implements OnInit, OnDestroy {
             // ${currentdate.getMinutes()} :
             // ${currentdate.getSeconds()}`,
             // requestedon: this.datePipe.transform(currentdate, 'dd MMM y'),
+            // fields: keys.slice(0, -1),
             requestedon: currentdate,
-            fields: keys.slice(0, -1),
+            fields: this.replaceWords(keys, conditions),
             userWorkflow: approval,
             tag: (approval.userInfo && approval.userInfo.tag) ? `${approval.userInfo.tag}` : '',
           })
@@ -185,6 +200,12 @@ export class ApprovalsComponent implements OnInit, OnDestroy {
     return this.data
   }
 
+  replaceWords(inputString: any, wordConditions: any) {
+    return wordConditions.reduce((acc: any, [word, condition]: any) => {
+      return acc.replace(new RegExp(word, 'gi'), condition)
+    },                           inputString)
+  }
+
   onPaginateChange(event: PageEvent) {
     this.pageIndex = event.pageIndex
     this.limit = event.pageSize

From cd00b2599fdeaef75075325e76e98e8b9b055151 Mon Sep 17 00:00:00 2001
From: Nazir <nazirhussain07@gmail.com>
Date: Fri, 1 Mar 2024 11:32:25 +0530
Subject: [PATCH 497/887] 2024_03_01 - on approval - Accept all and Reject all
 added

---
 .../needs-approval.component.html             | 12 ++++
 .../needs-approval.component.ts               | 72 +++++++++++++++++++
 2 files changed, 84 insertions(+)

diff --git a/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.html b/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.html
index f5ef521d3..081323fec 100644
--- a/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.html
+++ b/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.html
@@ -32,6 +32,18 @@
                 </button>
               </div>
             </ng-container>
+            <div style="margin-top: 17px; margin-left: 155px;">
+              <button mat-icon-button aria-label="Reject" id="reject"
+                (click)="onClickAllHandleWorkflow(needApprovalList,'REJECTALL')">
+                <span class="mat-button-wrapper" style="color: white; padding:13px;"> Reject All </span>
+                <!-- <mat-icon class="reject" style="width:100px;">Reject All</mat-icon> -->
+              </button>
+              <button mat-icon-button aria-label="Accept" id="accept" class="accept-btn"
+                (click)="onClickAllHandleWorkflow(needApprovalList,'APPROVEALL')">
+                <span class="mat-button-wrapper" style="color:white; padding:13px;"> Approve All </span>
+                <!-- <mat-icon class="accept" style="width:100px;">Approve All</mat-icon> -->
+              </button>
+            </div>
           </div>
           <div class="w-full profile-cols-full bg-grey" *ngIf="needApprovalList.length <= 0">
             <ng-container>
diff --git a/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.ts b/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.ts
index 8568a7f88..17727bf99 100644
--- a/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.ts
+++ b/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.ts
@@ -28,6 +28,7 @@ export class NeedsApprovalComponent implements OnInit {
   profile!: NSProfileDataV2.IProfile
   profileData: any[] = []
   comment = ''
+  listupdateFieldValues: any[] = []
 
   constructor(
     private needApprService: NeedApprovalsService,
@@ -134,4 +135,75 @@ export class NeedsApprovalComponent implements OnInit {
   private openSnackBar(message: string) {
     this.matSnackBar.open(message)
   }
+
+  onClickAllHandleWorkflow(approvalList: any[], action: string) {
+    if (action === 'APPROVEALL') {
+      const dialogRef = this.dialog.open(this.approveDialog, {
+        width: '770px',
+      })
+      dialogRef.afterClosed().subscribe(result => {
+        if (result) {
+          this.onApproveOrRejectClick(req)
+        } else {
+          dialogRef.close()
+        }
+      })
+    } else {
+      const dialogRef = this.dialog.open(this.rejectDialog, {
+        width: '770px',
+      })
+      dialogRef.afterClosed().subscribe(result => {
+        if (result) {
+          this.onApproveOrRejectClick(req)
+        } else {
+          dialogRef.close()
+        }
+      })
+    }
+
+    if (approvalList.length > 0) {
+      approvalList.forEach((approvalAttribute: any) => {
+        this.listupdateFieldValues.push(
+          JSON.parse(approvalAttribute.wf.updateFieldValues)[0]
+        )
+      })
+    }
+
+    let user1Id = ''
+    const application1Id = ''
+    const wfId1 = ''
+
+    if (approvalList && approvalList.length > 0) {
+      approvalList.forEach(approvalItem => {
+        user1Id = approvalItem.wf.userId
+        application1Id: approvalItem.wf.applicationId
+        wfId1: approvalItem.wf.wfId
+      })
+    }
+
+    const req = {
+      action,
+      state: 'SEND_FOR_APPROVAL',
+      userId: user1Id,
+      applicationId: application1Id,
+      actorUserId: this.userwfData.userInfo.wid,
+      wfId: wfId1,
+      serviceName: 'profile',
+      updateFieldValues: this.listupdateFieldValues,
+    }
+
+    this.events.raiseInteractTelemetry(
+      {
+        type: TelemetryEvents.EnumInteractTypes.CLICK,
+        subType: TelemetryEvents.EnumInteractSubTypes.BTN_CONTENT,
+      },
+      {
+        id: application1Id,
+        type: TelemetryEvents.EnumIdtype.APPLICATION,
+
+      }
+    )
+
+  }
+
 }

From 11b0f0a525cbbd4392755cacdc79d9917eab2369 Mon Sep 17 00:00:00 2001
From: Afzal84 <mohd.afzal@tarento.com>
Date: Mon, 4 Mar 2024 11:06:43 +0530
Subject: [PATCH 498/887] fixed:- blended program fix

---
 .../components/batch-list/batch-list.component.html          | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
index d63548922..6bc971b56 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/batch-list/batch-list.component.html
@@ -45,11 +45,10 @@
         </div>
         <div class="batches-lsit" *ngIf="programData && arcBatchList && arcBatchList.length > 0">
           <div class="grey-box ws-mat-accent-border cursor-pointer margin-bottom-m margin-right-l demo-section"
-            (click)="viewDetails(batch)" *ngFor="let batch of arcBatchList" [matBadge]="batch.newrequestsCount"
-            matBadgeColor="warn">
+            (click)="viewDetails(batch)" *ngFor="let batch of arcBatchList">
             <div class="padding-left-s padding-right-s padding-top-s margin-remove title-div">
               <span class="float-left mat-subheading-1 margin-remove">
-                <span *ngIf="batch.newrequestsCount > 0" class="circle"></span>
+                <!-- <span *ngIf="batch.newrequestsCount > 0" class="circle"></span> -->
                 {{batch.name}}
               </span>
 

From cf1ba80c957f6db19819548a05daaba6219706ee Mon Sep 17 00:00:00 2001
From: Nazir <nazirhussain07@gmail.com>
Date: Mon, 4 Mar 2024 14:48:31 +0530
Subject: [PATCH 499/887] add accept all and reject all

---
 .../needs-approval.component.html             |  4 +-
 .../needs-approval.component.ts               | 90 +++++++++++--------
 2 files changed, 55 insertions(+), 39 deletions(-)

diff --git a/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.html b/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.html
index 081323fec..0f03630cd 100644
--- a/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.html
+++ b/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.html
@@ -34,12 +34,12 @@
             </ng-container>
             <div style="margin-top: 17px; margin-left: 155px;">
               <button mat-icon-button aria-label="Reject" id="reject"
-                (click)="onClickAllHandleWorkflow(needApprovalList,'REJECTALL')">
+                (click)="onClickAllHandleWorkflow(needApprovalList,'REJECT')">
                 <span class="mat-button-wrapper" style="color: white; padding:13px;"> Reject All </span>
                 <!-- <mat-icon class="reject" style="width:100px;">Reject All</mat-icon> -->
               </button>
               <button mat-icon-button aria-label="Accept" id="accept" class="accept-btn"
-                (click)="onClickAllHandleWorkflow(needApprovalList,'APPROVEALL')">
+                (click)="onClickAllHandleWorkflow(needApprovalList,'APPROVE')">
                 <span class="mat-button-wrapper" style="color:white; padding:13px;"> Approve All </span>
                 <!-- <mat-icon class="accept" style="width:100px;">Approve All</mat-icon> -->
               </button>
diff --git a/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.ts b/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.ts
index ffebea023..23d0bdc67 100644
--- a/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.ts
+++ b/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.ts
@@ -124,10 +124,14 @@ export class NeedsApprovalComponent implements OnInit {
     req.comment = this.comment
     this.needApprService.handleWorkflow(req).subscribe(res => {
       if (res.result.data) {
-        this.openSnackBar('Request Approved')
+        if (res.result.data.status === 'REJECTED') {
+          this.openSnackBar('Request Rejected Successfully')
+        }
+        else {
+          this.openSnackBar('Request Approved')
+        }
         this.comment = ''
-        this.needApprovalList = this.needApprovalList.filter(wf => wf.wfId !== res.result.data.wfIds[0]
-        )
+        this.needApprovalList = this.needApprovalList.filter(wf => wf.wfId !== res.result.data.wfIds[0])
       }
     })
   }
@@ -137,13 +141,40 @@ export class NeedsApprovalComponent implements OnInit {
   }
 
   onClickAllHandleWorkflow(approvalList: any[], action: string) {
-    if (action === 'APPROVEALL') {
+    let user1Id = ''
+    let application1Id = ''
+
+    if (approvalList && approvalList.length > 0) {
+      approvalList.forEach(approvalItem => {
+        user1Id = approvalItem.wf.userId
+        application1Id = approvalItem.wf.applicationId
+      })
+    }
+
+    if (action === 'APPROVE') {
       const dialogRef = this.dialog.open(this.approveDialog, {
         width: '770px',
       })
       dialogRef.afterClosed().subscribe(result => {
         if (result) {
-          this.onApproveOrRejectClick(req)
+          const req: any = {
+            action,
+            state: 'SEND_FOR_APPROVAL',
+            userId: user1Id,
+            actorUserId: this.userwfData.userInfo.wid,
+            serviceName: 'profile',
+          }
+
+          if (approvalList.length > 0) {
+            approvalList.forEach((approvalAttribute: any) => {
+              this.listupdateFieldValues = JSON.parse(approvalAttribute.wf.updateFieldValues)
+              req['applicationId'] = approvalAttribute.wf.applicationId
+              req['wfId'] = approvalAttribute.wf.wfId
+              req['updateFieldValues'] = this.listupdateFieldValues
+              this.onApproveOrRejectClick(req)
+            })
+          }
+
         } else {
           dialogRef.close()
         }
@@ -154,44 +185,29 @@ export class NeedsApprovalComponent implements OnInit {
       })
       dialogRef.afterClosed().subscribe(result => {
         if (result) {
-          this.onApproveOrRejectClick(req)
+          const req: any = {
+            action,
+            state: 'SEND_FOR_APPROVAL',
+            userId: user1Id,
+            actorUserId: this.userwfData.userInfo.wid,
+            serviceName: 'profile',
+          }
+
+          if (approvalList.length > 0) {
+            approvalList.forEach((approvalAttribute: any) => {
+              this.listupdateFieldValues = JSON.parse(approvalAttribute.wf.updateFieldValues)
+              req['applicationId'] = approvalAttribute.wf.applicationId
+              req['wfId'] = approvalAttribute.wf.wfId
+              req['updateFieldValues'] = this.listupdateFieldValues
+              this.onApproveOrRejectClick(req)
+            })
+          }
         } else {
           dialogRef.close()
         }
       })
     }
 
-    if (approvalList.length > 0) {
-      approvalList.forEach((approvalAttribute: any) => {
-        this.listupdateFieldValues.push(
-          JSON.parse(approvalAttribute.wf.updateFieldValues)[0]
-        )
-      })
-    }
-
-    let user1Id = ''
-    let application1Id = ''
-    let wfId1 = ''
-
-    if (approvalList && approvalList.length > 0) {
-      approvalList.forEach(approvalItem => {
-        user1Id = approvalItem.wf.userId
-        application1Id = approvalItem.wf.applicationId
-        wfId1 = approvalItem.wf.wfId
-      })
-    }
-
-    const req = {
-      action,
-      state: 'SEND_FOR_APPROVAL',
-      userId: user1Id,
-      applicationId: application1Id,
-      actorUserId: this.userwfData.userInfo.wid,
-      wfId: wfId1,
-      serviceName: 'profile',
-      updateFieldValues: this.listupdateFieldValues,
-    }
-
     this.events.raiseInteractTelemetry(
       {
         type: TelemetryEvents.EnumInteractTypes.CLICK,

From 93284c8f8136104e9e90d469f09a7bacf3e97ca4 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Thu, 7 Mar 2024 10:23:28 +0530
Subject: [PATCH 500/887] update for revert approv all and reject all

---
 .../routes/needs-approval/needs-approval.component.html      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.html b/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.html
index 0f03630cd..5f16c7b52 100644
--- a/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.html
+++ b/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.html
@@ -36,16 +36,15 @@
               <button mat-icon-button aria-label="Reject" id="reject"
                 (click)="onClickAllHandleWorkflow(needApprovalList,'REJECT')">
                 <span class="mat-button-wrapper" style="color: white; padding:13px;"> Reject All </span>
-                <!-- <mat-icon class="reject" style="width:100px;">Reject All</mat-icon> -->
               </button>
               <button mat-icon-button aria-label="Accept" id="accept" class="accept-btn"
                 (click)="onClickAllHandleWorkflow(needApprovalList,'APPROVE')">
                 <span class="mat-button-wrapper" style="color:white; padding:13px;"> Approve All </span>
-                <!-- <mat-icon class="accept" style="width:100px;">Approve All</mat-icon> -->
               </button>
             </div>
           </div>
-          <div class="w-full profile-cols-full bg-grey" *ngIf="needApprovalList.length <= 0">
+          <!--needApprovalList.length <= 0-->
+          <div class="w-full profile-cols-full bg-grey" *ngIf="false">
             <ng-container>
               <div class="appr-label" *ngIf="changeLog">
                 <label class="field-key">{{changeLog.fieldKey}}</label>

From 505a04d5a159afcc077515d1e25e2a64bdc21620 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Thu, 7 Mar 2024 10:24:31 +0530
Subject: [PATCH 501/887] update for revert approv all and reject all

---
 .../routes/needs-approval/needs-approval.component.html       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.html b/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.html
index 5f16c7b52..ee7d3f159 100644
--- a/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.html
+++ b/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.html
@@ -32,7 +32,7 @@
                 </button>
               </div>
             </ng-container>
-            <div style="margin-top: 17px; margin-left: 155px;">
+            <!-- <div style="margin-top: 17px; margin-left: 155px;">
               <button mat-icon-button aria-label="Reject" id="reject"
                 (click)="onClickAllHandleWorkflow(needApprovalList,'REJECT')">
                 <span class="mat-button-wrapper" style="color: white; padding:13px;"> Reject All </span>
@@ -41,7 +41,7 @@
                 (click)="onClickAllHandleWorkflow(needApprovalList,'APPROVE')">
                 <span class="mat-button-wrapper" style="color:white; padding:13px;"> Approve All </span>
               </button>
-            </div>
+            </div> -->
           </div>
           <!--needApprovalList.length <= 0-->
           <div class="w-full profile-cols-full bg-grey" *ngIf="false">

From 05c6d2867e0419728ccbc568555bdc1bc2372292 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Tue, 12 Mar 2024 14:30:12 +0530
Subject: [PATCH 502/887] Opereational reports new ui

---
 .../head/_services/telemetry.event.model.ts   |   1 +
 .../ws/app/src/lib/routes/home/home.module.ts |  10 +-
 .../admins-table/admins-table.component.html  |  59 +++
 .../admins-table/admins-table.component.scss  |  59 +++
 .../admins-table.component.spec.ts            |  25 ++
 .../admins-table/admins-table.component.ts    |  50 +++
 .../reports-section.component.html            | 112 ++++--
 .../reports-section.component.scss            | 132 +++++--
 .../reports-section.component.ts              | 353 ++++++++++++++----
 .../reports-video.component.html              |   7 +
 .../reports-video.component.scss              |  27 ++
 .../reports-video.component.spec.ts           |  25 ++
 .../reports-video/reports-video.component.ts  |  28 ++
 .../home/services/download-report.service.ts  |  37 +-
 src/styles.scss                               |  15 +-
 15 files changed, 797 insertions(+), 143 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.html
 create mode 100644 project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.scss
 create mode 100644 project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.ts
 create mode 100644 project/ws/app/src/lib/routes/home/routes/reports-video/reports-video.component.html
 create mode 100644 project/ws/app/src/lib/routes/home/routes/reports-video/reports-video.component.scss
 create mode 100644 project/ws/app/src/lib/routes/home/routes/reports-video/reports-video.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/home/routes/reports-video/reports-video.component.ts

diff --git a/project/ws/app/src/lib/head/_services/telemetry.event.model.ts b/project/ws/app/src/lib/head/_services/telemetry.event.model.ts
index b38caa0a0..a845b4c0d 100644
--- a/project/ws/app/src/lib/head/_services/telemetry.event.model.ts
+++ b/project/ws/app/src/lib/head/_services/telemetry.event.model.ts
@@ -16,6 +16,7 @@ export namespace TelemetryEvents {
     APPROVAL_TAB = 'approval-tab',
     SCROLLY_MENU = 'scrolly-menu',
     NOMINATE_BTN = 'nominate-learners-btn',
+    BTN_DOWNLOAD_REPORTS = 'btn-download-reports'
 
   }
   export enum EnumIdtype {
diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index 05d199224..0b4cc70eb 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core'
 import { CommonModule } from '@angular/common'
-import { PipeFilterModule, PipeHtmlTagRemovalModule, PipeOrderByModule, PipeRelativeTimeModule } from '@sunbird-cb/utils'
+import { PipeDurationTransformModule, PipeFilterModule, PipeHtmlTagRemovalModule, PipeOrderByModule, PipeRelativeTimeModule } from '@sunbird-cb/utils'
 import { MatGridListModule } from '@angular/material/grid-list'
 import { MatExpansionModule } from '@angular/material/expansion'
 import { MatDividerModule } from '@angular/material/divider'
@@ -20,6 +20,7 @@ import {
   MatRadioModule,
   MatTabsModule,
   MatCheckboxModule,
+  MatDatepickerModule,
 } from '@angular/material'
 import { MatMenuModule } from '@angular/material/menu'
 import { MatPaginatorModule } from '@angular/material/paginator'
@@ -64,6 +65,8 @@ import { BlendedApprovalsComponent } from './routes/blended-approvals/blended-ap
 import { ReportsSectionComponent } from './routes/reports-section/reports-section.component'
 import { TrainingPlanDashboardComponent } from './routes/training-plan-dashboard/training-plan-dashboard.component'
 import { TrainingPlanDashboardService } from './services/training-plan-dashboard.service'
+import { AdminsTableComponent } from './routes/admins-table/admins-table.component'
+import { ReportsVideoComponent } from './routes/reports-video/reports-video.component'
 @NgModule({
   declarations: [
     HomeComponent,
@@ -88,6 +91,8 @@ import { TrainingPlanDashboardService } from './services/training-plan-dashboard
     BlendedApprovalsComponent,
     ReportsSectionComponent,
     TrainingPlanDashboardComponent,
+    AdminsTableComponent,
+    ReportsVideoComponent,
   ],
   imports: [
     CommonModule,
@@ -140,12 +145,15 @@ import { TrainingPlanDashboardService } from './services/training-plan-dashboard
     MatTooltipModule,
     MatSortModule,
     UsersModule,
+    MatDatepickerModule,
+    PipeDurationTransformModule
   ],
   entryComponents: [
     AdduserpopupComponent,
     StaffdetailspopupComponent,
     BudgetschemepopupComponent,
     BudgetproofspopupComponent,
+    ReportsVideoComponent
   ],
   providers: [
     // CKEditorService,
diff --git a/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.html b/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.html
new file mode 100644
index 000000000..01c66f0bd
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.html
@@ -0,0 +1,59 @@
+<ng-container *ngIf="dataSource && dataSource.data.length > 0; else noDataFount">
+  <div>
+    <mat-table #table matSort [matSortActive]="tableHeaders!.sortColumn" [matSortDirection]="tableHeaders!.sortState"
+      [dataSource]="dataSource" class="example-table table1 responsiveTable">
+      <ng-container matColumnDef="{{col.key}}" *ngFor="let col of tableHeaders!.columns, let i = index">
+        <mat-header-cell *matHeaderCellDef mat-sort-header class=".h-400-r-14-l color-60"
+          [ngClass]="{ SNoCell: col.type === 'position' }"> {{col.displayName}}
+        </mat-header-cell>
+        <mat-cell *matCellDef="let element; let i = index" [ngSwitch]="col.type"
+          [ngClass]="{ SNoCell: col.type === 'position' }">
+          <ng-container *ngSwitchCase="'text'">
+            <span class="h-400-r-14-l color-87 textclass">
+              <div>{{element[col.key]}}</div>
+            </span>
+          </ng-container>
+          <ng-container *ngSwitchCase="'position'">
+            <span class="h-400-r-14-l color-87 textclass">
+              <div>{{i + 1}}</div>
+            </span>
+          </ng-container>
+          <ng-container *ngSwitchCase="'datePicker'">
+            <mat-form-field color="accent" appearance="outline" class="expireDateForm">
+              <input matInput [matDatepicker]="expireDate" placeholder="Enter date" [(ngModel)]="element[col.key]"
+                [min]="minDate" (dateChange)="enableAccessBtn(element)">
+              <mat-datepicker-toggle matSuffix [for]="expireDate">
+              </mat-datepicker-toggle>
+              <mat-datepicker #expireDate></mat-datepicker>
+            </mat-form-field>
+          </ng-container>
+          <ng-container *ngSwitchCase="'action'">
+            <ng-container *ngIf="element[col.key] ===true; else giveAccess">
+              <div class="flex successText">
+                <mat-icon class="mr-2">check_circle</mat-icon>
+                <span>Access Given</span>
+              </div>
+            </ng-container>
+            <ng-template #giveAccess>
+              <button mat-button [ngClass]="element.enableAccessBtn ? 'enableAccessBtn' : 'disableAccessBtn'"
+                (click)="emitSelectedDate(element)">
+                Give Access
+              </button>
+            </ng-template>
+          </ng-container>
+        </mat-cell>
+      </ng-container>
+      <mat-header-row *matHeaderRowDef="getFinalColumns()"></mat-header-row>
+      <mat-row *matRowDef="let row; columns: getFinalColumns();" (click)="selection.toggle(row);">
+      </mat-row>
+    </mat-table>
+  </div>
+</ng-container>
+
+<ng-template #noDataFount>
+  <mat-card>
+    <div class="font-medium ">
+      No data found
+    </div>
+  </mat-card>
+</ng-template>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.scss b/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.scss
new file mode 100644
index 000000000..abdb87887
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.scss
@@ -0,0 +1,59 @@
+
+
+.successText {
+  color: #1D8923;
+}
+
+.disableAccessBtn {
+  background-color: #212529 !important;
+  color: white !important;
+  pointer-events: none !important;
+  width: 125px;
+  opacity: 0.7;
+}
+
+.enableAccessBtn {
+  background-color: #1b4ca1 !important;
+  color: white !important;
+  width: 125px;
+}
+
+.mat-header-cell {
+    background-color: #f5f5f5;
+}
+
+.mat-header-row {
+    min-height: 40px;
+}
+
+.SNoCell {
+  max-width: 100px;
+}
+
+.expireDateForm {
+  width: 185px;
+
+  //To make form border radious
+  ::ng-deep .mat-form-field-outline-start {
+    border-radius: 28px 0 0 28px !important;
+    min-width: 28px !important;
+  }
+
+  ::ng-deep .mat-form-field-outline-end {
+    border-radius: 0 28px 28px 0 !important;
+    min-width: 28px !important;
+  }
+
+  //To adjust height
+  ::ng-deep .mat-form-field-flex > .mat-form-field-infix { padding: 0.4em 0.5em 0.7em !important;}
+  ::ng-deep .mat-form-field-label-wrapper { top: -1.5em; }
+
+  ::ng-deep .mat-form-field-appearance-outline.mat-form-field-can-float.mat-form-field-should-float .mat-form-field-label {
+    transform: translateY(-1.1em) scale(.75);
+    width: 133.33333%;
+  }
+
+  ::ng-deep .mat-form-field-wrapper {
+    padding: 1rem 0rem;
+  }
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.spec.ts b/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.spec.ts
new file mode 100644
index 000000000..5a81f8e2e
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AdminsTableComponent } from './admins-table.component';
+
+describe('AdminsTableComponent', () => {
+  let component: AdminsTableComponent;
+  let fixture: ComponentFixture<AdminsTableComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ AdminsTableComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AdminsTableComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.ts b/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.ts
new file mode 100644
index 000000000..8c85498ff
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.ts
@@ -0,0 +1,50 @@
+import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'
+import { MatSort, MatTableDataSource } from '@angular/material'
+import * as _ from 'lodash'
+
+@Component({
+  selector: 'ws-app-admins-table',
+  templateUrl: './admins-table.component.html',
+  styleUrls: ['./admins-table.component.scss']
+})
+export class AdminsTableComponent implements OnInit {
+
+  @Input() tableHeaders: any
+  @Input() tableData: any
+  dataSource!: any
+
+  @Output() updateAccess = new EventEmitter<any>();
+  @ViewChild(MatSort, { static: false }) set matSort(sort: MatSort) {
+    if (!this.dataSource.sort) {
+      this.dataSource.sort = sort
+    }
+  }
+
+  minDate = new Date();
+
+  constructor() {
+    this.dataSource = new MatTableDataSource<any>()
+  }
+
+  ngOnInit() {
+    this.dataSource.data = this.tableData
+  }
+
+  getFinalColumns() {
+    if (this.tableHeaders !== undefined) {
+      const columns = _.map(this.tableHeaders.columns, c => c.key)
+      return columns
+    }
+    return ''
+  }
+
+  enableAccessBtn(rowData: any) {
+    rowData.enableAccessBtn = true
+    rowData.assigned = false
+  }
+
+  emitSelectedDate(rowData: any) {
+    this.updateAccess.emit(rowData)
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html
index 6646faa96..93760a8d0 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html
@@ -1,27 +1,93 @@
-<div class="flex flex-4 flex-column reports-section">
-  <mat-card>
+<ng-container *ngIf="noteLoaded">
+  <div class="reports pt-4">
     <div class="flex-4 mobile-margin text-capitalize mat-h2">Reports</div>
-    <mat-card-content>
-      <!-- <ng-container class="margin-top-l">
-        <div class="flex">
-          <div *ngFor="let item of btnList" class="margin-right-m">
-            <button type="button" mat-button class="upload-btn" (click)="onButtonClick(item.type, $event)">
-              <mat-icon>vertical_align_bottom</mat-icon> {{item.name}}
-            </button>
+
+    <mat-card class="mb-8">
+
+      <mat-card-content class="flex justify-center gap-10">
+        <div>
+          <div class="flex-4 mobile-margin text-capitalize mat-h2">Note:</div>
+          <ng-container *ngFor="let note of reportsNoteList">
+            <div class="flex gap-4 mb-4">
+              <div>
+                <mat-icon class="infoIcon">info_outlined</mat-icon>
+              </div>
+              <div>{{note}}</div>
+            </div>
+          </ng-container>
+        </div>
+        <div class="reportsDemo flex justify-end">
+          <div class="reportsDemoVideo flex flex-column flex-middle justify-center" (click)="openVideoPopup()">
+            <mat-icon class="video_icon mb-2">play_circle</mat-icon>
+            <div>
+              Watch how it works
+            </div>
+          </div>
+        </div>
+      </mat-card-content>
+    </mat-card>
+
+    <mat-card>
+      <div class="flex-4 mobile-margin mat-h2">Download the Report</div>
+      <div class="flex gap-4 mb-1">
+        <div>
+          <mat-icon class="infoIcon ">info_outlined</mat-icon>
+        </div>
+        <div>Please click the download button to obtain the password-protected ZIP file containing all reports. After
+          downloading, you will receive the password to access the file.</div>
+      </div>
+      <div class="mt-4 mb-2">
+        <button mat-raised-button class="btn-reports-downlaod" (click)="downLoadReports($event)"
+          [ngClass]="{'disable-btn': !reportsAvailbale || !hassAccessToreports || reportsDownlaoding}"
+          [disabled]="!reportsAvailbale || !hassAccessToreports || reportsDownlaoding">All
+          Reports
+          <mat-icon>download_outlined</mat-icon></button>
+      </div>
+      <span class="updatedDate">Last updated on: {{lastUpdatedOn}}</span>
+
+      <ng-container *ngIf="showPasswordView">
+        <hr class="my-4" style="border-top: 0.1px solid #b9b9b9;">
+        <div class="flex-4 mobile-margin  mat-h2">Password to view these Reports</div>
+        <div class="flex gap-4">
+          <div>
+            <mat-icon class="infoIcon">info_outlined</mat-icon>
+          </div>
+          <div>A unique password is generated for each download. After every refresh or login, the previous password is
+            lost, and a new file with a new password is required.</div>
+          <div>
           </div>
-          <!-- <button type="button" mat-button class="upload-btn" (click)="onButtonClick('consumptionReport', $event)">
-            <mat-icon>vertical_align_bottom</mat-icon> Consumption Report
-          </button>
-          <button type="button" mat-button class="upload-btn" (click)="onButtonClick('assessmentReport', $event)">
-            <mat-icon>vertical_align_bottom</mat-icon> Assessment Report
-          </button> --
         </div>
-      </ng-container> -->
-      <ng-container class="margin-top-l" *ngIf="reportSectionData && reportSectionData.length > 0">
-        <ws-widget-org-user-table [tableData]='tabledata' [data]='reportSectionData'
-          (actionsClick)="downloadFullFile($event)">
-        </ws-widget-org-user-table>
+        <div class="flex flex-col">
+          <label class="mt-4 password-lable">
+            File Password
+          </label>
+          <div class="flex flex-middle password justify-between">
+            <mat-form-field appearance="outline" class="margin-top-xs password-input">
+              <input [type]="showPassword ? 'text' : 'password'" matInput [(ngModel)]="password" readonly>
+              <mat-icon (click)="showPassword = !showPassword" class="eye-icon">visibility</mat-icon>
+            </mat-form-field>
+            <mat-icon class="copy-icon" (click)="copyToClipboard()">content_copy</mat-icon>
+          </div>
+        </div>
+      </ng-container>
+    </mat-card>
+
+    <ng-container *ngIf="showAdminsTable">
+      <ng-container *ngIf="!showLoaderOnTable; else loader">
+        <div class="mt-8">
+          <ws-app-admins-table [tableHeaders]="adminTableData" [tableData]="adminTableDataSource"
+            (updateAccess)="updateAccess($event)"></ws-app-admins-table>
+        </div>
+        <!-- Removed after discussions with Himanshu -->
+        <!-- <div class="flex justify-end mt-4">
+        <button mat-raised-button class="laodMoreBtn" (click)="getAdmins()">Load more...</button>
+      </div> -->
       </ng-container>
-    </mat-card-content>
-  </mat-card>
-</div>
\ No newline at end of file
+    </ng-container>
+  </div>
+</ng-container>
+<ng-container *ngIf="!noteLoaded || reportsDownlaoding">
+  <div class="reports-loader">
+    <mat-spinner></mat-spinner>
+  </div>
+</ng-container>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.scss b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.scss
index 6d96884a4..721b5ceaf 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.scss
@@ -1,31 +1,117 @@
-.upload-btn {
-  //width: 150px;
-  border: 1px solid #DEDEDE;
-  border-radius: 4px;
-  color: #848484 !important;
-  font-family: 'Lato';
-  font-weight: 700;
-  font-size: 14px;
-}
+// .upload-btn {
+//   //width: 150px;
+//   border: 1px solid #DEDEDE;
+//   border-radius: 4px;
+//   color: #848484 !important;
+//   font-family: 'Lato';
+//   font-weight: 700;
+//   font-size: 14px;
+// }
+
+// ::ng-deep .p1-btn {
+//   box-shadow: none !important;
+//   padding: 0 !important;
+//   text-align: left !important;
+//   span {
+//     text-decoration: underline !important;
+//     color: #0075B7 !important;
+//   }
+// }
+
+// ::ng-deep .reports-section .cdk-column-reportName .textclass {
+//   cursor: default!important;
+// }
 
-::ng-deep .p1-btn {
-  box-shadow: none !important;
-  padding: 0 !important;
-  text-align: left !important;
-  span {
-    text-decoration: underline !important;
-    color: #0075B7 !important;
+// ::ng-deep .reports-section .cdk-column-reportType .textclass {
+//   cursor: default!important;
+// }
+
+// ::ng-deep .reports-section .cdk-column-reportUpdatedOn .textclass {
+//   cursor: default!important;
+// }
+
+.reports {
+  .infoIcon {
+    rotate: 180deg;
+    color: #000000;
+    opacity: 0.6;
+    font-size: 20px;
+    margin-top: -3px;
+    margin-left: -4px;
+  }
+
+  .reportsDemo {
+    width: 300px;
+
+    .reportsDemoVideo {
+      width: 290px;
+      height: 163px;
+      border-radius: 5px;
+      background-color: #FDEAD5;
+      font-weight: 600;
+      pointer-events: all;
+      cursor: pointer;
+
+      .video_icon {
+        font-size: 32px;
+      }
+    }
+  }
+
+  .btn-reports-downlaod {
+    background: #1b4ca1 !important;
+    color: white !important;
+    font-family: 'Lato';
+    font-weight: 700;
+    font-size: 14px;
   }
-}
 
-::ng-deep .reports-section .cdk-column-reportName .textclass {
-  cursor: default!important;
+  .disable-btn {
+    opacity: 0.6;
+  }
+
+  .updatedDate {
+    color: gray;
+    font-size: 12px;
+  }
+
+  .password-lable {
+    font-weight: 600;
+  }
+
+  .password {
+    width: 50%;
+
+    .password-input {
+      width: calc(100% - 50px);
+
+      ::ng-deep .mat-form-field-infix {
+        display: flex;
+        padding-top: 0.6rem;
+      }
+    }
+
+    .eye-icon {
+      cursor: pointer;
+      color: #000000;
+      opacity: 0.6;
+    }
+
+    .copy-icon {
+      cursor: copy;
+      margin-bottom: 10px;
+      color: #000000;
+      opacity: 0.6;
+    }
+  }
 }
 
-::ng-deep .reports-section .cdk-column-reportType .textclass {
-  cursor: default!important;
+.reports-loader {
+  position: fixed;
+  top: calc(50vh - 25px);
+  left: calc(50% + 135px);
 }
 
-::ng-deep .reports-section .cdk-column-reportUpdatedOn .textclass {
-  cursor: default!important;
+.fullHeigh {
+  height: 75vh;
 }
diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
index 858864db2..7ce57b743 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
@@ -1,10 +1,15 @@
-import { Component, OnInit, ViewChild } from '@angular/core'
+import { Component, OnInit } from '@angular/core'
 import { ActivatedRoute } from '@angular/router'
-import { environment } from '../../../../../../../../../src/environments/environment'
-import { MatPaginator, MatSnackBar, MatTableDataSource } from '@angular/material'
+import { MatDialog, MatSnackBar } from '@angular/material'
 import { DownloadReportService } from '../../services/download-report.service'
-import { ITableData } from '@sunbird-cb/collection/lib/ui-org-table/interface/interfaces'
 import { DatePipe } from '@angular/common'
+import { mergeMap } from 'rxjs/operators'
+import * as _ from 'lodash'
+import { forkJoin, of } from 'rxjs'
+import { ReportsVideoComponent } from '../reports-video/reports-video.component'
+import { EventService } from '@sunbird-cb/utils'
+import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
+import { HttpErrorResponse, HttpResponse } from '@angular/common/http'
 
 @Component({
   selector: 'ws-app-reports-section',
@@ -12,109 +17,297 @@ import { DatePipe } from '@angular/common'
   styleUrls: ['./reports-section.component.scss'],
 })
 export class ReportsSectionComponent implements OnInit {
-  @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | null = null
+  // @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | null = null
+  // btnList!: any
+  // tabledata!: ITableData
+  // dataSource: MatTableDataSource<any>
+  // reportSectionData: any
+  // lastUpdatedOn!: any
+
   configSvc!: any
-  btnList!: any
-  tabledata!: ITableData
-  dataSource: MatTableDataSource<any>
-  reportSectionData: any
-  lastUpdatedOn!: any
+  userDetails: any
+  lastUpdatedOn: string | null = ''
+  showPasswordView = false;
+  password = '';
+  showPassword = false;
+  showAdminsTable = false;
+  adminTableData: any
+  adminTableDataSource: any
+  showLoaderOnTable = false;
+  noteLoaded = false;
+  reportsNoteList: string[] = [];
+  hassAccessToreports = false
+  reportsAvailbale = false
+  reportsDownlaoding = false
 
   constructor(
     private activeRouter: ActivatedRoute,
-    private snackBar: MatSnackBar,
     private downloadService: DownloadReportService,
-    private datePipe: DatePipe
+    private datePipe: DatePipe,
+    private dialog: MatDialog,
+    private events: EventService,
+    private snackBar: MatSnackBar
   ) {
     this.configSvc = this.activeRouter.parent && this.activeRouter.parent.snapshot.data.configService
-    this.dataSource = new MatTableDataSource(this.reportSectionData)
-    this.dataSource.paginator = this.paginator
+    this.userDetails = this.configSvc.unMappedUser
   }
 
   ngOnInit() {
-    this.tabledata = {
+    this.noteLoaded = false
+    const getNoteDetails = true
+    this.getReportInfo()
+    this.setTableHeaders()
+    this.getAdminTableData(getNoteDetails)
+  }
+
+  getReportInfo() {
+    this.reportsAvailbale = false
+    this.downloadService.getReportInfo().subscribe({
+      next: (response) => {
+        if (response) {
+          this.lastUpdatedOn = response.lastModified ? this.datePipe.transform(response.lastModified, 'dd/MM/yy, hh:mm a') : ''
+          this.reportsAvailbale = response.fileMetaData!.empty === false && response.lastModified ? true : false
+        }
+      },
+      error: (error: HttpErrorResponse) => {
+        const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
+        this.openSnackbar(errorMessage)
+      }
+    })
+  }
+
+  //#region (setting admin table)
+  setTableHeaders() {
+    this.adminTableData = {
       columns: [
-        // { displayName: 'Id', key: 'identifier' },
-        { displayName: 'Report name', key: 'reportName' },
-        { displayName: 'Report type', key: 'reportType' },
-        { displayName: 'Last updated on', key: 'reportUpdatedOn' },
+        { displayName: 'S. No.', key: 'sno', type: 'position' },
+        { displayName: 'MDO Admin Name', key: 'MDOAdmin', type: 'text' },
+        { displayName: 'MDO Admin Email', key: 'MDOAdminemail', type: 'text' },
+        { displayName: 'Access Expiry Date', key: 'expiryDate', type: 'datePicker' },
+        { displayName: 'Action', key: 'assigned', type: 'action' },
       ],
-      needCheckBox: false,
-      needHash: false,
-      sortColumn: 'dateCreatedOn',
-      sortState: 'desc',
-      needUserMenus: false,
-      actions: [{ icon: '', label: 'Download', name: 'DownloadFile', type: 'Standard', disabled: false }],
-      actionColumnName: 'Action',
     }
+  }
 
-    this.reportSectionData = []
-    this.downloadService.fetchDownloadJson().subscribe((result: any) => {
-      this.btnList = result
-      this.downloadService.fetctReportsUpdatedOn(this.configSvc.userProfile.rootOrgId).subscribe((res: any) => {
-        this.lastUpdatedOn = res
-        this.getTableData()
-      },                                                                                         _err => {
-        this.getTableData()
+  getAdminTableData(getNoteDetails = false) {
+    const isMDOLeader = this.configSvc && this.userDetails!.roles!.includes('MDO_LEADER') ? true : false
+    this.showAdminsTable = isMDOLeader ? true : false
+    const filters = {
+      request: {
+        filters: {
+          rootOrgId: this.configSvc.userProfile.rootOrgId,
+          'organisations.roles': [
+            isMDOLeader ? 'MDO_ADMIN' : 'MDO_LEADER'
+          ]
+        }
+      }
+    }
+    const readAssessEndPoint = isMDOLeader ? 'leader/readaccess' : 'admin/readaccess'
+    this.showLoaderOnTable = true
+    forkJoin([
+      this.downloadService.getAdminsList(filters),
+      this.downloadService.getAccessDetails(readAssessEndPoint)
+    ])
+      .pipe(
+        mergeMap(([adminDetails, accessDetailsList]) => {
+          const formatedResponse: {
+            currentUserAccessDetails: any,
+            formatedAdminsList: any[]
+          } = {
+            currentUserAccessDetails: {},
+            formatedAdminsList: []
+          }
+          if (adminDetails && adminDetails.content) {
+            formatedResponse.currentUserAccessDetails = accessDetailsList && accessDetailsList.length > 0 ?
+              accessDetailsList.find((obj: any) => obj.userId === this.userDetails.id) : { reportAccessExpiry: '' }
+            adminDetails.content.forEach((user: any) => {
+              const accessDetails = accessDetailsList && accessDetailsList.length > 0 ?
+                accessDetailsList.find((obj: any) => obj.userId === user.id) : { reportAccessExpiry: '' }
+              if (this.userDetails.id !== user.id) {
+                const currentDate = this.datePipe.transform(new Date(), 'yyyy/MM/dd') || ''
+                const expireDate = this.datePipe.transform(_.get(accessDetails, 'reportAccessExpiry', ''), 'yyyy/MM/dd') || ''
+                const firstName = _.get(user, 'firstName', '')
+                // const fullName = user.lastName ? `${user.lastName}' '${firstName}` : firstName
+                const formatedUserDetails = {
+                  userID: user.id,
+                  MDOAdmin: firstName,
+                  MDOAdminemail: _.get(user, 'profileDetails.personalDetails.primaryEmail'),
+                  expiryDate: new Date(expireDate),
+                  assigned: expireDate >= currentDate,
+                  enableAccessBtn: false,
+                }
+                formatedResponse.formatedAdminsList.push(formatedUserDetails)
+              }
+            })
+          }
+          return of(formatedResponse)
+        })
+      )
+      .subscribe({
+        next: (response) => {
+          this.showLoaderOnTable = false
+          this.noteLoaded = true
+          this.adminTableDataSource = response.formatedAdminsList
+          if (getNoteDetails) {
+            const hasUsers = response.formatedAdminsList && response.formatedAdminsList.length ? true : false
+            this.getNoteList(isMDOLeader, hasUsers, _.get(response, 'currentUserAccessDetails.reportAccessExpiry', ''))
+          }
+        },
+        error: (error: HttpErrorResponse) => {
+          const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
+          this.openSnackbar(errorMessage)
+          this.noteLoaded = true
+          this.showLoaderOnTable = false
+          const userAccessExpireDate = this.datePipe.transform(_.get(this.userDetails, 'report_access_expiry'), 'yyyy/MM/dd') || ''
+          this.getNoteList(isMDOLeader, false, userAccessExpireDate)
+        }
       })
-    })
-    setTimeout(() => this.dataSource.paginator = this.paginator)
   }
+  //#endregion
 
-  getTableData() {
-    this.btnList.forEach((element: any) => {
-      const latUpdate: any = this.getLastModified(element.downloadReportFileName)
-      if (element.enabled) {
-        this.reportSectionData.push({
-          reportName: element.name,
-          reportType: element.reportType,
-          type: element.type,
-          fileName: element.downloadReportFileName,
-          reportUpdatedOn: latUpdate,
-        })
+  getNoteList(isMDOLeader: boolean, hasUsers: boolean, userAccessExpireDate: string) {
+    if (hasUsers) {
+      if (isMDOLeader) {
+        this.hassAccessToreports = true
+        this.reportsNoteList = [
+          `You can grant access to these reports to your existing MDO Admins. Similarly, if you want to onboard new MDO Admins, it can be done in the 'User' tab, and then grant the access.`,
+          `Please grant or renew access to these reports to the MDO Admin very carefully due to Personally Identifiable Information (PII) data security.`
+        ]
+      } else {
+        const todayDate = this.datePipe.transform(new Date(), 'yyyy-MM-dd') || ''
+        if (userAccessExpireDate === '') {
+          this.hassAccessToreports = false
+          this.reportsNoteList = [
+            `Currently, your MDO Leader has not granted you access to these reports.Kindly contact your MDO Leader to provide you access.`
+          ]
+        } else if (userAccessExpireDate >= todayDate) {
+          this.hassAccessToreports = true
+          this.reportsNoteList = [
+            `These reports contain Personally Identifiable Information (PII) data. Please use them cautiously.`,
+            `Your access to the report is available until ${userAccessExpireDate}. Please contact your MDO Leader to renew your access.`
+          ]
+        } else if (userAccessExpireDate < todayDate) {
+          this.hassAccessToreports = false
+          this.reportsNoteList = [
+            `Your access to reports expired on ${userAccessExpireDate}. Please contact your MDO Leader to renew access.`,
+          ]
+        } else {
+          this.hassAccessToreports = false
+          this.reportsNoteList = [
+            `Currently, your MDO Leader has not granted you access to these reports.Kindly contact your MDO Leader to provide you access.`
+          ]
+        }
       }
-    })
-    this.dataSource = new MatTableDataSource(this.reportSectionData)
+    } else {
+      if (isMDOLeader) {
+        this.hassAccessToreports = true
+        this.reportsNoteList = [
+          `Your organization doesn’t have an MDO Admin role. Please assign the MDO Admin role in the 'User' tab.`,
+          `After successfully onboarding an MDO Admin, they can be granted access to these reports.`,
+          `Please grant or renew access to these reports to the MDO Admin very carefully due to Personally Identifiable Information (PII) data security.`
+        ]
+      } else {
+        this.hassAccessToreports = false
+        this.reportsNoteList = [
+          `Your organization does not have an MDO Leader onboarded. Every organization must have a leader assigned to iGOT to access these reports. Please reach out to us at mission.karmayogi@gov.in or connect with us via Video Conferencing by clicking the button below: [Join Now]`,
+          `Once the MDO Leader is onboarded, they will grant you access to download the reports, and you are requested to connect with your MDO Leader for further process.`
+        ]
+      }
+    }
   }
 
-  getLastModified(name: any) {
-    const fname = `${name}.csv`
-    if (this.lastUpdatedOn) {
-      const hashName = this.lastUpdatedOn[`${fname}`]
-      if (hashName) {
-        return this.datePipe.transform(hashName.lastModified, 'dd/MM/yyyy, h:mm a') || ''
+  downLoadReports(event: MouseEvent) {
+    event.stopPropagation()
+    this.reportsDownlaoding = true
+    this.downloadService.downloadReports().subscribe({
+      next: (response: HttpResponse<Blob>) => {
+        const password = response.headers.getAll('Password')
+        this.password = password ? password[0] : ''
+        if (response.body) {
+          const contentType = response.headers.get('Content-Type')
+          const blob = new Blob([response.body], {
+            type: contentType ? contentType : 'application/octet-stream'
+          })
+          const blobUrl = window.URL.createObjectURL(blob)
+          const a = document.createElement('a')
+          a.href = blobUrl
+          a.download = 'All Reports.zip'
+          document.body.appendChild(a)
+          a.click()
+          document.body.removeChild(a)
+          // Clean up blob URL
+          window.URL.revokeObjectURL(blobUrl)
+        }
+        this.showPasswordView = true
+        this.reportsDownlaoding = false
+        this.raiseTelemetry()
+      },
+      error: (error: HttpErrorResponse) => {
+        const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
+        this.openSnackbar(errorMessage)
       }
-      return ''
-    }
-    return ''
+    })
+
   }
 
-  downloadFullFile(event: any) {
-    if (event && event.row && event.row.type && event.row.fileName) {
-      this.downloadReportFile(event.row.type, event.row.fileName)
-    }
+  raiseTelemetry() {
+    this.events.raiseInteractTelemetry(
+      {
+        type: TelemetryEvents.EnumInteractTypes.CLICK,
+        subType: TelemetryEvents.EnumInteractSubTypes.BTN_DOWNLOAD_REPORTS,
+        id: "report-download",
+      },
+      {},
+    )
   }
 
-  async downloadReportFile(type: string, reportFileName: string) {
-    const currentDate = this.datePipe.transform(new Date(), 'yyyy-MM-dd')
-    const apiProxy = `apis/proxies/v8/storage/v1/report`
-    const popup = this.snackBar
-    const fileName = `${reportFileName}.csv`
-    const downloadUrl =
-      `${environment.mdoPath}/${apiProxy}/${type}/${currentDate}/mdoid=${this.configSvc.userProfile.rootOrgId}/${fileName}`
-    const xhr = new XMLHttpRequest()
-    xhr.onreadystatechange = () => {
-      if (xhr.readyState !== 4) {
-        return
-      }
-      if (xhr.status === 200) {
-        window.location.href = downloadUrl
-      } else {
-        popup.open('Report is not available')
+  updateAccess(rowData: any) {
+    const formData = {
+      request: {
+        userId: rowData.userID,
+        reportExpiryDate: rowData.expiryDate
       }
     }
-    xhr.open('GET', downloadUrl)
-    xhr.send()
+    this.showLoaderOnTable = true
+    this.downloadService.updateAccessToReports(formData).subscribe({
+      next: (response: any) => {
+        if (response.result)
+          this.openSnackbar(_.get(response, 'result.message', 'Report access has been granted successfully'))
+        this.getAdminTableData()
+      },
+      error: (error: HttpErrorResponse) => {
+        const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
+        this.openSnackbar(errorMessage)
+        this.getAdminTableData()
+      }
+    })
+  }
+
+  copyToClipboard() {
+    const dummyTextArea = document.createElement('textarea')
+    dummyTextArea.value = this.password
+    document.body.appendChild(dummyTextArea)
+    dummyTextArea.select()
+    document.execCommand('copy')
+    document.body.removeChild(dummyTextArea)
+  }
+
+  openVideoPopup() {
+    this.dialog.open(ReportsVideoComponent, {
+      data: {
+        videoLink: 'https://www.youtube.com/embed/tgbNymZ7vqY?autoplay=1&mute=1'
+      },
+      disableClose: true,
+      width: '50%',
+      height: '60%',
+      panelClass: 'overflow-visable'
+    })
+  }
+
+  private openSnackbar(primaryMsg: any, duration: number = 5000) {
+    this.snackBar.open(primaryMsg, 'X', {
+      duration,
+    })
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/home/routes/reports-video/reports-video.component.html b/project/ws/app/src/lib/routes/home/routes/reports-video/reports-video.component.html
new file mode 100644
index 000000000..fcd3b172f
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/reports-video/reports-video.component.html
@@ -0,0 +1,7 @@
+<div class="reports-video-content">
+  <div class="popup-close">
+    <mat-icon mat-dialog-close class="close-icon">cancel</mat-icon>
+  </div>
+  <iframe [src]="getVideoLink" i18n-title title="about-video" allow="fullscreen" class="about-video" width="100%"
+    height="90%"></iframe>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/reports-video/reports-video.component.scss b/project/ws/app/src/lib/routes/home/routes/reports-video/reports-video.component.scss
new file mode 100644
index 000000000..6f1780b71
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/reports-video/reports-video.component.scss
@@ -0,0 +1,27 @@
+.reports-video-content {
+  position: relative;
+  height: 100%;
+}
+
+.popup-close {
+  position: absolute;
+  right: -55px;
+  top: -55px;
+  color: #2f2e2e;
+  height: 20px;
+  width: 20px;
+  background-color: white;
+  border-radius: 11px;
+
+  .close-icon {
+    font-size: 30px;
+    margin-top: -4px;
+    margin-left: -3px;
+    pointer-events: all;
+    cursor: pointer;
+  }
+}
+
+::ng-deep.overflow-visable .mat-dialog-container {
+    overflow: visible !important; /* or any other value that suits your needs */
+  }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/reports-video/reports-video.component.spec.ts b/project/ws/app/src/lib/routes/home/routes/reports-video/reports-video.component.spec.ts
new file mode 100644
index 000000000..ab6f23d67
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/reports-video/reports-video.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ReportsVideoComponent } from './reports-video.component';
+
+describe('ReportsVideoComponent', () => {
+  let component: ReportsVideoComponent;
+  let fixture: ComponentFixture<ReportsVideoComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ReportsVideoComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ReportsVideoComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/project/ws/app/src/lib/routes/home/routes/reports-video/reports-video.component.ts b/project/ws/app/src/lib/routes/home/routes/reports-video/reports-video.component.ts
new file mode 100644
index 000000000..548a0b208
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/reports-video/reports-video.component.ts
@@ -0,0 +1,28 @@
+import { Component, Inject, OnInit } from '@angular/core'
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'
+import { DomSanitizer } from '@angular/platform-browser'
+
+@Component({
+  selector: 'ws-app-reports-video',
+  templateUrl: './reports-video.component.html',
+  styleUrls: ['./reports-video.component.scss']
+})
+export class ReportsVideoComponent implements OnInit {
+  videoLink = ''
+
+  constructor(
+    public dialogRef: MatDialogRef<ReportsVideoComponent>,
+    @Inject(MAT_DIALOG_DATA) public dialogData: any,
+    private domSanitizer: DomSanitizer
+  ) {
+    this.videoLink = this.dialogData.videoLink
+  }
+
+  ngOnInit() {
+  }
+
+  get getVideoLink() {
+    return this.domSanitizer.bypassSecurityTrustResourceUrl(this.videoLink)
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/home/services/download-report.service.ts b/project/ws/app/src/lib/routes/home/services/download-report.service.ts
index dec9b4e6e..9af19211c 100644
--- a/project/ws/app/src/lib/routes/home/services/download-report.service.ts
+++ b/project/ws/app/src/lib/routes/home/services/download-report.service.ts
@@ -1,20 +1,45 @@
 import { Injectable } from '@angular/core'
-import { HttpClient } from '@angular/common/http'
+import { HttpClient, HttpResponse } from '@angular/common/http'
 import { Observable } from 'rxjs'
 import { ConfigurationsService } from '@sunbird-cb/utils'
+import { map } from 'rxjs/operators'
+import _ from 'lodash'
 
+
+const API_END_POINTS = {
+  GET_REPORTS_INFO: `/apis/proxies/v8/operationalreports/v1/reportInfo`,
+  DOWNLOAD_REPORTS: `/apis/proxies/v8/operationalreports/download`,
+  GET_ADMINS: `/apis/proxies/v8/user/v1/search`,
+  GET_ADMINS_ACCESSS_DETAILS: `/apis/proxies/v8/operationalreports/`,
+  UPDATE_ACCESS: `/apis/proxies/v8/operationalreports/admin/grantaccess`,
+}
 @Injectable({
   providedIn: 'root',
 })
 export class DownloadReportService {
   baseUrl = this.configSvc.sitePath
-  constructor(private http: HttpClient, private configSvc: ConfigurationsService) { }
+  constructor(
+    private http: HttpClient,
+    private configSvc: ConfigurationsService
+  ) { }
+
+  getReportInfo() {
+    return this.http.get<any>(`${API_END_POINTS.GET_REPORTS_INFO}`).pipe(map(res => _.get(res, 'result')))
+  }
+
+  downloadReports(): Observable<HttpResponse<Blob>> {
+    return this.http.get(`${API_END_POINTS.DOWNLOAD_REPORTS}`, { observe: 'response', responseType: 'blob' })
+  }
+
+  getAdminsList(filter: object): Observable<any> {
+    return this.http.post<any>(`${API_END_POINTS.GET_ADMINS}`, filter).pipe(map(res => _.get(res, 'result.response')))
+  }
 
-  fetchDownloadJson(): Observable<any> {
-    return this.http.get<any>(`${this.baseUrl}/feature/download-report.json`).pipe()
+  getAccessDetails(readAssessEndPoint: string) {
+    return this.http.get<any>(`${API_END_POINTS.GET_ADMINS_ACCESSS_DETAILS}${readAssessEndPoint}`).pipe(map(res => _.get(res, 'result.response')))
   }
 
-  fetctReportsUpdatedOn(orgId: string): Observable<any> {
-    return this.http.get<any>(`/apis/proxies/v8/storage/v1/reportInfo/${orgId}`).pipe()
+  updateAccessToReports(formData: any) {
+    return this.http.post<any>(`${API_END_POINTS.UPDATE_ACCESS}`, formData)
   }
 }
diff --git a/src/styles.scss b/src/styles.scss
index fdf2eeb60..c563cecb3 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -1772,8 +1772,7 @@ video {
 }
 
 .bg-clip-text {
-  -webkit-background-clip: text;
-          background-clip: text;
+  background-clip: text;
 }
 
 .bg-transparent {
@@ -20391,8 +20390,7 @@ video {
   }
 
   .sm\:bg-clip-text {
-    -webkit-background-clip: text;
-            background-clip: text;
+    background-clip: text;
   }
 
   .sm\:bg-transparent {
@@ -38980,8 +38978,7 @@ video {
   }
 
   .md\:bg-clip-text {
-    -webkit-background-clip: text;
-            background-clip: text;
+    background-clip: text;
   }
 
   .md\:bg-transparent {
@@ -57569,8 +57566,7 @@ video {
   }
 
   .lg\:bg-clip-text {
-    -webkit-background-clip: text;
-            background-clip: text;
+    background-clip: text;
   }
 
   .lg\:bg-transparent {
@@ -76158,8 +76154,7 @@ video {
   }
 
   .xl\:bg-clip-text {
-    -webkit-background-clip: text;
-            background-clip: text;
+    background-clip: text;
   }
 
   .xl\:bg-transparent {

From c06a4f68b34e38683a66076f069db7a1b7d425e3 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Tue, 12 Mar 2024 14:34:15 +0530
Subject: [PATCH 503/887] bulck approval ui integration

---
 .../ws/app/src/lib/routes/home/home.module.ts |   2 +
 .../routes/approvals/approvals.component.html |  26 +-
 .../profle-bulk-upload.component.html         | 205 +++++++
 .../profle-bulk-upload.component.scss         | 126 +++++
 .../profle-bulk-upload.component.spec.ts      |  25 +
 .../profle-bulk-upload.component.ts           | 530 ++++++++++++++++++
 6 files changed, 907 insertions(+), 7 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/home/routes/profle-bulk-upload/profle-bulk-upload.component.html
 create mode 100644 project/ws/app/src/lib/routes/home/routes/profle-bulk-upload/profle-bulk-upload.component.scss
 create mode 100644 project/ws/app/src/lib/routes/home/routes/profle-bulk-upload/profle-bulk-upload.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/home/routes/profle-bulk-upload/profle-bulk-upload.component.ts

diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index 0b4cc70eb..f5273c70a 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -67,6 +67,7 @@ import { TrainingPlanDashboardComponent } from './routes/training-plan-dashboard
 import { TrainingPlanDashboardService } from './services/training-plan-dashboard.service'
 import { AdminsTableComponent } from './routes/admins-table/admins-table.component'
 import { ReportsVideoComponent } from './routes/reports-video/reports-video.component'
+import { ProfleBulkUploadComponent } from './routes/profle-bulk-upload/profle-bulk-upload.component'
 @NgModule({
   declarations: [
     HomeComponent,
@@ -93,6 +94,7 @@ import { ReportsVideoComponent } from './routes/reports-video/reports-video.comp
     TrainingPlanDashboardComponent,
     AdminsTableComponent,
     ReportsVideoComponent,
+    ProfleBulkUploadComponent
   ],
   imports: [
     CommonModule,
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.html
index 027964540..4edf98f63 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.html
@@ -18,18 +18,30 @@
           <a href="javascript:void(0)" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'toapprove',
               'ws-mat-accent-border font-medium':currentFilter !== 'toapprove'}" mat-button
             (click)="filter('toapprove'); tabTelemetry('toapprove', 0)" role="button">To approve</a>
+
+          <a href="javascript:void(0)" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'uploadApprovals',
+                          'ws-mat-accent-border font-medium':currentFilter !== 'uploadApprovals'}" mat-button
+            (click)="filter('uploadApprovals'); tabTelemetry('uploadApprovals', 1)" role="button">File uploads</a>
           <!-- <a href="javascript:void(0)" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'userflags',
               'ws-mat-accent-border font-medium':currentFilter !== 'userflags'}" mat-button
             (click)="filter('userflags')" role="button">User flags</a> -->
         </div>
       </div>
-      <ng-container *ngIf="getTableData && getTableData.length>0">
-        <ws-widget-org-user-table-v2 [tableData]="tabledata" [data]="data" (eOnRowClick)="onApprovalClick($event)"
-          [totalRecords]="approvalTotalCount" (pageChangeClick)="onPaginateChange($event)">
-        </ws-widget-org-user-table-v2>
-      </ng-container>
-      <ng-container *ngIf="!getTableData || getTableData.length<=0">
-        <p class="text-center">No approvals pending</p>
+
+      <ng-container [ngSwitch]="currentFilter">
+        <ng-container *ngSwitchCase="'toapprove'">
+          <ng-container *ngIf="getTableData && getTableData.length>0">
+            <ws-widget-org-user-table-v2 [tableData]="tabledata" [data]="data" (eOnRowClick)="onApprovalClick($event)"
+              [totalRecords]="approvalTotalCount" (pageChangeClick)="onPaginateChange($event)">
+            </ws-widget-org-user-table-v2>
+          </ng-container>
+          <ng-container *ngIf="!getTableData || getTableData.length<=0">
+            <p class="text-center">No approvals pending</p>
+          </ng-container>
+        </ng-container>
+        <ng-container *ngSwitchCase="'uploadApprovals'">
+          <ws-app-profle-bulk-upload></ws-app-profle-bulk-upload>
+        </ng-container>
       </ng-container>
     </mat-card-content>
   </mat-card>
diff --git a/project/ws/app/src/lib/routes/home/routes/profle-bulk-upload/profle-bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/profle-bulk-upload/profle-bulk-upload.component.html
new file mode 100644
index 000000000..6127ab500
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/profle-bulk-upload/profle-bulk-upload.component.html
@@ -0,0 +1,205 @@
+<div class="flex flex-wrap">
+  <div class="flex flex-row fle-wrap w-full">
+    <mat-card class="my-5 flex-custom ws-mat-accent-border mat-card w-full">
+      <div class="flex flex-row">
+        <form [formGroup]="formGroup" #form class="">
+          <button *ngIf="!fileName" type="button" (click)="fileInput.click()" (dblclick)="$event.preventDefault();"
+            class="download-btn mat-accent-border mat-button mat-button-base">Choose file</button>
+          <label class="file-name mr-5" *ngIf="fileName">Selected file : <b>{{fileName}}</b></label>
+          <input hidden type="file" #fileInput class="" (click)="fileClick($event)" (change)="onFileChange($event)"
+            name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();"
+            accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel, .xlsx, .xls" />
+          <mat-error *ngIf="showFileError">Only .xlsx or .csv files are accepted</mat-error>
+          <form *ngIf="fileName" [formGroup]="registrationForm" class="mobile-wrapper">
+            <ng-container *ngIf="fileName">
+              <label class="file-name mr-5" aria-label="Send OTP to">Send OTP to </label>
+              <div>
+                <mat-radio-group aria-label="Select an option" formControlName='otpType' #otpType
+                  (change)="radioChange($event)">
+                  <mat-radio-button [value]="'email'" color="accent" class="radio-btn">Email</mat-radio-button>
+                  <mat-radio-button [value]="'mobile'" color="accent" class="radio-btn">Mobile</mat-radio-button>
+                </mat-radio-group>
+              </div>
+            </ng-container>
+            <ng-container *ngIf="fileName && registrationForm.value.otpType==='email'">
+              <ng-container *ngIf="userEmail && !otpEmailSend">
+                <p for="email" class=" margin-remove-bottom margin-top-s" i18n-aria-label aria-label="Email label">
+                  OTP will be sent to your registered email
+                </p>
+              </ng-container>
+              <ng-container *ngIf="!userEmail">
+                <p for="email" class=" margin-remove-bottom margin-top-s" i18n-aria-label aria-label="Email label">
+                  No email associated with your account
+                </p>
+              </ng-container>
+            </ng-container>
+            <ng-container *ngIf="fileName && registrationForm.value.otpType==='mobile'">
+              <ng-container *ngIf="userMobile">
+                <p for="email" class=" margin-remove-bottom margin-top-s" i18n-aria-label aria-label="Email label">
+                  OTP will be sent to your registered mobile number
+                </p>
+              </ng-container>
+              <ng-container *ngIf="!userMobile">
+                <p for="email" class=" margin-remove-bottom margin-top-s" i18n-aria-label aria-label="Email label">
+                  No mobile number associated with your account.
+                  <a *ngIf="getKarmayogiLink" [href]="getKarmayogiLink">
+                    <span i18n>Click here to update</span>
+                  </a>
+                </p>
+              </ng-container>
+            </ng-container>
+
+            <ng-container *ngIf="fileName && registrationForm.value.otpType==='email' && userEmail">
+              <div class="input-wrapper margin-top-l">
+                <p class="flex items-center margin-remove-bottom form-label" i18n-aria-label aria-label="Email label"
+                  [hidden]="!isEmailVerified">
+                  OTP has been verified
+                  <mat-icon class="ws-mat-green-text margin-xs" svgIcon="verified"></mat-icon>
+                </p>
+                <div *ngIf="!isEmailVerified" class="flex flex-1  justify-end">
+                  <button *ngIf="!otpEmailSend" mat-raised-button type="button" (click)="sendOtpEmail()"
+                    class="submitBtnSmall text-white ws-mat-primary-background ws-mat-white-text btn-responsive"
+                    [disabled]="registrationForm?.email?.invalid">
+                    <a class="text-white" i18n>
+                      Send OTP
+                    </a>
+                  </button>
+                  <div *ngIf="otpEmailSend" class="flex flex-1 flex-column">
+                    <mat-form-field appearance="outline" class="margin-top-xs w-full">
+                      <input id="emailOTP" #emailotp type="password" minlength="4" maxlength="6" matInput
+                        placeholder="Enter OTP" i18n-aria-label aria-label="OTP input"
+                        onKeyPress="if(this.value.length === 8) return false;" autocomplete="new-password">
+                      <mat-hint *ngIf="timeLeftforOTPEmail > 0 ">
+                        <span>Resend OTP after {{timeLeftforOTPEmail | pipeDurationTransform: 'hms2M'}}</span>
+                      </mat-hint>
+                      <mat-hint *ngIf="timeLeftforOTPEmail <= 0 ">
+                        <span class="cursor-pointer ws-mat-default-text" (click)="resendOTPEmail()">Resend
+                          OTP</span>
+                      </mat-hint>
+                    </mat-form-field>
+                    <div class="flex flex-1 margin-top-s justify-end">
+                      <button mat-raised-button type="button" (click)="verifyOtpEmail(emailotp)"
+                        class="submitBtnSmall text-white ws-mat-primary-background ws-mat-white-text margin-top-s otp"
+                        [disabled]="registrationForm?.email?.invalid || disableEmailVerifyBtn">
+                        <span class="text-white" i18n>
+                          Verify OTP
+                        </span>
+                      </button>
+                    </div>
+                  </div>
+                </div>
+
+              </div>
+            </ng-container>
+            <ng-container *ngIf="fileName && registrationForm.value.otpType==='mobile' && userMobile">
+              <div class="input-wrapper margin-top-l">
+                <p class="flex items-center margin-remove-bottom form-label" i18n-aria-label aria-label="Email label"
+                  [hidden]="!isMobileVerified">
+                  OTP has been verified
+                  <mat-icon class="ws-mat-green-text margin-xs" svgIcon="verified"></mat-icon>
+                </p>
+                <div *ngIf="!isMobileVerified" class="flex flex-1 justify-end">
+                  <button *ngIf="!otpSend" mat-raised-button type="button" (click)="sendOtp()"
+                    class="submitBtnSmall text-white ws-mat-primary-background ws-mat-white-text btn-responsive"
+                    [disabled]="registrationForm?.mobile?.invalid">
+                    <a class="text-white" i18n>
+                      Send OTP
+                    </a>
+                  </button>
+                  <div *ngIf="otpSend" class="flex flex-1 flex-column">
+                    <mat-form-field appearance="outline" class="margin-top-xs w-full">
+                      <input id="mobileNumber" #otp type="password" minlength="4" maxlength="6" matInput
+                        placeholder="Enter OTP" i18n-aria-label aria-label="OTP input"
+                        onKeyPress="if(this.value.length === 8) return false;" autocomplete="new-password">
+                      <mat-hint *ngIf="timeLeftforOTP > 0 ">
+                        <span>Resend OTP after {{timeLeftforOTP | pipeDurationTransform: 'hms2M'}}</span>
+                      </mat-hint>
+                      <mat-hint *ngIf="timeLeftforOTP <= 0 ">
+                        <span class="cursor-pointer ws-mat-default-text" (click)="resendOTP()">Resend
+                          OTP</span>
+                      </mat-hint>
+                      {{otp.errors}}
+                      <mat-error [hidden]="false" *ngIf="otp.errors?.minlength">
+                        Mobile otp is required
+                      </mat-error>
+                    </mat-form-field>
+                    <div class="flex flex-1 margin-top-s justify-end">
+                      <button mat-raised-button type="button" (click)="verifyOtp(otp)"
+                        class="submitBtnSmall text-white ws-mat-primary-background ws-mat-white-text margin-top-s otp"
+                        [disabled]="registrationForm?.mobile?.invalid || disableVerifyBtn">
+                        <span class="text-white" i18n>
+                          Verify OTP
+                        </span>
+                      </button>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </ng-container>
+          </form>
+
+          <ng-container *ngIf="fileName && (isEmailVerified || isMobileVerified)">
+            <div class="flex mt-5 items-end justify-start">
+              <div class="text-left mr-5">
+                <button mat-button class="download-btn mat-accent-border mat-button mat-button-base" type="button" i18n
+                  (click)="cancelSelected()" (dblclick)="$event.preventDefault();" *ngIf="fileName">
+                  <ng-container i18n>Cancel</ng-container>
+                </button>
+              </div>
+              <div class="text-left flex">
+
+                <button mat-button class="upload-btn mat-button mat-button-base mr-5" type="submit" i18n
+                  [disabled]="formGroup.invalid || (displayLoader | async)" (click)="onSubmit(form)"
+                  (dblclick)="$event.preventDefault();" *ngIf="fileName">
+                  <ng-container i18n>Upload</ng-container>
+                </button>
+                <div *ngIf="displayLoader | async" class="pr-4 ml-4 flex items-center justify-center">
+                  <mat-spinner [diameter]="30"></mat-spinner>
+                </div>
+              </div>
+            </div>
+          </ng-container>
+
+        </form>
+        <div class="flex-1 inline-flex items-start justify-end">
+          <button class="download-btn mat-accent-border mat-button mat-button-base" i18n (click)="downloadFile()">
+            <ng-container i18n>Download sample file</ng-container>
+          </button>
+        </div>
+      </div>
+    </mat-card>
+  </div>
+
+  <div class="flex flex-row fle-wrap w-full">
+    <div class="flex-1 inline-flex items-end justify-flex-start">
+      <h2 class="contacts-head">File uploads</h2>
+    </div>
+    <div class="flex-1 inline-flex items-end justify-end">
+      <div class="mb-4 ws-mat-black60-text">
+        Need help? contact us <a class="mat-accent" target="_blank" href="{{contactUsUrl}}">here</a>
+      </div>
+    </div>
+  </div>
+
+  <div class="w-full relative bulkupload-table">
+
+    <ng-container *ngIf="fetching">
+      <div class="example-loading w-full text-center">
+        <mat-spinner></mat-spinner>
+      </div>
+    </ng-container>
+    <ng-container *ngIf="!fetching && tableList && tableList.length > 0">
+      <ws-widget-org-user-table [tableData]='tabledata' [data]='tableList' (actionsClick)="downloadFullFile($event)">
+      </ws-widget-org-user-table>
+    </ng-container>
+    <ng-container *ngIf="(!bulkUploadData || !bulkUploadData.length) && !fetching">
+      <h4 class="w-full
+       ws-mat-black60-text text-center">No data to be displayed!</h4>
+    </ng-container>
+  </div>
+</div>
+
+<input type="hidden" i18-value i18-aria-value aria-value="File upload successful..!" [value]="uplaodSuccessMsg"
+  #toastSuccess />
+<input type="hidden" i18-value i18-aria-value aria-value="Unable to process file upload..!"
+  value="Unable to process file upload..!" #toastError />
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/profle-bulk-upload/profle-bulk-upload.component.scss b/project/ws/app/src/lib/routes/home/routes/profle-bulk-upload/profle-bulk-upload.component.scss
new file mode 100644
index 000000000..158330da8
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/profle-bulk-upload/profle-bulk-upload.component.scss
@@ -0,0 +1,126 @@
+table {
+  width: 100%;
+}
+
+.mat-form-field {
+  font-size: 14px;
+  width: 100%;
+}
+
+td, th {
+  padding: 0px 12px!important;
+}
+
+.table-container{
+  position: relative;
+  width: 100%;
+  @media screen and (max-width: 1024px) {
+    overflow-x: scroll;
+  }
+}
+
+.mat-column-fileName {
+  width: 25% !important;
+}
+.mat-column-dateCreatedOn {
+  width: 20% !important;
+}
+.mat-column-dateUpdatedOn {
+  width: 20% !important;
+}
+
+.text-span {
+  word-break: break-all!important;
+  min-width: 180px!important;
+  display: block;
+}
+
+.example-loading-shade {
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0px;
+  right: 0;
+  background: rgba(0, 0, 0, 0.15);
+  z-index: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+  @media screen and (max-width: 1024px) {
+  #upload-data-box {
+    overflow-x: scroll;
+  }
+}
+
+.download-btn {
+  min-width: 112px;
+  width: auto;
+  border: 1px solid #0075B7;
+  border-radius: 4px;
+  color: #0075B7 !important;
+}
+
+.upload-btn {
+  min-width: 112px;
+  width: auto;
+  background: #0075B7 !important;
+  color: white !important;
+}
+
+.upload-btn:disabled {
+  opacity: 0.7;
+}
+
+.file-name {
+  line-height: 2;
+}
+
+.mobile-wrapper {
+  border: 1px dashed rgba(0,0,0,.40);
+  padding: 16px;
+  border-radius: 8px;
+}
+
+.radio-btn{
+  border: 1px solid #ddd;
+  padding: 5px 15px;
+  border-radius: 4px;
+  margin-right: 15px;
+}
+
+::ng-deep .bulkupload-table .mat-column-dateCreatedOn,
+::ng-deep .bulkupload-table .mat-column-dateUpdatedOn {
+  flex: 0 0 14% !important;
+  width: 14% !important;
+}
+
+::ng-deep .bulkupload-table .mat-column-status {
+  flex: 0 0 10% !important;
+  width: 10% !important;
+}
+
+::ng-deep .bulkupload-table .mat-column-fileName {
+  flex: 0 0 28% !important;
+  width: 28% !important;
+}
+
+::ng-deep .bulkupload-table .mat-column-status {
+  flex: 0 0 10% !important;
+  width: 10% !important;
+}
+
+::ng-deep .bulkupload-table .mat-header-cell,
+::ng-deep .bulkupload-table .mat-cell {
+  padding-right: 8px !important;
+}
+
+::ng-deep.textclass {
+  margin: 0 !important;
+}
+
+::ng-deep .bulkupload-table .mat-sort-header-button {
+  line-height: 1.5;
+  text-align: left;
+}
diff --git a/project/ws/app/src/lib/routes/home/routes/profle-bulk-upload/profle-bulk-upload.component.spec.ts b/project/ws/app/src/lib/routes/home/routes/profle-bulk-upload/profle-bulk-upload.component.spec.ts
new file mode 100644
index 000000000..40766b175
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/profle-bulk-upload/profle-bulk-upload.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ProfleBulkUploadComponent } from './profle-bulk-upload.component';
+
+describe('ProfleBulkUploadComponent', () => {
+  let component: ProfleBulkUploadComponent;
+  let fixture: ComponentFixture<ProfleBulkUploadComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ProfleBulkUploadComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ProfleBulkUploadComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/project/ws/app/src/lib/routes/home/routes/profle-bulk-upload/profle-bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/profle-bulk-upload/profle-bulk-upload.component.ts
new file mode 100644
index 000000000..bb2e5e765
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/profle-bulk-upload/profle-bulk-upload.component.ts
@@ -0,0 +1,530 @@
+import { DatePipe } from '@angular/common'
+import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'
+import { Validators, FormGroup, FormBuilder, FormControl } from '@angular/forms'
+import { MatSort, MatSnackBar, MatRadioChange } from '@angular/material'
+import { ActivatedRoute } from '@angular/router'
+import { Observable, Subscription, interval } from 'rxjs'
+import { startWith, pairwise, map } from 'rxjs/operators'
+import { MatPaginator } from '@angular/material/paginator'
+import { MatTableDataSource } from '@angular/material/table'
+import { environment } from 'src/environments/environment'
+import { FileService } from '../../../users/services/upload.service'
+import { UsersService } from '../../../users/services/users.service'
+import { ITableData } from '@sunbird-cb/collection/lib/ui-org-table/interface/interfaces'
+import _ from 'lodash'
+
+@Component({
+  selector: 'ws-app-profle-bulk-upload',
+  templateUrl: './profle-bulk-upload.component.html',
+  styleUrls: ['./profle-bulk-upload.component.scss']
+})
+export class ProfleBulkUploadComponent implements OnInit {
+
+  tableList!: any[]
+  public fileName: any
+  public displayLoader!: Observable<boolean>
+  public formGroup = this.fb.group({
+    file: ['', Validators.required],
+  })
+  fetching = true
+  showFileError = false
+  @ViewChild('toastSuccess', { static: true }) toastSuccess!: ElementRef<any>
+  @ViewChild('toastError', { static: true }) toastError!: ElementRef<any>
+  @ViewChild(MatSort, { static: true }) sort!: MatSort
+  bulkUploadData: any
+  uplaodSuccessMsg!: string
+  dataSource: MatTableDataSource<any>
+  // tslint:disable-next-line:max-line-length
+  displayedColumns: string[] = ['fileName', 'status', 'failedRecordsCount', 'successfulRecordsCount', 'totalRecords', 'dateCreatedOn', 'dateUpdatedOn']
+  tabledata!: ITableData
+  departments: string[] = []
+  contactUsUrl = ''
+  fileSelected!: any
+  pageDataSubscription!: any
+  downloadSampleFilePath = ''
+  downloadAsFileName = ''
+  rootOrgId!: any
+  phoneNumberPattern = '^((\\+91-?)|0)?[0-9]{10}$'
+  emailPattern = `^[\\w\-\\.]+@([\\w-]+\\.)+[\\w-]{2,4}$`
+  emailLengthVal = false
+  isMobileVerified = false
+  isEmailVerified = false
+  otpSend = false
+  otpEmailSend = false
+  otpVerified = false
+  OTP_TIMER = environment.resendOTPTIme
+  timerSubscription: Subscription | null = null
+  timeLeftforOTP = 0
+  timeLeftforOTPEmail = 0
+  timerSubscriptionEmail: Subscription | null = null
+  OTP_TIMER_EMAIL = environment.resendOTPTIme
+  registrationForm!: FormGroup
+  disableBtn = false
+  disableVerifyBtn = false
+  disableEmailVerifyBtn = false
+  userEmail = ''
+  userMobile = ''
+  userProfileV2!: any
+  myRoles: any = []
+
+  objDataSource = new MatTableDataSource<any>()
+  @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | null = null
+
+  @ViewChild(MatPaginator, { static: false }) set matPaginator(paginator: MatPaginator) {
+    this.paginator = paginator
+    this.setDataSourceAttributes()
+  }
+  setDataSourceAttributes() {
+    this.dataSource.paginator = this.paginator
+  }
+
+  constructor(
+    private fb: FormBuilder,
+    private fileService: FileService,
+    private snackBar: MatSnackBar,
+    private route: ActivatedRoute,
+    public datepipe: DatePipe,
+    private usersSvc: UsersService,
+  ) {
+    this.rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
+    this.userProfileV2 = _.get(this.route.snapshot.parent, 'data.configService.userProfileV2')
+    if (_.get(this.route.snapshot.parent, 'data.configService.userRoles')) {
+      this.myRoles = _.get(this.route.snapshot.parent, 'data.configService.userRoles')
+    }
+    this.dataSource = new MatTableDataSource(this.bulkUploadData)
+    this.dataSource.paginator = this.paginator
+
+    this.pageDataSubscription = this.route.data.subscribe(data => {
+      if (data && data.pageData) {
+        this.downloadSampleFilePath = data.pageData.data.downloadSampleFilePath
+        this.downloadAsFileName = data.pageData.data.downloadAsFileName
+      }
+    })
+
+    this.registrationForm = new FormGroup({
+      otpType: new FormControl('email', [Validators.pattern(this.emailPattern)]),
+      // tslint:disable-next-line:max-line-length
+      email: new FormControl({ value: '', disabled: true }, [Validators.pattern(this.emailPattern)]),
+      // department: new FormControl('', [Validators.required, forbiddenNamesValidator(this.masterDepartments)]),
+      mobile: new FormControl('', [Validators.pattern(this.phoneNumberPattern), Validators.maxLength(12)]),
+    })
+  }
+
+  ngOnInit() {
+    if (this.userProfileV2) {
+      this.userEmail = this.userProfileV2.email || ''
+      this.registrationForm.patchValue({ email: this.userEmail })
+      this.registrationForm.updateValueAndValidity()
+    }
+    if (this.userProfileV2) {
+      this.userMobile = this.userProfileV2.mobile || ''
+      this.registrationForm.patchValue({ mobile: this.userMobile })
+      this.registrationForm.updateValueAndValidity()
+    }
+    this.displayLoader = this.fileService.isLoading()
+    this.contactUsUrl = `${environment.karmYogiPath}/public/contact `
+    this.tabledata = {
+      columns: [
+        { displayName: 'Name', key: 'fileName' },
+        { displayName: 'Status', key: 'status' },
+        { displayName: 'Failed records', key: 'failedRecordsCount' },
+        { displayName: 'Success records', key: 'successfulRecordsCount' },
+        { displayName: 'Total records', key: 'totalRecords' },
+        { displayName: 'Created on', key: 'dateCreatedOn' },
+        { displayName: 'Updated on', key: 'dateUpdatedOn' },
+      ],
+      needCheckBox: false,
+      needHash: false,
+      sortColumn: 'dateCreatedOn',
+      sortState: 'desc',
+      needUserMenus: false,
+      actions: [{ icon: 'download', label: 'Download file', name: 'DownloadFile', type: 'link', disabled: false }],
+      actionColumnName: 'Download file',
+    }
+    this.getBulkUploadData()
+    this.onPhoneChange()
+    this.onEmailChange()
+
+  }
+  ngAfterViewInit() {
+    this.dataSource.paginator = this.paginator
+    // this.dataSource = new MatTableDataSource(this.bulkUploadData)
+    setTimeout(() => {
+      this.dataSource.sort = this.sort
+    })
+  }
+
+  radioChange(_event: MatRadioChange) {
+    this.resetOTPFields()
+  }
+
+  getBulkUploadData() {
+    this.fileService.getBulkUploadDataV1(this.rootOrgId).subscribe((res: any) => {
+      this.tableList = []
+      if (res.result && res.result.content) {
+        this.bulkUploadData = res.result.content
+        this.bulkUploadData.forEach((element: any) => {
+          this.tableList.push({
+            fileName: element.fileName,
+            status: element.status ? element.status : '',
+            failedRecordsCount: element.failedRecordsCount ? element.failedRecordsCount : 0,
+            successfulRecordsCount: element.successfulRecordsCount ? element.successfulRecordsCount : 0,
+            totalRecords: element.totalRecords ? element.totalRecords : 0,
+            dateCreatedOn: element.dateCreatedOn ? element.dateCreatedOn : '',
+            dateUpdatedOn: element.dateUpdatedOn ? element.dateUpdatedOn : '',
+          })
+        })
+        this.fetching = false
+        // this.bulkUploadData = []
+        this.dataSource = new MatTableDataSource(this.bulkUploadData)
+        setTimeout(() => this.dataSource.paginator = this.paginator)
+        // setTimeout(
+        //   () => {
+        //     if (this.sort) {
+        //       this.sort.active = this.tabledata.sortColumn,
+        //         this.sort.start = this.tabledata.sortState
+        //     }
+        //     this.dataSource.sort = this.sort
+        //   },
+        //   100)
+      } else {
+        this.fetching = false
+      }
+    })
+  }
+
+  public onFileChange(event: any) {
+    this.showFileError = false
+    const fileList = (<HTMLInputElement>event.target).files
+    if (fileList && fileList.length > 0) {
+      const file: File = fileList[0]
+      this.fileName = file.name
+      this.fileSelected = file
+      this.formGroup.patchValue({
+        file,
+      })
+    }
+  }
+
+  fileClick(event: any) {
+    event.target.value = ''
+  }
+
+  cancelSelected() {
+    this.fileName = ''
+    this.fileSelected = ''
+    this.formGroup.controls['file'].setValue('')
+    this.resetOTPFields()
+  }
+
+  public onSubmit(form: any): void {
+    // Validate File type before uploading
+    if (this.fileService.validateFile(this.fileName)) {
+      if (this.formGroup && this.formGroup.get('file')) {
+        const formData: FormData = new FormData()
+        formData.append('data', this.fileSelected, this.fileName)
+        // tslint:disable-next-line: no-non-null-assertion
+        this.fileService.upload(this.fileName, formData)
+          .subscribe(
+            _res => {
+              // this.uplaodSuccessMsg = res
+              this.openSnackbar('File uploaded successfully!')
+              this.cancelSelected()
+              // // tslint:disable-next-line: no-non-null-assertion
+              // this.formGroup!.get('file')!.setValue(['', Validators.required])
+              if (form && form.file) {
+                form.file.value = ''
+              }
+              this.resetOTPFields()
+              this.formGroup.reset()
+              this.getBulkUploadData()
+            },
+            _err => {
+              this.openSnackbar(this.toastError.nativeElement.value)
+            })
+      }
+    } else {
+      this.showFileError = true
+      this.openSnackbar(this.toastError.nativeElement.value)
+    }
+  }
+
+  resetOTPFields() {
+    this.isEmailVerified = false
+    this.otpEmailSend = false
+    this.isMobileVerified = false
+    this.otpSend = false
+    this.disableVerifyBtn = false
+  }
+
+  public refreshTable() {
+    this.getBulkUploadData()
+  }
+  public downloadFile(): void {
+    this.fileService.download(this.downloadSampleFilePath, this.downloadAsFileName)
+  }
+
+  private openSnackbar(primaryMsg: string, duration: number = 5000) {
+    this.snackBar.open(primaryMsg, 'X', {
+      duration,
+    })
+  }
+
+  public downloadReport(row: any) {
+    this.fileService.downloadReport(row.identifier, row.name)
+  }
+
+  ngOnDestroy() {
+    if (this.pageDataSubscription) {
+      this.pageDataSubscription.unsubscribe()
+    }
+  }
+
+  downloadFullFile(event: any) {
+    const url = `/apis/proxies/v8/user/v1/bulkuser/download/${event.row.fileName}`
+    window.open(url, '_blank')
+  }
+
+  emailVerification(emailId: string) {
+    this.emailLengthVal = false
+    if (emailId && emailId.length > 0) {
+      const email = emailId.split('@')
+      if (email && email.length === 2) {
+        if ((email[0] && email[0].length > 64) || (email[1] && email[1].length > 255)) {
+          this.emailLengthVal = true
+        }
+      } else {
+        this.emailLengthVal = false
+      }
+    }
+  }
+
+  onPhoneChange() {
+    const ctrl = this.registrationForm.get('mobile')
+    if (ctrl) {
+      ctrl
+        .valueChanges
+        .pipe(startWith(null), pairwise())
+        .subscribe(([prev, next]: [any, any]) => {
+          if (!(prev == null && next)) {
+            this.isMobileVerified = false
+            this.otpSend = false
+            this.disableVerifyBtn = false
+          }
+        })
+    }
+  }
+
+  onEmailChange() {
+    const ctrl = this.registrationForm.get('email')
+    if (ctrl) {
+      ctrl
+        .valueChanges
+        .pipe(startWith(null), pairwise())
+        .subscribe(([prev, next]: [any, any]) => {
+          if (!(prev == null && next)) {
+            this.isEmailVerified = false
+            this.otpEmailSend = false
+            this.disableEmailVerifyBtn = false
+          }
+        })
+    }
+  }
+
+  sendOtp() {
+    // const mob = this.registrationForm.get('mobile')
+    if (this.userMobile) {
+      this.usersSvc.sendOtp(this.userMobile, 'phone').subscribe(() => {
+        this.otpSend = true
+        alert('An OTP has been sent to your mobile number (valid for 15 minutes)')
+        this.startCountDown()
+        // tslint:disable-next-line: align
+      }, (error: any) => {
+        this.snackBar.open(_.get(error, 'error.params.errmsg') || 'Please try again later')
+      })
+    } else {
+      this.snackBar.open('Please enter a valid mobile number')
+    }
+  }
+
+  resendOTP() {
+    // const mob = this.registrationForm.get('mobile')
+    if (this.userMobile) {
+      this.usersSvc.resendOtp(this.userMobile, 'phone').subscribe((res: any) => {
+        if ((_.get(res, 'result.response')).toUpperCase() === 'SUCCESS') {
+          this.otpSend = true
+          this.disableVerifyBtn = false
+          alert('An OTP has been sent to your mobile number (valid for 15 minutes)')
+          this.startCountDown()
+        }
+        // tslint:disable-next-line: align
+      }, (error: any) => {
+        this.snackBar.open(_.get(error, 'error.params.errmsg') || 'Please try again later')
+      })
+    } else {
+      this.snackBar.open('Please enter a valid mobile number')
+    }
+  }
+
+  verifyOtp(otp: any) {
+    // const mob = this.registrationForm.get('mobile')
+
+    if (otp && otp.value) {
+      if (otp && otp.value.length < 4) {
+        this.snackBar.open('Please enter a valid OTP.')
+      } else if (this.userMobile) {
+        this.usersSvc.verifyOTP(otp.value, this.userMobile, 'phone').subscribe((res: any) => {
+          if ((_.get(res, 'result.response')).toUpperCase() === 'SUCCESS') {
+            this.otpVerified = true
+            this.isMobileVerified = true
+            this.disableBtn = false
+            // const reqUpdates = {
+            //   request: {
+            //     userId: this.configSvc.unMappedUser.id,
+            //     profileDetails: {
+            //       personalDetails: {
+            //         mobile: mob.value,
+            //         phoneVerified: true,
+            //       },
+            //     },
+            //   },
+            // }
+            // this.userProfileSvc.editProfileDetails(reqUpdates).subscribe((updateRes: any) => {
+            //   if (updateRes) {
+            //     this.isMobileVerified = true
+            //   }
+            // })
+          }
+          // tslint:disable-next-line: align
+        }, (error: any) => {
+          this.snackBar.open(_.get(error, 'error.params.errmsg') || 'Please try again later')
+          if (error.error && error.error.result) {
+            this.disableVerifyBtn = error.error.result.remainingAttempt === 0 ? true : false
+          }
+        })
+      }
+    } else {
+      this.snackBar.open('Please enter a valid OTP.')
+    }
+  }
+  startCountDown() {
+    const startTime = Date.now()
+    this.timeLeftforOTP = this.OTP_TIMER
+    // && this.primaryCategory !== this.ePrimaryCategory.PRACTICE_RESOURCE
+    if (this.OTP_TIMER > 0
+    ) {
+      this.timerSubscription = interval(1000)
+        .pipe(
+          map(
+            () =>
+              startTime + this.OTP_TIMER - Date.now(),
+          ),
+        )
+        .subscribe((_timeRemaining: any) => {
+          this.timeLeftforOTP -= 1
+          if (this.timeLeftforOTP < 0) {
+            this.timeLeftforOTP = 0
+            if (this.timerSubscription) {
+              this.timerSubscription.unsubscribe()
+            }
+            // this.submitQuiz()
+          }
+        })
+    }
+  }
+
+  sendOtpEmail() {
+    // const email = this.registrationForm.get('email')
+    if (this.userEmail) {
+      this.usersSvc.sendOtp(this.userEmail, 'email').subscribe(() => {
+        this.otpEmailSend = true
+        alert('An OTP has been sent to your email address (valid for 15 minutes)')
+        this.startCountDownEmail()
+        // tslint:disable-next-line: align
+      }, (error: any) => {
+        this.snackBar.open(_.get(error, 'error.params.errmsg') || 'Please try again later')
+      })
+    }
+    // else {
+    //   this.snackBar.open('Please enter a valid email address.')
+    // }
+  }
+
+  resendOTPEmail() {
+    // const email = this.registrationForm.get('email')
+    if (this.userEmail) {
+      this.usersSvc.resendOtp(this.userEmail, 'email').subscribe((res: any) => {
+        if ((_.get(res, 'result.response')).toUpperCase() === 'SUCCESS') {
+          this.otpEmailSend = true
+          this.disableEmailVerifyBtn = false
+          alert('An OTP has been sent to your email (valid for 15 minutes)')
+          this.startCountDownEmail()
+        }
+        // tslint:disable-next-line: align
+      }, (error: any) => {
+        this.snackBar.open(_.get(error, 'error.params.errmsg') || 'Please try again later')
+      })
+    }
+    // else {
+    //   this.snackBar.open('Please enter a valid email address.')
+    // }
+  }
+
+  verifyOtpEmail(otp: any) {
+    // const email = this.registrationForm.get('email')
+    if (otp && otp.value) {
+      if (otp && otp.value.length < 4) {
+        this.snackBar.open('Please enter a valid OTP.')
+      } else if (this.userEmail) {
+        this.usersSvc.verifyOTP(otp.value, this.userEmail, 'email').subscribe((res: any) => {
+          if ((_.get(res, 'result.response')).toUpperCase() === 'SUCCESS') {
+            this.otpEmailSend = true
+            this.isEmailVerified = true
+            this.disableBtn = false
+          }
+          // tslint:disable-next-line: align
+        }, (error: any) => {
+          this.snackBar.open(_.get(error, 'error.params.errmsg') || 'Please try again later')
+          if (error.error && error.error.result) {
+            this.disableEmailVerifyBtn = error.error.result.remainingAttempt === 0 ? true : false
+          }
+        })
+      }
+    } else {
+      this.snackBar.open('Please enter a valid OTP.')
+    }
+  }
+  startCountDownEmail() {
+    const startTime = Date.now()
+    this.timeLeftforOTPEmail = this.OTP_TIMER_EMAIL
+    // && this.primaryCategory !== this.ePrimaryCategory.PRACTICE_RESOURCE
+    if (this.OTP_TIMER_EMAIL > 0
+    ) {
+      this.timerSubscriptionEmail = interval(1000)
+        .pipe(
+          map(
+            () =>
+              startTime + this.OTP_TIMER_EMAIL - Date.now(),
+          ),
+        )
+        .subscribe(_timeRemaining => {
+          this.timeLeftforOTPEmail -= 1
+          if (this.timeLeftforOTPEmail < 0) {
+            this.timeLeftforOTPEmail = 0
+            if (this.timerSubscriptionEmail) {
+              this.timerSubscriptionEmail.unsubscribe()
+            }
+            // this.submitQuiz()
+          }
+        })
+    }
+  }
+
+  get getKarmayogiLink() {
+    if (this.myRoles && this.myRoles.has('public')) {
+      return `${environment.karmYogiPath}/app/user-profile/details`
+    }
+    return ''
+  }
+
+}

From b7d1e6ebddf0dafa06d8baf4494a91b4c0a49093 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Tue, 12 Mar 2024 15:40:32 +0530
Subject: [PATCH 504/887] Operationla reports UI fixes

---
 .../routes/reports-section/reports-section.component.html   | 2 +-
 .../routes/reports-section/reports-section.component.ts     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html
index 93760a8d0..2e8f52a16 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html
@@ -43,7 +43,7 @@
           Reports
           <mat-icon>download_outlined</mat-icon></button>
       </div>
-      <span class="updatedDate">Last updated on: {{lastUpdatedOn}}</span>
+      <span *ngIf="lastUpdatedOn" class="updatedDate">Last updated on: {{lastUpdatedOn}}</span>
 
       <ng-container *ngIf="showPasswordView">
         <hr class="my-4" style="border-top: 0.1px solid #b9b9b9;">
diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
index 7ce57b743..201985d13 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
@@ -132,7 +132,7 @@ export class ReportsSectionComponent implements OnInit {
                   userID: user.id,
                   MDOAdmin: firstName,
                   MDOAdminemail: _.get(user, 'profileDetails.personalDetails.primaryEmail'),
-                  expiryDate: new Date(expireDate),
+                  expiryDate: expireDate >= currentDate ? new Date(expireDate) : '',
                   assigned: expireDate >= currentDate,
                   enableAccessBtn: false,
                 }
@@ -150,7 +150,7 @@ export class ReportsSectionComponent implements OnInit {
           this.adminTableDataSource = response.formatedAdminsList
           if (getNoteDetails) {
             const hasUsers = response.formatedAdminsList && response.formatedAdminsList.length ? true : false
-            this.getNoteList(isMDOLeader, hasUsers, _.get(response, 'currentUserAccessDetails.reportAccessExpiry', ''))
+            this.getNoteList(isMDOLeader, hasUsers, this.datePipe.transform(_.get(response, 'currentUserAccessDetails.reportAccessExpiry'), 'yyyy/MM/dd') || '')
           }
         },
         error: (error: HttpErrorResponse) => {
@@ -174,7 +174,7 @@ export class ReportsSectionComponent implements OnInit {
           `Please grant or renew access to these reports to the MDO Admin very carefully due to Personally Identifiable Information (PII) data security.`
         ]
       } else {
-        const todayDate = this.datePipe.transform(new Date(), 'yyyy-MM-dd') || ''
+        const todayDate = this.datePipe.transform(new Date(), 'yyyy/MM/dd') || ''
         if (userAccessExpireDate === '') {
           this.hassAccessToreports = false
           this.reportsNoteList = [

From 46507637de0bde8b44149b526ba507b9fcc071c5 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Tue, 12 Mar 2024 15:53:45 +0530
Subject: [PATCH 505/887] style sheet fixes

---
 src/styles.scss | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/styles.scss b/src/styles.scss
index c563cecb3..e3aa80f7e 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -1772,7 +1772,8 @@ video {
 }
 
 .bg-clip-text {
-  background-clip: text;
+  -webkit-background-clip: text;
+          background-clip: text;
 }
 
 .bg-transparent {
@@ -20390,7 +20391,8 @@ video {
   }
 
   .sm\:bg-clip-text {
-    background-clip: text;
+     -webkit-background-clip: text;
+            background-clip: text;
   }
 
   .sm\:bg-transparent {
@@ -38978,7 +38980,8 @@ video {
   }
 
   .md\:bg-clip-text {
-    background-clip: text;
+    -webkit-background-clip: text;
+            background-clip: text;
   }
 
   .md\:bg-transparent {
@@ -57566,7 +57569,8 @@ video {
   }
 
   .lg\:bg-clip-text {
-    background-clip: text;
+    -webkit-background-clip: text;
+            background-clip: text;
   }
 
   .lg\:bg-transparent {
@@ -76154,7 +76158,8 @@ video {
   }
 
   .xl\:bg-clip-text {
-    background-clip: text;
+    -webkit-background-clip: text;
+            background-clip: text;
   }
 
   .xl\:bg-transparent {

From 9f9259f8513b646a0f9e6a3eda765fe2b2788c3f Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Tue, 12 Mar 2024 16:17:28 +0530
Subject: [PATCH 506/887] lint issues fixes

---
 .../head/_services/telemetry.event.model.ts   |   2 +-
 .../needs-approval.component.ts               |   3 +-
 .../admins-table.component.spec.ts            |  28 ++---
 .../admins-table/admins-table.component.ts    |   6 +-
 .../reports-section.component.ts              | 100 +++++++++++-------
 .../reports-video.component.spec.ts           |  28 ++---
 .../reports-video/reports-video.component.ts  |   2 +-
 .../home/services/download-report.service.ts  |   6 +-
 8 files changed, 96 insertions(+), 79 deletions(-)

diff --git a/project/ws/app/src/lib/head/_services/telemetry.event.model.ts b/project/ws/app/src/lib/head/_services/telemetry.event.model.ts
index a845b4c0d..a716866c9 100644
--- a/project/ws/app/src/lib/head/_services/telemetry.event.model.ts
+++ b/project/ws/app/src/lib/head/_services/telemetry.event.model.ts
@@ -16,7 +16,7 @@ export namespace TelemetryEvents {
     APPROVAL_TAB = 'approval-tab',
     SCROLLY_MENU = 'scrolly-menu',
     NOMINATE_BTN = 'nominate-learners-btn',
-    BTN_DOWNLOAD_REPORTS = 'btn-download-reports'
+    BTN_DOWNLOAD_REPORTS = 'btn-download-reports',
 
   }
   export enum EnumIdtype {
diff --git a/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.ts b/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.ts
index 23d0bdc67..563473281 100644
--- a/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.ts
+++ b/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.ts
@@ -126,8 +126,7 @@ export class NeedsApprovalComponent implements OnInit {
       if (res.result.data) {
         if (res.result.data.status === 'REJECTED') {
           this.openSnackBar('Request Rejected Successfully')
-        }
-        else {
+        } else {
           this.openSnackBar('Request Approved')
         }
         this.comment = ''
diff --git a/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.spec.ts b/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.spec.ts
index 5a81f8e2e..64ec204f3 100644
--- a/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.spec.ts
+++ b/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.spec.ts
@@ -1,25 +1,25 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
 
-import { AdminsTableComponent } from './admins-table.component';
+import { AdminsTableComponent } from './admins-table.component'
 
 describe('AdminsTableComponent', () => {
-  let component: AdminsTableComponent;
-  let fixture: ComponentFixture<AdminsTableComponent>;
+  let component: AdminsTableComponent
+  let fixture: ComponentFixture<AdminsTableComponent>
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ AdminsTableComponent ]
+      declarations: [AdminsTableComponent],
     })
-    .compileComponents();
-  }));
+    .compileComponents()
+  }))
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(AdminsTableComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+    fixture = TestBed.createComponent(AdminsTableComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
 
   it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.ts b/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.ts
index 8c85498ff..ebc23949d 100644
--- a/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.ts
@@ -5,7 +5,7 @@ import * as _ from 'lodash'
 @Component({
   selector: 'ws-app-admins-table',
   templateUrl: './admins-table.component.html',
-  styleUrls: ['./admins-table.component.scss']
+  styleUrls: ['./admins-table.component.scss'],
 })
 export class AdminsTableComponent implements OnInit {
 
@@ -13,14 +13,14 @@ export class AdminsTableComponent implements OnInit {
   @Input() tableData: any
   dataSource!: any
 
-  @Output() updateAccess = new EventEmitter<any>();
+  @Output() updateAccess = new EventEmitter<any>()
   @ViewChild(MatSort, { static: false }) set matSort(sort: MatSort) {
     if (!this.dataSource.sort) {
       this.dataSource.sort = sort
     }
   }
 
-  minDate = new Date();
+  minDate = new Date()
 
   constructor() {
     this.dataSource = new MatTableDataSource<any>()
diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
index 201985d13..879aa968d 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
@@ -27,15 +27,15 @@ export class ReportsSectionComponent implements OnInit {
   configSvc!: any
   userDetails: any
   lastUpdatedOn: string | null = ''
-  showPasswordView = false;
-  password = '';
-  showPassword = false;
-  showAdminsTable = false;
+  showPasswordView = false
+  password = ''
+  showPassword = false
+  showAdminsTable = false
   adminTableData: any
   adminTableDataSource: any
-  showLoaderOnTable = false;
-  noteLoaded = false;
-  reportsNoteList: string[] = [];
+  showLoaderOnTable = false
+  noteLoaded = false
+  reportsNoteList: string[] = []
   hassAccessToreports = false
   reportsAvailbale = false
   reportsDownlaoding = false
@@ -63,16 +63,16 @@ export class ReportsSectionComponent implements OnInit {
   getReportInfo() {
     this.reportsAvailbale = false
     this.downloadService.getReportInfo().subscribe({
-      next: (response) => {
+      next: response => {
         if (response) {
           this.lastUpdatedOn = response.lastModified ? this.datePipe.transform(response.lastModified, 'dd/MM/yy, hh:mm a') : ''
-          this.reportsAvailbale = response.fileMetaData!.empty === false && response.lastModified ? true : false
+          this.reportsAvailbale = _.get(response, 'fileMetaData.empty') === false && response.lastModified ? true : false
         }
       },
       error: (error: HttpErrorResponse) => {
         const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
         this.openSnackbar(errorMessage)
-      }
+      },
     })
   }
 
@@ -90,23 +90,23 @@ export class ReportsSectionComponent implements OnInit {
   }
 
   getAdminTableData(getNoteDetails = false) {
-    const isMDOLeader = this.configSvc && this.userDetails!.roles!.includes('MDO_LEADER') ? true : false
+    const isMDOLeader = this.configSvc && this.userDetails.roles.includes('MDO_LEADER') ? true : false
     this.showAdminsTable = isMDOLeader ? true : false
     const filters = {
       request: {
         filters: {
           rootOrgId: this.configSvc.userProfile.rootOrgId,
           'organisations.roles': [
-            isMDOLeader ? 'MDO_ADMIN' : 'MDO_LEADER'
-          ]
-        }
-      }
+            isMDOLeader ? 'MDO_ADMIN' : 'MDO_LEADER',
+          ],
+        },
+      },
     }
     const readAssessEndPoint = isMDOLeader ? 'leader/readaccess' : 'admin/readaccess'
     this.showLoaderOnTable = true
     forkJoin([
       this.downloadService.getAdminsList(filters),
-      this.downloadService.getAccessDetails(readAssessEndPoint)
+      this.downloadService.getAccessDetails(readAssessEndPoint),
     ])
       .pipe(
         mergeMap(([adminDetails, accessDetailsList]) => {
@@ -115,7 +115,7 @@ export class ReportsSectionComponent implements OnInit {
             formatedAdminsList: any[]
           } = {
             currentUserAccessDetails: {},
-            formatedAdminsList: []
+            formatedAdminsList: [],
           }
           if (adminDetails && adminDetails.content) {
             formatedResponse.currentUserAccessDetails = accessDetailsList && accessDetailsList.length > 0 ?
@@ -144,13 +144,14 @@ export class ReportsSectionComponent implements OnInit {
         })
       )
       .subscribe({
-        next: (response) => {
+        next: response => {
           this.showLoaderOnTable = false
           this.noteLoaded = true
           this.adminTableDataSource = response.formatedAdminsList
           if (getNoteDetails) {
             const hasUsers = response.formatedAdminsList && response.formatedAdminsList.length ? true : false
-            this.getNoteList(isMDOLeader, hasUsers, this.datePipe.transform(_.get(response, 'currentUserAccessDetails.reportAccessExpiry'), 'yyyy/MM/dd') || '')
+            this.getNoteList(isMDOLeader, hasUsers, this.datePipe.transform(
+              _.get(response, 'currentUserAccessDetails.reportAccessExpiry'), 'yyyy/MM/dd') || '')
           }
         },
         error: (error: HttpErrorResponse) => {
@@ -160,7 +161,7 @@ export class ReportsSectionComponent implements OnInit {
           this.showLoaderOnTable = false
           const userAccessExpireDate = this.datePipe.transform(_.get(this.userDetails, 'report_access_expiry'), 'yyyy/MM/dd') || ''
           this.getNoteList(isMDOLeader, false, userAccessExpireDate)
-        }
+        },
       })
   }
   //#endregion
@@ -170,31 +171,39 @@ export class ReportsSectionComponent implements OnInit {
       if (isMDOLeader) {
         this.hassAccessToreports = true
         this.reportsNoteList = [
-          `You can grant access to these reports to your existing MDO Admins. Similarly, if you want to onboard new MDO Admins, it can be done in the 'User' tab, and then grant the access.`,
-          `Please grant or renew access to these reports to the MDO Admin very carefully due to Personally Identifiable Information (PII) data security.`
+          `You can grant access to these reports to your existing
+          MDO Admins. Similarly, if you want to onboard new MDO Admins, it can
+          be done in the 'User' tab, and then grant the access.`,
+          `Please grant or renew access to these reports to the MDO Admin
+          very carefully due to Personally Identifiable Information (PII) data security.`,
         ]
       } else {
         const todayDate = this.datePipe.transform(new Date(), 'yyyy/MM/dd') || ''
         if (userAccessExpireDate === '') {
           this.hassAccessToreports = false
           this.reportsNoteList = [
-            `Currently, your MDO Leader has not granted you access to these reports.Kindly contact your MDO Leader to provide you access.`
+            `Currently, your MDO Leader has not granted you access to these
+            reports.Kindly contact your MDO Leader to provide you access.`,
           ]
         } else if (userAccessExpireDate >= todayDate) {
           this.hassAccessToreports = true
           this.reportsNoteList = [
-            `These reports contain Personally Identifiable Information (PII) data. Please use them cautiously.`,
-            `Your access to the report is available until ${userAccessExpireDate}. Please contact your MDO Leader to renew your access.`
+            `These reports contain Personally Identifiable Information (PII) data.
+            Please use them cautiously.`,
+            `Your access to the report is available until ${userAccessExpireDate}.
+            Please contact your MDO Leader to renew your access.`,
           ]
         } else if (userAccessExpireDate < todayDate) {
           this.hassAccessToreports = false
           this.reportsNoteList = [
-            `Your access to reports expired on ${userAccessExpireDate}. Please contact your MDO Leader to renew access.`,
+            `Your access to reports expired on ${userAccessExpireDate}. Please
+            contact your MDO Leader to renew access.`,
           ]
         } else {
           this.hassAccessToreports = false
           this.reportsNoteList = [
-            `Currently, your MDO Leader has not granted you access to these reports.Kindly contact your MDO Leader to provide you access.`
+            `Currently, your MDO Leader has not granted you access to these
+            reports.Kindly contact your MDO Leader to provide you access.`,
           ]
         }
       }
@@ -202,15 +211,23 @@ export class ReportsSectionComponent implements OnInit {
       if (isMDOLeader) {
         this.hassAccessToreports = true
         this.reportsNoteList = [
-          `Your organization doesn’t have an MDO Admin role. Please assign the MDO Admin role in the 'User' tab.`,
-          `After successfully onboarding an MDO Admin, they can be granted access to these reports.`,
-          `Please grant or renew access to these reports to the MDO Admin very carefully due to Personally Identifiable Information (PII) data security.`
+          `Your organization doesn’t have an MDO Admin role. Please assign the
+          MDO Admin role in the 'User' tab.`,
+          `After successfully onboarding an MDO Admin, they can be granted
+          access to these reports.`,
+          `Please grant or renew access to these reports to the MDO Admin very
+          carefully due to Personally Identifiable Information (PII) data security.`,
         ]
       } else {
         this.hassAccessToreports = false
         this.reportsNoteList = [
-          `Your organization does not have an MDO Leader onboarded. Every organization must have a leader assigned to iGOT to access these reports. Please reach out to us at mission.karmayogi@gov.in or connect with us via Video Conferencing by clicking the button below: [Join Now]`,
-          `Once the MDO Leader is onboarded, they will grant you access to download the reports, and you are requested to connect with your MDO Leader for further process.`
+          `Your organization does not have an MDO Leader onboarded.
+          Every organization must have a leader assigned to
+          iGOT to access these reports.
+          Please reach out to us at mission.karmayogi@gov.in or
+          connect with us via Video Conferencing by clicking the button below: [Join Now]`,
+          `Once the MDO Leader is onboarded, they will grant you access to download the
+          reports, and you are requested to connect with your MDO Leader for further process.`,
         ]
       }
     }
@@ -226,7 +243,7 @@ export class ReportsSectionComponent implements OnInit {
         if (response.body) {
           const contentType = response.headers.get('Content-Type')
           const blob = new Blob([response.body], {
-            type: contentType ? contentType : 'application/octet-stream'
+            type: contentType ? contentType : 'application/octet-stream',
           })
           const blobUrl = window.URL.createObjectURL(blob)
           const a = document.createElement('a')
@@ -245,7 +262,7 @@ export class ReportsSectionComponent implements OnInit {
       error: (error: HttpErrorResponse) => {
         const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
         this.openSnackbar(errorMessage)
-      }
+      },
     })
 
   }
@@ -255,7 +272,7 @@ export class ReportsSectionComponent implements OnInit {
       {
         type: TelemetryEvents.EnumInteractTypes.CLICK,
         subType: TelemetryEvents.EnumInteractSubTypes.BTN_DOWNLOAD_REPORTS,
-        id: "report-download",
+        id: 'report-download',
       },
       {},
     )
@@ -265,21 +282,22 @@ export class ReportsSectionComponent implements OnInit {
     const formData = {
       request: {
         userId: rowData.userID,
-        reportExpiryDate: rowData.expiryDate
-      }
+        reportExpiryDate: rowData.expiryDate,
+      },
     }
     this.showLoaderOnTable = true
     this.downloadService.updateAccessToReports(formData).subscribe({
       next: (response: any) => {
-        if (response.result)
+        if (response.result) {
           this.openSnackbar(_.get(response, 'result.message', 'Report access has been granted successfully'))
+        }
         this.getAdminTableData()
       },
       error: (error: HttpErrorResponse) => {
         const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
         this.openSnackbar(errorMessage)
         this.getAdminTableData()
-      }
+      },
     })
   }
 
@@ -295,12 +313,12 @@ export class ReportsSectionComponent implements OnInit {
   openVideoPopup() {
     this.dialog.open(ReportsVideoComponent, {
       data: {
-        videoLink: 'https://www.youtube.com/embed/tgbNymZ7vqY?autoplay=1&mute=1'
+        videoLink: 'https://www.youtube.com/embed/tgbNymZ7vqY?autoplay=1&mute=1',
       },
       disableClose: true,
       width: '50%',
       height: '60%',
-      panelClass: 'overflow-visable'
+      panelClass: 'overflow-visable',
     })
   }
 
diff --git a/project/ws/app/src/lib/routes/home/routes/reports-video/reports-video.component.spec.ts b/project/ws/app/src/lib/routes/home/routes/reports-video/reports-video.component.spec.ts
index ab6f23d67..01f4253de 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-video/reports-video.component.spec.ts
+++ b/project/ws/app/src/lib/routes/home/routes/reports-video/reports-video.component.spec.ts
@@ -1,25 +1,25 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
 
-import { ReportsVideoComponent } from './reports-video.component';
+import { ReportsVideoComponent } from './reports-video.component'
 
 describe('ReportsVideoComponent', () => {
-  let component: ReportsVideoComponent;
-  let fixture: ComponentFixture<ReportsVideoComponent>;
+  let component: ReportsVideoComponent
+  let fixture: ComponentFixture<ReportsVideoComponent>
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ ReportsVideoComponent ]
+      declarations: [ReportsVideoComponent],
     })
-    .compileComponents();
-  }));
+    .compileComponents()
+  }))
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(ReportsVideoComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+    fixture = TestBed.createComponent(ReportsVideoComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
 
   it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/home/routes/reports-video/reports-video.component.ts b/project/ws/app/src/lib/routes/home/routes/reports-video/reports-video.component.ts
index 548a0b208..8a5e05dd8 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-video/reports-video.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/reports-video/reports-video.component.ts
@@ -5,7 +5,7 @@ import { DomSanitizer } from '@angular/platform-browser'
 @Component({
   selector: 'ws-app-reports-video',
   templateUrl: './reports-video.component.html',
-  styleUrls: ['./reports-video.component.scss']
+  styleUrls: ['./reports-video.component.scss'],
 })
 export class ReportsVideoComponent implements OnInit {
   videoLink = ''
diff --git a/project/ws/app/src/lib/routes/home/services/download-report.service.ts b/project/ws/app/src/lib/routes/home/services/download-report.service.ts
index 9af19211c..ac96e3477 100644
--- a/project/ws/app/src/lib/routes/home/services/download-report.service.ts
+++ b/project/ws/app/src/lib/routes/home/services/download-report.service.ts
@@ -3,8 +3,7 @@ import { HttpClient, HttpResponse } from '@angular/common/http'
 import { Observable } from 'rxjs'
 import { ConfigurationsService } from '@sunbird-cb/utils'
 import { map } from 'rxjs/operators'
-import _ from 'lodash'
-
+import * as _ from 'lodash'
 
 const API_END_POINTS = {
   GET_REPORTS_INFO: `/apis/proxies/v8/operationalreports/v1/reportInfo`,
@@ -36,7 +35,8 @@ export class DownloadReportService {
   }
 
   getAccessDetails(readAssessEndPoint: string) {
-    return this.http.get<any>(`${API_END_POINTS.GET_ADMINS_ACCESSS_DETAILS}${readAssessEndPoint}`).pipe(map(res => _.get(res, 'result.response')))
+    return this.http.get<any>(`${API_END_POINTS.GET_ADMINS_ACCESSS_DETAILS}${readAssessEndPoint}`)
+      .pipe(map(res => _.get(res, 'result.response')))
   }
 
   updateAccessToReports(formData: any) {

From 7c0299aa288b802e9a800923daefa67eb64099ff Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Tue, 12 Mar 2024 16:38:52 +0530
Subject: [PATCH 507/887] lint issues fixes

---
 .../ws/app/src/lib/routes/home/home.module.ts |  6 ++--
 .../profle-bulk-upload.component.spec.ts      | 28 +++++++++----------
 .../profle-bulk-upload.component.ts           |  8 +++---
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index f5273c70a..465d63a5a 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -94,7 +94,7 @@ import { ProfleBulkUploadComponent } from './routes/profle-bulk-upload/profle-bu
     TrainingPlanDashboardComponent,
     AdminsTableComponent,
     ReportsVideoComponent,
-    ProfleBulkUploadComponent
+    ProfleBulkUploadComponent,
   ],
   imports: [
     CommonModule,
@@ -148,14 +148,14 @@ import { ProfleBulkUploadComponent } from './routes/profle-bulk-upload/profle-bu
     MatSortModule,
     UsersModule,
     MatDatepickerModule,
-    PipeDurationTransformModule
+    PipeDurationTransformModule,
   ],
   entryComponents: [
     AdduserpopupComponent,
     StaffdetailspopupComponent,
     BudgetschemepopupComponent,
     BudgetproofspopupComponent,
-    ReportsVideoComponent
+    ReportsVideoComponent,
   ],
   providers: [
     // CKEditorService,
diff --git a/project/ws/app/src/lib/routes/home/routes/profle-bulk-upload/profle-bulk-upload.component.spec.ts b/project/ws/app/src/lib/routes/home/routes/profle-bulk-upload/profle-bulk-upload.component.spec.ts
index 40766b175..ca0978cef 100644
--- a/project/ws/app/src/lib/routes/home/routes/profle-bulk-upload/profle-bulk-upload.component.spec.ts
+++ b/project/ws/app/src/lib/routes/home/routes/profle-bulk-upload/profle-bulk-upload.component.spec.ts
@@ -1,25 +1,25 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
 
-import { ProfleBulkUploadComponent } from './profle-bulk-upload.component';
+import { ProfleBulkUploadComponent } from './profle-bulk-upload.component'
 
 describe('ProfleBulkUploadComponent', () => {
-  let component: ProfleBulkUploadComponent;
-  let fixture: ComponentFixture<ProfleBulkUploadComponent>;
+  let component: ProfleBulkUploadComponent
+  let fixture: ComponentFixture<ProfleBulkUploadComponent>
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ ProfleBulkUploadComponent ]
+      declarations: [ProfleBulkUploadComponent],
     })
-    .compileComponents();
-  }));
+    .compileComponents()
+  }))
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(ProfleBulkUploadComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+    fixture = TestBed.createComponent(ProfleBulkUploadComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
 
   it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/home/routes/profle-bulk-upload/profle-bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/profle-bulk-upload/profle-bulk-upload.component.ts
index bb2e5e765..3b0f81f57 100644
--- a/project/ws/app/src/lib/routes/home/routes/profle-bulk-upload/profle-bulk-upload.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/profle-bulk-upload/profle-bulk-upload.component.ts
@@ -1,5 +1,5 @@
 import { DatePipe } from '@angular/common'
-import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'
+import { AfterViewInit, Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core'
 import { Validators, FormGroup, FormBuilder, FormControl } from '@angular/forms'
 import { MatSort, MatSnackBar, MatRadioChange } from '@angular/material'
 import { ActivatedRoute } from '@angular/router'
@@ -11,14 +11,14 @@ import { environment } from 'src/environments/environment'
 import { FileService } from '../../../users/services/upload.service'
 import { UsersService } from '../../../users/services/users.service'
 import { ITableData } from '@sunbird-cb/collection/lib/ui-org-table/interface/interfaces'
-import _ from 'lodash'
+import * as _ from 'lodash'
 
 @Component({
   selector: 'ws-app-profle-bulk-upload',
   templateUrl: './profle-bulk-upload.component.html',
-  styleUrls: ['./profle-bulk-upload.component.scss']
+  styleUrls: ['./profle-bulk-upload.component.scss'],
 })
-export class ProfleBulkUploadComponent implements OnInit {
+export class ProfleBulkUploadComponent implements OnInit, OnDestroy, AfterViewInit {
 
   tableList!: any[]
   public fileName: any

From 0264a9ac32415cc3b00fbfb5075afbaa299cab71 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Tue, 12 Mar 2024 16:46:17 +0530
Subject: [PATCH 508/887] hiding bulk approval tab

---
 .../lib/routes/home/routes/approvals/approvals.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.html
index 4edf98f63..b35bd9773 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.html
@@ -19,9 +19,9 @@
               'ws-mat-accent-border font-medium':currentFilter !== 'toapprove'}" mat-button
             (click)="filter('toapprove'); tabTelemetry('toapprove', 0)" role="button">To approve</a>
 
-          <a href="javascript:void(0)" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'uploadApprovals',
+          <!-- <a href="javascript:void(0)" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'uploadApprovals',
                           'ws-mat-accent-border font-medium':currentFilter !== 'uploadApprovals'}" mat-button
-            (click)="filter('uploadApprovals'); tabTelemetry('uploadApprovals', 1)" role="button">File uploads</a>
+            (click)="filter('uploadApprovals'); tabTelemetry('uploadApprovals', 1)" role="button">File uploads</a> -->
           <!-- <a href="javascript:void(0)" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'userflags',
               'ws-mat-accent-border font-medium':currentFilter !== 'userflags'}" mat-button
             (click)="filter('userflags')" role="button">User flags</a> -->

From 0a2343f907b0cfd09e2d2ce8e8c8b54a183dbc96 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Wed, 13 Mar 2024 17:33:37 +0530
Subject: [PATCH 509/887] Bug fix - KB-3299

---
 .../admins-table/admins-table.component.html  |  8 +++---
 .../admins-table/admins-table.component.ts    | 26 ++++++++++++++++++-
 .../reports-section.component.html            |  4 ++-
 .../reports-section.component.scss            |  2 +-
 .../reports-section.component.ts              |  1 +
 5 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.html b/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.html
index 01c66f0bd..370a12d29 100644
--- a/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.html
@@ -20,15 +20,15 @@
           </ng-container>
           <ng-container *ngSwitchCase="'datePicker'">
             <mat-form-field color="accent" appearance="outline" class="expireDateForm">
-              <input matInput [matDatepicker]="expireDate" placeholder="Enter date" [(ngModel)]="element[col.key]"
-                [min]="minDate" (dateChange)="enableAccessBtn(element)">
+              <input matInput readonly [matDatepicker]="expireDate" placeholder="Enter date"
+                [(ngModel)]="element[col.key]" [min]="minDate" [max]="maxDate" (dateChange)="enableAccessBtn(element)">
               <mat-datepicker-toggle matSuffix [for]="expireDate">
               </mat-datepicker-toggle>
               <mat-datepicker #expireDate></mat-datepicker>
             </mat-form-field>
           </ng-container>
           <ng-container *ngSwitchCase="'action'">
-            <ng-container *ngIf="element[col.key] ===true; else giveAccess">
+            <ng-container *ngIf="element[col.key] === true; else giveAccess">
               <div class="flex successText">
                 <mat-icon class="mr-2">check_circle</mat-icon>
                 <span>Access Given</span>
@@ -44,7 +44,7 @@
         </mat-cell>
       </ng-container>
       <mat-header-row *matHeaderRowDef="getFinalColumns()"></mat-header-row>
-      <mat-row *matRowDef="let row; columns: getFinalColumns();" (click)="selection.toggle(row);">
+      <mat-row *matRowDef="let row; columns: getFinalColumns();" (click)="selection && selection.toggle(row);">
       </mat-row>
     </mat-table>
   </div>
diff --git a/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.ts b/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.ts
index ebc23949d..92fa99f69 100644
--- a/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.ts
@@ -1,11 +1,32 @@
 import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'
-import { MatSort, MatTableDataSource } from '@angular/material'
+import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatSort, MatTableDataSource } from '@angular/material'
+import { MAT_MOMENT_DATE_ADAPTER_OPTIONS, MomentDateAdapter } from '@angular/material-moment-adapter'
 import * as _ from 'lodash'
 
+export const MY_FORMATS = {
+  parse: {
+    dateInput: 'DD/MM/YYYY',
+  },
+  display: {
+    dateInput: 'DD/MM/YYYY',
+    monthYearLabel: 'MMM YYYY',
+    dateA11yLabel: 'DD/MM/YYYY',
+    monthYearA11yLabel: 'MMMM YYYY',
+  },
+}
+
 @Component({
   selector: 'ws-app-admins-table',
   templateUrl: './admins-table.component.html',
   styleUrls: ['./admins-table.component.scss'],
+  providers: [
+    {
+      provide: DateAdapter,
+      useClass: MomentDateAdapter,
+      deps: [MAT_DATE_LOCALE, MAT_MOMENT_DATE_ADAPTER_OPTIONS],
+    },
+    { provide: MAT_DATE_FORMATS, useValue: MY_FORMATS },
+  ],
 })
 export class AdminsTableComponent implements OnInit {
 
@@ -21,9 +42,12 @@ export class AdminsTableComponent implements OnInit {
   }
 
   minDate = new Date()
+  today = new Date()
+  maxDate: any
 
   constructor() {
     this.dataSource = new MatTableDataSource<any>()
+    this.maxDate = new Date(this.today.getFullYear() + 1, this.today.getMonth(), this.today.getDate())
   }
 
   ngOnInit() {
diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html
index 2e8f52a16..f01e3f3ea 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html
@@ -64,7 +64,9 @@
           <div class="flex flex-middle password justify-between">
             <mat-form-field appearance="outline" class="margin-top-xs password-input">
               <input [type]="showPassword ? 'text' : 'password'" matInput [(ngModel)]="password" readonly>
-              <mat-icon (click)="showPassword = !showPassword" class="eye-icon">visibility</mat-icon>
+              <mat-icon (click)="showPassword = !showPassword" class="eye-icon">
+                {{showPassword ? 'visibility' : 'visibility_off'}}
+              </mat-icon>
             </mat-form-field>
             <mat-icon class="copy-icon" (click)="copyToClipboard()">content_copy</mat-icon>
           </div>
diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.scss b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.scss
index 721b5ceaf..9158ac06a 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.scss
@@ -98,7 +98,7 @@
     }
 
     .copy-icon {
-      cursor: copy;
+      cursor: pointer;
       margin-bottom: 10px;
       color: #000000;
       opacity: 0.6;
diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
index 879aa968d..cdedaf5dc 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
@@ -308,6 +308,7 @@ export class ReportsSectionComponent implements OnInit {
     dummyTextArea.select()
     document.execCommand('copy')
     document.body.removeChild(dummyTextArea)
+    this.openSnackbar('Copied to clipboard.')
   }
 
   openVideoPopup() {

From c75eeb998e9f54a6ca35ce905caee0a2e5ba5f2f Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Wed, 13 Mar 2024 18:02:12 +0530
Subject: [PATCH 510/887] Uncommented the bulk approval/reject code

---
 .../routes/needs-approval/needs-approval.component.html       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.html b/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.html
index ee7d3f159..5f16c7b52 100644
--- a/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.html
+++ b/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.html
@@ -32,7 +32,7 @@
                 </button>
               </div>
             </ng-container>
-            <!-- <div style="margin-top: 17px; margin-left: 155px;">
+            <div style="margin-top: 17px; margin-left: 155px;">
               <button mat-icon-button aria-label="Reject" id="reject"
                 (click)="onClickAllHandleWorkflow(needApprovalList,'REJECT')">
                 <span class="mat-button-wrapper" style="color: white; padding:13px;"> Reject All </span>
@@ -41,7 +41,7 @@
                 (click)="onClickAllHandleWorkflow(needApprovalList,'APPROVE')">
                 <span class="mat-button-wrapper" style="color:white; padding:13px;"> Approve All </span>
               </button>
-            </div> -->
+            </div>
           </div>
           <!--needApprovalList.length <= 0-->
           <div class="w-full profile-cols-full bg-grey" *ngIf="false">

From 587d2699a55dc44a40bf64dc2a3cd8a833a4aecb Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Wed, 13 Mar 2024 18:52:03 +0530
Subject: [PATCH 511/887] fixed the year format

---
 .../home/routes/reports-section/reports-section.component.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
index cdedaf5dc..36cc22f08 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
@@ -65,7 +65,7 @@ export class ReportsSectionComponent implements OnInit {
     this.downloadService.getReportInfo().subscribe({
       next: response => {
         if (response) {
-          this.lastUpdatedOn = response.lastModified ? this.datePipe.transform(response.lastModified, 'dd/MM/yy, hh:mm a') : ''
+          this.lastUpdatedOn = response.lastModified ? this.datePipe.transform(response.lastModified, 'dd/MM/yyyy, hh:mm a') : ''
           this.reportsAvailbale = _.get(response, 'fileMetaData.empty') === false && response.lastModified ? true : false
         }
       },

From 55ac151ed71a7ad50885fc959842b93c1f51ea03 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Thu, 14 Mar 2024 18:14:22 +0530
Subject: [PATCH 512/887] Bulk approve users profile details - UI fixes

---
 .../approvals/routes/home/home.component.html |  2 +-
 .../ws/app/src/lib/routes/home/home.module.ts |  4 +-
 .../lib/routes/home/home.rounting.module.ts   | 21 ++++++++++
 .../routes/approvals/approvals.component.html | 38 ++++++++-----------
 .../routes/approvals/approvals.component.ts   | 32 +++++-----------
 ...rofle-approval-bulk-upload.component.html} |  0
 ...rofle-approval-bulk-upload.component.scss} |  0
 ...fle-approval-bulk-upload.component.spec.ts | 25 ++++++++++++
 .../profle-approval-bulk-upload.component.ts} | 13 +++----
 .../profle-bulk-upload.component.spec.ts      | 25 ------------
 10 files changed, 80 insertions(+), 80 deletions(-)
 rename project/ws/app/src/lib/routes/home/routes/{profle-bulk-upload/profle-bulk-upload.component.html => profle-approval-bulk-upload/profle-approval-bulk-upload.component.html} (100%)
 rename project/ws/app/src/lib/routes/home/routes/{profle-bulk-upload/profle-bulk-upload.component.scss => profle-approval-bulk-upload/profle-approval-bulk-upload.component.scss} (100%)
 create mode 100644 project/ws/app/src/lib/routes/home/routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component.spec.ts
 rename project/ws/app/src/lib/routes/home/routes/{profle-bulk-upload/profle-bulk-upload.component.ts => profle-approval-bulk-upload/profle-approval-bulk-upload.component.ts} (98%)
 delete mode 100644 project/ws/app/src/lib/routes/home/routes/profle-bulk-upload/profle-bulk-upload.component.spec.ts

diff --git a/project/ws/app/src/lib/routes/approvals/routes/home/home.component.html b/project/ws/app/src/lib/routes/approvals/routes/home/home.component.html
index 26bb58e79..df9af21d7 100644
--- a/project/ws/app/src/lib/routes/approvals/routes/home/home.component.html
+++ b/project/ws/app/src/lib/routes/approvals/routes/home/home.component.html
@@ -4,7 +4,7 @@
       <div class="flex flex-4 flex-column">
         <div class="flex flex-1 margin-left-xl">
           <ws-widget-breadcrumbs-org
-            [widgetData]="{titles:[{title:'Approvals', url:'/app/home/approvals'},{title:'To approve', url:'none'},{title:fullname,url:'none'}] }">
+            [widgetData]="{titles:[{title:'Approvals', url:'/app/home/approvals/pending'},{title:'To approve', url:'none'},{title:fullname,url:'none'}] }">
           </ws-widget-breadcrumbs-org>
         </div>
         <div class="flex flex-1 custom">
diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index 465d63a5a..7b8eb351e 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -67,7 +67,7 @@ import { TrainingPlanDashboardComponent } from './routes/training-plan-dashboard
 import { TrainingPlanDashboardService } from './services/training-plan-dashboard.service'
 import { AdminsTableComponent } from './routes/admins-table/admins-table.component'
 import { ReportsVideoComponent } from './routes/reports-video/reports-video.component'
-import { ProfleBulkUploadComponent } from './routes/profle-bulk-upload/profle-bulk-upload.component'
+import { ProfleApprovalBulkUploadComponent } from './routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component'
 @NgModule({
   declarations: [
     HomeComponent,
@@ -94,7 +94,7 @@ import { ProfleBulkUploadComponent } from './routes/profle-bulk-upload/profle-bu
     TrainingPlanDashboardComponent,
     AdminsTableComponent,
     ReportsVideoComponent,
-    ProfleBulkUploadComponent,
+    ProfleApprovalBulkUploadComponent,
   ],
   imports: [
     CommonModule,
diff --git a/project/ws/app/src/lib/routes/home/home.rounting.module.ts b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
index ea67d54eb..381d9b00d 100644
--- a/project/ws/app/src/lib/routes/home/home.rounting.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
@@ -94,12 +94,33 @@ const routes: Routes = [
           usersList: UsersListResolve,
         },
       },
+      {
+        path: 'approvals/:tab',
+        component: ApprovalsComponent,
+        data: {
+          pageId: 'approvals',
+          module: 'Approvals',
+          pageType: 'feature',
+          pageKey: 'approval-view',
+        },
+        resolve: {
+          pageData: PageResolve,
+          configService: ConfigResolveService,
+        },
+      },
       {
         path: 'approvals',
+        redirectTo: 'approvals/pending',
         component: ApprovalsComponent,
+        resolve: {
+          pageData: PageResolve,
+          configService: ConfigResolveService,
+        },
         data: {
           pageId: 'approvals',
           module: 'Approvals',
+          pageType: 'feature',
+          pageKey: 'approval-view',
         },
       },
       {
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.html
index b35bd9773..bf68e58ff 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.html
@@ -15,34 +15,28 @@
     <mat-card-content>
       <div class="flex flex-1 flex-column margin-fix">
         <div class="flex flex-1 filter max-height-60">
-          <a href="javascript:void(0)" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'toapprove',
-              'ws-mat-accent-border font-medium':currentFilter !== 'toapprove'}" mat-button
-            (click)="filter('toapprove'); tabTelemetry('toapprove', 0)" role="button">To approve</a>
+          <a routerLink="/app/home/approvals/pending" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'pending',
+              'ws-mat-accent-border font-medium':currentFilter !== 'pending'}" mat-button
+            (click)="filter('pending'); tabTelemetry('toapprove', 0)" role="button">To approve</a>
 
-          <!-- <a href="javascript:void(0)" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'uploadApprovals',
-                          'ws-mat-accent-border font-medium':currentFilter !== 'uploadApprovals'}" mat-button
-            (click)="filter('uploadApprovals'); tabTelemetry('uploadApprovals', 1)" role="button">File uploads</a> -->
-          <!-- <a href="javascript:void(0)" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'userflags',
-              'ws-mat-accent-border font-medium':currentFilter !== 'userflags'}" mat-button
-            (click)="filter('userflags')" role="button">User flags</a> -->
+          <a routerLink="/app/home/approvals/upload" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'uploadApprovals',
+            'ws-mat-accent-border font-medium':currentFilter !== 'uploadApprovals'}" mat-button
+            (click)="filter('uploadApprovals'); tabTelemetry('uploadApprovals', 1)" role="button">File uploads</a>
         </div>
       </div>
-
-      <ng-container [ngSwitch]="currentFilter">
-        <ng-container *ngSwitchCase="'toapprove'">
-          <ng-container *ngIf="getTableData && getTableData.length>0">
-            <ws-widget-org-user-table-v2 [tableData]="tabledata" [data]="data" (eOnRowClick)="onApprovalClick($event)"
-              [totalRecords]="approvalTotalCount" (pageChangeClick)="onPaginateChange($event)">
-            </ws-widget-org-user-table-v2>
-          </ng-container>
-          <ng-container *ngIf="!getTableData || getTableData.length<=0">
-            <p class="text-center">No approvals pending</p>
-          </ng-container>
+      <ng-container *ngIf="currentFilter === 'pending'">
+        <ng-container *ngIf="getTableData && getTableData.length>0">
+          <ws-widget-org-user-table-v2 [tableData]="tabledata" [data]="data" (eOnRowClick)="onApprovalClick($event)"
+            [totalRecords]="approvalTotalCount" (pageChangeClick)="onPaginateChange($event)">
+          </ws-widget-org-user-table-v2>
         </ng-container>
-        <ng-container *ngSwitchCase="'uploadApprovals'">
-          <ws-app-profle-bulk-upload></ws-app-profle-bulk-upload>
+        <ng-container *ngIf="!getTableData || getTableData.length<=0">
+          <p class="text-center">No approvals pending</p>
         </ng-container>
       </ng-container>
+      <ng-container *ngIf="currentFilter === 'uploadApprovals'">
+        <ws-app-profle-approval-bulk-upload></ws-app-profle-approval-bulk-upload>
+      </ng-container>
     </mat-card-content>
   </mat-card>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
index e00b48b73..a73ebd657 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
@@ -17,7 +17,7 @@ import { TelemetryEvents } from '../../../../head/_services/telemetry.event.mode
 })
 export class ApprovalsComponent implements OnInit, OnDestroy {
   data: any = []
-  currentFilter = 'toapprove'
+  currentFilter = 'pending'
   discussionList!: any
   discussProfileData!: any
   departName = ''
@@ -58,34 +58,20 @@ export class ApprovalsComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit() {
-    this.fetchApprovals()
+    this.currentFilter = this.route.snapshot.params['tab']
+    console.log("this.currentFilter ", this.currentFilter)
+    if (this.currentFilter === 'pending') {
+      this.fetchApprovals()
+    }
   }
 
   filter(key: string | 'timestamp' | 'best' | 'saved') {
     if (key) {
       this.currentFilter = key
-      switch (key) {
-        case 'toapprove':
-          this.fetchApprovals()
-          break
-        case 'userflags':
-          this.data = [{
-            fullname: 'Nancy Jimenez',
-            requestedon: new Date(),
-            fields: 'Period,Position',
-          }]
-          break
-
-        default:
-          break
+      if (key === 'pending') {
+        this.fetchApprovals()
       }
     }
-    // this.events.raiseInteractTelemetry(
-    //   {
-    //     type: TelemetryEvents.EnumInteractTypes.CLICK,
-    //     subType: TelemetryEvents.EnumInteractSubTypes.TAB_CONTENT,
-    //   }, {}
-    // )
   }
 
   public tabTelemetry(label: string, index: number) {
@@ -203,7 +189,7 @@ export class ApprovalsComponent implements OnInit, OnDestroy {
   replaceWords(inputString: any, wordConditions: any) {
     return wordConditions.reduce((acc: any, [word, condition]: any) => {
       return acc.replace(new RegExp(word, 'gi'), condition)
-    },                           inputString)
+    }, inputString)
   }
 
   onPaginateChange(event: PageEvent) {
diff --git a/project/ws/app/src/lib/routes/home/routes/profle-bulk-upload/profle-bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component.html
similarity index 100%
rename from project/ws/app/src/lib/routes/home/routes/profle-bulk-upload/profle-bulk-upload.component.html
rename to project/ws/app/src/lib/routes/home/routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component.html
diff --git a/project/ws/app/src/lib/routes/home/routes/profle-bulk-upload/profle-bulk-upload.component.scss b/project/ws/app/src/lib/routes/home/routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component.scss
similarity index 100%
rename from project/ws/app/src/lib/routes/home/routes/profle-bulk-upload/profle-bulk-upload.component.scss
rename to project/ws/app/src/lib/routes/home/routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component.scss
diff --git a/project/ws/app/src/lib/routes/home/routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component.spec.ts b/project/ws/app/src/lib/routes/home/routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component.spec.ts
new file mode 100644
index 000000000..7af703673
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
+
+import { ProfleApprovalBulkUploadComponent } from './profle-approval-bulk-upload.component'
+
+describe('ProfleApprovalBulkUploadComponent', () => {
+  let component: ProfleApprovalBulkUploadComponent
+  let fixture: ComponentFixture<ProfleApprovalBulkUploadComponent>
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ProfleApprovalBulkUploadComponent],
+    })
+      .compileComponents()
+  }))
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ProfleApprovalBulkUploadComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
+
+  it('should create', () => {
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/home/routes/profle-bulk-upload/profle-bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component.ts
similarity index 98%
rename from project/ws/app/src/lib/routes/home/routes/profle-bulk-upload/profle-bulk-upload.component.ts
rename to project/ws/app/src/lib/routes/home/routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component.ts
index 3b0f81f57..d713c8560 100644
--- a/project/ws/app/src/lib/routes/home/routes/profle-bulk-upload/profle-bulk-upload.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component.ts
@@ -14,11 +14,11 @@ import { ITableData } from '@sunbird-cb/collection/lib/ui-org-table/interface/in
 import * as _ from 'lodash'
 
 @Component({
-  selector: 'ws-app-profle-bulk-upload',
-  templateUrl: './profle-bulk-upload.component.html',
-  styleUrls: ['./profle-bulk-upload.component.scss'],
+  selector: 'ws-app-profle-approval-bulk-upload',
+  templateUrl: './profle-approval-bulk-upload.component.html',
+  styleUrls: ['./profle-approval-bulk-upload.component.scss'],
 })
-export class ProfleBulkUploadComponent implements OnInit, OnDestroy, AfterViewInit {
+export class ProfleApprovalBulkUploadComponent implements OnInit, OnDestroy, AfterViewInit {
 
   tableList!: any[]
   public fileName: any
@@ -141,6 +141,7 @@ export class ProfleBulkUploadComponent implements OnInit, OnDestroy, AfterViewIn
       actions: [{ icon: 'download', label: 'Download file', name: 'DownloadFile', type: 'link', disabled: false }],
       actionColumnName: 'Download file',
     }
+
     this.getBulkUploadData()
     this.onPhoneChange()
     this.onEmailChange()
@@ -257,9 +258,7 @@ export class ProfleBulkUploadComponent implements OnInit, OnDestroy, AfterViewIn
     this.disableVerifyBtn = false
   }
 
-  public refreshTable() {
-    this.getBulkUploadData()
-  }
+
   public downloadFile(): void {
     this.fileService.download(this.downloadSampleFilePath, this.downloadAsFileName)
   }
diff --git a/project/ws/app/src/lib/routes/home/routes/profle-bulk-upload/profle-bulk-upload.component.spec.ts b/project/ws/app/src/lib/routes/home/routes/profle-bulk-upload/profle-bulk-upload.component.spec.ts
deleted file mode 100644
index ca0978cef..000000000
--- a/project/ws/app/src/lib/routes/home/routes/profle-bulk-upload/profle-bulk-upload.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing'
-
-import { ProfleBulkUploadComponent } from './profle-bulk-upload.component'
-
-describe('ProfleBulkUploadComponent', () => {
-  let component: ProfleBulkUploadComponent
-  let fixture: ComponentFixture<ProfleBulkUploadComponent>
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ProfleBulkUploadComponent],
-    })
-    .compileComponents()
-  }))
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ProfleBulkUploadComponent)
-    component = fixture.componentInstance
-    fixture.detectChanges()
-  })
-
-  it('should create', () => {
-    expect(component).toBeTruthy()
-  })
-})

From 223c8655488991b87b8007a07e298a5b7e0c5b80 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Fri, 15 Mar 2024 09:54:27 +0530
Subject: [PATCH 513/887] Reports page - added optional check for table data

---
 .../routes/home/routes/admins-table/admins-table.component.html | 2 +-
 .../home/routes/reports-section/reports-section.component.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.html b/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.html
index 370a12d29..3122b6404 100644
--- a/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.html
@@ -1,4 +1,4 @@
-<ng-container *ngIf="dataSource && dataSource.data.length > 0; else noDataFount">
+<ng-container *ngIf="dataSource && dataSource?.data?.length > 0; else noDataFount">
   <div>
     <mat-table #table matSort [matSortActive]="tableHeaders!.sortColumn" [matSortDirection]="tableHeaders!.sortState"
       [dataSource]="dataSource" class="example-table table1 responsiveTable">
diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html
index f01e3f3ea..7a6cf8006 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html
@@ -4,7 +4,7 @@
 
     <mat-card class="mb-8">
 
-      <mat-card-content class="flex justify-center gap-10">
+      <mat-card-content class="flex gap-10">
         <div>
           <div class="flex-4 mobile-margin text-capitalize mat-h2">Note:</div>
           <ng-container *ngFor="let note of reportsNoteList">

From 86e9487fc0d67afb6aa812a36ba46ee951045508 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Fri, 15 Mar 2024 09:59:18 +0530
Subject: [PATCH 514/887] removed console log

---
 .../src/lib/routes/home/routes/approvals/approvals.component.ts  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
index a73ebd657..d879a887c 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
@@ -59,7 +59,6 @@ export class ApprovalsComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     this.currentFilter = this.route.snapshot.params['tab']
-    console.log("this.currentFilter ", this.currentFilter)
     if (this.currentFilter === 'pending') {
       this.fetchApprovals()
     }

From 790902176e61eefbe94d98016cafb9e72dddb3f5 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Fri, 15 Mar 2024 10:01:27 +0530
Subject: [PATCH 515/887] lint fix

---
 .../src/lib/routes/home/routes/approvals/approvals.component.ts | 2 +-
 .../profle-approval-bulk-upload.component.ts                    | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
index d879a887c..fdc799c86 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
@@ -188,7 +188,7 @@ export class ApprovalsComponent implements OnInit, OnDestroy {
   replaceWords(inputString: any, wordConditions: any) {
     return wordConditions.reduce((acc: any, [word, condition]: any) => {
       return acc.replace(new RegExp(word, 'gi'), condition)
-    }, inputString)
+    },                           inputString)
   }
 
   onPaginateChange(event: PageEvent) {
diff --git a/project/ws/app/src/lib/routes/home/routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component.ts
index d713c8560..29ebe4d31 100644
--- a/project/ws/app/src/lib/routes/home/routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component.ts
@@ -258,7 +258,6 @@ export class ProfleApprovalBulkUploadComponent implements OnInit, OnDestroy, Aft
     this.disableVerifyBtn = false
   }
 
-
   public downloadFile(): void {
     this.fileService.download(this.downloadSampleFilePath, this.downloadAsFileName)
   }

From dbb4b4140461eabffa5f17781c441946179e53e6 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Sat, 16 Mar 2024 14:58:49 +0530
Subject: [PATCH 516/887] Operational reports changes as per the Prakhar
 feedback

---
 .../admins-table/admins-table.component.html  | 20 ++++++++++++++-----
 .../admins-table/admins-table.component.scss  |  6 +++++-
 .../admins-table/admins-table.component.ts    |  3 +++
 .../routes/approvals/approvals.component.ts   |  1 +
 .../profle-approval-bulk-upload.component.ts  | 16 +++++++--------
 .../reports-section.component.ts              | 16 ++++++++++++---
 .../routes/users/services/upload.service.ts   | 12 +++++++++++
 7 files changed, 57 insertions(+), 17 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.html b/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.html
index 3122b6404..5afba2e4d 100644
--- a/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.html
@@ -21,7 +21,8 @@
           <ng-container *ngSwitchCase="'datePicker'">
             <mat-form-field color="accent" appearance="outline" class="expireDateForm">
               <input matInput readonly [matDatepicker]="expireDate" placeholder="Enter date"
-                [(ngModel)]="element[col.key]" [min]="minDate" [max]="maxDate" (dateChange)="enableAccessBtn(element)">
+                [(ngModel)]="element[col.key]" [min]="element['startDate']" [max]="maxDate"
+                (dateChange)="enableAccessBtn(element)">
               <mat-datepicker-toggle matSuffix [for]="expireDate">
               </mat-datepicker-toggle>
               <mat-datepicker #expireDate></mat-datepicker>
@@ -35,10 +36,19 @@
               </div>
             </ng-container>
             <ng-template #giveAccess>
-              <button mat-button [ngClass]="element.enableAccessBtn ? 'enableAccessBtn' : 'disableAccessBtn'"
-                (click)="emitSelectedDate(element)">
-                Give Access
-              </button>
+              <div *ngIf="element['buttonText'] === 'Access Expired'">
+                <div class="flex dangerText">
+                  <mat-icon class="mr-2">info</mat-icon>
+                  <span>{{element['buttonText']}}</span>
+                </div>
+              </div>
+              <div *ngIf="element['buttonText'] !== 'Access Expired'">
+                <button mat-button [ngClass]="element.enableAccessBtn ? 'enableAccessBtn' : 'disableAccessBtn'"
+                  (click)="emitSelectedDate(element)">
+                  {{element['buttonText']}}
+                </button>
+              </div>
+
             </ng-template>
           </ng-container>
         </mat-cell>
diff --git a/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.scss b/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.scss
index abdb87887..79121ebd1 100644
--- a/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.scss
@@ -4,6 +4,10 @@
   color: #1D8923;
 }
 
+.dangerText {
+  color: red;
+}
+
 .disableAccessBtn {
   background-color: #212529 !important;
   color: white !important;
@@ -56,4 +60,4 @@
   ::ng-deep .mat-form-field-wrapper {
     padding: 1rem 0rem;
   }
-}
\ No newline at end of file
+}
diff --git a/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.ts b/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.ts
index 92fa99f69..53ea41e8e 100644
--- a/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.ts
@@ -65,6 +65,9 @@ export class AdminsTableComponent implements OnInit {
   enableAccessBtn(rowData: any) {
     rowData.enableAccessBtn = true
     rowData.assigned = false
+    if (rowData.preExpiryDate) {
+      rowData.buttonText = 'Update Access'
+    }
   }
 
   emitSelectedDate(rowData: any) {
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
index fdc799c86..bb66d22fc 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
@@ -59,6 +59,7 @@ export class ApprovalsComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     this.currentFilter = this.route.snapshot.params['tab']
+    this.currentFilter = this.currentFilter === 'upload' ? 'uploadApprovals' : 'pending'
     if (this.currentFilter === 'pending') {
       this.fetchApprovals()
     }
diff --git a/project/ws/app/src/lib/routes/home/routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component.ts
index 29ebe4d31..2c5f6ecb8 100644
--- a/project/ws/app/src/lib/routes/home/routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component.ts
@@ -160,19 +160,19 @@ export class ProfleApprovalBulkUploadComponent implements OnInit, OnDestroy, Aft
   }
 
   getBulkUploadData() {
-    this.fileService.getBulkUploadDataV1(this.rootOrgId).subscribe((res: any) => {
+    this.fileService.getBulkApprovalUploadDataV1().subscribe((res: any) => {
       this.tableList = []
-      if (res.result && res.result.content) {
-        this.bulkUploadData = res.result.content
+      if (res.result && res.result.response) {
+        this.bulkUploadData = res.result.response
         this.bulkUploadData.forEach((element: any) => {
           this.tableList.push({
-            fileName: element.fileName,
+            fileName: element.filename,
             status: element.status ? element.status : '',
             failedRecordsCount: element.failedRecordsCount ? element.failedRecordsCount : 0,
             successfulRecordsCount: element.successfulRecordsCount ? element.successfulRecordsCount : 0,
             totalRecords: element.totalRecords ? element.totalRecords : 0,
-            dateCreatedOn: element.dateCreatedOn ? element.dateCreatedOn : '',
-            dateUpdatedOn: element.dateUpdatedOn ? element.dateUpdatedOn : '',
+            dateCreatedOn: element.datecreatedon ? element.datecreatedon : '',
+            dateUpdatedOn: element.dateupdatedon ? element.dateupdatedon : '',
           })
         })
         this.fetching = false
@@ -225,7 +225,7 @@ export class ProfleApprovalBulkUploadComponent implements OnInit, OnDestroy, Aft
         const formData: FormData = new FormData()
         formData.append('data', this.fileSelected, this.fileName)
         // tslint:disable-next-line: no-non-null-assertion
-        this.fileService.upload(this.fileName, formData)
+        this.fileService.uploadApproval(this.fileName, formData)
           .subscribe(
             _res => {
               // this.uplaodSuccessMsg = res
@@ -279,7 +279,7 @@ export class ProfleApprovalBulkUploadComponent implements OnInit, OnDestroy, Aft
   }
 
   downloadFullFile(event: any) {
-    const url = `/apis/proxies/v8/user/v1/bulkuser/download/${event.row.fileName}`
+    const url = `/apis/proxies/v8/workflow/admin/bulkuploadfile/download/${event.row.fileName}`
     window.open(url, '_blank')
   }
 
diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
index 36cc22f08..fbe2dd34c 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
@@ -128,13 +128,23 @@ export class ReportsSectionComponent implements OnInit {
                 const expireDate = this.datePipe.transform(_.get(accessDetails, 'reportAccessExpiry', ''), 'yyyy/MM/dd') || ''
                 const firstName = _.get(user, 'firstName', '')
                 // const fullName = user.lastName ? `${user.lastName}' '${firstName}` : firstName
+
+                let _startDate = new Date()
+                if (expireDate) {
+                  if (expireDate < currentDate) {
+                    _startDate = new Date(expireDate)
+                  }
+                }
                 const formatedUserDetails = {
                   userID: user.id,
                   MDOAdmin: firstName,
                   MDOAdminemail: _.get(user, 'profileDetails.personalDetails.primaryEmail'),
-                  expiryDate: expireDate >= currentDate ? new Date(expireDate) : '',
+                  expiryDate: expireDate ? new Date(expireDate) : '',
                   assigned: expireDate >= currentDate,
                   enableAccessBtn: false,
+                  buttonText: expireDate && expireDate < currentDate ? 'Access Expired' : 'Give Access',
+                  preExpiryDate: expireDate,
+                  startDate: _startDate,
                 }
                 formatedResponse.formatedAdminsList.push(formatedUserDetails)
               }
@@ -173,7 +183,7 @@ export class ReportsSectionComponent implements OnInit {
         this.reportsNoteList = [
           `You can grant access to these reports to your existing
           MDO Admins. Similarly, if you want to onboard new MDO Admins, it can
-          be done in the 'User' tab, and then grant the access.`,
+          be done in the 'Users' tab, and then grant the access.`,
           `Please grant or renew access to these reports to the MDO Admin
           very carefully due to Personally Identifiable Information (PII) data security.`,
         ]
@@ -308,7 +318,7 @@ export class ReportsSectionComponent implements OnInit {
     dummyTextArea.select()
     document.execCommand('copy')
     document.body.removeChild(dummyTextArea)
-    this.openSnackbar('Copied to clipboard.')
+    this.openSnackbar('Password copied to clipboard.')
   }
 
   openVideoPopup() {
diff --git a/project/ws/app/src/lib/routes/users/services/upload.service.ts b/project/ws/app/src/lib/routes/users/services/upload.service.ts
index 0c645c2bf..1aba8b387 100644
--- a/project/ws/app/src/lib/routes/users/services/upload.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/upload.service.ts
@@ -11,6 +11,8 @@ const API_ENDPOINTS = {
   // getBulkUploadData: '/apis/protected/v8/admin/userRegistration/bulkUploadData',
   getBulkUploadData: '/apis/proxies/v8/user/v1/bulkupload',
   // downloadfile: '/apis/proxies/v8/user/v1/bulkuser/download',
+  getBulkApproval: '/apis/proxies/v8/workflow/admin/bulkupdate/getstatus',
+  bulkApprovalUpload: `/apis/proxies/v8/workflow/admin/transition/bulkupdate`,
 }
 
 @Injectable()
@@ -88,6 +90,16 @@ export class FileService {
     return this.http.get(`${API_ENDPOINTS.getBulkUploadData}/${rootOrgId}`)
   }
 
+  public getBulkApprovalUploadDataV1(): Observable<any> {
+    return this.http.get(`${API_ENDPOINTS.getBulkApproval}`)
+  }
+
+  public uploadApproval(_fileName: string, fileContent: FormData): Observable<any> {
+    this.displayLoader$.next(true)
+    return this.http.post<any>(API_ENDPOINTS.bulkApprovalUpload, fileContent)
+      .pipe(finalize(() => this.displayLoader$.next(false)))
+  }
+
   // public downloadFile(filename: string) {
   //   return this.http.get(`${API_ENDPOINTS.downloadfile}/${filename}`)
   // }

From 5d3c334f19f4c3d724871e5a4afab162e9d6b3c2 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Mon, 18 Mar 2024 12:40:27 +0530
Subject: [PATCH 517/887] Add team link  - Operational reports

---
 .../reports-section.component.html                |  2 +-
 .../reports-section/reports-section.component.ts  | 15 ++++++++++++---
 src/environments/environment.bm.ts                |  1 +
 src/environments/environment.dev.ts               |  1 +
 src/environments/environment.np.ts                |  1 +
 src/environments/environment.preprod.ts           |  1 +
 src/environments/environment.prod.ts              |  1 +
 src/environments/environment.ts                   |  2 ++
 8 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html
index 7a6cf8006..22f58f326 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html
@@ -12,7 +12,7 @@
               <div>
                 <mat-icon class="infoIcon">info_outlined</mat-icon>
               </div>
-              <div>{{note}}</div>
+              <div [innerHTML]="sanitizeHtml(note)"></div>
             </div>
           </ng-container>
         </div>
diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
index fbe2dd34c..713fd081d 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
@@ -10,6 +10,8 @@ import { ReportsVideoComponent } from '../reports-video/reports-video.component'
 import { EventService } from '@sunbird-cb/utils'
 import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
 import { HttpErrorResponse, HttpResponse } from '@angular/common/http'
+import { DomSanitizer, SafeHtml } from '@angular/platform-browser'
+import { environment } from '../../../../../../../../../src/environments/environment'
 
 @Component({
   selector: 'ws-app-reports-section',
@@ -39,17 +41,19 @@ export class ReportsSectionComponent implements OnInit {
   hassAccessToreports = false
   reportsAvailbale = false
   reportsDownlaoding = false
-
+  teamUrl: any
   constructor(
     private activeRouter: ActivatedRoute,
     private downloadService: DownloadReportService,
     private datePipe: DatePipe,
     private dialog: MatDialog,
     private events: EventService,
-    private snackBar: MatSnackBar
+    private snackBar: MatSnackBar,
+    private sanitizer: DomSanitizer,
   ) {
     this.configSvc = this.activeRouter.parent && this.activeRouter.parent.snapshot.data.configService
     this.userDetails = this.configSvc.unMappedUser
+    this.teamUrl = environment.teamsUrl
   }
 
   ngOnInit() {
@@ -60,6 +64,10 @@ export class ReportsSectionComponent implements OnInit {
     this.getAdminTableData(getNoteDetails)
   }
 
+  sanitizeHtml(html: string): SafeHtml {
+    return this.sanitizer.bypassSecurityTrustHtml(html)
+  }
+
   getReportInfo() {
     this.reportsAvailbale = false
     this.downloadService.getReportInfo().subscribe({
@@ -235,7 +243,8 @@ export class ReportsSectionComponent implements OnInit {
           Every organization must have a leader assigned to
           iGOT to access these reports.
           Please reach out to us at mission.karmayogi@gov.in or
-          connect with us via Video Conferencing by clicking the button below: [Join Now]`,
+          connect with us via Video Conferencing by clicking the button below:
+          [<a target='_blank' href='${this.teamUrl}'>Join Now</a>]`,
           `Once the MDO Leader is onboarded, they will grant you access to download the
           reports, and you are requested to connect with your MDO Leader for further process.`,
         ]
diff --git a/src/environments/environment.bm.ts b/src/environments/environment.bm.ts
index 496df9181..ce1fc1e8f 100644
--- a/src/environments/environment.bm.ts
+++ b/src/environments/environment.bm.ts
@@ -11,4 +11,5 @@ export const environment = {
   domainName: (window as { [key: string]: any })['env']['domainName'] || '',
   mdoPath: (window as { [key: string]: any })['env']['mdoPath'] || '',
   resendOTPTIme: (window as { [key: string]: any })['env']['resendOTPTIme'] || 120,
+  teamsUrl: (window as { [key: string]: any })['env']['teamsUrl'] || '',
 }
diff --git a/src/environments/environment.dev.ts b/src/environments/environment.dev.ts
index 1c49c9b76..007a7e6ee 100644
--- a/src/environments/environment.dev.ts
+++ b/src/environments/environment.dev.ts
@@ -11,4 +11,5 @@ export const environment = {
   domainName: (window as { [key: string]: any })['env']['domainName'] || '',
   mdoPath: (window as { [key: string]: any })['env']['mdoPath'] || '',
   resendOTPTIme: (window as { [key: string]: any })['env']['resendOTPTIme'] || 120,
+  teamsUrl: (window as { [key: string]: any })['env']['teamsUrl'] || '',
 }
diff --git a/src/environments/environment.np.ts b/src/environments/environment.np.ts
index 9ade53d15..54c86578a 100644
--- a/src/environments/environment.np.ts
+++ b/src/environments/environment.np.ts
@@ -11,4 +11,5 @@ export const environment = {
   domainName: (window as { [key: string]: any })['env']['domainName'] || '',
   mdoPath: (window as { [key: string]: any })['env']['mdoPath'] || '',
   resendOTPTIme: (window as { [key: string]: any })['env']['resendOTPTIme'] || 120,
+  teamsUrl: (window as { [key: string]: any })['env']['teamsUrl'] || '',
 }
diff --git a/src/environments/environment.preprod.ts b/src/environments/environment.preprod.ts
index 1c49c9b76..007a7e6ee 100644
--- a/src/environments/environment.preprod.ts
+++ b/src/environments/environment.preprod.ts
@@ -11,4 +11,5 @@ export const environment = {
   domainName: (window as { [key: string]: any })['env']['domainName'] || '',
   mdoPath: (window as { [key: string]: any })['env']['mdoPath'] || '',
   resendOTPTIme: (window as { [key: string]: any })['env']['resendOTPTIme'] || 120,
+  teamsUrl: (window as { [key: string]: any })['env']['teamsUrl'] || '',
 }
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 1c49c9b76..007a7e6ee 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -11,4 +11,5 @@ export const environment = {
   domainName: (window as { [key: string]: any })['env']['domainName'] || '',
   mdoPath: (window as { [key: string]: any })['env']['mdoPath'] || '',
   resendOTPTIme: (window as { [key: string]: any })['env']['resendOTPTIme'] || 120,
+  teamsUrl: (window as { [key: string]: any })['env']['teamsUrl'] || '',
 }
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 1cc19b900..43b7832dd 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -15,6 +15,7 @@ export const environment: IEnvironment = {
   domainName: (window as { [key: string]: any })['env']['domainName'] || '',
   mdoPath: (window as { [key: string]: any })['env']['mdoPath'] || '',
   resendOTPTIme: (window as { [key: string]: any })['env']['resendOTPTIme'] || 120,
+  teamsUrl: (window as { [key: string]: any })['env']['teamsUrl'] || '',
 }
 interface IEnvironment {
   name: null | string
@@ -29,6 +30,7 @@ interface IEnvironment {
   domainName?: string
   mdoPath: string,
   resendOTPTIme: number,
+  teamsUrl?: string,
 }
 
 /*

From 17f53204986dd99549773882e11ccc55bca4bb2c Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Mon, 18 Mar 2024 18:06:27 +0530
Subject: [PATCH 518/887] Updated the user tab with users tab

---
 .../home/routes/reports-section/reports-section.component.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
index 713fd081d..a3daf4480 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
@@ -230,7 +230,7 @@ export class ReportsSectionComponent implements OnInit {
         this.hassAccessToreports = true
         this.reportsNoteList = [
           `Your organization doesn’t have an MDO Admin role. Please assign the
-          MDO Admin role in the 'User' tab.`,
+          MDO Admin role in the 'Users' tab.`,
           `After successfully onboarding an MDO Admin, they can be granted
           access to these reports.`,
           `Please grant or renew access to these reports to the MDO Admin very

From f277edae7f6cc291105954693c28cb1acdd65fb5 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Mon, 18 Mar 2024 19:53:41 +0530
Subject: [PATCH 519/887] Upload bulk approval API as per the response

---
 .../profle-approval-bulk-upload.component.ts                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component.ts
index 2c5f6ecb8..506c0ca2c 100644
--- a/project/ws/app/src/lib/routes/home/routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component.ts
@@ -162,8 +162,8 @@ export class ProfleApprovalBulkUploadComponent implements OnInit, OnDestroy, Aft
   getBulkUploadData() {
     this.fileService.getBulkApprovalUploadDataV1().subscribe((res: any) => {
       this.tableList = []
-      if (res.result && res.result.response) {
-        this.bulkUploadData = res.result.response
+      if (res.result && res.result.content) {
+        this.bulkUploadData = res.result.content
         this.bulkUploadData.forEach((element: any) => {
           this.tableList.push({
             fileName: element.filename,

From b1af4ca57a581094df95790adc66146271449967 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Thu, 21 Mar 2024 14:01:55 +0530
Subject: [PATCH 520/887] Updated the Bulk approval keys as per the API
 response

---
 .../profle-approval-bulk-upload.component.ts                | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component.ts
index 506c0ca2c..ea8333fa9 100644
--- a/project/ws/app/src/lib/routes/home/routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component.ts
@@ -168,9 +168,9 @@ export class ProfleApprovalBulkUploadComponent implements OnInit, OnDestroy, Aft
           this.tableList.push({
             fileName: element.filename,
             status: element.status ? element.status : '',
-            failedRecordsCount: element.failedRecordsCount ? element.failedRecordsCount : 0,
-            successfulRecordsCount: element.successfulRecordsCount ? element.successfulRecordsCount : 0,
-            totalRecords: element.totalRecords ? element.totalRecords : 0,
+            failedRecordsCount: element.failedrecordscount ? element.failedrecordscount : 0,
+            successfulRecordsCount: element.successfulrecordscount ? element.successfulrecordscount : 0,
+            totalRecords: element.totalrecords ? element.totalrecords : 0,
             dateCreatedOn: element.datecreatedon ? element.datecreatedon : '',
             dateUpdatedOn: element.dateupdatedon ? element.dateupdatedon : '',
           })

From e040da33834d6fae2422f073b5e4c56d7ceed315 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Mon, 25 Mar 2024 13:47:17 +0530
Subject: [PATCH 521/887] Fixed the date format and align How it works

---
 .../routes/reports-section/reports-section.component.html | 4 ++--
 .../routes/reports-section/reports-section.component.scss | 8 +++++++-
 .../routes/reports-section/reports-section.component.ts   | 4 ++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html
index 22f58f326..746042c07 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.html
@@ -5,7 +5,7 @@
     <mat-card class="mb-8">
 
       <mat-card-content class="flex gap-10">
-        <div>
+        <div class="section-1">
           <div class="flex-4 mobile-margin text-capitalize mat-h2">Note:</div>
           <ng-container *ngFor="let note of reportsNoteList">
             <div class="flex gap-4 mb-4">
@@ -16,7 +16,7 @@
             </div>
           </ng-container>
         </div>
-        <div class="reportsDemo flex justify-end">
+        <div class="reportsDemo flex justify-end section-2">
           <div class="reportsDemoVideo flex flex-column flex-middle justify-center" (click)="openVideoPopup()">
             <mat-icon class="video_icon mb-2">play_circle</mat-icon>
             <div>
diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.scss b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.scss
index 9158ac06a..6fc36d794 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.scss
@@ -31,6 +31,12 @@
 // }
 
 .reports {
+  .section-1 {
+    width: 80%;
+  }
+  .section-2 {
+    width: 20%;
+  }
   .infoIcon {
     rotate: 180deg;
     color: #000000;
@@ -41,7 +47,7 @@
   }
 
   .reportsDemo {
-    width: 300px;
+
 
     .reportsDemoVideo {
       width: 290px;
diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
index a3daf4480..f1e1199d1 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
@@ -208,13 +208,13 @@ export class ReportsSectionComponent implements OnInit {
           this.reportsNoteList = [
             `These reports contain Personally Identifiable Information (PII) data.
             Please use them cautiously.`,
-            `Your access to the report is available until ${userAccessExpireDate}.
+            `Your access to the report is available until ${this.datePipe.transform(userAccessExpireDate, 'dd/MM/yyyy')}.
             Please contact your MDO Leader to renew your access.`,
           ]
         } else if (userAccessExpireDate < todayDate) {
           this.hassAccessToreports = false
           this.reportsNoteList = [
-            `Your access to reports expired on ${userAccessExpireDate}. Please
+            `Your access to reports expired on ${this.datePipe.transform(userAccessExpireDate, 'dd/MM/yyyy')}. Please
             contact your MDO Leader to renew access.`,
           ]
         } else {

From b3bfebf336a99d91f58143f8f6de8754b8223fa8 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Wed, 27 Mar 2024 17:58:44 +0530
Subject: [PATCH 522/887] Language fix

---
 .../home/routes/reports-section/reports-section.component.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
index f1e1199d1..8b445aa29 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
@@ -201,7 +201,7 @@ export class ReportsSectionComponent implements OnInit {
           this.hassAccessToreports = false
           this.reportsNoteList = [
             `Currently, your MDO Leader has not granted you access to these
-            reports.Kindly contact your MDO Leader to provide you access.`,
+            reports. Kindly contact your MDO Leader to provide you access.`,
           ]
         } else if (userAccessExpireDate >= todayDate) {
           this.hassAccessToreports = true

From 103d0ec522e0bee54512ba6f59921e60aee1bb02 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Thu, 28 Mar 2024 12:00:41 +0530
Subject: [PATCH 523/887] Bug fix - KB-3645

---
 .../home/routes/admins-table/admins-table.component.html       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.html b/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.html
index 5afba2e4d..f018aad50 100644
--- a/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/admins-table/admins-table.component.html
@@ -21,8 +21,7 @@
           <ng-container *ngSwitchCase="'datePicker'">
             <mat-form-field color="accent" appearance="outline" class="expireDateForm">
               <input matInput readonly [matDatepicker]="expireDate" placeholder="Enter date"
-                [(ngModel)]="element[col.key]" [min]="element['startDate']" [max]="maxDate"
-                (dateChange)="enableAccessBtn(element)">
+                [(ngModel)]="element[col.key]" [min]="minDate" [max]="maxDate" (dateChange)="enableAccessBtn(element)">
               <mat-datepicker-toggle matSuffix [for]="expireDate">
               </mat-datepicker-toggle>
               <mat-datepicker #expireDate></mat-datepicker>

From ef3671358b5ffc5885c5f5f8a2f4256b583bb06c Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Thu, 28 Mar 2024 15:04:21 +0530
Subject: [PATCH 524/887] MDO bulk approval sample file and bug KB-3671

---
 .../needs-approval/needs-approval.component.html   |  2 +-
 .../profle-approval-bulk-upload.component.html     | 14 +++++++++++---
 .../profle-approval-bulk-upload.component.ts       |  8 ++++++++
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.html b/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.html
index 5f16c7b52..b97242d03 100644
--- a/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.html
+++ b/project/ws/app/src/lib/routes/approvals/routes/needs-approval/needs-approval.component.html
@@ -32,7 +32,7 @@
                 </button>
               </div>
             </ng-container>
-            <div style="margin-top: 17px; margin-left: 155px;">
+            <div style="margin-top: 17px; margin-left: 155px;" *ngIf="needApprovalList.length > 1">
               <button mat-icon-button aria-label="Reject" id="reject"
                 (click)="onClickAllHandleWorkflow(needApprovalList,'REJECT')">
                 <span class="mat-button-wrapper" style="color: white; padding:13px;"> Reject All </span>
diff --git a/project/ws/app/src/lib/routes/home/routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component.html
index 6127ab500..b7c26299f 100644
--- a/project/ws/app/src/lib/routes/home/routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component.html
@@ -162,9 +162,17 @@
 
         </form>
         <div class="flex-1 inline-flex items-start justify-end">
-          <button class="download-btn mat-accent-border mat-button mat-button-base" i18n (click)="downloadFile()">
-            <ng-container i18n>Download sample file</ng-container>
-          </button>
+          <div class="mr-5">
+            <button class="download-btn mat-accent-border mat-button mat-button-base mr-10" i18n
+              (click)="downloadDefaultValuesFile()">
+              <ng-container i18n>Default field values</ng-container>
+            </button>
+          </div>
+          <div>
+            <button class="download-btn mat-accent-border mat-button mat-button-base" i18n (click)="downloadFile()">
+              <ng-container i18n>Download sample file</ng-container>
+            </button>
+          </div>
         </div>
       </div>
     </mat-card>
diff --git a/project/ws/app/src/lib/routes/home/routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component.ts
index ea8333fa9..e8bf10286 100644
--- a/project/ws/app/src/lib/routes/home/routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component.ts
@@ -43,6 +43,8 @@ export class ProfleApprovalBulkUploadComponent implements OnInit, OnDestroy, Aft
   pageDataSubscription!: any
   downloadSampleFilePath = ''
   downloadAsFileName = ''
+  defaultValuesFilePath = ''
+  defaultValuesFileName = ''
   rootOrgId!: any
   phoneNumberPattern = '^((\\+91-?)|0)?[0-9]{10}$'
   emailPattern = `^[\\w\-\\.]+@([\\w-]+\\.)+[\\w-]{2,4}$`
@@ -98,6 +100,8 @@ export class ProfleApprovalBulkUploadComponent implements OnInit, OnDestroy, Aft
       if (data && data.pageData) {
         this.downloadSampleFilePath = data.pageData.data.downloadSampleFilePath
         this.downloadAsFileName = data.pageData.data.downloadAsFileName
+        this.defaultValuesFilePath = data.pageData.data.defaultValuesFilePath
+        this.defaultValuesFileName = data.pageData.data.defaultValuesFileName
       }
     })
 
@@ -262,6 +266,10 @@ export class ProfleApprovalBulkUploadComponent implements OnInit, OnDestroy, Aft
     this.fileService.download(this.downloadSampleFilePath, this.downloadAsFileName)
   }
 
+  public downloadDefaultValuesFile(): void {
+    this.fileService.download(this.defaultValuesFilePath, this.defaultValuesFileName)
+  }
+
   private openSnackbar(primaryMsg: string, duration: number = 5000) {
     this.snackBar.open(primaryMsg, 'X', {
       duration,

From fb0b0bc92d836504963109ee1203df4e49616cb2 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Sun, 31 Mar 2024 21:45:35 +0530
Subject: [PATCH 525/887] Filter the deleted MDO admins

---
 .../home/routes/reports-section/reports-section.component.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
index 8b445aa29..d0af5a4da 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
@@ -131,7 +131,7 @@ export class ReportsSectionComponent implements OnInit {
             adminDetails.content.forEach((user: any) => {
               const accessDetails = accessDetailsList && accessDetailsList.length > 0 ?
                 accessDetailsList.find((obj: any) => obj.userId === user.id) : { reportAccessExpiry: '' }
-              if (this.userDetails.id !== user.id) {
+              if (this.userDetails.id !== user.id && !user.isDeleted) {
                 const currentDate = this.datePipe.transform(new Date(), 'yyyy/MM/dd') || ''
                 const expireDate = this.datePipe.transform(_.get(accessDetails, 'reportAccessExpiry', ''), 'yyyy/MM/dd') || ''
                 const firstName = _.get(user, 'firstName', '')

From c7d67babf6721ed263ed7dc15e3e36fb721329a7 Mon Sep 17 00:00:00 2001
From: Afzal84 <mohd.afzal@tarento.com>
Date: Mon, 1 Apr 2024 17:24:55 +0530
Subject: [PATCH 526/887] fixed:- Added validation for CSV file in user bulk
 upload

---
 .../users-upload/users-upload.component.html      |  7 ++++---
 .../users-upload/users-upload.component.ts        | 15 +++++++++++----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
index 0741977ae..302141ec2 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
@@ -10,10 +10,11 @@
             class="download-btn mat-accent-border mat-button mat-button-base">Choose file</button>
           <label class="file-name mr-5" *ngIf="fileName">Selected file : <b>{{fileName}}</b></label>
           <input hidden type="file" #fileInput class="" (click)="fileClick($event)" (change)="onFileChange($event)"
-            name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();"
-            accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel, .xlsx, .xls" />
+            name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();" accept=".csv" />
+          <!-- accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel, .xlsx, .xls" /> -->
           <!-- <input type="submit" [disabled]="formGroup.invalid" value="upload" /> -->
-          <mat-error *ngIf="showFileError">Only .xlsx or .csv files are accepted</mat-error>
+          <!-- <mat-error *ngIf="showFileError">Only .xlsx or .csv files are accepted</mat-error> -->
+          <mat-error *ngIf="showFileError">Only .csv files are accepted</mat-error>
           <form *ngIf="fileName" [formGroup]="registrationForm" class="mobile-wrapper">
             <ng-container *ngIf="fileName">
               <label class="file-name mr-5" aria-label="Send OTP to">Send OTP to </label>
diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
index a45750f61..4cd9dbe23 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
@@ -200,10 +200,17 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
     if (fileList && fileList.length > 0) {
       const file: File = fileList[0]
       this.fileName = file.name
-      this.fileSelected = file
-      this.formGroup.patchValue({
-        file,
-      })
+      const fileCsv = this.fileName.replace(/[^A-Za-z0-9_.]/g, '')
+      if (fileCsv.toLowerCase().endsWith('.csv')) {
+        this.fileSelected = file
+        this.formGroup.patchValue({
+          file,
+        })
+      } else {
+        this.fileName = ''
+        this.showFileError = true
+        this.openSnackbar('Please select a valid file.')
+      }
     }
   }
 

From 3c36306f450de77b561dd05f47841faa07dc1b51 Mon Sep 17 00:00:00 2001
From: Venky <venky.kandagaddala@gmail.com>
Date: Mon, 8 Apr 2024 17:33:44 +0530
Subject: [PATCH 527/887] updated the how it works video content

---
 .../routes/reports-section/reports-section.component.ts  | 8 +++++++-
 .../routes/reports-video/reports-video.component.html    | 9 +++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
index d0af5a4da..435a601e0 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
@@ -331,9 +331,15 @@ export class ReportsSectionComponent implements OnInit {
   }
 
   openVideoPopup() {
+    let url = ''
+    if (this.configSvc && this.userDetails.roles.includes('MDO_LEADER')) {
+      url = `${environment.karmYogiPath}/content-store/MDO-leader-reports.MP4`
+    } else {
+      url = `${environment.karmYogiPath}/content-store/MDO-admin-reports.mp4`
+    }
     this.dialog.open(ReportsVideoComponent, {
       data: {
-        videoLink: 'https://www.youtube.com/embed/tgbNymZ7vqY?autoplay=1&mute=1',
+        videoLink: url
       },
       disableClose: true,
       width: '50%',
diff --git a/project/ws/app/src/lib/routes/home/routes/reports-video/reports-video.component.html b/project/ws/app/src/lib/routes/home/routes/reports-video/reports-video.component.html
index fcd3b172f..831a3b17c 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-video/reports-video.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/reports-video/reports-video.component.html
@@ -2,6 +2,11 @@
   <div class="popup-close">
     <mat-icon mat-dialog-close class="close-icon">cancel</mat-icon>
   </div>
-  <iframe [src]="getVideoLink" i18n-title title="about-video" allow="fullscreen" class="about-video" width="100%"
-    height="90%"></iframe>
+  <!-- <iframe [src]="getVideoLink" i18n-title title="about-video" allow="fullscreen" class="about-video" width="100%"
+    height="90%"></iframe> -->
+
+  <video id="reportsVideo" disablePictureInPicture="true" controls controlsList="nodownload" height="100%" width="100%"
+    [autoplay]="true">
+    <source [src]="getVideoLink" type="video/mp4">
+  </video>
 </div>
\ No newline at end of file

From 6efaff08b225b7babb19c9d8f8f6fa66204b3396 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Mon, 8 Apr 2024 18:04:12 +0530
Subject: [PATCH 528/887] copyright year changed

---
 src/app/component/app-footer/app-footer.component.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/component/app-footer/app-footer.component.html b/src/app/component/app-footer/app-footer.component.html
index 1b2edb128..e6c804f5c 100644
--- a/src/app/component/app-footer/app-footer.component.html
+++ b/src/app/component/app-footer/app-footer.component.html
@@ -1,8 +1,8 @@
 <div class="mat-toolbar mat-ws-mat-primary-text footer-container px-6 sm:px-10 py-1-5">
   <div class="mat-body text-right flex-1">
     <ng-container i18n>
-      <span i18n>&copy; Copyright 2020 -2021</span>
-<!--       &nbsp;&nbsp; | &nbsp;&nbsp;
+      <span i18n>&copy; Copyright 2024 -2025</span>
+      <!--       &nbsp;&nbsp; | &nbsp;&nbsp;
       <a routerLink="/app/home/about" i18n> <span i18n>About Us</span></a>
       &nbsp;&nbsp; | &nbsp;&nbsp;
       <a routerLink="/app/tnc" i18n>Privacy</a> -->
@@ -12,4 +12,4 @@
       <a routerLink="/public/contact" i18n> Contact</a>-->
     </ng-container>
   </div>
-</div>
+</div>
\ No newline at end of file

From ff20ab23996b33fef65b1d686680da7ceb91266f Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Mon, 8 Apr 2024 18:09:54 +0530
Subject: [PATCH 529/887] lint fix

---
 .../home/routes/reports-section/reports-section.component.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
index 435a601e0..9a47326d3 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
@@ -339,7 +339,7 @@ export class ReportsSectionComponent implements OnInit {
     }
     this.dialog.open(ReportsVideoComponent, {
       data: {
-        videoLink: url
+        videoLink: url,
       },
       disableClose: true,
       width: '50%',

From b94a71fbdd9c88e08bdb75337edde57ab603c3cc Mon Sep 17 00:00:00 2001
From: Afzal84 <mohd.afzal@tarento.com>
Date: Tue, 9 Apr 2024 12:45:05 +0530
Subject: [PATCH 530/887] fixed:- csv validation reverted from the user bulk
 upload

---
 .../users-upload/users-upload.component.ts        | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
index 4cd9dbe23..a45750f61 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.ts
@@ -200,17 +200,10 @@ export class UsersUploadComponent implements OnInit, AfterViewInit, OnDestroy {
     if (fileList && fileList.length > 0) {
       const file: File = fileList[0]
       this.fileName = file.name
-      const fileCsv = this.fileName.replace(/[^A-Za-z0-9_.]/g, '')
-      if (fileCsv.toLowerCase().endsWith('.csv')) {
-        this.fileSelected = file
-        this.formGroup.patchValue({
-          file,
-        })
-      } else {
-        this.fileName = ''
-        this.showFileError = true
-        this.openSnackbar('Please select a valid file.')
-      }
+      this.fileSelected = file
+      this.formGroup.patchValue({
+        file,
+      })
     }
   }
 

From a02a51753cec3d32341dbfbaabdd966a7cd5006f Mon Sep 17 00:00:00 2001
From: Afzal84 <mohd.afzal@tarento.com>
Date: Tue, 9 Apr 2024 12:52:18 +0530
Subject: [PATCH 531/887] fixed:- csv validation reverted from the user bulk
 upload

---
 .../components/users-upload/users-upload.component.html   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
index 302141ec2..12c9e7cbb 100644
--- a/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
+++ b/project/ws/app/src/lib/routes/users/components/users-upload/users-upload.component.html
@@ -10,11 +10,11 @@
             class="download-btn mat-accent-border mat-button mat-button-base">Choose file</button>
           <label class="file-name mr-5" *ngIf="fileName">Selected file : <b>{{fileName}}</b></label>
           <input hidden type="file" #fileInput class="" (click)="fileClick($event)" (change)="onFileChange($event)"
-            name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();" accept=".csv" />
-          <!-- accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel, .xlsx, .xls" /> -->
+            name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();"
+            accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel, .xlsx, .xls" />
           <!-- <input type="submit" [disabled]="formGroup.invalid" value="upload" /> -->
-          <!-- <mat-error *ngIf="showFileError">Only .xlsx or .csv files are accepted</mat-error> -->
-          <mat-error *ngIf="showFileError">Only .csv files are accepted</mat-error>
+          <mat-error *ngIf="showFileError">Only .xlsx or .csv files are accepted</mat-error>
+          <!-- <mat-error *ngIf="showFileError">Only .csv files are accepted</mat-error> -->
           <form *ngIf="fileName" [formGroup]="registrationForm" class="mobile-wrapper">
             <ng-container *ngIf="fileName">
               <label class="file-name mr-5" aria-label="Send OTP to">Send OTP to </label>

From 5a872a41324f3b3a2f9965871ec081ca867b2b25 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Wed, 10 Apr 2024 00:42:45 +0530
Subject: [PATCH 532/887]  Added new left menu layout & user page layout

---
 .../head/left-menu/left-menu.component.html   |  41 +++
 .../head/left-menu/left-menu.component.scss   | 130 ++++++++++
 .../lib/head/left-menu/left-menu.component.ts | 239 ++++++++++++++++++
 .../lib/head/left-menu/left-menu.module.ts    |  37 +++
 .../head/user-cards/user-card.component.html  | 122 +++++++++
 .../head/user-cards/user-card.component.scss  | 106 ++++++++
 .../head/user-cards/user-card.component.ts    |  32 +++
 .../ws/app/src/lib/routes/home/home.module.ts |   8 +-
 .../home/routes/home/home.component.html      |   5 +-
 .../users-view/users-view.component.html      |  71 ++++--
 .../users-view/users-view.component.scss      |  20 ++
 .../routes/users-view/users-view.component.ts |  25 ++
 12 files changed, 807 insertions(+), 29 deletions(-)
 create mode 100644 project/ws/app/src/lib/head/left-menu/left-menu.component.html
 create mode 100644 project/ws/app/src/lib/head/left-menu/left-menu.component.scss
 create mode 100644 project/ws/app/src/lib/head/left-menu/left-menu.component.ts
 create mode 100644 project/ws/app/src/lib/head/left-menu/left-menu.module.ts
 create mode 100644 project/ws/app/src/lib/head/user-cards/user-card.component.html
 create mode 100644 project/ws/app/src/lib/head/user-cards/user-card.component.scss
 create mode 100644 project/ws/app/src/lib/head/user-cards/user-card.component.ts

diff --git a/project/ws/app/src/lib/head/left-menu/left-menu.component.html b/project/ws/app/src/lib/head/left-menu/left-menu.component.html
new file mode 100644
index 000000000..f966401bf
--- /dev/null
+++ b/project/ws/app/src/lib/head/left-menu/left-menu.component.html
@@ -0,0 +1,41 @@
+<div class="flex flex-1 flex-column min-wid sidenav-wrap text-center">
+  <div class="margin-top-xs flex flex-column max-width width-1-1">
+    <a href="javascript:void(0)" role="link" class="flex flex-column padding-right-m  padding-left-m">
+      <div class="dept-logo-block flex flex-middle flex-center">
+        <img src="../assets/icons/govtlogo.jpg" class="img-logo" />
+      </div>
+      <!-- <div class="dept-logo-block flex flex-middle flex-center" *ngIf="!widgetData.logo">
+        <img [src]="img.json" [alt]="widgetData.name" class="img-logo" />
+      </div> -->
+      <span i18n="title" class="mat-subheading-2 margin-top-m  dept-name">
+        <!-- this will be dynamic -->
+        TarentoCBP
+      </span>
+    </a>
+  </div>
+</div>
+<mat-accordion [multi]="true">
+  <ng-container *ngFor="let menu of menulist; let mi = index">
+    <mat-expansion-panel class="menuPannel bg-gray-accordian" hideToggle="true" [expanded]="true" #example>
+      <mat-expansion-panel-header>
+        <mat-panel-title>
+          <mat-panel-description>
+            <p class="margin-remove">{{menu?.menuCategory}}</p>
+            <mat-icon *ngIf="!example.expanded">arrow_drop_down</mat-icon>
+            <mat-icon *ngIf="example.expanded">arrow_drop_up</mat-icon>
+          </mat-panel-description>
+        </mat-panel-title>
+      </mat-expansion-panel-header>
+      <mat-nav-list class="nav-list-menu flex-1">
+        <ng-container *ngFor="let tab of menu?.subMenu; let i = index">
+          <ng-container>
+            <a mat-list-item disableRipple class="flex outline-1 menu-item-a" [attr.data-index]="i"
+              [routerLink]="[tab.routerLink]" [queryParamsHandling]="preserve" routerLinkActive="ws-active-route-men">
+              <span class="padding-left-xs">{{tab?.name}}</span>
+            </a>
+          </ng-container>
+        </ng-container>
+      </mat-nav-list>
+    </mat-expansion-panel>
+  </ng-container>
+</mat-accordion>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/head/left-menu/left-menu.component.scss b/project/ws/app/src/lib/head/left-menu/left-menu.component.scss
new file mode 100644
index 000000000..142059943
--- /dev/null
+++ b/project/ws/app/src/lib/head/left-menu/left-menu.component.scss
@@ -0,0 +1,130 @@
+@import 'ws-vars';
+
+::ng-deep .nav-container .mat-drawer-inner-container {
+  background: #F0F3F4;
+  border: 1px #F0F3F4 solid;
+  width: 99%;
+  height: 99%;
+  overflow: hidden;
+  -ms-overflow-style: none;
+  scrollbar-width: none;
+}
+
+::ng-deep .mat-drawer-container {
+  z-index: 999;
+}
+
+.sidenav-wrap {
+  padding-top: 24px;
+  padding-bottom: 24px;
+}
+
+.min-wid {
+  min-width: 247px;
+
+}
+
+.outline-1 {
+  outline: unset !important;
+}
+
+.pad-l-4r {
+  padding-left: 2.75rem;
+}
+
+.dept-logo-block {
+  width: 88px;
+  height: 86px;
+  background: white;
+  border-radius: 4px;
+  border: 1px rgba(0, 0, 0, 0.16) solid;
+  margin: 0 auto;
+
+  .img-logo {
+    width: 72px;
+    height: 72px;
+    // height: 74px;
+  }
+
+  .dept-name {
+    color: rgba(0, 0, 0, 0.87);
+    font-size: 14px;
+    font-family: Lato;
+    font-weight: 700;
+    word-wrap: break-word;
+  }
+}
+
+::ng-deep .nav-list-menu {
+  padding-top: 0 !important;
+
+  .menu-item-a {
+    background-color: rgb(255, 255, 255);
+    position: relative;
+
+    .mat-list-item-content {
+      padding: 12px 16px 12px 32px !important;
+    }
+
+
+  }
+
+}
+
+.mat-nav-list a:not(:first-child) {
+  border-top: 1px solid #F0F3F4;
+}
+
+.ws-active-route-men::after {
+  content: "";
+  position: absolute;
+  border-left: 4px solid #1a4ca1;
+  height: inherit;
+}
+
+.max-width {
+  width: 190px;
+}
+
+// ::ng-deep .menuPannel.mat-expansion-panel-spacing:first-child,
+// .mat-accordion>:first-child:not(.mat-expansion-panel) .mat-expansion-panel-spacing {
+//   margin: unset !important;
+// }
+
+::ng-deep .menuPannel.mat-expansion-panel {
+  border-radius: unset !important;
+  box-shadow: none !important;
+
+  .mat-expansion-panel-body {
+    padding: 0 !important;
+  }
+}
+
+::ng-deep .mat-expansion-panel-header.mat-expanded:hover {
+  background: rgba(0, 0, 0, 0.04) !important;
+
+}
+
+::ng-deep .mat-expansion-panel-spacing {
+  margin: 0 !important;
+}
+
+::ng-deep .menuPannel .mat-expansion-panel-header {
+  padding: 8px 16px !important;
+  height: unset !important;
+  background: rgba(0, 0, 0, 0.04);
+}
+
+::ng-deep .menuPannel .mat-expansion-panel-header .mat-expansion-panel-header-title {
+  justify-content: space-between;
+  margin-right: 0;
+
+  .mat-expansion-panel-header-description {
+    justify-content: space-between;
+    margin-right: 0;
+    width: 100%;
+  }
+}
+
+// <div style="width: 100%; height: 100%; padding: 16px; background: rgba(0, 0, 0, 0.04); justify-content: center; align-items: center; gap: 8px; display: inline-flex"><div style="flex: 1 1 0; color: black; font-size: 14px; font-family: Lato; font-weight: 700; word-wrap: break-word">Curate</div><div style="width: 24px; height: 24px; justify-content: center; align-items: center; display: flex"><div style="width: 24px; height: 24px; position: relative"><div style="width: 24px; height: 24px; left: 0px; top: 0px; position: absolute; opacity: 0; background: #D8D8D8"></div><div style="width: 10px; height: 5px; left: 7px; top: 15px; position: absolute; background: rgba(0, 0, 0, 0.60)"></div></div></div>
+// </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/head/left-menu/left-menu.component.ts b/project/ws/app/src/lib/head/left-menu/left-menu.component.ts
new file mode 100644
index 000000000..ba6453fe3
--- /dev/null
+++ b/project/ws/app/src/lib/head/left-menu/left-menu.component.ts
@@ -0,0 +1,239 @@
+import { Component, OnInit, OnDestroy, Input } from '@angular/core'
+import { ActivatedRoute, Router } from '@angular/router'
+// import { NsWidgetResolver, WidgetBaseComponent } from '@ws-widget/resolver'
+// import { ILeftMenu, IMenu } from './left-menu-v1.model'
+// import { defaultImg } from './img.json'
+@Component({
+  selector: 'ws-widget-left-menu',
+  templateUrl: './left-menu.component.html',
+  styleUrls: ['./left-menu.component.scss'],
+})
+export class LeftMenuComponent implements OnInit, OnDestroy {
+  @Input() widgetData!: any
+  mdoname: any
+  logo: any
+  menulist = [
+    {
+      "menuCategory": "Home",
+      "requiredRoles": [
+        "admin",
+        "mdo_admin",
+        "wat_member",
+        "mdo_leader"
+      ],
+      "subMenu": [
+        {
+          "name": "Home",
+          "key": "Home",
+          "fragment": false,
+          "render": true,
+          "badges": {
+            "enabled": false,
+            "uri": ""
+          },
+          "enabled": true,
+          "routerLink": "/app/home/welcome",
+          "requiredRoles": [
+            "admin",
+            "mdo_admin",
+            "wat_member",
+            "mdo_leader"
+          ]
+        }
+      ]
+    },
+    {
+      "menuCategory": "Users",
+      "requiredRoles": [
+        "admin",
+        "mdo_admin",
+        "mdo_leader"
+      ],
+      "subMenu": [
+        {
+          "name": "All Users",
+          "key": "users",
+          "fragment": false,
+          "render": true,
+          "badges": {
+            "enabled": false,
+            "uri": ""
+          },
+          "enabled": true,
+          "routerLink": "/app/home/users",
+          "requiredRoles": [
+            "admin",
+            "mdo_admin",
+            "mdo_leader"
+          ]
+        },
+        {
+          "name": "Approvals",
+          "key": "approvals",
+          "fragment": false,
+          "render": true,
+          "badges": {
+            "enabled": false,
+            "uri": ""
+          },
+          "enabled": true,
+          "routerLink": "/app/home/approvals/pending",
+          "requiredRoles": [
+            "admin",
+            "mdo_admin",
+            "mdo_leader"
+          ]
+        }
+      ]
+    },
+    {
+      "menuCategory": "Manage",
+      "requiredRoles": [
+        "admin",
+        "mdo_admin",
+        "mdo_leader"
+      ],
+      "subMenu": [
+        {
+          "name": "Roles and access",
+          "key": "roles-access",
+          "fragment": false,
+          "render": true,
+          "badges": {
+            "enabled": false,
+            "uri": ""
+          },
+          "enabled": true,
+          "routerLink": "/app/home/roles-access",
+          "requiredRoles": [
+            "admin",
+            "mdo_admin",
+            "mdo_leader"
+          ]
+        },
+        {
+          "name": "Organisation profile",
+          "key": "orgProfile",
+          "fragment": false,
+          "render": true,
+          "badges": {
+            "enabled": false,
+            "uri": ""
+          },
+          "enabled": true,
+          "routerLink": "/app/setup",
+          "requiredRoles": [
+            "isInstuteOrg"
+          ]
+        },
+        {
+          "name": "Blended program",
+          "key": "blended-approvals",
+          "fragment": false,
+          "render": true,
+          "badges": {
+            "enabled": false,
+            "uri": ""
+          },
+          "enabled": true,
+          "routerLink": "/app/home/blended-approvals",
+          "requiredRoles": [
+            "admin",
+            "mdo_admin",
+            "mdo_leader"
+          ]
+        },
+        {
+          "name": "Reports",
+          "key": "reports-section",
+          "fragment": false,
+          "render": true,
+          "badges": {
+            "enabled": false,
+            "uri": ""
+          },
+          "enabled": true,
+          "routerLink": "/app/home/reports-section",
+          "requiredRoles": [
+            "admin",
+            "mdo_admin",
+            "mdo_leader"
+          ]
+        },
+        {
+          "name": "Training Plan",
+          "key": "training-plan-dashboard",
+          "fragment": false,
+          "render": true,
+          "badges": {
+            "enabled": false,
+            "uri": ""
+          },
+          "enabled": true,
+          "routerLink": "/app/home/training-plan-dashboard",
+          "requiredRoles": [
+            "admin",
+            "mdo_admin",
+            "mdo_leader"
+          ]
+        }
+      ]
+    }
+  ]
+  // @Input() Source
+  constructor(private activatedRoute: ActivatedRoute, private router: Router) { }
+  ngOnDestroy(): void { }
+
+  ngOnInit(): void {
+    console.log('widgetData', this.widgetData)
+    this.mdoname = this.widgetData ? this.widgetData.name : ''
+    this.logo = this.widgetData ? this.widgetData.logoPath : './assets/icons/govtlogo.jpg'
+  }
+
+  // changeToDefaultImg($event: any) {
+  //   $event.target.src = defaultImg
+  // }
+  public isLinkActive(url?: string, index?: number): boolean {
+    let returnVal = false
+    if (url && index) {
+      returnVal = (this.activatedRoute.snapshot.fragment === url)
+    } else if (index === 0) {
+      returnVal = true
+    } else {
+      returnVal = false
+    }
+    return returnVal
+  }
+  public isLinkActive2(url?: string): boolean {
+    let returnval = false
+    if (url) {
+      const st = this.router.url.split('?')
+      if (st && st[0] && st[0] === (url)) {
+        returnval = true
+      }
+      // if(route.url.con)
+    }
+    return returnval
+  }
+  getLink(tab: any) {
+    if (tab && tab.customRouting && this.activatedRoute.snapshot && this.activatedRoute.snapshot.firstChild && tab.paramaterName) {
+      return (tab.routerLink.replace('<param>', this.activatedRoute.snapshot.firstChild.params[tab.paramaterName]))
+    }
+    return
+  }
+
+  isAllowed(tab: any): boolean {
+    let returnValue = false
+    if (tab.requiredRoles && tab.requiredRoles.length > 0) {
+      (tab.requiredRoles).forEach((v: any) => {
+        if ((this.widgetData.userRoles || new Set()).has(v)) {
+          returnValue = true
+        }
+      })
+    } else {
+      returnValue = true
+    }
+    console.log('returnValue', returnValue)
+    return returnValue
+  }
+}
diff --git a/project/ws/app/src/lib/head/left-menu/left-menu.module.ts b/project/ws/app/src/lib/head/left-menu/left-menu.module.ts
new file mode 100644
index 000000000..d65138c58
--- /dev/null
+++ b/project/ws/app/src/lib/head/left-menu/left-menu.module.ts
@@ -0,0 +1,37 @@
+import { NgModule } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { RouterModule } from '@angular/router'
+import { LeftMenuComponent } from './left-menu.component'
+import {
+  MatButtonModule,
+  MatIconModule,
+  MatTooltipModule,
+  MatProgressSpinnerModule,
+  MatChipsModule,
+  MatCardModule,
+  MatSidenavModule,
+  MatListModule,
+  MatExpansionModule,
+} from '@angular/material'
+
+@NgModule({
+  declarations: [LeftMenuComponent],
+  imports: [
+    CommonModule,
+    RouterModule,
+    MatButtonModule,
+    MatIconModule,
+    MatTooltipModule,
+    MatProgressSpinnerModule,
+    MatSidenavModule,
+    MatChipsModule,
+    MatCardModule,
+    MatListModule,
+    MatExpansionModule,
+  ],
+  entryComponents: [LeftMenuComponent],
+  exports: [
+    LeftMenuComponent,
+  ],
+})
+export class LeftMenuModule { }
diff --git a/project/ws/app/src/lib/head/user-cards/user-card.component.html b/project/ws/app/src/lib/head/user-cards/user-card.component.html
new file mode 100644
index 000000000..e109a38e9
--- /dev/null
+++ b/project/ws/app/src/lib/head/user-cards/user-card.component.html
@@ -0,0 +1,122 @@
+<div>
+  <mat-accordion>
+    <mat-expansion-panel class="user-card" *ngFor="let user of usersData.content">
+      <mat-expansion-panel-header *ngIf="user.profileDetails && user.profileDetails.personalDetails">
+        <div class="float-left">
+          <div class="initialcircle display-inline-block margin-right-s"><span>AB</span></div>
+          <div class="username display-inline-block">
+            <div class="mat-subheading-2 display-inline-block margin-remove">
+              {{user.profileDetails.personalDetails.firstname ||
+              user.profileDetails.personalDetails.firstName}}
+              <span class="status-label margin-left-s verified">Verified <mat-icon>check_circle</mat-icon></span>
+            </div>
+            <div class="mat-body-2 ws-mat-black40-text">Product Manager</div>
+          </div>
+        </div>
+        <div class="float-right">
+          <div class="button margin-top-xs mat-body"><mat-icon>edit</mat-icon> Edit</div>
+        </div>
+      </mat-expansion-panel-header>
+
+      <div class="panel-body">
+        <div class="inner-body">
+          Primary Details <mat-icon class="ws-mat-black40-text">info_outline</mat-icon>
+          <form [formGroup]="updateUserDataForm" class="margin-top-m">
+            <mat-grid-list cols="2" rowHeight="100px">
+              <!-- designation -->
+              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                <label class="appr-text-label required">Designation</label>
+                <mat-select class="appr-text-field" #designation formControlName="designation" i18n-placeholder
+                  placeholder="--Select--" (selectionChange)="otherDropDownChange(designation.value, 'designation')">
+                  <mat-option [value]="designation.name" *ngFor="let designation of designationsMeta">
+                    {{designation.name}}
+                  </mat-option>
+                  <mat-option [value]="'Other'">Other</mat-option>
+                </mat-select>
+              </mat-grid-tile>
+
+              <!-- group -->
+              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                <label class="appr-text-label required">Group</label>
+                <mat-select class="appr-text-field" #group formControlName="group" i18n-placeholder
+                  placeholder="--Select--" (selectionChange)="otherDropDownChange(designation.value, 'designation')">
+                  <mat-option [value]="designation.name" *ngFor="let designation of designationsMeta">
+                    {{designation.name}}
+                  </mat-option>
+                </mat-select>
+              </mat-grid-tile>
+            </mat-grid-list>
+          </form>
+        </div>
+        <hr>
+        <div class="inner-body">
+          Other Details <mat-icon class="ws-mat-black40-text">info_outline</mat-icon>
+
+          <form [formGroup]="updateUserDataForm" class="margin-top-m">
+            <mat-grid-list cols="3" rowHeight="100px">
+              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                <label class="appr-text-label requird">Employee ID</label>
+                <input type="text" [value]="" class="appr-text-field">
+              </mat-grid-tile>
+
+              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                <label class="appr-text-label required">Email</label>
+                <input type="text" [value]="" class="appr-text-field">
+              </mat-grid-tile>
+
+              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                <label class="appr-text-label required">Mobile number</label>
+                <input type="text" [value]="" class="appr-text-field">
+              </mat-grid-tile>
+
+              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                <label class="appr-text-label required">Date of Birth</label>
+                <input type="text" [value]="" class="appr-text-field">
+              </mat-grid-tile>
+
+              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                <label class="appr-text-label required">Mother Tongue</label>
+                <mat-select class="appr-text-field" #group formControlName="group" i18n-placeholder
+                  placeholder="--Select--" (selectionChange)="otherDropDownChange(designation.value, 'designation')">
+                  <mat-option [value]="designation.name" *ngFor="let designation of designationsMeta">
+                    {{designation.name}}
+                  </mat-option>
+                </mat-select>
+              </mat-grid-tile>
+
+              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                <label class="appr-text-label required">Gender</label>
+                <mat-select class="appr-text-field" #group formControlName="group" i18n-placeholder
+                  placeholder="--Select--" (selectionChange)="otherDropDownChange(designation.value, 'designation')">
+                  <mat-option [value]="designation.name" *ngFor="let designation of designationsMeta">
+                    {{designation.name}}
+                  </mat-option>
+                </mat-select>
+              </mat-grid-tile>
+
+              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                <label class="appr-text-label required">Office Pin Code</label>
+                <input type="text" [value]="" class="appr-text-field">
+              </mat-grid-tile>
+
+              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                <label class="appr-text-label required">eHRMS ID</label>
+                <input type="text" [value]="" class="appr-text-field">
+              </mat-grid-tile>
+
+              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                <label class="appr-text-label required">Category</label>
+                <mat-select class="appr-text-field" #group formControlName="group" i18n-placeholder
+                  placeholder="--Select--" (selectionChange)="otherDropDownChange(designation.value, 'designation')">
+                  <mat-option [value]="designation.name" *ngFor="let designation of designationsMeta">
+                    {{designation.name}}
+                  </mat-option>
+                </mat-select>
+              </mat-grid-tile>
+            </mat-grid-list>
+          </form>
+        </div>
+      </div>
+    </mat-expansion-panel>
+  </mat-accordion>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/head/user-cards/user-card.component.scss b/project/ws/app/src/lib/head/user-cards/user-card.component.scss
new file mode 100644
index 000000000..562961a68
--- /dev/null
+++ b/project/ws/app/src/lib/head/user-cards/user-card.component.scss
@@ -0,0 +1,106 @@
+@import 'ws-common';
+@import 'ws-vars';
+@import 'ws-mixins';
+
+.user-card.mat-expansion-panel {
+  margin-bottom: 1em !important;
+  box-shadow: none !important;
+  border: 1px solid #d5d5d5;
+  border-radius: 5px !important;
+
+  .mat-expansion-panel-header {
+    padding: 10px 24px !important;
+  }
+
+  .mat-content{
+    display: block !important;
+  }
+  .float-left {
+    width: 90%;
+  }
+
+  .initialcircle {
+    vertical-align: text-bottom;
+    span {
+      background-color: #000000;
+      color: #ffffff;
+      display: block;
+      border-radius: 50%;
+      width: 40px;
+      height: 40px;
+      text-align: center;
+      line-height: 2.5;
+    }
+  }
+
+  .status-label {
+    color: #fff;
+    font: 500 10px / 12px Lato;
+    padding: 4px 2px 4px 8px;
+    border-radius: 12px;
+
+    .mat-icon {
+      width: 16px;
+      height: 16px;
+      vertical-align: middle;
+      font-size: 13px;
+      margin-left: 4px;
+    }
+  }
+
+  .status-label.verified {
+    background: #1D8923;
+  }
+  .status-label.nonverified {
+    background: #D13924;
+  }
+
+ .button {
+    color: #1B4CA1;
+    border: 1px solid #1B4CA1;
+    padding: 2px 10px;
+    border-radius: 6px;
+
+    .mat-icon {
+      font-size: 20px;
+      width: 20px;
+      height: 20px;
+      vertical-align: sub;
+    }
+  }
+}
+
+// .mat-expansion-panel-body {
+//   padding: 0 !important;
+
+  .panel-body {
+    padding: 10px 0;
+  }
+// }
+.mat-expanded {
+  border: 1px solid #1B4CA1 !important;
+}
+
+.appr-text-field{
+  width: 272px;
+  border: 1px solid #DDDDDD;
+  border-radius: 4px;
+  padding: 9px;
+  font-family: 'Lato';
+  font-size: 14px;
+  font-weight: 400;
+  font: 400 14px Lato;
+}
+
+.appr-text-label{
+  width: 100%;
+  padding-bottom: 10px;
+  margin-bottom: 0;
+  color: #000000;
+  display: block;
+  font: 700 14px Lato;
+}
+
+::ng-deep.mat-figure {
+  display: block !important;
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/head/user-cards/user-card.component.ts b/project/ws/app/src/lib/head/user-cards/user-card.component.ts
new file mode 100644
index 000000000..fb376cdf6
--- /dev/null
+++ b/project/ws/app/src/lib/head/user-cards/user-card.component.ts
@@ -0,0 +1,32 @@
+import { Component, Input, OnInit } from '@angular/core'
+import { FormGroup, FormControl } from '@angular/forms'
+@Component({
+  selector: 'ws-widget-user-card',
+  templateUrl: './user-card.component.html',
+  styleUrls: ['./user-card.component.scss'],
+})
+export class UserCardComponent implements OnInit {
+  @Input() userId: any
+  @Input() tableData: any
+  @Input() usersData: any
+  @Input() totalRecords: any
+  @Input() tabChangeIndex: any
+
+  updateUserDataForm: FormGroup
+  designationsMeta: any = []
+
+  constructor() {
+    this.updateUserDataForm = new FormGroup({
+      designation: new FormControl('', []),
+      group: new FormControl('', []),
+    })
+  }
+
+  ngOnInit() {
+    console.log('userId', this.userId)
+    console.log('tableData', this.tableData)
+    console.log('usersData', this.usersData)
+    console.log('totalRecords', this.totalRecords)
+    console.log('tabChangeIndex', this.tabChangeIndex)
+  }
+}
diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index 7b8eb351e..43d7e4302 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -31,7 +31,7 @@ import { RouterModule } from '@angular/router'
 import { HomeRoutingModule } from './home.rounting.module'
 import { HomeComponent } from './routes/home/home.component'
 import { UsersViewComponent } from './routes/users-view/users-view.component'
-import { AvatarPhotoModule, BreadcrumbsOrgModule, LeftMenuModule, UIORGTableModule, ScrollspyLeftMenuModule } from '@sunbird-cb/collection'
+import { AvatarPhotoModule, BreadcrumbsOrgModule, UIORGTableModule, ScrollspyLeftMenuModule } from '@sunbird-cb/collection'
 import { AboutComponent } from './routes/about/about.component'
 import { RolesAccessComponent } from './routes/roles-access/roles-access.component'
 import { ApprovalsComponent } from './routes/approvals/approvals.component'
@@ -68,6 +68,8 @@ import { TrainingPlanDashboardService } from './services/training-plan-dashboard
 import { AdminsTableComponent } from './routes/admins-table/admins-table.component'
 import { ReportsVideoComponent } from './routes/reports-video/reports-video.component'
 import { ProfleApprovalBulkUploadComponent } from './routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component'
+import { LeftMenuModule } from '../../head/left-menu/left-menu.module'
+import { UserCardComponent } from '../../head/user-cards/user-card.component'
 @NgModule({
   declarations: [
     HomeComponent,
@@ -95,6 +97,7 @@ import { ProfleApprovalBulkUploadComponent } from './routes/profle-approval-bulk
     AdminsTableComponent,
     ReportsVideoComponent,
     ProfleApprovalBulkUploadComponent,
+    UserCardComponent,
   ],
   imports: [
     CommonModule,
@@ -103,7 +106,6 @@ import { ProfleApprovalBulkUploadComponent } from './routes/profle-approval-bulk
     WidgetResolverModule,
     ReactiveFormsModule,
     HomeRoutingModule,
-    LeftMenuModule,
     FormsModule,
     RouterModule,
     MatGridListModule,
@@ -149,6 +151,7 @@ import { ProfleApprovalBulkUploadComponent } from './routes/profle-approval-bulk
     UsersModule,
     MatDatepickerModule,
     PipeDurationTransformModule,
+    LeftMenuModule,
   ],
   entryComponents: [
     AdduserpopupComponent,
@@ -156,6 +159,7 @@ import { ProfleApprovalBulkUploadComponent } from './routes/profle-approval-bulk
     BudgetschemepopupComponent,
     BudgetproofspopupComponent,
     ReportsVideoComponent,
+    UserCardComponent,
   ],
   providers: [
     // CKEditorService,
diff --git a/project/ws/app/src/lib/routes/home/routes/home/home.component.html b/project/ws/app/src/lib/routes/home/routes/home/home.component.html
index 66a82fa43..ccf8ade57 100644
--- a/project/ws/app/src/lib/routes/home/routes/home/home.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/home/home.component.html
@@ -7,8 +7,9 @@
 
 <mat-sidenav-container autosize name="discuss-menu" class="nav-container" name="exp">
   <mat-sidenav [mode]="mode$ | async" [(opened)]="sideNavBarOpened" class="left-nav border-0">
-    <div class="container2">
-      <ng-container [wsResolverWidget]="widgetData"></ng-container>
+    <div class="container2" *ngIf="widgetData">
+      <!-- <ng-container [wsResolverWidget]="widgetData"></ng-container> -->
+      <ws-widget-left-menu [widgetData]="widgetData"></ws-widget-left-menu>
     </div>
   </mat-sidenav>
   <mat-sidenav-content>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index 042896b61..6a882ee51 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -1,5 +1,5 @@
 <div class="flex flex-4 flex-column main-flex-box">
-  <mat-card class="ws-mat-accent-border">
+  <mat-card class="no-border">
     <!-- <mat-card-header class="flex-custom-m">
       <div class="flex-1" role="link" tabindex="0">
         <div class="flex flex-1">
@@ -9,49 +9,70 @@
         </div>
       </div>
     </mat-card-header> -->
-    <mat-card-title class="flex-4 mobile-margin text-capitalize">
+    <mat-card-title class="flex-4 mobile-margin text-capitalize margin-bottom-l">
       <span class="h-600-s-20-m color-87">Users</span>
     </mat-card-title>
+    <mat-card class="mb-8">
+
+      <mat-card-content class="flex gap-10">
+        <div class="section-1">
+          <div class="flex-4 mobile-margin text-capitalize mat-h2">Note:</div>
+          <ng-container *ngFor="let note of reportsNoteList">
+            <div class="flex gap-4 mb-4">
+              <div>
+                <mat-icon class="infoIcon">info_outlined</mat-icon>
+              </div>
+              <div [innerHTML]="sanitizeHtml(note)"></div>
+            </div>
+          </ng-container>
+        </div>
+        <div class="reportsDemo flex justify-end section-2">
+          <div class="reportsDemoVideo flex flex-column flex-middle justify-center margin-top-m"
+            (click)="openVideoPopup()">
+            <mat-icon class="video_icon mb-2">play_circle</mat-icon>
+            <div>
+              Watch how it works
+            </div>
+          </div>
+        </div>
+      </mat-card-content>
+    </mat-card>
     <mat-card-content>
       <div class="flex flex-1 flex-column margin-fix">
         <div class="flex flex-1 filter max-height-60">
-          <!-- <a href="javascript:void(0)" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'underreview',
-              'ws-mat-accent-border font-medium':currentFilter !== 'underreview'}" mat-button
-            (click)="filter('underreview')" role="button">Under review</a> -->
-          <a routerLink="/app/home/users/active" routerLinkActive="router-link-active" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'active',
+          <!-- <a routerLink="/app/home/users/active" routerLinkActive="router-link-active" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'active',
               'ws-mat-accent-border font-medium':currentFilter !== 'active'}" mat-button
             (click)="filter('active'); tabTelemetry('active', 0)" role="button">Registered</a>
           <a routerLink="/app/home/users/inactive" routerLinkActive="router-link-active" class="filter-option"
             [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'inactive',
                           'ws-mat-accent-border font-medium':currentFilter !== 'inactive'}" mat-button
             (click)="filter('inactive'); tabTelemetry('inactive', 1)" role="button">Inactive</a>
-          <!-- <a href="javascript:void(0)" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'blocked',
-                          'ws-mat-accent-border font-medium':currentFilter !== 'blocked'}" mat-button
-            (click)="filter('blocked')" role="button">Blocked</a> -->
           <a routerLink="/app/home/users/upload" routerLinkActive="router-link-active" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'upload',
                                       'ws-mat-accent-border font-medium':currentFilter !== 'upload'}" mat-button
-            (click)="filter('upload'); tabTelemetry('upload', 2)" role="button">File uploads</a>
+            (click)="filter('upload'); tabTelemetry('upload', 2)" role="button">File uploads</a> -->
+
+          <a routerLink="/app/home/users/active" routerLinkActive="router-link-active" class="filter-option"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'active','ws-mat-accent-border font-medium':currentFilter !== 'active'}"
+            mat-button (click)="filter('active'); tabTelemetry('active', 0)" role="button">All Users (0)</a>
+          <a routerLink="/app/home/users/active" routerLinkActive="router-link-active" class="filter-option"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'active','ws-mat-accent-border font-medium':currentFilter !== 'active'}"
+            mat-button (click)="filter('active'); tabTelemetry('active', 0)" role="button">Verified (0)</a>
+          <a routerLink="/app/home/users/active" routerLinkActive="router-link-active" class="filter-option"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'active','ws-mat-accent-border font-medium':currentFilter !== 'active'}"
+            mat-button (click)="filter('active'); tabTelemetry('active', 0)" role="button">Non-verified (0)</a>
+          <a routerLink="/app/home/users/active" routerLinkActive="router-link-active" class="filter-option"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'active','ws-mat-accent-border font-medium':currentFilter !== 'active'}"
+            mat-button (click)="filter('active'); tabTelemetry('active', 0)" role="button">Not my user (0)</a>
         </div>
       </div>
       <ng-container *ngIf="usersData && currentFilter !== 'upload'">
-        <!-- <ws-widget-user-table-v2 [userId]="currentUser" [tableData]="tabledata" [data]="dataForTable" [isUpload]=false
-          [isCreate]=true (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuActions($event)"
-          (searchByEnterKey)="onEnterkySearch($event)" (pageChangeClick)="onPaginateChange($event)"
-          [showEditOnCondition]=true [totalRecords]="userDataTotalCount">
-        </ws-widget-user-table-v2> -->
-        <ws-widget-org-user-table-v2 [userId]="currentUser" [tableData]="tabledata" [data]="dataForTable"
+        <!-- <ws-widget-org-user-table-v2 [userId]="currentUser" [tableData]="tabledata" [data]="dataForTable"
           [isUpload]=false [isCreate]=true (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuActions($event)"
           (searchByEnterKey)="onEnterkySearch($event)" (pageChangeClick)="onPaginateChange($event)"
           [showEditOnCondition]=true [totalRecords]="userDataTotalCount" [tabChangeIndex]="pageIndex">
-        </ws-widget-org-user-table-v2>
-
-        <!-- <div style="float: right;display: flex;">
-          <button class="mr-5 move-button" matTooltip="display prev 250 data"
-            [disabled]="(currentOffset > 0)? false :true" (click)="getAllUsers(250,'prev')">Prev </button>
-          <button class="move-button" matTooltip=" display next 250 data"
-            [disabled]="(currentOffset >= userDataTotalCount)? true :false" (click)="getAllUsers(250,'next')">Next
-          </button>
-        </div> -->
+        </ws-widget-org-user-table-v2> -->
+        <ws-widget-user-card [userId]="currentUser" [tableData]="tabledata" [usersData]="usersData"
+          [totalRecords]="userDataTotalCount" [tabChangeIndex]="pageIndex"></ws-widget-user-card>
       </ng-container>
       <ng-container *ngIf="currentFilter === 'upload'">
         <ws-app-users-upload></ws-app-users-upload>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.scss b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.scss
index 68b471138..7d8cdf05b 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.scss
@@ -308,4 +308,24 @@ a:not([href]):not([tabindex]) {
   //font-weight: 700;
   font-family: Lato;
   font-size: 14px;
+}
+
+.reportsDemo {
+    .reportsDemoVideo {
+      width: 200px;
+      height: 140px;
+      border-radius: 5px;
+      background-color: #FDEAD5;
+      font-weight: 600;
+      pointer-events: all;
+      cursor: pointer;
+
+      .video_icon {
+        font-size: 32px;
+      }
+    }
+  }
+.no-border {
+  border: 0;
+  box-shadow: none !important;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index d2e5f5a6e..95dcf1958 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -14,6 +14,8 @@ import { NsContent } from '@sunbird-cb/collection'
 import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
 import { LoaderService } from '../../../../../../../../../src/app/services/loader.service'
 import { ProfileV2UtillService } from '../../services/home-utill.service'
+import { DomSanitizer, SafeHtml } from '@angular/platform-browser'
+import { ReportsVideoComponent } from '../reports-video/reports-video.component'
 
 // import * as XLSX from 'xlsx'
 
@@ -49,6 +51,8 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   content: NsContent.IContent = {} as NsContent.IContent
   isMdoAdmin = false
 
+  reportsNoteList: string[] = []
+
   tabledata: ITableData = {
     actions: [],
     columns: [
@@ -76,6 +80,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     private events: EventService,
     private loaderService: LoaderService,
     private profileUtilSvc: ProfileV2UtillService,
+    private sanitizer: DomSanitizer,
     // private telemetrySvc: TelemetryService,
     // private configSvc: ConfigurationsService,
     // private discussService: DiscussService,
@@ -105,6 +110,26 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       this.isMdoAdmin = this.configSvc.unMappedUser.roles.includes('MDO_ADMIN')
     }
     this.filterData('')
+
+    this.reportsNoteList = [
+      `Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque leo erat, tincidunt vel gravida sed, rhoncus vel velit. Duis at consectetur tellus. Sed vitae ipsum odio. `,
+      `Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque leo erat, tincidunt vel gravida sed, rhoncus vel velit. Duis at consectetur tellus. Sed vitae ipsum odio. `,
+    ]
+  }
+  sanitizeHtml(html: string): SafeHtml {
+    return this.sanitizer.bypassSecurityTrustHtml(html)
+  }
+
+  openVideoPopup() {
+    this.dialog.open(ReportsVideoComponent, {
+      data: {
+        videoLink: 'https://www.youtube.com/embed/tgbNymZ7vqY?autoplay=1&mute=1',
+      },
+      disableClose: true,
+      width: '50%',
+      height: '60%',
+      panelClass: 'overflow-visable',
+    })
   }
 
   filter(filter: string) {

From dadf375b03721a81997d50832702e9e724e07cee Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Fri, 12 Apr 2024 18:25:14 +0530
Subject: [PATCH 533/887] Updated tabs & users listing view layout

---
 .../head/left-menu/left-menu.component.html   |   2 +-
 .../lib/head/left-menu/left-menu.component.ts | 182 +--------
 .../head/user-cards/user-card.component.html  | 122 ------
 .../head/user-cards/user-card.component.ts    |  32 --
 .../user-cards/user-card.component.html       | 358 ++++++++++++++++++
 .../user-cards/user-card.component.scss       |  39 ++
 .../user-cards/user-card.component.ts         | 194 ++++++++++
 .../ws/app/src/lib/routes/home/home.module.ts |   2 +-
 .../users-view/users-view.component.html      |  47 ++-
 .../routes/users-view/users-view.component.ts |  52 ++-
 10 files changed, 673 insertions(+), 357 deletions(-)
 delete mode 100644 project/ws/app/src/lib/head/user-cards/user-card.component.html
 delete mode 100644 project/ws/app/src/lib/head/user-cards/user-card.component.ts
 create mode 100644 project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
 rename project/ws/app/src/lib/{head => routes/home/components}/user-cards/user-card.component.scss (74%)
 create mode 100644 project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts

diff --git a/project/ws/app/src/lib/head/left-menu/left-menu.component.html b/project/ws/app/src/lib/head/left-menu/left-menu.component.html
index f966401bf..45e4a9072 100644
--- a/project/ws/app/src/lib/head/left-menu/left-menu.component.html
+++ b/project/ws/app/src/lib/head/left-menu/left-menu.component.html
@@ -9,7 +9,7 @@
       </div> -->
       <span i18n="title" class="mat-subheading-2 margin-top-m  dept-name">
         <!-- this will be dynamic -->
-        TarentoCBP
+        {{mdoname}}
       </span>
     </a>
   </div>
diff --git a/project/ws/app/src/lib/head/left-menu/left-menu.component.ts b/project/ws/app/src/lib/head/left-menu/left-menu.component.ts
index ba6453fe3..e0348dd83 100644
--- a/project/ws/app/src/lib/head/left-menu/left-menu.component.ts
+++ b/project/ws/app/src/lib/head/left-menu/left-menu.component.ts
@@ -12,187 +12,15 @@ export class LeftMenuComponent implements OnInit, OnDestroy {
   @Input() widgetData!: any
   mdoname: any
   logo: any
-  menulist = [
-    {
-      "menuCategory": "Home",
-      "requiredRoles": [
-        "admin",
-        "mdo_admin",
-        "wat_member",
-        "mdo_leader"
-      ],
-      "subMenu": [
-        {
-          "name": "Home",
-          "key": "Home",
-          "fragment": false,
-          "render": true,
-          "badges": {
-            "enabled": false,
-            "uri": ""
-          },
-          "enabled": true,
-          "routerLink": "/app/home/welcome",
-          "requiredRoles": [
-            "admin",
-            "mdo_admin",
-            "wat_member",
-            "mdo_leader"
-          ]
-        }
-      ]
-    },
-    {
-      "menuCategory": "Users",
-      "requiredRoles": [
-        "admin",
-        "mdo_admin",
-        "mdo_leader"
-      ],
-      "subMenu": [
-        {
-          "name": "All Users",
-          "key": "users",
-          "fragment": false,
-          "render": true,
-          "badges": {
-            "enabled": false,
-            "uri": ""
-          },
-          "enabled": true,
-          "routerLink": "/app/home/users",
-          "requiredRoles": [
-            "admin",
-            "mdo_admin",
-            "mdo_leader"
-          ]
-        },
-        {
-          "name": "Approvals",
-          "key": "approvals",
-          "fragment": false,
-          "render": true,
-          "badges": {
-            "enabled": false,
-            "uri": ""
-          },
-          "enabled": true,
-          "routerLink": "/app/home/approvals/pending",
-          "requiredRoles": [
-            "admin",
-            "mdo_admin",
-            "mdo_leader"
-          ]
-        }
-      ]
-    },
-    {
-      "menuCategory": "Manage",
-      "requiredRoles": [
-        "admin",
-        "mdo_admin",
-        "mdo_leader"
-      ],
-      "subMenu": [
-        {
-          "name": "Roles and access",
-          "key": "roles-access",
-          "fragment": false,
-          "render": true,
-          "badges": {
-            "enabled": false,
-            "uri": ""
-          },
-          "enabled": true,
-          "routerLink": "/app/home/roles-access",
-          "requiredRoles": [
-            "admin",
-            "mdo_admin",
-            "mdo_leader"
-          ]
-        },
-        {
-          "name": "Organisation profile",
-          "key": "orgProfile",
-          "fragment": false,
-          "render": true,
-          "badges": {
-            "enabled": false,
-            "uri": ""
-          },
-          "enabled": true,
-          "routerLink": "/app/setup",
-          "requiredRoles": [
-            "isInstuteOrg"
-          ]
-        },
-        {
-          "name": "Blended program",
-          "key": "blended-approvals",
-          "fragment": false,
-          "render": true,
-          "badges": {
-            "enabled": false,
-            "uri": ""
-          },
-          "enabled": true,
-          "routerLink": "/app/home/blended-approvals",
-          "requiredRoles": [
-            "admin",
-            "mdo_admin",
-            "mdo_leader"
-          ]
-        },
-        {
-          "name": "Reports",
-          "key": "reports-section",
-          "fragment": false,
-          "render": true,
-          "badges": {
-            "enabled": false,
-            "uri": ""
-          },
-          "enabled": true,
-          "routerLink": "/app/home/reports-section",
-          "requiredRoles": [
-            "admin",
-            "mdo_admin",
-            "mdo_leader"
-          ]
-        },
-        {
-          "name": "Training Plan",
-          "key": "training-plan-dashboard",
-          "fragment": false,
-          "render": true,
-          "badges": {
-            "enabled": false,
-            "uri": ""
-          },
-          "enabled": true,
-          "routerLink": "/app/home/training-plan-dashboard",
-          "requiredRoles": [
-            "admin",
-            "mdo_admin",
-            "mdo_leader"
-          ]
-        }
-      ]
-    }
-  ]
-  // @Input() Source
+  menulist: any = []
   constructor(private activatedRoute: ActivatedRoute, private router: Router) { }
   ngOnDestroy(): void { }
 
   ngOnInit(): void {
-    console.log('widgetData', this.widgetData)
-    this.mdoname = this.widgetData ? this.widgetData.name : ''
-    this.logo = this.widgetData ? this.widgetData.logoPath : './assets/icons/govtlogo.jpg'
+    this.mdoname = this.widgetData ? this.widgetData.widgetData.name : ''
+    this.logo = this.widgetData ? this.widgetData.widgetData.logoPath : '../assets/icons/govtlogo.jpg'
+    this.menulist = this.widgetData ? this.widgetData.widgetData.menusList : []
   }
-
-  // changeToDefaultImg($event: any) {
-  //   $event.target.src = defaultImg
-  // }
   public isLinkActive(url?: string, index?: number): boolean {
     let returnVal = false
     if (url && index) {
@@ -211,7 +39,6 @@ export class LeftMenuComponent implements OnInit, OnDestroy {
       if (st && st[0] && st[0] === (url)) {
         returnval = true
       }
-      // if(route.url.con)
     }
     return returnval
   }
@@ -233,7 +60,6 @@ export class LeftMenuComponent implements OnInit, OnDestroy {
     } else {
       returnValue = true
     }
-    console.log('returnValue', returnValue)
     return returnValue
   }
 }
diff --git a/project/ws/app/src/lib/head/user-cards/user-card.component.html b/project/ws/app/src/lib/head/user-cards/user-card.component.html
deleted file mode 100644
index e109a38e9..000000000
--- a/project/ws/app/src/lib/head/user-cards/user-card.component.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<div>
-  <mat-accordion>
-    <mat-expansion-panel class="user-card" *ngFor="let user of usersData.content">
-      <mat-expansion-panel-header *ngIf="user.profileDetails && user.profileDetails.personalDetails">
-        <div class="float-left">
-          <div class="initialcircle display-inline-block margin-right-s"><span>AB</span></div>
-          <div class="username display-inline-block">
-            <div class="mat-subheading-2 display-inline-block margin-remove">
-              {{user.profileDetails.personalDetails.firstname ||
-              user.profileDetails.personalDetails.firstName}}
-              <span class="status-label margin-left-s verified">Verified <mat-icon>check_circle</mat-icon></span>
-            </div>
-            <div class="mat-body-2 ws-mat-black40-text">Product Manager</div>
-          </div>
-        </div>
-        <div class="float-right">
-          <div class="button margin-top-xs mat-body"><mat-icon>edit</mat-icon> Edit</div>
-        </div>
-      </mat-expansion-panel-header>
-
-      <div class="panel-body">
-        <div class="inner-body">
-          Primary Details <mat-icon class="ws-mat-black40-text">info_outline</mat-icon>
-          <form [formGroup]="updateUserDataForm" class="margin-top-m">
-            <mat-grid-list cols="2" rowHeight="100px">
-              <!-- designation -->
-              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                <label class="appr-text-label required">Designation</label>
-                <mat-select class="appr-text-field" #designation formControlName="designation" i18n-placeholder
-                  placeholder="--Select--" (selectionChange)="otherDropDownChange(designation.value, 'designation')">
-                  <mat-option [value]="designation.name" *ngFor="let designation of designationsMeta">
-                    {{designation.name}}
-                  </mat-option>
-                  <mat-option [value]="'Other'">Other</mat-option>
-                </mat-select>
-              </mat-grid-tile>
-
-              <!-- group -->
-              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                <label class="appr-text-label required">Group</label>
-                <mat-select class="appr-text-field" #group formControlName="group" i18n-placeholder
-                  placeholder="--Select--" (selectionChange)="otherDropDownChange(designation.value, 'designation')">
-                  <mat-option [value]="designation.name" *ngFor="let designation of designationsMeta">
-                    {{designation.name}}
-                  </mat-option>
-                </mat-select>
-              </mat-grid-tile>
-            </mat-grid-list>
-          </form>
-        </div>
-        <hr>
-        <div class="inner-body">
-          Other Details <mat-icon class="ws-mat-black40-text">info_outline</mat-icon>
-
-          <form [formGroup]="updateUserDataForm" class="margin-top-m">
-            <mat-grid-list cols="3" rowHeight="100px">
-              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                <label class="appr-text-label requird">Employee ID</label>
-                <input type="text" [value]="" class="appr-text-field">
-              </mat-grid-tile>
-
-              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                <label class="appr-text-label required">Email</label>
-                <input type="text" [value]="" class="appr-text-field">
-              </mat-grid-tile>
-
-              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                <label class="appr-text-label required">Mobile number</label>
-                <input type="text" [value]="" class="appr-text-field">
-              </mat-grid-tile>
-
-              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                <label class="appr-text-label required">Date of Birth</label>
-                <input type="text" [value]="" class="appr-text-field">
-              </mat-grid-tile>
-
-              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                <label class="appr-text-label required">Mother Tongue</label>
-                <mat-select class="appr-text-field" #group formControlName="group" i18n-placeholder
-                  placeholder="--Select--" (selectionChange)="otherDropDownChange(designation.value, 'designation')">
-                  <mat-option [value]="designation.name" *ngFor="let designation of designationsMeta">
-                    {{designation.name}}
-                  </mat-option>
-                </mat-select>
-              </mat-grid-tile>
-
-              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                <label class="appr-text-label required">Gender</label>
-                <mat-select class="appr-text-field" #group formControlName="group" i18n-placeholder
-                  placeholder="--Select--" (selectionChange)="otherDropDownChange(designation.value, 'designation')">
-                  <mat-option [value]="designation.name" *ngFor="let designation of designationsMeta">
-                    {{designation.name}}
-                  </mat-option>
-                </mat-select>
-              </mat-grid-tile>
-
-              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                <label class="appr-text-label required">Office Pin Code</label>
-                <input type="text" [value]="" class="appr-text-field">
-              </mat-grid-tile>
-
-              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                <label class="appr-text-label required">eHRMS ID</label>
-                <input type="text" [value]="" class="appr-text-field">
-              </mat-grid-tile>
-
-              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                <label class="appr-text-label required">Category</label>
-                <mat-select class="appr-text-field" #group formControlName="group" i18n-placeholder
-                  placeholder="--Select--" (selectionChange)="otherDropDownChange(designation.value, 'designation')">
-                  <mat-option [value]="designation.name" *ngFor="let designation of designationsMeta">
-                    {{designation.name}}
-                  </mat-option>
-                </mat-select>
-              </mat-grid-tile>
-            </mat-grid-list>
-          </form>
-        </div>
-      </div>
-    </mat-expansion-panel>
-  </mat-accordion>
-</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/head/user-cards/user-card.component.ts b/project/ws/app/src/lib/head/user-cards/user-card.component.ts
deleted file mode 100644
index fb376cdf6..000000000
--- a/project/ws/app/src/lib/head/user-cards/user-card.component.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { Component, Input, OnInit } from '@angular/core'
-import { FormGroup, FormControl } from '@angular/forms'
-@Component({
-  selector: 'ws-widget-user-card',
-  templateUrl: './user-card.component.html',
-  styleUrls: ['./user-card.component.scss'],
-})
-export class UserCardComponent implements OnInit {
-  @Input() userId: any
-  @Input() tableData: any
-  @Input() usersData: any
-  @Input() totalRecords: any
-  @Input() tabChangeIndex: any
-
-  updateUserDataForm: FormGroup
-  designationsMeta: any = []
-
-  constructor() {
-    this.updateUserDataForm = new FormGroup({
-      designation: new FormControl('', []),
-      group: new FormControl('', []),
-    })
-  }
-
-  ngOnInit() {
-    console.log('userId', this.userId)
-    console.log('tableData', this.tableData)
-    console.log('usersData', this.usersData)
-    console.log('totalRecords', this.totalRecords)
-    console.log('tabChangeIndex', this.tabChangeIndex)
-  }
-}
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
new file mode 100644
index 000000000..782895b7b
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -0,0 +1,358 @@
+<div>
+  <mat-accordion>
+    <mat-expansion-panel class="user-card" *ngFor="let user of usersData.content">
+      <mat-expansion-panel-header (click)="getUerData(user)">
+        <div class="float-left">
+          <div class="initialcircle display-inline-block margin-right-s">
+            <!-- <span>AB</span> -->
+            <ws-widget-avatar-photo [name]="getUseravatarName(user)" [photoUrl]="user?.photo" size="m">
+            </ws-widget-avatar-photo>
+          </div>
+          <div class="username display-inline-block" *ngIf="user.profileDetails && user.profileDetails.personalDetails">
+            <div class="mat-subheading-2 display-inline-block margin-remove">
+              {{user.profileDetails.personalDetails.firstname}}
+              <span class="status-label margin-left-s verified">Verified <mat-icon>check_circle</mat-icon></span>
+            </div>
+            <div class="mat-body-2 ws-mat-black40-text">Product Manager</div>
+          </div>
+          <div class="username display-inline-block" *ngIf="!user.profileDetails">
+            <div class="mat-subheading-2 display-inline-block margin-remove">
+              {{user.firstName}}
+              <span class="status-label margin-left-s verified" *ngIf="currentFilter !== 'nonverified'">Verified
+                <mat-icon>check_circle</mat-icon></span>
+              <span class="status-label margin-left-s nonverified" *ngIf="currentFilter === 'nonverified'">Non-verified
+                <mat-icon>check_circle</mat-icon></span>
+            </div>
+            <div class="mat-body-2 ws-mat-black40-text">Product Manager</div>
+          </div>
+        </div>
+        <!-- <div class="float-right">
+          <div class="button margin-top-xs mat-body" (click)="editUser(user)"><mat-icon>edit</mat-icon> Edit</div>
+        </div> -->
+      </mat-expansion-panel-header>
+
+      <div class="panel-body" *ngIf="user.editUser">
+        <div class="inner-body">
+          Primary Details <mat-icon class="ws-mat-black40-text">info_outline</mat-icon>
+          <form [formGroup]="updateUserDataForm" class="margin-top-m">
+            <mat-grid-list cols="2" rowHeight="100px">
+              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                <label class="appr-text-label required">Designation</label>
+                <mat-select class="appr-text-field" #designation formControlName="designation" i18n-placeholder
+                  placeholder="--Select--" (selectionChange)="otherDropDownChange(designation.value, 'designation')">
+                  <mat-option [value]="designation.name" *ngFor="let designation of designationsMeta">
+                    {{designation.name}}
+                  </mat-option>
+                  <mat-option [value]="'Other'">Other</mat-option>
+                </mat-select>
+              </mat-grid-tile>
+
+              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                <label class="appr-text-label required">Group</label>
+                <mat-select class="appr-text-field" #group formControlName="group" i18n-placeholder
+                  placeholder="--Select--" (selectionChange)="otherDropDownChange(designation.value, 'designation')">
+                  <mat-option [value]="designation.name" *ngFor="let designation of designationsMeta">
+                    {{designation.name}}
+                  </mat-option>
+                </mat-select>
+              </mat-grid-tile>
+            </mat-grid-list>
+          </form>
+        </div>
+        <hr>
+        <div class="inner-body">
+          Other Details <mat-icon class="ws-mat-black40-text">info_outline</mat-icon>
+
+          <form [formGroup]="updateUserDataForm" class="margin-top-m">
+            <mat-grid-list cols="3" rowHeight="100px">
+              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                <label class="appr-text-label requird">Employee ID</label>
+                <input type="text" [value]="" [disabled]="true" class="appr-text-field">
+              </mat-grid-tile>
+
+              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                <label class="appr-text-label required">Email</label>
+                <input type="text" [value]="" class="appr-text-field">
+              </mat-grid-tile>
+
+              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                <label class="appr-text-label required">Mobile number</label>
+                <input type="text" [value]="" class="appr-text-field">
+              </mat-grid-tile>
+
+              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                <label class="appr-text-label required">Date of Birth</label>
+                <input type="text" [value]="" class="appr-text-field">
+              </mat-grid-tile>
+
+              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                <label class="appr-text-label required">Mother Tongue</label>
+                <mat-select class="appr-text-field" #group formControlName="group" i18n-placeholder
+                  placeholder="--Select--" (selectionChange)="otherDropDownChange(designation.value, 'designation')">
+                  <mat-option [value]="designation.name" *ngFor="let designation of designationsMeta">
+                    {{designation.name}}
+                  </mat-option>
+                </mat-select>
+              </mat-grid-tile>
+
+              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                <label class="appr-text-label required">Gender</label>
+                <mat-select class="appr-text-field" #group formControlName="group" i18n-placeholder
+                  placeholder="--Select--" (selectionChange)="otherDropDownChange(designation.value, 'designation')">
+                  <mat-option [value]="designation.name" *ngFor="let designation of designationsMeta">
+                    {{designation.name}}
+                  </mat-option>
+                </mat-select>
+              </mat-grid-tile>
+
+              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                <label class="appr-text-label required">Office Pin Code</label>
+                <input type="text" [value]="" class="appr-text-field">
+              </mat-grid-tile>
+
+              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                <label class="appr-text-label required">eHRMS ID</label>
+                <input type="text" [value]="" [disabled]="true" class="appr-text-field">
+              </mat-grid-tile>
+
+              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+                <label class="appr-text-label required">Category</label>
+                <mat-select class="appr-text-field" #group formControlName="group" i18n-placeholder
+                  placeholder="--Select--" (selectionChange)="otherDropDownChange(designation.value, 'designation')">
+                  <mat-option [value]="designation.name" *ngFor="let designation of designationsMeta">
+                    {{designation.name}}
+                  </mat-option>
+                </mat-select>
+              </mat-grid-tile>
+
+              <mat-grid-tile [colspan]="1" [rowspan]="10" class="input-wrapper">
+                <mat-card id="roles" *ngIf="!isMdoAdmin"
+                  class="flex flex-1 flex-column margin-top-m margin-bottom-m margin-left-m margin-right-m ws-mat-accent-border">
+                  <div class="flex-custom">
+                    <mat-card-content class="margin-top-m margin-bottom-m margin-left-m margin-right-m">
+                      <span class="mat-subheading-1 flex-4 mobile-margin appr-section-heading" role="link" tabindex="0">
+                        Update roles
+                      </span>
+                      <div class="margin-top-xl new-mobile">
+                        <div class="flex flex-wrap mobile-break">
+                          <div class="w-full profile-cols-full bg-grey">
+                            <ng-container>
+                              <form [formGroup]="updateUserDataForm">
+                                <div class="input-wrapper margin-top-s">
+                                  <label for="roles" class="margin-remove-bottom form-label required" i18n-aria-label
+                                    aria-label="Roles label"
+                                    i18n="Role label|Label which explains the user to select the roles">
+                                    Role
+                                  </label>
+                                  <mat-selection-list id="roles" formControlName="roles" #roles>
+                                    <mat-list-option *ngFor="let role of rolesList"
+                                      (click)="modifyUserRoles(role.roleName)" [selected]="userRoles.has(role.roleName)"
+                                      [value]="role.roleName">
+                                      {{role.roleName}}
+                                    </mat-list-option>
+                                  </mat-selection-list>
+                                </div>
+                                <button mat-raised-button type="submit" (click)="onSubmit(updateUserDataForm, 'Roles')"
+                                  class="margin-top-m text-white btn-success btn-responsive"
+                                  [disabled]="updateUserDataForm?.invalid">
+                                  <span class="text-white" i18n>
+                                    Update
+                                  </span>
+                                </button>
+                                <button mat-raised-button type="submit" (click)="resetRoles()"
+                                  class="margin-top-m text-white btn-success btn-responsive"
+                                  [disabled]="updateUserDataForm?.invalid">
+                                  <span class="text-white" i18n>
+                                    Cancel
+                                  </span>
+                                </button>
+                              </form>
+                            </ng-container>
+                          </div>
+                        </div>
+                      </div>
+                    </mat-card-content>
+                  </div>
+                </mat-card>
+
+                <mat-card id="roles" *ngIf="isMdoAdmin"
+                  class="flex flex-1 flex-column margin-top-m margin-bottom-m margin-left-m margin-right-m ws-mat-accent-border">
+                  <div class="flex-custom">
+                    <mat-card-content class="margin-top-m margin-bottom-m margin-left-m margin-right-m">
+                      <span class="mat-subheading-1 flex-4 mobile-margin appr-section-heading" role="link" tabindex="0">
+                        Roles
+                      </span>
+                      <div class="margin-top-l new-mobile">
+                        <div class="flex flex-wrap mobile-break">
+                          <div class="w-full profile-cols-full bg-grey">
+                            <ng-container>
+                              <ul class="roles-list margin-0">
+                                <li *ngFor="let role of orguserRoles" class="margin-bottom-s">{{role}}</li>
+                              </ul>
+                            </ng-container>
+                          </div>
+                        </div>
+                      </div>
+                    </mat-card-content>
+                  </div>
+                </mat-card>
+              </mat-grid-tile>
+
+              <mat-grid-tile [colspan]="1" [rowspan]="10" class="input-wrapper">
+
+              </mat-grid-tile>
+
+              <mat-grid-tile [colspan]="1" [rowspan]="10" class="input-wrapper">
+                <label class="appr-text-label">Tags</label>
+                <div class="left-input-div">
+                  <div class="flex-col">
+                    <input class="appr-text-field w-full-imp" #tags matInput i18n-placeholder="Type tag here"
+                      placeholder="Type tag here" formControlName="tags" i18n-aria-label aria-label="Enter tag"
+                      [matChipInputFor]="chipListTags" autocomplete="off" maxlength="100"
+                      [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
+                      (matChipInputTokenEnd)="addActivity($event)" />
+                    <p class="margin-left-xs">
+                      <mat-error class="hintErr" *ngIf="updateUserDataForm.controls['tags'].errors?.pattern"
+                        i18n="name Error|Explains name is required">
+                        Only space and alphabets are supported
+                      </mat-error>
+                    </p>
+                  </div>
+                </div>
+                <div class="right-input-div">
+                  <button mat-raised-button type="button" [disabled]="!tags.value || !updateUserDataForm.valid"
+                    (click)="addActivity({input: tags, value: tags.value})"
+                    [ngStyle]="{'opacity': updateUserDataForm.valid? 1: 0.7}"
+                    class="text-white btn-add-activity btn-responsive">
+                    <span class="text-white" i18n>Add tag</span>
+                  </button>
+                </div>
+                <mat-chip-list #chipListTags>
+                  <mat-chip *ngFor="let tag of selectedtags" [selectable]="true" [removable]="true"
+                    (removed)="removeActivity(tag)">
+                    {{ tag }}
+                    <mat-icon matChipRemove>cancel</mat-icon>
+                  </mat-chip>
+                </mat-chip-list>
+              </mat-grid-tile>
+            </mat-grid-list>
+          </form>
+        </div>
+      </div>
+
+      <div class="panel-body" *ngIf="!user.editUser">
+        <div class="inner-body mat-body-2">
+          <div class="margin-bottom-m">
+            <span class="font-bold">Primary Details</span> <mat-icon
+              class="ws-mat-black40-text infoicon">info_outline</mat-icon>
+          </div>
+          <mat-grid-list cols="2" rowHeight="100px">
+            <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+              <label class="view-text-label">Designation</label>
+              <p>{{user.profileDetails && user.profileDetails.professionalDetails ?
+                user.profileDetails.professionalDetails.designation : '-'}}</p>
+
+            </mat-grid-tile>
+
+            <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+              <label class="view-text-label">Group</label>
+              <p>{{user.profileDetails && user.profileDetails.additionalProperties ?
+                user.profileDetails.additionalProperties.group : '-'}}</p>
+
+            </mat-grid-tile>
+          </mat-grid-list>
+        </div>
+        <hr>
+        <div class="inner-body margin-top-m mat-body-2">
+          <div class="margin-bottom-m">
+            <span class="font-bold">Other Details</span> <mat-icon
+              class="ws-mat-black40-text infoicon">info_outline</mat-icon>
+          </div>
+
+          <mat-grid-list cols="4" rowHeight="100px">
+            <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+              <label class="view-text-label">Employee ID</label>
+              <p>{{user.empID ? user.empID : '-'}}</p>
+            </mat-grid-tile>
+
+            <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+              <label class="view-text-label">Email</label>
+              <p>{{user.profileDetails && user.profileDetails.personalDetails ?
+                user.profileDetails.personalDetails.primaryEmail : '-'}}</p>
+            </mat-grid-tile>
+
+            <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+              <label class="view-text-label">Mobile Number</label>
+              <p>{{user.profileDetails && user.profileDetails.personalDetails ?
+                user.profileDetails.personalDetails.mobile : '-'}}</p>
+            </mat-grid-tile>
+
+            <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+              <label class="view-text-label">Gender</label>
+              <p>{{user.profileDetails && user.profileDetails.personalDetails ?
+                user.profileDetails.personalDetails.gender : '-'}}</p>
+
+            </mat-grid-tile>
+
+            <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+              <label class="view-text-label">Date Of Birth</label>
+              <p>{{user.profileDetails && user.profileDetails.personalDetails ? user.profileDetails.personalDetails.dob
+                : '-'}}</p>
+            </mat-grid-tile>
+
+            <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+              <label class="view-text-label">Mother Tongue</label>
+              <p>{{user.profileDetails && user.profileDetails.personalDetails ?
+                user.profileDetails.personalDetails.domicileMedium : '-'}}</p>
+            </mat-grid-tile>
+
+            <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+              <label class="view-text-label">Category</label>
+              <p>{{user.profileDetails && user.profileDetails.personalDetails ?
+                user.profileDetails.personalDetails.category : '-'}}</p>
+            </mat-grid-tile>
+
+            <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+              <label class="view-text-label">Pay Band</label>
+              <p>{{user.profileDetails && user.profileDetails.employmentDetails ?
+                user.profileDetails.employmentDetails.payType : '-'}}</p>
+            </mat-grid-tile>
+
+            <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+              <label class="view-text-label">Office Pin Code</label>
+              <p>{{user.profileDetails && user.profileDetails.employmentDetails ?
+                user.profileDetails.employmentDetails.pinCode : '-'}}</p>
+            </mat-grid-tile>
+
+            <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+              <label class="view-text-label">eHRMS ID</label>
+              <p>{{user.ehrmsID ? user.ehrmsID : '-'}}</p>
+            </mat-grid-tile>
+
+            <mat-grid-tile [colspan]="2" [rowspan]="1" class="input-wrapper">
+              <label class="view-text-label">Tags</label>
+              <div *ngIf="user.profileDetails && user.profileDetails.additionalProperties &&
+              user.profileDetails.additionalProperties.tag.length > 0">
+                <ul class="tagslist">
+                  <li *ngFor="let t of user.profileDetails.additionalProperties.tag">{{t}}</li>
+                </ul>
+              </div>
+              <p *ngIf="user.profileDetails && !user.profileDetails.additionalProperties">-</p>
+            </mat-grid-tile>
+
+            <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+              <label class="view-text-label">Roles</label>
+              <div *ngIf="user.organisations && user.organisations[0].roles.length > 0">
+                <ul class="roleslist">
+                  <li *ngFor="let t of user.organisations[0].roles">{{t}}
+                  </li>
+                </ul>
+              </div>
+              <p *ngIf="user.organisations && user.organisations[0].roles.length === 0">-</p>
+            </mat-grid-tile>
+          </mat-grid-list>
+        </div>
+      </div>
+    </mat-expansion-panel>
+  </mat-accordion>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/head/user-cards/user-card.component.scss b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
similarity index 74%
rename from project/ws/app/src/lib/head/user-cards/user-card.component.scss
rename to project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
index 562961a68..3d96a640a 100644
--- a/project/ws/app/src/lib/head/user-cards/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
@@ -101,6 +101,45 @@
   font: 700 14px Lato;
 }
 
+.view-text-label {
+  width: 100%;
+  padding-bottom: 10px;
+  margin-bottom: 0;
+  color: rgba(0, 0, 0, 0.6);
+  display: block;
+  font: 500 13px Lato;
+}
+
+.infoicon {
+  font-size: 18px !important;
+  width: 20px;
+  height: 20px;
+  vertical-align: bottom;
+  margin-left: 5px;
+}
+
 ::ng-deep.mat-figure {
   display: block !important;
+}
+
+.roleslist {
+  padding-left: 0 !important;
+  margin: 0 !important;
+  li {
+    float: left;
+    margin: 0 16px 4px;
+  }
+}
+
+.tagslist {
+  padding-left: 0 !important;
+  list-style-type: none !important;
+  margin: 0 !important;
+  li {
+    float: left;
+    margin: 0 4px 4px;
+    background: #e0e0e0;
+    padding: 2px 10px;
+    border-radius: 14px;
+  }
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
new file mode 100644
index 000000000..2045fb6a4
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -0,0 +1,194 @@
+import { Component, Input, OnInit } from '@angular/core'
+import { FormGroup, FormControl, Validators } from '@angular/forms'
+import { UsersService } from '../../../users/services/users.service'
+import { MatChipInputEvent } from '@angular/material'
+import { COMMA, ENTER } from '@angular/cdk/keycodes'
+// tslint:disable-next-line
+import _ from 'lodash'
+import { RolesService } from '../../../users/services/roles.service'
+import { ActivatedRoute } from '@angular/router'
+
+@Component({
+  selector: 'ws-widget-user-card',
+  templateUrl: './user-card.component.html',
+  styleUrls: ['./user-card.component.scss'],
+})
+export class UserCardComponent implements OnInit {
+  @Input() userId: any
+  @Input() tableData: any
+  @Input() usersData: any
+  @Input() totalRecords: any
+  @Input() tabChangeIndex: any
+  @Input() currentFilter: any
+
+  userStatus: any
+  rolesList: any = []
+  rolesObject: any = []
+  uniqueRoles: any = []
+  public userRoles: Set<string> = new Set()
+  orguserRoles: any = []
+  isMdoAdmin = false
+  isMdoLeader = false
+  updateUserDataForm: FormGroup
+  designationsMeta: any = []
+  selectedtags: any[] = []
+  reqbody: any
+  isTagsEdited = false
+  separatorKeysCodes: number[] = [ENTER, COMMA]
+  namePatern = `^[a-zA-Z ]*$`
+  orgTypeList: any = []
+
+  constructor(private usersSvc: UsersService, private roleservice: RolesService, private route: ActivatedRoute) {
+    this.updateUserDataForm = new FormGroup({
+      designation: new FormControl('', []),
+      group: new FormControl('', []),
+      tags: new FormControl('', [Validators.pattern(this.namePatern)]),
+      roles: new FormControl('', [Validators.required]),
+    })
+  }
+
+  ngOnInit() {
+    this.currentFilter = this.route.snapshot.params['tab'] || 'active'
+    // this.init()
+  }
+
+  async init() {
+    await this.loadDesignations()
+  }
+
+  async loadDesignations() {
+    await this.usersSvc.getDesignations({}).subscribe(
+      (data: any) => {
+        this.designationsMeta = data.responseData
+      },
+      (_err: any) => {
+      })
+  }
+
+  editUser(user: any) {
+    user.editUser = true
+  }
+
+  getUerData(user: any) {
+    // console.log('user', user)
+    user.editUser = false
+    const profileDataAll = user
+    this.userStatus = profileDataAll.isDeleted ? 'Inactive' : 'Active'
+
+    const profileData = profileDataAll.profileDetails
+    this.updateTags(profileData)
+
+    this.roleservice.getAllRoles().subscribe((data: any) => {
+      const parseRoledata = JSON.parse(data.result.response.value)
+      // console.log('parseRoledata', parseRoledata)
+      this.orgTypeList = parseRoledata.orgTypeList
+      // console.log('this.orgTypeList', this.orgTypeList)
+
+      // New code for roles
+      for (let i = 0; i < this.orgTypeList.length; i += 1) {
+        if (this.orgTypeList[i].name === 'MDO') {
+          _.each(this.orgTypeList[i].roles, rolesObject => {
+            // console.log('------------------------', rolesObject)
+            if (this.isMdoAdmin) {
+              if (rolesObject === 'PUBLIC') {
+                this.uniqueRoles.push({
+                  roleName: rolesObject, description: rolesObject,
+                })
+              }
+              if (rolesObject === 'MDO_DASHBOARD_USER') {
+                this.uniqueRoles.push({
+                  roleName: rolesObject, description: rolesObject,
+                })
+              }
+            } else {
+              if (this.isMdoLeader) {
+                if (rolesObject !== 'MDO_LEADER') {
+                  this.uniqueRoles.push({
+                    roleName: rolesObject, description: rolesObject,
+                  })
+                }
+              }
+            }
+          })
+        }
+      }
+
+      // console.log('uniqueRoles', this.uniqueRoles)
+
+      this.uniqueRoles.forEach((role: any) => {
+        if (!this.rolesList.some((item: any) => item.roleName === role.roleName)) {
+          this.rolesList.push(role)
+        }
+      })
+      // console.log('rolesList', this.rolesList)
+      const usrRoles = profileDataAll.roles
+      usrRoles.forEach((role: any) => {
+        this.orguserRoles.push(role)
+        this.modifyUserRoles(role)
+      })
+      // console.log('orguserRoles', this.orguserRoles)
+    })
+
+  }
+
+  getUseravatarName(user: any) {
+    let name = ''
+    if (user && user.profileDetails && user.profileDetails.personalDetails.firstname) {
+      name = `${user.profileDetails.personalDetails.firstname}`
+    } else {
+      name = `${user.firstName}`
+    }
+    return name
+  }
+
+  resetRoles() {
+    this.updateUserDataForm.controls['roles'].setValue(this.orguserRoles)
+  }
+
+  modifyUserRoles(role: string) {
+    if (this.userRoles.has(role)) {
+      this.userRoles.delete(role)
+    } else {
+      this.userRoles.add(role)
+    }
+  }
+
+  updateTags(profileData: any) {
+    this.selectedtags = _.get(profileData, 'additionalProperties.tag') || []
+  }
+
+  addActivity(event: MatChipInputEvent) {
+    const input = event.input
+    const value = event.value as string
+    if ((value && value.trim()) && this.updateUserDataForm.valid) {
+      this.isTagsEdited = true
+      this.selectedtags.push(value)
+    }
+    if (input) {
+      input.value = ''
+    }
+    if (this.updateUserDataForm.get('tags')) {
+      // tslint:disable-next-line: no-non-null-assertion
+      this.updateUserDataForm.get('tags')!.setValue(null)
+    }
+    this.updateUserDataForm.controls['tags'].reset()
+  }
+
+  removeActivity(interest: any) {
+    const index = this.selectedtags.indexOf(interest)
+    if (index >= 0) {
+      this.selectedtags.splice(index, 1)
+      this.isTagsEdited = true
+    }
+  }
+
+  checkForChange(activityList: any) {
+    const newobj: any = []
+    activityList.forEach((val: any) => {
+      const reqObj = {
+        name: val,
+      }
+      newobj.push(reqObj)
+    })
+  }
+}
diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index 43d7e4302..78ed0064b 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -69,7 +69,7 @@ import { AdminsTableComponent } from './routes/admins-table/admins-table.compone
 import { ReportsVideoComponent } from './routes/reports-video/reports-video.component'
 import { ProfleApprovalBulkUploadComponent } from './routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component'
 import { LeftMenuModule } from '../../head/left-menu/left-menu.module'
-import { UserCardComponent } from '../../head/user-cards/user-card.component'
+import { UserCardComponent } from './components/user-cards/user-card.component'
 @NgModule({
   declarations: [
     HomeComponent,
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index 6a882ee51..71222dd74 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -53,26 +53,39 @@
 
           <a routerLink="/app/home/users/active" routerLinkActive="router-link-active" class="filter-option"
             [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'active','ws-mat-accent-border font-medium':currentFilter !== 'active'}"
-            mat-button (click)="filter('active'); tabTelemetry('active', 0)" role="button">All Users (0)</a>
-          <a routerLink="/app/home/users/active" routerLinkActive="router-link-active" class="filter-option"
-            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'active','ws-mat-accent-border font-medium':currentFilter !== 'active'}"
-            mat-button (click)="filter('active'); tabTelemetry('active', 0)" role="button">Verified (0)</a>
-          <a routerLink="/app/home/users/active" routerLinkActive="router-link-active" class="filter-option"
-            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'active','ws-mat-accent-border font-medium':currentFilter !== 'active'}"
-            mat-button (click)="filter('active'); tabTelemetry('active', 0)" role="button">Non-verified (0)</a>
-          <a routerLink="/app/home/users/active" routerLinkActive="router-link-active" class="filter-option"
+            mat-button (click)="filter('active'); tabTelemetry('active', 0)" role="button">All Users</a>
+
+          <a routerLink="/app/home/users/verified" routerLinkActive="router-link-active" class="filter-option"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'verified','ws-mat-accent-border font-medium':currentFilter !== 'verified'}"
+            mat-button (click)="filter('verified'); tabTelemetry('verified', 0)" role="button">Verified</a>
+
+          <a routerLink="/app/home/users/nonverified" routerLinkActive="router-link-active" class="filter-option"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'nonverified','ws-mat-accent-border font-medium':currentFilter !== 'nonverified'}"
+            mat-button (click)="filter('nonverified'); tabTelemetry('nonverified', 0)" role="button">Non-verified</a>
+          <!-- <a routerLink="/app/home/users/active" routerLinkActive="router-link-active" class="filter-option"
             [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'active','ws-mat-accent-border font-medium':currentFilter !== 'active'}"
-            mat-button (click)="filter('active'); tabTelemetry('active', 0)" role="button">Not my user (0)</a>
+            mat-button (click)="filter('active'); tabTelemetry('active', 0)" role="button">Not my user (0)</a> -->
         </div>
       </div>
-      <ng-container *ngIf="usersData && currentFilter !== 'upload'">
-        <!-- <ws-widget-org-user-table-v2 [userId]="currentUser" [tableData]="tabledata" [data]="dataForTable"
-          [isUpload]=false [isCreate]=true (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuActions($event)"
-          (searchByEnterKey)="onEnterkySearch($event)" (pageChangeClick)="onPaginateChange($event)"
-          [showEditOnCondition]=true [totalRecords]="userDataTotalCount" [tabChangeIndex]="pageIndex">
-        </ws-widget-org-user-table-v2> -->
-        <ws-widget-user-card [userId]="currentUser" [tableData]="tabledata" [usersData]="usersData"
-          [totalRecords]="userDataTotalCount" [tabChangeIndex]="pageIndex"></ws-widget-user-card>
+      <!-- <ws-widget-org-user-table-v2 [userId]="currentUser" [tableData]="tabledata" [data]="dataForTable"
+                [isUpload]=false [isCreate]=true (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuActions($event)"
+                (searchByEnterKey)="onEnterkySearch($event)" (pageChangeClick)="onPaginateChange($event)"
+                [showEditOnCondition]=true [totalRecords]="userDataTotalCount" [tabChangeIndex]="pageIndex">
+              </ws-widget-org-user-table-v2> -->
+      <ng-container *ngIf="usersData && currentFilter === 'active'">
+        <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [tableData]="tabledata"
+          [usersData]="usersData" [totalRecords]="userDataTotalCount"
+          [tabChangeIndex]="pageIndex"></ws-widget-user-card>
+      </ng-container>
+      <ng-container *ngIf="usersData && currentFilter === 'verified'">
+        <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [tableData]="tabledata"
+          [usersData]="usersData" [totalRecords]="userDataTotalCount"
+          [tabChangeIndex]="pageIndex"></ws-widget-user-card>
+      </ng-container>
+      <ng-container *ngIf="usersData && currentFilter === 'nonverified'">
+        <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [tableData]="tabledata"
+          [usersData]="usersData" [totalRecords]="userDataTotalCount"
+          [tabChangeIndex]="pageIndex"></ws-widget-user-card>
       </ng-container>
       <ng-container *ngIf="currentFilter === 'upload'">
         <ws-app-users-upload></ws-app-users-upload>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 95dcf1958..dd41ecabc 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -47,7 +47,8 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   usersData!: any
   configSvc: any
   activeUsersData!: any[]
-  inactiveUsersData!: any[]
+  verifiedUsersData!: any[]
+  nonverifiedUsersData!: any[]
   content: NsContent.IContent = {} as NsContent.IContent
   isMdoAdmin = false
 
@@ -112,7 +113,9 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     this.filterData('')
 
     this.reportsNoteList = [
+      // tslint:disable-next-line: max-line-length
       `Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque leo erat, tincidunt vel gravida sed, rhoncus vel velit. Duis at consectetur tellus. Sed vitae ipsum odio. `,
+      // tslint:disable-next-line: max-line-length
       `Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque leo erat, tincidunt vel gravida sed, rhoncus vel velit. Duis at consectetur tellus. Sed vitae ipsum odio. `,
     ]
   }
@@ -156,8 +159,10 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     switch (this.currentFilter) {
       case 'active':
         return this.activeUsersData
-      case 'inactive':
-        return this.inactiveUsersData
+      case 'verified':
+        return this.verifiedUsersData
+      case 'nonverified':
+        return this.nonverifiedUsersData
       // case 'blocked':
       //   return this.blockedUsers()
       default:
@@ -168,7 +173,9 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   filterData(query: string) {
     if (this.currentFilter === 'active') {
       this.activeUsers(query)
-    } else if (this.currentFilter === 'inactive') {
+    } else if (this.currentFilter === 'verified') {
+      this.verifiedUsers(query)
+    } else if (this.currentFilter === 'nonverified') {
       this.inActiveUsers(query)
     }
   }
@@ -227,6 +234,38 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     //   })
     // }
   }
+
+  verifiedUsers(query: string) {
+    this.loaderService.changeLoad.next(true)
+    const verifiedUsers: any[] = []
+    const status = this.currentFilter === 'active' ? 1 : 0
+    this.currentOffset = this.limit * ((this.pageIndex + 1) - 1)
+    this.usersService.getAllKongUsers(this.rootOrgId, status, this.limit, this.currentOffset, query).subscribe(data => {
+      this.userDataTotalCount = data.result.response.count
+      this.usersData = data.result.response
+      if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
+        _.filter(this.usersData.content, { isDeleted: false }).forEach((user: any) => {
+          // tslint:disable-next-line
+          const org = { roles: _.get(_.first(_.filter(user.organisations, { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') }
+          verifiedUsers.push({
+            fullname: user ? `${user.firstName}` : null,
+            email: user.personalDetails && user.personalDetails.primaryEmail ?
+              this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
+            role: org.roles || [],
+            userId: user.id,
+            active: !user.isDeleted,
+            blocked: user.blocked,
+            roles: _.join(_.map((org.roles || []), i => `<li>${i}</li>`), ''),
+            orgId: user.rootOrgId,
+            orgName: user.rootOrgName,
+            allowEditUser: this.showEditUser(org.roles),
+          })
+        })
+      }
+      this.verifiedUsersData = verifiedUsers
+      return this.verifiedUsersData
+    })
+  }
   inActiveUsers(query: string) {
     this.loaderService.changeLoad.next(true)
     const inactiveUsersData: any[] = []
@@ -256,8 +295,9 @@ export class UsersViewComponent implements OnInit, OnDestroy {
             })
           })
         }
-        this.inactiveUsersData = inactiveUsersData
-        return this.inactiveUsersData
+        // this.inactiveUsersData = inactiveUsersData
+        this.nonverifiedUsersData = inactiveUsersData
+        return this.nonverifiedUsersData
       })
     // if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
     //   _.filter(this.usersData.content, { isDeleted: true }).forEach((user: any) => {

From cf58b2ce8a3a1c3088c28c0185730809aca79d21 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Fri, 12 Apr 2024 19:48:36 +0530
Subject: [PATCH 534/887] Updated note section in all users & approvals page

---
 .../routes/approvals/approvals.component.html | 24 ++++++++++++++
 .../routes/approvals/approvals.component.scss | 15 +++++++++
 .../routes/approvals/approvals.component.ts   | 32 ++++++++++++++++++-
 .../users-view/users-view.component.html      |  3 +-
 .../routes/users-view/users-view.component.ts | 10 ++++--
 5 files changed, 79 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.html
index bf68e58ff..9e37d9a91 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.html
@@ -12,6 +12,30 @@
     <mat-card-title class="flex-4 mobile-margin text-capitalize">
       <span class="mat-subheading-1">Approvals</span>
     </mat-card-title>
+    <mat-card class="mb-8">
+      <mat-card-content class="flex gap-10">
+        <div class="section-1">
+          <div class="flex-4 mobile-margin text-capitalize mat-h2">Note:</div>
+          <ng-container *ngFor="let note of reportsNoteList">
+            <div class="flex gap-4 mb-4">
+              <div>
+                <mat-icon class="infoIcon">info_outlined</mat-icon>
+              </div>
+              <div [innerHTML]="sanitizeHtml(note)"></div>
+            </div>
+          </ng-container>
+        </div>
+        <div class="reportsDemo flex justify-end section-2">
+          <div class="reportsDemoVideo flex flex-column flex-middle justify-center margin-top-m"
+            (click)="openVideoPopup()">
+            <mat-icon class="video_icon mb-2">play_circle</mat-icon>
+            <div>
+              Watch how it works
+            </div>
+          </div>
+        </div>
+      </mat-card-content>
+    </mat-card>
     <mat-card-content>
       <div class="flex flex-1 flex-column margin-fix">
         <div class="flex flex-1 filter max-height-60">
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.scss b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.scss
index a31eb3d19..4df45e821 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.scss
@@ -290,3 +290,18 @@ a:not([href]):not([tabindex]) {
   font-size: 20px !important;
 }
 
+.reportsDemo {
+    .reportsDemoVideo {
+      width: 200px;
+      height: 140px;
+      border-radius: 5px;
+      background-color: #FDEAD5;
+      font-weight: 600;
+      pointer-events: all;
+      cursor: pointer;
+
+      .video_icon {
+        font-size: 32px;
+      }
+    }
+  }
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
index bb66d22fc..03799a104 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
@@ -4,11 +4,13 @@ import { ActivatedRoute, Router } from '@angular/router'
 import { ApprovalsService } from '../../services/approvals.service'
 // import moment from 'moment'
 import { ITableData } from '@sunbird-cb/collection/lib/ui-org-table/interface/interfaces'
-import { MatSnackBar, PageEvent } from '@angular/material'
+import { MatDialog, MatSnackBar, PageEvent } from '@angular/material'
 /* tslint:disable */
 import _ from 'lodash'
 import { EventService } from '@sunbird-cb/utils'
 import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
+import { DomSanitizer, SafeHtml } from '@angular/platform-browser'
+import { ReportsVideoComponent } from '../reports-video/reports-video.component'
 /* tslint:enable */
 @Component({
   selector: 'ws-app-approvals',
@@ -42,6 +44,7 @@ export class ApprovalsComponent implements OnInit, OnDestroy {
     needUserMenus: false,
   }
   configSvc: any
+  reportsNoteList: string[] = []
 
   constructor(
     private router: Router,
@@ -49,6 +52,8 @@ export class ApprovalsComponent implements OnInit, OnDestroy {
     private activeRouter: ActivatedRoute,
     private route: ActivatedRoute,
     private events: EventService,
+    public dialog: MatDialog,
+    private sanitizer: DomSanitizer,
     private snackbar: MatSnackBar) {
     this.configSvc = this.route.parent && this.route.parent.snapshot.data.configService
     if (this.activeRouter.parent && this.activeRouter.parent.snapshot.data.configService.unMappedUser.channel
@@ -63,6 +68,31 @@ export class ApprovalsComponent implements OnInit, OnDestroy {
     if (this.currentFilter === 'pending') {
       this.fetchApprovals()
     }
+
+    this.reportsNoteList = [
+      // tslint:disable-next-line: max-line-length
+      `Profile Verifications: Review and approve/reject user requests for verification of one or more primary fields.`,
+      // tslint:disable-next-line: max-line-length
+      `Transfers: Manage user transfer requests, including approving/rejecting transfers. You will receive these request in the “Transfers” section.`,
+      // tslint:disable-next-line: max-line-length
+      `You can update multiple user profiles in one go by using Bulk Profile Update.`,
+    ]
+  }
+
+  sanitizeHtml(html: string): SafeHtml {
+    return this.sanitizer.bypassSecurityTrustHtml(html)
+  }
+
+  openVideoPopup() {
+    this.dialog.open(ReportsVideoComponent, {
+      data: {
+        videoLink: 'https://www.youtube.com/embed/tgbNymZ7vqY?autoplay=1&mute=1',
+      },
+      disableClose: true,
+      width: '50%',
+      height: '60%',
+      panelClass: 'overflow-visable',
+    })
   }
 
   filter(key: string | 'timestamp' | 'best' | 'saved') {
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index 71222dd74..dcd4ff10a 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -13,7 +13,6 @@
       <span class="h-600-s-20-m color-87">Users</span>
     </mat-card-title>
     <mat-card class="mb-8">
-
       <mat-card-content class="flex gap-10">
         <div class="section-1">
           <div class="flex-4 mobile-margin text-capitalize mat-h2">Note:</div>
@@ -53,7 +52,7 @@
 
           <a routerLink="/app/home/users/active" routerLinkActive="router-link-active" class="filter-option"
             [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'active','ws-mat-accent-border font-medium':currentFilter !== 'active'}"
-            mat-button (click)="filter('active'); tabTelemetry('active', 0)" role="button">All Users</a>
+            mat-button (click)="filter('active'); tabTelemetry('active', 0)" role="button">All users</a>
 
           <a routerLink="/app/home/users/verified" routerLinkActive="router-link-active" class="filter-option"
             [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'verified','ws-mat-accent-border font-medium':currentFilter !== 'verified'}"
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index dd41ecabc..ffb4ab6fa 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -114,9 +114,15 @@ export class UsersViewComponent implements OnInit, OnDestroy {
 
     this.reportsNoteList = [
       // tslint:disable-next-line: max-line-length
-      `Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque leo erat, tincidunt vel gravida sed, rhoncus vel velit. Duis at consectetur tellus. Sed vitae ipsum odio. `,
+      `Easily create users individually or in bulk.`,
       // tslint:disable-next-line: max-line-length
-      `Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque leo erat, tincidunt vel gravida sed, rhoncus vel velit. Duis at consectetur tellus. Sed vitae ipsum odio. `,
+      `Edit any user profile within your organization.`,
+      // tslint:disable-next-line: max-line-length
+      `Verified Users: Users with all their primary fields approved.`,
+      // tslint:disable-next-line: max-line-length
+      `Non-Verified Users: Users whose one or more primary fields are yet to be approved. You can help by reviewing and approving their requests.`,
+      // tslint:disable-next-line: max-line-length
+      `Not My User: Remove a user from your organization with a simple click.`,
     ]
   }
   sanitizeHtml(html: string): SafeHtml {

From 65b4dc89179f4f7b41541c2eb1a2a79e3f1f6fbd Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Fri, 19 Apr 2024 16:29:58 +0530
Subject: [PATCH 535/887] Updated new UI layout for left menu

---
 .../head/left-menu/left-menu.component.html   | 57 +++++++++++--------
 .../head/left-menu/left-menu.component.scss   | 13 ++++-
 2 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/project/ws/app/src/lib/head/left-menu/left-menu.component.html b/project/ws/app/src/lib/head/left-menu/left-menu.component.html
index 45e4a9072..d983976c6 100644
--- a/project/ws/app/src/lib/head/left-menu/left-menu.component.html
+++ b/project/ws/app/src/lib/head/left-menu/left-menu.component.html
@@ -14,28 +14,39 @@
     </a>
   </div>
 </div>
-<mat-accordion [multi]="true">
-  <ng-container *ngFor="let menu of menulist; let mi = index">
-    <mat-expansion-panel class="menuPannel bg-gray-accordian" hideToggle="true" [expanded]="true" #example>
-      <mat-expansion-panel-header>
-        <mat-panel-title>
-          <mat-panel-description>
-            <p class="margin-remove">{{menu?.menuCategory}}</p>
-            <mat-icon *ngIf="!example.expanded">arrow_drop_down</mat-icon>
-            <mat-icon *ngIf="example.expanded">arrow_drop_up</mat-icon>
-          </mat-panel-description>
-        </mat-panel-title>
-      </mat-expansion-panel-header>
-      <mat-nav-list class="nav-list-menu flex-1">
-        <ng-container *ngFor="let tab of menu?.subMenu; let i = index">
-          <ng-container>
-            <a mat-list-item disableRipple class="flex outline-1 menu-item-a" [attr.data-index]="i"
-              [routerLink]="[tab.routerLink]" [queryParamsHandling]="preserve" routerLinkActive="ws-active-route-men">
-              <span class="padding-left-xs">{{tab?.name}}</span>
-            </a>
+<ng-container *ngFor="let menu of menulist; let mi = index">
+  <ng-container *ngIf="menu.subMenu">
+    <mat-accordion [multi]="true">
+      <mat-expansion-panel class="menuPannel bg-gray-accordian" hideToggle="true" [expanded]="true" #example>
+        <mat-expansion-panel-header>
+          <mat-panel-title>
+            <mat-panel-description>
+              <p class="margin-remove">{{menu?.menuCategory}}</p>
+              <mat-icon *ngIf="!example.expanded">arrow_drop_down</mat-icon>
+              <mat-icon *ngIf="example.expanded">arrow_drop_up</mat-icon>
+            </mat-panel-description>
+          </mat-panel-title>
+        </mat-expansion-panel-header>
+        <mat-nav-list class="nav-list-menu flex-1">
+          <ng-container *ngFor="let tab of menu?.subMenu; let i = index">
+            <ng-container>
+              <a mat-list-item disableRipple class="flex outline-1 menu-item-a" [attr.data-index]="i"
+                [routerLink]="[tab.routerLink]" [queryParamsHandling]="preserve" routerLinkActive="ws-active-route-men">
+                <span class="padding-left-xs">{{tab?.name}}</span>
+              </a>
+            </ng-container>
           </ng-container>
-        </ng-container>
-      </mat-nav-list>
-    </mat-expansion-panel>
+        </mat-nav-list>
+      </mat-expansion-panel>
+    </mat-accordion>
   </ng-container>
-</mat-accordion>
\ No newline at end of file
+
+  <ng-container *ngIf="!menu.subMenu">
+    <mat-nav-list class="nav-list-menu flex-1">
+      <a mat-list-item disableRipple class="flex outline-1 main-menuitem" [attr.data-index]="mi"
+        [routerLink]="[menu.routerLink]" [queryParamsHandling]="preserve" routerLinkActive="ws-active-route-men">
+        <span class="padding-left-xs">{{menu?.menuCategory}}</span>
+      </a>
+    </mat-nav-list>
+  </ng-container>
+</ng-container>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/head/left-menu/left-menu.component.scss b/project/ws/app/src/lib/head/left-menu/left-menu.component.scss
index 142059943..9d20aa5a9 100644
--- a/project/ws/app/src/lib/head/left-menu/left-menu.component.scss
+++ b/project/ws/app/src/lib/head/left-menu/left-menu.component.scss
@@ -65,10 +65,11 @@
     .mat-list-item-content {
       padding: 12px 16px 12px 32px !important;
     }
-
-
   }
+}
 
+.main-menuitem {
+  background: transparent !important;
 }
 
 .mat-nav-list a:not(:first-child) {
@@ -91,6 +92,11 @@
 //   margin: unset !important;
 // }
 
+::ng-deep  .mat-expansion-panel:not([class*=mat-elevation-z]) {
+    background: rgba(0, 0, 0, 0.02) !important;
+    margin-bottom: 8px !important;
+}
+
 ::ng-deep .menuPannel.mat-expansion-panel {
   border-radius: unset !important;
   box-shadow: none !important;
@@ -110,9 +116,10 @@
 }
 
 ::ng-deep .menuPannel .mat-expansion-panel-header {
-  padding: 8px 16px !important;
+  padding: 8px 24px !important;
   height: unset !important;
   background: rgba(0, 0, 0, 0.04);
+  font: 400 16px/24px Lato !important;
 }
 
 ::ng-deep .menuPannel .mat-expansion-panel-header .mat-expansion-panel-header-title {

From ed340c586017d02debb23feb2435edef5771f767 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Fri, 19 Apr 2024 16:33:53 +0530
Subject: [PATCH 536/887] Added search filter component & updated tabs

---
 .../components/search/search.component.html   |  27 ++
 .../components/search/search.component.scss   |  50 +++
 .../components/search/search.component.ts     | 318 ++++++++++++++++++
 .../ws/app/src/lib/routes/home/home.module.ts |   3 +
 .../lib/routes/home/home.rounting.module.ts   |   2 +-
 .../users-view/users-view.component.html      |  33 +-
 .../routes/users-view/users-view.component.ts |  96 ++++--
 .../routes/view-user/view-user.component.ts   |   2 +-
 8 files changed, 483 insertions(+), 48 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/home/components/search/search.component.html
 create mode 100644 project/ws/app/src/lib/routes/home/components/search/search.component.scss
 create mode 100644 project/ws/app/src/lib/routes/home/components/search/search.component.ts

diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.html b/project/ws/app/src/lib/routes/home/components/search/search.component.html
new file mode 100644
index 000000000..14575dbd4
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.html
@@ -0,0 +1,27 @@
+<div class="flex flex-1 flex-row margin-top-m margin-bottom-m">
+    <div class="search flex margin-right-m" [ngClass]="{'disable': isContentLive}">
+        <div class="rsearch flex w-full"><mat-icon
+                class="color-60 search-icon mat-icon notranslate material-icons mat-icon-no-color">search</mat-icon>
+            <input class="sinput color-60 w-full" [(ngModel)]="searchText" (keyup.enter)="searchData()" label=""
+                placeholder="Select" type="Standard" [ngClass]="{'disable': isContentLive}">
+        </div>
+    </div>
+    <div class="filter-section flex" *ngIf="!(tpdsSvc?.trainingPlanAssigneeData?.category === 'Designation'
+        || tpdsSvc?.trainingPlanAssigneeData?.category === 'AllUser') || from === 'content'"
+        [ngClass]="{'disable': isContentLive}">
+        <button mat-button type="button" (click)="sort()" class="apply-filter margin-right-s">
+            <mat-icon class="margin-right-xs">sort</mat-icon> Sort
+        </button>
+    </div>
+    <div class="filter-section flex" *ngIf="!(tpdsSvc?.trainingPlanAssigneeData?.category === 'Designation'
+    || tpdsSvc?.trainingPlanAssigneeData?.category === 'AllUser') || from === 'content'"
+        [ngClass]="{'disable': isContentLive}">
+        <button mat-button type="button" (click)="openFilter()" class="apply-filter margin-right-s">
+            Apply Filter <mat-icon class="margin-right-xs">filter_list</mat-icon>
+        </button>
+    </div>
+    <div class="flex flex-end">
+        <button mat-button type="button" class="search-btn" (click)="createUser()"
+            [ngClass]="{'disable': isContentLive}">Create user</button>
+    </div>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.scss b/project/ws/app/src/lib/routes/home/components/search/search.component.scss
new file mode 100644
index 000000000..dcb221562
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.scss
@@ -0,0 +1,50 @@
+.search {
+    width: 34%;
+    .rsearch {
+        position: relative;
+    }
+
+    .search-icon {
+        position: absolute;
+        top: 16px;
+        font-size: 20px;
+        left: 10px;
+    }
+
+    .sinput {
+        border-radius: 4px;
+        border: 1px solid #d5d0d0;
+        padding: 15px 36px;
+        font: 400 14px Lato;
+    }
+}
+
+.filter-section span {
+    color: rgba(0, 0, 0, 0.87);
+    font-size: 16px;
+    font-weight: 600;
+}
+.apply-filter {
+    border: 1px solid #cccc;
+    padding: 4px 26px;
+}
+
+.search-btn {
+    background: #1b4ca1 !important;
+    color: white !important;
+    font-family: 'Lato';
+    font-weight: 700;
+    font-size: 14px;
+    border-radius: 4px;
+    min-width: 138px;
+}
+
+.btn-disabled {
+    background: rgba(0, 0, 0, 0.16) !important;
+}
+
+.disable {
+  opacity: 0.3;
+  pointer-events: none;
+  cursor: none;
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.ts b/project/ws/app/src/lib/routes/home/components/search/search.component.ts
new file mode 100644
index 000000000..057ed3e99
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.ts
@@ -0,0 +1,318 @@
+import { Component, EventEmitter, Input, Output, OnInit } from '@angular/core'
+// import { ActivatedRoute } from '@angular/router'
+// import { TrainingPlanService } from './../../services/traininig-plan.service'
+// import { TrainingPlanDataSharingService } from './../../services/training-plan-data-share.service'
+/* tslint:disable */
+import _ from 'lodash'
+/* tslint:enable */
+import { LoaderService } from '../../../../../../../../../src/app/services/loader.service'
+@Component({
+  selector: 'ws-app-searchuser',
+  templateUrl: './search.component.html',
+  styleUrls: ['./search.component.scss'],
+})
+export class SearchComponent implements OnInit {
+  @Input() categoryData: any = []
+  @Input() from: any = ''
+  @Output() handleApiData = new EventEmitter()
+  searchText = ''
+  filterVisibilityFlag = false
+  clearFilter = false
+  selectedDropDownValue: any
+  designationList: any[] = []
+  pageIndex = 0
+  pageSize = 20
+  isContentLive = false
+  constructor(
+    // private trainingPlanService: TrainingPlanService,
+    // private route: ActivatedRoute,
+    // public tpdsSvc: TrainingPlanDataSharingService,
+    private loadingService: LoaderService
+  ) { }
+
+  ngOnInit() {
+    // this.tpdsSvc.handleContentPageChange.subscribe((pageData: any) => {
+    //   if (pageData) {
+    //     this.pageIndex = pageData.pageIndex
+    //     this.pageSize = pageData.pageSize
+    //     this.getContent(this.selectedDropDownValue)
+    //   }
+
+    // })
+
+    // this.tpdsSvc.getFilterDataObject.subscribe(event => {
+    //   if (this.selectedDropDownValue === 'Course' ||
+    //     this.selectedDropDownValue === 'Standalone Assessment' ||
+    //     this.selectedDropDownValue === 'Program' ||
+    //     this.selectedDropDownValue === 'Blended program' ||
+    //     this.selectedDropDownValue === 'Curated program' ||
+    //     this.selectedDropDownValue === 'Moderated Course'
+    //   ) {
+    //     this.getContent(this.selectedDropDownValue, event)
+    //   }
+    //   if (this.selectedDropDownValue === 'CustomUser') {
+    //     this.getCustomUsers(this.selectedDropDownValue, event)
+    //   }
+
+    // })
+    // if (this.tpdsSvc.trainingPlanStepperData.status && this.tpdsSvc.trainingPlanStepperData.status.toLowerCase() === 'live') {
+    //   this.isContentLive = true
+    // }
+  }
+
+  openFilter() {
+    this.filterVisibilityFlag = true
+    // this.tpdsSvc.filterToggle.next({ from: this.from, status: true })
+    // if (this.document.getElementById('top-nav-bar')) {
+    //   const ele: any = this.document.getElementById('top-nav-bar')
+    //   ele.style.zIndex = '1'
+    // }
+
+  }
+
+  hideFilter(event: any) {
+    this.filterVisibilityFlag = event
+    // this.tpdsSvc.filterToggle.next({ from: '', status: false })
+    // if (this.document.getElementById('top-nav-bar')) {
+    //   const ele: any = this.document.getElementById('top-nav-bar')
+    //   ele.style.zIndex = '1000'
+    // }
+  }
+
+  handleCategorySelection(event: any) {
+    this.selectedDropDownValue = event
+    switch (this.from) {
+      case 'content':
+        // if(this.tpdsSvc.trainingPlanContentData && this.tpdsSvc.trainingPlanContentData.data) {
+        //   this.tpdsSvc.trainingPlanContentData.data = []
+        // }
+        /* tslint:disable */
+        event = !event ? 'Course' : event
+        /* tslint:enable */
+        this.searchText = ''
+        // this.tpdsSvc.clearFilter.next({ from: 'content', status: true })
+        this.resetPageIndex()
+        this.getContent(event)
+        break
+      case 'assignee':
+        // if(this.tpdsSvc.trainingPlanAssigneeData && this.tpdsSvc.trainingPlanAssigneeData.data) {
+        //   this.tpdsSvc.trainingPlanAssigneeData.data = []
+        //   this.tpdsSvc.trainingPlanStepperData['assignmentTypeInfo']=[]
+        // }
+        /* tslint:disable */
+        // this.tpdsSvc.clearFilter.next({ from: 'assignee', status: true })
+        this.resetPageIndex()
+        this.searchText = ''
+        event = !event ? 'Designation' : event
+        /* tslint:enable */
+        if (event === 'Designation') {
+          this.getDesignations(event)
+        } else if (event === 'CustomUser') {
+          this.getCustomUsers(event)
+        } else if (event === 'AllUser') {
+          this.getAllUsers(event)
+        }
+        break
+    }
+  }
+
+  getContent(contentType: any, applyFilterObj?: any) {
+    this.loadingService.changeLoaderState(true)
+    if (contentType) {
+      if (contentType === 'Moderated Course') {
+        // this.tpdsSvc.moderatedCourseSelectStatus.next(true)
+      }
+      if (applyFilterObj && Object.keys(applyFilterObj).length) {
+        this.searchText = ''
+      }
+      if (this.searchText) {
+        // this.tpdsSvc.clearFilter.next({ from: 'content', status: true })
+        /* tslint:disable */
+        applyFilterObj = {}
+        /* tslint:enable */
+      }
+      // const filterObj = {
+      //   request: {
+      //     secureSettings: contentType === 'Moderated Course' ? true : false, // for moderated course
+      //     filters: {
+      //       primaryCategory: [contentType === 'Moderated Course' ? 'Course' : contentType],
+      //       /* tslint:disable */
+      //       organisation: applyFilterObj && applyFilterObj['providers'] && applyFilterObj['providers'].length ? applyFilterObj['providers'] : [],
+      //       'competencies_v5.competencyArea': applyFilterObj && applyFilterObj['competencyArea'] && applyFilterObj['competencyArea'].length ? applyFilterObj['competencyArea'] : [],
+      //       'competencies_v5.competencyTheme': applyFilterObj && applyFilterObj['competencyTheme'] && applyFilterObj['competencyTheme'].length ? applyFilterObj['competencyTheme'] : [],
+      //       'competencies_v5.competencySubTheme': applyFilterObj && applyFilterObj['competencySubTheme'] && applyFilterObj['competencySubTheme'].length ? applyFilterObj['competencySubTheme'] : [],
+      //       /* tslint:enable */
+      //     },
+      //     offset: this.pageIndex,
+      //     limit: this.pageSize,
+      //     query: (this.searchText) ? this.searchText : '',
+      //     sort_by: { lastUpdatedOn: 'desc' },
+      //     fields: ['name', 'appIcon', 'instructions', 'description', 'purpose', 'mimeType',
+      //       'gradeLevel', 'identifier', 'medium', 'resourceType',
+      //       'primaryCategory', 'contentType', 'channel', 'organisation', 'trackable', 'posterImage',
+      //       'idealScreenSize', 'learningMode', 'creatorLogo', 'duration', 'programDuration',
+      //       'version', 'avgRating', 'competencies_v5', 'secureSettings'],
+      //   },
+      // }
+      // this.trainingPlanService.getAllContent(filterObj).subscribe((res: any) => {
+      //   let finResult = []
+      //   if (this.tpdsSvc.trainingPlanContentData.data && this.tpdsSvc.trainingPlanContentData.data.content) {
+      //     finResult = this.tpdsSvc.trainingPlanContentData.data.content.filter((sitem: any) => {
+      //       if (sitem) {
+      //         return sitem.selected
+      //       }
+      //     })
+      //   }
+      //   if (res && res.content) {
+      //     const result = { count: res.count, content: _.uniqBy(_.concat(finResult, res.content), 'identifier') }
+      //     this.tpdsSvc.trainingPlanContentData = { category: contentType, data: result, count: res.count }
+
+      //   } else {
+      //     const result = { count: res.count, content: _.uniqBy(_.concat(finResult, []), 'identifier') }
+      //     this.tpdsSvc.trainingPlanContentData = { category: contentType, data: result, count: res.count }
+      //   }
+      //   this.handleApiData.emit(true)
+      //   this.loadingService.changeLoaderState(false)
+      // })
+    }
+
+  }
+
+  getCustomUsers(event: any, applyFilterObj?: any) {
+    this.loadingService.changeLoaderState(true)
+    /* tslint:disable */
+    console.log(event)
+    /* tslint:enable */
+    // const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
+    if (applyFilterObj && Object.keys(applyFilterObj).length) {
+      this.searchText = ''
+    }
+    if (this.searchText) {
+      // this.tpdsSvc.clearFilter.next({ from: 'assignee', status: true })
+      /* tslint:disable */
+      applyFilterObj = {}
+      /* tslint:enable */
+    }
+    // const filterObj = {
+    //   request: {
+    //     query: (this.searchText) ? this.searchText : '',
+    //     filters: {
+    //       rootOrgId,
+    //       status: 1,
+    //       /* tslint:disable */
+    //       'profileDetails.professionalDetails.designation': applyFilterObj && applyFilterObj.designation && applyFilterObj.designation.length ? applyFilterObj.designation : [],
+    //       'profileDetails.professionalDetails.group': applyFilterObj && applyFilterObj.group && applyFilterObj.group.length ? applyFilterObj.group : [],
+    //       /* tslint:disable */
+    //     },
+    //     fields: [
+    //       'userId',
+    //       'firstName',
+    //       'rootOrgName',
+    //       'profileDetails',
+    //       'organisations',
+    //     ],
+    //     limit: 10000,
+    //     offset: 0,
+    //   },
+    // }
+    // this.trainingPlanService.getCustomUsers(filterObj).subscribe((res: any) => {
+    //   if (this.tpdsSvc.trainingPlanAssigneeData.data && this.tpdsSvc.trainingPlanAssigneeData.data && this.tpdsSvc.trainingPlanAssigneeData.data.content) {
+    //     const finArr = this.tpdsSvc.trainingPlanAssigneeData.data.content.filter((sitem: any) => {
+    //       if (sitem && sitem.selected) {
+    //         return sitem
+    //       }
+    //     })
+    //     this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: _.uniqBy(_.concat(finArr, res.content), 'userId') }
+    //   } else if (this.tpdsSvc.trainingPlanAssigneeData.data && this.tpdsSvc.trainingPlanAssigneeData.data) {
+    //     const finArr = this.tpdsSvc.trainingPlanAssigneeData.data.filter((sitem: any) => {
+    //       if (sitem && sitem.selected) {
+    //         return sitem
+    //       }
+    //     })
+    //     this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: _.uniqBy(_.concat(finArr, res.content), 'userId') }
+    //   } else {
+    //     this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: res.content }
+    //   }
+    //   this.handleApiData.emit(true)
+    //   this.loadingService.changeLoaderState(false)
+    // }, (_error: any) => {
+    // })
+  }
+
+  getAllUsers(_event: any) {
+    // this.tpdsSvc.trainingPlanAssigneeData = { category: _event, data: [_event] }
+    // this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo = [
+    //   'AllUser',
+    // ]
+    this.handleApiData.emit(true)
+  }
+
+  getDesignations(event: any) {
+    /* tslint:disable */
+    console.log(event)
+    /* tslint:enable */
+    this.loadingService.changeLoaderState(true)
+    // this.trainingPlanService.getDesignations().subscribe((res: any) => {
+    //   if (this.searchText) {
+    //     const resArr = res.result.response.content.filter((ditem: any) => {
+    //       if (ditem.name.toLowerCase().includes(this.searchText.toLowerCase())) {
+    //         return ditem
+    //       }
+    //     })
+    //     if (this.tpdsSvc.trainingPlanAssigneeData.data) {
+    //       const finArr = this.tpdsSvc.trainingPlanAssigneeData.data.filter((sitem: any) => {
+    //         if (sitem && sitem.selected) {
+    //           return sitem
+    //         }
+    //       })
+    //       this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: _.concat(finArr, resArr) }
+    //     } else {
+    //       this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: resArr }
+    //     }
+
+    //   } else {
+    //     this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: res.result.response.content }
+    //     this.designationList = res.result.response.content
+    //   }
+
+    //   this.handleApiData.emit(true)
+    //   this.loadingService.changeLoaderState(false)
+    // })
+  }
+
+  searchData() {
+    switch (this.selectedDropDownValue) {
+      case 'Course':
+      case 'Standalone Assessment':
+      case 'Program':
+      case 'Blended program':
+      case 'Curated program':
+      case 'Moderated Course':
+        this.getContent(this.selectedDropDownValue)
+        break
+      case 'Designation':
+        this.getDesignations(this.selectedDropDownValue)
+        break
+      case 'CustomUser':
+        this.getCustomUsers(this.selectedDropDownValue)
+        break
+      case 'AllUser':
+        this.getAllUsers(this.selectedDropDownValue)
+        break
+    }
+  }
+
+  // getFilterData(event: any) {
+  //   if (this.from === 'content') {
+  //     this.getContent(this.selectedDropDownValue, event)
+  //   } else {
+  //     this.getCustomUsers(this.selectedDropDownValue, event)
+  //   }
+  // }
+
+  resetPageIndex() {
+    this.pageIndex = 0
+    this.pageSize = 20
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index 78ed0064b..b51862920 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -70,6 +70,7 @@ import { ReportsVideoComponent } from './routes/reports-video/reports-video.comp
 import { ProfleApprovalBulkUploadComponent } from './routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component'
 import { LeftMenuModule } from '../../head/left-menu/left-menu.module'
 import { UserCardComponent } from './components/user-cards/user-card.component'
+import { SearchComponent } from './components/search/search.component'
 @NgModule({
   declarations: [
     HomeComponent,
@@ -98,6 +99,7 @@ import { UserCardComponent } from './components/user-cards/user-card.component'
     ReportsVideoComponent,
     ProfleApprovalBulkUploadComponent,
     UserCardComponent,
+    SearchComponent,
   ],
   imports: [
     CommonModule,
@@ -160,6 +162,7 @@ import { UserCardComponent } from './components/user-cards/user-card.component'
     BudgetproofspopupComponent,
     ReportsVideoComponent,
     UserCardComponent,
+    SearchComponent,
   ],
   providers: [
     // CKEditorService,
diff --git a/project/ws/app/src/lib/routes/home/home.rounting.module.ts b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
index 381d9b00d..882c3f3a4 100644
--- a/project/ws/app/src/lib/routes/home/home.rounting.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
@@ -61,7 +61,7 @@ const routes: Routes = [
       },
       {
         path: 'users',
-        redirectTo: 'users/active',
+        redirectTo: 'users/allusers',
         component: UsersViewComponent,
         resolve: {
           usersList: UsersListResolve,
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index dcd4ff10a..1b24ba3f1 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -50,20 +50,25 @@
                                       'ws-mat-accent-border font-medium':currentFilter !== 'upload'}" mat-button
             (click)="filter('upload'); tabTelemetry('upload', 2)" role="button">File uploads</a> -->
 
-          <a routerLink="/app/home/users/active" routerLinkActive="router-link-active" class="filter-option"
-            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'active','ws-mat-accent-border font-medium':currentFilter !== 'active'}"
-            mat-button (click)="filter('active'); tabTelemetry('active', 0)" role="button">All users</a>
+          <a routerLink="/app/home/users/allusers" routerLinkActive="router-link-active" class="filter-option"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'allusers','ws-mat-accent-border font-medium':currentFilter !== 'allusers'}"
+            mat-button (click)="filter('allusers'); tabTelemetry('allusers', 0)" role="button">All users
+            ({{activeUsersDataCount}})</a>
 
           <a routerLink="/app/home/users/verified" routerLinkActive="router-link-active" class="filter-option"
             [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'verified','ws-mat-accent-border font-medium':currentFilter !== 'verified'}"
-            mat-button (click)="filter('verified'); tabTelemetry('verified', 0)" role="button">Verified</a>
+            mat-button (click)="filter('verified'); tabTelemetry('verified', 0)" role="button">Verified
+            ({{verifiedUsersDataCount}})</a>
 
           <a routerLink="/app/home/users/nonverified" routerLinkActive="router-link-active" class="filter-option"
             [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'nonverified','ws-mat-accent-border font-medium':currentFilter !== 'nonverified'}"
-            mat-button (click)="filter('nonverified'); tabTelemetry('nonverified', 0)" role="button">Non-verified</a>
-          <!-- <a routerLink="/app/home/users/active" routerLinkActive="router-link-active" class="filter-option"
-            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'active','ws-mat-accent-border font-medium':currentFilter !== 'active'}"
-            mat-button (click)="filter('active'); tabTelemetry('active', 0)" role="button">Not my user (0)</a> -->
+            mat-button (click)="filter('nonverified'); tabTelemetry('nonverified', 0)" role="button">Non-verified
+            ({{nonverifiedUsersDataCount}})</a>
+
+          <a routerLink="/app/home/users/notmyuser" routerLinkActive="router-link-active" class="filter-option"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'notmyuser','ws-mat-accent-border font-medium':currentFilter !== 'notmyuser'}"
+            mat-button (click)="filter('notmyuser'); tabTelemetry('notmyuser', 0)" role="button">Not my user
+            ({{notmyuserUsersDataCount}})</a>
         </div>
       </div>
       <!-- <ws-widget-org-user-table-v2 [userId]="currentUser" [tableData]="tabledata" [data]="dataForTable"
@@ -71,7 +76,11 @@
                 (searchByEnterKey)="onEnterkySearch($event)" (pageChangeClick)="onPaginateChange($event)"
                 [showEditOnCondition]=true [totalRecords]="userDataTotalCount" [tabChangeIndex]="pageIndex">
               </ws-widget-org-user-table-v2> -->
-      <ng-container *ngIf="usersData && currentFilter === 'active'">
+      <div class="searchfilter">
+        <ws-app-searchuser></ws-app-searchuser>
+      </div>
+
+      <ng-container *ngIf="usersData && currentFilter === 'allusers'">
         <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [tableData]="tabledata"
           [usersData]="usersData" [totalRecords]="userDataTotalCount"
           [tabChangeIndex]="pageIndex"></ws-widget-user-card>
@@ -86,6 +95,12 @@
           [usersData]="usersData" [totalRecords]="userDataTotalCount"
           [tabChangeIndex]="pageIndex"></ws-widget-user-card>
       </ng-container>
+      <ng-container *ngIf="usersData && currentFilter === 'notmyuser'">
+        <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [tableData]="tabledata"
+          [usersData]="usersData" [totalRecords]="userDataTotalCount"
+          [tabChangeIndex]="pageIndex"></ws-widget-user-card>
+      </ng-container>
+
       <ng-container *ngIf="currentFilter === 'upload'">
         <ws-app-users-upload></ws-app-users-upload>
       </ng-container>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index ffb4ab6fa..46658c677 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -49,6 +49,12 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   activeUsersData!: any[]
   verifiedUsersData!: any[]
   nonverifiedUsersData!: any[]
+  notmyuserUsersData!: any[]
+
+  activeUsersDataCount?: number | 0
+  verifiedUsersDataCount?: number | 0
+  nonverifiedUsersDataCount?: number | 0
+  notmyuserUsersDataCount?: number | 0
   content: NsContent.IContent = {} as NsContent.IContent
   isMdoAdmin = false
 
@@ -68,7 +74,6 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     needUserMenus: true,
   }
   currentOffset = 0
-  userDataTotalCount?: number | 0
   limit = 20
   pageIndex = 0
   searchQuery = ''
@@ -105,26 +110,28 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   }
   ngOnInit() {
     this.rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
-    this.currentFilter = this.route.snapshot.params['tab'] || 'active'
+    this.currentFilter = this.route.snapshot.params['tab'] || 'allusers'
     this.searchQuery = ''
     if (this.configSvc.unMappedUser && this.configSvc.unMappedUser.roles) {
       this.isMdoAdmin = this.configSvc.unMappedUser.roles.includes('MDO_ADMIN')
     }
     this.filterData('')
 
+    this.activeUsers('')
+    this.verifiedUsers('')
+    this.inActiveUsers('')
+    this.notmyUsers('')
+
     this.reportsNoteList = [
-      // tslint:disable-next-line: max-line-length
       `Easily create users individually or in bulk.`,
-      // tslint:disable-next-line: max-line-length
       `Edit any user profile within your organization.`,
-      // tslint:disable-next-line: max-line-length
       `Verified Users: Users with all their primary fields approved.`,
       // tslint:disable-next-line: max-line-length
       `Non-Verified Users: Users whose one or more primary fields are yet to be approved. You can help by reviewing and approving their requests.`,
-      // tslint:disable-next-line: max-line-length
       `Not My User: Remove a user from your organization with a simple click.`,
     ]
   }
+
   sanitizeHtml(html: string): SafeHtml {
     return this.sanitizer.bypassSecurityTrustHtml(html)
   }
@@ -163,36 +170,40 @@ export class UsersViewComponent implements OnInit, OnDestroy {
 
   get dataForTable() {
     switch (this.currentFilter) {
-      case 'active':
+      case 'allusers':
         return this.activeUsersData
       case 'verified':
         return this.verifiedUsersData
       case 'nonverified':
         return this.nonverifiedUsersData
+      case 'notmyuser':
+        return this.notmyuserUsersData
       // case 'blocked':
       //   return this.blockedUsers()
       default:
         return []
     }
-
   }
+
   filterData(query: string) {
-    if (this.currentFilter === 'active') {
+    if (this.currentFilter === 'allusers') {
       this.activeUsers(query)
     } else if (this.currentFilter === 'verified') {
       this.verifiedUsers(query)
     } else if (this.currentFilter === 'nonverified') {
       this.inActiveUsers(query)
+    } else if (this.currentFilter === 'notmyuser') {
+      this.notmyUsers(query)
     }
   }
 
   activeUsers(query: string) {
     this.loaderService.changeLoad.next(true)
     const activeUsersData: any[] = []
-    const status = this.currentFilter === 'active' ? 1 : 0
+    const status = this.currentFilter === 'allusers' ? 1 : 0
     this.currentOffset = this.limit * ((this.pageIndex + 1) - 1)
     this.usersService.getAllKongUsers(this.rootOrgId, status, this.limit, this.currentOffset, query).subscribe(data => {
-      this.userDataTotalCount = data.result.response.count
+      this.activeUsersDataCount = data.result.response.count
       this.usersData = data.result.response
       if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
         _.filter(this.usersData.content, { isDeleted: false }).forEach((user: any) => {
@@ -244,10 +255,10 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   verifiedUsers(query: string) {
     this.loaderService.changeLoad.next(true)
     const verifiedUsers: any[] = []
-    const status = this.currentFilter === 'active' ? 1 : 0
+    const status = this.currentFilter === 'allusers' ? 1 : 0
     this.currentOffset = this.limit * ((this.pageIndex + 1) - 1)
     this.usersService.getAllKongUsers(this.rootOrgId, status, this.limit, this.currentOffset, query).subscribe(data => {
-      this.userDataTotalCount = data.result.response.count
+      this.verifiedUsersDataCount = data.result.response.count
       this.usersData = data.result.response
       if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
         _.filter(this.usersData.content, { isDeleted: false }).forEach((user: any) => {
@@ -275,11 +286,11 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   inActiveUsers(query: string) {
     this.loaderService.changeLoad.next(true)
     const inactiveUsersData: any[] = []
-    const status = this.currentFilter === 'active' ? 1 : 0
+    const status = this.currentFilter === 'allusers' ? 1 : 0
     this.currentOffset = this.limit * ((this.pageIndex + 1) - 1)
     this.usersService.getAllKongUsers(this.rootOrgId, status, this.limit, this.currentOffset, query).subscribe(
       data => {
-        this.userDataTotalCount = data.result.response.count
+        this.nonverifiedUsersDataCount = data.result.response.count
         this.usersData = data.result.response
         if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
           _.filter(this.usersData.content, { isDeleted: true }).forEach((user: any) => {
@@ -305,28 +316,39 @@ export class UsersViewComponent implements OnInit, OnDestroy {
         this.nonverifiedUsersData = inactiveUsersData
         return this.nonverifiedUsersData
       })
-    // if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
-    //   _.filter(this.usersData.content, { isDeleted: true }).forEach((user: any) => {
-    //     // tslint:disable-next-line
-    //     const org = { roles: _.get(_.first(_.filter(user.organisations,
-    // { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') || [] }
-    //     inactiveUsersData.push({
-    //       fullname: user ? `${user.firstName} ` : null,
-    //       // fullname: user ? `${user.firstName} ${user.lastName}` : null,
-    //       email: user.personalDetails && user.personalDetails.primaryEmail ?
-    //         this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
-    //       role: org.roles || [],
-    //       userId: user.id,
-    //       active: !user.isDeleted,
-    //       blocked: user.blocked,
-    //       roles: _.join(_.map((org.roles || []), i => `<li>${i}</li>`), ''),
-    //       orgId: user.rootOrgId,
-    //       orgName: user.rootOrgName,
-    //       allowEditUser: this.showEditUser(org.roles),
-    //     })
-    //   })
-    // }
-    // return inactiveUsersData
+  }
+  notmyUsers(query: string) {
+    this.loaderService.changeLoad.next(true)
+    const notmyuserUsersData: any[] = []
+    const status = this.currentFilter === 'allusers' ? 1 : 0
+    this.currentOffset = this.limit * ((this.pageIndex + 1) - 1)
+    this.usersService.getAllKongUsers('', status, this.limit, this.currentOffset, query).subscribe(
+      data => {
+        this.notmyuserUsersDataCount = data.result.response.count
+        this.usersData = data.result.response
+        if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
+          _.filter(this.usersData.content, { isDeleted: true }).forEach((user: any) => {
+            // tslint:disable-next-line
+            const org = { roles: _.get(_.first(_.filter(user.organisations, { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') }
+            notmyuserUsersData.push({
+              fullname: user ? `${user.firstName}` : null,
+              // fullname: user ? `${user.firstName} ${user.lastName}` : null,
+              email: user.personalDetails && user.personalDetails.primaryEmail ?
+                this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
+              role: org.roles || [],
+              userId: user.id,
+              active: !user.isDeleted,
+              blocked: user.blocked,
+              roles: _.join(_.map((org.roles || []), i => `<li>${i}</li>`), ''),
+              orgId: user.rootOrgId,
+              orgName: user.rootOrgName,
+              allowEditUser: this.showEditUser(org.roles),
+            })
+          })
+        }
+        this.notmyuserUsersData = notmyuserUsersData
+        return this.nonverifiedUsersData
+      })
   }
 
   showEditUser(roles: any): boolean {
diff --git a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
index 1781b65cd..75cbf0acf 100644
--- a/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
+++ b/project/ws/app/src/lib/routes/users/routes/view-user/view-user.component.ts
@@ -277,7 +277,7 @@ export class ViewUserComponent implements OnInit, AfterViewInit {
             this.breadcrumbs = { titles: [{ title: 'Users', url: '/app/home/users' }, { title: this.userStatus, url: 'none' }, { title: 'MDO information', url: '/app/home/mdoinfo/leadership' }, { title: this.fullname, url: 'none' }] }
           } else {
             // tslint:disable-next-line:max-line-length
-            this.breadcrumbs = [{ title: 'Users', url: '/app/home/users/active' }, { title: this.userStatus, url: `/app/home/users/${this.userStatus.toLowerCase()}` }, { title: this.fullname, url: 'none' }]
+            this.breadcrumbs = [{ title: 'Users', url: '/app/home/users/allusers' }, { title: this.userStatus, url: `/app/home/users/${this.userStatus.toLowerCase()}` }, { title: this.fullname, url: 'none' }]
           }
         })
 

From f1ad9411743cffeaa7f52e861adde74f49a08a19 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Mon, 22 Apr 2024 23:51:35 +0530
Subject: [PATCH 537/887] Updated left menu & fixed scroll issue

---
 project/ws/app/src/lib/head/left-menu/left-menu.component.html | 2 +-
 project/ws/app/src/lib/head/left-menu/left-menu.component.scss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/head/left-menu/left-menu.component.html b/project/ws/app/src/lib/head/left-menu/left-menu.component.html
index d983976c6..34b8c2b25 100644
--- a/project/ws/app/src/lib/head/left-menu/left-menu.component.html
+++ b/project/ws/app/src/lib/head/left-menu/left-menu.component.html
@@ -17,7 +17,7 @@
 <ng-container *ngFor="let menu of menulist; let mi = index">
   <ng-container *ngIf="menu.subMenu">
     <mat-accordion [multi]="true">
-      <mat-expansion-panel class="menuPannel bg-gray-accordian" hideToggle="true" [expanded]="true" #example>
+      <mat-expansion-panel class="menuPannel bg-gray-accordian" hideToggle="true" [expanded]="false" #example>
         <mat-expansion-panel-header>
           <mat-panel-title>
             <mat-panel-description>
diff --git a/project/ws/app/src/lib/head/left-menu/left-menu.component.scss b/project/ws/app/src/lib/head/left-menu/left-menu.component.scss
index 9d20aa5a9..65d50131d 100644
--- a/project/ws/app/src/lib/head/left-menu/left-menu.component.scss
+++ b/project/ws/app/src/lib/head/left-menu/left-menu.component.scss
@@ -5,7 +5,7 @@
   border: 1px #F0F3F4 solid;
   width: 99%;
   height: 99%;
-  overflow: hidden;
+  overflow: auto;
   -ms-overflow-style: none;
   scrollbar-width: none;
 }

From bac0051a4471ec0dd62687f82ebc984b1afde9bd Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Mon, 22 Apr 2024 23:54:02 +0530
Subject: [PATCH 538/887] Fxied notes section icon issue in approvals page

---
 .../lib/routes/home/routes/approvals/approvals.component.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.html
index 9e37d9a91..cad237433 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.html
@@ -19,7 +19,7 @@
           <ng-container *ngFor="let note of reportsNoteList">
             <div class="flex gap-4 mb-4">
               <div>
-                <mat-icon class="infoIcon">info_outlined</mat-icon>
+                <mat-icon class="infoIcon">error_outline</mat-icon>
               </div>
               <div [innerHTML]="sanitizeHtml(note)"></div>
             </div>

From e54f11c1619ef053c638cda3624d6faf45347837 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Tue, 23 Apr 2024 00:04:18 +0530
Subject: [PATCH 539/887] Integrated search & pagination for all users tab

---
 .../components/search/search.component.html   |   2 +-
 .../components/search/search.component.ts     | 272 ++-----------
 .../user-cards/user-card.component.html       |  69 +++-
 .../user-cards/user-card.component.ts         |  41 +-
 .../users-view/users-view.component.html      |  33 +-
 .../routes/users-view/users-view.component.ts | 382 +++---------------
 .../routes/users/services/users.service.ts    |   3 +-
 7 files changed, 175 insertions(+), 627 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.html b/project/ws/app/src/lib/routes/home/components/search/search.component.html
index 14575dbd4..ee235f381 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.html
@@ -2,7 +2,7 @@
     <div class="search flex margin-right-m" [ngClass]="{'disable': isContentLive}">
         <div class="rsearch flex w-full"><mat-icon
                 class="color-60 search-icon mat-icon notranslate material-icons mat-icon-no-color">search</mat-icon>
-            <input class="sinput color-60 w-full" [(ngModel)]="searchText" (keyup.enter)="searchData()" label=""
+            <input class="sinput color-60 w-full" [(ngModel)]="searchText" (keyup.enter)="searchData($event)" label=""
                 placeholder="Select" type="Standard" [ngClass]="{'disable': isContentLive}">
         </div>
     </div>
diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.ts b/project/ws/app/src/lib/routes/home/components/search/search.component.ts
index 057ed3e99..9056c4751 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.ts
@@ -1,63 +1,39 @@
 import { Component, EventEmitter, Input, Output, OnInit } from '@angular/core'
 // import { ActivatedRoute } from '@angular/router'
-// import { TrainingPlanService } from './../../services/traininig-plan.service'
-// import { TrainingPlanDataSharingService } from './../../services/training-plan-data-share.service'
 /* tslint:disable */
 import _ from 'lodash'
 /* tslint:enable */
 import { LoaderService } from '../../../../../../../../../src/app/services/loader.service'
+import { UsersService } from '../../../users/services/users.service'
 @Component({
   selector: 'ws-app-searchuser',
   templateUrl: './search.component.html',
   styleUrls: ['./search.component.scss'],
 })
 export class SearchComponent implements OnInit {
-  @Input() categoryData: any = []
   @Input() from: any = ''
   @Output() handleApiData = new EventEmitter()
   searchText = ''
   filterVisibilityFlag = false
   clearFilter = false
-  selectedDropDownValue: any
   designationList: any[] = []
   pageIndex = 0
   pageSize = 20
   isContentLive = false
   constructor(
-    // private trainingPlanService: TrainingPlanService,
     // private route: ActivatedRoute,
-    // public tpdsSvc: TrainingPlanDataSharingService,
+    private usersSvc: UsersService,
     private loadingService: LoaderService
   ) { }
 
   ngOnInit() {
-    // this.tpdsSvc.handleContentPageChange.subscribe((pageData: any) => {
+    // this.usersSvc.handleContentPageChange.subscribe((pageData: any) => {
     //   if (pageData) {
     //     this.pageIndex = pageData.pageIndex
     //     this.pageSize = pageData.pageSize
-    //     this.getContent(this.selectedDropDownValue)
+    //     this.getContent()
     //   }
-
     // })
-
-    // this.tpdsSvc.getFilterDataObject.subscribe(event => {
-    //   if (this.selectedDropDownValue === 'Course' ||
-    //     this.selectedDropDownValue === 'Standalone Assessment' ||
-    //     this.selectedDropDownValue === 'Program' ||
-    //     this.selectedDropDownValue === 'Blended program' ||
-    //     this.selectedDropDownValue === 'Curated program' ||
-    //     this.selectedDropDownValue === 'Moderated Course'
-    //   ) {
-    //     this.getContent(this.selectedDropDownValue, event)
-    //   }
-    //   if (this.selectedDropDownValue === 'CustomUser') {
-    //     this.getCustomUsers(this.selectedDropDownValue, event)
-    //   }
-
-    // })
-    // if (this.tpdsSvc.trainingPlanStepperData.status && this.tpdsSvc.trainingPlanStepperData.status.toLowerCase() === 'live') {
-    //   this.isContentLive = true
-    // }
   }
 
   openFilter() {
@@ -79,240 +55,42 @@ export class SearchComponent implements OnInit {
     // }
   }
 
-  handleCategorySelection(event: any) {
-    this.selectedDropDownValue = event
-    switch (this.from) {
-      case 'content':
-        // if(this.tpdsSvc.trainingPlanContentData && this.tpdsSvc.trainingPlanContentData.data) {
-        //   this.tpdsSvc.trainingPlanContentData.data = []
-        // }
-        /* tslint:disable */
-        event = !event ? 'Course' : event
-        /* tslint:enable */
-        this.searchText = ''
-        // this.tpdsSvc.clearFilter.next({ from: 'content', status: true })
-        this.resetPageIndex()
-        this.getContent(event)
-        break
-      case 'assignee':
-        // if(this.tpdsSvc.trainingPlanAssigneeData && this.tpdsSvc.trainingPlanAssigneeData.data) {
-        //   this.tpdsSvc.trainingPlanAssigneeData.data = []
-        //   this.tpdsSvc.trainingPlanStepperData['assignmentTypeInfo']=[]
-        // }
-        /* tslint:disable */
-        // this.tpdsSvc.clearFilter.next({ from: 'assignee', status: true })
-        this.resetPageIndex()
-        this.searchText = ''
-        event = !event ? 'Designation' : event
-        /* tslint:enable */
-        if (event === 'Designation') {
-          this.getDesignations(event)
-        } else if (event === 'CustomUser') {
-          this.getCustomUsers(event)
-        } else if (event === 'AllUser') {
-          this.getAllUsers(event)
-        }
-        break
-    }
-  }
-
-  getContent(contentType: any, applyFilterObj?: any) {
-    this.loadingService.changeLoaderState(true)
-    if (contentType) {
-      if (contentType === 'Moderated Course') {
-        // this.tpdsSvc.moderatedCourseSelectStatus.next(true)
-      }
-      if (applyFilterObj && Object.keys(applyFilterObj).length) {
-        this.searchText = ''
-      }
-      if (this.searchText) {
-        // this.tpdsSvc.clearFilter.next({ from: 'content', status: true })
-        /* tslint:disable */
-        applyFilterObj = {}
-        /* tslint:enable */
-      }
-      // const filterObj = {
-      //   request: {
-      //     secureSettings: contentType === 'Moderated Course' ? true : false, // for moderated course
-      //     filters: {
-      //       primaryCategory: [contentType === 'Moderated Course' ? 'Course' : contentType],
-      //       /* tslint:disable */
-      //       organisation: applyFilterObj && applyFilterObj['providers'] && applyFilterObj['providers'].length ? applyFilterObj['providers'] : [],
-      //       'competencies_v5.competencyArea': applyFilterObj && applyFilterObj['competencyArea'] && applyFilterObj['competencyArea'].length ? applyFilterObj['competencyArea'] : [],
-      //       'competencies_v5.competencyTheme': applyFilterObj && applyFilterObj['competencyTheme'] && applyFilterObj['competencyTheme'].length ? applyFilterObj['competencyTheme'] : [],
-      //       'competencies_v5.competencySubTheme': applyFilterObj && applyFilterObj['competencySubTheme'] && applyFilterObj['competencySubTheme'].length ? applyFilterObj['competencySubTheme'] : [],
-      //       /* tslint:enable */
-      //     },
-      //     offset: this.pageIndex,
-      //     limit: this.pageSize,
-      //     query: (this.searchText) ? this.searchText : '',
-      //     sort_by: { lastUpdatedOn: 'desc' },
-      //     fields: ['name', 'appIcon', 'instructions', 'description', 'purpose', 'mimeType',
-      //       'gradeLevel', 'identifier', 'medium', 'resourceType',
-      //       'primaryCategory', 'contentType', 'channel', 'organisation', 'trackable', 'posterImage',
-      //       'idealScreenSize', 'learningMode', 'creatorLogo', 'duration', 'programDuration',
-      //       'version', 'avgRating', 'competencies_v5', 'secureSettings'],
-      //   },
-      // }
-      // this.trainingPlanService.getAllContent(filterObj).subscribe((res: any) => {
-      //   let finResult = []
-      //   if (this.tpdsSvc.trainingPlanContentData.data && this.tpdsSvc.trainingPlanContentData.data.content) {
-      //     finResult = this.tpdsSvc.trainingPlanContentData.data.content.filter((sitem: any) => {
-      //       if (sitem) {
-      //         return sitem.selected
-      //       }
-      //     })
-      //   }
-      //   if (res && res.content) {
-      //     const result = { count: res.count, content: _.uniqBy(_.concat(finResult, res.content), 'identifier') }
-      //     this.tpdsSvc.trainingPlanContentData = { category: contentType, data: result, count: res.count }
-
-      //   } else {
-      //     const result = { count: res.count, content: _.uniqBy(_.concat(finResult, []), 'identifier') }
-      //     this.tpdsSvc.trainingPlanContentData = { category: contentType, data: result, count: res.count }
-      //   }
-      //   this.handleApiData.emit(true)
-      //   this.loadingService.changeLoaderState(false)
-      // })
-    }
-
-  }
-
-  getCustomUsers(event: any, applyFilterObj?: any) {
+  getContent(applyFilterObj?: any) {
     this.loadingService.changeLoaderState(true)
-    /* tslint:disable */
-    console.log(event)
-    /* tslint:enable */
-    // const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
     if (applyFilterObj && Object.keys(applyFilterObj).length) {
       this.searchText = ''
     }
     if (this.searchText) {
-      // this.tpdsSvc.clearFilter.next({ from: 'assignee', status: true })
+      // this.tpdsSvc.clearFilter.next({ from: 'content', status: true })
       /* tslint:disable */
       applyFilterObj = {}
       /* tslint:enable */
     }
-    // const filterObj = {
-    //   request: {
-    //     query: (this.searchText) ? this.searchText : '',
-    //     filters: {
-    //       rootOrgId,
-    //       status: 1,
-    //       /* tslint:disable */
-    //       'profileDetails.professionalDetails.designation': applyFilterObj && applyFilterObj.designation && applyFilterObj.designation.length ? applyFilterObj.designation : [],
-    //       'profileDetails.professionalDetails.group': applyFilterObj && applyFilterObj.group && applyFilterObj.group.length ? applyFilterObj.group : [],
-    //       /* tslint:disable */
-    //     },
-    //     fields: [
-    //       'userId',
-    //       'firstName',
-    //       'rootOrgName',
-    //       'profileDetails',
-    //       'organisations',
-    //     ],
-    //     limit: 10000,
-    //     offset: 0,
-    //   },
-    // }
-    // this.trainingPlanService.getCustomUsers(filterObj).subscribe((res: any) => {
-    //   if (this.tpdsSvc.trainingPlanAssigneeData.data && this.tpdsSvc.trainingPlanAssigneeData.data && this.tpdsSvc.trainingPlanAssigneeData.data.content) {
-    //     const finArr = this.tpdsSvc.trainingPlanAssigneeData.data.content.filter((sitem: any) => {
-    //       if (sitem && sitem.selected) {
-    //         return sitem
-    //       }
-    //     })
-    //     this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: _.uniqBy(_.concat(finArr, res.content), 'userId') }
-    //   } else if (this.tpdsSvc.trainingPlanAssigneeData.data && this.tpdsSvc.trainingPlanAssigneeData.data) {
-    //     const finArr = this.tpdsSvc.trainingPlanAssigneeData.data.filter((sitem: any) => {
-    //       if (sitem && sitem.selected) {
-    //         return sitem
-    //       }
-    //     })
-    //     this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: _.uniqBy(_.concat(finArr, res.content), 'userId') }
-    //   } else {
-    //     this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: res.content }
-    //   }
-    //   this.handleApiData.emit(true)
-    //   this.loadingService.changeLoaderState(false)
-    // }, (_error: any) => {
-    // })
-  }
-
-  getAllUsers(_event: any) {
-    // this.tpdsSvc.trainingPlanAssigneeData = { category: _event, data: [_event] }
-    // this.tpdsSvc.trainingPlanStepperData.assignmentTypeInfo = [
-    //   'AllUser',
-    // ]
-    this.handleApiData.emit(true)
-  }
-
-  getDesignations(event: any) {
-    /* tslint:disable */
-    console.log(event)
-    /* tslint:enable */
-    this.loadingService.changeLoaderState(true)
-    // this.trainingPlanService.getDesignations().subscribe((res: any) => {
-    //   if (this.searchText) {
-    //     const resArr = res.result.response.content.filter((ditem: any) => {
-    //       if (ditem.name.toLowerCase().includes(this.searchText.toLowerCase())) {
-    //         return ditem
-    //       }
-    //     })
-    //     if (this.tpdsSvc.trainingPlanAssigneeData.data) {
-    //       const finArr = this.tpdsSvc.trainingPlanAssigneeData.data.filter((sitem: any) => {
-    //         if (sitem && sitem.selected) {
-    //           return sitem
-    //         }
-    //       })
-    //       this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: _.concat(finArr, resArr) }
-    //     } else {
-    //       this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: resArr }
-    //     }
-
-    //   } else {
-    //     this.tpdsSvc.trainingPlanAssigneeData = { category: event, data: res.result.response.content }
-    //     this.designationList = res.result.response.content
-    //   }
-
-    //   this.handleApiData.emit(true)
-    //   this.loadingService.changeLoaderState(false)
-    // })
-  }
-
-  searchData() {
-    switch (this.selectedDropDownValue) {
-      case 'Course':
-      case 'Standalone Assessment':
-      case 'Program':
-      case 'Blended program':
-      case 'Curated program':
-      case 'Moderated Course':
-        this.getContent(this.selectedDropDownValue)
-        break
-      case 'Designation':
-        this.getDesignations(this.selectedDropDownValue)
-        break
-      case 'CustomUser':
-        this.getCustomUsers(this.selectedDropDownValue)
-        break
-      case 'AllUser':
-        this.getAllUsers(this.selectedDropDownValue)
-        break
+    const filterObj = {
+      request: {
+        filters: {},
+        offset: this.pageIndex,
+        limit: this.pageSize,
+        query: (this.searchText) ? this.searchText : '',
+        sort_by: { lastUpdatedOn: 'desc' },
+        fields: [],
+      },
     }
+    this.usersSvc.getAllUsers(filterObj).subscribe((res: any) => {
+      if (res) {
+        this.handleApiData.emit(true)
+        this.loadingService.changeLoaderState(false)
+      }
+    })
   }
 
-  // getFilterData(event: any) {
-  //   if (this.from === 'content') {
-  //     this.getContent(this.selectedDropDownValue, event)
-  //   } else {
-  //     this.getCustomUsers(this.selectedDropDownValue, event)
-  //   }
-  // }
+  searchData(event: any) {
+    this.searchText = event.target.value
+    this.handleApiData.emit(this.searchText)
+  }
 
   resetPageIndex() {
     this.pageIndex = 0
     this.pageSize = 20
   }
-
 }
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 782895b7b..855bcac81 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -1,3 +1,7 @@
+<div class="searchfilter">
+  <ws-app-searchuser (handleApiData)="onSearch($event)"></ws-app-searchuser>
+</div>
+
 <div>
   <mat-accordion>
     <mat-expansion-panel class="user-card" *ngFor="let user of usersData.content">
@@ -11,9 +15,19 @@
           <div class="username display-inline-block" *ngIf="user.profileDetails && user.profileDetails.personalDetails">
             <div class="mat-subheading-2 display-inline-block margin-remove">
               {{user.profileDetails.personalDetails.firstname}}
-              <span class="status-label margin-left-s verified">Verified <mat-icon>check_circle</mat-icon></span>
+              <span class="status-label margin-left-s verified" *ngIf="currentFilter !== 'nonverified'">Verified
+                <mat-icon>check_circle</mat-icon></span>
+              <span class="status-label margin-left-s nonverified" *ngIf="currentFilter === 'nonverified'">Non-verified
+                <mat-icon>check_circle</mat-icon></span>
             </div>
-            <div class="mat-body-2 ws-mat-black40-text">Product Manager</div>
+            <div class="mat-body-2 ws-mat-black40-text">{{user.profileDetails && user.profileDetails.professionalDetails
+              &&
+              user.profileDetails.professionalDetails.designation ?
+              user.profileDetails.professionalDetails.designation : '-'}}</div>
+            <!-- <div class="mat-body-2 ws-mat-black40-text" *ngIf="currentFilter !== 'nonverified'">Verified date:
+              19/04/2024</div>
+            <div class="mat-body-2 ws-mat-black40-text" *ngIf="currentFilter === 'nonverified'">Non-verified date:
+              19/04/2024</div> -->
           </div>
           <div class="username display-inline-block" *ngIf="!user.profileDetails">
             <div class="mat-subheading-2 display-inline-block margin-remove">
@@ -23,19 +37,26 @@
               <span class="status-label margin-left-s nonverified" *ngIf="currentFilter === 'nonverified'">Non-verified
                 <mat-icon>check_circle</mat-icon></span>
             </div>
-            <div class="mat-body-2 ws-mat-black40-text">Product Manager</div>
+            <div class="mat-body-2 ws-mat-black40-text">{{user.profileDetails && user.profileDetails.professionalDetails
+              &&
+              user.profileDetails.professionalDetails.designation ?
+              user.profileDetails.professionalDetails.designation : '-'}}</div>
+            <!-- <div class="mat-body-2 ws-mat-black40-text" *ngIf="currentFilter !== 'nonverified'">Verified date:
+              19/04/2024</div>
+            <div class="mat-body-2 ws-mat-black40-text" *ngIf="currentFilter === 'nonverified'">Non-verified date:
+              19/04/2024</div> -->
           </div>
         </div>
-        <!-- <div class="float-right">
+        <div class="float-right">
           <div class="button margin-top-xs mat-body" (click)="editUser(user)"><mat-icon>edit</mat-icon> Edit</div>
-        </div> -->
+        </div>
       </mat-expansion-panel-header>
 
       <div class="panel-body" *ngIf="user.editUser">
         <div class="inner-body">
           Primary Details <mat-icon class="ws-mat-black40-text">info_outline</mat-icon>
           <form [formGroup]="updateUserDataForm" class="margin-top-m">
-            <mat-grid-list cols="2" rowHeight="100px">
+            <mat-grid-list cols="2" rowHeight="60px">
               <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                 <label class="appr-text-label required">Designation</label>
                 <mat-select class="appr-text-field" #designation formControlName="designation" i18n-placeholder
@@ -64,7 +85,7 @@
           Other Details <mat-icon class="ws-mat-black40-text">info_outline</mat-icon>
 
           <form [formGroup]="updateUserDataForm" class="margin-top-m">
-            <mat-grid-list cols="3" rowHeight="100px">
+            <mat-grid-list cols="3" rowHeight="60px">
               <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                 <label class="appr-text-label requird">Employee ID</label>
                 <input type="text" [value]="" [disabled]="true" class="appr-text-field">
@@ -246,17 +267,19 @@
             <span class="font-bold">Primary Details</span> <mat-icon
               class="ws-mat-black40-text infoicon">info_outline</mat-icon>
           </div>
-          <mat-grid-list cols="2" rowHeight="100px">
+          <mat-grid-list cols="2" rowHeight="60px">
             <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
               <label class="view-text-label">Designation</label>
-              <p>{{user.profileDetails && user.profileDetails.professionalDetails ?
+              <p>{{user.profileDetails && user.profileDetails.professionalDetails &&
+                user.profileDetails.professionalDetails.designation ?
                 user.profileDetails.professionalDetails.designation : '-'}}</p>
 
             </mat-grid-tile>
 
             <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
               <label class="view-text-label">Group</label>
-              <p>{{user.profileDetails && user.profileDetails.additionalProperties ?
+              <p>{{user.profileDetails && user.profileDetails.additionalProperties &&
+                user.profileDetails.additionalProperties.group ?
                 user.profileDetails.additionalProperties.group : '-'}}</p>
 
             </mat-grid-tile>
@@ -269,7 +292,7 @@
               class="ws-mat-black40-text infoicon">info_outline</mat-icon>
           </div>
 
-          <mat-grid-list cols="4" rowHeight="100px">
+          <mat-grid-list cols="4" rowHeight="60px">
             <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
               <label class="view-text-label">Employee ID</label>
               <p>{{user.empID ? user.empID : '-'}}</p>
@@ -289,38 +312,44 @@
 
             <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
               <label class="view-text-label">Gender</label>
-              <p>{{user.profileDetails && user.profileDetails.personalDetails ?
+              <p>{{user.profileDetails && user.profileDetails.personalDetails &&
+                user.profileDetails.personalDetails.gender ?
                 user.profileDetails.personalDetails.gender : '-'}}</p>
 
             </mat-grid-tile>
 
             <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
               <label class="view-text-label">Date Of Birth</label>
-              <p>{{user.profileDetails && user.profileDetails.personalDetails ? user.profileDetails.personalDetails.dob
+              <p>{{user.profileDetails && user.profileDetails.personalDetails && user.profileDetails.personalDetails.dob
+                ? user.profileDetails.personalDetails.dob
                 : '-'}}</p>
             </mat-grid-tile>
 
             <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
               <label class="view-text-label">Mother Tongue</label>
-              <p>{{user.profileDetails && user.profileDetails.personalDetails ?
+              <p>{{user.profileDetails && user.profileDetails.personalDetails &&
+                user.profileDetails.personalDetails.domicileMedium ?
                 user.profileDetails.personalDetails.domicileMedium : '-'}}</p>
             </mat-grid-tile>
 
             <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
               <label class="view-text-label">Category</label>
-              <p>{{user.profileDetails && user.profileDetails.personalDetails ?
+              <p>{{user.profileDetails && user.profileDetails.personalDetails &&
+                user.profileDetails.personalDetails.category ?
                 user.profileDetails.personalDetails.category : '-'}}</p>
             </mat-grid-tile>
 
             <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
               <label class="view-text-label">Pay Band</label>
-              <p>{{user.profileDetails && user.profileDetails.employmentDetails ?
+              <p>{{user.profileDetails && user.profileDetails.employmentDetails &&
+                user.profileDetails.employmentDetails.payType ?
                 user.profileDetails.employmentDetails.payType : '-'}}</p>
             </mat-grid-tile>
 
             <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
               <label class="view-text-label">Office Pin Code</label>
-              <p>{{user.profileDetails && user.profileDetails.employmentDetails ?
+              <p>{{user.profileDetails && user.profileDetails.employmentDetails &&
+                user.profileDetails.employmentDetails.pinCode ?
                 user.profileDetails.employmentDetails.pinCode : '-'}}</p>
             </mat-grid-tile>
 
@@ -332,6 +361,7 @@
             <mat-grid-tile [colspan]="2" [rowspan]="1" class="input-wrapper">
               <label class="view-text-label">Tags</label>
               <div *ngIf="user.profileDetails && user.profileDetails.additionalProperties &&
+              user.profileDetails.additionalProperties.tag &&
               user.profileDetails.additionalProperties.tag.length > 0">
                 <ul class="tagslist">
                   <li *ngFor="let t of user.profileDetails.additionalProperties.tag">{{t}}</li>
@@ -355,4 +385,9 @@
       </div>
     </mat-expansion-panel>
   </mat-accordion>
+</div>
+
+<div class="flex flex-row justify-center">
+  <mat-paginator [pageSize]="pageSize" [length]="totalRecords" [pageSizeOptions]="[20,30,40]"
+    (page)="onChangePage($event)"></mat-paginator>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 2045fb6a4..686b61b24 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -1,7 +1,7 @@
-import { Component, Input, OnInit } from '@angular/core'
+import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'
 import { FormGroup, FormControl, Validators } from '@angular/forms'
 import { UsersService } from '../../../users/services/users.service'
-import { MatChipInputEvent } from '@angular/material'
+import { MatChipInputEvent, MatPaginator, PageEvent } from '@angular/material'
 import { COMMA, ENTER } from '@angular/cdk/keycodes'
 // tslint:disable-next-line
 import _ from 'lodash'
@@ -21,6 +21,14 @@ export class UserCardComponent implements OnInit {
   @Input() tabChangeIndex: any
   @Input() currentFilter: any
 
+  @Output() paginationData = new EventEmitter()
+  @Output() searchByEnterKey = new EventEmitter()
+
+  @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator | any
+  startIndex = 0
+  lastIndex = 20
+  pageSize = 20
+
   userStatus: any
   rolesList: any = []
   rolesObject: any = []
@@ -48,7 +56,7 @@ export class UserCardComponent implements OnInit {
   }
 
   ngOnInit() {
-    this.currentFilter = this.route.snapshot.params['tab'] || 'active'
+    this.currentFilter = this.route.snapshot.params['tab'] || 'allusers'
     // this.init()
   }
 
@@ -66,11 +74,14 @@ export class UserCardComponent implements OnInit {
   }
 
   editUser(user: any) {
-    user.editUser = true
+    this.usersData.content.forEach((u: any) => {
+      if (u.userId === user.userId && user.editUser === false) {
+        u.editUser = !u.editUser
+      }
+    })
   }
 
   getUerData(user: any) {
-    // console.log('user', user)
     user.editUser = false
     const profileDataAll = user
     this.userStatus = profileDataAll.isDeleted ? 'Inactive' : 'Active'
@@ -80,15 +91,12 @@ export class UserCardComponent implements OnInit {
 
     this.roleservice.getAllRoles().subscribe((data: any) => {
       const parseRoledata = JSON.parse(data.result.response.value)
-      // console.log('parseRoledata', parseRoledata)
       this.orgTypeList = parseRoledata.orgTypeList
-      // console.log('this.orgTypeList', this.orgTypeList)
 
       // New code for roles
       for (let i = 0; i < this.orgTypeList.length; i += 1) {
         if (this.orgTypeList[i].name === 'MDO') {
           _.each(this.orgTypeList[i].roles, rolesObject => {
-            // console.log('------------------------', rolesObject)
             if (this.isMdoAdmin) {
               if (rolesObject === 'PUBLIC') {
                 this.uniqueRoles.push({
@@ -112,23 +120,17 @@ export class UserCardComponent implements OnInit {
           })
         }
       }
-
-      // console.log('uniqueRoles', this.uniqueRoles)
-
       this.uniqueRoles.forEach((role: any) => {
         if (!this.rolesList.some((item: any) => item.roleName === role.roleName)) {
           this.rolesList.push(role)
         }
       })
-      // console.log('rolesList', this.rolesList)
       const usrRoles = profileDataAll.roles
       usrRoles.forEach((role: any) => {
         this.orguserRoles.push(role)
         this.modifyUserRoles(role)
       })
-      // console.log('orguserRoles', this.orguserRoles)
     })
-
   }
 
   getUseravatarName(user: any) {
@@ -191,4 +193,15 @@ export class UserCardComponent implements OnInit {
       newobj.push(reqObj)
     })
   }
+
+  onChangePage(pe: PageEvent) {
+    this.startIndex = (pe.pageIndex) * pe.pageSize
+    this.lastIndex = pe.pageSize
+    this.paginationData.emit({ pageIndex: this.startIndex, pageSize: pe.pageSize })
+    // this.startIndex = this.pageIndex
+  }
+
+  onSearch(event: any) {
+    this.searchByEnterKey.emit(event)
+  }
 }
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index 1b24ba3f1..c9206e9fc 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -19,7 +19,7 @@
           <ng-container *ngFor="let note of reportsNoteList">
             <div class="flex gap-4 mb-4">
               <div>
-                <mat-icon class="infoIcon">info_outlined</mat-icon>
+                <mat-icon class="infoIcon">error_outline</mat-icon>
               </div>
               <div [innerHTML]="sanitizeHtml(note)"></div>
             </div>
@@ -76,29 +76,30 @@
                 (searchByEnterKey)="onEnterkySearch($event)" (pageChangeClick)="onPaginateChange($event)"
                 [showEditOnCondition]=true [totalRecords]="userDataTotalCount" [tabChangeIndex]="pageIndex">
               </ws-widget-org-user-table-v2> -->
-      <div class="searchfilter">
-        <ws-app-searchuser></ws-app-searchuser>
-      </div>
 
       <ng-container *ngIf="usersData && currentFilter === 'allusers'">
-        <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [tableData]="tabledata"
-          [usersData]="usersData" [totalRecords]="userDataTotalCount"
-          [tabChangeIndex]="pageIndex"></ws-widget-user-card>
+        <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
+          [totalRecords]="activeUsersDataCount" [tabChangeIndex]="pageIndex"
+          (searchByEnterKey)="onEnterkySearch($event)"
+          (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
       </ng-container>
       <ng-container *ngIf="usersData && currentFilter === 'verified'">
-        <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [tableData]="tabledata"
-          [usersData]="usersData" [totalRecords]="userDataTotalCount"
-          [tabChangeIndex]="pageIndex"></ws-widget-user-card>
+        <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
+          [totalRecords]="verifiedUsersDataCount" [tabChangeIndex]="pageIndex"
+          (searchByEnterKey)="onEnterkySearch($event)"
+          (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
       </ng-container>
       <ng-container *ngIf="usersData && currentFilter === 'nonverified'">
-        <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [tableData]="tabledata"
-          [usersData]="usersData" [totalRecords]="userDataTotalCount"
-          [tabChangeIndex]="pageIndex"></ws-widget-user-card>
+        <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
+          [totalRecords]="nonverifiedUsersDataCount" [tabChangeIndex]="pageIndex"
+          (searchByEnterKey)="onEnterkySearch($event)"
+          (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
       </ng-container>
       <ng-container *ngIf="usersData && currentFilter === 'notmyuser'">
-        <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [tableData]="tabledata"
-          [usersData]="usersData" [totalRecords]="userDataTotalCount"
-          [tabChangeIndex]="pageIndex"></ws-widget-user-card>
+        <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
+          [totalRecords]="notmyuserUsersDataCount" [tabChangeIndex]="pageIndex"
+          (searchByEnterKey)="onEnterkySearch($event)"
+          (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
       </ng-container>
 
       <ng-container *ngIf="currentFilter === 'upload'">
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 46658c677..2167ec0b2 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -6,9 +6,8 @@ import { UsersService } from '../../../users/services/users.service'
 /* tslint:disable */
 import _ from 'lodash'
 /* tslint:enable */
-import { environment } from 'src/environments/environment'
-import { ITableData } from '@sunbird-cb/collection/lib/ui-org-table/interface/interfaces'
-import { MatSnackBar, PageEvent } from '@angular/material'
+// import { environment } from 'src/environments/environment'
+import { PageEvent } from '@angular/material'
 import { EventService } from '@sunbird-cb/utils'
 import { NsContent } from '@sunbird-cb/collection'
 import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
@@ -32,7 +31,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   /* tslint:disable */
   Math: any
   /* tslint:enable */
-  currentFilter = 'active'
+  currentFilter = 'allusers'
   filterPath = '/app/home/users'
   discussionList!: any
   discussProfileData!: any
@@ -60,19 +59,6 @@ export class UsersViewComponent implements OnInit, OnDestroy {
 
   reportsNoteList: string[] = []
 
-  tabledata: ITableData = {
-    actions: [],
-    columns: [
-      { displayName: 'Full name', key: 'fullname' },
-      { displayName: 'Email', key: 'email' },
-      { displayName: 'Roles', key: 'roles', isList: true },
-    ],
-    needCheckBox: false,
-    needHash: false,
-    sortColumn: 'fullName',
-    sortState: 'asc',
-    needUserMenus: true,
-  }
   currentOffset = 0
   limit = 20
   pageIndex = 0
@@ -82,7 +68,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     public dialog: MatDialog,
     private route: ActivatedRoute,
     private router: Router,
-    private snackBar: MatSnackBar,
+    // private snackBar: MatSnackBar,
     private events: EventService,
     private loaderService: LoaderService,
     private profileUtilSvc: ProfileV2UtillService,
@@ -110,17 +96,16 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   }
   ngOnInit() {
     this.rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
-    this.currentFilter = this.route.snapshot.params['tab'] || 'allusers'
     this.searchQuery = ''
     if (this.configSvc.unMappedUser && this.configSvc.unMappedUser.roles) {
       this.isMdoAdmin = this.configSvc.unMappedUser.roles.includes('MDO_ADMIN')
     }
     this.filterData('')
 
-    this.activeUsers('')
-    this.verifiedUsers('')
-    this.inActiveUsers('')
-    this.notmyUsers('')
+    this.getUsers('', 'allusers')
+    this.getUsers('', 'verified')
+    this.getUsers('', 'nonverified')
+    this.getUsers('', 'notmyuser')
 
     this.reportsNoteList = [
       `Easily create users individually or in bulk.`,
@@ -178,177 +163,13 @@ export class UsersViewComponent implements OnInit, OnDestroy {
         return this.nonverifiedUsersData
       case 'notmyuser':
         return this.notmyuserUsersData
-      // case 'blocked':
-      //   return this.blockedUsers()
       default:
         return []
     }
   }
 
   filterData(query: string) {
-    if (this.currentFilter === 'allusers') {
-      this.activeUsers(query)
-    } else if (this.currentFilter === 'verified') {
-      this.verifiedUsers(query)
-    } else if (this.currentFilter === 'nonverified') {
-      this.inActiveUsers(query)
-    } else if (this.currentFilter === 'notmyuser') {
-      this.notmyUsers(query)
-    }
-  }
-
-  activeUsers(query: string) {
-    this.loaderService.changeLoad.next(true)
-    const activeUsersData: any[] = []
-    const status = this.currentFilter === 'allusers' ? 1 : 0
-    this.currentOffset = this.limit * ((this.pageIndex + 1) - 1)
-    this.usersService.getAllKongUsers(this.rootOrgId, status, this.limit, this.currentOffset, query).subscribe(data => {
-      this.activeUsersDataCount = data.result.response.count
-      this.usersData = data.result.response
-      if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
-        _.filter(this.usersData.content, { isDeleted: false }).forEach((user: any) => {
-          // tslint:disable-next-line
-          const org = { roles: _.get(_.first(_.filter(user.organisations, { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') }
-          activeUsersData.push({
-            fullname: user ? `${user.firstName}` : null,
-            // fullname: user ? `${user.firstName} ${user.lastName}` : null,
-            email: user.personalDetails && user.personalDetails.primaryEmail ?
-              this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
-            role: org.roles || [],
-            userId: user.id,
-            active: !user.isDeleted,
-            blocked: user.blocked,
-            roles: _.join(_.map((org.roles || []), i => `<li>${i}</li>`), ''),
-            orgId: user.rootOrgId,
-            orgName: user.rootOrgName,
-            allowEditUser: this.showEditUser(org.roles),
-          })
-        })
-
-      }
-      this.activeUsersData = activeUsersData
-      return this.activeUsersData
-    })
-    // if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
-    //   _.filter(this.usersData.content, { isDeleted: false }).forEach((user: any) => {
-    //     // tslint:disable-next-line
-    //     const org = { roles: _.get(_.first(_.filter(user.organisations,
-    //   { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') }
-    //     activeUsersData.push({
-    //       fullname: user ? `${user.firstName}` : null,
-    //       // fullname: user ? `${user.firstName} ${user.lastName}` : null,
-    //       email: user.personalDetails && user.personalDetails.primaryEmail ?
-    //         this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
-    //       role: org.roles || [],
-    //       userId: user.id,
-    //       active: !user.isDeleted,
-    //       blocked: user.blocked,
-    //       roles: _.join(_.map((org.roles || []), i => `<li>${i}</li>`), ''),
-    //       orgId: user.rootOrgId,
-    //       orgName: user.rootOrgName,
-    //       allowEditUser: this.showEditUser(org.roles),
-    //     })
-    //   })
-    // }
-  }
-
-  verifiedUsers(query: string) {
-    this.loaderService.changeLoad.next(true)
-    const verifiedUsers: any[] = []
-    const status = this.currentFilter === 'allusers' ? 1 : 0
-    this.currentOffset = this.limit * ((this.pageIndex + 1) - 1)
-    this.usersService.getAllKongUsers(this.rootOrgId, status, this.limit, this.currentOffset, query).subscribe(data => {
-      this.verifiedUsersDataCount = data.result.response.count
-      this.usersData = data.result.response
-      if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
-        _.filter(this.usersData.content, { isDeleted: false }).forEach((user: any) => {
-          // tslint:disable-next-line
-          const org = { roles: _.get(_.first(_.filter(user.organisations, { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') }
-          verifiedUsers.push({
-            fullname: user ? `${user.firstName}` : null,
-            email: user.personalDetails && user.personalDetails.primaryEmail ?
-              this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
-            role: org.roles || [],
-            userId: user.id,
-            active: !user.isDeleted,
-            blocked: user.blocked,
-            roles: _.join(_.map((org.roles || []), i => `<li>${i}</li>`), ''),
-            orgId: user.rootOrgId,
-            orgName: user.rootOrgName,
-            allowEditUser: this.showEditUser(org.roles),
-          })
-        })
-      }
-      this.verifiedUsersData = verifiedUsers
-      return this.verifiedUsersData
-    })
-  }
-  inActiveUsers(query: string) {
-    this.loaderService.changeLoad.next(true)
-    const inactiveUsersData: any[] = []
-    const status = this.currentFilter === 'allusers' ? 1 : 0
-    this.currentOffset = this.limit * ((this.pageIndex + 1) - 1)
-    this.usersService.getAllKongUsers(this.rootOrgId, status, this.limit, this.currentOffset, query).subscribe(
-      data => {
-        this.nonverifiedUsersDataCount = data.result.response.count
-        this.usersData = data.result.response
-        if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
-          _.filter(this.usersData.content, { isDeleted: true }).forEach((user: any) => {
-            // tslint:disable-next-line
-            const org = { roles: _.get(_.first(_.filter(user.organisations, { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') }
-            inactiveUsersData.push({
-              fullname: user ? `${user.firstName}` : null,
-              // fullname: user ? `${user.firstName} ${user.lastName}` : null,
-              email: user.personalDetails && user.personalDetails.primaryEmail ?
-                this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
-              role: org.roles || [],
-              userId: user.id,
-              active: !user.isDeleted,
-              blocked: user.blocked,
-              roles: _.join(_.map((org.roles || []), i => `<li>${i}</li>`), ''),
-              orgId: user.rootOrgId,
-              orgName: user.rootOrgName,
-              allowEditUser: this.showEditUser(org.roles),
-            })
-          })
-        }
-        // this.inactiveUsersData = inactiveUsersData
-        this.nonverifiedUsersData = inactiveUsersData
-        return this.nonverifiedUsersData
-      })
-  }
-  notmyUsers(query: string) {
-    this.loaderService.changeLoad.next(true)
-    const notmyuserUsersData: any[] = []
-    const status = this.currentFilter === 'allusers' ? 1 : 0
-    this.currentOffset = this.limit * ((this.pageIndex + 1) - 1)
-    this.usersService.getAllKongUsers('', status, this.limit, this.currentOffset, query).subscribe(
-      data => {
-        this.notmyuserUsersDataCount = data.result.response.count
-        this.usersData = data.result.response
-        if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
-          _.filter(this.usersData.content, { isDeleted: true }).forEach((user: any) => {
-            // tslint:disable-next-line
-            const org = { roles: _.get(_.first(_.filter(user.organisations, { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') }
-            notmyuserUsersData.push({
-              fullname: user ? `${user.firstName}` : null,
-              // fullname: user ? `${user.firstName} ${user.lastName}` : null,
-              email: user.personalDetails && user.personalDetails.primaryEmail ?
-                this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
-              role: org.roles || [],
-              userId: user.id,
-              active: !user.isDeleted,
-              blocked: user.blocked,
-              roles: _.join(_.map((org.roles || []), i => `<li>${i}</li>`), ''),
-              orgId: user.rootOrgId,
-              orgName: user.rootOrgName,
-              allowEditUser: this.showEditUser(org.roles),
-            })
-          })
-        }
-        this.notmyuserUsersData = notmyuserUsersData
-        return this.nonverifiedUsersData
-      })
+    this.getUsers(query, this.currentFilter)
   }
 
   showEditUser(roles: any): boolean {
@@ -382,41 +203,48 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     return blockedUsersData
   }
 
-  // getAllUsers(offset?: number, functionality?: string) {
-  //   this.loaderService.changeLoad.next(true)
-  //   const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
-  //   // const filterObj = {
-  //   //   request: {
-  //   //     query: '',
-  //   //     filters: {
-  //   //       rootOrgId: this.configSvc,
-  //   //     },
-  //   //   },
-  //   // }
-  //   // this.usersService.getAllUsers(filterObj).subscribe(data => {
-  //   //   this.usersData = data
-  //   //   this.filterData()
-  //   // })
-  //   let status: number
-  //   if (functionality !== undefined && offset !== undefined) {
-  //     if (functionality === 'next') {
-  //       this.currentOffset = this.currentOffset + offset
-  //     } else { this.currentOffset = this.currentOffset - offset }
-  //     status = this.currentFilter == 'active' ? 1 : 0
-  //     this.usersService.getAllKongUsers(rootOrgId, status, this.currentOffset,).subscribe(data => {
-  //       this.userDataTotalCount = data.result.response.count
-  //       this.usersData = data.result.response
-  //       this.filterData('')
-  //     })
-  //   } else {
-  //     status = this.currentFilter == 'active' ? 1 : 0
-  //     this.usersService.getAllKongUsers(rootOrgId, status).subscribe(data => {
-  //       this.userDataTotalCount = data.result.response.count
-  //       this.usersData = data.result.response
-  //       this.filterData('')
-  //     })
-  //   }
-  // }
+  getUsers(query: string, currentFilter: any) {
+    this.loaderService.changeLoad.next(true)
+    const usersData: any[] = []
+    const status = currentFilter === 'allusers' ? 1 : 1
+    this.usersService.getAllKongUsers(this.rootOrgId, status, this.limit, this.pageIndex, query).subscribe((data: any) => {
+      this.usersData = data.result.response
+      if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
+        _.filter(this.usersData.content, { isDeleted: false }).forEach((user: any) => {
+          // tslint:disable-next-line
+          const org = { roles: _.get(_.first(_.filter(user.organisations, { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') }
+          usersData.push({
+            fullname: user ? `${user.firstName}` : null,
+            // fullname: user ? `${user.firstName} ${user.lastName}` : null,
+            email: user.personalDetails && user.personalDetails.primaryEmail ?
+              this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
+            role: org.roles || [],
+            userId: user.id,
+            active: !user.isDeleted,
+            blocked: user.blocked,
+            roles: _.join(_.map((org.roles || []), i => `<li>${i}</li>`), ''),
+            orgId: user.rootOrgId,
+            orgName: user.rootOrgName,
+            allowEditUser: this.showEditUser(org.roles),
+          })
+        })
+      }
+      if (this.currentFilter === 'allusers') {
+        this.activeUsersData = usersData
+        this.activeUsersDataCount = this.usersData.count
+      } else if (this.currentFilter === 'verified') {
+        this.verifiedUsersData = usersData
+        this.verifiedUsersDataCount = this.usersData.count
+      } else if (this.currentFilter === 'nonverified') {
+        this.notmyuserUsersData = usersData
+        this.nonverifiedUsersDataCount = this.usersData.count
+      } else if (this.currentFilter === 'notmyuser') {
+        this.notmyuserUsersData = usersData
+        this.notmyuserUsersDataCount = this.usersData.count
+      }
+      return usersData
+    })
+  }
 
   clickHandler(event: any) {
     switch (event.type) {
@@ -459,117 +287,9 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       }
     )
   }
-  menuActions($event: { action: string, row: any }) {
-    this.loaderService.changeLoad.next(true)
-    const loggedInUserId = _.get(this.route, 'snapshot.parent.data.configService.userProfile.userId')
-    // const user = { userId: _.get($event.row, 'userId') }
-    // _.set(user, 'deptId', _.get(_.first(_.filter(this.usersData.content, { id: user.userId })), 'rootOrgId'))
-    // _.set(user, 'isBlocked', _.get($event.row, 'blocked'))
-    // _.set(user, 'isDeleted', _.get($event.row, 'active'))
-    // _.set(user, 'requestedBy', this.currentUser)
-    const user = {
-      request: {
-        userId: _.get($event.row, 'userId'),
-        requestedBy: this.currentUser,
-      },
-    }
-
-    switch ($event.action) {
-      case 'showOnKarma':
-        window.open(`${environment.karmYogiPath}/app/person-profile/${user.request.userId}`)
-        break
-      case 'editInfo':
-        this.onRoleClick($event.row)
-        break
-      case 'block':
-        _.set(user, 'isBlocked', true)
-        _.set(user, 'isDeleted', false)
-        _.set(user, 'roles', _.map(_.get($event.row, 'role'), i => i))
-        this.usersService.blockUser(user).subscribe(response => {
-          if (response) {
-            // this.getAllUsers()
-            this.filterData('')
-            this.snackBar.open(response.result.response)
-          }
-        })
-        break
-      case 'unblock':
-        _.set(user, 'isBlocked', false)
-        _.set(user, 'roles', _.map(_.get($event.row, 'role'), i => i))
-        this.usersService.blockUser(user).subscribe(response => {
-          if (response) {
-            // this.getAllUsers()
-            this.filterData('')
-            this.snackBar.open('Updated successfully !')
-          }
-        })
-        break
-      case 'deactive':
-        // _.set(user, 'isDeleted', true)
-        // _.set(user, 'roles', _.map(_.get($event.row, 'role'), i => i))
-        // this.usersService.deActiveUser(user).subscribe(response => {
-        this.usersService.newBlockUser(loggedInUserId, user.request.userId).subscribe(response => {
-          if (_.toUpper(response.params.status) === 'SUCCESS') {
-            setTimeout(() => {
-              // this.getAllUsers()
-              // this.activeUsers('')
-              this.filterData('')
-
-              this.snackBar.open('Deactivated successfully!')
-            },
-              // tslint:disable-next-line: align
-              1500)
-            // this.changeDetectorRefs.detectChanges()
-          } else {
-            this.loaderService.changeLoad.next(false)
-            this.snackBar.open('Update unsuccess!')
-          }
-        },
-          // tslint:disable-next-line:align
-          () => {
-            this.snackBar.open('Given User Data doesnt exist in our records. Please provide a valid one.')
-          })
-        break
-      case 'active':
-        const state = _.get(user, 'isBlocked')
-        if (state === true) {
-          _.set(user, 'isDeleted', false)
-          _.set(user, 'isBlocked', false)
-        } else {
-          _.set(user, 'isDeleted', false)
-        }
-        _.set(user, 'roles', _.map(_.get($event.row, 'role'), i => i))
-        // this.usersService.deActiveUser(user).subscribe(response => {
-        this.usersService.newUnBlockUser(loggedInUserId, user.request.userId).subscribe(response => {
-          if (_.toUpper(response.params.status) === 'SUCCESS') {
-            setTimeout(() => {
-              // this.getAllUsers()
-              this.filterData('')
-              this.snackBar.open('Activated successfully!')
-              // tslint:disable-next-line: align
-            }, 1500)
-          } else {
-            this.loaderService.changeLoad.next(false)
-            this.snackBar.open('Update unsuccess!')
-          }
-        })
-        break
-      //   case 'delete':
-      //     _.set(user, 'isBlocked', false)
-      //     this.usersSvc.deleteUser(user)
-      //     break
-    }
-  }
 
   onEnterkySearch(enterValue: any) {
-    // const rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
-    // this.usersService.searchUserByenter(enterValue, rootOrgId).subscribe(data => {
-    //   this.usersData = data.result.response
-    //   this.filterData(enterValue)
-    // })
     this.searchQuery = enterValue
-    this.currentOffset = 0
-    this.pageIndex = 0
     this.filterData(this.searchQuery)
   }
 
diff --git a/project/ws/app/src/lib/routes/users/services/users.service.ts b/project/ws/app/src/lib/routes/users/services/users.service.ts
index 5934fdf66..c7fe32cef 100644
--- a/project/ws/app/src/lib/routes/users/services/users.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/users.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core'
 import { HttpClient } from '@angular/common/http'
-import { Observable } from 'rxjs'
+import { Observable, Subject } from 'rxjs'
 import { map, retry } from 'rxjs/operators'
 // tslint:disable
 import _ from 'lodash'
@@ -36,6 +36,7 @@ const API_END_POINTS = {
   providedIn: 'root',
 })
 export class UsersService {
+  handleContentPageChange = new Subject()
   constructor(private http: HttpClient) { }
   getAllUsers(filter: object): Observable<any> {
     return this.http.post<any>(`${API_END_POINTS.GET_ALL_USERS}`, filter).pipe(map(res => _.get(res, 'result.response')))

From 35bec094cd9361541655808ab67ae6105c9cab24 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Tue, 23 Apr 2024 00:12:11 +0530
Subject: [PATCH 540/887] Added filters component for all users

---
 .../components/filter/filter.component.html   |  53 +++
 .../components/filter/filter.component.scss   | 169 +++++++
 .../components/filter/filter.component.ts     | 431 ++++++++++++++++++
 .../ws/app/src/lib/routes/home/home.module.ts |   5 +
 4 files changed, 658 insertions(+)
 create mode 100644 project/ws/app/src/lib/routes/home/components/filter/filter.component.html
 create mode 100644 project/ws/app/src/lib/routes/home/components/filter/filter.component.scss
 create mode 100644 project/ws/app/src/lib/routes/home/components/filter/filter.component.ts

diff --git a/project/ws/app/src/lib/routes/home/components/filter/filter.component.html b/project/ws/app/src/lib/routes/home/components/filter/filter.component.html
new file mode 100644
index 000000000..c2c83a336
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/components/filter/filter.component.html
@@ -0,0 +1,53 @@
+<div class="filter-overlay">
+    <div class="filter">
+        <div class="filter-header flex flex-1">
+            <div class="flex flex-2 flex-row">
+                <div class="label">Filters</div>
+                <div class="cross-filter cursor-pointer" (click)="hideFilter()"><img src="assets/icons/close.svg"></div>
+            </div>
+        </div>
+        <div class="filter-content-container">
+            <div class="filter-content flex flex-1">
+                <mat-accordion>
+                    <mat-expansion-panel disableRipple [expanded]="true">
+                        <mat-expansion-panel-header>
+                            <mat-panel-title>
+                                Groups
+                            </mat-panel-title>
+                        </mat-expansion-panel-header>
+                        <div class="flex flex-1 flex-row category-item" *ngFor="let group of groupList">
+                            <mat-checkbox #checkboxes disableRipple class="example-margin" [checked]="group?.selected"
+                                (change)="manageSelectedGroup($event, group)">{{group?.name | titlecase}}</mat-checkbox>
+                        </div>
+                    </mat-expansion-panel>
+                </mat-accordion>
+            </div>
+            <div class="filter-content flex flex-1">
+                <mat-accordion>
+                    <mat-expansion-panel disableRipple [expanded]="true">
+                        <mat-expansion-panel-header>
+                            <mat-panel-title>
+                                Designation
+                            </mat-panel-title>
+                        </mat-expansion-panel-header>
+                        <div class="flex flex-1 flex-row category-item" *ngFor="let des of designationList">
+                            <mat-checkbox #checkboxes disableRipple class="example-margin" [checked]="des?.selected"
+                                (change)="manageSelectedDesignation($event, des)">{{des?.name |
+                                titlecase}}</mat-checkbox>
+                        </div>
+                    </mat-expansion-panel>
+                </mat-accordion>
+            </div>
+        </div>
+        <div class="filter-footer flex flex-1">
+            <div class="flex flex-2 flex-row">
+                <div class="filter-clear" (click)="clearFilter()">
+                    Clear
+                </div>
+                <div class="filter-apply" (click)="applyFilter()">
+                    Apply
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/filter/filter.component.scss b/project/ws/app/src/lib/routes/home/components/filter/filter.component.scss
new file mode 100644
index 000000000..29a876084
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/components/filter/filter.component.scss
@@ -0,0 +1,169 @@
+.filter-overlay {
+    background: rgba(0,0,0,0.6);
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    z-index: 1000;
+}
+.filter {
+    height: 100%;
+    border: 1px solid #ccc;
+    position: absolute;
+    right: 0;
+    top: 0;
+    background: #fff;
+    z-index: 10000 !important;
+    top:0px;
+    position: fixed;
+    overflow-y: auto;
+}
+
+
+.filter-header {
+    margin:26px 25px;
+}
+
+.filter-content {    
+    padding: 18px 0px;
+    margin: 0px 25px;
+}
+
+.filter-content-container {
+    height: calc(100vh - 200px);
+    overflow-y: auto;
+}
+
+.filter-content:last-child {
+    border:none;
+}
+.filter-footer {
+    margin:26px 25px;
+    position: fixed;
+    bottom: 0;
+}
+
+.filter-header .label {
+    width:299px;
+    font-weight: 700;
+}
+
+.filter-clear {
+    width: 142px;
+    text-align: center;
+    /* height: 40px; */
+    border: 1px solid #1B4CA1;
+    padding: 10px;
+    border-radius: 4px;
+    color: #1B4CA1;
+    cursor: pointer;
+}
+
+.filter-apply {
+    width: 142px;
+    text-align: center;
+    /* height: 40px; */
+    background-color: #1B4CA1;
+    color: #fff;
+    padding: 10px;
+    border-radius: 4px;
+    margin-left: 15px;
+    cursor: pointer;
+}
+
+.filter ::ng-deep .mat-expansion-panel {
+    box-shadow: none !important;
+}
+
+.filter ::ng-deep .mat-expansion-panel-header {
+    padding:0 !important;
+}
+
+.filter ::ng-deep .mat-expansion-panel-header-title {
+    font-weight: 700;
+    font-size: 14px;
+    width: 299px;
+}
+
+
+.filter ::ng-deep .mat-expansion-panel:not(.mat-expanded) .mat-expansion-panel-header:not([aria-disabled=true]).cdk-keyboard-focused, .mat-expansion-panel:not(.mat-expanded) .mat-expansion-panel-header:not([aria-disabled=true]).cdk-program-focused, .mat-expansion-panel:not(.mat-expanded) .mat-expansion-panel-header:hover {
+    background:none !important;
+}
+
+.filter ::ng-deep .mat-expansion-panel-body {
+    padding: 0 !important;
+}
+
+.filter ::ng-deep .mat-expansion-panel-header {
+    height: 24px !important; 
+}
+
+.spacer {
+    height: 1px;
+    width: 250px;
+    margin-left: 25px;
+    background: rgba(0,0,0,0.16);
+}
+
+.category-item {
+    color: rgba(0,0,0,0.6);
+    padding: 12px 0;
+    width: 318px;
+    overflow: hidden;
+}
+
+::ng-deep .mat-checkbox-label {
+    width: 300px;
+    white-space: pre-wrap;
+}
+/** Search **/
+
+.rsearch {
+    position: relative;
+    margin-top: 10px;
+}
+
+.search {
+    margin-left: 16px;
+    width: 78%;
+}
+
+.search-icon {
+    position: absolute;
+    top: 16px;
+    font-size: 20px;
+    left: 10px;
+}
+
+.sinput {
+    border-radius: 63px;
+    border: 1px solid #d5d0d0;
+    padding: 6px 36px;
+    font: 400 14px Lato;
+    width: 250px;
+    height: 32px;
+}
+
+.filter .category-content {
+    max-height: 232px;
+    overflow-y: auto;
+}
+
+.filter .category-content-without-theme {
+    overflow-y: auto;
+}
+
+::-webkit-scrollbar {
+    width: 4px;
+}
+
+::-webkit-scrollbar-track {
+    -webkit-box-shadow: inset 0 0 4px rgba(0,0,0,0.16);
+}
+
+::-webkit-scrollbar-thumb {
+  background-color: darkgrey;
+  outline: 1px solid slategrey;
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
new file mode 100644
index 000000000..914a150cf
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
@@ -0,0 +1,431 @@
+import {
+  Component, ChangeDetectorRef, Input, ElementRef, EventEmitter, OnInit,
+  Output, QueryList, ViewChildren, ChangeDetectionStrategy, AfterContentChecked,
+} from '@angular/core'
+import { FormControl } from '@angular/forms'
+import { TrainingPlanDataSharingService } from '../../../training-plan/services/training-plan-data-share.service'
+import { TrainingPlanService } from '../../../training-plan/services/traininig-plan.service'
+@Component({
+  selector: 'ws-app-filter',
+  templateUrl: './filter.component.html',
+  styleUrls: ['./filter.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class FilterComponent implements OnInit, AfterContentChecked {
+  @Output() toggleFilter = new EventEmitter()
+  // @Output() getFilterData = new EventEmitter()
+  @Input() from: any
+  designationList: any = []
+  providersList: any[] = []
+  selectedProviders: any[] = []
+  competencyTypeList = [
+    { id: 'Behavioural', name: 'Behavioural' },
+    { id: 'Functional', name: 'Functional' },
+    { id: 'Domain', name: 'Domain' },
+  ]
+  groupList: any = [
+    { id: 'groupA', name: 'Group A' },
+    { id: 'groupB', name: 'Group B' },
+    { id: 'groupC', name: 'Group C' },
+    { id: 'groupD', name: 'Group D' },
+    { id: 'contractualStaff', name: 'Contractual Staff' },
+    { id: 'others', name: 'Others' },
+  ]
+  competencyList: any = []
+  competencyThemeList: any[] = []
+  competencySubThemeList: any[] = []
+  filterObj: any = { competencyArea: [], competencyTheme: [], competencySubTheme: [], providers: [] }
+  assigneeFilterObj: any = { group: [], designation: [] }
+  searchThemeControl = new FormControl()
+  searchSubThemeControl = new FormControl()
+  searchProviderControl = new FormControl()
+  @ViewChildren('checkboxes') checkboxes!: QueryList<ElementRef>
+  constructor(
+    private cdref: ChangeDetectorRef,
+    private trainingPlanService: TrainingPlanService,
+    private tpdsSvc: TrainingPlanDataSharingService) { }
+
+  ngOnInit() {
+    this.tpdsSvc.filterToggle.subscribe((data: any) => {
+      if (data && data.status) {
+        if (data.from === 'content') {
+          this.getFilterEntity()
+          // this.getProviders()
+        } else {
+          // if(this.tpdsSvc.trainingPlanAssigneeData &&
+          //   this.tpdsSvc.trainingPlanAssigneeData.category === 'Custom Users') {
+          //   this.getDesignation();
+          // }
+          if (!this.designationList.length) {
+            this.getDesignation()
+          } else {
+            this.designationList.map((pitem: any) => {
+              if (pitem && this.assigneeFilterObj['designation'] && this.assigneeFilterObj['designation'].indexOf(pitem.name) > -1) {
+                pitem['selected'] = true
+              } else {
+                pitem['selected'] = false
+              }
+            })
+          }
+        }
+      }
+    })
+
+    this.tpdsSvc.clearFilter.subscribe((result: any) => {
+      if (result && result.status) {
+        this.from = result.from
+        this.clearFilter()
+      }
+    })
+    this.resetFilter()
+  }
+
+  ngAfterContentChecked() {
+    this.cdref.detectChanges()
+  }
+
+  getFilterEntity() {
+    const filterObj = {
+      search: {
+        type: 'Competency Area',
+      },
+      filter: {
+        isDetail: true,
+      },
+    }
+    this.trainingPlanService.getFilterEntity(filterObj).subscribe((res: any) => {
+
+      this.competencyList = res
+
+    })
+  }
+  // getProviders() {
+  //   this.trainingPlanService.getProviders().subscribe((res: any) => {
+  //     this.providersList = res
+  //     this.providersList.map((pitem: any) => {
+  //       if (this.filterObj['providers'] && pitem && this.filterObj['providers'].indexOf(pitem.name) > -1) {
+  //         pitem['selected'] = true
+  //       } else {
+  //         pitem['selected'] = false
+  //       }
+  //     })
+  //   })
+  // }
+
+  hideFilter() {
+    // this.toggleFilter.emit(false)
+    this.tpdsSvc.filterToggle.next({ from: '', status: false })
+  }
+
+  checkedProviders(event: any, item: any) {
+    if (event.checked) {
+      item['checked'] = true
+      this.providersList.map((pitem: any) => {
+        if (item.name === pitem.name) {
+          pitem['selected'] = true
+        }
+
+      })
+      if (this.filterObj['providers']) {
+        this.filterObj['providers'].push(item.name)
+      }
+    } else {
+      item['checked'] = false
+      this.providersList.map((pitem: any) => {
+        if (item.name === pitem.name) {
+          pitem['selected'] = false
+        }
+      })
+      if (this.filterObj['providers'].indexOf(item.name) > -1) {
+        const index = this.filterObj['providers'].findIndex((x: any) => x === item.name)
+        item['selected'] = false
+        this.filterObj['providers'].splice(index, 1)
+      }
+    }
+  }
+
+  getCompetencyTheme(event: any, ctype: any) {
+    if (event.checked) {
+      ctype['selected'] = true
+      this.competencyList.map((citem: any) => {
+        if (citem.name === ctype.id) {
+          citem['selected'] = true
+          citem.children.map((themechild: any) => {
+            themechild['parent'] = ctype.id
+          })
+          if (this.filterObj['competencyArea']) {
+            this.filterObj['competencyArea'].push(citem.name)
+          }
+          this.competencyThemeList = this.competencyThemeList.concat(citem.children)
+        }
+      })
+    } else {
+      ctype['selected'] = false
+      this.competencyList.map((citem: any) => {
+        if (citem.name === ctype.id) {
+          citem['selected'] = false
+        }
+      })
+
+      if (this.filterObj['competencyArea'] &&
+        this.filterObj['competencyArea'].indexOf(ctype.id) > -1) {
+        const index = this.filterObj['competencyArea'].findIndex((x: any) => x === ctype.id)
+        this.filterObj['competencyArea'].splice(index, 1)
+      }
+      if (this.filterObj['competencyTheme']) {
+        this.competencyThemeList.map(sitem => {
+          if (sitem.parent === ctype.id) {
+            if (this.filterObj['competencyTheme'].indexOf(sitem.name) > -1) {
+              const index = this.filterObj['competencyTheme'].findIndex((x: any) => x === sitem.name)
+              this.filterObj['competencyTheme'].splice(index, 1)
+            }
+          }
+        })
+      }
+      if (this.filterObj['competencySubTheme']) {
+        this.competencySubThemeList.map(ssitem => {
+          if (ssitem.parentType === ctype.id) {
+            if (this.filterObj['competencySubTheme'].indexOf(ssitem.name) > -1) {
+              const index = this.filterObj['competencySubTheme'].findIndex((x: any) => x === ssitem.name)
+              this.filterObj['competencySubTheme'].splice(index, 1)
+            }
+          }
+        })
+      }
+      this.competencyThemeList = this.competencyThemeList.filter(sitem => {
+        if (sitem.parent === ctype.id) {
+          sitem['selected'] = false
+        }
+        return sitem.parent !== ctype.id
+      })
+      this.competencySubThemeList = this.competencySubThemeList.filter(pitem => {
+        if (pitem.parentType === ctype.id) {
+          pitem['selected'] = false
+        }
+        return pitem.parentType !== ctype.id
+      })
+      this.searchThemeControl.reset()
+      this.searchSubThemeControl.reset()
+    }
+  }
+
+  getCompetencySubTheme(event: any, cstype: any) {
+    if (event.checked) {
+      this.competencyThemeList.map((csitem: any) => {
+        if (csitem.name === cstype.name) {
+          csitem['selected'] = true
+          csitem.children.map((subthemechild: any) => {
+            subthemechild['parentType'] = csitem.parent
+            subthemechild['parent'] = csitem.name
+          })
+          this.competencySubThemeList = this.competencySubThemeList.concat(csitem.children)
+          if (this.filterObj['competencyTheme']) {
+            this.filterObj['competencyTheme'].push(cstype.name)
+          }
+
+        }
+      })
+    } else {
+      this.competencyThemeList.map((csitem: any) => {
+        if (csitem.name === cstype.name) {
+          csitem['selected'] = false
+        }
+      })
+
+      this.competencySubThemeList = this.competencySubThemeList.filter(sitem => {
+        return sitem.parent !== cstype.name
+      })
+      if (this.filterObj['competencyTheme'] &&
+        this.filterObj['competencyTheme'].indexOf(cstype.name) > -1) {
+        const index = this.filterObj['competencyTheme'].findIndex((x: any) => x === cstype.name)
+        this.filterObj['competencyTheme'].splice(index, 1)
+      }
+      this.searchSubThemeControl.reset()
+    }
+  }
+
+  manageCompetencySubTheme(event: any, csttype: any) {
+    if (event.checked) {
+      this.competencySubThemeList.map((cstlitem: any) => {
+        if (csttype.name === cstlitem.name) {
+          cstlitem['selected'] = true
+        }
+      })
+      if (this.filterObj['competencySubTheme']) {
+        this.filterObj['competencySubTheme'].push(csttype.name)
+      }
+
+    } else {
+      this.competencySubThemeList.map((cstlitem: any) => {
+        if (csttype.name === cstlitem.name) {
+          cstlitem['selected'] = false
+        }
+      })
+      if (this.filterObj['competencySubTheme'] &&
+        this.filterObj['competencySubTheme'].indexOf(csttype.name) > -1) {
+        const index = this.filterObj['competencySubTheme'].findIndex((x: any) => x === csttype.name)
+        this.filterObj['competencySubTheme'].splice(index, 1)
+      }
+    }
+
+  }
+
+  applyFilter() {
+    if (this.from === 'content') {
+      // this.getFilterData.emit(this.filterObj)
+      this.tpdsSvc.getFilterDataObject.next(this.filterObj)
+    } else {
+      this.tpdsSvc.getFilterDataObject.next(this.assigneeFilterObj)
+      // this.getFilterData.emit(this.assigneeFilterObj)
+    }
+    this.tpdsSvc.filterToggle.next({ from: '', status: false })
+  }
+
+  clearFilter() {
+    if (this.from === 'content') {
+      this.filterObj = { competencyArea: [], competencyTheme: [], competencySubTheme: [], providers: [] }
+      this.selectedProviders = []
+      this.competencyThemeList = []
+      this.competencySubThemeList = []
+      this.searchThemeControl.reset()
+      this.searchSubThemeControl.reset()
+      this.searchProviderControl.reset()
+      this.resetFilter()
+    } else {
+      this.assigneeFilterObj = { group: [], designation: [] }
+      this.resetAssigneeFilter()
+    }
+
+    if (this.from === 'content') {
+      // this.getFilterData.emit(this.filterObj)
+      // this.tpdsSvc.getFilterDataObject.next(this.filterObj)
+    } else {
+      // this.getFilterData.emit(this.assigneeFilterObj)
+      // this.tpdsSvc.getFilterDataObject.next(this.assigneeFilterObj)
+    }
+
+    if (this.checkboxes) {
+      this.checkboxes.forEach((element: any) => {
+        element['checked'] = false
+      })
+    }
+  }
+
+  clearFilterWhileSearch() {
+    if (this.checkboxes) {
+      this.checkboxes.forEach((element: any) => {
+        element['checked'] = false
+      })
+    }
+  }
+
+  getDesignation() {
+    this.trainingPlanService.getDesignations().subscribe((res: any) => {
+      if (res && res.result && res.result.response) {
+        this.designationList = res.result.response.content
+      }
+
+    })
+  }
+
+  manageSelectedGroup(event: any, group: any) {
+    if (event.checked) {
+      this.groupList.map((grp: any, index: any) => {
+        if (grp && grp.name === group.name) {
+          this.groupList[index]['selected'] = true
+        }
+      })
+      if (group) {
+        group['selected'] = true
+      }
+      this.assigneeFilterObj['group'].push(group.name)
+    } else {
+      if (this.assigneeFilterObj['group'] &&
+        this.assigneeFilterObj['group'].indexOf(group.name) > -1) {
+        const index = this.assigneeFilterObj['group'].findIndex((x: any) => x === group.name)
+        this.assigneeFilterObj['group'].splice(index, 1)
+      }
+      this.groupList.map((grp: any, index: any) => {
+        if (grp && grp.name === group.name) {
+          this.groupList[index]['selected'] = false
+        }
+      })
+      if (group) {
+        group['selected'] = false
+      }
+    }
+  }
+
+  manageSelectedDesignation(event: any, designation: any) {
+    if (event.checked) {
+      this.designationList.map((ditem: any) => {
+        if (ditem && ditem['name'] === designation.name) {
+          ditem['selected'] = true
+        }
+      })
+
+      this.assigneeFilterObj['designation'].push(designation.name)
+    } else {
+      this.designationList.map((ditem: any) => {
+        if (ditem && ditem['name'] === designation.name) {
+          ditem['selected'] = false
+        }
+      })
+      if (this.assigneeFilterObj['designation'] &&
+        this.assigneeFilterObj['designation'].indexOf(designation.name) > -1) {
+        const index = this.assigneeFilterObj['designation'].findIndex((x: any) => x === designation.name)
+        this.assigneeFilterObj['designation'].splice(index, 1)
+      }
+    }
+  }
+
+  resetFilter() {
+    if (this.competencyTypeList) {
+      this.competencyTypeList.map((citem: any) => {
+        if (citem && citem['selected']) {
+          citem['selected'] = false
+        }
+      })
+    }
+    if (this.competencyThemeList) {
+      this.competencyThemeList.map((titem: any) => {
+        if (titem && titem['selected']) {
+          titem['selected'] = false
+        }
+      })
+    }
+    if (this.competencySubThemeList) {
+      this.competencySubThemeList.map((sitem: any) => {
+        if (sitem && sitem['selected']) {
+          sitem['selected'] = false
+        }
+      })
+    }
+    if (this.providersList) {
+      this.providersList.map((pitem: any) => {
+        if (pitem && pitem['selected']) {
+          pitem['selected'] = false
+        }
+      })
+    }
+
+  }
+
+  resetAssigneeFilter() {
+    if (this.groupList) {
+      this.groupList.map((pitem: any) => {
+        if (pitem && pitem['selected']) {
+          pitem['selected'] = false
+        }
+      })
+    }
+
+    if (this.designationList) {
+      this.designationList.map((pitem: any) => {
+        if (pitem && pitem['selected']) {
+          pitem['selected'] = false
+        }
+      })
+    }
+  }
+}
diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index b51862920..b91e04210 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -71,6 +71,8 @@ import { ProfleApprovalBulkUploadComponent } from './routes/profle-approval-bulk
 import { LeftMenuModule } from '../../head/left-menu/left-menu.module'
 import { UserCardComponent } from './components/user-cards/user-card.component'
 import { SearchComponent } from './components/search/search.component'
+import { FilterComponent } from './components/filter/filter.component'
+import { FilterSearchPipeModule } from '../pipes/filter-search/filter-search.module'
 @NgModule({
   declarations: [
     HomeComponent,
@@ -100,6 +102,7 @@ import { SearchComponent } from './components/search/search.component'
     ProfleApprovalBulkUploadComponent,
     UserCardComponent,
     SearchComponent,
+    FilterComponent,
   ],
   imports: [
     CommonModule,
@@ -154,6 +157,7 @@ import { SearchComponent } from './components/search/search.component'
     MatDatepickerModule,
     PipeDurationTransformModule,
     LeftMenuModule,
+    FilterSearchPipeModule,
   ],
   entryComponents: [
     AdduserpopupComponent,
@@ -163,6 +167,7 @@ import { SearchComponent } from './components/search/search.component'
     ReportsVideoComponent,
     UserCardComponent,
     SearchComponent,
+    FilterComponent,
   ],
   providers: [
     // CKEditorService,

From db7245cb57ad731ec70e01aaeafe6acf2c005928 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Tue, 23 Apr 2024 00:29:53 +0530
Subject: [PATCH 541/887] Updated code in search component

---
 .../routes/home/components/search/search.component.html   | 8 ++------
 .../lib/routes/home/components/search/search.component.ts | 2 ++
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.html b/project/ws/app/src/lib/routes/home/components/search/search.component.html
index ee235f381..79e043c4e 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.html
@@ -6,16 +6,12 @@
                 placeholder="Select" type="Standard" [ngClass]="{'disable': isContentLive}">
         </div>
     </div>
-    <div class="filter-section flex" *ngIf="!(tpdsSvc?.trainingPlanAssigneeData?.category === 'Designation'
-        || tpdsSvc?.trainingPlanAssigneeData?.category === 'AllUser') || from === 'content'"
-        [ngClass]="{'disable': isContentLive}">
+    <div class="filter-section flex">
         <button mat-button type="button" (click)="sort()" class="apply-filter margin-right-s">
             <mat-icon class="margin-right-xs">sort</mat-icon> Sort
         </button>
     </div>
-    <div class="filter-section flex" *ngIf="!(tpdsSvc?.trainingPlanAssigneeData?.category === 'Designation'
-    || tpdsSvc?.trainingPlanAssigneeData?.category === 'AllUser') || from === 'content'"
-        [ngClass]="{'disable': isContentLive}">
+    <div class="filter-section flex">
         <button mat-button type="button" (click)="openFilter()" class="apply-filter margin-right-s">
             Apply Filter <mat-icon class="margin-right-xs">filter_list</mat-icon>
         </button>
diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.ts b/project/ws/app/src/lib/routes/home/components/search/search.component.ts
index 9056c4751..6bdebde14 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.ts
@@ -93,4 +93,6 @@ export class SearchComponent implements OnInit {
     this.pageIndex = 0
     this.pageSize = 20
   }
+
+  createUser() { }
 }

From 26a0c2c89f07ebea54f9ced23352bc076f493205 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Tue, 23 Apr 2024 00:31:53 +0530
Subject: [PATCH 542/887] Fxied user name alignment in all users

---
 .../home/components/user-cards/user-card.component.html     | 2 +-
 .../home/components/user-cards/user-card.component.scss     | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 855bcac81..3c107cc0d 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -13,7 +13,7 @@
             </ws-widget-avatar-photo>
           </div>
           <div class="username display-inline-block" *ngIf="user.profileDetails && user.profileDetails.personalDetails">
-            <div class="mat-subheading-2 display-inline-block margin-remove">
+            <div class="mat-subheading-2 margin-remove">
               {{user.profileDetails.personalDetails.firstname}}
               <span class="status-label margin-left-s verified" *ngIf="currentFilter !== 'nonverified'">Verified
                 <mat-icon>check_circle</mat-icon></span>
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
index 3d96a640a..90ad4c9bb 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
@@ -16,7 +16,7 @@
     display: block !important;
   }
   .float-left {
-    width: 90%;
+    width: 86%;
   }
 
   .initialcircle {
@@ -142,4 +142,8 @@
     padding: 2px 10px;
     border-radius: 14px;
   }
+}
+
+.username {
+  width: 88%;
 }
\ No newline at end of file

From 812d509034e6b08176d640cfafc378220f10cb75 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Tue, 23 Apr 2024 15:54:36 +0530
Subject: [PATCH 543/887] Added parent class for CSS

---
 project/ws/app/src/lib/head/left-menu/left-menu.component.html | 2 +-
 project/ws/app/src/lib/head/left-menu/left-menu.component.scss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/head/left-menu/left-menu.component.html b/project/ws/app/src/lib/head/left-menu/left-menu.component.html
index 34b8c2b25..c90708d38 100644
--- a/project/ws/app/src/lib/head/left-menu/left-menu.component.html
+++ b/project/ws/app/src/lib/head/left-menu/left-menu.component.html
@@ -16,7 +16,7 @@
 </div>
 <ng-container *ngFor="let menu of menulist; let mi = index">
   <ng-container *ngIf="menu.subMenu">
-    <mat-accordion [multi]="true">
+    <mat-accordion [multi]="true" class="custom-leftmenu">
       <mat-expansion-panel class="menuPannel bg-gray-accordian" hideToggle="true" [expanded]="false" #example>
         <mat-expansion-panel-header>
           <mat-panel-title>
diff --git a/project/ws/app/src/lib/head/left-menu/left-menu.component.scss b/project/ws/app/src/lib/head/left-menu/left-menu.component.scss
index 65d50131d..c84429b93 100644
--- a/project/ws/app/src/lib/head/left-menu/left-menu.component.scss
+++ b/project/ws/app/src/lib/head/left-menu/left-menu.component.scss
@@ -92,7 +92,7 @@
 //   margin: unset !important;
 // }
 
-::ng-deep  .mat-expansion-panel:not([class*=mat-elevation-z]) {
+::ng-deep .custom-leftmenu .mat-expansion-panel:not([class*=mat-elevation-z]) {
     background: rgba(0, 0, 0, 0.02) !important;
     margin-bottom: 8px !important;
 }

From caffef1784943b49a9dffcfd9d0be7a37f50f6fc Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Tue, 23 Apr 2024 17:17:35 +0530
Subject: [PATCH 544/887] Fixed build issue

---
 .../src/lib/routes/home/components/search/search.component.ts   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.ts b/project/ws/app/src/lib/routes/home/components/search/search.component.ts
index 6bdebde14..04588703a 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.ts
@@ -95,4 +95,6 @@ export class SearchComponent implements OnInit {
   }
 
   createUser() { }
+
+  sort() { }
 }

From 290712e97701cb895e7cfb957e8aafa878f1e774 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Thu, 25 Apr 2024 09:09:55 +0530
Subject: [PATCH 545/887] Updated edit fields form

---
 .../user-cards/user-card.component.html       | 147 +++++++++---------
 .../user-cards/user-card.component.ts         |  93 +++++++++--
 .../ws/app/src/lib/routes/home/home.module.ts |   2 +
 .../routes/users/services/users.service.ts    |  10 ++
 4 files changed, 172 insertions(+), 80 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 3c107cc0d..17ed5d132 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -48,7 +48,7 @@
           </div>
         </div>
         <div class="float-right">
-          <div class="button margin-top-xs mat-body" (click)="editUser(user)"><mat-icon>edit</mat-icon> Edit</div>
+          <div class="button margin-top-xs mat-body" (click)="onEditUser(user)"><mat-icon>edit</mat-icon> Edit</div>
         </div>
       </mat-expansion-panel-header>
 
@@ -56,7 +56,7 @@
         <div class="inner-body">
           Primary Details <mat-icon class="ws-mat-black40-text">info_outline</mat-icon>
           <form [formGroup]="updateUserDataForm" class="margin-top-m">
-            <mat-grid-list cols="2" rowHeight="60px">
+            <mat-grid-list cols="2" rowHeight="100px">
               <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                 <label class="appr-text-label required">Designation</label>
                 <mat-select class="appr-text-field" #designation formControlName="designation" i18n-placeholder
@@ -71,9 +71,9 @@
               <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                 <label class="appr-text-label required">Group</label>
                 <mat-select class="appr-text-field" #group formControlName="group" i18n-placeholder
-                  placeholder="--Select--" (selectionChange)="otherDropDownChange(designation.value, 'designation')">
-                  <mat-option [value]="designation.name" *ngFor="let designation of designationsMeta">
-                    {{designation.name}}
+                  placeholder="--Select--">
+                  <mat-option [value]="g" *ngFor="let g of groupsList">
+                    {{g.name}}
                   </mat-option>
                 </mat-select>
               </mat-grid-tile>
@@ -85,7 +85,7 @@
           Other Details <mat-icon class="ws-mat-black40-text">info_outline</mat-icon>
 
           <form [formGroup]="updateUserDataForm" class="margin-top-m">
-            <mat-grid-list cols="3" rowHeight="60px">
+            <mat-grid-list cols="3" rowHeight="80px">
               <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                 <label class="appr-text-label requird">Employee ID</label>
                 <input type="text" [value]="" [disabled]="true" class="appr-text-field">
@@ -94,6 +94,13 @@
               <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                 <label class="appr-text-label required">Email</label>
                 <input type="text" [value]="" class="appr-text-field">
+
+                <input id="primaryEmail" name="primaryEmailField" type="email" matInput placeholder="Email"
+                  #primaryEmail formControlName="primaryEmail" i18n-aria-label aria-label="Primary Email readonly input"
+                  maxlength="320">
+                <mat-error [hidden]="false" i18n="Primary Email Error|Explains name is required">
+                  {{'userProfile.primaryEmailMandatory' | translate }}
+                </mat-error>
               </mat-grid-tile>
 
               <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
@@ -108,96 +115,96 @@
 
               <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                 <label class="appr-text-label required">Mother Tongue</label>
-                <mat-select class="appr-text-field" #group formControlName="group" i18n-placeholder
-                  placeholder="--Select--" (selectionChange)="otherDropDownChange(designation.value, 'designation')">
-                  <mat-option [value]="designation.name" *ngFor="let designation of designationsMeta">
-                    {{designation.name}}
+                <mat-form-field appearance="outline" class="margin-top-xs">
+                  <input id="language" matInput type="text" placeholder="Mother Tongue" i18n-placeholder="Mother Tongue"
+                    formControlName="domicileMedium" [matAutocomplete]="motherTongueAuto" i18n-aria-label
+                    aria-label="Domicile Medium (Mother Tongue)" #motherTongue maxlength="30" />
+                  <mat-error *ngIf="updateUserDataForm?.controls['domicileMedium'].errors?.forbiddenNames"
+                    i18n-aria-label aria-label="Please choose a value from the list provided above.">
+                    Please choose a value from the list provided above
+                  </mat-error>
+                </mat-form-field>
+                <mat-autocomplete #motherTongueAuto="matAutocomplete" autoActiveFirstOption="true">
+                  <mat-option *ngFor="let option of masterLanguages | async" [value]="option.name">
+                    {{ option.name }}
                   </mat-option>
-                </mat-select>
+                </mat-autocomplete>
               </mat-grid-tile>
 
               <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                 <label class="appr-text-label required">Gender</label>
-                <mat-select class="appr-text-field" #group formControlName="group" i18n-placeholder
-                  placeholder="--Select--" (selectionChange)="otherDropDownChange(designation.value, 'designation')">
-                  <mat-option [value]="designation.name" *ngFor="let designation of designationsMeta">
-                    {{designation.name}}
+                <mat-select class="appr-text-field" #gender formControlName="gender" i18n-placeholder
+                  placeholder="--Select--">
+                  <mat-option [value]="gender" *ngFor="let gender of genderList">
+                    {{gender}}
                   </mat-option>
                 </mat-select>
               </mat-grid-tile>
 
               <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                 <label class="appr-text-label required">Office Pin Code</label>
-                <input type="text" [value]="" class="appr-text-field">
+                <input id="pinCode" #pincode class="appr-text-field" type="text" matInput placeholder="Pin code"
+                  formControlName="pincode" i18n-aria-label aria-label="Pin Code input field" autocomplete="off"
+                  (keypress)="numericOnly($event)" maxlength="6">
               </mat-grid-tile>
 
               <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                <label class="appr-text-label required">eHRMS ID</label>
+                <label class="appr-text-label">eHRMS ID</label>
                 <input type="text" [value]="" [disabled]="true" class="appr-text-field">
               </mat-grid-tile>
 
               <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                 <label class="appr-text-label required">Category</label>
-                <mat-select class="appr-text-field" #group formControlName="group" i18n-placeholder
-                  placeholder="--Select--" (selectionChange)="otherDropDownChange(designation.value, 'designation')">
-                  <mat-option [value]="designation.name" *ngFor="let designation of designationsMeta">
-                    {{designation.name}}
+                <mat-select class="appr-text-field" #category formControlName="category" i18n-placeholder
+                  placeholder="--Select--">
+                  <mat-option [value]="ctg" *ngFor="let ctg of categoryList">
+                    {{ctg}}
                   </mat-option>
                 </mat-select>
               </mat-grid-tile>
 
               <mat-grid-tile [colspan]="1" [rowspan]="10" class="input-wrapper">
-                <mat-card id="roles" *ngIf="!isMdoAdmin"
-                  class="flex flex-1 flex-column margin-top-m margin-bottom-m margin-left-m margin-right-m ws-mat-accent-border">
-                  <div class="flex-custom">
-                    <mat-card-content class="margin-top-m margin-bottom-m margin-left-m margin-right-m">
-                      <span class="mat-subheading-1 flex-4 mobile-margin appr-section-heading" role="link" tabindex="0">
-                        Update roles
-                      </span>
-                      <div class="margin-top-xl new-mobile">
-                        <div class="flex flex-wrap mobile-break">
-                          <div class="w-full profile-cols-full bg-grey">
-                            <ng-container>
-                              <form [formGroup]="updateUserDataForm">
-                                <div class="input-wrapper margin-top-s">
-                                  <label for="roles" class="margin-remove-bottom form-label required" i18n-aria-label
-                                    aria-label="Roles label"
-                                    i18n="Role label|Label which explains the user to select the roles">
-                                    Role
-                                  </label>
-                                  <mat-selection-list id="roles" formControlName="roles" #roles>
-                                    <mat-list-option *ngFor="let role of rolesList"
-                                      (click)="modifyUserRoles(role.roleName)" [selected]="userRoles.has(role.roleName)"
-                                      [value]="role.roleName">
-                                      {{role.roleName}}
-                                    </mat-list-option>
-                                  </mat-selection-list>
-                                </div>
-                                <button mat-raised-button type="submit" (click)="onSubmit(updateUserDataForm, 'Roles')"
-                                  class="margin-top-m text-white btn-success btn-responsive"
-                                  [disabled]="updateUserDataForm?.invalid">
-                                  <span class="text-white" i18n>
-                                    Update
-                                  </span>
-                                </button>
-                                <button mat-raised-button type="submit" (click)="resetRoles()"
-                                  class="margin-top-m text-white btn-success btn-responsive"
-                                  [disabled]="updateUserDataForm?.invalid">
-                                  <span class="text-white" i18n>
-                                    Cancel
-                                  </span>
-                                </button>
-                              </form>
-                            </ng-container>
+                <div id="roles" *ngIf="!isMdoAdmin"
+                  class="flex flex-1 flex-column margin-top-m margin-bottom-m margin-left-m margin-right-m">
+                  <div class="flex flex-wrap mobile-break">
+                    <div class="w-full profile-cols-full bg-grey">
+                      <ng-container>
+                        <form [formGroup]="updateUserDataForm">
+                          <div class="input-wrapper margin-top-s">
+                            <label for="roles" class="margin-remove-bottom form-label required" i18n-aria-label
+                              aria-label="Roles label"
+                              i18n="Role label|Label which explains the user to select the roles">
+                              Role
+                            </label>
+                            <mat-selection-list id="roles" formControlName="roles" #roles>
+                              <mat-list-option *ngFor="let role of rolesList" (click)="modifyUserRoles(role.roleName)"
+                                [selected]="userRoles.has(role.roleName)" [value]="role.roleName">
+                                {{role.roleName}}
+                              </mat-list-option>
+                            </mat-selection-list>
                           </div>
-                        </div>
-                      </div>
-                    </mat-card-content>
+                          <button mat-raised-button type="submit" (click)="onSubmit(updateUserDataForm, 'Roles')"
+                            class="margin-top-m text-white btn-success btn-responsive"
+                            [disabled]="updateUserDataForm?.invalid">
+                            <span class="text-white" i18n>
+                              Update
+                            </span>
+                          </button>
+                          <button mat-raised-button type="submit" (click)="resetRoles()"
+                            class="margin-top-m text-white btn-success btn-responsive"
+                            [disabled]="updateUserDataForm?.invalid">
+                            <span class="text-white" i18n>
+                              Cancel
+                            </span>
+                          </button>
+                        </form>
+                      </ng-container>
+                    </div>
                   </div>
-                </mat-card>
+                </div>
 
-                <mat-card id="roles" *ngIf="isMdoAdmin"
-                  class="flex flex-1 flex-column margin-top-m margin-bottom-m margin-left-m margin-right-m ws-mat-accent-border">
+                <div id="roles" *ngIf="isMdoAdmin"
+                  class="flex flex-1 flex-column margin-top-m margin-bottom-m margin-left-m margin-right-m">
                   <div class="flex-custom">
                     <mat-card-content class="margin-top-m margin-bottom-m margin-left-m margin-right-m">
                       <span class="mat-subheading-1 flex-4 mobile-margin appr-section-heading" role="link" tabindex="0">
@@ -216,7 +223,7 @@
                       </div>
                     </mat-card-content>
                   </div>
-                </mat-card>
+                </div>
               </mat-grid-tile>
 
               <mat-grid-tile [colspan]="1" [rowspan]="10" class="input-wrapper">
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 686b61b24..423ea3195 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'
+import { Component, EventEmitter, Input, OnInit, Output, ViewChild, ChangeDetectorRef } from '@angular/core'
 import { FormGroup, FormControl, Validators } from '@angular/forms'
 import { UsersService } from '../../../users/services/users.service'
 import { MatChipInputEvent, MatPaginator, PageEvent } from '@angular/material'
@@ -7,6 +7,8 @@ import { COMMA, ENTER } from '@angular/cdk/keycodes'
 import _ from 'lodash'
 import { RolesService } from '../../../users/services/roles.service'
 import { ActivatedRoute } from '@angular/router'
+import { Observable } from 'rxjs'
+import { debounceTime, distinctUntilChanged, map, startWith } from 'rxjs/operators'
 
 @Component({
   selector: 'ws-widget-user-card',
@@ -39,29 +41,41 @@ export class UserCardComponent implements OnInit {
   isMdoLeader = false
   updateUserDataForm: FormGroup
   designationsMeta: any = []
+  groupsList: any = []
   selectedtags: any[] = []
   reqbody: any
   isTagsEdited = false
   separatorKeysCodes: number[] = [ENTER, COMMA]
   namePatern = `^[a-zA-Z ]*$`
   orgTypeList: any = []
+  masterLanguages: Observable<any[]> | undefined
+  masterLanguagesEntries: any
+  genderList = ['Male', 'Female', 'Others']
+  categoryList = ['General', 'OBC', 'SC', 'ST', 'Others']
 
-  constructor(private usersSvc: UsersService, private roleservice: RolesService, private route: ActivatedRoute) {
+  constructor(private usersSvc: UsersService, private roleservice: RolesService,
+    private route: ActivatedRoute, private cdref: ChangeDetectorRef) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', []),
       tags: new FormControl('', [Validators.pattern(this.namePatern)]),
       roles: new FormControl('', [Validators.required]),
+      domicileMedium: new FormControl('', []),
+      gender: new FormControl('', []),
+      category: new FormControl('', []),
+      primaryEmail: new FormControl('', [Validators.required]),
     })
   }
 
   ngOnInit() {
     this.currentFilter = this.route.snapshot.params['tab'] || 'allusers'
-    // this.init()
+    this.init()
   }
 
   async init() {
     await this.loadDesignations()
+    await this.loadGroups()
+    await this.loadLangauages()
   }
 
   async loadDesignations() {
@@ -73,16 +87,75 @@ export class UserCardComponent implements OnInit {
       })
   }
 
-  editUser(user: any) {
-    this.usersData.content.forEach((u: any) => {
-      if (u.userId === user.userId && user.editUser === false) {
-        u.editUser = !u.editUser
-      }
-    })
+  async loadGroups() {
+    await this.usersSvc.getGroups().subscribe(
+      (data: any) => {
+        const res = data.result.response
+        res.map((value: any) => {
+          this.groupsList.push({ name: value })
+        })
+      },
+      (_err: any) => {
+      })
+  }
+
+  async loadLangauages() {
+    await this.usersSvc.getMasterLanguages().subscribe(
+      (data: any) => {
+        this.masterLanguagesEntries = data.languages
+        this.onChangesLanuage()
+      },
+      (_err: any) => {
+      })
+  }
+
+  otherDropDownChange(value: any, field: string) {
+    if (field === 'designation' && value !== 'Other') {
+      this.updateUserDataForm.controls['designation'].setValue(value)
+
+      console.log('this.updateUserDataForm', this.updateUserDataForm)
+    }
+  }
+
+  onChangesLanuage(): void {
+    // tslint:disable-next-line: no-non-null-assertion
+    this.masterLanguages = this.updateUserDataForm.get('domicileMedium')!.valueChanges
+      .pipe(
+        debounceTime(500),
+        distinctUntilChanged(),
+        startWith(''),
+        map((value: any) => typeof (value) === 'string' ? value : (value && value.name ? value.name : '')),
+        map((name: any) => name ? this.filterLanguage(name) : this.masterLanguagesEntries.slice()),
+      )
+  }
+
+  private filterLanguage(name: string) {
+    if (name) {
+      const filterValue = name.toLowerCase()
+      return this.masterLanguagesEntries.filter((option: any) => option.name.toLowerCase().includes(filterValue))
+    }
+    return this.masterLanguagesEntries
+  }
+
+  numericOnly(event: any): boolean {
+    const pattren = /^([0-9])$/
+    const result = pattren.test(event.key)
+    return result
+  }
+
+  onEditUser(user: any) {
+    // this.usersData.content.forEach((u: any) => {
+    //   if (u.userId === user.userId && user.editUser === false) {
+
+    this.cdref.detectChanges()
+    user.editUser = !user.editUser
+    console.log('user-----', user)
+    //   }
+    // })
   }
 
   getUerData(user: any) {
-    user.editUser = false
+    user.editUser = true
     const profileDataAll = user
     this.userStatus = profileDataAll.isDeleted ? 'Inactive' : 'Active'
 
diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index b91e04210..7858efb50 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -21,6 +21,7 @@ import {
   MatTabsModule,
   MatCheckboxModule,
   MatDatepickerModule,
+  MatAutocompleteModule,
 } from '@angular/material'
 import { MatMenuModule } from '@angular/material/menu'
 import { MatPaginatorModule } from '@angular/material/paginator'
@@ -158,6 +159,7 @@ import { FilterSearchPipeModule } from '../pipes/filter-search/filter-search.mod
     PipeDurationTransformModule,
     LeftMenuModule,
     FilterSearchPipeModule,
+    MatAutocompleteModule,
   ],
   entryComponents: [
     AdduserpopupComponent,
diff --git a/project/ws/app/src/lib/routes/users/services/users.service.ts b/project/ws/app/src/lib/routes/users/services/users.service.ts
index c7fe32cef..382c6be4f 100644
--- a/project/ws/app/src/lib/routes/users/services/users.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/users.service.ts
@@ -29,6 +29,8 @@ const API_END_POINTS = {
   SEND_OTP: '/apis/proxies/v8/otp/v1/generate',
   RESEND_OTP: '/apis/proxies/v8/otp/v1/generate',
   VERIFY_OTP: '/apis/proxies/v8/otp/v1/verify',
+  getMasterLanguages: '/apis/protected/v8/user/profileRegistry/getMasterLanguages',
+  GET_GROUPS: '/api/user/v1/groups',
   // GET_BULKUPLOAD_DATA: '/apis/protected/v8/admin/userRegistration/bulkUploadData',
 }
 
@@ -221,4 +223,12 @@ export class UsersService {
     return this.http.post(API_END_POINTS.VERIFY_OTP, reqObj)
 
   }
+
+  getMasterLanguages(): Observable<any> {
+    return this.http.get<any>(API_END_POINTS.getMasterLanguages)
+  }
+
+  getGroups(): Observable<any> {
+    return this.http.get<any>(API_END_POINTS.GET_GROUPS)
+  }
 }

From 20c939375dbdb11f1628f67f4a7f83fa5ce478ea Mon Sep 17 00:00:00 2001
From: Vinod Kumar Shyave <121538586+vShyave@users.noreply.github.com>
Date: Fri, 26 Apr 2024 15:46:02 +0530
Subject: [PATCH 546/887] Bulk upload page setup and basic UI is ready

---
 .../approvals/routes/home/home.component.scss |   2 +-
 .../events-home/events-home.component.scss    |   2 +-
 .../ws/app/src/lib/routes/home/home.module.ts |   4 +
 .../lib/routes/home/home.rounting.module.ts   |  62 +-
 .../approval-pending.component.html           |  57 ++
 .../approval-pending.component.scss           | 307 +++++++++
 .../approval-pending.component.spec.ts        |  25 +
 .../approval-pending.component.ts             | 237 +++++++
 .../routes/approvals/approvals.component.html |  14 +-
 .../routes/approvals/approvals.component.scss | 614 +++++++++---------
 .../routes/approvals/approvals.component.ts   | 437 ++++++-------
 .../bulk-upload/bulk-upload.component.html    |  89 +++
 .../bulk-upload/bulk-upload.component.scss    |  41 ++
 .../bulk-upload/bulk-upload.component.spec.ts |  25 +
 .../bulk-upload/bulk-upload.component.ts      |  15 +
 .../home/routes/home/home.component.scss      |   2 +-
 src/app/app.module.ts                         |   1 +
 17 files changed, 1380 insertions(+), 554 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
 create mode 100644 project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.scss
 create mode 100644 project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
 create mode 100644 project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
 create mode 100644 project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.scss
 create mode 100644 project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts

diff --git a/project/ws/app/src/lib/routes/approvals/routes/home/home.component.scss b/project/ws/app/src/lib/routes/approvals/routes/home/home.component.scss
index 0c9128d7b..19e04d907 100644
--- a/project/ws/app/src/lib/routes/approvals/routes/home/home.component.scss
+++ b/project/ws/app/src/lib/routes/approvals/routes/home/home.component.scss
@@ -5,7 +5,7 @@
 
 .container-balanced{
   min-height: 85vh;
-  max-width: 99%;
+  max-width: 100%;
   margin-left: auto!important;
   margin-right: auto!important;
 }
diff --git a/project/ws/app/src/lib/routes/events/routes/events-home/events-home.component.scss b/project/ws/app/src/lib/routes/events/routes/events-home/events-home.component.scss
index cee31c91e..732d290b3 100644
--- a/project/ws/app/src/lib/routes/events/routes/events-home/events-home.component.scss
+++ b/project/ws/app/src/lib/routes/events/routes/events-home/events-home.component.scss
@@ -6,7 +6,7 @@
   @extend %page-center;
   height: auto;
   min-height: 85vh;
-  padding: 15px;
+  padding: 20px;
 }
 
 .container2 {
diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index b91e04210..50e1e8eb8 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -73,6 +73,8 @@ import { UserCardComponent } from './components/user-cards/user-card.component'
 import { SearchComponent } from './components/search/search.component'
 import { FilterComponent } from './components/filter/filter.component'
 import { FilterSearchPipeModule } from '../pipes/filter-search/filter-search.module'
+import { ApprovalPendingComponent } from './routes/approvals/approval-pending/approval-pending.component'
+import { BulkUploadComponent } from './routes/approvals/bulk-upload/bulk-upload.component'
 @NgModule({
   declarations: [
     HomeComponent,
@@ -103,6 +105,8 @@ import { FilterSearchPipeModule } from '../pipes/filter-search/filter-search.mod
     UserCardComponent,
     SearchComponent,
     FilterComponent,
+    ApprovalPendingComponent,
+    BulkUploadComponent,
   ],
   imports: [
     CommonModule,
diff --git a/project/ws/app/src/lib/routes/home/home.rounting.module.ts b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
index 882c3f3a4..799135120 100644
--- a/project/ws/app/src/lib/routes/home/home.rounting.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
@@ -20,6 +20,8 @@ import { PageResolve } from '@sunbird-cb/utils'
 import { BlendedApprovalsComponent } from './routes/blended-approvals/blended-approvals.component'
 import { ReportsSectionComponent } from './routes/reports-section/reports-section.component'
 import { TrainingPlanDashboardComponent } from './routes/training-plan-dashboard/training-plan-dashboard.component'
+import { BulkUploadComponent } from './routes/approvals/bulk-upload/bulk-upload.component'
+import { ApprovalPendingComponent } from './routes/approvals/approval-pending/approval-pending.component'
 
 const routes: Routes = [
   {
@@ -94,8 +96,22 @@ const routes: Routes = [
           usersList: UsersListResolve,
         },
       },
+      // {
+      //   path: 'approvals/:tab',
+      //   component: ApprovalsComponent,
+      //   data: {
+      //     pageId: 'approvals',
+      //     module: 'Approvals',
+      //     pageType: 'feature',
+      //     pageKey: 'approval-view',
+      //   },
+      //   resolve: {
+      //     pageData: PageResolve,
+      //     configService: ConfigResolveService,
+      //   },
+      // },
       {
-        path: 'approvals/:tab',
+        path: 'approvals',
         component: ApprovalsComponent,
         data: {
           pageId: 'approvals',
@@ -107,21 +123,35 @@ const routes: Routes = [
           pageData: PageResolve,
           configService: ConfigResolveService,
         },
-      },
-      {
-        path: 'approvals',
-        redirectTo: 'approvals/pending',
-        component: ApprovalsComponent,
-        resolve: {
-          pageData: PageResolve,
-          configService: ConfigResolveService,
-        },
-        data: {
-          pageId: 'approvals',
-          module: 'Approvals',
-          pageType: 'feature',
-          pageKey: 'approval-view',
-        },
+        children: [
+          {
+            path: '',
+            pathMatch: 'full',
+            redirectTo: 'pending',
+          },
+          {
+            path: 'pending',
+            component: ApprovalPendingComponent,
+            data: {
+              pageId: 'approvals-pending',
+              module: 'Approvals',
+            },
+            resolve: {
+              configService: ConfigResolveService,
+            },
+          },
+          {
+            path: 'bulk-upload',
+            component: BulkUploadComponent,
+            data: {
+              pageId: 'bulk-upload',
+              module: 'Approvals',
+            },
+            resolve: {
+              configService: ConfigResolveService,
+            },
+          },
+        ],
       },
       {
         path: 'workallocation/:tab',
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
new file mode 100644
index 000000000..c9893fbce
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
@@ -0,0 +1,57 @@
+<div class="flex flex-4 flex-column">
+  <mat-card>
+    <mat-card-title class="flex-4 mobile-margin text-capitalize">
+      <span class="mat-subheading-1">Approvals</span>
+    </mat-card-title>
+    <mat-card class="mb-8">
+      <mat-card-content class="flex gap-10">
+        <div class="section-1">
+          <div class="flex-4 mobile-margin text-capitalize mat-h2">Note:</div>
+          <ng-container *ngFor="let note of reportsNoteList">
+            <div class="flex gap-4 mb-4">
+              <div>
+                <mat-icon class="infoIcon">error_outline</mat-icon>
+              </div>
+              <div [innerHTML]="sanitizeHtml(note)"></div>
+            </div>
+          </ng-container>
+        </div>
+        <div class="reportsDemo flex justify-end section-2">
+          <div class="reportsDemoVideo flex flex-column flex-middle justify-center margin-top-m"
+            (click)="openVideoPopup()">
+            <mat-icon class="video_icon mb-2">play_circle</mat-icon>
+            <div>
+              Watch how it works
+            </div>
+          </div>
+        </div>
+      </mat-card-content>
+    </mat-card>
+    <mat-card-content>
+      <div class="flex flex-1 flex-column margin-fix">
+        <div class="flex flex-1 filter max-height-60">
+          <a routerLink="/app/home/approvals/pending" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'pending',
+              'ws-mat-accent-border font-medium':currentFilter !== 'pending'}" mat-button
+            (click)="filter('pending'); tabTelemetry('toapprove', 0)" role="button">To approve</a>
+
+          <a routerLink="/app/home/approvals/upload" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'uploadApprovals',
+            'ws-mat-accent-border font-medium':currentFilter !== 'uploadApprovals'}" mat-button
+            (click)="filter('uploadApprovals'); tabTelemetry('uploadApprovals', 1)" role="button">File uploads</a>
+        </div>
+      </div>
+      <ng-container *ngIf="currentFilter === 'pending'">
+        <ng-container *ngIf="getTableData && getTableData.length>0">
+          <ws-widget-org-user-table-v2 [tableData]="tabledata" [data]="data" (eOnRowClick)="onApprovalClick($event)"
+            [totalRecords]="approvalTotalCount" (pageChangeClick)="onPaginateChange($event)">
+          </ws-widget-org-user-table-v2>
+        </ng-container>
+        <ng-container *ngIf="!getTableData || getTableData.length<=0">
+          <p class="text-center">No approvals pending</p>
+        </ng-container>
+      </ng-container>
+      <ng-container *ngIf="currentFilter === 'uploadApprovals'">
+        <ws-app-profle-approval-bulk-upload></ws-app-profle-approval-bulk-upload>
+      </ng-container>
+    </mat-card-content>
+  </mat-card>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.scss b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.scss
new file mode 100644
index 000000000..4df45e821
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.scss
@@ -0,0 +1,307 @@
+@import 'ws-common';
+@import 'ws-vars';
+@import 'ws-mixins';
+
+.buton {
+  display: flex;
+  border: 1px solid;
+  flex: 1;
+  background: red;
+  align-content: center;
+  text-align: center;
+}
+
+.flex-4 {
+  flex: 4;
+}
+
+.mob {
+  @include breakpoint-xs {
+    bottom: 0 !important;
+    position: unset !important;
+  }
+}
+
+.font-medium {
+  font-weight: 500 !important;
+}
+.text-center{
+  text-align: center;
+  margin: 10px;
+}
+.bottom-fix {
+  bottom: 1.5rem;
+  position: absolute;
+}
+
+.view-more {
+  display: flex;
+  align-items: center;
+  text-align: center;
+  border: 1px solid;
+
+  .icon {
+    $icon-size: 24px;
+    font-size: $icon-size;
+    width: $icon-size;
+    height: $icon-size;
+    border: 1px solid;
+    border-radius: 50%;
+    padding: 8px;
+    margin-bottom: 8px;
+    margin-right: $size-s;
+  }
+}
+
+.view-all {
+  display: flex;
+  margin: 0 auto;
+  // border: 1px solid;
+  // font-weight: 500;
+  box-shadow: 0px 10px 30p;
+  /*#99999933*/
+  border-radius: 8px;
+}
+
+
+
+.text-box {
+  display: flex;
+  border: 1px solid;
+  flex: 3;
+  align-content: center;
+  text-align: center;
+}
+
+.margin-fix {
+  @include breakpoint-xs {
+    margin: 0 $size-l 0 $size-l;
+  }
+
+  @include breakpoint-s {
+    margin: 0 $size-l 0 $size-l;
+  }
+}
+
+.overflow {
+  // @include breakpoint-xs {
+  //   width: 10em;
+  //   // outline: 1px solid #000;
+  //   margin: 0 0 2em 0;
+  //   text-overflow: ellipsis !important;
+  //   /**
+  //  * Required properties to achieve text-overflow
+  //  */
+  //   white-space: nowrap;
+  //   overflow: hidden;
+  // }
+  overflow: hidden;
+}
+
+.custom {
+
+  // height: 48px;
+  // max-height: 48px;
+  @include breakpoint-xs {
+    flex-direction: column;
+  }
+
+  @include breakpoint-s {
+    flex-direction: column;
+  }
+}
+
+.discuss-border {
+  border-radius: 4px;
+  /*.75rem;*/
+  border: 1px solid #DEDFE0;
+  flex: 1;
+  // max-width: 500px;
+  /* border-color: #cecece;*/
+}
+
+.discuss .mat-form-field-wrapper {
+  padding-bottom: 0px;
+
+  .mat-form-field-infix {
+    border-top-width: 5px !important;
+    padding: 0px;
+    padding-bottom: 5px;
+  }
+
+}
+
+
+.flex-3 {
+  flex: 3;
+}
+
+.filter {
+  .filter-option {
+    margin: $size-xs $size-m;
+    /* border-bottom: darkslateblue; */
+    border-radius: 0;
+    border-bottom-width: 2px;
+    border-top-width: 0;
+    border-left-width: 0;
+    border-right-width: 0;
+  }
+}
+
+.max-height-60 {
+  max-height: 60px;
+}
+
+.height-48 {
+  max-height: 48px;
+}
+
+.pagination {
+  justify-content: center;
+  flex-wrap: wrap;
+  margin-top: 0;
+  margin-bottom: 1rem;
+}
+
+.pagination {
+  display: -ms-flexbox;
+  display: flex;
+  padding-left: 0;
+  list-style: none;
+  border-radius: .25rem;
+}
+
+.page-item.active .page-link {
+  z-index: 1;
+  color: #fff;
+  background-color: #0074B6;
+  border-color: #0074B6;
+}
+
+a:not([href]):not([tabindex]) {
+  color: inherit;
+  text-decoration: none;
+}
+
+.page-link {
+  position: relative;
+  display: block;
+  padding: .5rem .75rem;
+  margin-left: -1px;
+  line-height: 1.25;
+  color: #0074B6;
+  background-color: #fff;
+  border: 1px solid #dee2e6;
+
+  &.separator {
+    font-size: 20px;
+  }
+}
+
+.page-item.disabled .page-link {
+  color: #6c757d;
+  pointer-events: none;
+  cursor: auto;
+  background-color: #fff;
+  border-color: #dee2e6;
+}
+
+.container-balanced {
+  @extend %page-center;
+}
+
+.flex-3 {
+  flex: 3;
+}
+
+.flex-update {
+  flex-direction: row;
+
+  @include breakpoint-xs {
+    flex-direction: row;
+  }
+
+  @include breakpoint-s {
+    flex-direction: row;
+  }
+}
+
+.flex-custom {
+  display: flex;
+
+  // @include breakpoint-xs {
+  flex-direction: column;
+  // }
+}
+
+.flex-custom-m {
+  @include breakpoint-xs {
+    flex-direction: column;
+  }
+}
+
+.example-header-image {
+  width: auto;
+  height: auto;
+}
+
+.margin-0 {
+  margin: 0;
+}
+
+.pad-4 {
+  padding: 0 0 0 $size-s;
+}
+
+.mobile-margin {
+  @include breakpoint-xs {
+    margin-top: $size-s;
+  }
+}
+
+.filter {
+  .filter-option {
+    margin: $size-s $size-s;
+    /* border-bottom: darkslateblue; */
+    border-radius: 0;
+    border-bottom-width: 2px;
+    border-top-width: 0;
+    border-left-width: 0;
+    border-right-width: 0;
+  }
+
+  .filter-option:first-child {
+    margin-left: 0;
+  }
+}
+
+.recent-tabs {
+  box-shadow: none !important;
+  border-radius: unset;
+  background: inherit !important;
+}
+
+.no-shadow {
+  box-shadow: none !important;
+}
+
+.mat-card-title{
+  // margin-left: -31px !important;
+  font-size: 20px !important;
+}
+
+.reportsDemo {
+    .reportsDemoVideo {
+      width: 200px;
+      height: 140px;
+      border-radius: 5px;
+      background-color: #FDEAD5;
+      font-weight: 600;
+      pointer-events: all;
+      cursor: pointer;
+
+      .video_icon {
+        font-size: 32px;
+      }
+    }
+  }
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.spec.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.spec.ts
new file mode 100644
index 000000000..59df50938
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
+
+import { ApprovalPendingComponent } from './approval-pending.component'
+
+describe('ApprovalPendingComponent', () => {
+  let component: ApprovalPendingComponent
+  let fixture: ComponentFixture<ApprovalPendingComponent>
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ApprovalPendingComponent],
+    })
+    .compileComponents()
+  }))
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ApprovalPendingComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
+
+  it('should create', () => {
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
new file mode 100644
index 000000000..65a42f55e
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
@@ -0,0 +1,237 @@
+import { Component, OnDestroy, OnInit } from '@angular/core'
+import { ActivatedRoute, Router } from '@angular/router'
+import { DomSanitizer, SafeHtml } from '@angular/platform-browser'
+import { MatDialog, MatSnackBar, PageEvent } from '@angular/material'
+import { EventService } from '@sunbird-cb/utils'
+
+/* tslint:disable */
+import _ from 'lodash'
+/* tslint:enable */
+
+import { ITableData } from '@sunbird-cb/collection/lib/ui-org-table/interface/interfaces'
+import { TelemetryEvents } from '../../../../../head/_services/telemetry.event.model'
+import { ReportsVideoComponent } from '../../reports-video/reports-video.component'
+import { ApprovalsService } from '../../../services/approvals.service'
+
+@Component({
+  selector: 'ws-approval-pending',
+  templateUrl: './approval-pending.component.html',
+  styleUrls: ['./approval-pending.component.scss'],
+})
+
+export class ApprovalPendingComponent implements OnInit, OnDestroy {
+
+  data: any = []
+  currentFilter = 'pending'
+  discussionList!: any
+  discussProfileData!: any
+  departName = ''
+  approvalTotalCount = 0
+  limit = 20
+  pageIndex = 0
+  currentOffset = 0
+  tabledata: ITableData = {
+    // actions: [{ name: 'Approve', label: 'Approve', icon: 'remove_red_eye', type: 'Approve' },
+    // { name: 'Reject', label: 'Reject', icon: 'remove_red_eye', type: 'Reject' }],
+    actions: [],
+    columns: [
+      { displayName: 'Full name', key: 'fullname' },
+      { displayName: 'Requested on', key: 'requestedon' },
+      { displayName: 'Fields', key: 'fields', isList: true },
+      { displayName: 'Tags', key: 'tag', isList: true },
+    ],
+    needCheckBox: false,
+    needHash: false,
+    sortColumn: 'fullname',
+    sortState: 'asc',
+    needUserMenus: false,
+  }
+  configSvc: any
+  reportsNoteList: string[] = []
+
+  constructor(
+    private router: Router,
+    private apprService: ApprovalsService,
+    private activeRouter: ActivatedRoute,
+    private route: ActivatedRoute,
+    private events: EventService,
+    public dialog: MatDialog,
+    private sanitizer: DomSanitizer,
+    private snackbar: MatSnackBar) {
+    this.configSvc = this.route.parent && this.route.parent.snapshot.data.configService
+    if (this.activeRouter.parent && this.activeRouter.parent.snapshot.data.configService.unMappedUser.channel
+    ) {
+      this.departName = _.get(this.activeRouter, 'parent.snapshot.data.configService.unMappedUser.channel')
+    }
+  }
+
+  ngOnInit() {
+    this.currentFilter = this.route.snapshot.params['tab']
+    this.currentFilter = this.currentFilter === 'upload' ? 'uploadApprovals' : 'pending'
+    if (this.currentFilter === 'pending') {
+      this.fetchApprovals()
+    }
+
+    this.reportsNoteList = [
+      // tslint:disable-next-line: max-line-length
+      `Profile Verifications: Review and approve/reject user requests for verification of one or more primary fields.`,
+      // tslint:disable-next-line: max-line-length
+      `Transfers: Manage user transfer requests, including approving/rejecting transfers. You will receive these request in the “Transfers” section.`,
+      // tslint:disable-next-line: max-line-length
+      `You can update multiple user profiles in one go by using Bulk Profile Update.`,
+    ]
+  }
+
+  sanitizeHtml(html: string): SafeHtml {
+    return this.sanitizer.bypassSecurityTrustHtml(html)
+  }
+
+  openVideoPopup() {
+    this.dialog.open(ReportsVideoComponent, {
+      data: {
+        videoLink: 'https://www.youtube.com/embed/tgbNymZ7vqY?autoplay=1&mute=1',
+      },
+      disableClose: true,
+      width: '50%',
+      height: '60%',
+      panelClass: 'overflow-visable',
+    })
+  }
+
+  filter(key: string | 'timestamp' | 'best' | 'saved') {
+    if (key) {
+      this.currentFilter = key
+      if (key === 'pending') {
+        this.fetchApprovals()
+      }
+    }
+  }
+
+  public tabTelemetry(label: string, index: number) {
+    const data: TelemetryEvents.ITelemetryTabData = {
+      label,
+      index,
+    }
+    this.events.handleTabTelemetry(
+      TelemetryEvents.EnumInteractSubTypes.APPROVAL_TAB,
+      data,
+    )
+  }
+
+  onApprovalClick(approval: any) {
+    if (approval && approval.userWorkflow.userInfo) {
+      this.router.navigate([`/app/approvals/${approval.userWorkflow.userInfo.wid}/to-approve`])
+    }
+    // this.telemetrySvc.impression()
+    this.events.raiseInteractTelemetry(
+      {
+        type: TelemetryEvents.EnumInteractTypes.CLICK,
+        subType: TelemetryEvents.EnumInteractSubTypes.CARD_CONTENT,
+        id: TelemetryEvents.EnumIdtype.APPROVAL_ROW,
+      },
+      {
+        id: approval.userWorkflow.userInfo.wid,
+        type: TelemetryEvents.EnumIdtype.WORK_ORDER,
+      }
+    )
+
+  }
+
+  fetchApprovals() {
+    const conditions = [
+      ['location', 'Country'],
+      ['designation', 'Designation'],
+      ['group', 'Group'],
+      ['name', 'Organisation Name'],
+      ['orgNameOther', 'Other Organisation Name'],
+      ['industry', 'Industry'],
+      ['industryOther', 'Other Industry'],
+      ['doj', 'Date of Joining'],
+      ['organisationType', 'Type of Organisation'],
+      ['orgDesc', 'Organisation Description'],
+      ['verifiedKarmayogi', 'Verified Karmayogi'],
+    ]
+
+    if (this.departName) {
+      const req = {
+        serviceName: 'profile',
+        applicationStatus: 'SEND_FOR_APPROVAL',
+        deptName: this.departName,
+        offset: this.currentOffset,
+        limit: this.limit,
+      }
+      this.apprService.getApprovals(req).subscribe(res => {
+        this.data = []
+        let currentdate: Date
+        this.approvalTotalCount = res.result.count
+        const resData = res.result.data
+        resData.forEach((approval: any) => {
+          let keys = ''
+          approval.wfInfo.forEach((wf: any) => {
+            currentdate = new Date(wf.createdOn)
+            if (typeof wf.updateFieldValues === 'string') {
+              const fields = JSON.parse(wf.updateFieldValues)
+              if (fields.length > 0) {
+                fields.forEach((field: any) => {
+                  if (Object.keys(field.fromValue).length > 0) {
+
+                    keys += `${_.first(Object.keys(field.fromValue))}, `
+                  } else {
+                    keys += `${_.first(Object.keys(field.toValue))}, `
+                  }
+                })
+              }
+            }
+          })
+
+          this.data.push({
+
+            fullname: approval.userInfo ? `${approval.userInfo.first_name}` : '--',
+            // fullname: approval.userInfo ? `${approval.userInfo.first_name} ${approval.userInfo.last_name}` : '--',
+            // requestedon: `${currentdate.getDate()}
+            //   requestedon: `${currentdate.getDate()}
+            // ${moment(currentdate.getMonth() + 1, 'MM').format('MMM')}
+            // ${currentdate.getFullYear()}
+            // ${currentdate.getHours()} :
+            // ${currentdate.getMinutes()} :
+            // ${currentdate.getSeconds()}`,
+            // requestedon: this.datePipe.transform(currentdate, 'dd MMM y'),
+            // fields: keys.slice(0, -1),
+            requestedon: currentdate,
+            fields: this.replaceWords(keys, conditions),
+            userWorkflow: approval,
+            tag: (approval.userInfo && approval.userInfo.tag) ? `${approval.userInfo.tag}` : '',
+          })
+        })
+      })
+    } else {
+      this.snackbar.open('Please connect to your SPV admin, to update MDO name.')
+    }
+  }
+
+  get getTableData() {
+    if (this.data.length > 0) {
+      this.data.forEach((element: any) => {
+        // element.requestedon = this.datePipe.transform(element.requestedon, 'dd MMM y')
+        element.requestedon = element.requestedon
+      })
+    }
+    return this.data
+  }
+
+  replaceWords(inputString: any, wordConditions: any) {
+    return wordConditions.reduce((acc: any, [word, condition]: any) => {
+      return acc.replace(new RegExp(word, 'gi'), condition)
+    },                           inputString)
+  }
+
+  onPaginateChange(event: PageEvent) {
+    this.pageIndex = event.pageIndex
+    this.limit = event.pageSize
+    this.currentOffset = event.pageIndex
+    this.fetchApprovals()
+  }
+
+  ngOnDestroy(): void { }
+
+}
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.html
index cad237433..d9d38a349 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.html
@@ -1,14 +1,6 @@
-<div class="flex flex-4 flex-column">
+<router-outlet></router-outlet>
+<!-- <div class="flex flex-4 flex-column">
   <mat-card>
-    <!-- <mat-card-header class="flex-custom-m">
-      <div class="flex-1" role="link" tabindex="0">
-        <div class="flex flex-1">
-          <mat-card-title class="flex-4 mobile-margin text-capitalize">
-            <span class="mat-subheading-1">Approvals</span>
-          </mat-card-title>
-        </div>
-      </div>
-    </mat-card-header> -->
     <mat-card-title class="flex-4 mobile-margin text-capitalize">
       <span class="mat-subheading-1">Approvals</span>
     </mat-card-title>
@@ -63,4 +55,4 @@
       </ng-container>
     </mat-card-content>
   </mat-card>
-</div>
\ No newline at end of file
+</div> -->
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.scss b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.scss
index 4df45e821..b2d7809ec 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.scss
@@ -1,307 +1,307 @@
-@import 'ws-common';
-@import 'ws-vars';
-@import 'ws-mixins';
-
-.buton {
-  display: flex;
-  border: 1px solid;
-  flex: 1;
-  background: red;
-  align-content: center;
-  text-align: center;
-}
-
-.flex-4 {
-  flex: 4;
-}
-
-.mob {
-  @include breakpoint-xs {
-    bottom: 0 !important;
-    position: unset !important;
-  }
-}
-
-.font-medium {
-  font-weight: 500 !important;
-}
-.text-center{
-  text-align: center;
-  margin: 10px;
-}
-.bottom-fix {
-  bottom: 1.5rem;
-  position: absolute;
-}
-
-.view-more {
-  display: flex;
-  align-items: center;
-  text-align: center;
-  border: 1px solid;
-
-  .icon {
-    $icon-size: 24px;
-    font-size: $icon-size;
-    width: $icon-size;
-    height: $icon-size;
-    border: 1px solid;
-    border-radius: 50%;
-    padding: 8px;
-    margin-bottom: 8px;
-    margin-right: $size-s;
-  }
-}
-
-.view-all {
-  display: flex;
-  margin: 0 auto;
-  // border: 1px solid;
-  // font-weight: 500;
-  box-shadow: 0px 10px 30p;
-  /*#99999933*/
-  border-radius: 8px;
-}
-
-
-
-.text-box {
-  display: flex;
-  border: 1px solid;
-  flex: 3;
-  align-content: center;
-  text-align: center;
-}
-
-.margin-fix {
-  @include breakpoint-xs {
-    margin: 0 $size-l 0 $size-l;
-  }
-
-  @include breakpoint-s {
-    margin: 0 $size-l 0 $size-l;
-  }
-}
-
-.overflow {
-  // @include breakpoint-xs {
-  //   width: 10em;
-  //   // outline: 1px solid #000;
-  //   margin: 0 0 2em 0;
-  //   text-overflow: ellipsis !important;
-  //   /**
-  //  * Required properties to achieve text-overflow
-  //  */
-  //   white-space: nowrap;
-  //   overflow: hidden;
-  // }
-  overflow: hidden;
-}
-
-.custom {
-
-  // height: 48px;
-  // max-height: 48px;
-  @include breakpoint-xs {
-    flex-direction: column;
-  }
-
-  @include breakpoint-s {
-    flex-direction: column;
-  }
-}
-
-.discuss-border {
-  border-radius: 4px;
-  /*.75rem;*/
-  border: 1px solid #DEDFE0;
-  flex: 1;
-  // max-width: 500px;
-  /* border-color: #cecece;*/
-}
-
-.discuss .mat-form-field-wrapper {
-  padding-bottom: 0px;
-
-  .mat-form-field-infix {
-    border-top-width: 5px !important;
-    padding: 0px;
-    padding-bottom: 5px;
-  }
-
-}
-
-
-.flex-3 {
-  flex: 3;
-}
-
-.filter {
-  .filter-option {
-    margin: $size-xs $size-m;
-    /* border-bottom: darkslateblue; */
-    border-radius: 0;
-    border-bottom-width: 2px;
-    border-top-width: 0;
-    border-left-width: 0;
-    border-right-width: 0;
-  }
-}
-
-.max-height-60 {
-  max-height: 60px;
-}
-
-.height-48 {
-  max-height: 48px;
-}
-
-.pagination {
-  justify-content: center;
-  flex-wrap: wrap;
-  margin-top: 0;
-  margin-bottom: 1rem;
-}
-
-.pagination {
-  display: -ms-flexbox;
-  display: flex;
-  padding-left: 0;
-  list-style: none;
-  border-radius: .25rem;
-}
-
-.page-item.active .page-link {
-  z-index: 1;
-  color: #fff;
-  background-color: #0074B6;
-  border-color: #0074B6;
-}
-
-a:not([href]):not([tabindex]) {
-  color: inherit;
-  text-decoration: none;
-}
-
-.page-link {
-  position: relative;
-  display: block;
-  padding: .5rem .75rem;
-  margin-left: -1px;
-  line-height: 1.25;
-  color: #0074B6;
-  background-color: #fff;
-  border: 1px solid #dee2e6;
-
-  &.separator {
-    font-size: 20px;
-  }
-}
-
-.page-item.disabled .page-link {
-  color: #6c757d;
-  pointer-events: none;
-  cursor: auto;
-  background-color: #fff;
-  border-color: #dee2e6;
-}
-
-.container-balanced {
-  @extend %page-center;
-}
-
-.flex-3 {
-  flex: 3;
-}
-
-.flex-update {
-  flex-direction: row;
-
-  @include breakpoint-xs {
-    flex-direction: row;
-  }
-
-  @include breakpoint-s {
-    flex-direction: row;
-  }
-}
-
-.flex-custom {
-  display: flex;
-
-  // @include breakpoint-xs {
-  flex-direction: column;
-  // }
-}
-
-.flex-custom-m {
-  @include breakpoint-xs {
-    flex-direction: column;
-  }
-}
-
-.example-header-image {
-  width: auto;
-  height: auto;
-}
-
-.margin-0 {
-  margin: 0;
-}
-
-.pad-4 {
-  padding: 0 0 0 $size-s;
-}
-
-.mobile-margin {
-  @include breakpoint-xs {
-    margin-top: $size-s;
-  }
-}
-
-.filter {
-  .filter-option {
-    margin: $size-s $size-s;
-    /* border-bottom: darkslateblue; */
-    border-radius: 0;
-    border-bottom-width: 2px;
-    border-top-width: 0;
-    border-left-width: 0;
-    border-right-width: 0;
-  }
-
-  .filter-option:first-child {
-    margin-left: 0;
-  }
-}
-
-.recent-tabs {
-  box-shadow: none !important;
-  border-radius: unset;
-  background: inherit !important;
-}
-
-.no-shadow {
-  box-shadow: none !important;
-}
-
-.mat-card-title{
-  // margin-left: -31px !important;
-  font-size: 20px !important;
-}
-
-.reportsDemo {
-    .reportsDemoVideo {
-      width: 200px;
-      height: 140px;
-      border-radius: 5px;
-      background-color: #FDEAD5;
-      font-weight: 600;
-      pointer-events: all;
-      cursor: pointer;
-
-      .video_icon {
-        font-size: 32px;
-      }
-    }
-  }
+// @import 'ws-common';
+// @import 'ws-vars';
+// @import 'ws-mixins';
+
+// .buton {
+//   display: flex;
+//   border: 1px solid;
+//   flex: 1;
+//   background: red;
+//   align-content: center;
+//   text-align: center;
+// }
+
+// .flex-4 {
+//   flex: 4;
+// }
+
+// .mob {
+//   @include breakpoint-xs {
+//     bottom: 0 !important;
+//     position: unset !important;
+//   }
+// }
+
+// .font-medium {
+//   font-weight: 500 !important;
+// }
+// .text-center{
+//   text-align: center;
+//   margin: 10px;
+// }
+// .bottom-fix {
+//   bottom: 1.5rem;
+//   position: absolute;
+// }
+
+// .view-more {
+//   display: flex;
+//   align-items: center;
+//   text-align: center;
+//   border: 1px solid;
+
+//   .icon {
+//     $icon-size: 24px;
+//     font-size: $icon-size;
+//     width: $icon-size;
+//     height: $icon-size;
+//     border: 1px solid;
+//     border-radius: 50%;
+//     padding: 8px;
+//     margin-bottom: 8px;
+//     margin-right: $size-s;
+//   }
+// }
+
+// .view-all {
+//   display: flex;
+//   margin: 0 auto;
+//   // border: 1px solid;
+//   // font-weight: 500;
+//   box-shadow: 0px 10px 30p;
+//   /*#99999933*/
+//   border-radius: 8px;
+// }
+
+
+
+// .text-box {
+//   display: flex;
+//   border: 1px solid;
+//   flex: 3;
+//   align-content: center;
+//   text-align: center;
+// }
+
+// .margin-fix {
+//   @include breakpoint-xs {
+//     margin: 0 $size-l 0 $size-l;
+//   }
+
+//   @include breakpoint-s {
+//     margin: 0 $size-l 0 $size-l;
+//   }
+// }
+
+// .overflow {
+//   // @include breakpoint-xs {
+//   //   width: 10em;
+//   //   // outline: 1px solid #000;
+//   //   margin: 0 0 2em 0;
+//   //   text-overflow: ellipsis !important;
+//   //   /**
+//   //  * Required properties to achieve text-overflow
+//   //  */
+//   //   white-space: nowrap;
+//   //   overflow: hidden;
+//   // }
+//   overflow: hidden;
+// }
+
+// .custom {
+
+//   // height: 48px;
+//   // max-height: 48px;
+//   @include breakpoint-xs {
+//     flex-direction: column;
+//   }
+
+//   @include breakpoint-s {
+//     flex-direction: column;
+//   }
+// }
+
+// .discuss-border {
+//   border-radius: 4px;
+//   /*.75rem;*/
+//   border: 1px solid #DEDFE0;
+//   flex: 1;
+//   // max-width: 500px;
+//   /* border-color: #cecece;*/
+// }
+
+// .discuss .mat-form-field-wrapper {
+//   padding-bottom: 0px;
+
+//   .mat-form-field-infix {
+//     border-top-width: 5px !important;
+//     padding: 0px;
+//     padding-bottom: 5px;
+//   }
+
+// }
+
+
+// .flex-3 {
+//   flex: 3;
+// }
+
+// .filter {
+//   .filter-option {
+//     margin: $size-xs $size-m;
+//     /* border-bottom: darkslateblue; */
+//     border-radius: 0;
+//     border-bottom-width: 2px;
+//     border-top-width: 0;
+//     border-left-width: 0;
+//     border-right-width: 0;
+//   }
+// }
+
+// .max-height-60 {
+//   max-height: 60px;
+// }
+
+// .height-48 {
+//   max-height: 48px;
+// }
+
+// .pagination {
+//   justify-content: center;
+//   flex-wrap: wrap;
+//   margin-top: 0;
+//   margin-bottom: 1rem;
+// }
+
+// .pagination {
+//   display: -ms-flexbox;
+//   display: flex;
+//   padding-left: 0;
+//   list-style: none;
+//   border-radius: .25rem;
+// }
+
+// .page-item.active .page-link {
+//   z-index: 1;
+//   color: #fff;
+//   background-color: #0074B6;
+//   border-color: #0074B6;
+// }
+
+// a:not([href]):not([tabindex]) {
+//   color: inherit;
+//   text-decoration: none;
+// }
+
+// .page-link {
+//   position: relative;
+//   display: block;
+//   padding: .5rem .75rem;
+//   margin-left: -1px;
+//   line-height: 1.25;
+//   color: #0074B6;
+//   background-color: #fff;
+//   border: 1px solid #dee2e6;
+
+//   &.separator {
+//     font-size: 20px;
+//   }
+// }
+
+// .page-item.disabled .page-link {
+//   color: #6c757d;
+//   pointer-events: none;
+//   cursor: auto;
+//   background-color: #fff;
+//   border-color: #dee2e6;
+// }
+
+// .container-balanced {
+//   @extend %page-center;
+// }
+
+// .flex-3 {
+//   flex: 3;
+// }
+
+// .flex-update {
+//   flex-direction: row;
+
+//   @include breakpoint-xs {
+//     flex-direction: row;
+//   }
+
+//   @include breakpoint-s {
+//     flex-direction: row;
+//   }
+// }
+
+// .flex-custom {
+//   display: flex;
+
+//   // @include breakpoint-xs {
+//   flex-direction: column;
+//   // }
+// }
+
+// .flex-custom-m {
+//   @include breakpoint-xs {
+//     flex-direction: column;
+//   }
+// }
+
+// .example-header-image {
+//   width: auto;
+//   height: auto;
+// }
+
+// .margin-0 {
+//   margin: 0;
+// }
+
+// .pad-4 {
+//   padding: 0 0 0 $size-s;
+// }
+
+// .mobile-margin {
+//   @include breakpoint-xs {
+//     margin-top: $size-s;
+//   }
+// }
+
+// .filter {
+//   .filter-option {
+//     margin: $size-s $size-s;
+//     /* border-bottom: darkslateblue; */
+//     border-radius: 0;
+//     border-bottom-width: 2px;
+//     border-top-width: 0;
+//     border-left-width: 0;
+//     border-right-width: 0;
+//   }
+
+//   .filter-option:first-child {
+//     margin-left: 0;
+//   }
+// }
+
+// .recent-tabs {
+//   box-shadow: none !important;
+//   border-radius: unset;
+//   background: inherit !important;
+// }
+
+// .no-shadow {
+//   box-shadow: none !important;
+// }
+
+// .mat-card-title{
+//   // margin-left: -31px !important;
+//   font-size: 20px !important;
+// }
+
+// .reportsDemo {
+//     .reportsDemoVideo {
+//       width: 200px;
+//       height: 140px;
+//       border-radius: 5px;
+//       background-color: #FDEAD5;
+//       font-weight: 600;
+//       pointer-events: all;
+//       cursor: pointer;
+
+//       .video_icon {
+//         font-size: 32px;
+//       }
+//     }
+//   }
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
index 03799a104..76799b7c1 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approvals.component.ts
@@ -1,16 +1,16 @@
 
 import { Component, OnDestroy, OnInit } from '@angular/core'
-import { ActivatedRoute, Router } from '@angular/router'
-import { ApprovalsService } from '../../services/approvals.service'
-// import moment from 'moment'
-import { ITableData } from '@sunbird-cb/collection/lib/ui-org-table/interface/interfaces'
-import { MatDialog, MatSnackBar, PageEvent } from '@angular/material'
-/* tslint:disable */
-import _ from 'lodash'
-import { EventService } from '@sunbird-cb/utils'
-import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
-import { DomSanitizer, SafeHtml } from '@angular/platform-browser'
-import { ReportsVideoComponent } from '../reports-video/reports-video.component'
+// import { ActivatedRoute, Router } from '@angular/router'
+// import { ApprovalsService } from '../../services/approvals.service'
+// // import moment from 'moment'
+// import { ITableData } from '@sunbird-cb/collection/lib/ui-org-table/interface/interfaces'
+// import { MatDialog, MatSnackBar, PageEvent } from '@angular/material'
+// /* tslint:disable */
+// import _ from 'lodash'
+// import { EventService } from '@sunbird-cb/utils'
+// import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
+// import { DomSanitizer, SafeHtml } from '@angular/platform-browser'
+// import { ReportsVideoComponent } from '../reports-video/reports-video.component'
 /* tslint:enable */
 @Component({
   selector: 'ws-app-approvals',
@@ -18,216 +18,219 @@ import { ReportsVideoComponent } from '../reports-video/reports-video.component'
   styleUrls: ['./approvals.component.scss'],
 })
 export class ApprovalsComponent implements OnInit, OnDestroy {
-  data: any = []
-  currentFilter = 'pending'
-  discussionList!: any
-  discussProfileData!: any
-  departName = ''
-  approvalTotalCount = 0
-  limit = 20
-  pageIndex = 0
-  currentOffset = 0
-  tabledata: ITableData = {
-    // actions: [{ name: 'Approve', label: 'Approve', icon: 'remove_red_eye', type: 'Approve' },
-    // { name: 'Reject', label: 'Reject', icon: 'remove_red_eye', type: 'Reject' }],
-    actions: [],
-    columns: [
-      { displayName: 'Full name', key: 'fullname' },
-      { displayName: 'Requested on', key: 'requestedon' },
-      { displayName: 'Fields', key: 'fields', isList: true },
-      { displayName: 'Tags', key: 'tag', isList: true },
-    ],
-    needCheckBox: false,
-    needHash: false,
-    sortColumn: 'fullname',
-    sortState: 'asc',
-    needUserMenus: false,
-  }
-  configSvc: any
-  reportsNoteList: string[] = []
-
-  constructor(
-    private router: Router,
-    private apprService: ApprovalsService,
-    private activeRouter: ActivatedRoute,
-    private route: ActivatedRoute,
-    private events: EventService,
-    public dialog: MatDialog,
-    private sanitizer: DomSanitizer,
-    private snackbar: MatSnackBar) {
-    this.configSvc = this.route.parent && this.route.parent.snapshot.data.configService
-    if (this.activeRouter.parent && this.activeRouter.parent.snapshot.data.configService.unMappedUser.channel
-    ) {
-      this.departName = _.get(this.activeRouter, 'parent.snapshot.data.configService.unMappedUser.channel')
-    }
-  }
+  // data: any = []
+  // currentFilter = 'pending'
+  // discussionList!: any
+  // discussProfileData!: any
+  // departName = ''
+  // approvalTotalCount = 0
+  // limit = 20
+  // pageIndex = 0
+  // currentOffset = 0
+  // tabledata: ITableData = {
+  //   // actions: [{ name: 'Approve', label: 'Approve', icon: 'remove_red_eye', type: 'Approve' },
+  //   // { name: 'Reject', label: 'Reject', icon: 'remove_red_eye', type: 'Reject' }],
+  //   actions: [],
+  //   columns: [
+  //     { displayName: 'Full name', key: 'fullname' },
+  //     { displayName: 'Requested on', key: 'requestedon' },
+  //     { displayName: 'Fields', key: 'fields', isList: true },
+  //     { displayName: 'Tags', key: 'tag', isList: true },
+  //   ],
+  //   needCheckBox: false,
+  //   needHash: false,
+  //   sortColumn: 'fullname',
+  //   sortState: 'asc',
+  //   needUserMenus: false,
+  // }
+  // configSvc: any
+  // reportsNoteList: string[] = []
+
+  // constructor(
+  //   private router: Router,
+  //   private apprService: ApprovalsService,
+  //   private activeRouter: ActivatedRoute,
+  //   private route: ActivatedRoute,
+  //   private events: EventService,
+  //   public dialog: MatDialog,
+  //   private sanitizer: DomSanitizer,
+  //   private snackbar: MatSnackBar) {
+  //   this.configSvc = this.route.parent && this.route.parent.snapshot.data.configService
+  //   if (this.activeRouter.parent && this.activeRouter.parent.snapshot.data.configService.unMappedUser.channel
+  //   ) {
+  //     this.departName = _.get(this.activeRouter, 'parent.snapshot.data.configService.unMappedUser.channel')
+  //   }
+  // }
+
+  constructor() { }
 
   ngOnInit() {
-    this.currentFilter = this.route.snapshot.params['tab']
-    this.currentFilter = this.currentFilter === 'upload' ? 'uploadApprovals' : 'pending'
-    if (this.currentFilter === 'pending') {
-      this.fetchApprovals()
-    }
-
-    this.reportsNoteList = [
-      // tslint:disable-next-line: max-line-length
-      `Profile Verifications: Review and approve/reject user requests for verification of one or more primary fields.`,
-      // tslint:disable-next-line: max-line-length
-      `Transfers: Manage user transfer requests, including approving/rejecting transfers. You will receive these request in the “Transfers” section.`,
-      // tslint:disable-next-line: max-line-length
-      `You can update multiple user profiles in one go by using Bulk Profile Update.`,
-    ]
-  }
-
-  sanitizeHtml(html: string): SafeHtml {
-    return this.sanitizer.bypassSecurityTrustHtml(html)
-  }
-
-  openVideoPopup() {
-    this.dialog.open(ReportsVideoComponent, {
-      data: {
-        videoLink: 'https://www.youtube.com/embed/tgbNymZ7vqY?autoplay=1&mute=1',
-      },
-      disableClose: true,
-      width: '50%',
-      height: '60%',
-      panelClass: 'overflow-visable',
-    })
-  }
-
-  filter(key: string | 'timestamp' | 'best' | 'saved') {
-    if (key) {
-      this.currentFilter = key
-      if (key === 'pending') {
-        this.fetchApprovals()
-      }
-    }
-  }
-
-  public tabTelemetry(label: string, index: number) {
-    const data: TelemetryEvents.ITelemetryTabData = {
-      label,
-      index,
-    }
-    this.events.handleTabTelemetry(
-      TelemetryEvents.EnumInteractSubTypes.APPROVAL_TAB,
-      data,
-    )
+    //   this.currentFilter = this.route.snapshot.params['tab']
+    //   this.currentFilter = this.currentFilter === 'upload' ? 'uploadApprovals' : 'pending'
+    //   if (this.currentFilter === 'pending') {
+    //     // this.fetchApprovals()
+    //   }
+
+    //   this.reportsNoteList = [
+    //     // tslint:disable-next-line: max-line-length
+    //     `Profile Verifications: Review and approve/reject user requests for verification of one or more primary fields.`,
+    //     // tslint:disable-next-line: max-line-length
+    //     `Transfers: Manage user transfer requests, including approving/rejecting transfers.
+    // You will receive these request in the “Transfers” section.`,
+    //     // tslint:disable-next-line: max-line-length
+    //     `You can update multiple user profiles in one go by using Bulk Profile Update.`,
+    //   ]
   }
 
-  onApprovalClick(approval: any) {
-    if (approval && approval.userWorkflow.userInfo) {
-      this.router.navigate([`/app/approvals/${approval.userWorkflow.userInfo.wid}/to-approve`])
-    }
-    // this.telemetrySvc.impression()
-    this.events.raiseInteractTelemetry(
-      {
-        type: TelemetryEvents.EnumInteractTypes.CLICK,
-        subType: TelemetryEvents.EnumInteractSubTypes.CARD_CONTENT,
-        id: TelemetryEvents.EnumIdtype.APPROVAL_ROW,
-      },
-      {
-        id: approval.userWorkflow.userInfo.wid,
-        type: TelemetryEvents.EnumIdtype.WORK_ORDER,
-      }
-    )
-
-  }
-
-  fetchApprovals() {
-    const conditions = [
-      ['location', 'Country'],
-      ['designation', 'Designation'],
-      ['group', 'Group'],
-      ['name', 'Organisation Name'],
-      ['orgNameOther', 'Other Organisation Name'],
-      ['industry', 'Industry'],
-      ['industryOther', 'Other Industry'],
-      ['doj', 'Date of Joining'],
-      ['organisationType', 'Type of Organisation'],
-      ['orgDesc', 'Organisation Description'],
-      ['verifiedKarmayogi', 'Verified Karmayogi'],
-    ]
-
-    if (this.departName) {
-      const req = {
-        serviceName: 'profile',
-        applicationStatus: 'SEND_FOR_APPROVAL',
-        deptName: this.departName,
-        offset: this.currentOffset,
-        limit: this.limit,
-      }
-      this.apprService.getApprovals(req).subscribe(res => {
-        this.data = []
-        let currentdate: Date
-        this.approvalTotalCount = res.result.count
-        const resData = res.result.data
-        resData.forEach((approval: any) => {
-          let keys = ''
-          approval.wfInfo.forEach((wf: any) => {
-            currentdate = new Date(wf.createdOn)
-            if (typeof wf.updateFieldValues === 'string') {
-              const fields = JSON.parse(wf.updateFieldValues)
-              if (fields.length > 0) {
-                fields.forEach((field: any) => {
-                  if (Object.keys(field.fromValue).length > 0) {
-
-                    keys += `${_.first(Object.keys(field.fromValue))}, `
-                  } else {
-                    keys += `${_.first(Object.keys(field.toValue))}, `
-                  }
-                })
-              }
-            }
-          })
-
-          this.data.push({
-
-            fullname: approval.userInfo ? `${approval.userInfo.first_name}` : '--',
-            // fullname: approval.userInfo ? `${approval.userInfo.first_name} ${approval.userInfo.last_name}` : '--',
-            // requestedon: `${currentdate.getDate()}
-            //   requestedon: `${currentdate.getDate()}
-            // ${moment(currentdate.getMonth() + 1, 'MM').format('MMM')}
-            // ${currentdate.getFullYear()}
-            // ${currentdate.getHours()} :
-            // ${currentdate.getMinutes()} :
-            // ${currentdate.getSeconds()}`,
-            // requestedon: this.datePipe.transform(currentdate, 'dd MMM y'),
-            // fields: keys.slice(0, -1),
-            requestedon: currentdate,
-            fields: this.replaceWords(keys, conditions),
-            userWorkflow: approval,
-            tag: (approval.userInfo && approval.userInfo.tag) ? `${approval.userInfo.tag}` : '',
-          })
-        })
-      })
-    } else {
-      this.snackbar.open('Please connect to your SPV admin, to update MDO name.')
-    }
-  }
-
-  get getTableData() {
-    if (this.data.length > 0) {
-      this.data.forEach((element: any) => {
-        // element.requestedon = this.datePipe.transform(element.requestedon, 'dd MMM y')
-        element.requestedon = element.requestedon
-      })
-    }
-    return this.data
-  }
-
-  replaceWords(inputString: any, wordConditions: any) {
-    return wordConditions.reduce((acc: any, [word, condition]: any) => {
-      return acc.replace(new RegExp(word, 'gi'), condition)
-    },                           inputString)
-  }
-
-  onPaginateChange(event: PageEvent) {
-    this.pageIndex = event.pageIndex
-    this.limit = event.pageSize
-    this.currentOffset = event.pageIndex
-    this.fetchApprovals()
-  }
+  // sanitizeHtml(html: string): SafeHtml {
+  //   return this.sanitizer.bypassSecurityTrustHtml(html)
+  // }
+
+  // openVideoPopup() {
+  //   this.dialog.open(ReportsVideoComponent, {
+  //     data: {
+  //       videoLink: 'https://www.youtube.com/embed/tgbNymZ7vqY?autoplay=1&mute=1',
+  //     },
+  //     disableClose: true,
+  //     width: '50%',
+  //     height: '60%',
+  //     panelClass: 'overflow-visable',
+  //   })
+  // }
+
+  // filter(key: string | 'timestamp' | 'best' | 'saved') {
+  //   if (key) {
+  //     this.currentFilter = key
+  //     if (key === 'pending') {
+  //       this.fetchApprovals()
+  //     }
+  //   }
+  // }
+
+  // public tabTelemetry(label: string, index: number) {
+  //   const data: TelemetryEvents.ITelemetryTabData = {
+  //     label,
+  //     index,
+  //   }
+  //   this.events.handleTabTelemetry(
+  //     TelemetryEvents.EnumInteractSubTypes.APPROVAL_TAB,
+  //     data,
+  //   )
+  // }
+
+  // onApprovalClick(approval: any) {
+  //   if (approval && approval.userWorkflow.userInfo) {
+  //     this.router.navigate([`/app/approvals/${approval.userWorkflow.userInfo.wid}/to-approve`])
+  //   }
+  //   // this.telemetrySvc.impression()
+  //   this.events.raiseInteractTelemetry(
+  //     {
+  //       type: TelemetryEvents.EnumInteractTypes.CLICK,
+  //       subType: TelemetryEvents.EnumInteractSubTypes.CARD_CONTENT,
+  //       id: TelemetryEvents.EnumIdtype.APPROVAL_ROW,
+  //     },
+  //     {
+  //       id: approval.userWorkflow.userInfo.wid,
+  //       type: TelemetryEvents.EnumIdtype.WORK_ORDER,
+  //     }
+  //   )
+
+  // }
+
+  // fetchApprovals() {
+  //   const conditions = [
+  //     ['location', 'Country'],
+  //     ['designation', 'Designation'],
+  //     ['group', 'Group'],
+  //     ['name', 'Organisation Name'],
+  //     ['orgNameOther', 'Other Organisation Name'],
+  //     ['industry', 'Industry'],
+  //     ['industryOther', 'Other Industry'],
+  //     ['doj', 'Date of Joining'],
+  //     ['organisationType', 'Type of Organisation'],
+  //     ['orgDesc', 'Organisation Description'],
+  //     ['verifiedKarmayogi', 'Verified Karmayogi'],
+  //   ]
+
+  //   if (this.departName) {
+  //     const req = {
+  //       serviceName: 'profile',
+  //       applicationStatus: 'SEND_FOR_APPROVAL',
+  //       deptName: this.departName,
+  //       offset: this.currentOffset,
+  //       limit: this.limit,
+  //     }
+  //     this.apprService.getApprovals(req).subscribe(res => {
+  //       this.data = []
+  //       let currentdate: Date
+  //       this.approvalTotalCount = res.result.count
+  //       const resData = res.result.data
+  //       resData.forEach((approval: any) => {
+  //         let keys = ''
+  //         approval.wfInfo.forEach((wf: any) => {
+  //           currentdate = new Date(wf.createdOn)
+  //           if (typeof wf.updateFieldValues === 'string') {
+  //             const fields = JSON.parse(wf.updateFieldValues)
+  //             if (fields.length > 0) {
+  //               fields.forEach((field: any) => {
+  //                 if (Object.keys(field.fromValue).length > 0) {
+
+  //                   keys += `${_.first(Object.keys(field.fromValue))}, `
+  //                 } else {
+  //                   keys += `${_.first(Object.keys(field.toValue))}, `
+  //                 }
+  //               })
+  //             }
+  //           }
+  //         })
+
+  //         this.data.push({
+
+  //           fullname: approval.userInfo ? `${approval.userInfo.first_name}` : '--',
+  //           // fullname: approval.userInfo ? `${approval.userInfo.first_name} ${approval.userInfo.last_name}` : '--',
+  //           // requestedon: `${currentdate.getDate()}
+  //           //   requestedon: `${currentdate.getDate()}
+  //           // ${moment(currentdate.getMonth() + 1, 'MM').format('MMM')}
+  //           // ${currentdate.getFullYear()}
+  //           // ${currentdate.getHours()} :
+  //           // ${currentdate.getMinutes()} :
+  //           // ${currentdate.getSeconds()}`,
+  //           // requestedon: this.datePipe.transform(currentdate, 'dd MMM y'),
+  //           // fields: keys.slice(0, -1),
+  //           requestedon: currentdate,
+  //           fields: this.replaceWords(keys, conditions),
+  //           userWorkflow: approval,
+  //           tag: (approval.userInfo && approval.userInfo.tag) ? `${approval.userInfo.tag}` : '',
+  //         })
+  //       })
+  //     })
+  //   } else {
+  //     this.snackbar.open('Please connect to your SPV admin, to update MDO name.')
+  //   }
+  // }
+
+  // get getTableData() {
+  //   if (this.data.length > 0) {
+  //     this.data.forEach((element: any) => {
+  //       // element.requestedon = this.datePipe.transform(element.requestedon, 'dd MMM y')
+  //       element.requestedon = element.requestedon
+  //     })
+  //   }
+  //   return this.data
+  // }
+
+  // replaceWords(inputString: any, wordConditions: any) {
+  //   return wordConditions.reduce((acc: any, [word, condition]: any) => {
+  //     return acc.replace(new RegExp(word, 'gi'), condition)
+  //   },                           inputString)
+  // }
+
+  // onPaginateChange(event: PageEvent) {
+  //   this.pageIndex = event.pageIndex
+  //   this.limit = event.pageSize
+  //   this.currentOffset = event.pageIndex
+  //   this.fetchApprovals()
+  // }
 
   ngOnDestroy(): void { }
 }
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
new file mode 100644
index 000000000..e0b87c356
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
@@ -0,0 +1,89 @@
+<div class="flex flex-col gap-6">
+  <div class="flex flex-row gap-4 items-center">
+    <mat-icon>arrow_back</mat-icon>
+    <div class="flex font-bold">Bulk Profile Update</div>
+  </div>
+
+  <div class="flex flex-col gap-4 bulk-container">
+    <div class="flex font-bold">Bulk Profile Update</div>
+    <div class="flex flex-row gap-8">
+      <div class="flex-1">
+        <div class="flex flex-col gap-6 dashed-card">
+          <div>Open &amp; follow these instruction</div>
+          <div class="flex flex-col gap-4">
+            <ol class="custom-ol">
+              <li>Keep the row of the items you wish to process</li>
+              <li>Keep the row of the items you wish to process</li>
+              <li>Delete the entire row you do not intend to process</li>
+            </ol>
+          </div>
+          <div class="flex flex-row gap-6">
+            <button class="outline-button">Download Sample File</button>
+            <button class="outline-button">Supporting Document</button>
+          </div>
+        </div>
+      </div>
+      <div class="flex-1">
+        <div class="flex flex-col gap-4 dashed-card items-center">
+          <div class="img-div"></div>
+          <div class="flex flex-col items-center">
+            <div class="text-primary cursor-pointer">Browse files</div>
+            <div class="flex">or</div>
+            <div class="flex">Drag file to upload</div>
+          </div>
+          <div class="flex flex-col items-center">
+            <div class="flex">Max file size: 100 MB</div>
+            <div class="flex">Supported file types: CSV</div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="file-container">
+    <div class="flex flex-col gap-4">
+      <div class="flex flex-row justify-between items-center">
+        <div class="flex flex-row gap-1">
+          <div class="font-bold">File Information</div>
+          <mat-icon class="ws-mat-black40-text">info_outline</mat-icon>
+        </div>
+        <div class="flex flex-row gap-4 outline-button items-center">
+          <mat-icon>download_2</mat-icon>
+          Download error log
+        </div>
+      </div>
+      <div class="grid grid-flow-row sm:grid-flow-col gap-10 grid-col grid-container-25">
+        <div class="flex flex-col gap-1">
+          <div class="label">Name</div>
+          <div class="value">1710482612470_1710214198937_users-file-upload-sample (15).xlsx</div>
+        </div>
+        <div class="flex flex-col gap-1">
+          <div class="label">Status</div>
+          <div class="value">Failed</div>
+        </div>
+        <div class="flex flex-col gap-1">
+          <div class="label">Failed Records</div>
+          <div class="value">3</div>
+        </div>
+        <div class="flex flex-col gap-1">
+          <div class="label">Success Records</div>
+          <div class="value">0</div>
+        </div>
+      </div>
+      <div class="grid grid-flow-row sm:grid-flow-col gap-10 grid-col grid-container-25">
+        <div class="flex flex-col gap-1">
+          <div class="label">Total Records</div>
+          <div class="value">3</div>
+        </div>
+        <div class="flex flex-col gap-1">
+          <div class="label">Initiated On</div>
+          <div class="value">27 Jul 2023 3:15PM</div>
+        </div>
+        <div class="flex flex-col gap-1">
+          <div class="label">Completed ON</div>
+          <div class="value">27 Aug 2023 3:15PM</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.scss b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.scss
new file mode 100644
index 000000000..789ebde04
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.scss
@@ -0,0 +1,41 @@
+@import 'ws-common';
+
+.bulk-container, .file-container {
+  box-shadow: 0px 1px 5px 0px #0000001F, 0px 2px 2px 0px #00000024, 0px 3px 1px -2px #00000033;
+  padding: 24px;
+  border: 1px solid $border-color;
+
+  .label {
+    font-size: 12px;
+    font-weight: 400;
+    color: rgba($color: #000000, $alpha: 0.6);
+  }
+
+  .value {
+    font-size: 14px;
+    color: rgba($color: #000000, $alpha: 0.88);
+  }
+}
+
+.dashed-card {
+  border: 1px dashed $border-color;
+  padding: 24px;
+  font-size: 14px;
+
+  .custom-ol {
+    margin: 0px;
+    padding-left: 12px;
+  }
+
+  .img-div {
+    width: 80px;
+    height: 80px;
+    border: 1px dashed $border-color;
+    border-radius: 4px;
+  }
+
+  .text-primary {
+    color: $color-blue;
+    font-weight: bold;
+  }
+}
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.spec.ts b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.spec.ts
new file mode 100644
index 000000000..c3f682107
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
+
+import { BulkUploadComponent } from './bulk-upload.component'
+
+describe('BulkUploadComponent', () => {
+  let component: BulkUploadComponent
+  let fixture: ComponentFixture<BulkUploadComponent>
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [BulkUploadComponent],
+    })
+    .compileComponents()
+  }))
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(BulkUploadComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
+
+  it('should create', () => {
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
new file mode 100644
index 000000000..976b57521
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core'
+
+@Component({
+  selector: 'ws-bulk-upload',
+  templateUrl: './bulk-upload.component.html',
+  styleUrls: ['./bulk-upload.component.scss'],
+})
+export class BulkUploadComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/home/routes/home/home.component.scss b/project/ws/app/src/lib/routes/home/routes/home/home.component.scss
index 164f2462b..cfdad9d57 100644
--- a/project/ws/app/src/lib/routes/home/routes/home/home.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/home/home.component.scss
@@ -6,7 +6,7 @@
   @extend %page-center;
   height: auto;
   min-height: 85vh;
-  padding: 15px;
+  padding: 20px;
   box-sizing: border-box;
 }
 
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 7085ea286..d56d7cd48 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -67,6 +67,7 @@ import { environment } from '../environments/environment'
 import { PublicLogoutModule } from './routes/public/public-logout/public-logout.module'
 import { LoaderService } from './services/loader.service'
 import { ConfirmationBoxComponent } from '../../project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation.box.component'
+
 @Injectable()
 export class HammerConfig extends GestureConfig {
   buildHammer(element: HTMLElement) {

From f48ceffac4c051811fc4e29d36a9a4e38b70bf34 Mon Sep 17 00:00:00 2001
From: Vinod Kumar Shyave <121538586+vShyave@users.noreply.github.com>
Date: Fri, 26 Apr 2024 15:53:33 +0530
Subject: [PATCH 547/887] Bulk upload page setup and basic UI is ready

---
 .../bulk-upload/bulk-upload.component.scss    |  1 +
 src/styles/_ws-common.scss                    | 92 +++++++++++++++++++
 2 files changed, 93 insertions(+)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.scss b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.scss
index 789ebde04..6930e9f45 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.scss
@@ -1,4 +1,5 @@
 @import 'ws-common';
+// $border-color:
 
 .bulk-container, .file-container {
   box-shadow: 0px 1px 5px 0px #0000001F, 0px 2px 2px 0px #00000024, 0px 3px 1px -2px #00000033;
diff --git a/src/styles/_ws-common.scss b/src/styles/_ws-common.scss
index de9b43d04..53c9a6aa1 100644
--- a/src/styles/_ws-common.scss
+++ b/src/styles/_ws-common.scss
@@ -27,3 +27,95 @@
     height: calc(100% - #{$mat-toolbar-gt-xs});
   }
 }
+
+$border-color: rgba($color: #000, $alpha: 0.2);
+$color-blue: #1B4CA1;
+$color-green: #1D8923;
+$color-red: #D13924;
+
+::ng-deep .profile-form-field {
+  .mat-form-field-appearance-legacy,
+  .mat-form-field-wrapper {
+    padding-bottom: 0px !important;
+
+    .mat-form-field-flex {
+      display: flex;
+      align-items: center;
+
+      .mat-form-field-infix {
+        border-top: 0px !important;
+      }
+    }
+  }
+
+  .mat-form-field-underline {
+    height: 0px !important;
+  }
+
+  .mat-select {
+    padding: 12px 16px;
+    border: 1px solid rgba($color: #000000, $alpha: 0.14);
+    border-radius: 4px;
+    width: calc(100% - 36px);
+  }
+}
+
+.input-text {
+  padding: 12px 16px;
+  border-radius: 4px;
+  border: 1px solid rgba($color: #000000, $alpha: 0.14);
+  font-family: $font-family-lato;
+  letter-spacing: 0.25px;
+  width: calc(100% - 36px);
+}
+
+.grid-container-25 {
+  display: grid;
+  grid-template-columns: 1fr 1fr 1fr 1fr;
+  grid-auto-rows: auto;
+  gap: 24px;
+}
+
+.grid-container-33 {
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  grid-auto-rows: auto;
+  gap: 24px;
+}
+
+.role-chip {
+  padding: 8px 16px;
+  border-radius: 4px;
+  border: 1px solid $border-color;
+  color: rgba($color: #000, $alpha: 0.88);
+  text-transform: uppercase;
+  font-size: 14px;
+
+  .mat-checkbox {
+    display: flex;
+    align-items: center;
+  }
+}
+
+.button-common-css {
+  padding: 12px 16px;
+  border-radius: 4px;
+  cursor: pointer;
+  line-height: 16px;
+  font-size: 14px;
+  font-weight: 700;
+}
+
+.outline-button {
+  @extend .button-common-css;
+  color: $color-blue;
+  border: 1px solid $color-blue;
+  background-color: #FFF;
+}
+
+.action-button {
+  @extend .button-common-css;
+  color: #FFF;
+  background-color: $color-blue;
+  border: 1px solid $color-blue;
+}
\ No newline at end of file

From 9deffff8d5843b33e0c0e9a1289ecad1c5e2c02c Mon Sep 17 00:00:00 2001
From: Vinod Kumar Shyave <121538586+vShyave@users.noreply.github.com>
Date: Fri, 26 Apr 2024 17:01:03 +0530
Subject: [PATCH 548/887] Mat tabs & Paginator added

---
 .../bulk-upload/bulk-upload.component.html    | 100 ++++++++++--------
 .../bulk-upload/bulk-upload.component.scss    |   5 +
 .../bulk-upload/bulk-upload.component.ts      |  10 +-
 3 files changed, 71 insertions(+), 44 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
index e0b87c356..06f50bdcd 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
@@ -40,50 +40,64 @@
     </div>
   </div>
 
-  <div class="file-container">
-    <div class="flex flex-col gap-4">
-      <div class="flex flex-row justify-between items-center">
-        <div class="flex flex-row gap-1">
-          <div class="font-bold">File Information</div>
-          <mat-icon class="ws-mat-black40-text">info_outline</mat-icon>
-        </div>
-        <div class="flex flex-row gap-4 outline-button items-center">
-          <mat-icon>download_2</mat-icon>
-          Download error log
-        </div>
-      </div>
-      <div class="grid grid-flow-row sm:grid-flow-col gap-10 grid-col grid-container-25">
-        <div class="flex flex-col gap-1">
-          <div class="label">Name</div>
-          <div class="value">1710482612470_1710214198937_users-file-upload-sample (15).xlsx</div>
-        </div>
-        <div class="flex flex-col gap-1">
-          <div class="label">Status</div>
-          <div class="value">Failed</div>
-        </div>
-        <div class="flex flex-col gap-1">
-          <div class="label">Failed Records</div>
-          <div class="value">3</div>
-        </div>
-        <div class="flex flex-col gap-1">
-          <div class="label">Success Records</div>
-          <div class="value">0</div>
+  <mat-tab-group>
+    <mat-tab label="Recent upload">
+      Recent upload
+    </mat-tab>
+    <mat-tab label="Last uploads">
+      <div class="file-container mt-6" *ngFor="let item of [1, 2, 3]">
+        <div class="flex flex-col gap-4">
+          <div class="flex flex-row justify-between items-center">
+            <div class="flex flex-row gap-1">
+              <div class="font-bold">File Information</div>
+              <mat-icon class="ws-mat-black40-text">info_outline</mat-icon>
+            </div>
+            <div class="flex flex-row gap-2 outline-button items-center">
+              <mat-icon>download_2</mat-icon>
+              Download error log
+            </div>
+          </div>
+          <div class="grid grid-flow-row sm:grid-flow-col gap-10 grid-col grid-container-25">
+            <div class="flex flex-col">
+              <div class="label">Name</div>
+              <div class="value">1710482612470_1710214198937_users-file-upload-sample (15).xlsx</div>
+            </div>
+            <div class="flex flex-col">
+              <div class="label">Status</div>
+              <div class="value">Failed</div>
+            </div>
+            <div class="flex flex-col">
+              <div class="label">Failed Records</div>
+              <div class="value">3</div>
+            </div>
+            <div class="flex flex-col">
+              <div class="label">Success Records</div>
+              <div class="value">0</div>
+            </div>
+          </div>
+          <div class="grid grid-flow-row sm:grid-flow-col gap-10 grid-col grid-container-25">
+            <div class="flex flex-col">
+              <div class="label">Total Records</div>
+              <div class="value">3</div>
+            </div>
+            <div class="flex flex-col">
+              <div class="label">Initiated On</div>
+              <div class="value">27 Jul 2023 3:15PM</div>
+            </div>
+            <div class="flex flex-col">
+              <div class="label">Completed ON</div>
+              <div class="value">27 Aug 2023 3:15PM</div>
+            </div>
+          </div>
         </div>
       </div>
-      <div class="grid grid-flow-row sm:grid-flow-col gap-10 grid-col grid-container-25">
-        <div class="flex flex-col gap-1">
-          <div class="label">Total Records</div>
-          <div class="value">3</div>
-        </div>
-        <div class="flex flex-col gap-1">
-          <div class="label">Initiated On</div>
-          <div class="value">27 Jul 2023 3:15PM</div>
-        </div>
-        <div class="flex flex-col gap-1">
-          <div class="label">Completed ON</div>
-          <div class="value">27 Aug 2023 3:15PM</div>
-        </div>
+
+      <div class="flex flex-row justify-end mt-4">
+        <mat-paginator [pageSize]="pageSize" [length]="totalRecords" [pageSizeOptions]="[10, 25, 50]"
+          (page)="handleChangePage($event)"></mat-paginator>
       </div>
-    </div>
-  </div>
+    </mat-tab>
+  </mat-tab-group>
+
+
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.scss b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.scss
index 6930e9f45..d6ddac725 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.scss
@@ -14,8 +14,13 @@
 
   .value {
     font-size: 14px;
+    line-height: 18px;
     color: rgba($color: #000000, $alpha: 0.88);
   }
+
+  .outline-button {
+    padding: 8px 16px;
+  }
 }
 
 .dashed-card {
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
index 976b57521..1e3aff107 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
@@ -1,4 +1,5 @@
-import { Component, OnInit } from '@angular/core'
+import { Component, OnInit, Input } from '@angular/core'
+import { PageEvent } from '@angular/material'
 
 @Component({
   selector: 'ws-bulk-upload',
@@ -7,9 +8,16 @@ import { Component, OnInit } from '@angular/core'
 })
 export class BulkUploadComponent implements OnInit {
 
+  @Input() totalRecords = 100
+  pageSize = 20
   constructor() { }
 
   ngOnInit() {
   }
 
+  handleChangePage(_event: PageEvent): void {
+    // console.log('event - ', event)
+
+  }
+
 }

From 84bfd6aad9e224afd6e146c8715e30066c6146aa Mon Sep 17 00:00:00 2001
From: Vinod Kumar Shyave <121538586+vShyave@users.noreply.github.com>
Date: Fri, 26 Apr 2024 18:22:42 +0530
Subject: [PATCH 549/887] Integration of Bulk list & download file is done

---
 .../lib/routes/home/home.rounting.module.ts   | 30 +++++++------
 .../bulk-upload/bulk-upload.component.html    | 18 ++++----
 .../bulk-upload/bulk-upload.component.ts      | 45 ++++++++++++++++---
 3 files changed, 65 insertions(+), 28 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/home.rounting.module.ts b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
index 799135120..fad310ae4 100644
--- a/project/ws/app/src/lib/routes/home/home.rounting.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
@@ -96,20 +96,6 @@ const routes: Routes = [
           usersList: UsersListResolve,
         },
       },
-      // {
-      //   path: 'approvals/:tab',
-      //   component: ApprovalsComponent,
-      //   data: {
-      //     pageId: 'approvals',
-      //     module: 'Approvals',
-      //     pageType: 'feature',
-      //     pageKey: 'approval-view',
-      //   },
-      //   resolve: {
-      //     pageData: PageResolve,
-      //     configService: ConfigResolveService,
-      //   },
-      // },
       {
         path: 'approvals',
         component: ApprovalsComponent,
@@ -137,6 +123,7 @@ const routes: Routes = [
               module: 'Approvals',
             },
             resolve: {
+              pageData: PageResolve,
               configService: ConfigResolveService,
             },
           },
@@ -148,11 +135,26 @@ const routes: Routes = [
               module: 'Approvals',
             },
             resolve: {
+              pageData: PageResolve,
               configService: ConfigResolveService,
             },
           },
         ],
       },
+      // {
+      //   path: 'approvals/:tab',
+      //   component: ApprovalsComponent,
+      //   data: {
+      //     pageId: 'approvals',
+      //     module: 'Approvals',
+      //     pageType: 'feature',
+      //     pageKey: 'approval-view',
+      //   },
+      //   resolve: {
+      //     pageData: PageResolve,
+      //     configService: ConfigResolveService,
+      //   },
+      // },
       {
         path: 'workallocation/:tab',
         data: {
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
index 06f50bdcd..93ac4cca2 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
@@ -45,14 +45,14 @@
       Recent upload
     </mat-tab>
     <mat-tab label="Last uploads">
-      <div class="file-container mt-6" *ngFor="let item of [1, 2, 3]">
+      <div class="file-container mt-6" *ngFor="let list of lastUploadList">
         <div class="flex flex-col gap-4">
           <div class="flex flex-row justify-between items-center">
             <div class="flex flex-row gap-1">
               <div class="font-bold">File Information</div>
               <mat-icon class="ws-mat-black40-text">info_outline</mat-icon>
             </div>
-            <div class="flex flex-row gap-2 outline-button items-center">
+            <div class="flex flex-row gap-2 outline-button items-center" (click)="handleDownloadFile(list)">
               <mat-icon>download_2</mat-icon>
               Download error log
             </div>
@@ -60,33 +60,33 @@
           <div class="grid grid-flow-row sm:grid-flow-col gap-10 grid-col grid-container-25">
             <div class="flex flex-col">
               <div class="label">Name</div>
-              <div class="value">1710482612470_1710214198937_users-file-upload-sample (15).xlsx</div>
+              <div class="value">{{ list?.filename }}</div>
             </div>
             <div class="flex flex-col">
               <div class="label">Status</div>
-              <div class="value">Failed</div>
+              <div class="value">{{ list?.status }}</div>
             </div>
             <div class="flex flex-col">
               <div class="label">Failed Records</div>
-              <div class="value">3</div>
+              <div class="value">{{ list?.failedrecordscount }}</div>
             </div>
             <div class="flex flex-col">
               <div class="label">Success Records</div>
-              <div class="value">0</div>
+              <div class="value">{{ list?.successfulrecordscount }}</div>
             </div>
           </div>
           <div class="grid grid-flow-row sm:grid-flow-col gap-10 grid-col grid-container-25">
             <div class="flex flex-col">
               <div class="label">Total Records</div>
-              <div class="value">3</div>
+              <div class="value">{{ list?.totalrecords }}</div>
             </div>
             <div class="flex flex-col">
               <div class="label">Initiated On</div>
-              <div class="value">27 Jul 2023 3:15PM</div>
+              <div class="value">{{ list?.datecreatedon | date: 'dd MMM yyyy h:mm a' }}</div>
             </div>
             <div class="flex flex-col">
               <div class="label">Completed ON</div>
-              <div class="value">27 Aug 2023 3:15PM</div>
+              <div class="value">{{ list?.dateupdatedon | date: 'dd MMM yyyy h:mm a' }}</div>
             </div>
           </div>
         </div>
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
index 1e3aff107..c0534954e 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
@@ -1,23 +1,58 @@
-import { Component, OnInit, Input } from '@angular/core'
-import { PageEvent } from '@angular/material'
+import { Component, OnInit, Input, OnDestroy } from '@angular/core'
+import { MatSnackBar, PageEvent } from '@angular/material'
+import { HttpErrorResponse } from '@angular/common/http'
+import { ActivatedRoute } from '@angular/router'
+
+import { Subject } from 'rxjs'
+import { takeUntil } from 'rxjs/operators'
+
+import { FileService } from '../../../../users/services/upload.service'
 
 @Component({
   selector: 'ws-bulk-upload',
   templateUrl: './bulk-upload.component.html',
   styleUrls: ['./bulk-upload.component.scss'],
 })
-export class BulkUploadComponent implements OnInit {
+export class BulkUploadComponent implements OnInit, OnDestroy {
 
+  lastUploadList: any[] = []
+  private destroySubject$ = new Subject()
   @Input() totalRecords = 100
   pageSize = 20
-  constructor() { }
+  constructor(
+    private fileService: FileService,
+    private matSnackBar: MatSnackBar,
+    private router: ActivatedRoute
+  ) {
+    this.router.data.subscribe((_data: any) => { })
+  }
 
   ngOnInit() {
+    this.getBulkStatusList()
+  }
+
+  getBulkStatusList(): void {
+    this.fileService.getBulkApprovalUploadDataV1()
+      .pipe(takeUntil(this.destroySubject$))
+      .subscribe((res: any) => {
+        this.lastUploadList = res.result.content
+      }, (error: HttpErrorResponse) => {
+        if (!error.ok) {
+          this.matSnackBar.open("Unable to get Bulk status list")
+        }
+      })
+  }
+
+  handleDownloadFile(listObj: any): void {
+    const filePath = `/apis/proxies/v8/workflow/admin/bulkuploadfile/download/${listObj.filename}`
+    window.open(filePath, '_blank')
   }
 
   handleChangePage(_event: PageEvent): void {
-    // console.log('event - ', event)
+  }
 
+  ngOnDestroy(): void {
+    this.destroySubject$.unsubscribe()
   }
 
 }

From bddd7d6b28611f936e77daaf46aa8521d813b8b8 Mon Sep 17 00:00:00 2001
From: Vinod Kumar Shyave <121538586+vShyave@users.noreply.github.com>
Date: Fri, 26 Apr 2024 18:23:58 +0530
Subject: [PATCH 550/887] Integration of Bulk list & download file is done

---
 .../routes/approvals/bulk-upload/bulk-upload.component.ts     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
index c0534954e..4a0f505b5 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
@@ -36,9 +36,9 @@ export class BulkUploadComponent implements OnInit, OnDestroy {
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
         this.lastUploadList = res.result.content
-      }, (error: HttpErrorResponse) => {
+      },         (error: HttpErrorResponse) => {
         if (!error.ok) {
-          this.matSnackBar.open("Unable to get Bulk status list")
+          this.matSnackBar.open('Unable to get Bulk status list')
         }
       })
   }

From 8244a888b9834645af72cf6455230aa9c59553e4 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Fri, 26 Apr 2024 18:50:16 +0530
Subject: [PATCH 551/887] added popup to get reason for rejection

---
 .../rejection-popup.component.html            | 39 ++++++++
 .../rejection-popup.component.scss            | 57 ++++++++++++
 .../rejection-popup.component.spec.ts         | 25 +++++
 .../rejection-popup.component.ts              | 47 ++++++++++
 .../user-cards/user-card.component.html       |  2 +
 .../user-cards/user-card.component.ts         | 91 ++++++++++++++++++-
 .../ws/app/src/lib/routes/home/home.module.ts |  3 +
 7 files changed, 262 insertions(+), 2 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/home/components/rejection-popup/rejection-popup.component.html
 create mode 100644 project/ws/app/src/lib/routes/home/components/rejection-popup/rejection-popup.component.scss
 create mode 100644 project/ws/app/src/lib/routes/home/components/rejection-popup/rejection-popup.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/home/components/rejection-popup/rejection-popup.component.ts

diff --git a/project/ws/app/src/lib/routes/home/components/rejection-popup/rejection-popup.component.html b/project/ws/app/src/lib/routes/home/components/rejection-popup/rejection-popup.component.html
new file mode 100644
index 000000000..4f27a9b19
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/components/rejection-popup/rejection-popup.component.html
@@ -0,0 +1,39 @@
+<div class="rejection">
+  <div class="header flex justify-between gap-4 items-center px-6">
+    <div>{{rejectionsDetails?.header?.headerText}}</div>
+    <ng-container *ngIf="rejectionsDetails?.header?.showEditButton">
+      <div>
+        <img (click)="editReason()" src="../assets/icons/pencil-square.svg" class="editBox">
+      </div>
+    </ng-container>
+  </div>
+
+  <div class="px-5 mb-6">
+    <ng-container *ngIf="!rejectionsDetails?.body?.showTextArea; else textArea">
+      <div class="reason-description">
+        {{rejectionsDetails?.body?.reason}}
+      </div>
+    </ng-container>
+    <ng-template #textArea>
+      <div>
+        <mat-form-field class="w-full mt-5" appearance="outline">
+          <textarea matInput class="reason-text-area" [formControl]="reason"
+            [placeholder]="rejectionsDetails?.body?.placeholder" i18n-placeholder resizable="none"></textarea>
+        </mat-form-field>
+      </div>
+    </ng-template>
+  </div>
+
+  <ng-container *ngIf="rejectionsDetails?.footer?.showFooter">
+    <div class="footer flex justify-end items-center gap-3 px-5">
+      <ng-container *ngFor="let btn of rejectionsDetails?.footer?.buttons">
+        <ng-container *ngIf="btn.btnType === 'submit'; else cancelBtn">
+          <button mat-button class="submit-btn" (click)="onButtonClick(btn)">{{btn.btnText}}</button>
+        </ng-container>
+        <ng-template #cancelBtn>
+          <button mat-button class="cancel-btn" (click)="onButtonClick(btn)">{{btn.btnText}}</button>
+        </ng-template>
+      </ng-container>
+    </div>
+  </ng-container>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/rejection-popup/rejection-popup.component.scss b/project/ws/app/src/lib/routes/home/components/rejection-popup/rejection-popup.component.scss
new file mode 100644
index 000000000..a87250d8a
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/components/rejection-popup/rejection-popup.component.scss
@@ -0,0 +1,57 @@
+::ng-deep .rejection-modal {
+  .mat-dialog-container {
+    padding: 0px !important;
+  }
+}
+
+.rejection {
+
+  .header {
+    height: 80px;
+    background-color: rgba(27, 76, 161, 1);
+    color: rgba(255, 255, 255, 1);
+    font-size: 24px;
+    font-weight: 700;
+
+    .editBox {
+      width: 24px;
+      cursor: pointer;
+    }
+  }
+
+  .reason-description {
+    padding: 20px;
+    font-size: 14px;
+    color: rgba(0, 0, 0, 1);
+  }
+
+  .reason-text-area {
+    height: 170px;
+    resize: none;
+  }
+
+  .footer {
+    height: 75px;
+    background-color: rgba(241, 240, 244, 1);
+
+    .submit-btn {
+      height: 40px;
+      padding: 12px, 16px, 12px, 16px;
+      background-color: rgba(27, 76, 161, 1);
+      color: rgba(255, 255, 255, 1);
+      font-size: 14px;
+      font-weight: 700;
+      border-radius: 4px;
+    }
+
+    .cancel-btn {
+      height: 40px;
+      padding: 12px, 16px, 12px, 16px;
+      color: rgba(27, 76, 161, 1);
+      border: 1px solid rgba(27, 76, 161, 1);
+      font-size: 14px;
+      font-weight: 700;
+      border-radius: 4px;
+    }
+  }
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/rejection-popup/rejection-popup.component.spec.ts b/project/ws/app/src/lib/routes/home/components/rejection-popup/rejection-popup.component.spec.ts
new file mode 100644
index 000000000..3679766ff
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/components/rejection-popup/rejection-popup.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { RejectionPopupComponent } from './rejection-popup.component';
+
+describe('RejectionPopupComponent', () => {
+  let component: RejectionPopupComponent;
+  let fixture: ComponentFixture<RejectionPopupComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ RejectionPopupComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(RejectionPopupComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/project/ws/app/src/lib/routes/home/components/rejection-popup/rejection-popup.component.ts b/project/ws/app/src/lib/routes/home/components/rejection-popup/rejection-popup.component.ts
new file mode 100644
index 000000000..3efc022cd
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/components/rejection-popup/rejection-popup.component.ts
@@ -0,0 +1,47 @@
+import { Component, Inject, OnInit } from '@angular/core'
+import { FormControl, Validators } from '@angular/forms'
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'
+import * as _ from 'lodash'
+
+@Component({
+  selector: 'ws-app-rejection-popup',
+  templateUrl: './rejection-popup.component.html',
+  styleUrls: ['./rejection-popup.component.scss']
+})
+export class RejectionPopupComponent implements OnInit {
+
+  rejectionsDetails: any
+  reason: FormControl = new FormControl(null, [Validators.required, Validators.maxLength(100)]);
+
+  constructor(
+    private dialogRef: MatDialogRef<RejectionPopupComponent>,
+    @Inject(MAT_DIALOG_DATA) data: any
+  ) {
+    this.rejectionsDetails = data
+  }
+
+  ngOnInit() {
+    this.intialisation()
+  }
+
+  intialisation() {
+    this.reason.setValue(_.get(this.rejectionsDetails, 'body.reason'))
+  }
+
+  editReason() {
+    this.rejectionsDetails['header']['showEditButton'] = false
+    this.rejectionsDetails['body']['showTextArea'] = true
+    this.rejectionsDetails['footer']['showFooter'] = true
+  }
+
+  onButtonClick(btnDetails: any) {
+    const responce = {
+      btnResponse: btnDetails.response,
+      reason: this.reason.value
+    }
+    if (btnDetails.btnType === 'cancel' || this.reason.valid) {
+      this.dialogRef.close(responce)
+    }
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 3c107cc0d..1e462cc87 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -262,6 +262,8 @@
       </div>
 
       <div class="panel-body" *ngIf="!user.editUser">
+        <button mat-button class="my-4 mr-4" (click)="addRejection()">add reason</button>
+        <button mat-button class="my-4 mr-4" (click)="updateRejection()">update reason</button>
         <div class="inner-body mat-body-2">
           <div class="margin-bottom-m">
             <span class="font-bold">Primary Details</span> <mat-icon
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 686b61b24..e49326bd3 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -1,12 +1,13 @@
 import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'
 import { FormGroup, FormControl, Validators } from '@angular/forms'
 import { UsersService } from '../../../users/services/users.service'
-import { MatChipInputEvent, MatPaginator, PageEvent } from '@angular/material'
+import { MatChipInputEvent, MatDialog, MatPaginator, PageEvent } from '@angular/material'
 import { COMMA, ENTER } from '@angular/cdk/keycodes'
 // tslint:disable-next-line
 import _ from 'lodash'
 import { RolesService } from '../../../users/services/roles.service'
 import { ActivatedRoute } from '@angular/router'
+import { RejectionPopupComponent } from '../rejection-popup/rejection-popup.component'
 
 @Component({
   selector: 'ws-widget-user-card',
@@ -46,7 +47,8 @@ export class UserCardComponent implements OnInit {
   namePatern = `^[a-zA-Z ]*$`
   orgTypeList: any = []
 
-  constructor(private usersSvc: UsersService, private roleservice: RolesService, private route: ActivatedRoute) {
+  constructor(private usersSvc: UsersService, private roleservice: RolesService, private route: ActivatedRoute,
+    private dialog: MatDialog) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', []),
@@ -204,4 +206,89 @@ export class UserCardComponent implements OnInit {
   onSearch(event: any) {
     this.searchByEnterKey.emit(event)
   }
+
+  addRejection() {
+    const rejectinDetails = {
+      header: {
+        headerText: 'Reason of rejection',
+        showEditButton: false,
+      },
+      body: {
+        reason: '',
+        placeholder: 'Type the decription in fewer than 100 characters',
+        showTextArea: true
+      },
+      footer: {
+        showFooter: true,
+        buttons: [
+          {
+            btnType: 'submit',
+            btnText: 'Submit',
+            response: true,
+          },
+          {
+            btnType: 'cancel',
+            btnText: 'Cancel',
+            response: false,
+          }
+        ]
+      }
+    }
+
+    const dialogRef = this.dialog.open(RejectionPopupComponent, {
+      data: rejectinDetails,
+      width: '1100px',
+      disableClose: true,
+      panelClass: 'rejection-modal',
+      autoFocus: false
+    })
+
+    dialogRef.afterClosed().subscribe(result => {
+      if (result.btnResponse) {
+        console.log(result)
+      }
+    })
+  }
+
+  updateRejection() {
+    const rejectinDetails = {
+      header: {
+        headerText: 'Reason of rejection',
+        showEditButton: true,
+      },
+      body: {
+        reason: `You're not in Group C.Please provide the request with the correct entry.`,
+        placeholder: 'Type the decription in fewer than 100 characters',
+        showTextArea: false
+      },
+      footer: {
+        showFooter: false,
+        buttons: [
+          {
+            btnType: 'success',
+            btnText: 'Update',
+            response: true,
+          },
+          {
+            btnType: 'cancel',
+            btnText: 'Cancel',
+            response: false,
+          }
+        ]
+      }
+    }
+
+    const dialogRef = this.dialog.open(RejectionPopupComponent, {
+      data: rejectinDetails,
+      width: '1100px',
+      disableClose: true,
+      panelClass: 'rejection-modal',
+    })
+
+    dialogRef.afterClosed().subscribe(result => {
+      if (result.btnResponse) {
+        console.log(result)
+      }
+    })
+  }
 }
diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index b91e04210..367b2f718 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -73,6 +73,7 @@ import { UserCardComponent } from './components/user-cards/user-card.component'
 import { SearchComponent } from './components/search/search.component'
 import { FilterComponent } from './components/filter/filter.component'
 import { FilterSearchPipeModule } from '../pipes/filter-search/filter-search.module'
+import { RejectionPopupComponent } from './components/rejection-popup/rejection-popup.component'
 @NgModule({
   declarations: [
     HomeComponent,
@@ -103,6 +104,7 @@ import { FilterSearchPipeModule } from '../pipes/filter-search/filter-search.mod
     UserCardComponent,
     SearchComponent,
     FilterComponent,
+    RejectionPopupComponent,
   ],
   imports: [
     CommonModule,
@@ -168,6 +170,7 @@ import { FilterSearchPipeModule } from '../pipes/filter-search/filter-search.mod
     UserCardComponent,
     SearchComponent,
     FilterComponent,
+    RejectionPopupComponent,
   ],
   providers: [
     // CKEditorService,

From 96a7cd66cad21f0b0604b16d2d05b7e331d697a4 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Fri, 26 Apr 2024 19:19:28 +0530
Subject: [PATCH 552/887] fixing update button ui

---
 .../routes/home/components/user-cards/user-card.component.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index e49326bd3..c69586968 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -265,7 +265,7 @@ export class UserCardComponent implements OnInit {
         showFooter: false,
         buttons: [
           {
-            btnType: 'success',
+            btnType: 'submit',
             btnText: 'Update',
             response: true,
           },

From 52968301f2a349ee14328b1c2305e0d8ae32d5f5 Mon Sep 17 00:00:00 2001
From: Vinod Kumar Shyave <121538586+vShyave@users.noreply.github.com>
Date: Fri, 26 Apr 2024 21:03:32 +0530
Subject: [PATCH 553/887] fixed lint errors

---
 .../routes/home/components/user-cards/user-card.component.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index c5db9f2e7..65b027afa 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -48,7 +48,7 @@ export class UserCardComponent implements OnInit {
   orgTypeList: any = []
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService, private route: ActivatedRoute,
-    private dialog: MatDialog) {
+              private dialog: MatDialog) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', []),

From 23d9ea4168c5c20d3d1ac9da574d68063489cc6b Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Sat, 27 Apr 2024 10:20:20 +0530
Subject: [PATCH 554/887] Updated validations in edit form

---
 .../user-cards/user-card.component.html       | 211 +++++++++++-------
 .../user-cards/user-card.component.scss       |  12 +-
 .../user-cards/user-card.component.ts         | 177 +++++++++++++--
 .../lib/routes/users/services/otp.service.ts  |  84 +++++++
 .../routes/users/services/users.service.ts    |  10 +
 .../app/src/lib/routes/users/users.module.ts  |   3 +-
 6 files changed, 398 insertions(+), 99 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/users/services/otp.service.ts

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 17ed5d132..c0e83df4a 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -3,8 +3,9 @@
 </div>
 
 <div>
-  <mat-accordion>
-    <mat-expansion-panel class="user-card" *ngFor="let user of usersData.content">
+  <mat-accordion [multi]="true">
+    <mat-expansion-panel class="user-card" *ngFor="let user of usersData.content" #panel
+      (opened)="closeOtherPanels(panel)">
       <mat-expansion-panel-header (click)="getUerData(user)">
         <div class="float-left">
           <div class="initialcircle display-inline-block margin-right-s">
@@ -52,7 +53,7 @@
         </div>
       </mat-expansion-panel-header>
 
-      <div class="panel-body" *ngIf="user.editUser">
+      <div class="panel-body" *ngIf="user.enableEdit">
         <div class="inner-body">
           Primary Details <mat-icon class="ws-mat-black40-text">info_outline</mat-icon>
           <form [formGroup]="updateUserDataForm" class="margin-top-m">
@@ -85,7 +86,7 @@
           Other Details <mat-icon class="ws-mat-black40-text">info_outline</mat-icon>
 
           <form [formGroup]="updateUserDataForm" class="margin-top-m">
-            <mat-grid-list cols="3" rowHeight="80px">
+            <mat-grid-list cols="3" rowHeight="100px">
               <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                 <label class="appr-text-label requird">Employee ID</label>
                 <input type="text" [value]="" [disabled]="true" class="appr-text-field">
@@ -93,19 +94,73 @@
 
               <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                 <label class="appr-text-label required">Email</label>
-                <input type="text" [value]="" class="appr-text-field">
-
-                <input id="primaryEmail" name="primaryEmailField" type="email" matInput placeholder="Email"
-                  #primaryEmail formControlName="primaryEmail" i18n-aria-label aria-label="Primary Email readonly input"
-                  maxlength="320">
+                <input id="primaryEmail" class="appr-text-field" name="primaryEmailField" type="email" matInput
+                  placeholder="Type here" #primaryEmail formControlName="primaryEmail" i18n-aria-label
+                  aria-label="Primary Email readonly input" maxlength="320">
                 <mat-error [hidden]="false" i18n="Primary Email Error|Explains name is required">
-                  {{'userProfile.primaryEmailMandatory' | translate }}
+                  Email is mandatory
                 </mat-error>
               </mat-grid-tile>
 
               <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
                 <label class="appr-text-label required">Mobile number</label>
-                <input type="text" [value]="" class="appr-text-field">
+                <div class="flex flex-1">
+                  <mat-form-field appearance="outline" class="margin-top-xs w80 mobile-country-code">
+                    <mat-select formControlName="countryCode" default="+91" i18n-placeholder placeholder="--Select--"
+                      i18n-aria-label aria-label="Mobile Number label">
+                      <mat-option [value]="code" *ngFor="let code of countryCodes">{{code}}</mat-option>
+                    </mat-select>
+                  </mat-form-field>
+                  <mat-form-field appearance="outline" class="margin-top-xs flex-expand w-minus-w80">
+                    <input id="mobileNumber" #mobile type="text" matInput placeholder="Type here"
+                      formControlName="mobile" i18n-aria-label aria-label="Mobile Number input" maxlength="10"
+                      (keypress)="numericOnly($event)" (paste)="numericOnly($event)">
+                    <mat-error [hidden]="false" i18n="Mobile Number Error | Explains Mobile no is required"
+                      *ngIf="updateUserDataForm?.controls['mobile'].errors?.required" i18n-aria-label
+                      aria-label="Please enter your mobile number">
+                      Please enter your mobile number
+                    </mat-error>
+                    <mat-error [hidden]="false" *ngIf="updateUserDataForm?.controls['mobile'].errors?.pattern"
+                      i18n-aria-label aria-label="Please enter a valid 10 digit mobile number">
+                      Please enter a valid 10 digit mobile number
+                    </mat-error>
+                  </mat-form-field>
+                  <!-- <div class="flex m-auto" *ngIf="isMobileVerified">
+                    <mat-icon class="ws-mat-green-text margin-xs" svgIcon="verified"></mat-icon>
+                  </div> -->
+                </div>
+                <!-- <div *ngIf="!isMobileVerified" class="flex flex-1">
+                  <button *ngIf="!otpSend" mat-raised-button type="button" (click)="sendOtp()"
+                    class="text-white btn-success btn-responsive" [disabled]="updateUserDataForm?.mobile?.invalid">
+                    <a class="text-white" i18n>
+                      Send OTP
+                    </a>
+                  </button>
+                  <div *ngIf="otpSend" class="flex flex-1 flex-column">
+                    <div class="flex flex-1 flex-row margin-bottom-m">
+                      <mat-form-field appearance="outline" class="margin-top-xs flex-expand w-minus-w50">
+                        <input id="mobileNumber" #otp type="number" matInput placeholder="Enter OTP" i18n-aria-label
+                          aria-label="OTP input" onKeyPress="if(this.value.length === 8) return false;">
+                        <mat-hint *ngIf="timeLeftforOTP > 0 ">
+                          <span>Resend OTP after {{timeLeftforOTP | pipeDurationTransform:
+                            'hms2M'}}</span>
+                        </mat-hint>
+                        <mat-hint *ngIf="timeLeftforOTP <= 0 ">
+                          <span class="cursor-pointer ws-mat-default-text" (click)="resendOTP()">
+                            Resend OTP
+                          </span>
+                        </mat-hint>
+                      </mat-form-field>
+                      <button mat-raised-button type="button" (click)="verifyOtp(otp)"
+                        class="text-white btn-success btn-responsive margin-top-s otp"
+                        [disabled]="updateUserDataForm?.mobile?.invalid  || disableVerifyBtn">
+                        <span class="text-white" i18n>
+                          Verify OTP
+                        </span>
+                      </button>
+                    </div>
+                  </div>
+                </div> -->
               </mat-grid-tile>
 
               <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
@@ -163,74 +218,7 @@
                 </mat-select>
               </mat-grid-tile>
 
-              <mat-grid-tile [colspan]="1" [rowspan]="10" class="input-wrapper">
-                <div id="roles" *ngIf="!isMdoAdmin"
-                  class="flex flex-1 flex-column margin-top-m margin-bottom-m margin-left-m margin-right-m">
-                  <div class="flex flex-wrap mobile-break">
-                    <div class="w-full profile-cols-full bg-grey">
-                      <ng-container>
-                        <form [formGroup]="updateUserDataForm">
-                          <div class="input-wrapper margin-top-s">
-                            <label for="roles" class="margin-remove-bottom form-label required" i18n-aria-label
-                              aria-label="Roles label"
-                              i18n="Role label|Label which explains the user to select the roles">
-                              Role
-                            </label>
-                            <mat-selection-list id="roles" formControlName="roles" #roles>
-                              <mat-list-option *ngFor="let role of rolesList" (click)="modifyUserRoles(role.roleName)"
-                                [selected]="userRoles.has(role.roleName)" [value]="role.roleName">
-                                {{role.roleName}}
-                              </mat-list-option>
-                            </mat-selection-list>
-                          </div>
-                          <button mat-raised-button type="submit" (click)="onSubmit(updateUserDataForm, 'Roles')"
-                            class="margin-top-m text-white btn-success btn-responsive"
-                            [disabled]="updateUserDataForm?.invalid">
-                            <span class="text-white" i18n>
-                              Update
-                            </span>
-                          </button>
-                          <button mat-raised-button type="submit" (click)="resetRoles()"
-                            class="margin-top-m text-white btn-success btn-responsive"
-                            [disabled]="updateUserDataForm?.invalid">
-                            <span class="text-white" i18n>
-                              Cancel
-                            </span>
-                          </button>
-                        </form>
-                      </ng-container>
-                    </div>
-                  </div>
-                </div>
-
-                <div id="roles" *ngIf="isMdoAdmin"
-                  class="flex flex-1 flex-column margin-top-m margin-bottom-m margin-left-m margin-right-m">
-                  <div class="flex-custom">
-                    <mat-card-content class="margin-top-m margin-bottom-m margin-left-m margin-right-m">
-                      <span class="mat-subheading-1 flex-4 mobile-margin appr-section-heading" role="link" tabindex="0">
-                        Roles
-                      </span>
-                      <div class="margin-top-l new-mobile">
-                        <div class="flex flex-wrap mobile-break">
-                          <div class="w-full profile-cols-full bg-grey">
-                            <ng-container>
-                              <ul class="roles-list margin-0">
-                                <li *ngFor="let role of orguserRoles" class="margin-bottom-s">{{role}}</li>
-                              </ul>
-                            </ng-container>
-                          </div>
-                        </div>
-                      </div>
-                    </mat-card-content>
-                  </div>
-                </div>
-              </mat-grid-tile>
-
-              <mat-grid-tile [colspan]="1" [rowspan]="10" class="input-wrapper">
-
-              </mat-grid-tile>
-
-              <mat-grid-tile [colspan]="1" [rowspan]="10" class="input-wrapper">
+              <mat-grid-tile [colspan]="2" [rowspan]="2" class="input-wrapper">
                 <label class="appr-text-label">Tags</label>
                 <div class="left-input-div">
                   <div class="flex-col">
@@ -248,7 +236,7 @@
                   </div>
                 </div>
                 <div class="right-input-div">
-                  <button mat-raised-button type="button" [disabled]="!tags.value || !updateUserDataForm.valid"
+                  <button mat-raised-button type="button" [disabled]="!tags.value"
                     (click)="addActivity({input: tags, value: tags.value})"
                     [ngStyle]="{'opacity': updateUserDataForm.valid? 1: 0.7}"
                     class="text-white btn-add-activity btn-responsive">
@@ -263,12 +251,73 @@
                   </mat-chip>
                 </mat-chip-list>
               </mat-grid-tile>
+
+              <mat-grid-tile [colspan]="2" [rowspan]="2" class="input-wrapper">
+                <div id="roles"
+                  class="flex flex-1 flex-column margin-top-m margin-bottom-m margin-left-m margin-right-m">
+                  <div class="flex flex-wrap mobile-break">
+                    <div class="w-full profile-cols-full bg-grey">
+                      <div class="input-wrapper margin-top-s">
+                        <label for="roles" class="margin-remove-bottom form-label required" i18n-aria-label
+                          aria-label="Roles label" i18n="Role label|Label which explains the user to select the roles">
+                          Role
+                        </label>
+                        <mat-selection-list id="roles" formControlName="roles" #roles class="roles-list">
+                          <mat-list-option *ngFor="let role of rolesList" (click)="modifyUserRoles(role.roleName)"
+                            [selected]="userRoles.has(role.roleName)" [value]="role.roleName">
+                            {{role.roleName}}
+                          </mat-list-option>
+                        </mat-selection-list>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+
+                <div>
+                  <button mat-raised-button type="submit" (click)="onSubmit(updateUserDataForm, 'Roles')"
+                    class="margin-top-m text-white btn-success btn-responsive">
+                    <span class="text-white" i18n>
+                      Update
+                    </span>
+                  </button>
+                  <button mat-raised-button type="submit" (click)="resetRoles()"
+                    class="margin-top-m text-white btn-success btn-responsive">
+                    <span class="text-white" i18n>
+                      Cancel
+                    </span>
+                  </button>
+                </div>
+
+                <!-- <div id="roles" *ngIf="isMdoAdmin"
+                  class="flex flex-1 flex-column margin-top-m margin-bottom-m margin-left-m margin-right-m">
+                  <div class="flex-custom">
+                    <mat-card-content class="margin-top-m margin-bottom-m margin-left-m margin-right-m">
+                      <span class="mat-subheading-1 flex-4 mobile-margin appr-section-heading" role="link" tabindex="0">
+                        Roles
+                      </span>
+                      <div class="margin-top-l new-mobile">
+                        <div class="flex flex-wrap mobile-break">
+                          <div class="w-full profile-cols-full bg-grey">
+                            <ng-container>
+                              <ul class="roles-list margin-0">
+                                <li *ngFor="let role of orguserRoles" class="margin-bottom-s">{{role}}</li>
+                              </ul>
+                            </ng-container>
+                          </div>
+                        </div>
+                      </div>
+                    </mat-card-content>
+                  </div>
+                </div> -->
+              </mat-grid-tile>
+
+
             </mat-grid-list>
           </form>
         </div>
       </div>
 
-      <div class="panel-body" *ngIf="!user.editUser">
+      <div class="panel-body" *ngIf="!user.enableEdit">
         <div class="inner-body mat-body-2">
           <div class="margin-bottom-m">
             <span class="font-bold">Primary Details</span> <mat-icon
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
index 90ad4c9bb..e21c453fd 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
@@ -82,7 +82,7 @@
 }
 
 .appr-text-field{
-  width: 272px;
+  width: 80%;
   border: 1px solid #DDDDDD;
   border-radius: 4px;
   padding: 9px;
@@ -98,7 +98,7 @@
   margin-bottom: 0;
   color: #000000;
   display: block;
-  font: 700 14px Lato;
+  font: 600 13px/16px Lato;
 }
 
 .view-text-label {
@@ -146,4 +146,12 @@
 
 .username {
   width: 88%;
+}
+
+mat-selection-list.roles-list {
+    display: inline-flex;
+}
+
+label {
+  display: block;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 423ea3195..6de24bea9 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -1,14 +1,17 @@
-import { Component, EventEmitter, Input, OnInit, Output, ViewChild, ChangeDetectorRef } from '@angular/core'
+import { Component, EventEmitter, Input, OnInit, Output, QueryList, ViewChild, ViewChildren } from '@angular/core'
 import { FormGroup, FormControl, Validators } from '@angular/forms'
 import { UsersService } from '../../../users/services/users.service'
-import { MatChipInputEvent, MatPaginator, PageEvent } from '@angular/material'
+import { MatChipInputEvent, MatExpansionPanel, MatPaginator, MatSnackBar, PageEvent } from '@angular/material'
 import { COMMA, ENTER } from '@angular/cdk/keycodes'
 // tslint:disable-next-line
 import _ from 'lodash'
 import { RolesService } from '../../../users/services/roles.service'
 import { ActivatedRoute } from '@angular/router'
-import { Observable } from 'rxjs'
+import { Observable, Subscription, interval } from 'rxjs'
 import { debounceTime, distinctUntilChanged, map, startWith } from 'rxjs/operators'
+import { environment } from '../../../../../../../../../src/environments/environment'
+import { OtpService } from '../../../users/services/otp.service'
+import { ConfigurationsService } from '@sunbird-cb/utils'
 
 @Component({
   selector: 'ws-widget-user-card',
@@ -25,6 +28,7 @@ export class UserCardComponent implements OnInit {
 
   @Output() paginationData = new EventEmitter()
   @Output() searchByEnterKey = new EventEmitter()
+  @ViewChildren(MatExpansionPanel) panels!: QueryList<MatExpansionPanel>
 
   @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator | any
   startIndex = 0
@@ -48,23 +52,48 @@ export class UserCardComponent implements OnInit {
   separatorKeysCodes: number[] = [ENTER, COMMA]
   namePatern = `^[a-zA-Z ]*$`
   orgTypeList: any = []
+  public countryCodes: string[] = []
   masterLanguages: Observable<any[]> | undefined
   masterLanguagesEntries: any
   genderList = ['Male', 'Female', 'Others']
   categoryList = ['General', 'OBC', 'SC', 'ST', 'Others']
 
+  phoneNumberPattern = '^((\\+91-?)|0)?[0-9]{10}$'
+  pincodePattern = '(^[0-9]{6}$)'
+  yearPattern = '(^[0-9]{4}$)'
+
+  otpSend = false
+  otpVerified = false
+  OTP_TIMER = environment.resendOTPTIme
+  timerSubscription: Subscription | null = null
+  timeLeftforOTP = 0
+  isMobileVerified = false
+  disableVerifyBtn = false
+
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-    private route: ActivatedRoute, private cdref: ChangeDetectorRef) {
+    private configSvc: ConfigurationsService,
+    private route: ActivatedRoute, private otpService: OtpService,
+    private snackBar: MatSnackBar) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', []),
+      primaryEmail: new FormControl('', [Validators.required]),
+      countryCode: new FormControl('+91', [Validators.required]),
+      mobile: new FormControl('', [Validators.required, Validators.pattern(this.phoneNumberPattern)]),
       tags: new FormControl('', [Validators.pattern(this.namePatern)]),
       roles: new FormControl('', [Validators.required]),
       domicileMedium: new FormControl('', []),
       gender: new FormControl('', []),
       category: new FormControl('', []),
-      primaryEmail: new FormControl('', [Validators.required]),
+      pincode: new FormControl('', []),
     })
+
+    const fullProfile = _.get(this.route.snapshot, 'data.configService')
+
+    if (fullProfile.unMappedUser && fullProfile.unMappedUser.roles) {
+      this.isMdoAdmin = fullProfile.unMappedUser.roles.includes('MDO_ADMIN')
+      this.isMdoLeader = fullProfile.unMappedUser.roles.includes('MDO_LEADER')
+    }
   }
 
   ngOnInit() {
@@ -76,6 +105,7 @@ export class UserCardComponent implements OnInit {
     await this.loadDesignations()
     await this.loadGroups()
     await this.loadLangauages()
+    await this.loadCountryCodes()
   }
 
   async loadDesignations() {
@@ -109,6 +139,28 @@ export class UserCardComponent implements OnInit {
       })
   }
 
+  async loadCountryCodes() {
+    this.usersSvc.getMasterNationlity().subscribe((data: any) => {
+      data.nationality.map((item: any) => {
+        this.countryCodes.push(item.countryCode)
+      })
+
+      this.updateUserDataForm.patchValue({
+        countryCode: '+91',
+      })
+    },
+      (_err: any) => {
+      })
+  }
+
+  closeOtherPanels(openPanel: MatExpansionPanel) {
+    this.panels.forEach(panel => {
+      if (panel !== openPanel) {
+        panel.close()
+      }
+    })
+  }
+
   otherDropDownChange(value: any, field: string) {
     if (field === 'designation' && value !== 'Other') {
       this.updateUserDataForm.controls['designation'].setValue(value)
@@ -144,18 +196,12 @@ export class UserCardComponent implements OnInit {
   }
 
   onEditUser(user: any) {
-    // this.usersData.content.forEach((u: any) => {
-    //   if (u.userId === user.userId && user.editUser === false) {
-
-    this.cdref.detectChanges()
-    user.editUser = !user.editUser
-    console.log('user-----', user)
-    //   }
-    // })
+    user.enableEdit = false
+    // this.cdref.detectChanges()
   }
 
   getUerData(user: any) {
-    user.editUser = true
+    user.enableEdit = true
     const profileDataAll = user
     this.userStatus = profileDataAll.isDeleted ? 'Inactive' : 'Active'
 
@@ -235,7 +281,8 @@ export class UserCardComponent implements OnInit {
   addActivity(event: MatChipInputEvent) {
     const input = event.input
     const value = event.value as string
-    if ((value && value.trim()) && this.updateUserDataForm.valid) {
+    // if ((value && value.trim()) && this.updateUserDataForm.valid) {
+    if ((value && value.trim())) {
       this.isTagsEdited = true
       this.selectedtags.push(value)
     }
@@ -277,4 +324,104 @@ export class UserCardComponent implements OnInit {
   onSearch(event: any) {
     this.searchByEnterKey.emit(event)
   }
+
+  sendOtp() {
+    const mob = this.updateUserDataForm.get('mobile')
+    if (mob && mob.value && Math.floor(mob.value) && mob.valid) {
+      this.otpService.sendOtp(mob.value).subscribe(() => {
+        this.otpSend = true
+        alert('An OTP has been sent to your mobile number')
+        this.startCountDown()
+        // tslint:disable-next-line: align
+      }, (error: any) => {
+        this.snackBar.open(_.get(error, 'error.params.errmsg') || 'Please try again later')
+      })
+    } else {
+      this.snackBar.open('Please enter a valid mobile number')
+    }
+  }
+  resendOTP() {
+    const mob = this.updateUserDataForm.get('mobile')
+    if (mob && mob.value && Math.floor(mob.value) && mob.valid) {
+      this.otpService.resendOtp(mob.value).subscribe((res: any) => {
+        if ((_.get(res, 'result.response')).toUpperCase() === 'SUCCESS') {
+          this.otpSend = true
+          this.disableVerifyBtn = false
+          alert('An OTP has been sent to your mobile number')
+          this.startCountDown()
+        }
+        // tslint:disable-next-line: align
+      }, (error: any) => {
+        this.snackBar.open(_.get(error, 'error.params.errmsg') || 'Please try again later')
+      })
+    } else {
+      this.snackBar.open('Please enter a valid mobile number')
+    }
+  }
+  verifyOtp(otp: any) {
+    // console.log(otp)
+    const mob = this.updateUserDataForm.get('mobile')
+    if (otp && otp.value) {
+      if (mob && mob.value && Math.floor(mob.value) && mob.valid) {
+        this.otpService.verifyOTP(otp.value, mob.value).subscribe((res: any) => {
+          if ((_.get(res, 'result.response')).toUpperCase() === 'SUCCESS') {
+            this.otpVerified = true
+            const reqUpdates = {
+              request: {
+                userId: this.configSvc.unMappedUser.id,
+                profileDetails: {
+                  personalDetails: {
+                    mobile: mob.value,
+                    phoneVerified: true,
+                  },
+                },
+              },
+            }
+            this.usersSvc.editProfileDetails(reqUpdates).subscribe((updateRes: any) => {
+
+              if (updateRes) {
+                this.isMobileVerified = true
+              }
+              // tslint:disable-next-line:align
+            }, (error: any) => {
+
+              this.snackBar.open(_.get(error, 'error.params.errmsg') || 'Please try again later')
+            }
+            )
+          }
+          // tslint:disable-next-line: align
+        }, (error: any) => {
+          this.snackBar.open(_.get(error, 'error.params.errmsg') || 'Please try again later')
+          if (error.error && error.error.result) {
+            this.disableVerifyBtn = error.error.result.remainingAttempt === 0 ? true : false
+          }
+        })
+      }
+    }
+  }
+  startCountDown() {
+    const startTime = Date.now()
+    this.timeLeftforOTP = this.OTP_TIMER
+    // && this.primaryCategory !== this.ePrimaryCategory.PRACTICE_RESOURCE
+    if (this.OTP_TIMER > 0
+    ) {
+      this.timerSubscription = interval(1000)
+        .pipe(
+          map(
+            () =>
+              startTime + this.OTP_TIMER - Date.now(),
+          ),
+        )
+        .subscribe((_timeRemaining: any) => {
+          this.timeLeftforOTP -= 1
+          if (this.timeLeftforOTP < 0) {
+            this.timeLeftforOTP = 0
+            if (this.timerSubscription) {
+              this.timerSubscription.unsubscribe()
+            }
+            // this.submitQuiz()
+          }
+        })
+    }
+  }
 }
diff --git a/project/ws/app/src/lib/routes/users/services/otp.service.ts b/project/ws/app/src/lib/routes/users/services/otp.service.ts
new file mode 100644
index 000000000..f942f08f7
--- /dev/null
+++ b/project/ws/app/src/lib/routes/users/services/otp.service.ts
@@ -0,0 +1,84 @@
+import { Injectable } from '@angular/core'
+import { HttpClient } from '@angular/common/http'
+import { Observable } from 'rxjs'
+const API_ENDPOINTS = {
+  sendOtp: '/apis/proxies/v8/otp/v1/generate',
+  ReSendOtp: '/apis/proxies/v8/otp/v1/generate',
+  VerifyOtp: '/apis/proxies/v8/otp/v1/verify',
+  sendEmailOtp: '/apis/proxies/v8/otp/v3/generate',
+  VerifyEmailOtp: '/apis/proxies/v8/otp/v3/verify',
+}
+
+@Injectable()
+export class OtpService {
+  constructor(
+    private http: HttpClient,
+  ) {
+  }
+  sendOtp(mob: number): Observable<any> {
+    const reqObj = {
+      request: {
+        type: 'phone',
+        key: `${mob}`,
+      },
+    }
+    return this.http.post(API_ENDPOINTS.sendOtp, reqObj)
+  }
+  resendOtp(mob: number) {
+    const reqObj = {
+      request: {
+        type: 'phone',
+        key: `${mob}`,
+      },
+    }
+    return this.http.post(API_ENDPOINTS.ReSendOtp, reqObj)
+
+  }
+  verifyOTP(otp: number, mob: number) {
+    const reqObj = {
+      request: {
+        otp,
+        type: 'phone',
+        key: `${mob}`,
+      },
+    }
+    return this.http.post(API_ENDPOINTS.VerifyOtp, reqObj)
+
+  }
+
+  sendEmailOtp(email: string): Observable<any> {
+    const reqObj = {
+      request: {
+        type: 'email',
+        key: `${email}`,
+        contextType: 'extPatch',
+        context: ['profileDetails.personalDetails.primaryEmail'],
+      },
+    }
+    return this.http.post(API_ENDPOINTS.sendEmailOtp, reqObj)
+  }
+
+  reSendEmailOtp(email: string): Observable<any> {
+    const reqObj = {
+      request: {
+        type: 'email',
+        key: `${email}`,
+        contextType: 'extPatch',
+        context: ['profileDetails.personalDetails.primaryEmail'],
+      },
+    }
+    return this.http.post(API_ENDPOINTS.sendEmailOtp, reqObj)
+  }
+
+  verifyEmailOTP(otp: any, email: number) {
+    const reqObj = {
+      request: {
+        otp: otp.toString(),
+        type: 'email',
+        key: `${email}`,
+      },
+    }
+    return this.http.post(API_ENDPOINTS.VerifyEmailOtp, reqObj)
+
+  }
+}
diff --git a/project/ws/app/src/lib/routes/users/services/users.service.ts b/project/ws/app/src/lib/routes/users/services/users.service.ts
index 382c6be4f..393f6486a 100644
--- a/project/ws/app/src/lib/routes/users/services/users.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/users.service.ts
@@ -31,6 +31,8 @@ const API_END_POINTS = {
   VERIFY_OTP: '/apis/proxies/v8/otp/v1/verify',
   getMasterLanguages: '/apis/protected/v8/user/profileRegistry/getMasterLanguages',
   GET_GROUPS: '/api/user/v1/groups',
+  getMasterNationlity: '/apis/protected/v8/user/profileRegistry/getMasterNationalities',
+  editProfileDetails: '/apis/proxies/v8/user/v1/extPatch',
   // GET_BULKUPLOAD_DATA: '/apis/protected/v8/admin/userRegistration/bulkUploadData',
 }
 
@@ -231,4 +233,12 @@ export class UsersService {
   getGroups(): Observable<any> {
     return this.http.get<any>(API_END_POINTS.GET_GROUPS)
   }
+
+  getMasterNationlity(): Observable<any> {
+    return this.http.get<any>(API_END_POINTS.getMasterNationlity)
+  }
+
+  editProfileDetails(data: any) {
+    return this.http.post<any>(API_END_POINTS.editProfileDetails, data)
+  }
 }
diff --git a/project/ws/app/src/lib/routes/users/users.module.ts b/project/ws/app/src/lib/routes/users/users.module.ts
index a9de7bcd9..1479101d8 100644
--- a/project/ws/app/src/lib/routes/users/users.module.ts
+++ b/project/ws/app/src/lib/routes/users/users.module.ts
@@ -19,6 +19,7 @@ import { FileService } from './services/upload.service'
 import { UsersUploadComponent } from './components/users-upload/users-upload.component'
 import { PipeEmailModule } from '../pipes/pipe-email/pipe-email.module'
 import { PipeDurationTransformModule } from '@sunbird-cb/utils'
+import { OtpService } from './services/otp.service'
 
 @NgModule({
   declarations: [CreateUserComponent, ViewUserComponent, UsersUploadComponent],
@@ -30,7 +31,7 @@ import { PipeDurationTransformModule } from '@sunbird-cb/utils'
     MatExpansionModule, MatDividerModule, MatPaginatorModule, MatTableModule, WidgetResolverModule, MatSortModule, PipeEmailModule,
     UIORGTableModule, MatChipsModule, PipeDurationTransformModule,
   ],
-  providers: [RolesService, FileService, DatePipe],
+  providers: [RolesService, FileService, DatePipe, OtpService],
   exports: [UsersUploadComponent],
 })
 export class UsersModule { }

From 80143a3dc043afd9304f1d4b6a4ddc97a479a6bf Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Sat, 27 Apr 2024 19:01:25 +0530
Subject: [PATCH 555/887] Added validations & submit function flow

---
 .../user-cards/user-card.component.html       | 388 ++++++++++--------
 .../user-cards/user-card.component.scss       |  85 +++-
 .../user-cards/user-card.component.ts         | 158 ++++++-
 src/styles/_ws-common.scss                    |  29 ++
 4 files changed, 468 insertions(+), 192 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index ecc1c3c01..3551f1ff6 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -53,82 +53,90 @@
         </div>
       </mat-expansion-panel-header>
 
-      <div class="panel-body" *ngIf="user.enableEdit">
-        <div class="inner-body">
-          Primary Details <mat-icon class="ws-mat-black40-text">info_outline</mat-icon>
-          <form [formGroup]="updateUserDataForm" class="margin-top-m">
-            <mat-grid-list cols="2" rowHeight="100px">
-              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                <label class="appr-text-label required">Designation</label>
-                <mat-select class="appr-text-field" #designation formControlName="designation" i18n-placeholder
-                  placeholder="--Select--" (selectionChange)="otherDropDownChange(designation.value, 'designation')">
-                  <mat-option [value]="designation.name" *ngFor="let designation of designationsMeta">
-                    {{designation.name}}
-                  </mat-option>
-                  <mat-option [value]="'Other'">Other</mat-option>
-                </mat-select>
-              </mat-grid-tile>
-
-              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                <label class="appr-text-label required">Group</label>
-                <mat-select class="appr-text-field" #group formControlName="group" i18n-placeholder
-                  placeholder="--Select--">
-                  <mat-option [value]="g" *ngFor="let g of groupsList">
-                    {{g.name}}
-                  </mat-option>
-                </mat-select>
-              </mat-grid-tile>
-            </mat-grid-list>
-          </form>
-        </div>
-        <hr>
-        <div class="inner-body">
-          Other Details <mat-icon class="ws-mat-black40-text">info_outline</mat-icon>
-
-          <form [formGroup]="updateUserDataForm" class="margin-top-m">
-            <mat-grid-list cols="3" rowHeight="100px">
-              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                <label class="appr-text-label requird">Employee ID</label>
-                <input type="text" [value]="" [disabled]="true" class="appr-text-field">
-              </mat-grid-tile>
-
-              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                <label class="appr-text-label required">Email</label>
-                <input id="primaryEmail" class="appr-text-field" name="primaryEmailField" type="email" matInput
-                  placeholder="Type here" #primaryEmail formControlName="primaryEmail" i18n-aria-label
-                  aria-label="Primary Email readonly input" maxlength="320">
-                <mat-error [hidden]="false" i18n="Primary Email Error|Explains name is required">
-                  Email is mandatory
-                </mat-error>
-              </mat-grid-tile>
-
-              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                <label class="appr-text-label required">Mobile number</label>
-                <div class="flex flex-1">
-                  <mat-form-field appearance="outline" class="margin-top-xs w80 mobile-country-code">
-                    <mat-select formControlName="countryCode" default="+91" i18n-placeholder placeholder="--Select--"
-                      i18n-aria-label aria-label="Mobile Number label">
-                      <mat-option [value]="code" *ngFor="let code of countryCodes">{{code}}</mat-option>
+      <div class="panel-body profile-box" *ngIf="user.enableEdit">
+        <form [formGroup]="updateUserDataForm" class="margin-top-m">
+          <div class="inner-body">
+            Primary Details <mat-icon class="ws-mat-black40-text">info_outline</mat-icon>
+            <div class="flex flex-row margin-top-m">
+              <div class="flex md:w-1/3">
+                <div>
+                  <label class="margin-remove-bottom form-label required">Designation</label>
+                  <mat-form-field appearance="outline">
+                    <mat-select #designation formControlName="designation" i18n-placeholder
+                      placeholder="Select designation"
+                      (selectionChange)="otherDropDownChange(designation.value, 'designation')">
+                      <mat-option [value]="designation.name" *ngFor="let designation of designationsMeta">
+                        {{designation.name}}
+                      </mat-option>
+                      <mat-option [value]="'Other'">Other</mat-option>
                     </mat-select>
                   </mat-form-field>
-                  <mat-form-field appearance="outline" class="margin-top-xs flex-expand w-minus-w80">
-                    <input id="mobileNumber" #mobile type="text" matInput placeholder="Type here"
-                      formControlName="mobile" i18n-aria-label aria-label="Mobile Number input" maxlength="10"
-                      (keypress)="numericOnly($event)" (paste)="numericOnly($event)">
-                    <mat-error [hidden]="false" i18n="Mobile Number Error | Explains Mobile no is required"
-                      *ngIf="updateUserDataForm?.controls['mobile'].errors?.required" i18n-aria-label
-                      aria-label="Please enter your mobile number">
-                      Please enter your mobile number
-                    </mat-error>
-                    <mat-error [hidden]="false" *ngIf="updateUserDataForm?.controls['mobile'].errors?.pattern"
-                      i18n-aria-label aria-label="Please enter a valid 10 digit mobile number">
-                      Please enter a valid 10 digit mobile number
-                    </mat-error>
+                </div>
+              </div>
+
+              <div class="flex md:w-1/3">
+                <div>
+                  <label class="margin-remove-bottom form-label required">Group</label>
+                  <mat-form-field appearance="outline">
+                    <mat-select #group formControlName="group" i18n-placeholder placeholder="Select group">
+                      <mat-option [value]="g" *ngFor="let g of groupsList">
+                        {{g.name}}
+                      </mat-option>
+                    </mat-select>
                   </mat-form-field>
-                  <!-- <div class="flex m-auto" *ngIf="isMobileVerified">
-                    <mat-icon class="ws-mat-green-text margin-xs" svgIcon="verified"></mat-icon>
-                  </div> -->
                 </div>
+              </div>
+            </div>
+          </div>
+          <hr>
+          <div class="inner-body">
+            Other Details <mat-icon class="ws-mat-black40-text">info_outline</mat-icon>
+
+            <div class="flex flex-row margin-top-m">
+              <div class="md:w-1/3">
+                <label class="margin-remove-bottom form-label">Employee ID</label>
+                <mat-form-field appearance="outline">
+                  <input type="text" matInput #employeeID formControlName="employeeID">
+                </mat-form-field>
+              </div>
+
+              <div class="md:w-1/3">
+                <label class="margin-remove-bottom form-label required">Email</label>
+                <mat-form-field appearance="outline">
+                  <input id="primaryEmail" name="primaryEmailField" type="email" matInput placeholder="Type here"
+                    #primaryEmail formControlName="primaryEmail" i18n-aria-label
+                    aria-label="Primary Email readonly input" maxlength="320">
+                  <mat-error [hidden]="false" i18n="Primary Email Error|Explains name is required">
+                    Email is mandatory
+                  </mat-error>
+                </mat-form-field>
+              </div>
+
+              <div class="md:w-1/3">
+                <label class="margin-remove-bottom form-label required">Mobile number</label>
+                <mat-form-field appearance="outline" class="w80 mobile-country-code">
+                  <mat-select formControlName="countryCode" default="+91" i18n-placeholder placeholder="Select code"
+                    i18n-aria-label aria-label="Mobile Number label">
+                    <mat-option [value]="code" *ngFor="let code of countryCodes">{{code}}</mat-option>
+                  </mat-select>
+                </mat-form-field>
+                <mat-form-field appearance="outline" class="flex-expand w-minus-w80">
+                  <input id="mobileNumber" #mobile type="text" matInput placeholder="Type here" formControlName="mobile"
+                    i18n-aria-label aria-label="Mobile Number input" maxlength="10" (keypress)="numericOnly($event)"
+                    (paste)="numericOnly($event)">
+                  <mat-error [hidden]="false" i18n="Mobile Number Error | Explains Mobile no is required"
+                    *ngIf="updateUserDataForm?.controls['mobile'].errors?.required" i18n-aria-label
+                    aria-label="Please enter your mobile number">
+                    Please enter your mobile number
+                  </mat-error>
+                  <mat-error [hidden]="false" *ngIf="updateUserDataForm?.controls['mobile'].errors?.pattern"
+                    i18n-aria-label aria-label="Please enter a valid 10 digit mobile number">
+                    Please enter a valid 10 digit mobile number
+                  </mat-error>
+                </mat-form-field>
+                <!-- <div class="flex m-auto" *ngIf="isMobileVerified">
+                  <mat-icon class="ws-mat-green-text margin-xs" svgIcon="verified"></mat-icon>
+                </div> -->
                 <!-- <div *ngIf="!isMobileVerified" class="flex flex-1">
                   <button *ngIf="!otpSend" mat-raised-button type="button" (click)="sendOtp()"
                     class="text-white btn-success btn-responsive" [disabled]="updateUserDataForm?.mobile?.invalid">
@@ -161,17 +169,27 @@
                     </div>
                   </div>
                 </div> -->
-              </mat-grid-tile>
-
-              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                <label class="appr-text-label required">Date of Birth</label>
-                <input type="text" [value]="" class="appr-text-field">
-              </mat-grid-tile>
+              </div>
+            </div>
+            <div class="flex flex-row margin-top-m">
+              <div class="md:w-1/3">
+                <label class="margin-remove-bottom form-label required">Date of Birth</label>
+                <mat-form-field appearance="outline">
+                  <input id="birthDate" matInput #dob formControlName="dob" [matDatepicker]="picker" i18n-placeholder
+                    (focus)="picker.open()" placeholder="Choose date of birth" [min]="1/1/1900" [max]="today">
+                  <mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
+                  <mat-datepicker #picker (closed)="dob.blur()" i18n-aria-label aria-label="Date picker">
+                  </mat-datepicker>
+                  <mat-error [hidden]="false" i18n="Date of Birth Error|Explains name is required">
+                    Date of birth is mandatory
+                  </mat-error>
+                </mat-form-field>
+              </div>
 
-              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                <label class="appr-text-label required">Mother Tongue</label>
-                <mat-form-field appearance="outline" class="margin-top-xs">
-                  <input id="language" matInput type="text" placeholder="Mother Tongue" i18n-placeholder="Mother Tongue"
+              <div class="md:w-1/3">
+                <label class="margin-remove-bottom form-label required">Mother Tongue</label>
+                <mat-form-field appearance="outline">
+                  <input id="language" matInput type="text" placeholder="Type here" i18n-placeholder="Mother Tongue"
                     formControlName="domicileMedium" [matAutocomplete]="motherTongueAuto" i18n-aria-label
                     aria-label="Domicile Medium (Mother Tongue)" #motherTongue maxlength="30" />
                   <mat-error *ngIf="updateUserDataForm?.controls['domicileMedium'].errors?.forbiddenNames"
@@ -184,46 +202,63 @@
                     {{ option.name }}
                   </mat-option>
                 </mat-autocomplete>
-              </mat-grid-tile>
-
-              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                <label class="appr-text-label required">Gender</label>
-                <mat-select class="appr-text-field" #gender formControlName="gender" i18n-placeholder
-                  placeholder="--Select--">
-                  <mat-option [value]="gender" *ngFor="let gender of genderList">
-                    {{gender}}
-                  </mat-option>
-                </mat-select>
-              </mat-grid-tile>
-
-              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                <label class="appr-text-label required">Office Pin Code</label>
-                <input id="pinCode" #pincode class="appr-text-field" type="text" matInput placeholder="Pin code"
-                  formControlName="pincode" i18n-aria-label aria-label="Pin Code input field" autocomplete="off"
-                  (keypress)="numericOnly($event)" maxlength="6">
-              </mat-grid-tile>
-
-              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                <label class="appr-text-label">eHRMS ID</label>
-                <input type="text" [value]="" [disabled]="true" class="appr-text-field">
-              </mat-grid-tile>
-
-              <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
-                <label class="appr-text-label required">Category</label>
-                <mat-select class="appr-text-field" #category formControlName="category" i18n-placeholder
-                  placeholder="--Select--">
-                  <mat-option [value]="ctg" *ngFor="let ctg of categoryList">
-                    {{ctg}}
-                  </mat-option>
-                </mat-select>
-              </mat-grid-tile>
+                <mat-error [hidden]="false" i18n="Mother tongue Error | Explains Mother tongue is required">
+                  Mother tongue is mandatory
+                </mat-error>
+              </div>
 
-              <mat-grid-tile [colspan]="2" [rowspan]="2" class="input-wrapper">
-                <label class="appr-text-label">Tags</label>
+              <div class="md:w-1/3">
+                <label class="margin-remove-bottom form-label required">Gender</label>
+                <mat-form-field appearance="outline">
+                  <mat-select #gender formControlName="gender" i18n-placeholder placeholder="Select gender">
+                    <mat-option [value]="gender" *ngFor="let gender of genderList">
+                      {{gender}}
+                    </mat-option>
+                  </mat-select>
+                </mat-form-field>
+              </div>
+            </div>
+
+            <div class="flex flex-row margin-top-m">
+              <div class="md:w-1/3">
+                <label class="margin-remove-bottom form-label required">Office Pin Code</label>
+                <mat-form-field appearance="outline">
+                  <input id="pinCode" #pincode type="text" matInput placeholder="Type here" formControlName="pincode"
+                    i18n-aria-label aria-label="Pin Code input field" autocomplete="off"
+                    (keypress)="numericOnly($event)" maxlength="6">
+                  <mat-error [hidden]="false" i18n="Pin code | Explains pin code is required">
+                    Pin code is mandatory
+                  </mat-error>
+                </mat-form-field>
+              </div>
+
+              <div class="md:w-1/3">
+                <label class="margin-remove-bottom form-label">eHRMS ID</label>
+                <mat-form-field appearance="outline">
+                  <input type="text" matInput #ehrmsID formControlName="ehrmsID" placeholder="Type here">
+                </mat-form-field>
+              </div>
+
+              <div class="md:w-1/3">
+                <label class="margin-remove-bottom form-label">Category</label>
+                <mat-form-field appearance="outline">
+                  <mat-select #category formControlName="category" i18n-placeholder placeholder="Select category">
+                    <mat-option [value]="ctg" *ngFor="let ctg of categoryList">
+                      {{ctg}}
+                    </mat-option>
+                  </mat-select>
+                </mat-form-field>
+              </div>
+            </div>
+
+            <div class="flex flex-row margin-top-m">
+              <div class="md:w-1/2">
+                <label class="margin-remove-bottom form-label required">Tags</label>
+                <!-- <mat-form-field> -->
                 <div class="left-input-div">
                   <div class="flex-col">
-                    <input class="appr-text-field w-full-imp" #tags matInput i18n-placeholder="Type tag here"
-                      placeholder="Type tag here" formControlName="tags" i18n-aria-label aria-label="Enter tag"
+                    <input class="appr-text-field w-full-imp" #tags matInput i18n-placeholder="Type here"
+                      placeholder="Type here" formControlName="tags" i18n-aria-label aria-label="Type here"
                       [matChipInputFor]="chipListTags" autocomplete="off" maxlength="100"
                       [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
                       (matChipInputTokenEnd)="addActivity($event)" />
@@ -238,8 +273,7 @@
                 <div class="right-input-div">
                   <button mat-raised-button type="button" [disabled]="!tags.value"
                     (click)="addActivity({input: tags, value: tags.value})"
-                    [ngStyle]="{'opacity': updateUserDataForm.valid? 1: 0.7}"
-                    class="text-white btn-add-activity btn-responsive">
+                    class="btn-success btn-responsive btn-add-activity">
                     <span class="text-white" i18n>Add tag</span>
                   </button>
                 </div>
@@ -250,71 +284,69 @@
                     <mat-icon matChipRemove>cancel</mat-icon>
                   </mat-chip>
                 </mat-chip-list>
-              </mat-grid-tile>
-
-              <mat-grid-tile [colspan]="2" [rowspan]="2" class="input-wrapper">
-                <div id="roles"
-                  class="flex flex-1 flex-column margin-top-m margin-bottom-m margin-left-m margin-right-m">
-                  <div class="flex flex-wrap mobile-break">
-                    <div class="w-full profile-cols-full bg-grey">
-                      <div class="input-wrapper margin-top-s">
-                        <label for="roles" class="margin-remove-bottom form-label required" i18n-aria-label
-                          aria-label="Roles label" i18n="Role label|Label which explains the user to select the roles">
-                          Role
-                        </label>
-                        <mat-selection-list id="roles" formControlName="roles" #roles class="roles-list">
-                          <mat-list-option *ngFor="let role of rolesList" (click)="modifyUserRoles(role.roleName)"
-                            [selected]="userRoles.has(role.roleName)" [value]="role.roleName">
-                            {{role.roleName}}
-                          </mat-list-option>
-                        </mat-selection-list>
-                      </div>
+                <!-- </mat-form-field> -->
+              </div>
+            </div>
+
+            <div class="flex flex-row margin-top-m">
+              <div class="md:w-1/2" *ngIf="isMdoAdmin">
+                <div class="flex flex-wrap mobile-break">
+                  <div class="w-full profile-cols-full bg-grey">
+                    <div class="input-wrapper margin-top-s">
+                      <label for="roles" class="margin-remove-bottom form-label required" i18n-aria-label
+                        aria-label="Roles label" i18n="Role label|Label which explains the user to select the roles">
+                        Role
+                      </label>
+                      <mat-selection-list id="roles" formControlName="roles" #roles class="roles-list">
+                        <mat-list-option *ngFor="let role of rolesList" (click)="modifyUserRoles(role.roleName)"
+                          [selected]="userRoles.has(role.roleName)" [value]="role.roleName">
+                          {{role.roleName}}
+                        </mat-list-option>
+                      </mat-selection-list>
                     </div>
                   </div>
                 </div>
+              </div>
 
-                <div>
-                  <button mat-raised-button type="submit" (click)="onSubmit(updateUserDataForm, 'Roles')"
-                    class="margin-top-m text-white btn-success btn-responsive">
-                    <span class="text-white" i18n>
-                      Update
-                    </span>
-                  </button>
-                  <button mat-raised-button type="submit" (click)="resetRoles()"
-                    class="margin-top-m text-white btn-success btn-responsive">
-                    <span class="text-white" i18n>
-                      Cancel
+              <div class="md:w-1/2" *ngIf="!isMdoAdmin"
+                class="flex flex-1 flex-column margin-top-m margin-bottom-m margin-left-m margin-right-m">
+                <div class="flex-custom">
+                  <mat-card-content class="margin-top-m margin-bottom-m margin-left-m margin-right-m">
+                    <span class="mat-subheading-1 flex-4 mobile-margin appr-section-heading" role="link" tabindex="0">
+                      Roles
                     </span>
-                  </button>
-                </div>
-
-                <!-- <div id="roles" *ngIf="isMdoAdmin"
-                  class="flex flex-1 flex-column margin-top-m margin-bottom-m margin-left-m margin-right-m">
-                  <div class="flex-custom">
-                    <mat-card-content class="margin-top-m margin-bottom-m margin-left-m margin-right-m">
-                      <span class="mat-subheading-1 flex-4 mobile-margin appr-section-heading" role="link" tabindex="0">
-                        Roles
-                      </span>
-                      <div class="margin-top-l new-mobile">
-                        <div class="flex flex-wrap mobile-break">
-                          <div class="w-full profile-cols-full bg-grey">
-                            <ng-container>
-                              <ul class="roles-list margin-0">
-                                <li *ngFor="let role of orguserRoles" class="margin-bottom-s">{{role}}</li>
-                              </ul>
-                            </ng-container>
-                          </div>
+                    <div class="margin-top-l new-mobile">
+                      <div class="flex flex-wrap mobile-break">
+                        <div class="w-full profile-cols-full bg-grey">
+                          <ng-container>
+                            <ul class="roles-list margin-0">
+                              <li *ngFor="let role of orguserRoles" class="margin-bottom-s">{{role}}</li>
+                            </ul>
+                          </ng-container>
                         </div>
                       </div>
-                    </mat-card-content>
-                  </div>
-                </div> -->
-              </mat-grid-tile>
-
+                    </div>
+                  </mat-card-content>
+                </div>
+              </div>
+            </div>
 
-            </mat-grid-list>
-          </form>
-        </div>
+            <div class="flex flex-row margin-top-l">
+              <button mat-raised-button type="submit" (click)="onSubmit(updateUserDataForm, user)"
+                class="margin-right-m btn-success btn-responsive successbtn" [disabled]="updateUserDataForm?.invalid">
+                <span class="text-white" i18n>
+                  Update
+                </span>
+              </button>
+              <button mat-raised-button type="submit" (click)="resetRoles()"
+                class="btn-success btn-responsive cancelbtn">
+                <span i18n>
+                  Cancel
+                </span>
+              </button>
+            </div>
+          </div>
+        </form>
       </div>
 
       <div class="panel-body" *ngIf="!user.enableEdit">
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
index e21c453fd..3eb168aa6 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
@@ -70,13 +70,9 @@
   }
 }
 
-// .mat-expansion-panel-body {
-//   padding: 0 !important;
-
-  .panel-body {
-    padding: 10px 0;
-  }
-// }
+.panel-body {
+  padding: 10px 0;
+}
 .mat-expanded {
   border: 1px solid #1B4CA1 !important;
 }
@@ -92,7 +88,7 @@
   font: 400 14px Lato;
 }
 
-.appr-text-label{
+.form-label{
   width: 100%;
   padding-bottom: 10px;
   margin-bottom: 0;
@@ -154,4 +150,77 @@ mat-selection-list.roles-list {
 
 label {
   display: block;
+}
+.btn-success:disabled,
+.btn-success[disabled] {
+  opacity: 0.6;
+}
+
+.btn-danger {
+  height: 30px;
+  width: 30px
+}
+
+.text_hint {
+  margin-top: -20px;
+  color: rgba($color: #000000, $alpha: .4);
+}
+
+.left-input-div {
+  width: auto;
+  display: inline-flex;
+}
+.right-input-div {
+  // width: 14%;
+  display: inline-flex;
+  vertical-align: top;
+}
+
+.btn-add-activity {
+  background: no-repeat padding-box #0074b6 !important;
+  border-radius: 4px;
+  box-sizing: border-box;
+  margin: 4px 16px 0 16px !important;
+  line-height: 28px;
+  height: 36px;
+}
+
+.mat-chip-list {
+  margin-top: 2px;
+  display: flex;
+}
+
+.roles-list {
+  list-style: none;
+  padding: 0;
+}
+::ng-deep .profile-box {
+  .mobile-country-code .mat-select-value {
+    text-overflow: inherit !important;
+  }
+
+  .mat-select-arrow-wrapper {
+      transform: translateY(0%) !important;
+  }
+
+  .mat-form-field-appearance-outline .mat-form-field-infix {
+      padding: 0 0 0.5em 0 !important;
+  }
+
+  .mat-form-field-disabled {
+    cursor: not-allowed !important;
+    pointer-events: none !important;
+    opacity: 0.8 !important;
+  }
+   .mat-list-base .mat-list-option {
+    border: 1px solid #dedede !important;
+    border-radius: 4px !important;
+    margin-right: 12px;
+    height: auto;
+    padding: 0.7em 0;
+  }
+
+  .mat-form-field-disabled .mat-form-field-outline {
+    background-color: #ededed;
+  }
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index a7388e218..6346b89db 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -1,23 +1,28 @@
 import { Component, EventEmitter, Input, OnInit, Output, QueryList, ViewChild, ViewChildren } from '@angular/core'
 import { FormGroup, FormControl, Validators } from '@angular/forms'
 import { UsersService } from '../../../users/services/users.service'
-import { MatChipInputEvent, MatDialog, MatExpansionPanel, MatPaginator, MatSnackBar, PageEvent } from '@angular/material'
+import { DateAdapter, MAT_DATE_FORMATS, MatChipInputEvent, MatDialog, MatExpansionPanel, MatPaginator, MatSnackBar, PageEvent } from '@angular/material'
 import { COMMA, ENTER } from '@angular/cdk/keycodes'
 // tslint:disable-next-line
 import _ from 'lodash'
 import { RolesService } from '../../../users/services/roles.service'
-import { ActivatedRoute } from '@angular/router'
+import { ActivatedRoute, Router } from '@angular/router'
 import { Observable, Subscription, interval } from 'rxjs'
 import { debounceTime, distinctUntilChanged, map, startWith } from 'rxjs/operators'
 import { environment } from '../../../../../../../../../src/environments/environment'
 import { OtpService } from '../../../users/services/otp.service'
 import { ConfigurationsService } from '@sunbird-cb/utils'
 import { RejectionPopupComponent } from '../rejection-popup/rejection-popup.component'
+import { APP_DATE_FORMATS, AppDateAdapter } from '../../../events/routes/format-datepicker'
 
 @Component({
   selector: 'ws-widget-user-card',
   templateUrl: './user-card.component.html',
   styleUrls: ['./user-card.component.scss'],
+  providers: [
+    { provide: DateAdapter, useClass: AppDateAdapter },
+    { provide: MAT_DATE_FORMATS, useValue: APP_DATE_FORMATS },
+  ]
 })
 export class UserCardComponent implements OnInit {
   @Input() userId: any
@@ -70,14 +75,19 @@ export class UserCardComponent implements OnInit {
   timeLeftforOTP = 0
   isMobileVerified = false
   disableVerifyBtn = false
+  qpParam: any
+  department: any
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-    private configSvc: ConfigurationsService, private dialog: MatDialog,
+    private configSvc: ConfigurationsService, private dialog: MatDialog, private router: Router,
     private route: ActivatedRoute, private otpService: OtpService,
     private snackBar: MatSnackBar) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', []),
+      employeeID: new FormControl({ value: '', disabled: true }, []),
+      ehrmsID: new FormControl({ value: '', disabled: true }, []),
+      dob: new FormControl('', [Validators.required]),
       primaryEmail: new FormControl('', [Validators.required]),
       countryCode: new FormControl('+91', [Validators.required]),
       mobile: new FormControl('', [Validators.required, Validators.pattern(this.phoneNumberPattern)]),
@@ -90,6 +100,7 @@ export class UserCardComponent implements OnInit {
     })
 
     const fullProfile = _.get(this.route.snapshot, 'data.configService')
+    this.department = fullProfile.unMappedUser.rootOrgId
 
     if (fullProfile.unMappedUser && fullProfile.unMappedUser.roles) {
       this.isMdoAdmin = fullProfile.unMappedUser.roles.includes('MDO_ADMIN')
@@ -165,8 +176,6 @@ export class UserCardComponent implements OnInit {
   otherDropDownChange(value: any, field: string) {
     if (field === 'designation' && value !== 'Other') {
       this.updateUserDataForm.controls['designation'].setValue(value)
-
-      console.log('this.updateUserDataForm', this.updateUserDataForm)
     }
   }
 
@@ -197,7 +206,9 @@ export class UserCardComponent implements OnInit {
   }
 
   onEditUser(user: any) {
-    user.enableEdit = false
+    setTimeout(() => {
+      user.enableEdit = false
+    }, 5000)
     // this.cdref.detectChanges()
   }
 
@@ -251,6 +262,49 @@ export class UserCardComponent implements OnInit {
         this.modifyUserRoles(role)
       })
     })
+
+    if (user && user.profileDetails) {
+      // this.updateUserDataForm.controls['employeeID'].setValue('')
+      // this.updateUserDataForm.controls['ehrmsID'].setValue('')
+      if (user.profileDetails.professionalDetails) {
+        if (user.profileDetails.professionalDetails.designation) {
+          this.updateUserDataForm.controls['designation'].setValue(user.profileDetails.professionalDetails.designation)
+        }
+      }
+
+      if (user.profileDetails.additionalProperties) {
+        if (user.profileDetails.additionalProperties.group) {
+          this.updateUserDataForm.controls['group'].setValue(user.profileDetails.additionalProperties.group)
+        }
+      }
+
+      if (user.profileDetails.personalDetails) {
+        if (user.profileDetails.personalDetails.primaryEmail) {
+          this.updateUserDataForm.controls['primaryEmail'].setValue(user.profileDetails.personalDetails.primaryEmail)
+        }
+        if (user.profileDetails.personalDetails.mobile) {
+          this.updateUserDataForm.controls['mobile'].setValue(user.profileDetails.personalDetails.mobile)
+        }
+        if (user.profileDetails.personalDetails.gender) {
+          this.updateUserDataForm.controls['gender'].setValue(user.profileDetails.personalDetails.mobile)
+        }
+        if (user.profileDetails.personalDetails.dob) {
+          this.updateUserDataForm.controls['dob'].setValue(user.profileDetails.personalDetails.dob)
+        }
+        if (user.profileDetails.personalDetails.domicileMedium) {
+          this.updateUserDataForm.controls['domicileMedium'].setValue(user.profileDetails.personalDetails.domicileMedium)
+        }
+        if (user.profileDetails.personalDetails.category) {
+          this.updateUserDataForm.controls['category'].setValue(user.profileDetails.personalDetails.category)
+        }
+      }
+
+      if (user.profileDetails.employmentDetails) {
+        if (user.profileDetails.employmentDetails.pinCode) {
+          this.updateUserDataForm.controls['pincode'].setValue(user.profileDetails.employmentDetails.pincode)
+        }
+      }
+    }
   }
 
   getUseravatarName(user: any) {
@@ -510,4 +564,96 @@ export class UserCardComponent implements OnInit {
       }
     })
   }
+
+  onSubmit(form: any, user: any) {
+    // console.log('user -------', user)
+    // console.log('form *******', form)
+    if (form.valid) {
+      const tags = user.profileDetails && user.profileDetails.additionalProperties && user.profileDetails.additionalProperties.tags ?
+        user.profileDetails.additionalProperties.tags : []
+      if (tags !== this.selectedtags) {
+        this.reqbody = {
+          request: {
+            userId: user.userId,
+            profileDetails: {
+              personalDetails: {
+                dob: this.updateUserDataForm.controls['dob'].value,
+                domicileMedium: this.updateUserDataForm.controls['domicileMedium'].value,
+                gender: this.updateUserDataForm.controls['gender'].value,
+                category: this.updateUserDataForm.controls['category'].value,
+                mobile: this.updateUserDataForm.controls['mobile'].value,
+                primaryEmail: this.updateUserDataForm.controls['primaryEmail'].value,
+              },
+              professionalDetails: [
+                {
+                  designation: this.updateUserDataForm.controls['designation'].value,
+                  group: this.updateUserDataForm.controls['group'].value,
+                },
+              ],
+              additionalProperties: {
+                tag: this.selectedtags,
+              },
+              employmentDetails: {
+                pinCode: this.updateUserDataForm.controls['pinCode'].value,
+              }
+            },
+          },
+        }
+      } else {
+        this.reqbody = {
+          request: {
+            userId: user.userId,
+            profileDetails: {
+              professionalDetails: [
+                {
+                  designation: this.updateUserDataForm.controls['designation'].value,
+                },
+              ],
+            },
+          },
+        }
+      }
+      this.usersSvc.updateUserDetails(this.reqbody).subscribe(dres => {
+        if (dres) {
+          this.openSnackbar('User updated Successfully')
+          if (this.qpParam === 'MDOinfo') {
+            this.router.navigate(['/app/home/mdoinfo/leadership'])
+          } else {
+            this.router.navigate(['/app/home/users'])
+          }
+        }
+      })
+    } else {
+      if (form.value.roles !== this.orguserRoles) {
+        const dreq = {
+          request: {
+            organisationId: this.department,
+            userId: user.userId,
+            roles: Array.from(this.userRoles),
+          },
+        }
+
+        this.usersSvc.addUserToDepartment(dreq).subscribe(dres => {
+          if (dres) {
+            this.updateUserDataForm.reset({ roles: '' })
+            this.openSnackbar('User role updated Successfully')
+            if (this.qpParam === 'MDOinfo') {
+              this.router.navigate(['/app/home/mdoinfo/leadership'])
+            } else {
+              this.router.navigate(['/app/home/users'])
+            }
+          }
+        })
+      } else {
+        this.openSnackbar('Select new roles')
+      }
+    }
+
+  }
+
+  private openSnackbar(primaryMsg: string, duration: number = 5000) {
+    this.snackBar.open(primaryMsg, 'X', {
+      duration,
+    })
+  }
 }
diff --git a/src/styles/_ws-common.scss b/src/styles/_ws-common.scss
index 53c9a6aa1..c0997b526 100644
--- a/src/styles/_ws-common.scss
+++ b/src/styles/_ws-common.scss
@@ -118,4 +118,33 @@ $color-red: #D13924;
   color: #FFF;
   background-color: $color-blue;
   border: 1px solid $color-blue;
+}
+
+.successbtn {
+  background: #1B4CA1 !important;
+}
+
+.cancelbtn {
+  border: 1px solid #1B4CA1;
+  color: #1B4CA1 !important;
+}
+
+.justify-between {
+    justify-content: space-between;
+}
+
+.w-full {
+    width: 100%;
+}
+
+.w80 {
+  width: 95px !important;
+}
+
+.w-minus-w80 {
+  max-width: calc(100% - 80px) !important;
+}
+
+.w-minus-w50 {
+  max-width: calc(100% - 50%) !important;
 }
\ No newline at end of file

From c09ed2d69c89e2cd182582b3b3fac6f0b980292e Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Sun, 28 Apr 2024 17:40:12 +0530
Subject: [PATCH 556/887] Updated view UI for user card

---
 .../user-cards/user-card.component.html       | 128 +++++++++---------
 .../user-cards/user-card.component.scss       |   7 +
 2 files changed, 70 insertions(+), 65 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 3551f1ff6..2f4e433db 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -58,33 +58,29 @@
           <div class="inner-body">
             Primary Details <mat-icon class="ws-mat-black40-text">info_outline</mat-icon>
             <div class="flex flex-row margin-top-m">
-              <div class="flex md:w-1/3">
-                <div>
-                  <label class="margin-remove-bottom form-label required">Designation</label>
-                  <mat-form-field appearance="outline">
-                    <mat-select #designation formControlName="designation" i18n-placeholder
-                      placeholder="Select designation"
-                      (selectionChange)="otherDropDownChange(designation.value, 'designation')">
-                      <mat-option [value]="designation.name" *ngFor="let designation of designationsMeta">
-                        {{designation.name}}
-                      </mat-option>
-                      <mat-option [value]="'Other'">Other</mat-option>
-                    </mat-select>
-                  </mat-form-field>
-                </div>
+              <div class="md:w-1/4">
+                <label class="margin-remove-bottom form-label required">Designation</label>
+                <mat-form-field appearance="outline">
+                  <mat-select #designation formControlName="designation" i18n-placeholder
+                    placeholder="Select designation"
+                    (selectionChange)="otherDropDownChange(designation.value, 'designation')">
+                    <mat-option [value]="designation.name" *ngFor="let designation of designationsMeta">
+                      {{designation.name}}
+                    </mat-option>
+                    <mat-option [value]="'Other'">Other</mat-option>
+                  </mat-select>
+                </mat-form-field>
               </div>
 
-              <div class="flex md:w-1/3">
-                <div>
-                  <label class="margin-remove-bottom form-label required">Group</label>
-                  <mat-form-field appearance="outline">
-                    <mat-select #group formControlName="group" i18n-placeholder placeholder="Select group">
-                      <mat-option [value]="g" *ngFor="let g of groupsList">
-                        {{g.name}}
-                      </mat-option>
-                    </mat-select>
-                  </mat-form-field>
-                </div>
+              <div class="md:w-1/4">
+                <label class="margin-remove-bottom form-label required">Group</label>
+                <mat-form-field appearance="outline">
+                  <mat-select #group formControlName="group" i18n-placeholder placeholder="Select group">
+                    <mat-option [value]="g" *ngFor="let g of groupsList">
+                      {{g.name}}
+                    </mat-option>
+                  </mat-select>
+                </mat-form-field>
               </div>
             </div>
           </div>
@@ -357,23 +353,23 @@
             <span class="font-bold">Primary Details</span> <mat-icon
               class="ws-mat-black40-text infoicon">info_outline</mat-icon>
           </div>
-          <mat-grid-list cols="2" rowHeight="60px">
-            <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+          <div class="flex flex-row margin-top-m">
+            <div class="md:w-1/3">
               <label class="view-text-label">Designation</label>
               <p>{{user.profileDetails && user.profileDetails.professionalDetails &&
                 user.profileDetails.professionalDetails.designation ?
-                user.profileDetails.professionalDetails.designation : '-'}}</p>
-
-            </mat-grid-tile>
+                user.profileDetails.professionalDetails.designation : '-'}} <mat-icon
+                  class="verified-icon">check_circle</mat-icon></p>
+            </div>
 
-            <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+            <div class="md:w-1/3">
               <label class="view-text-label">Group</label>
               <p>{{user.profileDetails && user.profileDetails.additionalProperties &&
                 user.profileDetails.additionalProperties.group ?
-                user.profileDetails.additionalProperties.group : '-'}}</p>
-
-            </mat-grid-tile>
-          </mat-grid-list>
+                user.profileDetails.additionalProperties.group : '-'}} <mat-icon
+                  class="verified-icon">check_circle</mat-icon></p>
+            </div>
+          </div>
         </div>
         <hr>
         <div class="inner-body margin-top-m mat-body-2">
@@ -382,73 +378,74 @@
               class="ws-mat-black40-text infoicon">info_outline</mat-icon>
           </div>
 
-          <mat-grid-list cols="4" rowHeight="60px">
-            <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+          <div class="flex flex-row margin-top-m">
+            <div class="md:w-1/4">
               <label class="view-text-label">Employee ID</label>
               <p>{{user.empID ? user.empID : '-'}}</p>
-            </mat-grid-tile>
+            </div>
 
-            <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+            <div class="md:w-1/4">
               <label class="view-text-label">Email</label>
               <p>{{user.profileDetails && user.profileDetails.personalDetails ?
                 user.profileDetails.personalDetails.primaryEmail : '-'}}</p>
-            </mat-grid-tile>
+            </div>
 
-            <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+            <div class="md:w-1/4">
               <label class="view-text-label">Mobile Number</label>
               <p>{{user.profileDetails && user.profileDetails.personalDetails ?
                 user.profileDetails.personalDetails.mobile : '-'}}</p>
-            </mat-grid-tile>
+            </div>
 
-            <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+            <div class="md:w-1/4">
               <label class="view-text-label">Gender</label>
               <p>{{user.profileDetails && user.profileDetails.personalDetails &&
                 user.profileDetails.personalDetails.gender ?
                 user.profileDetails.personalDetails.gender : '-'}}</p>
-
-            </mat-grid-tile>
-
-            <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+            </div>
+          </div>
+          <div class="flex flex-row margin-top-m">
+            <div class="md:w-1/4">
               <label class="view-text-label">Date Of Birth</label>
               <p>{{user.profileDetails && user.profileDetails.personalDetails && user.profileDetails.personalDetails.dob
                 ? user.profileDetails.personalDetails.dob
                 : '-'}}</p>
-            </mat-grid-tile>
+            </div>
 
-            <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+            <div class="md:w-1/4">
               <label class="view-text-label">Mother Tongue</label>
               <p>{{user.profileDetails && user.profileDetails.personalDetails &&
                 user.profileDetails.personalDetails.domicileMedium ?
                 user.profileDetails.personalDetails.domicileMedium : '-'}}</p>
-            </mat-grid-tile>
+            </div>
 
-            <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+            <div class="md:w-1/4">
               <label class="view-text-label">Category</label>
               <p>{{user.profileDetails && user.profileDetails.personalDetails &&
                 user.profileDetails.personalDetails.category ?
                 user.profileDetails.personalDetails.category : '-'}}</p>
-            </mat-grid-tile>
+            </div>
 
-            <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+            <div class="md:w-1/4">
               <label class="view-text-label">Pay Band</label>
               <p>{{user.profileDetails && user.profileDetails.employmentDetails &&
                 user.profileDetails.employmentDetails.payType ?
                 user.profileDetails.employmentDetails.payType : '-'}}</p>
-            </mat-grid-tile>
-
-            <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+            </div>
+          </div>
+          <div class="flex flex-row margin-top-m">
+            <div class="md:w-1/4">
               <label class="view-text-label">Office Pin Code</label>
               <p>{{user.profileDetails && user.profileDetails.employmentDetails &&
                 user.profileDetails.employmentDetails.pinCode ?
                 user.profileDetails.employmentDetails.pinCode : '-'}}</p>
-            </mat-grid-tile>
+            </div>
 
-            <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+            <div class="md:w-1/4">
               <label class="view-text-label">eHRMS ID</label>
               <p>{{user.ehrmsID ? user.ehrmsID : '-'}}</p>
-            </mat-grid-tile>
+            </div>
 
-            <mat-grid-tile [colspan]="2" [rowspan]="1" class="input-wrapper">
+            <div class="md:w-1/2">
               <label class="view-text-label">Tags</label>
               <div *ngIf="user.profileDetails && user.profileDetails.additionalProperties &&
               user.profileDetails.additionalProperties.tag &&
@@ -458,9 +455,10 @@
                 </ul>
               </div>
               <p *ngIf="user.profileDetails && !user.profileDetails.additionalProperties">-</p>
-            </mat-grid-tile>
-
-            <mat-grid-tile [colspan]="1" [rowspan]="1" class="input-wrapper">
+            </div>
+          </div>
+          <div class="flex flex-row margin-top-m">
+            <div class="md:w-1/1">
               <label class="view-text-label">Roles</label>
               <div *ngIf="user.organisations && user.organisations[0].roles.length > 0">
                 <ul class="roleslist">
@@ -469,8 +467,8 @@
                 </ul>
               </div>
               <p *ngIf="user.organisations && user.organisations[0].roles.length === 0">-</p>
-            </mat-grid-tile>
-          </mat-grid-list>
+            </div>
+          </div>
         </div>
       </div>
     </mat-expansion-panel>
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
index 3eb168aa6..dcd04c585 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
@@ -55,6 +55,13 @@
     background: #D13924;
   }
 
+  .verified-icon {
+    color: #1D8923;
+  }
+  .nonverified-icon {
+    color: #D13924;
+  }
+
  .button {
     color: #1B4CA1;
     border: 1px solid #1B4CA1;

From 6d2b77ebd1410802869c27cb3a31823462b01466 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Mon, 29 Apr 2024 01:30:47 +0530
Subject: [PATCH 557/887] Updated validations & error for edit user form

---
 .../user-cards/user-card.component.html       |  86 +++++++++------
 .../user-cards/user-card.component.scss       |  25 ++++-
 .../user-cards/user-card.component.ts         | 103 ++++++++----------
 .../ws/app/src/lib/routes/home/home.module.ts |   2 +
 src/styles/_ws-common.scss                    |   7 +-
 5 files changed, 128 insertions(+), 95 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 2f4e433db..9034d5bc4 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -49,16 +49,19 @@
           </div>
         </div>
         <div class="float-right">
-          <div class="button margin-top-xs mat-body" (click)="onEditUser(user)"><mat-icon>edit</mat-icon> Edit</div>
+          <div class="button margin-top-xs mat-body" (click)="onEditUser(user)" *ngIf="isMdoAdmin || isMdoLeader">
+            <mat-icon>edit</mat-icon> Edit
+          </div>
         </div>
       </mat-expansion-panel-header>
 
       <div class="panel-body profile-box" *ngIf="user.enableEdit">
         <form [formGroup]="updateUserDataForm" class="margin-top-m">
           <div class="inner-body">
-            Primary Details <mat-icon class="ws-mat-black40-text">info_outline</mat-icon>
+            Primary Details <mat-icon class="ws-mat-black40-text custominfo">info_outline</mat-icon>
+            <p class="float-right mat-body-2"><mat-slide-toggle>Mark this user as non-verified</mat-slide-toggle></p>
             <div class="flex flex-row margin-top-m">
-              <div class="md:w-1/4">
+              <div class="md:w-1/3">
                 <label class="margin-remove-bottom form-label required">Designation</label>
                 <mat-form-field appearance="outline">
                   <mat-select #designation formControlName="designation" i18n-placeholder
@@ -69,10 +72,15 @@
                     </mat-option>
                     <mat-option [value]="'Other'">Other</mat-option>
                   </mat-select>
+                  <mat-error [hidden]="false" i18n="Designation Error | Explains designation is required"
+                    *ngIf="updateUserDataForm?.controls['designation'].errors?.required">
+                    Designation is mandatory
+                  </mat-error>
                 </mat-form-field>
+                <mat-icon class="verified-icon margin-left-xs">check_circle</mat-icon>
               </div>
 
-              <div class="md:w-1/4">
+              <div class="md:w-1/3">
                 <label class="margin-remove-bottom form-label required">Group</label>
                 <mat-form-field appearance="outline">
                   <mat-select #group formControlName="group" i18n-placeholder placeholder="Select group">
@@ -80,13 +88,18 @@
                       {{g.name}}
                     </mat-option>
                   </mat-select>
+                  <mat-error [hidden]="false" i18n="Group Error | Explains group is required"
+                    *ngIf="updateUserDataForm?.controls['group'].errors?.required">
+                    Group is mandatory
+                  </mat-error>
                 </mat-form-field>
+                <mat-icon class="verified-icon margin-left-xs">check_circle</mat-icon>
               </div>
             </div>
           </div>
           <hr>
           <div class="inner-body">
-            Other Details <mat-icon class="ws-mat-black40-text">info_outline</mat-icon>
+            Other Details <mat-icon class="ws-mat-black40-text custominfo">info_outline</mat-icon>
 
             <div class="flex flex-row margin-top-m">
               <div class="md:w-1/3">
@@ -102,21 +115,27 @@
                   <input id="primaryEmail" name="primaryEmailField" type="email" matInput placeholder="Type here"
                     #primaryEmail formControlName="primaryEmail" i18n-aria-label
                     aria-label="Primary Email readonly input" maxlength="320">
-                  <mat-error [hidden]="false" i18n="Primary Email Error|Explains name is required">
+                  <mat-error [hidden]="false" i18n="Primary Email Error|Explains name is required"
+                    *ngIf="updateUserDataForm?.controls['mobile'].errors?.required">
                     Email is mandatory
                   </mat-error>
+                  <mat-error [hidden]="false" class="custom-error"
+                    *ngIf="updateUserDataForm?.controls['mobile'].errors?.pattern" i18n-aria-label
+                    aria-label="Please enter a valid email">
+                    Please enter a valid email
+                  </mat-error>
                 </mat-form-field>
               </div>
 
               <div class="md:w-1/3">
                 <label class="margin-remove-bottom form-label required">Mobile number</label>
-                <mat-form-field appearance="outline" class="w80 mobile-country-code">
+                <mat-form-field appearance="outline" class="w82 mobile-country-code">
                   <mat-select formControlName="countryCode" default="+91" i18n-placeholder placeholder="Select code"
                     i18n-aria-label aria-label="Mobile Number label">
                     <mat-option [value]="code" *ngFor="let code of countryCodes">{{code}}</mat-option>
                   </mat-select>
                 </mat-form-field>
-                <mat-form-field appearance="outline" class="flex-expand w-minus-w80">
+                <mat-form-field appearance="outline" class="flex-expand w-48p">
                   <input id="mobileNumber" #mobile type="text" matInput placeholder="Type here" formControlName="mobile"
                     i18n-aria-label aria-label="Mobile Number input" maxlength="10" (keypress)="numericOnly($event)"
                     (paste)="numericOnly($event)">
@@ -170,13 +189,13 @@
             <div class="flex flex-row margin-top-m">
               <div class="md:w-1/3">
                 <label class="margin-remove-bottom form-label required">Date of Birth</label>
-                <mat-form-field appearance="outline">
+                <mat-form-field appearance="outline" class="customdob">
                   <input id="birthDate" matInput #dob formControlName="dob" [matDatepicker]="picker" i18n-placeholder
                     (focus)="picker.open()" placeholder="Choose date of birth" [min]="1/1/1900" [max]="today">
                   <mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
                   <mat-datepicker #picker (closed)="dob.blur()" i18n-aria-label aria-label="Date picker">
                   </mat-datepicker>
-                  <mat-error [hidden]="false" i18n="Date of Birth Error|Explains name is required">
+                  <mat-error [hidden]="false" i18n="Date of Birth Error | Explains name is required">
                     Date of birth is mandatory
                   </mat-error>
                 </mat-form-field>
@@ -188,9 +207,14 @@
                   <input id="language" matInput type="text" placeholder="Type here" i18n-placeholder="Mother Tongue"
                     formControlName="domicileMedium" [matAutocomplete]="motherTongueAuto" i18n-aria-label
                     aria-label="Domicile Medium (Mother Tongue)" #motherTongue maxlength="30" />
-                  <mat-error *ngIf="updateUserDataForm?.controls['domicileMedium'].errors?.forbiddenNames"
+                  <!-- <mat-error *ngIf="updateUserDataForm?.controls['domicileMedium'].errors?.forbiddenNames"
                     i18n-aria-label aria-label="Please choose a value from the list provided above.">
                     Please choose a value from the list provided above
+                  </mat-error> -->
+                  <mat-error [hidden]="false" i18n="domicileMedium Error|Explains Domicile Medium is required"
+                    *ngIf="updateUserDataForm?.controls['domicileMedium'].errors?.required" i18n-aria-label
+                    aria-label="Domicile Medium is mandatory">
+                    Mother Tongue is mandatory
                   </mat-error>
                 </mat-form-field>
                 <mat-autocomplete #motherTongueAuto="matAutocomplete" autoActiveFirstOption="true">
@@ -198,9 +222,6 @@
                     {{ option.name }}
                   </mat-option>
                 </mat-autocomplete>
-                <mat-error [hidden]="false" i18n="Mother tongue Error | Explains Mother tongue is required">
-                  Mother tongue is mandatory
-                </mat-error>
               </div>
 
               <div class="md:w-1/3">
@@ -211,6 +232,9 @@
                       {{gender}}
                     </mat-option>
                   </mat-select>
+                  <mat-error [hidden]="false" i18n="Gender Error | Explains gender is required">
+                    Gender is mandatory
+                  </mat-error>
                 </mat-form-field>
               </div>
             </div>
@@ -236,13 +260,16 @@
               </div>
 
               <div class="md:w-1/3">
-                <label class="margin-remove-bottom form-label">Category</label>
+                <label class="margin-remove-bottom form-label required">Category</label>
                 <mat-form-field appearance="outline">
                   <mat-select #category formControlName="category" i18n-placeholder placeholder="Select category">
                     <mat-option [value]="ctg" *ngFor="let ctg of categoryList">
                       {{ctg}}
                     </mat-option>
                   </mat-select>
+                  <mat-error [hidden]="false" i18n="Category Error | Explains category is required">
+                    Category is mandatory
+                  </mat-error>
                 </mat-form-field>
               </div>
             </div>
@@ -285,7 +312,7 @@
             </div>
 
             <div class="flex flex-row margin-top-m">
-              <div class="md:w-1/2" *ngIf="isMdoAdmin">
+              <div class="md:w-1/2" *ngIf="!isMdoAdmin">
                 <div class="flex flex-wrap mobile-break">
                   <div class="w-full profile-cols-full bg-grey">
                     <div class="input-wrapper margin-top-s">
@@ -304,26 +331,15 @@
                 </div>
               </div>
 
-              <div class="md:w-1/2" *ngIf="!isMdoAdmin"
-                class="flex flex-1 flex-column margin-top-m margin-bottom-m margin-left-m margin-right-m">
-                <div class="flex-custom">
-                  <mat-card-content class="margin-top-m margin-bottom-m margin-left-m margin-right-m">
-                    <span class="mat-subheading-1 flex-4 mobile-margin appr-section-heading" role="link" tabindex="0">
-                      Roles
-                    </span>
-                    <div class="margin-top-l new-mobile">
-                      <div class="flex flex-wrap mobile-break">
-                        <div class="w-full profile-cols-full bg-grey">
-                          <ng-container>
-                            <ul class="roles-list margin-0">
-                              <li *ngFor="let role of orguserRoles" class="margin-bottom-s">{{role}}</li>
-                            </ul>
-                          </ng-container>
-                        </div>
-                      </div>
-                    </div>
-                  </mat-card-content>
+              <div class="md:w-1/2" *ngIf="isMdoAdmin">
+                <label class="view-text-label">Roles</label>
+                <div *ngIf="user.organisations && user.organisations[0].roles.length > 0">
+                  <ul class="roleslist">
+                    <li *ngFor="let t of user.organisations[0].roles">{{t}}
+                    </li>
+                  </ul>
                 </div>
+                <p *ngIf="user.organisations && user.organisations[0].roles.length === 0">-</p>
               </div>
             </div>
 
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
index dcd04c585..480fabe50 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
@@ -151,9 +151,9 @@
   width: 88%;
 }
 
-mat-selection-list.roles-list {
-    display: inline-flex;
-}
+// mat-selection-list.roles-list {
+//     // display: inline-flex;
+// }
 
 label {
   display: block;
@@ -212,6 +212,7 @@ label {
 
   .mat-form-field-appearance-outline .mat-form-field-infix {
       padding: 0 0 0.5em 0 !important;
+      width: 15em !important;
   }
 
   .mat-form-field-disabled {
@@ -230,4 +231,22 @@ label {
   .mat-form-field-disabled .mat-form-field-outline {
     background-color: #ededed;
   }
+
+  .custominfo {
+    font-size: 18px;
+    height: 20px;
+    width: 20px;
+    vertical-align: middle;
+    margin-left: 1px;
+  }
+
+  .customdob {
+    width: 12.5em !important;
+  }
+  .mat-slide-toggle.mat-checked .mat-slide-toggle-thumb {
+    background-color: rgba(29, 137, 35) !important;
+  }
+  .mat-slide-toggle.mat-checked .mat-slide-toggle-bar {
+    background-color: rgba(29, 137, 35, 0.54) !important;
+  }
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 6346b89db..ee97e51d5 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -65,6 +65,7 @@ export class UserCardComponent implements OnInit {
   categoryList = ['General', 'OBC', 'SC', 'ST', 'Others']
 
   phoneNumberPattern = '^((\\+91-?)|0)?[0-9]{10}$'
+  emailRegix = `^[\\w\-\\.]+@([\\w-]+\\.)+[\\w-]{2,4}$`
   pincodePattern = '(^[0-9]{6}$)'
   yearPattern = '(^[0-9]{4}$)'
 
@@ -83,20 +84,20 @@ export class UserCardComponent implements OnInit {
     private route: ActivatedRoute, private otpService: OtpService,
     private snackBar: MatSnackBar) {
     this.updateUserDataForm = new FormGroup({
-      designation: new FormControl('', []),
-      group: new FormControl('', []),
+      designation: new FormControl('', [Validators.required]),
+      group: new FormControl('', [Validators.required]),
       employeeID: new FormControl({ value: '', disabled: true }, []),
       ehrmsID: new FormControl({ value: '', disabled: true }, []),
       dob: new FormControl('', [Validators.required]),
-      primaryEmail: new FormControl('', [Validators.required]),
+      primaryEmail: new FormControl('', [Validators.required, Validators.email, Validators.pattern(this.emailRegix)]),
       countryCode: new FormControl('+91', [Validators.required]),
       mobile: new FormControl('', [Validators.required, Validators.pattern(this.phoneNumberPattern)]),
-      tags: new FormControl('', [Validators.pattern(this.namePatern)]),
+      tags: new FormControl('', [Validators.required, Validators.pattern(this.namePatern)]),
       roles: new FormControl('', [Validators.required]),
-      domicileMedium: new FormControl('', []),
-      gender: new FormControl('', []),
-      category: new FormControl('', []),
-      pincode: new FormControl('', []),
+      domicileMedium: new FormControl('', [Validators.required]),
+      gender: new FormControl('', [Validators.required]),
+      category: new FormControl('', [Validators.required]),
+      pincode: new FormControl('', [Validators.required]),
     })
 
     const fullProfile = _.get(this.route.snapshot, 'data.configService')
@@ -228,26 +229,26 @@ export class UserCardComponent implements OnInit {
       for (let i = 0; i < this.orgTypeList.length; i += 1) {
         if (this.orgTypeList[i].name === 'MDO') {
           _.each(this.orgTypeList[i].roles, rolesObject => {
-            if (this.isMdoAdmin) {
-              if (rolesObject === 'PUBLIC') {
-                this.uniqueRoles.push({
-                  roleName: rolesObject, description: rolesObject,
-                })
-              }
-              if (rolesObject === 'MDO_DASHBOARD_USER') {
-                this.uniqueRoles.push({
-                  roleName: rolesObject, description: rolesObject,
-                })
-              }
-            } else {
-              if (this.isMdoLeader) {
-                if (rolesObject !== 'MDO_LEADER') {
-                  this.uniqueRoles.push({
-                    roleName: rolesObject, description: rolesObject,
-                  })
-                }
-              }
+            // if (this.isMdoAdmin) {
+            //   if (rolesObject === 'PUBLIC') {
+            //     this.uniqueRoles.push({
+            //       roleName: rolesObject, description: rolesObject,
+            //     })
+            //   }
+            //   if (rolesObject === 'MDO_DASHBOARD_USER') {
+            //     this.uniqueRoles.push({
+            //       roleName: rolesObject, description: rolesObject,
+            //     })
+            //   }
+            // } else {
+            // if (this.isMdoLeader) {
+            if (rolesObject !== 'MDO_LEADER') {
+              this.uniqueRoles.push({
+                roleName: rolesObject, description: rolesObject,
+              })
+              // }
             }
+            // }
           })
         }
       }
@@ -256,7 +257,7 @@ export class UserCardComponent implements OnInit {
           this.rolesList.push(role)
         }
       })
-      const usrRoles = profileDataAll.roles
+      const usrRoles = profileDataAll.organisations[0].roles
       usrRoles.forEach((role: any) => {
         this.orguserRoles.push(role)
         this.modifyUserRoles(role)
@@ -616,39 +617,29 @@ export class UserCardComponent implements OnInit {
       this.usersSvc.updateUserDetails(this.reqbody).subscribe(dres => {
         if (dres) {
           this.openSnackbar('User updated Successfully')
-          if (this.qpParam === 'MDOinfo') {
-            this.router.navigate(['/app/home/mdoinfo/leadership'])
+
+          if (form.value.roles !== this.orguserRoles) {
+            const dreq = {
+              request: {
+                organisationId: this.department,
+                userId: user.userId,
+                roles: Array.from(this.userRoles),
+              },
+            }
+
+            this.usersSvc.addUserToDepartment(dreq).subscribe(dres => {
+              if (dres) {
+                this.updateUserDataForm.reset({ roles: '' })
+                this.openSnackbar('User role updated Successfully')
+                this.router.navigate(['/app/home/users/allusers'])
+              }
+            })
           } else {
-            this.router.navigate(['/app/home/users'])
+            this.openSnackbar('Select new roles')
           }
         }
       })
-    } else {
-      if (form.value.roles !== this.orguserRoles) {
-        const dreq = {
-          request: {
-            organisationId: this.department,
-            userId: user.userId,
-            roles: Array.from(this.userRoles),
-          },
-        }
-
-        this.usersSvc.addUserToDepartment(dreq).subscribe(dres => {
-          if (dres) {
-            this.updateUserDataForm.reset({ roles: '' })
-            this.openSnackbar('User role updated Successfully')
-            if (this.qpParam === 'MDOinfo') {
-              this.router.navigate(['/app/home/mdoinfo/leadership'])
-            } else {
-              this.router.navigate(['/app/home/users'])
-            }
-          }
-        })
-      } else {
-        this.openSnackbar('Select new roles')
-      }
     }
-
   }
 
   private openSnackbar(primaryMsg: string, duration: number = 5000) {
diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index 084ee73da..4c9079f00 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -22,6 +22,7 @@ import {
   MatCheckboxModule,
   MatDatepickerModule,
   MatAutocompleteModule,
+  MatSlideToggleModule,
 } from '@angular/material'
 import { MatMenuModule } from '@angular/material/menu'
 import { MatPaginatorModule } from '@angular/material/paginator'
@@ -167,6 +168,7 @@ import { RejectionPopupComponent } from './components/rejection-popup/rejection-
     LeftMenuModule,
     FilterSearchPipeModule,
     MatAutocompleteModule,
+    MatSlideToggleModule,
   ],
   entryComponents: [
     AdduserpopupComponent,
diff --git a/src/styles/_ws-common.scss b/src/styles/_ws-common.scss
index c0997b526..cd077a6c5 100644
--- a/src/styles/_ws-common.scss
+++ b/src/styles/_ws-common.scss
@@ -136,11 +136,16 @@ $color-red: #D13924;
 .w-full {
     width: 100%;
 }
-
+.w-48p {
+    width: 48% !important;
+}
 .w80 {
   width: 95px !important;
 }
 
+.w82 {
+  width: 82px !important;
+}
 .w-minus-w80 {
   max-width: calc(100% - 80px) !important;
 }

From 41997d2e13b6dbe436879d4b31d11bcf2972933d Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Mon, 29 Apr 2024 17:44:27 +0530
Subject: [PATCH 558/887] Updated left menu CSS

---
 .../ws/app/src/lib/head/left-menu/left-menu.component.scss   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/head/left-menu/left-menu.component.scss b/project/ws/app/src/lib/head/left-menu/left-menu.component.scss
index c84429b93..3c3c89ef4 100644
--- a/project/ws/app/src/lib/head/left-menu/left-menu.component.scss
+++ b/project/ws/app/src/lib/head/left-menu/left-menu.component.scss
@@ -93,10 +93,11 @@
 // }
 
 ::ng-deep .custom-leftmenu .mat-expansion-panel:not([class*=mat-elevation-z]) {
-    background: rgba(0, 0, 0, 0.02) !important;
+    background: transparent !important;
     margin-bottom: 8px !important;
 }
 
+
 ::ng-deep .menuPannel.mat-expansion-panel {
   border-radius: unset !important;
   box-shadow: none !important;
@@ -118,7 +119,7 @@
 ::ng-deep .menuPannel .mat-expansion-panel-header {
   padding: 8px 24px !important;
   height: unset !important;
-  background: rgba(0, 0, 0, 0.04);
+  background: transparent !important;
   font: 400 16px/24px Lato !important;
 }
 

From 97f02477e554c792ca4cc28b8c24621da689434f Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Mon, 29 Apr 2024 17:49:56 +0530
Subject: [PATCH 559/887] Approvals tab listing inetgration

---
 .../components/search/search.component.html   |   2 +-
 .../components/search/search.component.ts     |   1 +
 .../user-cards/user-card.component.html       | 237 +++++++++++++---
 .../user-cards/user-card.component.scss       |   2 +-
 .../user-cards/user-card.component.ts         | 262 ++++++++++--------
 .../approval-pending.component.html           |  34 ++-
 .../approval-pending.component.ts             |  10 +-
 .../users-view/users-view.component.html      |  44 +--
 8 files changed, 416 insertions(+), 176 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.html b/project/ws/app/src/lib/routes/home/components/search/search.component.html
index 79e043c4e..4d497f327 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.html
@@ -16,7 +16,7 @@
             Apply Filter <mat-icon class="margin-right-xs">filter_list</mat-icon>
         </button>
     </div>
-    <div class="flex flex-end">
+    <div class="flex flex-end" *ngIf="!isApprovals">
         <button mat-button type="button" class="search-btn" (click)="createUser()"
             [ngClass]="{'disable': isContentLive}">Create user</button>
     </div>
diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.ts b/project/ws/app/src/lib/routes/home/components/search/search.component.ts
index 04588703a..73cde224f 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.ts
@@ -12,6 +12,7 @@ import { UsersService } from '../../../users/services/users.service'
 })
 export class SearchComponent implements OnInit {
   @Input() from: any = ''
+  @Input() isApprovals: any
   @Output() handleApiData = new EventEmitter()
   searchText = ''
   filterVisibilityFlag = false
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 9034d5bc4..a374aa0e6 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -1,37 +1,29 @@
 <div class="searchfilter">
-  <ws-app-searchuser (handleApiData)="onSearch($event)"></ws-app-searchuser>
+  <ws-app-searchuser (handleApiData)="onSearch($event)" [isApprovals]="isApprovals"></ws-app-searchuser>
 </div>
 
-<div>
+<div *ngIf="!isApprovals">
   <mat-accordion [multi]="true">
     <mat-expansion-panel class="user-card" *ngFor="let user of usersData.content" #panel
       (opened)="closeOtherPanels(panel)">
       <mat-expansion-panel-header (click)="getUerData(user)">
-        <div class="float-left">
+        <div class="float-left" (click)="$event.stopPropagation();">
           <div class="initialcircle display-inline-block margin-right-s">
             <!-- <span>AB</span> -->
             <ws-widget-avatar-photo [name]="getUseravatarName(user)" [photoUrl]="user?.photo" size="m">
             </ws-widget-avatar-photo>
           </div>
-          <div class="username display-inline-block" *ngIf="user.profileDetails && user.profileDetails.personalDetails">
-            <div class="mat-subheading-2 margin-remove">
+          <div class="username display-inline-block">
+            <div class="mat-subheading-2 margin-remove"
+              *ngIf="user.profileDetails && user.profileDetails.personalDetails">
               {{user.profileDetails.personalDetails.firstname}}
               <span class="status-label margin-left-s verified" *ngIf="currentFilter !== 'nonverified'">Verified
                 <mat-icon>check_circle</mat-icon></span>
               <span class="status-label margin-left-s nonverified" *ngIf="currentFilter === 'nonverified'">Non-verified
                 <mat-icon>check_circle</mat-icon></span>
             </div>
-            <div class="mat-body-2 ws-mat-black40-text">{{user.profileDetails && user.profileDetails.professionalDetails
-              &&
-              user.profileDetails.professionalDetails.designation ?
-              user.profileDetails.professionalDetails.designation : '-'}}</div>
-            <!-- <div class="mat-body-2 ws-mat-black40-text" *ngIf="currentFilter !== 'nonverified'">Verified date:
-              19/04/2024</div>
-            <div class="mat-body-2 ws-mat-black40-text" *ngIf="currentFilter === 'nonverified'">Non-verified date:
-              19/04/2024</div> -->
-          </div>
-          <div class="username display-inline-block" *ngIf="!user.profileDetails">
-            <div class="mat-subheading-2 display-inline-block margin-remove">
+
+            <div class="mat-subheading-2 display-inline-block margin-remove" *ngIf="!user.profileDetails">
               {{user.firstName}}
               <span class="status-label margin-left-s verified" *ngIf="currentFilter !== 'nonverified'">Verified
                 <mat-icon>check_circle</mat-icon></span>
@@ -49,7 +41,8 @@
           </div>
         </div>
         <div class="float-right">
-          <div class="button margin-top-xs mat-body" (click)="onEditUser(user)" *ngIf="isMdoAdmin || isMdoLeader">
+          <div class="button margin-top-xs mat-body" (click)="onEditUser(user);$event.stopPropagation();"
+            *ngIf="isMdoAdmin || isMdoLeader">
             <mat-icon>edit</mat-icon> Edit
           </div>
         </div>
@@ -276,7 +269,7 @@
 
             <div class="flex flex-row margin-top-m">
               <div class="md:w-1/2">
-                <label class="margin-remove-bottom form-label required">Tags</label>
+                <label class="margin-remove-bottom form-label">Tags</label>
                 <!-- <mat-form-field> -->
                 <div class="left-input-div">
                   <div class="flex-col">
@@ -313,22 +306,16 @@
 
             <div class="flex flex-row margin-top-m">
               <div class="md:w-1/2" *ngIf="!isMdoAdmin">
-                <div class="flex flex-wrap mobile-break">
-                  <div class="w-full profile-cols-full bg-grey">
-                    <div class="input-wrapper margin-top-s">
-                      <label for="roles" class="margin-remove-bottom form-label required" i18n-aria-label
-                        aria-label="Roles label" i18n="Role label|Label which explains the user to select the roles">
-                        Role
-                      </label>
-                      <mat-selection-list id="roles" formControlName="roles" #roles class="roles-list">
-                        <mat-list-option *ngFor="let role of rolesList" (click)="modifyUserRoles(role.roleName)"
-                          [selected]="userRoles.has(role.roleName)" [value]="role.roleName">
-                          {{role.roleName}}
-                        </mat-list-option>
-                      </mat-selection-list>
-                    </div>
-                  </div>
-                </div>
+                <label for="roles" class="margin-remove-bottom form-label required" i18n-aria-label
+                  aria-label="Roles label" i18n="Role label|Label which explains the user to select the roles">
+                  Role
+                </label>
+                <mat-selection-list id="roles" formControlName="roles" #roles class="roles-list">
+                  <mat-list-option *ngFor="let role of rolesList" (click)="modifyUserRoles(role.roleName)"
+                    [selected]="userRoles.has(role.roleName)" [value]="role.roleName">
+                    {{role.roleName}}
+                  </mat-list-option>
+                </mat-selection-list>
               </div>
 
               <div class="md:w-1/2" *ngIf="isMdoAdmin">
@@ -491,6 +478,188 @@
   </mat-accordion>
 </div>
 
+<!-- for Approvals page -->
+<div *ngIf="isApprovals">
+  <mat-accordion [multi]="true">
+    <mat-expansion-panel class="user-card" *ngFor="let appData of approvalData" #panel
+      (opened)="closeOtherPanels(panel)">
+      <mat-expansion-panel-header (click)="getUerData(appData.user)">
+        <div class="float-left" (click)="$event.stopPropagation();">
+          <div class="initialcircle display-inline-block margin-right-s" *ngIf="appData.user">
+            <ws-widget-avatar-photo [name]="getUseravatarName(appData.user)" [photoUrl]="appData.user?.photo" size="m">
+            </ws-widget-avatar-photo>
+          </div>
+          <div class="initialcircle display-inline-block margin-right-s" *ngIf="!appData.user">
+            <ws-widget-avatar-photo [name]="appData.userWorkflow.userInfo.first_name" [photoUrl]="" size="m">
+            </ws-widget-avatar-photo>
+          </div>
+          <div class="username display-inline-block">
+            <div class="mat-subheading-2 margin-remove">
+              {{appData.userWorkflow.userInfo.first_name}}
+              <span class="status-label margin-left-s verified" *ngIf="currentFilter !== 'nonverified'">Verified
+                <mat-icon>check_circle</mat-icon></span>
+              <span class="status-label margin-left-s nonverified" *ngIf="currentFilter === 'nonverified'">Non-verified
+                <mat-icon>check_circle</mat-icon></span>
+            </div>
+            <div class="mat-body-2 ws-mat-black40-text">{{appData.user &&
+              appData.user.profileDetails.professionalDetails &&
+              appData.user.profileDetails.professionalDetails.designation ?
+              appData.user.profileDetails.professionalDetails.designation : '-'}}</div>
+            <!-- <div class="mat-body-2 ws-mat-black40-text" *ngIf="currentFilter !== 'nonverified'">Verified date:
+                19/04/2024</div>
+              <div class="mat-body-2 ws-mat-black40-text" *ngIf="currentFilter === 'nonverified'">Non-verified date:
+                19/04/2024</div> -->
+          </div>
+        </div>
+      </mat-expansion-panel-header>
+
+      <div class="panel-body" *ngIf="appData.user">
+        <form [formGroup]="approveUserDataForm" class="margin-top-m">
+          <!-- <button mat-button class="my-4 mr-4" (click)="addRejection()">add reason</button>
+              <button mat-button class="my-4 mr-4" (click)="updateRejection()">update reason</button> -->
+          <div class="inner-body mat-body-2">
+            <div class="margin-bottom-m">
+              <span class="font-bold">Primary Details</span> <mat-icon
+                class="ws-mat-black40-text infoicon">info_outline</mat-icon>
+            </div>
+            <div class="flex flex-row margin-top-m">
+              <div class="md:w-1/3">
+                <label class="view-text-label">Designation</label>
+                <p>{{appData.user.profileDetails && appData.user.profileDetails.professionalDetails &&
+                  appData.user.profileDetails.professionalDetails.designation ?
+                  appData.user.profileDetails.professionalDetails.designation : '-'}} <mat-icon
+                    class="verified-icon">check_circle</mat-icon></p>
+                <mat-radio-group aria-label="Select an option" name="approveDesignation"
+                  formControlName="approveDesignation">
+                  <mat-radio-button value="approve" class="margin-right-s">Approve</mat-radio-button>
+                  <mat-radio-button value="reject">Reject</mat-radio-button>
+                </mat-radio-group>
+              </div>
+
+              <div class="md:w-1/3">
+                <label class="view-text-label">Group</label>
+                <p>{{appData.user.profileDetails && appData.user.profileDetails.additionalProperties &&
+                  appData.user.profileDetails.additionalProperties.group ?
+                  appData.user.profileDetails.additionalProperties.group : '-'}} <mat-icon
+                    class="verified-icon">check_circle</mat-icon>
+                </p>
+
+                <mat-radio-group aria-label="Select an option" name="approveGroup" formControlName="approveGroup">
+                  <mat-radio-button value="approve" class="margin-right-s">Approve</mat-radio-button>
+                  <mat-radio-button value="reject">Reject</mat-radio-button>
+                </mat-radio-group>
+              </div>
+            </div>
+          </div>
+        </form>
+        <hr>
+        <div class="inner-body margin-top-m mat-body-2">
+          <div class="margin-bottom-m">
+            <span class="font-bold">Other Details</span> <mat-icon
+              class="ws-mat-black40-text infoicon">info_outline</mat-icon>
+          </div>
+
+          <div class="flex flex-row margin-top-m">
+            <div class="md:w-1/4">
+              <label class="view-text-label">Employee ID</label>
+              <p>{{appData.user.empID ? appData.user.empID : '-'}}</p>
+            </div>
+
+            <div class="md:w-1/4">
+              <label class="view-text-label">Email</label>
+              <p>{{appData.user.profileDetails && appData.user.profileDetails.personalDetails ?
+                appData.user.profileDetails.personalDetails.primaryEmail : '-'}}</p>
+            </div>
+
+            <div class="md:w-1/4">
+              <label class="view-text-label">Mobile Number</label>
+              <p>{{appData.user.profileDetails && appData.user.profileDetails.personalDetails ?
+                appData.user.profileDetails.personalDetails.mobile : '-'}}</p>
+            </div>
+
+            <div class="md:w-1/4">
+              <label class="view-text-label">Gender</label>
+              <p>{{appData.user.profileDetails && appData.user.profileDetails.personalDetails &&
+                appData.user.profileDetails.personalDetails.gender ?
+                appData.user.profileDetails.personalDetails.gender : '-'}}</p>
+            </div>
+          </div>
+          <div class="flex flex-row margin-top-m">
+            <div class="md:w-1/4">
+              <label class="view-text-label">Date Of Birth</label>
+              <p>{{appData.user.profileDetails && appData.user.profileDetails.personalDetails &&
+                appData.user.profileDetails.personalDetails.dob
+                ? appData.user.profileDetails.personalDetails.dob
+                : '-'}}</p>
+            </div>
+
+            <div class="md:w-1/4">
+              <label class="view-text-label">Mother Tongue</label>
+              <p>{{appData.user.profileDetails && appData.user.profileDetails.personalDetails &&
+                appData.user.profileDetails.personalDetails.domicileMedium ?
+                appData.user.profileDetails.personalDetails.domicileMedium : '-'}}</p>
+            </div>
+
+            <div class="md:w-1/4">
+              <label class="view-text-label">Category</label>
+              <p>{{appData.user.profileDetails && appData.user.profileDetails.personalDetails &&
+                appData.user.profileDetails.personalDetails.category ?
+                appData.user.profileDetails.personalDetails.category : '-'}}</p>
+            </div>
+
+            <div class="md:w-1/4">
+              <label class="view-text-label">Pay Band</label>
+              <p>{{appData.user.profileDetails && appData.user.profileDetails.employmentDetails &&
+                appData.user.profileDetails.employmentDetails.payType ?
+                appData.user.profileDetails.employmentDetails.payType : '-'}}</p>
+            </div>
+          </div>
+          <div class="flex flex-row margin-top-m">
+            <div class="md:w-1/4">
+              <label class="view-text-label">Office Pin Code</label>
+              <p>{{appData.user.profileDetails && appData.user.profileDetails.employmentDetails &&
+                appData.user.profileDetails.employmentDetails.pinCode ?
+                appData.user.profileDetails.employmentDetails.pinCode : '-'}}</p>
+            </div>
+
+            <div class="md:w-1/4">
+              <label class="view-text-label">eHRMS ID</label>
+              <p>{{appData.user.ehrmsID ? appData.user.ehrmsID : '-'}}</p>
+            </div>
+
+            <div class="md:w-1/2">
+              <label class="view-text-label">Tags</label>
+              <div *ngIf="appData.user.profileDetails && appData.user.profileDetails.additionalProperties &&
+                    appData.user.profileDetails.additionalProperties.tag &&
+                    appData.user.profileDetails.additionalProperties.tag.length > 0">
+                <ul class="tagslist">
+                  <li *ngFor="let t of appData.user.profileDetails.additionalProperties.tag">{{t}}</li>
+                </ul>
+              </div>
+              <p *ngIf="appData.user.profileDetails && !appData.user.profileDetails.additionalProperties">-</p>
+            </div>
+          </div>
+          <div class="flex flex-row margin-top-m">
+            <div class="md:w-1/1">
+              <label class="view-text-label">Roles</label>
+              <div *ngIf="appData.user.organisations && appData.user.organisations[0].roles.length > 0">
+                <ul class="roleslist">
+                  <li *ngFor="let t of appData.user.organisations[0].roles">{{t}}
+                  </li>
+                </ul>
+              </div>
+              <p *ngIf="appData.user.organisations && appData.user.organisations[0].roles.length === 0">-</p>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="panel-body" *ngIf="!appData.user">
+        <p class="text-center">No user data</p>
+      </div>
+    </mat-expansion-panel>
+  </mat-accordion>
+</div>
+
 <div class="flex flex-row justify-center">
   <mat-paginator [pageSize]="pageSize" [length]="totalRecords" [pageSizeOptions]="[20,30,40]"
     (page)="onChangePage($event)"></mat-paginator>
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
index 480fabe50..b9f80e700 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
@@ -241,7 +241,7 @@ label {
   }
 
   .customdob {
-    width: 12.5em !important;
+    width: 16.5em !important;
   }
   .mat-slide-toggle.mat-checked .mat-slide-toggle-thumb {
     background-color: rgba(29, 137, 35) !important;
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index ee97e51d5..d7e0d9b74 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -1,17 +1,20 @@
 import { Component, EventEmitter, Input, OnInit, Output, QueryList, ViewChild, ViewChildren } from '@angular/core'
 import { FormGroup, FormControl, Validators } from '@angular/forms'
 import { UsersService } from '../../../users/services/users.service'
-import { DateAdapter, MAT_DATE_FORMATS, MatChipInputEvent, MatDialog, MatExpansionPanel, MatPaginator, MatSnackBar, PageEvent } from '@angular/material'
+import {
+  DateAdapter, MAT_DATE_FORMATS, MatChipInputEvent, MatDialog,
+  MatExpansionPanel, MatPaginator, MatSnackBar, PageEvent,
+} from '@angular/material'
 import { COMMA, ENTER } from '@angular/cdk/keycodes'
 // tslint:disable-next-line
 import _ from 'lodash'
 import { RolesService } from '../../../users/services/roles.service'
 import { ActivatedRoute, Router } from '@angular/router'
-import { Observable, Subscription, interval } from 'rxjs'
+import { Observable, Subscription } from 'rxjs'
 import { debounceTime, distinctUntilChanged, map, startWith } from 'rxjs/operators'
 import { environment } from '../../../../../../../../../src/environments/environment'
-import { OtpService } from '../../../users/services/otp.service'
-import { ConfigurationsService } from '@sunbird-cb/utils'
+// import { OtpService } from '../../../users/services/otp.service'
+// import { ConfigurationsService } from '@sunbird-cb/utils'
 import { RejectionPopupComponent } from '../rejection-popup/rejection-popup.component'
 import { APP_DATE_FORMATS, AppDateAdapter } from '../../../events/routes/format-datepicker'
 
@@ -22,7 +25,7 @@ import { APP_DATE_FORMATS, AppDateAdapter } from '../../../events/routes/format-
   providers: [
     { provide: DateAdapter, useClass: AppDateAdapter },
     { provide: MAT_DATE_FORMATS, useValue: APP_DATE_FORMATS },
-  ]
+  ],
 })
 export class UserCardComponent implements OnInit {
   @Input() userId: any
@@ -31,6 +34,7 @@ export class UserCardComponent implements OnInit {
   @Input() totalRecords: any
   @Input() tabChangeIndex: any
   @Input() currentFilter: any
+  @Input() isApprovals: any
 
   @Output() paginationData = new EventEmitter()
   @Output() searchByEnterKey = new EventEmitter()
@@ -50,6 +54,7 @@ export class UserCardComponent implements OnInit {
   isMdoAdmin = false
   isMdoLeader = false
   updateUserDataForm: FormGroup
+  approveUserDataForm: FormGroup
   designationsMeta: any = []
   groupsList: any = []
   selectedtags: any[] = []
@@ -78,11 +83,11 @@ export class UserCardComponent implements OnInit {
   disableVerifyBtn = false
   qpParam: any
   department: any
+  approvalData: any
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-    private configSvc: ConfigurationsService, private dialog: MatDialog, private router: Router,
-    private route: ActivatedRoute, private otpService: OtpService,
-    private snackBar: MatSnackBar) {
+              private dialog: MatDialog, private router: Router,
+              private route: ActivatedRoute, private snackBar: MatSnackBar) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', [Validators.required]),
       group: new FormControl('', [Validators.required]),
@@ -92,7 +97,7 @@ export class UserCardComponent implements OnInit {
       primaryEmail: new FormControl('', [Validators.required, Validators.email, Validators.pattern(this.emailRegix)]),
       countryCode: new FormControl('+91', [Validators.required]),
       mobile: new FormControl('', [Validators.required, Validators.pattern(this.phoneNumberPattern)]),
-      tags: new FormControl('', [Validators.required, Validators.pattern(this.namePatern)]),
+      tags: new FormControl('', [Validators.pattern(this.namePatern)]),
       roles: new FormControl('', [Validators.required]),
       domicileMedium: new FormControl('', [Validators.required]),
       gender: new FormControl('', [Validators.required]),
@@ -100,6 +105,11 @@ export class UserCardComponent implements OnInit {
       pincode: new FormControl('', [Validators.required]),
     })
 
+    this.approveUserDataForm = new FormGroup({
+      approveDesignation: new FormControl('', []),
+      approveGroup: new FormControl('', []),
+    })
+
     const fullProfile = _.get(this.route.snapshot, 'data.configService')
     this.department = fullProfile.unMappedUser.rootOrgId
 
@@ -111,7 +121,25 @@ export class UserCardComponent implements OnInit {
 
   ngOnInit() {
     this.currentFilter = this.route.snapshot.params['tab'] || 'allusers'
-    this.init()
+
+    if (this.isApprovals && this.usersData && this.usersData.length > 0) {
+      this.approvalData = this.usersData
+      this.getUserMappedData(this.approvalData)
+    } else {
+      this.init()
+    }
+  }
+
+  // for approvals
+  async getUserMappedData(approvalData: any) {
+    approvalData.forEach((data: any) => {
+      const id = data.userWorkflow.userInfo.wid
+      this.usersSvc.getUserById(id).subscribe((res: any) => {
+        if (res) {
+          data.user = res
+        }
+      })
+    })
   }
 
   async init() {
@@ -162,7 +190,7 @@ export class UserCardComponent implements OnInit {
         countryCode: '+91',
       })
     },
-      (_err: any) => {
+                                                  (_err: any) => {
       })
   }
 
@@ -207,14 +235,15 @@ export class UserCardComponent implements OnInit {
   }
 
   onEditUser(user: any) {
-    setTimeout(() => {
-      user.enableEdit = false
-    }, 5000)
+    user.enableEdit = true
+    // setTimeout(() => {
+    //   user.enableEdit = true
+    // }, 5000)
     // this.cdref.detectChanges()
   }
 
   getUerData(user: any) {
-    user.enableEdit = true
+    user.enableEdit = false
     const profileDataAll = user
     this.userStatus = profileDataAll.isDeleted ? 'Inactive' : 'Active'
 
@@ -381,105 +410,102 @@ export class UserCardComponent implements OnInit {
     this.searchByEnterKey.emit(event)
   }
 
-  sendOtp() {
-    const mob = this.updateUserDataForm.get('mobile')
-    if (mob && mob.value && Math.floor(mob.value) && mob.valid) {
-      this.otpService.sendOtp(mob.value).subscribe(() => {
-        this.otpSend = true
-        alert('An OTP has been sent to your mobile number')
-        this.startCountDown()
-        // tslint:disable-next-line: align
-      }, (error: any) => {
-        this.snackBar.open(_.get(error, 'error.params.errmsg') || 'Please try again later')
-      })
-    } else {
-      this.snackBar.open('Please enter a valid mobile number')
-    }
-  }
-  resendOTP() {
-    const mob = this.updateUserDataForm.get('mobile')
-    if (mob && mob.value && Math.floor(mob.value) && mob.valid) {
-      this.otpService.resendOtp(mob.value).subscribe((res: any) => {
-        if ((_.get(res, 'result.response')).toUpperCase() === 'SUCCESS') {
-          this.otpSend = true
-          this.disableVerifyBtn = false
-          alert('An OTP has been sent to your mobile number')
-          this.startCountDown()
-        }
-        // tslint:disable-next-line: align
-      }, (error: any) => {
-        this.snackBar.open(_.get(error, 'error.params.errmsg') || 'Please try again later')
-      })
-    } else {
-      this.snackBar.open('Please enter a valid mobile number')
-    }
-  }
-  verifyOtp(otp: any) {
-    // console.log(otp)
-    const mob = this.updateUserDataForm.get('mobile')
-    if (otp && otp.value) {
-      if (mob && mob.value && Math.floor(mob.value) && mob.valid) {
-        this.otpService.verifyOTP(otp.value, mob.value).subscribe((res: any) => {
-          if ((_.get(res, 'result.response')).toUpperCase() === 'SUCCESS') {
-            this.otpVerified = true
-            const reqUpdates = {
-              request: {
-                userId: this.configSvc.unMappedUser.id,
-                profileDetails: {
-                  personalDetails: {
-                    mobile: mob.value,
-                    phoneVerified: true,
-                  },
-                },
-              },
-            }
-            this.usersSvc.editProfileDetails(reqUpdates).subscribe((updateRes: any) => {
-
-              if (updateRes) {
-                this.isMobileVerified = true
-              }
-              // tslint:disable-next-line:align
-            }, (error: any) => {
-
-              this.snackBar.open(_.get(error, 'error.params.errmsg') || 'Please try again later')
-            }
-            )
-          }
-          // tslint:disable-next-line: align
-        }, (error: any) => {
-          this.snackBar.open(_.get(error, 'error.params.errmsg') || 'Please try again later')
-          if (error.error && error.error.result) {
-            this.disableVerifyBtn = error.error.result.remainingAttempt === 0 ? true : false
-          }
-        })
-      }
-    }
-  }
-  startCountDown() {
-    const startTime = Date.now()
-    this.timeLeftforOTP = this.OTP_TIMER
-    // && this.primaryCategory !== this.ePrimaryCategory.PRACTICE_RESOURCE
-    if (this.OTP_TIMER > 0
-    ) {
-      this.timerSubscription = interval(1000)
-        .pipe(
-          map(
-            () =>
-              startTime + this.OTP_TIMER - Date.now(),
-          ),
-        )
-        .subscribe((_timeRemaining: any) => {
-          this.timeLeftforOTP -= 1
-          if (this.timeLeftforOTP < 0) {
-            this.timeLeftforOTP = 0
-            if (this.timerSubscription) {
-              this.timerSubscription.unsubscribe()
-            }
-            // this.submitQuiz()
-          }
-        })
-    }
-  }
+  // sendOtp() {
+  //   const mob = this.updateUserDataForm.get('mobile')
+  //   if (mob && mob.value && Math.floor(mob.value) && mob.valid) {
+  //     this.otpService.sendOtp(mob.value).subscribe(() => {
+  //       this.otpSend = true
+  //       alert('An OTP has been sent to your mobile number')
+  //       this.startCountDown()
+  //       // tslint:disable-next-line: align
+  //     }, (error: any) => {
+  //       this.snackBar.open(_.get(error, 'error.params.errmsg') || 'Please try again later')
+  //     })
+  //   } else {
+  //     this.snackBar.open('Please enter a valid mobile number')
+  //   }
+  // }
+  // resendOTP() {
+  //   const mob = this.updateUserDataForm.get('mobile')
+  //   if (mob && mob.value && Math.floor(mob.value) && mob.valid) {
+  //     this.otpService.resendOtp(mob.value).subscribe((res: any) => {
+  //       if ((_.get(res, 'result.response')).toUpperCase() === 'SUCCESS') {
+  //         this.otpSend = true
+  //         this.disableVerifyBtn = false
+  //         alert('An OTP has been sent to your mobile number')
+  //         this.startCountDown()
+  //       }
+  //       // tslint:disable-next-line: align
+  //     }, (error: any) => {
+  //       this.snackBar.open(_.get(error, 'error.params.errmsg') || 'Please try again later')
+  //     })
+  //   } else {
+  //     this.snackBar.open('Please enter a valid mobile number')
+  //   }
+  // }
+  // verifyOtp(otp: any) {
+  //   const mob = this.updateUserDataForm.get('mobile')
+  //   if (otp && otp.value) {
+  //     if (mob && mob.value && Math.floor(mob.value) && mob.valid) {
+  //       this.otpService.verifyOTP(otp.value, mob.value).subscribe((res: any) => {
+  //         if ((_.get(res, 'result.response')).toUpperCase() === 'SUCCESS') {
+  //           this.otpVerified = true
+  //           const reqUpdates = {
+  //             request: {
+  //               userId: this.configSvc.unMappedUser.id,
+  //               profileDetails: {
+  //                 personalDetails: {
+  //                   mobile: mob.value,
+  //                   phoneVerified: true,
+  //                 },
+  //               },
+  //             },
+  //           }
+  //           this.usersSvc.editProfileDetails(reqUpdates).subscribe((updateRes: any) => {
+
+  //             if (updateRes) {
+  //               this.isMobileVerified = true
+  //             }
+  //             // tslint:disable-next-line:align
+  //           }, (error: any) => {
+
+  //             this.snackBar.open(_.get(error, 'error.params.errmsg') || 'Please try again later')
+  //           }
+  //           )
+  //         }
+  //         // tslint:disable-next-line: align
+  //       }, (error: any) => {
+  //         this.snackBar.open(_.get(error, 'error.params.errmsg') || 'Please try again later')
+  //         if (error.error && error.error.result) {
+  //           this.disableVerifyBtn = error.error.result.remainingAttempt === 0 ? true : false
+  //         }
+  //       })
+  //     }
+  //   }
+  // }
+  // startCountDown() {
+  //   const startTime = Date.now()
+  //   this.timeLeftforOTP = this.OTP_TIMER
+  //   if (this.OTP_TIMER > 0
+  //   ) {
+  //     this.timerSubscription = interval(1000)
+  //       .pipe(
+  //         map(
+  //           () =>
+  //             startTime + this.OTP_TIMER - Date.now(),
+  //         ),
+  //       )
+  //       .subscribe((_timeRemaining: any) => {
+  //         this.timeLeftforOTP -= 1
+  //         if (this.timeLeftforOTP < 0) {
+  //           this.timeLeftforOTP = 0
+  //           if (this.timerSubscription) {
+  //             this.timerSubscription.unsubscribe()
+  //           }
+  //         }
+  //       })
+  //   }
+  // }
 
   addRejection() {
     const rejectinDetails = {
@@ -595,8 +621,8 @@ export class UserCardComponent implements OnInit {
                 tag: this.selectedtags,
               },
               employmentDetails: {
-                pinCode: this.updateUserDataForm.controls['pinCode'].value,
-              }
+                pinCode: this.updateUserDataForm.controls['pincode'].value,
+              },
             },
           },
         }
@@ -627,8 +653,8 @@ export class UserCardComponent implements OnInit {
               },
             }
 
-            this.usersSvc.addUserToDepartment(dreq).subscribe(dres => {
-              if (dres) {
+            this.usersSvc.addUserToDepartment(dreq).subscribe(res => {
+              if (res) {
                 this.updateUserDataForm.reset({ roles: '' })
                 this.openSnackbar('User role updated Successfully')
                 this.router.navigate(['/app/home/users/allusers'])
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
index c9893fbce..2753b96c9 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
@@ -28,6 +28,38 @@
       </mat-card-content>
     </mat-card>
     <mat-card-content>
+      <div class="flex flex-1 flex-column margin-fix">
+        <div class="flex flex-1 filter max-height-60">
+          <a routerLink="/app/home/approvals/pending" class="filter-option"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'profileverification', 'ws-mat-accent-border font-medium':currentFilter !== 'profileverification'}"
+            mat-button (click)="filter('profileverification'); tabTelemetry('toapprove', 0)" role="button">Profile
+            Verifications</a>
+
+          <a routerLink="/app/home/approvals/transfers" class="filter-option"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'transfers', 'ws-mat-accent-border font-medium':currentFilter !== 'transfers'}"
+            mat-button (click)="filter('transfers'); tabTelemetry('transfers', 1)" role="button">Transfers</a>
+        </div>
+      </div>
+      <ng-container *ngIf="currentFilter === 'profileverification'">
+        <ng-container *ngIf="getTableData && getTableData.length > 0">
+          <!-- <ws-widget-org-user-table-v2 [tableData]="tabledata" [data]="data" (eOnRowClick)="onApprovalClick($event)"
+            [totalRecords]="approvalTotalCount" (pageChangeClick)="onPaginateChange($event)">
+          </ws-widget-org-user-table-v2> -->
+          <ws-widget-user-card [currentFilter]="currentFilter" [usersData]="data" [isApprovals]="true"
+            [totalRecords]="approvalTotalCount" [tabChangeIndex]="pageIndex"
+            (searchByEnterKey)="onEnterkySearch($event)"
+            (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
+        </ng-container>
+        <ng-container *ngIf="!getTableData || getTableData.length === 0">
+          <p class="text-center">No approvals pending</p>
+        </ng-container>
+      </ng-container>
+      <ng-container *ngIf="currentFilter === 'transfers'">
+        <!-- <ws-app-profle-approval-bulk-upload></ws-app-profle-approval-bulk-upload> -->
+        No data
+      </ng-container>
+    </mat-card-content>
+    <!-- <mat-card-content>
       <div class="flex flex-1 flex-column margin-fix">
         <div class="flex flex-1 filter max-height-60">
           <a routerLink="/app/home/approvals/pending" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'pending',
@@ -52,6 +84,6 @@
       <ng-container *ngIf="currentFilter === 'uploadApprovals'">
         <ws-app-profle-approval-bulk-upload></ws-app-profle-approval-bulk-upload>
       </ng-container>
-    </mat-card-content>
+    </mat-card-content> -->
   </mat-card>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
index 65a42f55e..2892f274f 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
@@ -22,7 +22,7 @@ import { ApprovalsService } from '../../../services/approvals.service'
 export class ApprovalPendingComponent implements OnInit, OnDestroy {
 
   data: any = []
-  currentFilter = 'pending'
+  currentFilter = 'profileverification'
   discussionList!: any
   discussProfileData!: any
   departName = ''
@@ -66,9 +66,9 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit() {
-    this.currentFilter = this.route.snapshot.params['tab']
-    this.currentFilter = this.currentFilter === 'upload' ? 'uploadApprovals' : 'pending'
-    if (this.currentFilter === 'pending') {
+    // this.currentFilter = this.route.snapshot.params['tab']
+    // this.currentFilter = this.currentFilter === 'upload' ? 'uploadApprovals' : 'pending'
+    if (this.currentFilter === 'profileverification') {
       this.fetchApprovals()
     }
 
@@ -101,7 +101,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   filter(key: string | 'timestamp' | 'best' | 'saved') {
     if (key) {
       this.currentFilter = key
-      if (key === 'pending') {
+      if (key === 'profileverification') {
         this.fetchApprovals()
       }
     }
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index c9206e9fc..8f4d6395a 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -78,28 +78,40 @@
               </ws-widget-org-user-table-v2> -->
 
       <ng-container *ngIf="usersData && currentFilter === 'allusers'">
-        <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
-          [totalRecords]="activeUsersDataCount" [tabChangeIndex]="pageIndex"
-          (searchByEnterKey)="onEnterkySearch($event)"
-          (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
+        <div *ngIf="usersData.count > 0">
+          <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
+            [totalRecords]="activeUsersDataCount" [tabChangeIndex]="pageIndex" [isApprovals]="false"
+            (searchByEnterKey)="onEnterkySearch($event)"
+            (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
+        </div>
+        <p class="text-center" *ngIf="usersData.count === 0">No users found</p>
       </ng-container>
       <ng-container *ngIf="usersData && currentFilter === 'verified'">
-        <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
-          [totalRecords]="verifiedUsersDataCount" [tabChangeIndex]="pageIndex"
-          (searchByEnterKey)="onEnterkySearch($event)"
-          (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
+        <div *ngIf="usersData.count > 0">
+          <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
+            [totalRecords]="verifiedUsersDataCount" [tabChangeIndex]="pageIndex"
+            (searchByEnterKey)="onEnterkySearch($event)"
+            (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
+        </div>
+        <p class="text-center" *ngIf="usersData.count === 0">No users found</p>
       </ng-container>
       <ng-container *ngIf="usersData && currentFilter === 'nonverified'">
-        <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
-          [totalRecords]="nonverifiedUsersDataCount" [tabChangeIndex]="pageIndex"
-          (searchByEnterKey)="onEnterkySearch($event)"
-          (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
+        <div *ngIf="usersData.count > 0">
+          <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
+            [totalRecords]="nonverifiedUsersDataCount" [tabChangeIndex]="pageIndex"
+            (searchByEnterKey)="onEnterkySearch($event)"
+            (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
+        </div>
+        <p class="text-center" *ngIf="usersData.count === 0">No users found</p>
       </ng-container>
       <ng-container *ngIf="usersData && currentFilter === 'notmyuser'">
-        <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
-          [totalRecords]="notmyuserUsersDataCount" [tabChangeIndex]="pageIndex"
-          (searchByEnterKey)="onEnterkySearch($event)"
-          (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
+        <div *ngIf="usersData.count > 0">
+          <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
+            [totalRecords]="notmyuserUsersDataCount" [tabChangeIndex]="pageIndex"
+            (searchByEnterKey)="onEnterkySearch($event)"
+            (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
+        </div>
+        <p class="text-center" *ngIf="usersData.count === 0">No users found</p>
       </ng-container>
 
       <ng-container *ngIf="currentFilter === 'upload'">

From eba8356139d7fc2850049d9940f8d86f417d7049 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Tue, 30 Apr 2024 11:30:50 +0530
Subject: [PATCH 560/887] Updated PR comments & search placeholder

---
 .../components/search/search.component.html   |  5 +-
 .../user-cards/user-card.component.html       | 47 ++++++++++---------
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.html b/project/ws/app/src/lib/routes/home/components/search/search.component.html
index 4d497f327..c9f6f06c4 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.html
@@ -1,9 +1,10 @@
 <div class="flex flex-1 flex-row margin-top-m margin-bottom-m">
     <div class="search flex margin-right-m" [ngClass]="{'disable': isContentLive}">
-        <div class="rsearch flex w-full"><mat-icon
+        <div class="rsearch flex w-full">
+            <mat-icon
                 class="color-60 search-icon mat-icon notranslate material-icons mat-icon-no-color">search</mat-icon>
             <input class="sinput color-60 w-full" [(ngModel)]="searchText" (keyup.enter)="searchData($event)" label=""
-                placeholder="Select" type="Standard" [ngClass]="{'disable': isContentLive}">
+                placeholder="Search" type="Standard" [ngClass]="{'disable': isContentLive}">
         </div>
     </div>
     <div class="filter-section flex">
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index a374aa0e6..d756ff2af 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -48,7 +48,7 @@
         </div>
       </mat-expansion-panel-header>
 
-      <div class="panel-body profile-box" *ngIf="user.enableEdit">
+      <div class="panel-body profile-box" *ngIf="user?.enableEdit">
         <form [formGroup]="updateUserDataForm" class="margin-top-m">
           <div class="inner-body">
             Primary Details <mat-icon class="ws-mat-black40-text custominfo">info_outline</mat-icon>
@@ -59,9 +59,9 @@
                 <mat-form-field appearance="outline">
                   <mat-select #designation formControlName="designation" i18n-placeholder
                     placeholder="Select designation"
-                    (selectionChange)="otherDropDownChange(designation.value, 'designation')">
-                    <mat-option [value]="designation.name" *ngFor="let designation of designationsMeta">
-                      {{designation.name}}
+                    (selectionChange)="otherDropDownChange(designation?.value, 'designation')">
+                    <mat-option [value]="designation?.name" *ngFor="let designation of designationsMeta">
+                      {{designation?.name}}
                     </mat-option>
                     <mat-option [value]="'Other'">Other</mat-option>
                   </mat-select>
@@ -279,7 +279,7 @@
                       [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
                       (matChipInputTokenEnd)="addActivity($event)" />
                     <p class="margin-left-xs">
-                      <mat-error class="hintErr" *ngIf="updateUserDataForm.controls['tags'].errors?.pattern"
+                      <mat-error class="hintErr" *ngIf="updateUserDataForm?.controls['tags'].errors?.pattern"
                         i18n="name Error|Explains name is required">
                         Only space and alphabets are supported
                       </mat-error>
@@ -312,7 +312,7 @@
                 </label>
                 <mat-selection-list id="roles" formControlName="roles" #roles class="roles-list">
                   <mat-list-option *ngFor="let role of rolesList" (click)="modifyUserRoles(role.roleName)"
-                    [selected]="userRoles.has(role.roleName)" [value]="role.roleName">
+                    [selected]="userRoles.has(role.roleName)" [value]="role?.roleName">
                     {{role.roleName}}
                   </mat-list-option>
                 </mat-selection-list>
@@ -320,13 +320,13 @@
 
               <div class="md:w-1/2" *ngIf="isMdoAdmin">
                 <label class="view-text-label">Roles</label>
-                <div *ngIf="user.organisations && user.organisations[0].roles.length > 0">
+                <div *ngIf="user?.organisations && user?.organisations[0].roles.length > 0">
                   <ul class="roleslist">
-                    <li *ngFor="let t of user.organisations[0].roles">{{t}}
+                    <li *ngFor="let t of user?.organisations[0]?.roles">{{t}}
                     </li>
                   </ul>
                 </div>
-                <p *ngIf="user.organisations && user.organisations[0].roles.length === 0">-</p>
+                <p *ngIf="user?.organisations && user?.organisations[0]?.roles.length === 0">-</p>
               </div>
             </div>
 
@@ -348,7 +348,7 @@
         </form>
       </div>
 
-      <div class="panel-body" *ngIf="!user.enableEdit">
+      <div class="panel-body" *ngIf="!user?.enableEdit">
         <!-- <button mat-button class="my-4 mr-4" (click)="addRejection()">add reason</button>
         <button mat-button class="my-4 mr-4" (click)="updateRejection()">update reason</button> -->
         <div class="inner-body mat-body-2">
@@ -485,12 +485,13 @@
       (opened)="closeOtherPanels(panel)">
       <mat-expansion-panel-header (click)="getUerData(appData.user)">
         <div class="float-left" (click)="$event.stopPropagation();">
-          <div class="initialcircle display-inline-block margin-right-s" *ngIf="appData.user">
-            <ws-widget-avatar-photo [name]="getUseravatarName(appData.user)" [photoUrl]="appData.user?.photo" size="m">
+          <div class="initialcircle display-inline-block margin-right-s" *ngIf="appData?.user">
+            <ws-widget-avatar-photo [name]="getUseravatarName(appData?.user)" [photoUrl]="appData?.user?.photo"
+              size="m">
             </ws-widget-avatar-photo>
           </div>
-          <div class="initialcircle display-inline-block margin-right-s" *ngIf="!appData.user">
-            <ws-widget-avatar-photo [name]="appData.userWorkflow.userInfo.first_name" [photoUrl]="" size="m">
+          <div class="initialcircle display-inline-block margin-right-s" *ngIf="!appData?.user">
+            <ws-widget-avatar-photo [name]="appData?.userWorkflow?.userInfo?.first_name" [photoUrl]="" size="m">
             </ws-widget-avatar-photo>
           </div>
           <div class="username display-inline-block">
@@ -629,31 +630,31 @@
 
             <div class="md:w-1/2">
               <label class="view-text-label">Tags</label>
-              <div *ngIf="appData.user.profileDetails && appData.user.profileDetails.additionalProperties &&
-                    appData.user.profileDetails.additionalProperties.tag &&
-                    appData.user.profileDetails.additionalProperties.tag.length > 0">
+              <div *ngIf="appData?.user?.profileDetails && appData?.user?.profileDetails?.additionalProperties &&
+                    appData?.user?.profileDetails?.additionalProperties?.tag &&
+                    appData?.user?.profileDetails?.additionalProperties?.tag.length > 0">
                 <ul class="tagslist">
-                  <li *ngFor="let t of appData.user.profileDetails.additionalProperties.tag">{{t}}</li>
+                  <li *ngFor="let t of appData?.user?.profileDetails?.additionalProperties.tag">{{t}}</li>
                 </ul>
               </div>
-              <p *ngIf="appData.user.profileDetails && !appData.user.profileDetails.additionalProperties">-</p>
+              <p *ngIf="appData?.user?.profileDetails && !appData?.user?.profileDetails?.additionalProperties">-</p>
             </div>
           </div>
           <div class="flex flex-row margin-top-m">
             <div class="md:w-1/1">
               <label class="view-text-label">Roles</label>
-              <div *ngIf="appData.user.organisations && appData.user.organisations[0].roles.length > 0">
+              <div *ngIf="appData?.user?.organisations && appData?.user?.organisations[0]?.roles.length > 0">
                 <ul class="roleslist">
-                  <li *ngFor="let t of appData.user.organisations[0].roles">{{t}}
+                  <li *ngFor="let t of appData?.user?.organisations[0]?.roles">{{t}}
                   </li>
                 </ul>
               </div>
-              <p *ngIf="appData.user.organisations && appData.user.organisations[0].roles.length === 0">-</p>
+              <p *ngIf="appData?.user?.organisations && appData?.user?.organisations[0].roles.length === 0">-</p>
             </div>
           </div>
         </div>
       </div>
-      <div class="panel-body" *ngIf="!appData.user">
+      <div class="panel-body" *ngIf="!appData?.user">
         <p class="text-center">No user data</p>
       </div>
     </mat-expansion-panel>

From 1fe12c0e3b78e8a8d026e67a2f29928ba0c58ba2 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Tue, 30 Apr 2024 11:47:38 +0530
Subject: [PATCH 561/887] Updated optional conditions

---
 .../user-cards/user-card.component.html       | 17 +++++++++--------
 .../user-cards/user-card.component.ts         | 19 +++++++++++--------
 .../users-view/users-view.component.html      | 16 ++++++++--------
 3 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index d756ff2af..0b5a2a8ea 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -4,7 +4,7 @@
 
 <div *ngIf="!isApprovals">
   <mat-accordion [multi]="true">
-    <mat-expansion-panel class="user-card" *ngFor="let user of usersData.content" #panel
+    <mat-expansion-panel class="user-card" *ngFor="let user of usersData?.content" #panel
       (opened)="closeOtherPanels(panel)">
       <mat-expansion-panel-header (click)="getUerData(user)">
         <div class="float-left" (click)="$event.stopPropagation();">
@@ -15,25 +15,26 @@
           </div>
           <div class="username display-inline-block">
             <div class="mat-subheading-2 margin-remove"
-              *ngIf="user.profileDetails && user.profileDetails.personalDetails">
-              {{user.profileDetails.personalDetails.firstname}}
+              *ngIf="user?.profileDetails && user?.profileDetails?.personalDetails">
+              {{user?.profileDetails?.personalDetails?.firstname}}
               <span class="status-label margin-left-s verified" *ngIf="currentFilter !== 'nonverified'">Verified
                 <mat-icon>check_circle</mat-icon></span>
               <span class="status-label margin-left-s nonverified" *ngIf="currentFilter === 'nonverified'">Non-verified
                 <mat-icon>check_circle</mat-icon></span>
             </div>
 
-            <div class="mat-subheading-2 display-inline-block margin-remove" *ngIf="!user.profileDetails">
-              {{user.firstName}}
+            <div class="mat-subheading-2 display-inline-block margin-remove" *ngIf="!user?.profileDetails">
+              {{user?.firstName}}
               <span class="status-label margin-left-s verified" *ngIf="currentFilter !== 'nonverified'">Verified
                 <mat-icon>check_circle</mat-icon></span>
               <span class="status-label margin-left-s nonverified" *ngIf="currentFilter === 'nonverified'">Non-verified
                 <mat-icon>check_circle</mat-icon></span>
             </div>
-            <div class="mat-body-2 ws-mat-black40-text">{{user.profileDetails && user.profileDetails.professionalDetails
+            <div class="mat-body-2 ws-mat-black40-text">{{user?.profileDetails &&
+              user?.profileDetails?.professionalDetails
               &&
-              user.profileDetails.professionalDetails.designation ?
-              user.profileDetails.professionalDetails.designation : '-'}}</div>
+              user?.profileDetails?.professionalDetails?.designation ?
+              user?.profileDetails?.professionalDetails?.designation : '-'}}</div>
             <!-- <div class="mat-body-2 ws-mat-black40-text" *ngIf="currentFilter !== 'nonverified'">Verified date:
               19/04/2024</div>
             <div class="mat-body-2 ws-mat-black40-text" *ngIf="currentFilter === 'nonverified'">Non-verified date:
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index d7e0d9b74..f115c3b03 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -86,8 +86,8 @@ export class UserCardComponent implements OnInit {
   approvalData: any
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-              private dialog: MatDialog, private router: Router,
-              private route: ActivatedRoute, private snackBar: MatSnackBar) {
+    private dialog: MatDialog, private router: Router,
+    private route: ActivatedRoute, private snackBar: MatSnackBar) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', [Validators.required]),
       group: new FormControl('', [Validators.required]),
@@ -190,7 +190,7 @@ export class UserCardComponent implements OnInit {
         countryCode: '+91',
       })
     },
-                                                  (_err: any) => {
+      (_err: any) => {
       })
   }
 
@@ -286,11 +286,14 @@ export class UserCardComponent implements OnInit {
           this.rolesList.push(role)
         }
       })
-      const usrRoles = profileDataAll.organisations[0].roles
-      usrRoles.forEach((role: any) => {
-        this.orguserRoles.push(role)
-        this.modifyUserRoles(role)
-      })
+      const usrRoles = profileDataAll.organisations[0] && profileDataAll.organisations[0].roles
+        ? profileDataAll.organisations[0].roles : []
+      if (usrRoles.length > 0) {
+        usrRoles.forEach((role: any) => {
+          this.orguserRoles.push(role)
+          this.modifyUserRoles(role)
+        })
+      }
     })
 
     if (user && user.profileDetails) {
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index 8f4d6395a..38cf298bd 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -78,40 +78,40 @@
               </ws-widget-org-user-table-v2> -->
 
       <ng-container *ngIf="usersData && currentFilter === 'allusers'">
-        <div *ngIf="usersData.count > 0">
+        <div *ngIf="usersData?.count > 0">
           <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
             [totalRecords]="activeUsersDataCount" [tabChangeIndex]="pageIndex" [isApprovals]="false"
             (searchByEnterKey)="onEnterkySearch($event)"
             (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
         </div>
-        <p class="text-center" *ngIf="usersData.count === 0">No users found</p>
+        <p class="text-center" *ngIf="usersData?.count === 0">No users found</p>
       </ng-container>
       <ng-container *ngIf="usersData && currentFilter === 'verified'">
-        <div *ngIf="usersData.count > 0">
+        <div *ngIf="usersData?.count > 0">
           <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
             [totalRecords]="verifiedUsersDataCount" [tabChangeIndex]="pageIndex"
             (searchByEnterKey)="onEnterkySearch($event)"
             (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
         </div>
-        <p class="text-center" *ngIf="usersData.count === 0">No users found</p>
+        <p class="text-center" *ngIf="usersData?.count === 0">No users found</p>
       </ng-container>
       <ng-container *ngIf="usersData && currentFilter === 'nonverified'">
-        <div *ngIf="usersData.count > 0">
+        <div *ngIf="usersData?.count > 0">
           <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
             [totalRecords]="nonverifiedUsersDataCount" [tabChangeIndex]="pageIndex"
             (searchByEnterKey)="onEnterkySearch($event)"
             (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
         </div>
-        <p class="text-center" *ngIf="usersData.count === 0">No users found</p>
+        <p class="text-center" *ngIf="usersData?.count === 0">No users found</p>
       </ng-container>
       <ng-container *ngIf="usersData && currentFilter === 'notmyuser'">
-        <div *ngIf="usersData.count > 0">
+        <div *ngIf="usersData?.count > 0">
           <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
             [totalRecords]="notmyuserUsersDataCount" [tabChangeIndex]="pageIndex"
             (searchByEnterKey)="onEnterkySearch($event)"
             (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
         </div>
-        <p class="text-center" *ngIf="usersData.count === 0">No users found</p>
+        <p class="text-center" *ngIf="usersData?.count === 0">No users found</p>
       </ng-container>
 
       <ng-container *ngIf="currentFilter === 'upload'">

From 6ee1c35c519158b1e60b640f0bd0fc5c48bbe5bd Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Thu, 2 May 2024 12:47:41 +0530
Subject: [PATCH 562/887] lint issue fix

---
 .../home/components/user-cards/user-card.component.ts       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index f115c3b03..3099e1caa 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -86,8 +86,8 @@ export class UserCardComponent implements OnInit {
   approvalData: any
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-    private dialog: MatDialog, private router: Router,
-    private route: ActivatedRoute, private snackBar: MatSnackBar) {
+              private dialog: MatDialog, private router: Router,
+              private route: ActivatedRoute, private snackBar: MatSnackBar) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', [Validators.required]),
       group: new FormControl('', [Validators.required]),
@@ -190,7 +190,7 @@ export class UserCardComponent implements OnInit {
         countryCode: '+91',
       })
     },
-      (_err: any) => {
+                                                  (_err: any) => {
       })
   }
 

From 283a802efbf9d4a8ec5745335d187db6e5a4a9ae Mon Sep 17 00:00:00 2001
From: Vinod Kumar Shyave <121538586+vShyave@users.noreply.github.com>
Date: Thu, 2 May 2024 13:12:23 +0530
Subject: [PATCH 563/887] Bulk upload added to users

---
 .../user-cards/user-card.component.ts         |   6 +-
 .../ws/app/src/lib/routes/home/home.module.ts |  64 ++--
 .../lib/routes/home/home.rounting.module.ts   | 138 ++++----
 .../approval-pending.component.html           |   4 +-
 .../all-users/all-users.component.html        | 100 ++++++
 .../all-users/all-users.component.scss        | 302 ++++++++++++++++++
 .../all-users/all-users.component.spec.ts     |  25 ++
 .../all-users/all-users.component.ts          | 285 +++++++++++++++++
 .../bulk-upload/bulk-upload.component.html    |  12 +-
 .../bulk-upload/bulk-upload.component.scss    |   0
 .../bulk-upload/bulk-upload.component.spec.ts |   0
 .../bulk-upload/bulk-upload.component.ts      |  11 +-
 .../users-view/users-view.component.html      | 123 +------
 .../routes/users-view/users-view.component.ts | 290 +----------------
 src/app/app.module.ts                         |   2 +
 15 files changed, 841 insertions(+), 521 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.html
 create mode 100644 project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.scss
 create mode 100644 project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.ts
 rename project/ws/app/src/lib/routes/home/routes/{approvals => users-view}/bulk-upload/bulk-upload.component.html (90%)
 rename project/ws/app/src/lib/routes/home/routes/{approvals => users-view}/bulk-upload/bulk-upload.component.scss (100%)
 rename project/ws/app/src/lib/routes/home/routes/{approvals => users-view}/bulk-upload/bulk-upload.component.spec.ts (100%)
 rename project/ws/app/src/lib/routes/home/routes/{approvals => users-view}/bulk-upload/bulk-upload.component.ts (81%)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index f115c3b03..3099e1caa 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -86,8 +86,8 @@ export class UserCardComponent implements OnInit {
   approvalData: any
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-    private dialog: MatDialog, private router: Router,
-    private route: ActivatedRoute, private snackBar: MatSnackBar) {
+              private dialog: MatDialog, private router: Router,
+              private route: ActivatedRoute, private snackBar: MatSnackBar) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', [Validators.required]),
       group: new FormControl('', [Validators.required]),
@@ -190,7 +190,7 @@ export class UserCardComponent implements OnInit {
         countryCode: '+91',
       })
     },
-      (_err: any) => {
+                                                  (_err: any) => {
       })
   }
 
diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index 4c9079f00..8c337500e 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -6,78 +6,69 @@ import { MatExpansionModule } from '@angular/material/expansion'
 import { MatDividerModule } from '@angular/material/divider'
 import { WidgetResolverModule } from '@sunbird-cb/resolver'
 import {
-  MatIconModule,
-  MatListModule,
-  MatFormFieldModule,
-  MatDialogModule,
-  MatSelectModule,
-  MatInputModule,
-  MatButtonModule,
-  MatSidenavModule,
-  MatChipsModule,
-  MatProgressSpinnerModule,
-  MatProgressBarModule,
-  MatRadioModule,
-  MatTabsModule,
-  MatCheckboxModule,
-  MatDatepickerModule,
-  MatAutocompleteModule,
-  MatSlideToggleModule,
+  MatIconModule, MatListModule, MatFormFieldModule, MatDialogModule,
+  MatSelectModule, MatInputModule, MatButtonModule, MatSidenavModule,
+  MatChipsModule, MatProgressSpinnerModule, MatProgressBarModule, MatRadioModule,
+  MatTabsModule, MatCheckboxModule, MatDatepickerModule, MatAutocompleteModule, MatSlideToggleModule,
 } from '@angular/material'
 import { MatMenuModule } from '@angular/material/menu'
 import { MatPaginatorModule } from '@angular/material/paginator'
 import { MatCardModule } from '@angular/material/card'
+import { MatTableModule } from '@angular/material/table'
+import { MatTooltipModule } from '@angular/material/tooltip'
+import { MatSortModule } from '@angular/material/sort'
 import { ReactiveFormsModule, FormsModule } from '@angular/forms'
-import { InitResolver } from './resolvers/init-resolve.service'
 import { RouterModule } from '@angular/router'
+import { Ng2SearchPipeModule } from 'ng2-search-filter'
+import { NgxPaginationModule } from 'ngx-pagination'
+import { RainDashboardsModule } from '@sunbird-cb/rain-dashboards'
+
+import { ExportAsModule } from 'ngx-export-as'
 import { HomeRoutingModule } from './home.rounting.module'
+import { AvatarPhotoModule, BreadcrumbsOrgModule, UIORGTableModule, ScrollspyLeftMenuModule } from '@sunbird-cb/collection'
+import { UsersModule } from '../users/users.module'
+import { WorkallocationModule } from '../workallocation/workallocation.module'
+import { UIAdminTableModule } from '../../head/work-allocation-table/ui-admin-table.module'
+import { LeftMenuModule } from '../../head/left-menu/left-menu.module'
+
+import { InitResolver } from './resolvers/init-resolve.service'
+import { MdoInfoService } from './services/mdoinfo.service'
+import { UploadService } from './services/upload.service'
+import { TrainingPlanDashboardService } from './services/training-plan-dashboard.service'
+
 import { HomeComponent } from './routes/home/home.component'
 import { UsersViewComponent } from './routes/users-view/users-view.component'
-import { AvatarPhotoModule, BreadcrumbsOrgModule, UIORGTableModule, ScrollspyLeftMenuModule } from '@sunbird-cb/collection'
 import { AboutComponent } from './routes/about/about.component'
 import { RolesAccessComponent } from './routes/roles-access/roles-access.component'
 import { ApprovalsComponent } from './routes/approvals/approvals.component'
 import { WorkallocationComponent } from './routes/workallocation/workallocation.component'
-import { Ng2SearchPipeModule } from 'ng2-search-filter'
-import { ExportAsModule } from 'ngx-export-as'
-import { WorkallocationModule } from '../workallocation/workallocation.module'
-import { NgxPaginationModule } from 'ngx-pagination'
-import { UIAdminTableModule } from '../../head/work-allocation-table/ui-admin-table.module'
 import { WelcomeComponent } from './routes/welcome/welcome.component'
-import { RainDashboardsModule } from '@sunbird-cb/rain-dashboards'
 import { MdoinfoComponent } from './routes/mdoinfo/mdoinfo.component'
 import { LeadershipComponent } from './routes/leadership/leadership.component'
 import { StaffComponent } from './routes/staff/staff.component'
 import { BudgetComponent } from './routes/budget/budget.component'
 import { LeftMenuComponent } from './components/left-menu/left-menu.component'
-import { MatTableModule } from '@angular/material/table'
-import { MatTooltipModule } from '@angular/material/tooltip'
-import { MatSortModule } from '@angular/material/sort'
 import { LeadershiptableComponent } from './components/leadershiptable/leadershiptable.component'
 import { BudgettableComponent } from './components/budgettable/budgettable.component'
 import { AdduserpopupComponent } from './components/adduserpopup/adduserpopup.component'
 import { StaffdetailspopupComponent } from './components/staffdetailspopup/staffdetailspopup.component'
-import { MdoInfoService } from './services/mdoinfo.service'
 import { BudgetschemepopupComponent } from './components/budgetschemepopup/budgetschemepopup.component'
 import { BudgetproofspopupComponent } from './components/budgetproofspopup/budgetproofspopup.component'
-import { UploadService } from './services/upload.service'
 import { AdmintableComponent } from './components/admintable/admintable.component'
-import { UsersModule } from '../users/users.module'
 import { BlendedApprovalsComponent } from './routes/blended-approvals/blended-approvals.component'
 import { ReportsSectionComponent } from './routes/reports-section/reports-section.component'
 import { TrainingPlanDashboardComponent } from './routes/training-plan-dashboard/training-plan-dashboard.component'
-import { TrainingPlanDashboardService } from './services/training-plan-dashboard.service'
 import { AdminsTableComponent } from './routes/admins-table/admins-table.component'
 import { ReportsVideoComponent } from './routes/reports-video/reports-video.component'
 import { ProfleApprovalBulkUploadComponent } from './routes/profle-approval-bulk-upload/profle-approval-bulk-upload.component'
-import { LeftMenuModule } from '../../head/left-menu/left-menu.module'
 import { UserCardComponent } from './components/user-cards/user-card.component'
 import { SearchComponent } from './components/search/search.component'
 import { FilterComponent } from './components/filter/filter.component'
 import { FilterSearchPipeModule } from '../pipes/filter-search/filter-search.module'
 import { ApprovalPendingComponent } from './routes/approvals/approval-pending/approval-pending.component'
-import { BulkUploadComponent } from './routes/approvals/bulk-upload/bulk-upload.component'
 import { RejectionPopupComponent } from './components/rejection-popup/rejection-popup.component'
+import { AllUsersComponent } from './routes/users-view/all-users/all-users.component'
+import { BulkUploadComponent } from './routes/users-view/bulk-upload/bulk-upload.component'
 
 @NgModule({
   declarations: [
@@ -112,6 +103,7 @@ import { RejectionPopupComponent } from './components/rejection-popup/rejection-
     ApprovalPendingComponent,
     BulkUploadComponent,
     RejectionPopupComponent,
+    AllUsersComponent,
   ],
   imports: [
     CommonModule,
@@ -146,8 +138,6 @@ import { RejectionPopupComponent } from './components/rejection-popup/rejection-
     PipeHtmlTagRemovalModule,
     PipeRelativeTimeModule,
     AvatarPhotoModule,
-    // EditorSharedModule,
-    // CkEditorModule,
     PipeOrderByModule,
     BreadcrumbsOrgModule,
     WidgetResolverModule,
@@ -182,8 +172,6 @@ import { RejectionPopupComponent } from './components/rejection-popup/rejection-
     RejectionPopupComponent,
   ],
   providers: [
-    // CKEditorService,
-    // LoaderService,
     InitResolver,
     MdoInfoService,
     UploadService,
diff --git a/project/ws/app/src/lib/routes/home/home.rounting.module.ts b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
index fad310ae4..a309bd7e8 100644
--- a/project/ws/app/src/lib/routes/home/home.rounting.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
@@ -1,27 +1,28 @@
 import { NgModule } from '@angular/core'
 import { Routes, RouterModule } from '@angular/router'
-// import { InitResolver } from './resol./routes/profile-v2/discuss-all.component'
-import { HomeResolve } from './resolvers/home-resolve'
-import { AboutComponent } from './routes/about/about.component'
+
 import { HomeComponent } from './routes/home/home.component'
+import { AboutComponent } from './routes/about/about.component'
 import { UsersViewComponent } from './routes/users-view/users-view.component'
 import { RolesAccessComponent } from './routes/roles-access/roles-access.component'
-// import { PageResolve } from '@sunbird-cb/utils'
 import { ApprovalsComponent } from './routes/approvals/approvals.component'
 import { WorkallocationComponent } from './routes/workallocation/workallocation.component'
-import { WelcomeComponent } from './routes/welcome/welcome.component'
-import { ConfigResolveService } from './resolvers/config-resolve.service'
-import { UsersListResolve } from './resolvers/users-list-resolve.service'
 import { LeadershipComponent } from './routes/leadership/leadership.component'
 import { StaffComponent } from './routes/staff/staff.component'
-import { BudgetComponent } from './routes/budget/budget.component'
 import { MdoinfoComponent } from './routes/mdoinfo/mdoinfo.component'
-import { PageResolve } from '@sunbird-cb/utils'
+import { BudgetComponent } from './routes/budget/budget.component'
 import { BlendedApprovalsComponent } from './routes/blended-approvals/blended-approvals.component'
 import { ReportsSectionComponent } from './routes/reports-section/reports-section.component'
 import { TrainingPlanDashboardComponent } from './routes/training-plan-dashboard/training-plan-dashboard.component'
-import { BulkUploadComponent } from './routes/approvals/bulk-upload/bulk-upload.component'
 import { ApprovalPendingComponent } from './routes/approvals/approval-pending/approval-pending.component'
+import { WelcomeComponent } from './routes/welcome/welcome.component'
+import { AllUsersComponent } from './routes/users-view/all-users/all-users.component'
+import { BulkUploadComponent } from './routes/users-view/bulk-upload/bulk-upload.component'
+
+import { PageResolve } from '@sunbird-cb/utils'
+import { HomeResolve } from './resolvers/home-resolve'
+import { ConfigResolveService } from './resolvers/config-resolve.service'
+import { UsersListResolve } from './resolvers/users-list-resolve.service'
 
 const routes: Routes = [
   {
@@ -33,7 +34,6 @@ const routes: Routes = [
     path: '',
     component: HomeComponent,
     resolve: {
-      // department: DepartmentResolve,
       configService: ConfigResolveService,
       tabs: HomeResolve,
     },
@@ -46,36 +46,66 @@ const routes: Routes = [
           module: 'Home',
         },
       },
-      {
-        path: 'users/:tab',
-        component: UsersViewComponent,
-        resolve: {
-          usersList: UsersListResolve,
-          pageData: PageResolve,
-          configService: ConfigResolveService,
-        },
-        data: {
-          pageId: 'users',
-          module: 'User',
-          pageType: 'feature',
-          pageKey: 'users-view',
-        },
-      },
       {
         path: 'users',
-        redirectTo: 'users/allusers',
         component: UsersViewComponent,
         resolve: {
           usersList: UsersListResolve,
           pageData: PageResolve,
           configService: ConfigResolveService,
         },
-        data: {
-          pageId: 'users',
-          module: 'User',
-          pageType: 'feature',
-          pageKey: 'users-view',
-        },
+        children: [
+          {
+            path: '',
+            pathMatch: 'full',
+            redirectTo: 'all-users',
+          },
+          {
+            path: 'all-users',
+            component: AllUsersComponent,
+            resolve: {
+              usersList: UsersListResolve,
+              pageData: PageResolve,
+              configService: ConfigResolveService,
+            },
+            data: {
+              pageId: 'users',
+              module: 'User',
+              pageType: 'feature',
+              pageKey: 'users-view',
+            },
+          },
+          {
+            path: 'all-users/:tab',
+            component: AllUsersComponent,
+            resolve: {
+              usersList: UsersListResolve,
+              pageData: PageResolve,
+              configService: ConfigResolveService,
+            },
+            data: {
+              pageId: 'users',
+              module: 'User',
+              pageType: 'feature',
+              pageKey: 'users-view',
+            },
+          },
+          {
+            path: 'bulk-upload',
+            component: BulkUploadComponent,
+            resolve: {
+              usersList: UsersListResolve,
+              pageData: PageResolve,
+              configService: ConfigResolveService,
+            },
+            data: {
+              pageId: 'users',
+              module: 'User',
+              pageType: 'feature',
+              pageKey: 'users-view',
+            },
+          },
+        ],
       },
       {
         path: 'about',
@@ -121,18 +151,8 @@ const routes: Routes = [
             data: {
               pageId: 'approvals-pending',
               module: 'Approvals',
-            },
-            resolve: {
-              pageData: PageResolve,
-              configService: ConfigResolveService,
-            },
-          },
-          {
-            path: 'bulk-upload',
-            component: BulkUploadComponent,
-            data: {
-              pageId: 'bulk-upload',
-              module: 'Approvals',
+              pageType: 'feature',
+              pageKey: 'approval-view',
             },
             resolve: {
               pageData: PageResolve,
@@ -141,20 +161,20 @@ const routes: Routes = [
           },
         ],
       },
-      // {
-      //   path: 'approvals/:tab',
-      //   component: ApprovalsComponent,
-      //   data: {
-      //     pageId: 'approvals',
-      //     module: 'Approvals',
-      //     pageType: 'feature',
-      //     pageKey: 'approval-view',
-      //   },
-      //   resolve: {
-      //     pageData: PageResolve,
-      //     configService: ConfigResolveService,
-      //   },
-      // },
+      {
+        path: 'approvals/pending/:tab',
+        component: ApprovalsComponent,
+        data: {
+          pageId: 'approvals',
+          module: 'Approvals',
+          pageType: 'feature',
+          pageKey: 'approval-view',
+        },
+        resolve: {
+          pageData: PageResolve,
+          configService: ConfigResolveService,
+        },
+      },
       {
         path: 'workallocation/:tab',
         data: {
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
index 2753b96c9..8b44f1ca2 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
@@ -30,12 +30,12 @@
     <mat-card-content>
       <div class="flex flex-1 flex-column margin-fix">
         <div class="flex flex-1 filter max-height-60">
-          <a routerLink="/app/home/approvals/pending" class="filter-option"
+          <a routerLink="/app/home/approvals/pending/verification" class="filter-option"
             [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'profileverification', 'ws-mat-accent-border font-medium':currentFilter !== 'profileverification'}"
             mat-button (click)="filter('profileverification'); tabTelemetry('toapprove', 0)" role="button">Profile
             Verifications</a>
 
-          <a routerLink="/app/home/approvals/transfers" class="filter-option"
+          <a routerLink="/app/home/approvals/pending/transfers" class="filter-option"
             [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'transfers', 'ws-mat-accent-border font-medium':currentFilter !== 'transfers'}"
             mat-button (click)="filter('transfers'); tabTelemetry('transfers', 1)" role="button">Transfers</a>
         </div>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.html
new file mode 100644
index 000000000..41800e41d
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.html
@@ -0,0 +1,100 @@
+<div class="flex flex-4 flex-column main-flex-box">
+  <mat-card class="no-border">
+    <mat-card-title class="flex-4 mobile-margin text-capitalize margin-bottom-l">
+      <span class="h-600-s-20-m color-87">Users</span>
+    </mat-card-title>
+    <mat-card class="mb-8">
+      <mat-card-content class="flex gap-10">
+        <div class="section-1">
+          <div class="flex-4 mobile-margin text-capitalize mat-h2">Note:</div>
+          <ng-container *ngFor="let note of reportsNoteList">
+            <div class="flex gap-4 mb-4">
+              <mat-icon class="infoIcon">error_outline</mat-icon>
+              <div [innerHTML]="sanitizeHtml(note)"></div>
+            </div>
+          </ng-container>
+        </div>
+        <div class="reportsDemo flex justify-end section-2">
+          <div class="reportsDemoVideo flex flex-column flex-middle justify-center margin-top-m"
+            (click)="openVideoPopup()">
+            <mat-icon class="video_icon mb-2">play_circle</mat-icon>
+            Watch how it works
+          </div>
+        </div>
+      </mat-card-content>
+    </mat-card>
+    <mat-card-content>
+      <div class="flex flex-1 flex-column margin-fix">
+        <div class="flex flex-1 filter max-height-60">
+          <a routerLink="/app/home/users/all-users" routerLinkActive="router-link-active" class="filter-option"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'allusers','ws-mat-accent-border font-medium':currentFilter !== 'allusers'}"
+            mat-button (click)="filter('allusers'); tabTelemetry('allusers', 0)" role="button">All users
+            ({{activeUsersDataCount}})</a>
+
+          <a routerLink="/app/home/users/all-users/verified" routerLinkActive="router-link-active" class="filter-option"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'verified','ws-mat-accent-border font-medium':currentFilter !== 'verified'}"
+            mat-button (click)="filter('verified'); tabTelemetry('verified', 0)" role="button">Verified
+            ({{verifiedUsersDataCount}})</a>
+
+          <a routerLink="/app/home/users/all-users/nonverified" routerLinkActive="router-link-active"
+            class="filter-option"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'nonverified','ws-mat-accent-border font-medium':currentFilter !== 'nonverified'}"
+            mat-button (click)="filter('nonverified'); tabTelemetry('nonverified', 0)" role="button">Non-verified
+            ({{nonverifiedUsersDataCount}})</a>
+
+          <a routerLink="/app/home/users/all-users/notmyuser" routerLinkActive="router-link-active"
+            class="filter-option"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'notmyuser','ws-mat-accent-border font-medium':currentFilter !== 'notmyuser'}"
+            mat-button (click)="filter('notmyuser'); tabTelemetry('notmyuser', 0)" role="button">Not my user
+            ({{notmyuserUsersDataCount}})</a>
+        </div>
+      </div>
+      <!-- <ws-widget-org-user-table-v2 [userId]="currentUser" [tableData]="tabledata" [data]="dataForTable"
+                [isUpload]=false [isCreate]=true (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuActions($event)"
+                (searchByEnterKey)="onEnterkySearch($event)" (pageChangeClick)="onPaginateChange($event)"
+                [showEditOnCondition]=true [totalRecords]="userDataTotalCount" [tabChangeIndex]="pageIndex">
+              </ws-widget-org-user-table-v2> -->
+
+      <ng-container *ngIf="usersData && currentFilter === 'allusers'">
+        <div *ngIf="usersData?.count > 0">
+          <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
+            [totalRecords]="activeUsersDataCount" [tabChangeIndex]="pageIndex" [isApprovals]="false"
+            (searchByEnterKey)="onEnterkySearch($event)"
+            (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
+        </div>
+        <p class="text-center" *ngIf="usersData?.count === 0">No users found</p>
+      </ng-container>
+      <ng-container *ngIf="usersData && currentFilter === 'verified'">
+        <div *ngIf="usersData?.count > 0">
+          <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
+            [totalRecords]="verifiedUsersDataCount" [tabChangeIndex]="pageIndex"
+            (searchByEnterKey)="onEnterkySearch($event)"
+            (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
+        </div>
+        <p class="text-center" *ngIf="usersData?.count === 0">No users found</p>
+      </ng-container>
+      <ng-container *ngIf="usersData && currentFilter === 'nonverified'">
+        <div *ngIf="usersData?.count > 0">
+          <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
+            [totalRecords]="nonverifiedUsersDataCount" [tabChangeIndex]="pageIndex"
+            (searchByEnterKey)="onEnterkySearch($event)"
+            (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
+        </div>
+        <p class="text-center" *ngIf="usersData?.count === 0">No users found</p>
+      </ng-container>
+      <ng-container *ngIf="usersData && currentFilter === 'notmyuser'">
+        <div *ngIf="usersData?.count > 0">
+          <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
+            [totalRecords]="notmyuserUsersDataCount" [tabChangeIndex]="pageIndex"
+            (searchByEnterKey)="onEnterkySearch($event)"
+            (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
+        </div>
+        <p class="text-center" *ngIf="usersData?.count === 0">No users found</p>
+      </ng-container>
+
+      <ng-container *ngIf="currentFilter === 'upload'">
+        <ws-app-users-upload></ws-app-users-upload>
+      </ng-container>
+    </mat-card-content>
+  </mat-card>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.scss b/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.scss
new file mode 100644
index 000000000..0f314a2e8
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.scss
@@ -0,0 +1,302 @@
+@import 'ws-common';
+@import 'ws-vars';
+@import 'ws-mixins';
+
+.buton {
+  display: flex;
+  border: 1px solid;
+  flex: 1;
+  background: red;
+  align-content: center;
+  text-align: center;
+}
+
+.flex-4 {
+  flex: 4;
+}
+
+.mob {
+  @include breakpoint-xs {
+    bottom: 0 !important;
+    position: unset !important;
+  }
+}
+
+.font-medium {
+  font-weight: 500 !important;
+}
+
+.bottom-fix {
+  bottom: 1.5rem;
+  position: absolute;
+}
+
+.view-more {
+  display: flex;
+  align-items: center;
+  text-align: center;
+  border: 1px solid;
+
+  .icon {
+    $icon-size: 24px;
+    font-size: $icon-size;
+    width: $icon-size;
+    height: $icon-size;
+    border: 1px solid;
+    border-radius: 50%;
+    padding: 8px;
+    margin-bottom: 8px;
+    margin-right: $size-s;
+  }
+}
+
+.view-all {
+  display: flex;
+  margin: 0 auto;
+  box-shadow: 0px 10px 30p;
+  border-radius: 8px;
+}
+
+.text-box {
+  display: flex;
+  border: 1px solid;
+  flex: 3;
+  align-content: center;
+  text-align: center;
+}
+
+.margin-fix {
+  @include breakpoint-xs {
+    margin: 0 $size-l 0 $size-l;
+  }
+
+  @include breakpoint-s {
+    margin: 0 $size-l 0 $size-l;
+  }
+}
+
+.overflow {
+  overflow: hidden;
+}
+
+.custom {
+  @include breakpoint-xs {
+    flex-direction: column;
+  }
+
+  @include breakpoint-s {
+    flex-direction: column;
+  }
+}
+
+.discuss-border {
+  border-radius: 4px;
+  border: 1px solid #DEDFE0;
+  flex: 1;
+}
+
+.discuss .mat-form-field-wrapper {
+  padding-bottom: 0px;
+
+  .mat-form-field-infix {
+    border-top-width: 5px !important;
+    padding: 0px;
+    padding-bottom: 5px;
+  }
+
+}
+
+
+.flex-3 {
+  flex: 3;
+}
+
+.filter {
+  .filter-option {
+    margin: $size-xs $size-m;
+    /* border-bottom: darkslateblue; */
+    border-radius: 0;
+    border-bottom-width: 2px;
+    border-top-width: 0;
+    border-left-width: 0;
+    border-right-width: 0;
+  }
+}
+
+.max-height-60 {
+  max-height: 60px;
+}
+
+.height-48 {
+  max-height: 48px;
+}
+
+.pagination {
+  justify-content: center;
+  flex-wrap: wrap;
+  margin-top: 0;
+  margin-bottom: 1rem;
+}
+
+.pagination {
+  display: -ms-flexbox;
+  display: flex;
+  padding-left: 0;
+  list-style: none;
+  border-radius: .25rem;
+}
+
+.page-item.active .page-link {
+  z-index: 1;
+  color: #fff;
+  background-color: #0074B6;
+  border-color: #0074B6;
+}
+
+a:not([href]):not([tabindex]) {
+  color: inherit;
+  text-decoration: none;
+}
+
+.page-link {
+  position: relative;
+  display: block;
+  padding: .5rem .75rem;
+  margin-left: -1px;
+  line-height: 1.25;
+  color: #0074B6;
+  background-color: #fff;
+  border: 1px solid #dee2e6;
+
+  &.separator {
+    font-size: 20px;
+  }
+}
+
+.page-item.disabled .page-link {
+  color: #6c757d;
+  pointer-events: none;
+  cursor: auto;
+  background-color: #fff;
+  border-color: #dee2e6;
+}
+
+.container-balanced {
+  @extend %page-center;
+}
+
+@media screen and (max-width: 1024px) {
+  .main-flex-box {
+  overflow: auto;
+}
+}
+
+.flex-3 {
+  flex: 3;
+}
+
+.flex-update {
+  flex-direction: row;
+
+  @include breakpoint-xs {
+    flex-direction: row;
+  }
+
+  @include breakpoint-s {
+    flex-direction: row;
+  }
+}
+
+.flex-custom {
+  display: flex;
+  flex-direction: column;
+}
+
+.flex-custom-m {
+  @include breakpoint-xs {
+    flex-direction: column;
+  }
+}
+
+.example-header-image {
+  width: auto;
+  height: auto;
+}
+
+.margin-0 {
+  margin: 0;
+}
+
+.pad-4 {
+  padding: 0 0 0 $size-s;
+}
+
+.mobile-margin {
+  @include breakpoint-xs {
+    margin-top: $size-s;
+  }
+}
+
+.filter {
+  .filter-option {
+    margin: $size-s $size-s;
+    border-radius: 0;
+    border-bottom-width: 2px;
+    border-top-width: 0;
+    border-left-width: 0;
+    border-right-width: 0;
+  }
+
+  .filter-option:first-child {
+    margin-left: 0;
+  }
+}
+
+.recent-tabs {
+  box-shadow: none !important;
+  border-radius: unset;
+  background: inherit !important;
+}
+
+.no-shadow {
+  box-shadow: none !important;
+}
+
+.mat-card-title {
+  font-size: 20px !important;
+}
+
+::ng-deep.mat-header-cell .mat-icon {
+  padding-left: 0.3em !important;
+}
+
+.move-button{
+  cursor: pointer;
+  height: auto;
+  border-radius: 4px;
+  border: none;
+  width: 60px;
+  font-family: Lato;
+  font-size: 14px;
+}
+
+.reportsDemo {
+  .reportsDemoVideo {
+    width: 200px;
+    height: 140px;
+    border-radius: 5px;
+    background-color: #FDEAD5;
+    font-weight: 600;
+    pointer-events: all;
+    cursor: pointer;
+
+    .video_icon {
+      font-size: 32px;
+    }
+  }
+}
+
+.no-border {
+  border: 0;
+  box-shadow: none !important;
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.spec.ts b/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.spec.ts
new file mode 100644
index 000000000..c801c980a
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
+
+import { AllUsersComponent } from './all-users.component'
+
+describe('AllUsersComponent', () => {
+  let component: AllUsersComponent
+  let fixture: ComponentFixture<AllUsersComponent>
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [AllUsersComponent],
+    })
+    .compileComponents()
+  }))
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AllUsersComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
+
+  it('should create', () => {
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.ts
new file mode 100644
index 000000000..37448cdef
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.ts
@@ -0,0 +1,285 @@
+import { Component, OnDestroy, OnInit } from '@angular/core'
+import { MatDialog } from '@angular/material/dialog'
+import { ActivatedRoute, Router } from '@angular/router'
+import { PageEvent } from '@angular/material'
+import { EventService } from '@sunbird-cb/utils'
+import { DomSanitizer, SafeHtml } from '@angular/platform-browser'
+/* tslint:disable */
+import _ from 'lodash'
+/* tslint:enable */
+
+import { NsContent } from '@sunbird-cb/collection'
+import { ReportsVideoComponent } from '../../reports-video/reports-video.component'
+import { NSProfileDataV2 } from '../../../models/profile-v2.model'
+import { TelemetryEvents } from '../../../../../head/_services/telemetry.event.model'
+
+import { UsersService } from '../../../../users/services/users.service'
+import { LoaderService } from '../../../../../../../../../../src/app/services/loader.service'
+import { ProfileV2UtillService } from '../../../services/home-utill.service'
+
+@Component({
+  selector: 'ws-all-users',
+  templateUrl: './all-users.component.html',
+  styleUrls: ['./all-users.component.scss'],
+  providers: [LoaderService],
+  /* tslint:disable */
+  host: { class: 'flex flex-1 margin-top-l' },
+  /* tslint:enable */
+})
+
+export class AllUsersComponent implements OnInit, OnDestroy {
+
+  // Math: any
+  currentFilter = 'allusers'
+  filterPath = '/app/home/users'
+  discussionList!: any
+  discussProfileData!: any
+  portalProfile!: NSProfileDataV2.IProfile
+  userDetails: any
+  location!: string | null
+  tabs: any
+  currentUser!: any
+  connectionRequests!: any[]
+  data: any = []
+  usersData!: any
+  configSvc: any
+  activeUsersData!: any[]
+  verifiedUsersData!: any[]
+  nonverifiedUsersData!: any[]
+  notmyuserUsersData!: any[]
+
+  activeUsersDataCount?: number | 0
+  verifiedUsersDataCount?: number | 0
+  nonverifiedUsersDataCount?: number | 0
+  notmyuserUsersDataCount?: number | 0
+  content: NsContent.IContent = {} as NsContent.IContent
+  isMdoAdmin = false
+
+  reportsNoteList: string[] = []
+
+  currentOffset = 0
+  limit = 20
+  pageIndex = 0
+  searchQuery = ''
+  rootOrgId: any
+  constructor(
+    public dialog: MatDialog,
+    private route: ActivatedRoute,
+    private router: Router,
+    private events: EventService,
+    private loaderService: LoaderService,
+    private profileUtilSvc: ProfileV2UtillService,
+    private sanitizer: DomSanitizer,
+    private usersService: UsersService
+  ) {
+    // this.Math = Math
+    this.configSvc = this.route.parent && this.route.parent.snapshot.data.configService
+    this.currentUser = this.configSvc.userProfile && this.configSvc.userProfile.userId
+  }
+
+  ngOnInit() {
+    this.rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
+    this.searchQuery = ''
+    if (this.configSvc.unMappedUser && this.configSvc.unMappedUser.roles) {
+      this.isMdoAdmin = this.configSvc.unMappedUser.roles.includes('MDO_ADMIN')
+    }
+    this.filterData('')
+
+    this.getUsers('', 'allusers')
+    this.getUsers('', 'verified')
+    this.getUsers('', 'nonverified')
+    this.getUsers('', 'notmyuser')
+
+    this.reportsNoteList = [
+      `Easily create users individually or in bulk.`,
+      `Edit any user profile within your organization.`,
+      `Verified Users: Users with all their primary fields approved.`,
+      // tslint:disable-next-line: max-line-length
+      `Non-Verified Users: Users whose one or more primary fields are yet to be approved. You can help by reviewing and approving their requests.`,
+      `Not My User: Remove a user from your organization with a simple click.`,
+    ]
+  }
+
+  sanitizeHtml(html: string): SafeHtml {
+    return this.sanitizer.bypassSecurityTrustHtml(html)
+  }
+
+  openVideoPopup() {
+    this.dialog.open(ReportsVideoComponent, {
+      data: {
+        videoLink: 'https://www.youtube.com/embed/tgbNymZ7vqY?autoplay=1&mute=1',
+      },
+      disableClose: true,
+      width: '50%',
+      height: '60%',
+      panelClass: 'overflow-visable',
+    })
+  }
+
+  filter(filter: string) {
+    this.currentFilter = filter
+    this.pageIndex = 0
+    this.currentOffset = 0
+    this.limit = 20
+    this.searchQuery = ''
+    this.filterData(this.searchQuery)
+  }
+
+  public tabTelemetry(label: string, index: number) {
+    const data: TelemetryEvents.ITelemetryTabData = {
+      label,
+      index,
+    }
+    this.events.handleTabTelemetry(
+      TelemetryEvents.EnumInteractSubTypes.USER_TAB,
+      data,
+    )
+  }
+
+  get dataForTable() {
+    switch (this.currentFilter) {
+      case 'allusers':
+        return this.activeUsersData
+      case 'verified':
+        return this.verifiedUsersData
+      case 'nonverified':
+        return this.nonverifiedUsersData
+      case 'notmyuser':
+        return this.notmyuserUsersData
+      default:
+        return []
+    }
+  }
+
+  filterData(query: string) {
+    this.getUsers(query, this.currentFilter)
+  }
+
+  showEditUser(roles: any): boolean {
+    if (this.isMdoAdmin) {
+      if (roles && roles.length > 0) {
+        return true
+      }
+    }
+    return true
+  }
+
+  blockedUsers() {
+    const blockedUsersData: any[] = []
+    if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
+      _.filter(this.usersData.content, { isDeleted: false }).forEach((user: any) => {
+        blockedUsersData.push({
+          fullname: user ? `${user.firstName}` : null,
+          // fullname: user ? `${user.firstName} ${user.lastName}` : null,
+          email: user.personalDetails && user.personalDetails.primaryEmail ?
+            this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
+          role: user.roles,
+          userId: user.id,
+          active: !user.isDeleted,
+          blocked: user.blocked,
+          roles: _.join(_.map(user.roleInfo, i => `<li>${i}</li>`), ''),
+        })
+      })
+    }
+    return blockedUsersData
+  }
+
+  getUsers(query: string, currentFilter: any) {
+    this.loaderService.changeLoad.next(true)
+    const usersData: any[] = []
+    const status = currentFilter === 'allusers' ? 1 : 1
+    this.usersService.getAllKongUsers(this.rootOrgId, status, this.limit, this.pageIndex, query).subscribe((data: any) => {
+      this.usersData = data.result.response
+      if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
+        _.filter(this.usersData.content, { isDeleted: false }).forEach((user: any) => {
+          // tslint:disable-next-line
+          const org = { roles: _.get(_.first(_.filter(user.organisations, { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') }
+          usersData.push({
+            fullname: user ? `${user.firstName}` : null,
+            // fullname: user ? `${user.firstName} ${user.lastName}` : null,
+            email: user.personalDetails && user.personalDetails.primaryEmail ?
+              this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
+            role: org.roles || [],
+            userId: user.id,
+            active: !user.isDeleted,
+            blocked: user.blocked,
+            roles: _.join(_.map((org.roles || []), i => `<li>${i}</li>`), ''),
+            orgId: user.rootOrgId,
+            orgName: user.rootOrgName,
+            allowEditUser: this.showEditUser(org.roles),
+          })
+        })
+      }
+      if (this.currentFilter === 'allusers') {
+        this.activeUsersData = usersData
+        this.activeUsersDataCount = this.usersData.count
+      } else if (this.currentFilter === 'verified') {
+        this.verifiedUsersData = usersData
+        this.verifiedUsersDataCount = this.usersData.count
+      } else if (this.currentFilter === 'nonverified') {
+        this.notmyuserUsersData = usersData
+        this.nonverifiedUsersDataCount = this.usersData.count
+      } else if (this.currentFilter === 'notmyuser') {
+        this.notmyuserUsersData = usersData
+        this.notmyuserUsersDataCount = this.usersData.count
+      }
+      return usersData
+    })
+  }
+
+  clickHandler(event: any) {
+    switch (event.type) {
+      case 'createUser':
+        this.onCreateClick()
+        break
+      case 'upload':
+        this.onUploadClick()
+        break
+    }
+  }
+
+  onCreateClick() {
+    this.router.navigate([`/app/users/create-user`])
+    this.events.raiseInteractTelemetry(
+      {
+        type: TelemetryEvents.EnumInteractTypes.CLICK,
+        subType: TelemetryEvents.EnumInteractSubTypes.CREATE_BTN,
+        id: 'create-user-btn',
+      },
+      {}
+    )
+  }
+
+  onUploadClick() {
+    this.filter('upload')
+  }
+
+  onRoleClick(user: any) {
+    this.router.navigate([`/app/users/${user.userId}/details`])
+    this.events.raiseInteractTelemetry(
+      {
+        type: TelemetryEvents.EnumInteractTypes.CLICK,
+        subType: TelemetryEvents.EnumInteractSubTypes.CARD_CONTENT,
+        id: TelemetryEvents.EnumIdtype.USER_ROW,
+      },
+      {
+        id: user.userId,
+        type: TelemetryEvents.EnumIdtype.USER,
+      }
+    )
+  }
+
+  onEnterkySearch(enterValue: any) {
+    this.searchQuery = enterValue
+    this.filterData(this.searchQuery)
+  }
+
+  onPaginateChange(event: PageEvent) {
+    this.pageIndex = event.pageIndex
+    this.limit = event.pageSize
+    this.filterData(this.searchQuery)
+  }
+
+  ngOnDestroy() {
+  }
+}
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
similarity index 90%
rename from project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
rename to project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
index 93ac4cca2..80c9c7dfc 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
@@ -60,7 +60,7 @@
           <div class="grid grid-flow-row sm:grid-flow-col gap-10 grid-col grid-container-25">
             <div class="flex flex-col">
               <div class="label">Name</div>
-              <div class="value">{{ list?.filename }}</div>
+              <div class="value">{{ list?.fileName }}</div>
             </div>
             <div class="flex flex-col">
               <div class="label">Status</div>
@@ -68,25 +68,25 @@
             </div>
             <div class="flex flex-col">
               <div class="label">Failed Records</div>
-              <div class="value">{{ list?.failedrecordscount }}</div>
+              <div class="value">{{ list?.failedRecordsCount }}</div>
             </div>
             <div class="flex flex-col">
               <div class="label">Success Records</div>
-              <div class="value">{{ list?.successfulrecordscount }}</div>
+              <div class="value">{{ list?.successfulRecordsCount }}</div>
             </div>
           </div>
           <div class="grid grid-flow-row sm:grid-flow-col gap-10 grid-col grid-container-25">
             <div class="flex flex-col">
               <div class="label">Total Records</div>
-              <div class="value">{{ list?.totalrecords }}</div>
+              <div class="value">{{ list?.totalRecords }}</div>
             </div>
             <div class="flex flex-col">
               <div class="label">Initiated On</div>
-              <div class="value">{{ list?.datecreatedon | date: 'dd MMM yyyy h:mm a' }}</div>
+              <div class="value">{{ list?.dateCreatedOn | date: 'dd MMM yyyy h:mm a' }}</div>
             </div>
             <div class="flex flex-col">
               <div class="label">Completed ON</div>
-              <div class="value">{{ list?.dateupdatedon | date: 'dd MMM yyyy h:mm a' }}</div>
+              <div class="value">{{ list?.dateUpdatedOn | date: 'dd MMM yyyy h:mm a' }}</div>
             </div>
           </div>
         </div>
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.scss b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.scss
similarity index 100%
rename from project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.scss
rename to project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.scss
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.spec.ts b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.spec.ts
similarity index 100%
rename from project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.spec.ts
rename to project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.spec.ts
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts
similarity index 81%
rename from project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
rename to project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts
index 4a0f505b5..0a3b5a54e 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts
@@ -2,7 +2,8 @@ import { Component, OnInit, Input, OnDestroy } from '@angular/core'
 import { MatSnackBar, PageEvent } from '@angular/material'
 import { HttpErrorResponse } from '@angular/common/http'
 import { ActivatedRoute } from '@angular/router'
-
+// tslint:disable-next-line
+import _ from 'lodash'
 import { Subject } from 'rxjs'
 import { takeUntil } from 'rxjs/operators'
 
@@ -18,13 +19,15 @@ export class BulkUploadComponent implements OnInit, OnDestroy {
   lastUploadList: any[] = []
   private destroySubject$ = new Subject()
   @Input() totalRecords = 100
+  rootOrgId: any
   pageSize = 20
   constructor(
     private fileService: FileService,
     private matSnackBar: MatSnackBar,
     private router: ActivatedRoute
   ) {
-    this.router.data.subscribe((_data: any) => { })
+    // this.router.data.subscribe((_data: any) => { })
+    this.rootOrgId = _.get(this.router.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
   }
 
   ngOnInit() {
@@ -32,11 +35,11 @@ export class BulkUploadComponent implements OnInit, OnDestroy {
   }
 
   getBulkStatusList(): void {
-    this.fileService.getBulkApprovalUploadDataV1()
+    this.fileService.getBulkUploadDataV1(this.rootOrgId)
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
         this.lastUploadList = res.result.content
-      },         (error: HttpErrorResponse) => {
+      }, (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open('Unable to get Bulk status list')
         }
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index 38cf298bd..90c6b6463 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -1,122 +1 @@
-<div class="flex flex-4 flex-column main-flex-box">
-  <mat-card class="no-border">
-    <!-- <mat-card-header class="flex-custom-m">
-      <div class="flex-1" role="link" tabindex="0">
-        <div class="flex flex-1">
-          <mat-card-title class="flex-4 mobile-margin text-capitalize">
-            <span class="h-600-s-20-m color-87">Users</span>
-          </mat-card-title>
-        </div>
-      </div>
-    </mat-card-header> -->
-    <mat-card-title class="flex-4 mobile-margin text-capitalize margin-bottom-l">
-      <span class="h-600-s-20-m color-87">Users</span>
-    </mat-card-title>
-    <mat-card class="mb-8">
-      <mat-card-content class="flex gap-10">
-        <div class="section-1">
-          <div class="flex-4 mobile-margin text-capitalize mat-h2">Note:</div>
-          <ng-container *ngFor="let note of reportsNoteList">
-            <div class="flex gap-4 mb-4">
-              <div>
-                <mat-icon class="infoIcon">error_outline</mat-icon>
-              </div>
-              <div [innerHTML]="sanitizeHtml(note)"></div>
-            </div>
-          </ng-container>
-        </div>
-        <div class="reportsDemo flex justify-end section-2">
-          <div class="reportsDemoVideo flex flex-column flex-middle justify-center margin-top-m"
-            (click)="openVideoPopup()">
-            <mat-icon class="video_icon mb-2">play_circle</mat-icon>
-            <div>
-              Watch how it works
-            </div>
-          </div>
-        </div>
-      </mat-card-content>
-    </mat-card>
-    <mat-card-content>
-      <div class="flex flex-1 flex-column margin-fix">
-        <div class="flex flex-1 filter max-height-60">
-          <!-- <a routerLink="/app/home/users/active" routerLinkActive="router-link-active" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'active',
-              'ws-mat-accent-border font-medium':currentFilter !== 'active'}" mat-button
-            (click)="filter('active'); tabTelemetry('active', 0)" role="button">Registered</a>
-          <a routerLink="/app/home/users/inactive" routerLinkActive="router-link-active" class="filter-option"
-            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'inactive',
-                          'ws-mat-accent-border font-medium':currentFilter !== 'inactive'}" mat-button
-            (click)="filter('inactive'); tabTelemetry('inactive', 1)" role="button">Inactive</a>
-          <a routerLink="/app/home/users/upload" routerLinkActive="router-link-active" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'upload',
-                                      'ws-mat-accent-border font-medium':currentFilter !== 'upload'}" mat-button
-            (click)="filter('upload'); tabTelemetry('upload', 2)" role="button">File uploads</a> -->
-
-          <a routerLink="/app/home/users/allusers" routerLinkActive="router-link-active" class="filter-option"
-            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'allusers','ws-mat-accent-border font-medium':currentFilter !== 'allusers'}"
-            mat-button (click)="filter('allusers'); tabTelemetry('allusers', 0)" role="button">All users
-            ({{activeUsersDataCount}})</a>
-
-          <a routerLink="/app/home/users/verified" routerLinkActive="router-link-active" class="filter-option"
-            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'verified','ws-mat-accent-border font-medium':currentFilter !== 'verified'}"
-            mat-button (click)="filter('verified'); tabTelemetry('verified', 0)" role="button">Verified
-            ({{verifiedUsersDataCount}})</a>
-
-          <a routerLink="/app/home/users/nonverified" routerLinkActive="router-link-active" class="filter-option"
-            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'nonverified','ws-mat-accent-border font-medium':currentFilter !== 'nonverified'}"
-            mat-button (click)="filter('nonverified'); tabTelemetry('nonverified', 0)" role="button">Non-verified
-            ({{nonverifiedUsersDataCount}})</a>
-
-          <a routerLink="/app/home/users/notmyuser" routerLinkActive="router-link-active" class="filter-option"
-            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'notmyuser','ws-mat-accent-border font-medium':currentFilter !== 'notmyuser'}"
-            mat-button (click)="filter('notmyuser'); tabTelemetry('notmyuser', 0)" role="button">Not my user
-            ({{notmyuserUsersDataCount}})</a>
-        </div>
-      </div>
-      <!-- <ws-widget-org-user-table-v2 [userId]="currentUser" [tableData]="tabledata" [data]="dataForTable"
-                [isUpload]=false [isCreate]=true (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuActions($event)"
-                (searchByEnterKey)="onEnterkySearch($event)" (pageChangeClick)="onPaginateChange($event)"
-                [showEditOnCondition]=true [totalRecords]="userDataTotalCount" [tabChangeIndex]="pageIndex">
-              </ws-widget-org-user-table-v2> -->
-
-      <ng-container *ngIf="usersData && currentFilter === 'allusers'">
-        <div *ngIf="usersData?.count > 0">
-          <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
-            [totalRecords]="activeUsersDataCount" [tabChangeIndex]="pageIndex" [isApprovals]="false"
-            (searchByEnterKey)="onEnterkySearch($event)"
-            (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
-        </div>
-        <p class="text-center" *ngIf="usersData?.count === 0">No users found</p>
-      </ng-container>
-      <ng-container *ngIf="usersData && currentFilter === 'verified'">
-        <div *ngIf="usersData?.count > 0">
-          <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
-            [totalRecords]="verifiedUsersDataCount" [tabChangeIndex]="pageIndex"
-            (searchByEnterKey)="onEnterkySearch($event)"
-            (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
-        </div>
-        <p class="text-center" *ngIf="usersData?.count === 0">No users found</p>
-      </ng-container>
-      <ng-container *ngIf="usersData && currentFilter === 'nonverified'">
-        <div *ngIf="usersData?.count > 0">
-          <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
-            [totalRecords]="nonverifiedUsersDataCount" [tabChangeIndex]="pageIndex"
-            (searchByEnterKey)="onEnterkySearch($event)"
-            (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
-        </div>
-        <p class="text-center" *ngIf="usersData?.count === 0">No users found</p>
-      </ng-container>
-      <ng-container *ngIf="usersData && currentFilter === 'notmyuser'">
-        <div *ngIf="usersData?.count > 0">
-          <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
-            [totalRecords]="notmyuserUsersDataCount" [tabChangeIndex]="pageIndex"
-            (searchByEnterKey)="onEnterkySearch($event)"
-            (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
-        </div>
-        <p class="text-center" *ngIf="usersData?.count === 0">No users found</p>
-      </ng-container>
-
-      <ng-container *ngIf="currentFilter === 'upload'">
-        <ws-app-users-upload></ws-app-users-upload>
-      </ng-container>
-    </mat-card-content>
-  </mat-card>
-</div>
\ No newline at end of file
+<router-outlet></router-outlet>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 2167ec0b2..f71bbf695 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -1,301 +1,17 @@
 import { Component, OnDestroy, OnInit } from '@angular/core'
-import { NSProfileDataV2 } from '../../models/profile-v2.model'
-import { MatDialog } from '@angular/material/dialog'
-import { ActivatedRoute, Router } from '@angular/router'
-import { UsersService } from '../../../users/services/users.service'
-/* tslint:disable */
-import _ from 'lodash'
-/* tslint:enable */
-// import { environment } from 'src/environments/environment'
-import { PageEvent } from '@angular/material'
-import { EventService } from '@sunbird-cb/utils'
-import { NsContent } from '@sunbird-cb/collection'
-import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
-import { LoaderService } from '../../../../../../../../../src/app/services/loader.service'
-import { ProfileV2UtillService } from '../../services/home-utill.service'
-import { DomSanitizer, SafeHtml } from '@angular/platform-browser'
-import { ReportsVideoComponent } from '../reports-video/reports-video.component'
-
-// import * as XLSX from 'xlsx'
 
 @Component({
   selector: 'ws-app-users-view',
   templateUrl: './users-view.component.html',
   styleUrls: ['./users-view.component.scss'],
-  providers: [LoaderService],
   /* tslint:disable */
   host: { class: 'flex flex-1 margin-top-l' },
   /* tslint:enable */
 })
 export class UsersViewComponent implements OnInit, OnDestroy {
-  /* tslint:disable */
-  Math: any
-  /* tslint:enable */
-  currentFilter = 'allusers'
-  filterPath = '/app/home/users'
-  discussionList!: any
-  discussProfileData!: any
-  portalProfile!: NSProfileDataV2.IProfile
-  userDetails: any
-  location!: string | null
-  tabs: any
-  // tabsData: NSProfileDataV2.IProfileTab[]
-  currentUser!: any
-  connectionRequests!: any[]
-  data: any = []
-  usersData!: any
-  configSvc: any
-  activeUsersData!: any[]
-  verifiedUsersData!: any[]
-  nonverifiedUsersData!: any[]
-  notmyuserUsersData!: any[]
-
-  activeUsersDataCount?: number | 0
-  verifiedUsersDataCount?: number | 0
-  nonverifiedUsersDataCount?: number | 0
-  notmyuserUsersDataCount?: number | 0
-  content: NsContent.IContent = {} as NsContent.IContent
-  isMdoAdmin = false
-
-  reportsNoteList: string[] = []
-
-  currentOffset = 0
-  limit = 20
-  pageIndex = 0
-  searchQuery = ''
-  rootOrgId: any
-  constructor(
-    public dialog: MatDialog,
-    private route: ActivatedRoute,
-    private router: Router,
-    // private snackBar: MatSnackBar,
-    private events: EventService,
-    private loaderService: LoaderService,
-    private profileUtilSvc: ProfileV2UtillService,
-    private sanitizer: DomSanitizer,
-    // private telemetrySvc: TelemetryService,
-    // private configSvc: ConfigurationsService,
-    // private discussService: DiscussService,
-    // private configSvc: ConfigurationsService,
-    // private networkV2Service: NetworkV2Service,
-    // private profileV2Svc: ProfileV2Service
-    private usersService: UsersService
-  ) {
-    this.Math = Math
-    this.configSvc = this.route.parent && this.route.parent.snapshot.data.configService
-    this.currentUser = this.configSvc.userProfile && this.configSvc.userProfile.userId
-
-    // this.usersData = _.get(this.route, 'snapshot.data.usersList.data') || {}
-    // this.filterData()
-  }
-
-  ngOnDestroy() {
-    // if (this.tabs) {
-    //   this.tabs.unsubscribe()
-    // }
-  }
-  ngOnInit() {
-    this.rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
-    this.searchQuery = ''
-    if (this.configSvc.unMappedUser && this.configSvc.unMappedUser.roles) {
-      this.isMdoAdmin = this.configSvc.unMappedUser.roles.includes('MDO_ADMIN')
-    }
-    this.filterData('')
-
-    this.getUsers('', 'allusers')
-    this.getUsers('', 'verified')
-    this.getUsers('', 'nonverified')
-    this.getUsers('', 'notmyuser')
-
-    this.reportsNoteList = [
-      `Easily create users individually or in bulk.`,
-      `Edit any user profile within your organization.`,
-      `Verified Users: Users with all their primary fields approved.`,
-      // tslint:disable-next-line: max-line-length
-      `Non-Verified Users: Users whose one or more primary fields are yet to be approved. You can help by reviewing and approving their requests.`,
-      `Not My User: Remove a user from your organization with a simple click.`,
-    ]
-  }
-
-  sanitizeHtml(html: string): SafeHtml {
-    return this.sanitizer.bypassSecurityTrustHtml(html)
-  }
-
-  openVideoPopup() {
-    this.dialog.open(ReportsVideoComponent, {
-      data: {
-        videoLink: 'https://www.youtube.com/embed/tgbNymZ7vqY?autoplay=1&mute=1',
-      },
-      disableClose: true,
-      width: '50%',
-      height: '60%',
-      panelClass: 'overflow-visable',
-    })
-  }
-
-  filter(filter: string) {
-    this.currentFilter = filter
-    this.pageIndex = 0
-    this.currentOffset = 0
-    this.limit = 20
-    this.searchQuery = ''
-    this.filterData(this.searchQuery)
-  }
-
-  public tabTelemetry(label: string, index: number) {
-    const data: TelemetryEvents.ITelemetryTabData = {
-      label,
-      index,
-    }
-    this.events.handleTabTelemetry(
-      TelemetryEvents.EnumInteractSubTypes.USER_TAB,
-      data,
-    )
-  }
-
-  get dataForTable() {
-    switch (this.currentFilter) {
-      case 'allusers':
-        return this.activeUsersData
-      case 'verified':
-        return this.verifiedUsersData
-      case 'nonverified':
-        return this.nonverifiedUsersData
-      case 'notmyuser':
-        return this.notmyuserUsersData
-      default:
-        return []
-    }
-  }
-
-  filterData(query: string) {
-    this.getUsers(query, this.currentFilter)
-  }
-
-  showEditUser(roles: any): boolean {
-    if (this.isMdoAdmin) {
-      if (roles && roles.length > 0) {
-        return true
-        //   return (roles.includes('PUBLIC') && roles.length === 1)
-      }
-      // return false
-    }
-    return true
-  }
-
-  blockedUsers() {
-    const blockedUsersData: any[] = []
-    if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
-      _.filter(this.usersData.content, { isDeleted: false }).forEach((user: any) => {
-        blockedUsersData.push({
-          fullname: user ? `${user.firstName}` : null,
-          // fullname: user ? `${user.firstName} ${user.lastName}` : null,
-          email: user.personalDetails && user.personalDetails.primaryEmail ?
-            this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
-          role: user.roles,
-          userId: user.id,
-          active: !user.isDeleted,
-          blocked: user.blocked,
-          roles: _.join(_.map(user.roleInfo, i => `<li>${i}</li>`), ''),
-        })
-      })
-    }
-    return blockedUsersData
-  }
-
-  getUsers(query: string, currentFilter: any) {
-    this.loaderService.changeLoad.next(true)
-    const usersData: any[] = []
-    const status = currentFilter === 'allusers' ? 1 : 1
-    this.usersService.getAllKongUsers(this.rootOrgId, status, this.limit, this.pageIndex, query).subscribe((data: any) => {
-      this.usersData = data.result.response
-      if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
-        _.filter(this.usersData.content, { isDeleted: false }).forEach((user: any) => {
-          // tslint:disable-next-line
-          const org = { roles: _.get(_.first(_.filter(user.organisations, { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') }
-          usersData.push({
-            fullname: user ? `${user.firstName}` : null,
-            // fullname: user ? `${user.firstName} ${user.lastName}` : null,
-            email: user.personalDetails && user.personalDetails.primaryEmail ?
-              this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
-            role: org.roles || [],
-            userId: user.id,
-            active: !user.isDeleted,
-            blocked: user.blocked,
-            roles: _.join(_.map((org.roles || []), i => `<li>${i}</li>`), ''),
-            orgId: user.rootOrgId,
-            orgName: user.rootOrgName,
-            allowEditUser: this.showEditUser(org.roles),
-          })
-        })
-      }
-      if (this.currentFilter === 'allusers') {
-        this.activeUsersData = usersData
-        this.activeUsersDataCount = this.usersData.count
-      } else if (this.currentFilter === 'verified') {
-        this.verifiedUsersData = usersData
-        this.verifiedUsersDataCount = this.usersData.count
-      } else if (this.currentFilter === 'nonverified') {
-        this.notmyuserUsersData = usersData
-        this.nonverifiedUsersDataCount = this.usersData.count
-      } else if (this.currentFilter === 'notmyuser') {
-        this.notmyuserUsersData = usersData
-        this.notmyuserUsersDataCount = this.usersData.count
-      }
-      return usersData
-    })
-  }
-
-  clickHandler(event: any) {
-    switch (event.type) {
-      case 'createUser':
-        this.onCreateClick()
-        break
-      case 'upload':
-        this.onUploadClick()
-        break
-    }
-  }
-
-  onCreateClick() {
-    this.router.navigate([`/app/users/create-user`])
-    this.events.raiseInteractTelemetry(
-      {
-        type: TelemetryEvents.EnumInteractTypes.CLICK,
-        subType: TelemetryEvents.EnumInteractSubTypes.CREATE_BTN,
-        id: 'create-user-btn',
-      },
-      {}
-    )
-  }
-
-  onUploadClick() {
-    this.filter('upload')
-  }
-
-  onRoleClick(user: any) {
-    this.router.navigate([`/app/users/${user.userId}/details`])
-    this.events.raiseInteractTelemetry(
-      {
-        type: TelemetryEvents.EnumInteractTypes.CLICK,
-        subType: TelemetryEvents.EnumInteractSubTypes.CARD_CONTENT,
-        id: TelemetryEvents.EnumIdtype.USER_ROW,
-      },
-      {
-        id: user.userId,
-        type: TelemetryEvents.EnumIdtype.USER,
-      }
-    )
-  }
+  constructor() { }
 
-  onEnterkySearch(enterValue: any) {
-    this.searchQuery = enterValue
-    this.filterData(this.searchQuery)
-  }
+  ngOnInit() { }
 
-  onPaginateChange(event: PageEvent) {
-    this.pageIndex = event.pageIndex
-    this.limit = event.pageSize
-    this.filterData(this.searchQuery)
-  }
+  ngOnDestroy() { }
 }
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index d56d7cd48..2688fd6df 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -74,6 +74,7 @@ export class HammerConfig extends GestureConfig {
     return new GestureConfig({ touchAction: 'pan-y' }).buildHammer(element)
   }
 }
+
 const appInitializer = (initSvc: InitService, logger: LoggerService) => async () => {
   try {
     await initSvc.init()
@@ -192,4 +193,5 @@ const getBaseHref = (platformLocation: PlatformLocation): string => {
     LoaderService,
   ],
 })
+
 export class AppModule { }

From 12ea9018663df1b343eab84ea9f56ca1d3b32834 Mon Sep 17 00:00:00 2001
From: Haritest <haridasksd@gmail.com>
Date: Thu, 2 May 2024 14:49:46 +0530
Subject: [PATCH 564/887] Update Dockerfile Node version update

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index b533e6b03..a8c08e7aa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:14.15
+FROM node:16
 
 WORKDIR /app
 COPY . .

From 8d980631daebe568afea1595ceae8c36864cdf8e Mon Sep 17 00:00:00 2001
From: Vinod Kumar Shyave <121538586+vShyave@users.noreply.github.com>
Date: Fri, 3 May 2024 09:25:37 +0530
Subject: [PATCH 565/887] Working on Upload CSV file

---
 .../components/search/search.component.html   |  2 +-
 .../ws/app/src/lib/routes/home/home.module.ts |  6 ++
 .../bulk-upload/bulk-upload.component.html    | 14 ++-
 .../bulk-upload/bulk-upload.component.scss    | 34 +++++--
 .../bulk-upload/bulk-upload.component.ts      | 92 ++++++++++++++++++-
 .../file-progress.component.html              |  9 ++
 .../file-progress.component.scss              | 16 ++++
 .../file-progress.component.spec.ts           | 25 +++++
 .../file-progress/file-progress.component.ts  | 19 ++++
 .../routes/users-view/users-view.component.ts |  2 +-
 .../verify-otp/verify-otp.component.html      | 24 +++++
 .../verify-otp/verify-otp.component.scss      | 18 ++++
 .../verify-otp/verify-otp.component.spec.ts   | 25 +++++
 .../verify-otp/verify-otp.component.ts        | 69 ++++++++++++++
 14 files changed, 338 insertions(+), 17 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/home/routes/users-view/file-progress/file-progress.component.html
 create mode 100644 project/ws/app/src/lib/routes/home/routes/users-view/file-progress/file-progress.component.scss
 create mode 100644 project/ws/app/src/lib/routes/home/routes/users-view/file-progress/file-progress.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/home/routes/users-view/file-progress/file-progress.component.ts
 create mode 100644 project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.html
 create mode 100644 project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.scss
 create mode 100644 project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.ts

diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.html b/project/ws/app/src/lib/routes/home/components/search/search.component.html
index c9f6f06c4..dbe6d6f21 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.html
@@ -18,7 +18,7 @@
         </button>
     </div>
     <div class="flex flex-end" *ngIf="!isApprovals">
-        <button mat-button type="button" class="search-btn" (click)="createUser()"
+        <button mat-button type="button" class="search-btn" [routerLink]="['/app/home/users/bulk-upload']"
             [ngClass]="{'disable': isContentLive}">Create user</button>
     </div>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index 8c337500e..abc1de3a1 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -69,6 +69,8 @@ import { ApprovalPendingComponent } from './routes/approvals/approval-pending/ap
 import { RejectionPopupComponent } from './components/rejection-popup/rejection-popup.component'
 import { AllUsersComponent } from './routes/users-view/all-users/all-users.component'
 import { BulkUploadComponent } from './routes/users-view/bulk-upload/bulk-upload.component'
+import { VerifyOtpComponent } from './routes/users-view/verify-otp/verify-otp.component'
+import { FileProgressComponent } from './routes/users-view/file-progress/file-progress.component'
 
 @NgModule({
   declarations: [
@@ -104,6 +106,8 @@ import { BulkUploadComponent } from './routes/users-view/bulk-upload/bulk-upload
     BulkUploadComponent,
     RejectionPopupComponent,
     AllUsersComponent,
+    VerifyOtpComponent,
+    FileProgressComponent,
   ],
   imports: [
     CommonModule,
@@ -170,6 +174,8 @@ import { BulkUploadComponent } from './routes/users-view/bulk-upload/bulk-upload
     SearchComponent,
     FilterComponent,
     RejectionPopupComponent,
+    VerifyOtpComponent,
+    FileProgressComponent,
   ],
   providers: [
     InitResolver,
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
index 80c9c7dfc..300cfc0e0 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
@@ -18,16 +18,22 @@
             </ol>
           </div>
           <div class="flex flex-row gap-6">
-            <button class="outline-button">Download Sample File</button>
+            <button class="outline-button" (click)="handleDownloadSampleFile()">Download Sample File</button>
             <button class="outline-button">Supporting Document</button>
           </div>
         </div>
       </div>
       <div class="flex-1">
-        <div class="flex flex-col gap-4 dashed-card items-center">
-          <div class="img-div"></div>
+        <div class="flex flex-col gap-2 dashed-card items-center">
+          <div class="flex cursor-pointer" (click)="fileInput.click()" (dblclick)="$event.preventDefault()">
+            <img src="/assets/icons/csv-file.svg" alt="CSV file logo" />
+          </div>
           <div class="flex flex-col items-center">
-            <div class="text-primary cursor-pointer">Browse files</div>
+            <div class="text-primary cursor-pointer" (click)="fileInput.click()" (dblclick)="$event.preventDefault()">
+              Browse files</div>
+            <input hidden type="file" #fileInput (click)="handleFileClick($event)" (change)="handleOnFileChange($event)"
+              name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();"
+              accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel, .xlsx, .xls" />
             <div class="flex">or</div>
             <div class="flex">Drag file to upload</div>
           </div>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.scss b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.scss
index d6ddac725..ee7bcfa3e 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.scss
@@ -1,5 +1,4 @@
 @import 'ws-common';
-// $border-color:
 
 .bulk-container, .file-container {
   box-shadow: 0px 1px 5px 0px #0000001F, 0px 2px 2px 0px #00000024, 0px 3px 1px -2px #00000033;
@@ -33,15 +32,34 @@
     padding-left: 12px;
   }
 
-  .img-div {
-    width: 80px;
-    height: 80px;
-    border: 1px dashed $border-color;
-    border-radius: 4px;
-  }
-
   .text-primary {
     color: $color-blue;
     font-weight: bold;
   }
 }
+
+::ng-deep .common-modal {
+  width: 420px;
+  padding: 0px;
+
+  .mat-dialog-container {
+    border-radius: 12px;
+    background-color: #EEE !important;
+  }
+}
+
+::ng-deep .progress-modal {
+  width: 920px;
+  height: 420px;
+
+  .mat-dialog-container {
+    border-radius: 4px;
+    background-color: #FFF !important;
+  }
+}
+
+@media screen and (max-width: 641px) {
+  ::ng-deep .common-modal, ::ng-deep .progress-modal {
+    max-width: 90vw !important;
+  }
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts
index 0a3b5a54e..bbf78eddf 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit, Input, OnDestroy } from '@angular/core'
-import { MatSnackBar, PageEvent } from '@angular/material'
+import { MatSnackBar, PageEvent, MatDialog } from '@angular/material'
 import { HttpErrorResponse } from '@angular/common/http'
 import { ActivatedRoute } from '@angular/router'
 // tslint:disable-next-line
@@ -8,6 +8,9 @@ import { Subject } from 'rxjs'
 import { takeUntil } from 'rxjs/operators'
 
 import { FileService } from '../../../../users/services/upload.service'
+import { UsersService } from '../../../../users/services/users.service'
+import { VerifyOtpComponent } from '../verify-otp/verify-otp.component'
+import { FileProgressComponent } from '../file-progress/file-progress.component'
 
 @Component({
   selector: 'ws-bulk-upload',
@@ -19,19 +22,36 @@ export class BulkUploadComponent implements OnInit, OnDestroy {
   lastUploadList: any[] = []
   private destroySubject$ = new Subject()
   @Input() totalRecords = 100
+  downloadSampleFilePath = ''
+  downloadAsFileName = ''
   rootOrgId: any
   pageSize = 20
+  showFileError = false
+  public fileName: any
+  fileSelected!: any
+  userProfile: any
+
   constructor(
     private fileService: FileService,
     private matSnackBar: MatSnackBar,
-    private router: ActivatedRoute
+    private router: ActivatedRoute,
+    public dialog: MatDialog,
+    private usersService: UsersService
   ) {
     // this.router.data.subscribe((_data: any) => { })
     this.rootOrgId = _.get(this.router.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
+    this.userProfile = _.get(this.router.snapshot.parent, 'data.configService.userProfileV2')
+    this.router.data.subscribe(data => {
+      if (data && data.pageData) {
+        this.downloadSampleFilePath = data.pageData.data.downloadSampleFilePath
+        this.downloadAsFileName = data.pageData.data.downloadAsFileName
+      }
+    })
   }
 
   ngOnInit() {
     this.getBulkStatusList()
+    this.showFileUploadProgress()
   }
 
   getBulkStatusList(): void {
@@ -39,19 +59,85 @@ export class BulkUploadComponent implements OnInit, OnDestroy {
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
         this.lastUploadList = res.result.content
-      }, (error: HttpErrorResponse) => {
+      },         (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open('Unable to get Bulk status list')
         }
       })
   }
 
+  showFileUploadProgress(): void {
+    this.dialog.open(FileProgressComponent, {
+      data: {},
+      disableClose: true,
+      panelClass: 'progress-modal',
+    })
+  }
+
   handleDownloadFile(listObj: any): void {
     const filePath = `/apis/proxies/v8/workflow/admin/bulkuploadfile/download/${listObj.filename}`
     window.open(filePath, '_blank')
   }
 
+  handleDownloadSampleFile(): void {
+    this.fileService.download(this.downloadSampleFilePath, this.downloadAsFileName)
+  }
+
+  handleFileClick(event: any): void {
+    event.target.value = ''
+  }
+
+  sendOTP(): void {
+    this.generateAndVerifyOTP(this.userProfile.mobile ? 'phone' : 'email')
+  }
+
+  generateAndVerifyOTP(contactType: string, resendFlag?: string): void {
+    this.usersService.sendOtp(this.userProfile.mobile, contactType)
+      .pipe(takeUntil(this.destroySubject$))
+      .subscribe((_res: any) => {
+        this.matSnackBar.open(`An OTP has been sent to your ${contactType === 'phone' ? 'Mobile number'
+          : 'Email address'}, (Valid for 15 min's)`)
+        if (resendFlag) {
+          this.verifyOTP(contactType)
+        }
+      },         (error: HttpErrorResponse) => {
+        if (!error.ok) {
+          this.matSnackBar.open(_.get(error, 'error.params.errmsg') || `Unable to send OTP to your ${contactType}, please try again later!`)
+        }
+      })
+  }
+
+  handleOnFileChange(event: any): void {
+    this.showFileError = false
+    const fileList = (<HTMLInputElement>event.target).files
+    if (fileList && fileList.length > 0) {
+      const file: File = fileList[0]
+      this.fileName = file.name
+      this.fileSelected = file
+      this.sendOTP()
+    }
+  }
+
+  verifyOTP(contactType: string): void {
+    const dialogRef = this.dialog.open(VerifyOtpComponent, {
+      data: { type: contactType },
+      disableClose: true,
+      panelClass: 'common-modal',
+    })
+
+    dialogRef.componentInstance.resendOTP.subscribe((data: any) => {
+      this.generateAndVerifyOTP(data.type, 'resend')
+    })
+
+    dialogRef.afterClosed().subscribe(res => {
+      if (res) {
+        this.showFileUploadProgress()
+      }
+    })
+  }
+
   handleChangePage(_event: PageEvent): void {
+
   }
 
   ngOnDestroy(): void {
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/file-progress/file-progress.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/file-progress/file-progress.component.html
new file mode 100644
index 000000000..916ac4ffd
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/file-progress/file-progress.component.html
@@ -0,0 +1,9 @@
+<div class="flex items-center">
+  <div class="flex flex-col w-48 gap-4 items-center justify-center">
+    <img src="/assets/icons/csv-file.svg" alt="CSV file logo" />
+    <div class="flex flex-col gap-2 w-full items-center">
+      <mat-progress-bar class="file-progress" mode="determinate" value="40"></mat-progress-bar>
+      <div class="font-semibold">File uploading...</div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/file-progress/file-progress.component.scss b/project/ws/app/src/lib/routes/home/routes/users-view/file-progress/file-progress.component.scss
new file mode 100644
index 000000000..a49257928
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/file-progress/file-progress.component.scss
@@ -0,0 +1,16 @@
+@import 'ws-common';
+
+::ng-deep .file-progress {
+  height: 8px;
+  border-radius: 8px;
+
+  .mat-progress-bar-primary {
+    &::after {
+      background-color: $color-green !important;
+    }
+  }
+
+  .mat-progress-bar-buffer {
+    background: #CCC !important;
+  }
+}
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/file-progress/file-progress.component.spec.ts b/project/ws/app/src/lib/routes/home/routes/users-view/file-progress/file-progress.component.spec.ts
new file mode 100644
index 000000000..9039f2984
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/file-progress/file-progress.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
+
+import { FileProgressComponent } from './file-progress.component'
+
+describe('FileProgressComponent', () => {
+  let component: FileProgressComponent
+  let fixture: ComponentFixture<FileProgressComponent>
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [FileProgressComponent],
+    })
+    .compileComponents()
+  }))
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(FileProgressComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
+
+  it('should create', () => {
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/file-progress/file-progress.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/file-progress/file-progress.component.ts
new file mode 100644
index 000000000..dfe48f8f0
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/file-progress/file-progress.component.ts
@@ -0,0 +1,19 @@
+import { Component, OnInit } from '@angular/core'
+
+@Component({
+  selector: 'ws-file-progress',
+  templateUrl: './file-progress.component.html',
+  styleUrls: ['./file-progress.component.scss'],
+  /* tslint:disable */
+  host: { class: 'flex h-full justify-center' },
+  /* tslint:enable */
+
+})
+export class FileProgressComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index f71bbf695..d4c43fcaa 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -5,7 +5,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core'
   templateUrl: './users-view.component.html',
   styleUrls: ['./users-view.component.scss'],
   /* tslint:disable */
-  host: { class: 'flex flex-1 margin-top-l' },
+  host: { class: 'flex flex-col' },
   /* tslint:enable */
 })
 export class UsersViewComponent implements OnInit, OnDestroy {
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.html
new file mode 100644
index 000000000..c76792cad
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.html
@@ -0,0 +1,24 @@
+<div class="verify-otp-dialog">
+  <div class="flex flex-col gap-4">
+    <div class="text-base font-semibold text-center mb-4">
+      Enter the OTP sent to your {{ data.type === 'phone' ? 'mobile number' : 'email address' }}
+    </div>
+    <div class="flex flex-col gap-1">
+      <div class="text-sm font-bold">Enter OTP</div>
+      <input type="text" class="input-text" placeholder="Enter the OTP" maxlength="6" [(ngModel)]="otpEntered" />
+    </div>
+    <div class="flex flex-row gap-2 items-center justify-center timer-div" *ngIf="!showResendOTP">
+      <div class="flex flex-row gap-1 time-remaining text-sm ">
+        Time remaining to resend OTP: <div #timerDiv></div>
+      </div>
+    </div>
+    <div class="flex justify-end" *ngIf="showResendOTP">
+      <div class="resend-otp" (click)="handleResendOTP()">Resend OTP</div>
+    </div>
+
+    <div class="flex flex-row justify-between">
+      <button class="outline-button" (click)="handleCloseModal()">Cancel</button>
+      <button class="action-button" (click)="handleVerifyOTP()">Submit</button>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.scss b/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.scss
new file mode 100644
index 000000000..84245f08b
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.scss
@@ -0,0 +1,18 @@
+@import 'ws-common';
+
+.verify-otp-dialog {
+  .timer-div {
+    margin-bottom: 16px;
+
+    .time-remaining {
+      color: rgba($color: #000, $alpha: 0.6);
+    }
+  }
+
+  .resend-otp {
+    color: $color-blue;
+    font-weight: 700;
+    cursor: pointer;
+    margin-bottom: 16px;
+  }
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.spec.ts b/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.spec.ts
new file mode 100644
index 000000000..240807f6a
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
+
+import { VerifyOtpComponent } from './verify-otp.component'
+
+describe('VerifyOtpComponent', () => {
+  let component: VerifyOtpComponent
+  let fixture: ComponentFixture<VerifyOtpComponent>
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [VerifyOtpComponent],
+    })
+    .compileComponents()
+  }))
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(VerifyOtpComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
+
+  it('should create', () => {
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.ts
new file mode 100644
index 000000000..83ddca286
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.ts
@@ -0,0 +1,69 @@
+import { Component, OnInit, Inject, OnDestroy, ViewChild, Output, EventEmitter } from '@angular/core'
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'
+// import { HttpErrorResponse } from '@angular/common/http'
+import { MatSnackBar } from '@angular/material'
+
+import { Subject } from 'rxjs'
+// import { takeUntil } from 'rxjs/operators'
+/* tslint:disable */
+import * as _ from 'lodash'
+
+
+@Component({
+  selector: 'ws-verify-otp',
+  templateUrl: './verify-otp.component.html',
+  styleUrls: ['./verify-otp.component.scss']
+})
+export class VerifyOtpComponent implements OnInit {
+
+  private destroySubject$ = new Subject()
+  @ViewChild('timerDiv', { static: false }) timerDiv !: any
+  @Output() resendOTP = new EventEmitter<string>()
+  @Output() otpVerified = new EventEmitter<any>()
+  timeLeft = 150
+  interval: any
+  showResendOTP = false
+  otpEntered = ''
+
+  constructor(
+    public dialogRef: MatDialogRef<VerifyOtpComponent>,
+    @Inject(MAT_DIALOG_DATA) public data: any,
+    private matSnackbar: MatSnackBar,
+  ) { }
+
+  ngOnInit() {
+    this.startTimer()
+  }
+
+  startTimer() {
+    this.interval = setInterval(() => {
+      if (this.timeLeft > 0) {
+        this.timeLeft = this.timeLeft - 1
+        this.timerDiv.nativeElement.innerHTML = `${Math.floor(this.timeLeft / 60)}m: ${this.timeLeft % 60}s`
+      } else {
+        clearInterval(this.interval)
+        this.showResendOTP = true
+      }
+    }, 1000)
+  }
+
+  handleCloseModal(): void {
+    this.dialogRef.close(true)
+  }
+
+  handleResendOTP(): void {
+    this.timeLeft = 150
+    this.showResendOTP = !this.resendOTP
+    this.startTimer()
+    this.resendOTP.emit(this.data.type)
+  }
+
+  handleVerifyOTP(): void {
+
+  }
+
+  ngOnDestroy(): void {
+    clearInterval(this.interval)
+    this.destroySubject$.unsubscribe()
+  }
+}

From 15e84d56eb21ada815c9a0f13ae2f0160ed510cf Mon Sep 17 00:00:00 2001
From: Vinod Kumar Shyave <121538586+vShyave@users.noreply.github.com>
Date: Fri, 3 May 2024 09:29:11 +0530
Subject: [PATCH 566/887] fixed lint errors

---
 .../home/routes/users-view/verify-otp/verify-otp.component.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.ts
index 83ddca286..5fd1bf861 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.ts
@@ -14,7 +14,7 @@ import * as _ from 'lodash'
   templateUrl: './verify-otp.component.html',
   styleUrls: ['./verify-otp.component.scss']
 })
-export class VerifyOtpComponent implements OnInit {
+export class VerifyOtpComponent implements OnInit, OnDestroy {
 
   private destroySubject$ = new Subject()
   @ViewChild('timerDiv', { static: false }) timerDiv !: any
@@ -59,7 +59,7 @@ export class VerifyOtpComponent implements OnInit {
   }
 
   handleVerifyOTP(): void {
-
+    this.matSnackbar.open("Working on handle Verify OTP")
   }
 
   ngOnDestroy(): void {

From 942adb166422ce13a93a8e2a081f7ca5fe483255 Mon Sep 17 00:00:00 2001
From: Vinod Kumar Shyave <121538586+vShyave@users.noreply.github.com>
Date: Fri, 3 May 2024 15:59:59 +0530
Subject: [PATCH 567/887] OTP verification, upload file integration is done

---
 .../bulk-upload/bulk-upload.component.html    | 108 +++++++++---------
 .../bulk-upload/bulk-upload.component.scss    |   6 +
 .../bulk-upload/bulk-upload.component.ts      |  76 ++++++++----
 .../verify-otp/verify-otp.component.ts        |  46 ++++++--
 .../lib/routes/users/services/otp.service.ts  |   2 +-
 .../routes/users/services/upload.service.ts   |  17 ---
 6 files changed, 153 insertions(+), 102 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
index 300cfc0e0..8a1063c87 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
@@ -1,6 +1,6 @@
 <div class="flex flex-col gap-6">
   <div class="flex flex-row gap-4 items-center">
-    <mat-icon>arrow_back</mat-icon>
+    <mat-icon class="cursor-pointer" [routerLink]="['/app/home/users/all-users']">arrow_back</mat-icon>
     <div class="flex font-bold">Bulk Profile Update</div>
   </div>
 
@@ -19,7 +19,6 @@
           </div>
           <div class="flex flex-row gap-6">
             <button class="outline-button" (click)="handleDownloadSampleFile()">Download Sample File</button>
-            <button class="outline-button">Supporting Document</button>
           </div>
         </div>
       </div>
@@ -28,14 +27,15 @@
           <div class="flex cursor-pointer" (click)="fileInput.click()" (dblclick)="$event.preventDefault()">
             <img src="/assets/icons/csv-file.svg" alt="CSV file logo" />
           </div>
+          <div *ngIf="showFileError" class="error-msg">Upload CSV format file only</div>
           <div class="flex flex-col items-center">
             <div class="text-primary cursor-pointer" (click)="fileInput.click()" (dblclick)="$event.preventDefault()">
               Browse files</div>
             <input hidden type="file" #fileInput (click)="handleFileClick($event)" (change)="handleOnFileChange($event)"
               name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();"
               accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel, .xlsx, .xls" />
-            <div class="flex">or</div>
-            <div class="flex">Drag file to upload</div>
+            <!-- <div class="flex">or</div>
+            <div class="flex">Drag file to upload</div> -->
           </div>
           <div class="flex flex-col items-center">
             <div class="flex">Max file size: 100 MB</div>
@@ -46,64 +46,60 @@
     </div>
   </div>
 
-  <mat-tab-group>
-    <mat-tab label="Recent upload">
-      Recent upload
-    </mat-tab>
-    <mat-tab label="Last uploads">
-      <div class="file-container mt-6" *ngFor="let list of lastUploadList">
-        <div class="flex flex-col gap-4">
-          <div class="flex flex-row justify-between items-center">
-            <div class="flex flex-row gap-1">
-              <div class="font-bold">File Information</div>
-              <mat-icon class="ws-mat-black40-text">info_outline</mat-icon>
-            </div>
-            <div class="flex flex-row gap-2 outline-button items-center" (click)="handleDownloadFile(list)">
-              <mat-icon>download_2</mat-icon>
-              Download error log
-            </div>
+  <div class="text-base font-bold">File logs</div>
+  <div class="flex flex-col gap-6">
+    <div class="file-container" *ngFor="let list of lastUploadList | slice:startIndex:lastIndex">
+      <div class="flex flex-col gap-4">
+        <div class="flex flex-row justify-between items-center">
+          <div class="flex flex-row gap-1">
+            <div class="font-bold">File Information</div>
+            <mat-icon class="ws-mat-black40-text">info_outline</mat-icon>
           </div>
-          <div class="grid grid-flow-row sm:grid-flow-col gap-10 grid-col grid-container-25">
-            <div class="flex flex-col">
-              <div class="label">Name</div>
-              <div class="value">{{ list?.fileName }}</div>
-            </div>
-            <div class="flex flex-col">
-              <div class="label">Status</div>
-              <div class="value">{{ list?.status }}</div>
-            </div>
-            <div class="flex flex-col">
-              <div class="label">Failed Records</div>
-              <div class="value">{{ list?.failedRecordsCount }}</div>
-            </div>
-            <div class="flex flex-col">
-              <div class="label">Success Records</div>
-              <div class="value">{{ list?.successfulRecordsCount }}</div>
-            </div>
+          <div class="flex flex-row gap-2 outline-button items-center" (click)="handleDownloadFile(list)">
+            <mat-icon>download_2</mat-icon>
+            Download error log
           </div>
-          <div class="grid grid-flow-row sm:grid-flow-col gap-10 grid-col grid-container-25">
-            <div class="flex flex-col">
-              <div class="label">Total Records</div>
-              <div class="value">{{ list?.totalRecords }}</div>
-            </div>
-            <div class="flex flex-col">
-              <div class="label">Initiated On</div>
-              <div class="value">{{ list?.dateCreatedOn | date: 'dd MMM yyyy h:mm a' }}</div>
-            </div>
-            <div class="flex flex-col">
-              <div class="label">Completed ON</div>
-              <div class="value">{{ list?.dateUpdatedOn | date: 'dd MMM yyyy h:mm a' }}</div>
-            </div>
+        </div>
+        <div class="grid grid-flow-row sm:grid-flow-col gap-10 grid-col grid-container-25">
+          <div class="flex flex-col">
+            <div class="label">Name</div>
+            <div class="value">{{ list?.fileName }}</div>
+          </div>
+          <div class="flex flex-col">
+            <div class="label">Status</div>
+            <div class="value">{{ list?.status }}</div>
+          </div>
+          <div class="flex flex-col">
+            <div class="label">Failed Records</div>
+            <div class="value">{{ list?.failedRecordsCount }}</div>
+          </div>
+          <div class="flex flex-col">
+            <div class="label">Success Records</div>
+            <div class="value">{{ list?.successfulRecordsCount }}</div>
+          </div>
+        </div>
+        <div class="grid grid-flow-row sm:grid-flow-col gap-10 grid-col grid-container-25">
+          <div class="flex flex-col">
+            <div class="label">Total Records</div>
+            <div class="value">{{ list?.totalRecords }}</div>
+          </div>
+          <div class="flex flex-col">
+            <div class="label">Initiated On</div>
+            <div class="value">{{ list?.dateCreatedOn | date: 'dd MMM yyyy h:mm a' }}</div>
+          </div>
+          <div class="flex flex-col">
+            <div class="label">Completed ON</div>
+            <div class="value">{{ list?.dateUpdatedOn | date: 'dd MMM yyyy h:mm a' }}</div>
           </div>
         </div>
       </div>
+    </div>
+  </div>
 
-      <div class="flex flex-row justify-end mt-4">
-        <mat-paginator [pageSize]="pageSize" [length]="totalRecords" [pageSizeOptions]="[10, 25, 50]"
-          (page)="handleChangePage($event)"></mat-paginator>
-      </div>
-    </mat-tab>
-  </mat-tab-group>
+  <div class="flex flex-row justify-end mt-4">
+    <mat-paginator [pageSize]="pageSize" [length]="lastUploadList.length" [pageSizeOptions]="sizeOptions"
+      (page)="handleChangePage($event)"></mat-paginator>
+  </div>
 
 
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.scss b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.scss
index ee7bcfa3e..71148d579 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.scss
@@ -38,6 +38,12 @@
   }
 }
 
+.error-msg {
+  color: $color-red;
+  font-weight: 600;
+  font-size: 14px;
+}
+
 ::ng-deep .common-modal {
   width: 420px;
   padding: 0px;
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts
index bbf78eddf..86db6be6f 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, Input, OnDestroy } from '@angular/core'
+import { Component, OnInit, OnDestroy, AfterViewInit } from '@angular/core'
 import { MatSnackBar, PageEvent, MatDialog } from '@angular/material'
 import { HttpErrorResponse } from '@angular/common/http'
 import { ActivatedRoute } from '@angular/router'
@@ -17,19 +17,24 @@ import { FileProgressComponent } from '../file-progress/file-progress.component'
   templateUrl: './bulk-upload.component.html',
   styleUrls: ['./bulk-upload.component.scss'],
 })
-export class BulkUploadComponent implements OnInit, OnDestroy {
+export class BulkUploadComponent implements OnInit, AfterViewInit, OnDestroy {
 
   lastUploadList: any[] = []
   private destroySubject$ = new Subject()
-  @Input() totalRecords = 100
   downloadSampleFilePath = ''
   downloadAsFileName = ''
   rootOrgId: any
-  pageSize = 20
+
   showFileError = false
   public fileName: any
   fileSelected!: any
   userProfile: any
+  fileUploadDialogInstance: any
+
+  sizeOptions = [10, 20]
+  startIndex = 0
+  lastIndex: any
+  pageSize = 10
 
   constructor(
     private fileService: FileService,
@@ -38,9 +43,9 @@ export class BulkUploadComponent implements OnInit, OnDestroy {
     public dialog: MatDialog,
     private usersService: UsersService
   ) {
-    // this.router.data.subscribe((_data: any) => { })
     this.rootOrgId = _.get(this.router.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
     this.userProfile = _.get(this.router.snapshot.parent, 'data.configService.userProfileV2')
+
     this.router.data.subscribe(data => {
       if (data && data.pageData) {
         this.downloadSampleFilePath = data.pageData.data.downloadSampleFilePath
@@ -51,7 +56,10 @@ export class BulkUploadComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     this.getBulkStatusList()
-    this.showFileUploadProgress()
+  }
+
+  ngAfterViewInit(): void {
+    this.lastIndex = this.sizeOptions[0]
   }
 
   getBulkStatusList(): void {
@@ -59,7 +67,7 @@ export class BulkUploadComponent implements OnInit, OnDestroy {
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
         this.lastUploadList = res.result.content
-      },         (error: HttpErrorResponse) => {
+      }, (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open('Unable to get Bulk status list')
         }
@@ -67,7 +75,7 @@ export class BulkUploadComponent implements OnInit, OnDestroy {
   }
 
   showFileUploadProgress(): void {
-    this.dialog.open(FileProgressComponent, {
+    this.fileUploadDialogInstance = this.dialog.open(FileProgressComponent, {
       data: {},
       disableClose: true,
       panelClass: 'progress-modal',
@@ -75,7 +83,7 @@ export class BulkUploadComponent implements OnInit, OnDestroy {
   }
 
   handleDownloadFile(listObj: any): void {
-    const filePath = `/apis/proxies/v8/workflow/admin/bulkuploadfile/download/${listObj.filename}`
+    const filePath = `/apis/proxies/v8/workflow/admin/bulkuploadfile/download/${listObj.fileName}`
     window.open(filePath, '_blank')
   }
 
@@ -88,19 +96,20 @@ export class BulkUploadComponent implements OnInit, OnDestroy {
   }
 
   sendOTP(): void {
-    this.generateAndVerifyOTP(this.userProfile.mobile ? 'phone' : 'email')
+    this.generateAndVerifyOTP(this.userProfile.email ? 'email' : 'phone')
   }
 
   generateAndVerifyOTP(contactType: string, resendFlag?: string): void {
-    this.usersService.sendOtp(this.userProfile.mobile, contactType)
+    const postValue = contactType === 'email' ? this.userProfile.email : this.userProfile.mobile
+    this.usersService.sendOtp(postValue, contactType)
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((_res: any) => {
         this.matSnackBar.open(`An OTP has been sent to your ${contactType === 'phone' ? 'Mobile number'
           : 'Email address'}, (Valid for 15 min's)`)
-        if (resendFlag) {
+        if (!resendFlag) {
           this.verifyOTP(contactType)
         }
-      },         (error: HttpErrorResponse) => {
+      }, (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open(_.get(error, 'error.params.errmsg') || `Unable to send OTP to your ${contactType}, please try again later!`)
         }
@@ -120,24 +129,49 @@ export class BulkUploadComponent implements OnInit, OnDestroy {
 
   verifyOTP(contactType: string): void {
     const dialogRef = this.dialog.open(VerifyOtpComponent, {
-      data: { type: contactType },
+      data: { type: contactType, email: this.userProfile.email, mobile: this.userProfile.mobile },
       disableClose: true,
       panelClass: 'common-modal',
     })
 
-    dialogRef.componentInstance.resendOTP.subscribe((data: any) => {
-      this.generateAndVerifyOTP(data.type, 'resend')
+    dialogRef.componentInstance.resendOTP.subscribe((_cType: any) => {
+      this.generateAndVerifyOTP(_cType, 'resend')
     })
 
-    dialogRef.afterClosed().subscribe(res => {
-      if (res) {
-        this.showFileUploadProgress()
-      }
+    dialogRef.componentInstance.otpVerified.subscribe((_data: boolean) => {
+      this.showFileUploadProgress()
+      this.uploadCSVFile()
     })
   }
 
-  handleChangePage(_event: PageEvent): void {
+  uploadCSVFile(): void {
+    if (this.fileService.validateFile(this.fileName)) {
+      if (this.fileSelected) {
+        const formData: FormData = new FormData()
+        formData.append('data', this.fileSelected, this.fileName)
+        this.fileService.upload(this.fileName, formData)
+          .pipe(takeUntil(this.destroySubject$))
+          .subscribe((_res: any) => {
+            this.fileUploadDialogInstance.close()
+            this.matSnackBar.open('File uploaded successfully!')
+            this.fileName = ''
+            this.fileSelected = ''
+            this.getBulkStatusList()
+          }, (_err: HttpErrorResponse) => {
+            if (!_err.ok) {
+              this.matSnackBar.open('Uploading CSV file failed due to some error, please try again later!')
+            }
+          })
+      }
+    } else {
+      this.showFileError = true
+    }
+  }
 
+  handleChangePage(_event: PageEvent): void {
+    this.pageSize = _event.pageSize
+    this.startIndex = (_event.pageIndex) * _event.pageSize
+    this.lastIndex = this.startIndex + _event.pageSize
   }
 
   ngOnDestroy(): void {
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.ts
index 5fd1bf861..4aeae6fb8 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.ts
@@ -1,18 +1,19 @@
 import { Component, OnInit, Inject, OnDestroy, ViewChild, Output, EventEmitter } from '@angular/core'
 import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'
-// import { HttpErrorResponse } from '@angular/common/http'
+import { HttpErrorResponse } from '@angular/common/http'
 import { MatSnackBar } from '@angular/material'
 
 import { Subject } from 'rxjs'
-// import { takeUntil } from 'rxjs/operators'
+import { takeUntil } from 'rxjs/operators'
 /* tslint:disable */
 import * as _ from 'lodash'
-
+/* tslint:enable */
+import { OtpService } from '../../../../users/services/otp.service'
 
 @Component({
   selector: 'ws-verify-otp',
   templateUrl: './verify-otp.component.html',
-  styleUrls: ['./verify-otp.component.scss']
+  styleUrls: ['./verify-otp.component.scss'],
 })
 export class VerifyOtpComponent implements OnInit, OnDestroy {
 
@@ -29,6 +30,7 @@ export class VerifyOtpComponent implements OnInit, OnDestroy {
     public dialogRef: MatDialogRef<VerifyOtpComponent>,
     @Inject(MAT_DIALOG_DATA) public data: any,
     private matSnackbar: MatSnackBar,
+    private otpService: OtpService
   ) { }
 
   ngOnInit() {
@@ -44,11 +46,11 @@ export class VerifyOtpComponent implements OnInit, OnDestroy {
         clearInterval(this.interval)
         this.showResendOTP = true
       }
-    }, 1000)
+    },                          1000)
   }
 
   handleCloseModal(): void {
-    this.dialogRef.close(true)
+    this.dialogRef.close()
   }
 
   handleResendOTP(): void {
@@ -59,7 +61,37 @@ export class VerifyOtpComponent implements OnInit, OnDestroy {
   }
 
   handleVerifyOTP(): void {
-    this.matSnackbar.open("Working on handle Verify OTP")
+    if (this.data.type === 'email') {
+      this.verifyEmailOTP()
+    } else {
+      this.verifyMobileOTP()
+    }
+  }
+
+  verifyEmailOTP(): void {
+    this.otpService.verifyEmailOTP(this.otpEntered, this.data.email)
+      .pipe(takeUntil(this.destroySubject$))
+      .subscribe((_res: any) => {
+        this.handleCloseModal()
+        this.otpVerified.emit(true)
+      },         (error: HttpErrorResponse) => {
+        if (!error.ok) {
+          this.matSnackbar.open('Unable to verify OTP, please try again later!')
+        }
+      })
+  }
+
+  verifyMobileOTP(): void {
+    this.otpService.verifyOTP(Number(this.otpEntered), this.data.mobile)
+      .pipe(takeUntil(this.destroySubject$))
+      .subscribe((_res: any) => {
+        this.handleCloseModal()
+        this.otpVerified.emit(true)
+      },         (error: HttpErrorResponse) => {
+        if (!error.ok) {
+          this.matSnackbar.open('Unable to verify OTP, please try again later!')
+        }
+      })
   }
 
   ngOnDestroy(): void {
diff --git a/project/ws/app/src/lib/routes/users/services/otp.service.ts b/project/ws/app/src/lib/routes/users/services/otp.service.ts
index f942f08f7..ba0c4723b 100644
--- a/project/ws/app/src/lib/routes/users/services/otp.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/otp.service.ts
@@ -70,7 +70,7 @@ export class OtpService {
     return this.http.post(API_ENDPOINTS.sendEmailOtp, reqObj)
   }
 
-  verifyEmailOTP(otp: any, email: number) {
+  verifyEmailOTP(otp: any, email: any) {
     const reqObj = {
       request: {
         otp: otp.toString(),
diff --git a/project/ws/app/src/lib/routes/users/services/upload.service.ts b/project/ws/app/src/lib/routes/users/services/upload.service.ts
index 1aba8b387..5d563e83d 100644
--- a/project/ws/app/src/lib/routes/users/services/upload.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/upload.service.ts
@@ -5,12 +5,9 @@ import { HttpClient } from '@angular/common/http'
 import * as fileSaver from 'file-saver'
 
 const API_ENDPOINTS = {
-  // bulkUpload: `/apis/protected/v8/admin/userRegistration/bulkUpload`,
   bulkUpload: `/apis/proxies/v8/user/v1/bulkupload`,
   downloadReport: `/apis/protected/v8/admin/userRegistration/bulkUploadReport`,
-  // getBulkUploadData: '/apis/protected/v8/admin/userRegistration/bulkUploadData',
   getBulkUploadData: '/apis/proxies/v8/user/v1/bulkupload',
-  // downloadfile: '/apis/proxies/v8/user/v1/bulkuser/download',
   getBulkApproval: '/apis/proxies/v8/workflow/admin/bulkupdate/getstatus',
   bulkApprovalUpload: `/apis/proxies/v8/workflow/admin/transition/bulkupdate`,
 }
@@ -35,12 +32,7 @@ export class FileService {
   }
 
   public download(filePath: string, downloadAsFileName: string): void {
-    // const httpOptions = {
-    //   headers: new HttpHeaders({ responseType:  'blob',
-    //   'Content-Type':  'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'}),
-    // }
     this.http.get(filePath, { responseType: 'blob' }).subscribe((res: any) => {
-      // window.open(window.URL.createObjectURL(res))
       fileSaver.saveAs(res, downloadAsFileName)
     })
   }
@@ -66,11 +58,6 @@ export class FileService {
     return this.fileList$
   }
 
-  // private addFileToList(fileName: string): void {
-  //   this.fileList.push(fileName)
-  //   this.fileList$.next(this.fileList)
-  // }
-
   validateFile(name: String) {
     const allowedFormats = ['xlsx', 'csv']
     const ext = name.substring(name.lastIndexOf('.') + 1).toLowerCase()
@@ -99,8 +86,4 @@ export class FileService {
     return this.http.post<any>(API_ENDPOINTS.bulkApprovalUpload, fileContent)
       .pipe(finalize(() => this.displayLoader$.next(false)))
   }
-
-  // public downloadFile(filename: string) {
-  //   return this.http.get(`${API_ENDPOINTS.downloadfile}/${filename}`)
-  // }
 }

From b2f5ca03c90757830477b551cfc472e2bcab8b98 Mon Sep 17 00:00:00 2001
From: Vinod Kumar Shyave <121538586+vShyave@users.noreply.github.com>
Date: Fri, 3 May 2024 16:01:18 +0530
Subject: [PATCH 568/887] lint error fixed

---
 .../routes/users-view/bulk-upload/bulk-upload.component.ts  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts
index 86db6be6f..e4a18d5e4 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts
@@ -67,7 +67,7 @@ export class BulkUploadComponent implements OnInit, AfterViewInit, OnDestroy {
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
         this.lastUploadList = res.result.content
-      }, (error: HttpErrorResponse) => {
+      },         (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open('Unable to get Bulk status list')
         }
@@ -109,7 +109,7 @@ export class BulkUploadComponent implements OnInit, AfterViewInit, OnDestroy {
         if (!resendFlag) {
           this.verifyOTP(contactType)
         }
-      }, (error: HttpErrorResponse) => {
+      },         (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open(_.get(error, 'error.params.errmsg') || `Unable to send OTP to your ${contactType}, please try again later!`)
         }
@@ -157,7 +157,7 @@ export class BulkUploadComponent implements OnInit, AfterViewInit, OnDestroy {
             this.fileName = ''
             this.fileSelected = ''
             this.getBulkStatusList()
-          }, (_err: HttpErrorResponse) => {
+          },         (_err: HttpErrorResponse) => {
             if (!_err.ok) {
               this.matSnackBar.open('Uploading CSV file failed due to some error, please try again later!')
             }

From eeac963d8c0fdc24210f8e5c0d43eb83abb124c2 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Sat, 4 May 2024 00:33:39 +0530
Subject: [PATCH 569/887] Added approval tabs flow, added verified & nonverfied
 listings & UI updates

---
 .../user-cards/user-card.component.html       | 127 +++++--
 .../user-cards/user-card.component.scss       |  80 ++++-
 .../user-cards/user-card.component.ts         | 332 +++++++++++++++---
 .../lib/routes/home/home.rounting.module.ts   |  22 +-
 .../approval-pending.component.html           |  17 +-
 .../approval-pending.component.ts             |  35 +-
 .../users-view/users-view.component.html      |  24 +-
 .../routes/users-view/users-view.component.ts |  21 +-
 .../routes/home/services/approvals.service.ts |  16 +-
 .../routes/users/services/users.service.ts    |   7 +-
 10 files changed, 543 insertions(+), 138 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 0b5a2a8ea..334130427 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -8,41 +8,37 @@
       (opened)="closeOtherPanels(panel)">
       <mat-expansion-panel-header (click)="getUerData(user)">
         <div class="float-left" (click)="$event.stopPropagation();">
-          <div class="initialcircle display-inline-block margin-right-s">
+          <div class="initialcircle display-inline-block margin-right-m">
             <!-- <span>AB</span> -->
-            <ws-widget-avatar-photo [name]="getUseravatarName(user)" [photoUrl]="user?.photo" size="m">
+            <ws-widget-avatar-photo [name]="getUseravatarName(user)" [photoUrl]="user?.photo" size="l">
             </ws-widget-avatar-photo>
           </div>
           <div class="username display-inline-block">
             <div class="mat-subheading-2 margin-remove"
               *ngIf="user?.profileDetails && user?.profileDetails?.personalDetails">
               {{user?.profileDetails?.personalDetails?.firstname}}
-              <span class="status-label margin-left-s verified" *ngIf="currentFilter !== 'nonverified'">Verified
+              <span class="status-label margin-left-s verified"
+                *ngIf="user?.profileDetails?.profileStatus === 'VERIFIED'">Verified
                 <mat-icon>check_circle</mat-icon></span>
-              <span class="status-label margin-left-s nonverified" *ngIf="currentFilter === 'nonverified'">Non-verified
+              <span class="status-label margin-left-s nonverified"
+                *ngIf="user?.profileDetails?.profileStatus === 'NOT-VERIFIED'">Non-verified
                 <mat-icon>check_circle</mat-icon></span>
             </div>
 
             <div class="mat-subheading-2 display-inline-block margin-remove" *ngIf="!user?.profileDetails">
               {{user?.firstName}}
-              <span class="status-label margin-left-s verified" *ngIf="currentFilter !== 'nonverified'">Verified
-                <mat-icon>check_circle</mat-icon></span>
-              <span class="status-label margin-left-s nonverified" *ngIf="currentFilter === 'nonverified'">Non-verified
-                <mat-icon>check_circle</mat-icon></span>
             </div>
             <div class="mat-body-2 ws-mat-black40-text">{{user?.profileDetails &&
               user?.profileDetails?.professionalDetails
               &&
               user?.profileDetails?.professionalDetails?.designation ?
               user?.profileDetails?.professionalDetails?.designation : '-'}}</div>
-            <!-- <div class="mat-body-2 ws-mat-black40-text" *ngIf="currentFilter !== 'nonverified'">Verified date:
-              19/04/2024</div>
-            <div class="mat-body-2 ws-mat-black40-text" *ngIf="currentFilter === 'nonverified'">Non-verified date:
-              19/04/2024</div> -->
+            <!-- <div class="mat-caption ws-mat-black40-text">Verified on: {{user.requestedon | date: 'dd/MM/yyyy'}}</div> -->
+            <div class="mat-caption ws-mat-black40-text">Verified on: 02/05/2024</div>
           </div>
         </div>
         <div class="float-right">
-          <div class="button margin-top-xs mat-body" (click)="onEditUser(user);$event.stopPropagation();"
+          <div class="button margin-top-m mat-body" (click)="onEditUser(user);$event.stopPropagation();"
             *ngIf="isMdoAdmin || isMdoLeader">
             <mat-icon>edit</mat-icon> Edit
           </div>
@@ -338,7 +334,7 @@
                   Update
                 </span>
               </button>
-              <button mat-raised-button type="submit" (click)="resetRoles()"
+              <button mat-raised-button type="submit" (click)="cancelSubmit()"
                 class="btn-success btn-responsive cancelbtn">
                 <span i18n>
                   Cancel
@@ -385,7 +381,9 @@
           <div class="flex flex-row margin-top-m">
             <div class="md:w-1/4">
               <label class="view-text-label">Employee ID</label>
-              <p>{{user.empID ? user.empID : '-'}}</p>
+              <p>{{user.profileDetails && user.profileDetails.employmentDetails &&
+                user.profileDetails.employmentDetails.employeeCode ?
+                user.profileDetails.employmentDetails.employeeCode : '-'}}</p>
             </div>
 
             <div class="md:w-1/4">
@@ -484,33 +482,27 @@
   <mat-accordion [multi]="true">
     <mat-expansion-panel class="user-card" *ngFor="let appData of approvalData" #panel
       (opened)="closeOtherPanels(panel)">
-      <mat-expansion-panel-header (click)="getUerData(appData.user)">
+      <mat-expansion-panel-header (click)="getUerData(appData.user, appData.userWorkflow);">
         <div class="float-left" (click)="$event.stopPropagation();">
           <div class="initialcircle display-inline-block margin-right-s" *ngIf="appData?.user">
             <ws-widget-avatar-photo [name]="getUseravatarName(appData?.user)" [photoUrl]="appData?.user?.photo"
-              size="m">
+              size="l">
             </ws-widget-avatar-photo>
           </div>
           <div class="initialcircle display-inline-block margin-right-s" *ngIf="!appData?.user">
-            <ws-widget-avatar-photo [name]="appData?.userWorkflow?.userInfo?.first_name" [photoUrl]="" size="m">
+            <ws-widget-avatar-photo [name]="appData?.userWorkflow?.userInfo?.first_name" [photoUrl]="" size="l">
             </ws-widget-avatar-photo>
           </div>
           <div class="username display-inline-block">
             <div class="mat-subheading-2 margin-remove">
               {{appData.userWorkflow.userInfo.first_name}}
-              <span class="status-label margin-left-s verified" *ngIf="currentFilter !== 'nonverified'">Verified
-                <mat-icon>check_circle</mat-icon></span>
-              <span class="status-label margin-left-s nonverified" *ngIf="currentFilter === 'nonverified'">Non-verified
-                <mat-icon>check_circle</mat-icon></span>
             </div>
             <div class="mat-body-2 ws-mat-black40-text">{{appData.user &&
               appData.user.profileDetails.professionalDetails &&
               appData.user.profileDetails.professionalDetails.designation ?
               appData.user.profileDetails.professionalDetails.designation : '-'}}</div>
-            <!-- <div class="mat-body-2 ws-mat-black40-text" *ngIf="currentFilter !== 'nonverified'">Verified date:
-                19/04/2024</div>
-              <div class="mat-body-2 ws-mat-black40-text" *ngIf="currentFilter === 'nonverified'">Non-verified date:
-                19/04/2024</div> -->
+            <div class="mat-caption ws-mat-black40-text">Requested on: {{appData.requestedon | date: 'dd/MM/yyyy'}}
+            </div>
           </div>
         </div>
       </mat-expansion-panel-header>
@@ -525,7 +517,7 @@
                 class="ws-mat-black40-text infoicon">info_outline</mat-icon>
             </div>
             <div class="flex flex-row margin-top-m">
-              <div class="md:w-1/3">
+              <!-- <div class="md:w-1/3">
                 <label class="view-text-label">Designation</label>
                 <p>{{appData.user.profileDetails && appData.user.profileDetails.professionalDetails &&
                   appData.user.profileDetails.professionalDetails.designation ?
@@ -534,7 +526,7 @@
                 <mat-radio-group aria-label="Select an option" name="approveDesignation"
                   formControlName="approveDesignation">
                   <mat-radio-button value="approve" class="margin-right-s">Approve</mat-radio-button>
-                  <mat-radio-button value="reject">Reject</mat-radio-button>
+                  <mat-radio-button value="reject" (click)="addRejection('designation')">Reject</mat-radio-button>
                 </mat-radio-group>
               </div>
 
@@ -548,9 +540,46 @@
 
                 <mat-radio-group aria-label="Select an option" name="approveGroup" formControlName="approveGroup">
                   <mat-radio-button value="approve" class="margin-right-s">Approve</mat-radio-button>
-                  <mat-radio-button value="reject">Reject</mat-radio-button>
+                  <mat-radio-button value="reject" (click)="addRejection('group')">Reject</mat-radio-button>
                 </mat-radio-group>
-              </div>
+              </div> -->
+              <ng-container *ngFor="let field of needApprovalList">
+                <div class="md:w-1/3">
+                  <div *ngIf="field.fieldKey !== 'verifiedKarmayogi'">
+                    <label class="view-text-label">{{field.label}}</label>
+                  </div>
+                  <div [class]="field.fieldKey === 'verifiedKarmayogi'">
+                    <span [hidden]="field.fieldKey === 'verifiedKarmayogi'">
+                      <input type="text" class="appr-text-field margin-bottom-s" [value]="field.value">
+                      <mat-icon class="verified-icon margin-left-s"
+                        *ngIf="field.action === 'APPROVE'">check_circle</mat-icon>
+                      <mat-icon class="nonverified-icon margin-left-s"
+                        *ngIf="field.action === 'REJECT'">cancel</mat-icon>
+                    </span>
+                    <label class="appr-text-label mt-2" *ngIf="field.fieldKey === 'verifiedKarmayogi'">{{field.label}}
+                    </label>
+                    <mat-radio-group aria-label="Select an option" name="approveDesignation"
+                      formControlName="approveDesignation" class="mat-caption margin-top-s">
+                      <mat-radio-button value="approve" class="margin-right-s"
+                        (click)="onClickHandleWorkflow(field,'APPROVE')">Approve</mat-radio-button>
+                      <mat-radio-button value="reject"
+                        (click)="onClickHandleWorkflow(field,'REJECT')">Reject</mat-radio-button>
+                      <mat-icon class="margin-left-m" *ngIf="field.action === 'REJECT' && comment !== ''"
+                        (click)="updateRejection(field)">chat_bubble</mat-icon>
+                    </mat-radio-group>
+                  </div>
+                </div>
+              </ng-container>
+              <!-- <div style="margin-top: 17px; margin-left: 155px;" *ngIf="needApprovalList.length > 1">
+                <button mat-icon-button aria-label="Reject" id="reject"
+                  (click)="onClickAllHandleWorkflow(needApprovalList,'REJECT')">
+                  <span class="mat-button-wrapper" style="color: white; padding:13px;"> Reject All </span>
+                </button>
+                <button mat-icon-button aria-label="Accept" id="accept" class="accept-btn"
+                  (click)="onClickAllHandleWorkflow(needApprovalList,'APPROVE')">
+                  <span class="mat-button-wrapper" style="color:white; padding:13px;"> Approve All </span>
+                </button>
+              </div> -->
             </div>
           </div>
         </form>
@@ -654,6 +683,21 @@
             </div>
           </div>
         </div>
+
+        <div class="flex flex-row margin-top-l">
+          <button mat-raised-button type="submit" (click)="onApprovalSubmit()"
+            class="margin-right-m btn-success btn-responsive successbtn" [disabled]="actionList.length === 0">
+            <span class="text-white" i18n>
+              Update
+            </span>
+          </button>
+          <button mat-raised-button type="submit" (click)="onApprovalCancel()"
+            class="btn-success btn-responsive cancelbtn">
+            <span i18n>
+              Cancel
+            </span>
+          </button>
+        </div>
       </div>
       <div class="panel-body" *ngIf="!appData?.user">
         <p class="text-center">No user data</p>
@@ -665,4 +709,25 @@
 <div class="flex flex-row justify-center">
   <mat-paginator [pageSize]="pageSize" [length]="totalRecords" [pageSizeOptions]="[20,30,40]"
     (page)="onChangePage($event)"></mat-paginator>
-</div>
\ No newline at end of file
+</div>
+
+<ng-template #rejectDialog>
+  <form>
+    <p mat-dialog-title class="dialog-title">Reason for rejection</p>
+    <mat-dialog-content>
+      <!-- <p class="appr-text margin-top-l">Please specify the reason for rejection</p> -->
+      <!-- <textarea rows="4" [(ngModel)]="comment" placeholder="Type the description in fewer than 100 characters"
+        name="comment" class="reject-reason-text"></textarea> -->
+
+      <mat-form-field class="w-full mt-5" appearance="outline">
+        <textarea matInput class="reason-text-area" [(ngModel)]="comment" name="reason"
+          placeholder="Type the description in fewer than 100 characters" i18n-placeholder resizable="none"></textarea>
+      </mat-form-field>
+    </mat-dialog-content>
+    <mat-dialog-actions class="flex flex-wrap justify-end">
+      <button mat-raised-button class="btn-success btn-responsive cancelbtn" matDialogClose>Cancel</button>
+      <button mat-raised-button class="btn-success btn-responsive successbtn" [mat-dialog-close]="true">
+        <span class="text-white">Submit</span></button>
+    </mat-dialog-actions>
+  </form>
+</ng-template>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
index b9f80e700..087df89ca 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
@@ -9,7 +9,7 @@
   border-radius: 5px !important;
 
   .mat-expansion-panel-header {
-    padding: 10px 24px !important;
+    padding: 14px 24px !important;
   }
 
   .mat-content{
@@ -77,14 +77,28 @@
   }
 }
 
-.panel-body {
+::ng-deep .initialcircle .circle-l {
+  border-radius: 50% !important;
+  width: 60px !important;
+  height: 60px !important;
+}
+::ng-deep .panel-body {
   padding: 10px 0;
+
+  .mat-radio-container {
+    width: 14px !important;
+    height: 14px !important;
+  }
+  .mat-radio-outer-circle, .mat-radio-inner-circle {
+    height: 16px !important;
+    width: 16px !important;
+  }
 }
 .mat-expanded {
   border: 1px solid #1B4CA1 !important;
 }
 
-.appr-text-field{
+.appr-text-field {
   width: 80%;
   border: 1px solid #DDDDDD;
   border-radius: 4px;
@@ -95,7 +109,7 @@
   font: 400 14px Lato;
 }
 
-.form-label{
+.form-label {
   width: 100%;
   padding-bottom: 10px;
   margin-bottom: 0;
@@ -249,4 +263,62 @@ label {
   .mat-slide-toggle.mat-checked .mat-slide-toggle-bar {
     background-color: rgba(29, 137, 35, 0.54) !important;
   }
+}
+
+::ng-deep .rejection-modal {
+  .mat-dialog-container {
+    padding: 0px !important;
+  }
+}
+
+.rejection {
+
+  .header {
+    height: 80px;
+    background-color: rgba(27, 76, 161, 1);
+    color: rgba(255, 255, 255, 1);
+    font-size: 24px;
+    font-weight: 700;
+
+    .editBox {
+      width: 24px;
+      cursor: pointer;
+    }
+  }
+
+  .reason-description {
+    padding: 20px;
+    font-size: 14px;
+    color: rgba(0, 0, 0, 1);
+  }
+
+  .reason-text-area {
+    height: 170px;
+    resize: none;
+  }
+
+  .footer {
+    height: 75px;
+    background-color: rgba(241, 240, 244, 1);
+
+    // .submit-btn {
+    //   height: 40px;
+    //   padding: 12px, 16px, 12px, 16px;
+    //   background-color: rgba(27, 76, 161, 1);
+    //   color: rgba(255, 255, 255, 1);
+    //   font-size: 14px;
+    //   font-weight: 700;
+    //   border-radius: 4px;
+    // }
+
+    // .cancel-btn {
+    //   height: 40px;
+    //   padding: 12px, 16px, 12px, 16px;
+    //   color: rgba(27, 76, 161, 1);
+    //   border: 1px solid rgba(27, 76, 161, 1);
+    //   font-size: 14px;
+    //   font-weight: 700;
+    //   border-radius: 4px;
+    // }
+  }
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index f115c3b03..bd9a4ae4d 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, OnInit, Output, QueryList, ViewChild, ViewChildren } from '@angular/core'
+import { Component, EventEmitter, Input, OnInit, Output, QueryList, TemplateRef, ViewChild, ViewChildren } from '@angular/core'
 import { FormGroup, FormControl, Validators } from '@angular/forms'
 import { UsersService } from '../../../users/services/users.service'
 import {
@@ -17,6 +17,9 @@ import { environment } from '../../../../../../../../../src/environments/environ
 // import { ConfigurationsService } from '@sunbird-cb/utils'
 import { RejectionPopupComponent } from '../rejection-popup/rejection-popup.component'
 import { APP_DATE_FORMATS, AppDateAdapter } from '../../../events/routes/format-datepicker'
+import { ApprovalsService } from '../../services/approvals.service'
+import { EventService } from '@sunbird-cb/utils'
+import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
 
 @Component({
   selector: 'ws-widget-user-card',
@@ -39,6 +42,10 @@ export class UserCardComponent implements OnInit {
   @Output() paginationData = new EventEmitter()
   @Output() searchByEnterKey = new EventEmitter()
   @ViewChildren(MatExpansionPanel) panels!: QueryList<MatExpansionPanel>
+  @ViewChild('approveDialog', { static: false })
+  approveDialog!: TemplateRef<any>
+  @ViewChild('rejectDialog', { static: false })
+  rejectDialog!: TemplateRef<any>
 
   @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator | any
   startIndex = 0
@@ -68,6 +75,12 @@ export class UserCardComponent implements OnInit {
   masterLanguagesEntries: any
   genderList = ['Male', 'Female', 'Others']
   categoryList = ['General', 'OBC', 'SC', 'ST', 'Others']
+  needApprovalList: any[] = []
+  profileData: any[] = []
+  userwfData!: any
+  comment = ''
+  listupdateFieldValues: any[] = []
+  actionList: any = []
 
   phoneNumberPattern = '^((\\+91-?)|0)?[0-9]{10}$'
   emailRegix = `^[\\w\-\\.]+@([\\w-]+\\.)+[\\w-]{2,4}$`
@@ -86,8 +99,12 @@ export class UserCardComponent implements OnInit {
   approvalData: any
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-    private dialog: MatDialog, private router: Router,
-    private route: ActivatedRoute, private snackBar: MatSnackBar) {
+    private dialog: MatDialog, private router: Router, private approvalSvc: ApprovalsService,
+    private route: ActivatedRoute, private snackBar: MatSnackBar,
+    private events: EventService) {
+    // this.route.data.subscribe((data: any) => {
+    //   this.profileData = data.pageData.data.profileData
+    // })
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', [Validators.required]),
       group: new FormControl('', [Validators.required]),
@@ -125,6 +142,10 @@ export class UserCardComponent implements OnInit {
     if (this.isApprovals && this.usersData && this.usersData.length > 0) {
       this.approvalData = this.usersData
       this.getUserMappedData(this.approvalData)
+
+      this.approvalSvc.getProfileConfig().then((res: any) => {
+        this.profileData = res && res.profileData
+      })
     } else {
       this.init()
     }
@@ -236,13 +257,10 @@ export class UserCardComponent implements OnInit {
 
   onEditUser(user: any) {
     user.enableEdit = true
-    // setTimeout(() => {
-    //   user.enableEdit = true
-    // }, 5000)
-    // this.cdref.detectChanges()
+    this.setUserDetails(user)
   }
 
-  getUerData(user: any) {
+  getUerData(user: any, data: any) {
     user.enableEdit = false
     const profileDataAll = user
     this.userStatus = profileDataAll.isDeleted ? 'Inactive' : 'Active'
@@ -250,6 +268,13 @@ export class UserCardComponent implements OnInit {
     const profileData = profileDataAll.profileDetails
     this.updateTags(profileData)
 
+    if (this.isApprovals) {
+      this.needApprovalList = []
+      this.actionList = []
+      this.comment = ''
+      this.getApprovalList(data)
+    }
+
     this.roleservice.getAllRoles().subscribe((data: any) => {
       const parseRoledata = JSON.parse(data.result.response.value)
       this.orgTypeList = parseRoledata.orgTypeList
@@ -295,7 +320,9 @@ export class UserCardComponent implements OnInit {
         })
       }
     })
+  }
 
+  setUserDetails(user: any) {
     if (user && user.profileDetails) {
       // this.updateUserDataForm.controls['employeeID'].setValue('')
       // this.updateUserDataForm.controls['ehrmsID'].setValue('')
@@ -307,7 +334,10 @@ export class UserCardComponent implements OnInit {
 
       if (user.profileDetails.additionalProperties) {
         if (user.profileDetails.additionalProperties.group) {
-          this.updateUserDataForm.controls['group'].setValue(user.profileDetails.additionalProperties.group)
+          // this.updateUserDataForm.controls['group'].setValue(user.profileDetails.additionalProperties.group)
+          this.updateUserDataForm.patchValue({
+            group: user.profileDetails.additionalProperties.group
+          })
         }
       }
 
@@ -336,6 +366,10 @@ export class UserCardComponent implements OnInit {
         if (user.profileDetails.employmentDetails.pinCode) {
           this.updateUserDataForm.controls['pincode'].setValue(user.profileDetails.employmentDetails.pincode)
         }
+        if (user.profileDetails.employmentDetails.employeeCode) {
+          this.updateUserDataForm.controls['employeeID'].setValue(user.profileDetails.employmentDetails.employeeCode)
+
+        }
       }
     }
   }
@@ -350,8 +384,38 @@ export class UserCardComponent implements OnInit {
     return name
   }
 
-  resetRoles() {
-    this.updateUserDataForm.controls['roles'].setValue(this.orguserRoles)
+  getApprovalList(approvalData: any) {
+    this.userwfData = approvalData
+    if (approvalData.wfInfo && approvalData.wfInfo.length > 0) {
+      approvalData.wfInfo.forEach((wf: any) => {
+        if (typeof wf.updateFieldValues === 'string') {
+          const fields = JSON.parse(wf.updateFieldValues)
+          if (fields.length > 0) {
+            fields.forEach((field: any) => {
+              const labelKey = Object.keys(field.toValue)[0]
+              const feildNameObj = this.profileData.filter(userData => userData.key === labelKey)[0]
+              if (labelKey === 'designation' || labelKey === 'group') {
+                this.needApprovalList.push(
+                  Object.assign({
+                    wf,
+                    feildName: labelKey,
+                    label: feildNameObj ? feildNameObj.name : null,
+                    value: field.toValue[labelKey],
+                    fieldKey: field.fieldKey,
+                    wfId: wf.wfId,
+                  })
+                )
+                console.log('needApprovalList', this.needApprovalList)
+              }
+            })
+          }
+        }
+      })
+    }
+  }
+
+  cancelSubmit() {
+    this.updateUserDataForm.reset()
   }
 
   modifyUserRoles(role: string) {
@@ -510,8 +574,9 @@ export class UserCardComponent implements OnInit {
   //   }
   // }
 
-  addRejection() {
+  addRejection(field: any) {
     const rejectinDetails = {
+      field: field,
       header: {
         headerText: 'Reason of rejection',
         showEditButton: false,
@@ -553,47 +618,47 @@ export class UserCardComponent implements OnInit {
     })
   }
 
-  updateRejection() {
-    const rejectinDetails = {
-      header: {
-        headerText: 'Reason of rejection',
-        showEditButton: true,
-      },
-      body: {
-        reason: `You're not in Group C.Please provide the request with the correct entry.`,
-        placeholder: 'Type the decription in fewer than 100 characters',
-        showTextArea: false,
-      },
-      footer: {
-        showFooter: false,
-        buttons: [
-          {
-            btnType: 'submit',
-            btnText: 'Update',
-            response: true,
-          },
-          {
-            btnType: 'cancel',
-            btnText: 'Cancel',
-            response: false,
-          },
-        ],
-      },
-    }
+  // updateRejection() {
+  //   const rejectinDetails = {
+  //     header: {
+  //       headerText: 'Reason of rejection',
+  //       showEditButton: true,
+  //     },
+  //     body: {
+  //       reason: `You're not in Group C.Please provide the request with the correct entry.`,
+  //       placeholder: 'Type the decription in fewer than 100 characters',
+  //       showTextArea: false,
+  //     },
+  //     footer: {
+  //       showFooter: false,
+  //       buttons: [
+  //         {
+  //           btnType: 'submit',
+  //           btnText: 'Update',
+  //           response: true,
+  //         },
+  //         {
+  //           btnType: 'cancel',
+  //           btnText: 'Cancel',
+  //           response: false,
+  //         },
+  //       ],
+  //     },
+  //   }
 
-    const dialogRef = this.dialog.open(RejectionPopupComponent, {
-      data: rejectinDetails,
-      width: '1100px',
-      disableClose: true,
-      panelClass: 'rejection-modal',
-    })
+  //   const dialogRef = this.dialog.open(RejectionPopupComponent, {
+  //     data: rejectinDetails,
+  //     width: '1100px',
+  //     disableClose: true,
+  //     panelClass: 'rejection-modal',
+  //   })
 
-    dialogRef.afterClosed().subscribe(result => {
-      if (result.btnResponse) {
-        // console.log(result)
-      }
-    })
-  }
+  //   dialogRef.afterClosed().subscribe(result => {
+  //     if (result.btnResponse) {
+  //       // console.log(result)
+  //     }
+  //   })
+  // }
 
   onSubmit(form: any, user: any) {
     // console.log('user -------', user)
@@ -676,4 +741,169 @@ export class UserCardComponent implements OnInit {
       duration,
     })
   }
+
+  // for approval & rejection
+  onClickHandleWorkflow(field: any, action: string) {
+    field.action = action
+    const req = {
+      action,
+      comment: '',
+      state: 'SEND_FOR_APPROVAL',
+      userId: field.wf.userId,
+      applicationId: field.wf.applicationId,
+      actorUserId: this.userwfData.userInfo.wid,
+      wfId: field.wf.wfId,
+      serviceName: 'profile',
+      updateFieldValues: JSON.parse(field.wf.updateFieldValues),
+    }
+    if (action === 'APPROVE') {
+      this.actionList.push(req)
+      // this.onApproveOrRejectClick(req)
+    } else {
+      const dialogRef = this.dialog.open(this.rejectDialog, {
+        width: '770px',
+      })
+      dialogRef.afterClosed().subscribe(result => {
+        if (result) {
+          // this.onApproveOrRejectClick(req)
+          req.comment = this.comment
+          this.actionList.push(req)
+        } else {
+          dialogRef.close()
+        }
+      })
+    }
+
+    this.events.raiseInteractTelemetry(
+      {
+        type: TelemetryEvents.EnumInteractTypes.CLICK,
+        subType: TelemetryEvents.EnumInteractSubTypes.BTN_CONTENT,
+      },
+      {
+        id: field.wf.applicationId,
+        type: TelemetryEvents.EnumIdtype.APPLICATION,
+      }
+    )
+  }
+
+  // single aprrove or reject
+  onApproveOrRejectClick(req: any) {
+    req.comment = this.comment
+    this.approvalSvc.handleWorkflow(req).subscribe((res: any) => {
+      if (res.result.data) {
+        if (res.result.data.status === 'REJECTED') {
+          this.openSnackbar('Request Rejected Successfully')
+        } else {
+          this.openSnackbar('Request Approved')
+        }
+        this.comment = ''
+        // this.needApprovalList = this.needApprovalList.filter(wf => wf.wfId !== res.result.data.wfIds[0])
+      }
+    })
+  }
+
+  onApprovalSubmit() {
+    // console.log('this.actionList', this.actionList)
+    if (this.actionList.length > 0) {
+      this.actionList.forEach((req: any) => {
+        this.onApproveOrRejectClick(req)
+      })
+    }
+  }
+
+  updateRejection(field: any) {
+    const dialogRef = this.dialog.open(this.rejectDialog, {
+      width: '770px',
+    })
+    dialogRef.afterClosed().subscribe(result => {
+      if (result) {
+        this.actionList.forEach((req: any) => {
+          if (req.wfId === field.wfId) {
+            req.comment = this.comment
+          }
+        })
+      } else {
+        dialogRef.close()
+      }
+    })
+
+  }
+
+  onClickAllHandleWorkflow(approvalList: any[], action: string) {
+    let user1Id = ''
+    let application1Id = ''
+
+    if (approvalList && approvalList.length > 0) {
+      approvalList.forEach(approvalItem => {
+        user1Id = approvalItem.wf.userId
+        application1Id = approvalItem.wf.applicationId
+      })
+    }
+    if (action === 'APPROVE') {
+      // const dialogRef = this.dialog.open(this.approveDialog, {
+      //   width: '770px',
+      // })
+      // dialogRef.afterClosed().subscribe(result => {
+      // if (result) {
+      const req: any = {
+        action,
+        state: 'SEND_FOR_APPROVAL',
+        userId: user1Id,
+        actorUserId: this.userwfData.userInfo.wid,
+        serviceName: 'profile',
+      }
+      if (approvalList.length > 0) {
+        approvalList.forEach((approvalAttribute: any) => {
+          this.listupdateFieldValues = JSON.parse(approvalAttribute.wf.updateFieldValues)
+          req['applicationId'] = approvalAttribute.wf.applicationId
+          req['wfId'] = approvalAttribute.wf.wfId
+          req['updateFieldValues'] = this.listupdateFieldValues
+          this.onApproveOrRejectClick(req)
+        })
+      }
+      // } else {
+      //   dialogRef.close()
+      // }
+      // })
+    } else {
+      const dialogRef = this.dialog.open(this.rejectDialog, {
+        width: '770px',
+      })
+      dialogRef.afterClosed().subscribe(result => {
+        if (result) {
+          const req: any = {
+            action,
+            state: 'SEND_FOR_APPROVAL',
+            userId: user1Id,
+            actorUserId: this.userwfData.userInfo.wid,
+            serviceName: 'profile',
+          }
+
+          if (approvalList.length > 0) {
+            approvalList.forEach((approvalAttribute: any) => {
+              this.listupdateFieldValues = JSON.parse(approvalAttribute.wf.updateFieldValues)
+              req['applicationId'] = approvalAttribute.wf.applicationId
+              req['wfId'] = approvalAttribute.wf.wfId
+              req['updateFieldValues'] = this.listupdateFieldValues
+              this.onApproveOrRejectClick(req)
+            })
+          }
+        } else {
+          dialogRef.close()
+        }
+      })
+    }
+
+    this.events.raiseInteractTelemetry(
+      {
+        type: TelemetryEvents.EnumInteractTypes.CLICK,
+        subType: TelemetryEvents.EnumInteractSubTypes.BTN_CONTENT,
+      },
+      {
+        id: application1Id,
+        type: TelemetryEvents.EnumIdtype.APPLICATION,
+
+      }
+    )
+  }
 }
diff --git a/project/ws/app/src/lib/routes/home/home.rounting.module.ts b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
index fad310ae4..a6aa624cd 100644
--- a/project/ws/app/src/lib/routes/home/home.rounting.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
@@ -110,16 +110,28 @@ const routes: Routes = [
           configService: ConfigResolveService,
         },
         children: [
+          // {
+          //   path: '',
+          //   pathMatch: 'full',
+          //   redirectTo: 'profileverification',
+          // },
           {
-            path: '',
-            pathMatch: 'full',
-            redirectTo: 'pending',
+            path: 'profileverification',
+            component: ApprovalPendingComponent,
+            data: {
+              pageId: 'approvals-profileverification',
+              module: 'Approvals',
+            },
+            resolve: {
+              pageData: PageResolve,
+              configService: ConfigResolveService,
+            },
           },
           {
-            path: 'pending',
+            path: 'transfers',
             component: ApprovalPendingComponent,
             data: {
-              pageId: 'approvals-pending',
+              pageId: 'approvals-transfers',
               module: 'Approvals',
             },
             resolve: {
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
index 2753b96c9..e64b25c3d 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
@@ -30,14 +30,15 @@
     <mat-card-content>
       <div class="flex flex-1 flex-column margin-fix">
         <div class="flex flex-1 filter max-height-60">
-          <a routerLink="/app/home/approvals/pending" class="filter-option"
+          <a routerLink="/app/home/approvals/profileverification" class="filter-option"
             [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'profileverification', 'ws-mat-accent-border font-medium':currentFilter !== 'profileverification'}"
             mat-button (click)="filter('profileverification'); tabTelemetry('toapprove', 0)" role="button">Profile
-            Verifications</a>
+            Verifications ({{approvalTotalCount}})</a>
 
           <a routerLink="/app/home/approvals/transfers" class="filter-option"
             [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'transfers', 'ws-mat-accent-border font-medium':currentFilter !== 'transfers'}"
-            mat-button (click)="filter('transfers'); tabTelemetry('transfers', 1)" role="button">Transfers</a>
+            mat-button (click)="filter('transfers'); tabTelemetry('transfers', 1)" role="button">Transfers
+            ({{approvalTotalCount}})</a>
         </div>
       </div>
       <ng-container *ngIf="currentFilter === 'profileverification'">
@@ -56,7 +57,15 @@
       </ng-container>
       <ng-container *ngIf="currentFilter === 'transfers'">
         <!-- <ws-app-profle-approval-bulk-upload></ws-app-profle-approval-bulk-upload> -->
-        No data
+        <ng-container *ngIf="getTableData && getTableData.length > 0">
+          <ws-widget-user-card [currentFilter]="currentFilter" [usersData]="data" [isApprovals]="true"
+            [totalRecords]="approvalTotalCount" [tabChangeIndex]="pageIndex"
+            (searchByEnterKey)="onEnterkySearch($event)"
+            (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
+        </ng-container>
+        <ng-container *ngIf="!getTableData || getTableData.length === 0">
+          <p class="text-center">No approvals pending</p>
+        </ng-container>
       </ng-container>
     </mat-card-content>
     <!-- <mat-card-content>
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
index 2892f274f..7f1d923eb 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
@@ -7,8 +7,6 @@ import { EventService } from '@sunbird-cb/utils'
 /* tslint:disable */
 import _ from 'lodash'
 /* tslint:enable */
-
-import { ITableData } from '@sunbird-cb/collection/lib/ui-org-table/interface/interfaces'
 import { TelemetryEvents } from '../../../../../head/_services/telemetry.event.model'
 import { ReportsVideoComponent } from '../../reports-video/reports-video.component'
 import { ApprovalsService } from '../../../services/approvals.service'
@@ -20,7 +18,6 @@ import { ApprovalsService } from '../../../services/approvals.service'
 })
 
 export class ApprovalPendingComponent implements OnInit, OnDestroy {
-
   data: any = []
   currentFilter = 'profileverification'
   discussionList!: any
@@ -30,22 +27,6 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   limit = 20
   pageIndex = 0
   currentOffset = 0
-  tabledata: ITableData = {
-    // actions: [{ name: 'Approve', label: 'Approve', icon: 'remove_red_eye', type: 'Approve' },
-    // { name: 'Reject', label: 'Reject', icon: 'remove_red_eye', type: 'Reject' }],
-    actions: [],
-    columns: [
-      { displayName: 'Full name', key: 'fullname' },
-      { displayName: 'Requested on', key: 'requestedon' },
-      { displayName: 'Fields', key: 'fields', isList: true },
-      { displayName: 'Tags', key: 'tag', isList: true },
-    ],
-    needCheckBox: false,
-    needHash: false,
-    sortColumn: 'fullname',
-    sortState: 'asc',
-    needUserMenus: false,
-  }
   configSvc: any
   reportsNoteList: string[] = []
 
@@ -66,11 +47,14 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit() {
-    // this.currentFilter = this.route.snapshot.params['tab']
+    this.currentFilter = this.route.snapshot.params['tab'] || 'profileverification'
     // this.currentFilter = this.currentFilter === 'upload' ? 'uploadApprovals' : 'pending'
     if (this.currentFilter === 'profileverification') {
       this.fetchApprovals()
     }
+    if (this.currentFilter !== 'profileverification') {
+      this.fetchApprovals()
+    }
 
     this.reportsNoteList = [
       // tslint:disable-next-line: max-line-length
@@ -104,6 +88,9 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
       if (key === 'profileverification') {
         this.fetchApprovals()
       }
+      if (key === 'transfers') {
+        this.fetchApprovals()
+      }
     }
   }
 
@@ -185,7 +172,6 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
           })
 
           this.data.push({
-
             fullname: approval.userInfo ? `${approval.userInfo.first_name}` : '--',
             // fullname: approval.userInfo ? `${approval.userInfo.first_name} ${approval.userInfo.last_name}` : '--',
             // requestedon: `${currentdate.getDate()}
@@ -202,6 +188,11 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
             userWorkflow: approval,
             tag: (approval.userInfo && approval.userInfo.tag) ? `${approval.userInfo.tag}` : '',
           })
+          this.data.sort((a: any, b: any) => {
+            const textA = a.fullname.toUpperCase()
+            const textB = b.fullname.toUpperCase()
+            return (textA < textB) ? -1 : (textA > textB) ? 1 : 0
+          })
         })
       })
     } else {
@@ -222,7 +213,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   replaceWords(inputString: any, wordConditions: any) {
     return wordConditions.reduce((acc: any, [word, condition]: any) => {
       return acc.replace(new RegExp(word, 'gi'), condition)
-    },                           inputString)
+    }, inputString)
   }
 
   onPaginateChange(event: PageEvent) {
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index 38cf298bd..a0e39548d 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -65,17 +65,17 @@
             mat-button (click)="filter('nonverified'); tabTelemetry('nonverified', 0)" role="button">Non-verified
             ({{nonverifiedUsersDataCount}})</a>
 
-          <a routerLink="/app/home/users/notmyuser" routerLinkActive="router-link-active" class="filter-option"
+          <!-- <a routerLink="/app/home/users/notmyuser" routerLinkActive="router-link-active" class="filter-option"
             [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'notmyuser','ws-mat-accent-border font-medium':currentFilter !== 'notmyuser'}"
             mat-button (click)="filter('notmyuser'); tabTelemetry('notmyuser', 0)" role="button">Not my user
-            ({{notmyuserUsersDataCount}})</a>
+            ({{notmyuserUsersDataCount}})</a> -->
         </div>
       </div>
       <!-- <ws-widget-org-user-table-v2 [userId]="currentUser" [tableData]="tabledata" [data]="dataForTable"
-                [isUpload]=false [isCreate]=true (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuActions($event)"
-                (searchByEnterKey)="onEnterkySearch($event)" (pageChangeClick)="onPaginateChange($event)"
-                [showEditOnCondition]=true [totalRecords]="userDataTotalCount" [tabChangeIndex]="pageIndex">
-              </ws-widget-org-user-table-v2> -->
+        [isUpload]=false [isCreate]=true (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuActions($event)"
+        (searchByEnterKey)="onEnterkySearch($event)" (pageChangeClick)="onPaginateChange($event)"
+        [showEditOnCondition]=true [totalRecords]="userDataTotalCount" [tabChangeIndex]="pageIndex">
+      </ws-widget-org-user-table-v2> -->
 
       <ng-container *ngIf="usersData && currentFilter === 'allusers'">
         <div *ngIf="usersData?.count > 0">
@@ -84,7 +84,7 @@
             (searchByEnterKey)="onEnterkySearch($event)"
             (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
         </div>
-        <p class="text-center" *ngIf="usersData?.count === 0">No users found</p>
+        <p class="margin-top-l margin-bottom-l" *ngIf="usersData?.count === 0">No users found</p>
       </ng-container>
       <ng-container *ngIf="usersData && currentFilter === 'verified'">
         <div *ngIf="usersData?.count > 0">
@@ -93,7 +93,7 @@
             (searchByEnterKey)="onEnterkySearch($event)"
             (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
         </div>
-        <p class="text-center" *ngIf="usersData?.count === 0">No users found</p>
+        <p class="margin-top-l margin-bottom-l" *ngIf="usersData?.count === 0">No users found</p>
       </ng-container>
       <ng-container *ngIf="usersData && currentFilter === 'nonverified'">
         <div *ngIf="usersData?.count > 0">
@@ -102,17 +102,17 @@
             (searchByEnterKey)="onEnterkySearch($event)"
             (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
         </div>
-        <p class="text-center" *ngIf="usersData?.count === 0">No users found</p>
+        <p class="margin-top-l margin-bottom-l" *ngIf="usersData?.count === 0">No users found</p>
       </ng-container>
-      <ng-container *ngIf="usersData && currentFilter === 'notmyuser'">
+      <!-- <ng-container *ngIf="usersData && currentFilter === 'notmyuser'">
         <div *ngIf="usersData?.count > 0">
           <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
             [totalRecords]="notmyuserUsersDataCount" [tabChangeIndex]="pageIndex"
             (searchByEnterKey)="onEnterkySearch($event)"
             (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
         </div>
-        <p class="text-center" *ngIf="usersData?.count === 0">No users found</p>
-      </ng-container>
+        <p class="margin-top-l margin-bottom-l" *ngIf="usersData?.count === 0">No users found</p>
+      </ng-container> -->
 
       <ng-container *ngIf="currentFilter === 'upload'">
         <ws-app-users-upload></ws-app-users-upload>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 2167ec0b2..e1f95599f 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -206,8 +206,25 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   getUsers(query: string, currentFilter: any) {
     this.loaderService.changeLoad.next(true)
     const usersData: any[] = []
-    const status = currentFilter === 'allusers' ? 1 : 1
-    this.usersService.getAllKongUsers(this.rootOrgId, status, this.limit, this.pageIndex, query).subscribe((data: any) => {
+    let filtreq = {}
+    if (currentFilter === 'allusers') {
+      filtreq = {
+        'rootOrgId': this.rootOrgId,
+        'status': 1,
+      }
+    } else if (currentFilter === 'verified') {
+      filtreq = {
+        'rootOrgId': this.rootOrgId,
+        'profileDetails.profileStatus': 'VERIFIED'
+      }
+    } else if (currentFilter === 'nonverified') {
+      filtreq = {
+        'rootOrgId': this.rootOrgId,
+        'profileDetails.profileStatus': 'NOT-VERIFIED'
+      }
+    }
+
+    this.usersService.getAllKongUsers(filtreq, this.limit, this.pageIndex, query).subscribe((data: any) => {
       this.usersData = data.result.response
       if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
         _.filter(this.usersData.content, { isDeleted: false }).forEach((user: any) => {
diff --git a/project/ws/app/src/lib/routes/home/services/approvals.service.ts b/project/ws/app/src/lib/routes/home/services/approvals.service.ts
index 4a79c606e..318779ad2 100644
--- a/project/ws/app/src/lib/routes/home/services/approvals.service.ts
+++ b/project/ws/app/src/lib/routes/home/services/approvals.service.ts
@@ -1,17 +1,29 @@
 import { Injectable } from '@angular/core'
 import { HttpClient } from '@angular/common/http'
-import { Observable } from 'rxjs'
+import { Observable, of } from 'rxjs'
+import { ConfigurationsService } from '@sunbird-cb/utils'
 
 const API_END_POINTS = {
   APPROVALS: '/apis/protected/v8/workflowhandler/applicationsSearch',
+  WORKFLOW_HANDLER: 'apis/protected/v8/workflowhandler/transition',
 }
 
 @Injectable({
   providedIn: 'root',
 })
 export class ApprovalsService {
-  constructor(private http: HttpClient) { }
+  constructor(private http: HttpClient, private configSrv: ConfigurationsService) { }
   getApprovals(request: any): Observable<any> {
     return this.http.post<any>(API_END_POINTS.APPROVALS, request)
   }
+
+  getProfileConfig(): Promise<any> {
+    const baseUrl = this.configSrv.sitePath
+    const config = this.http.get<any>(`${baseUrl}/feature/approvals.json`).toPromise()
+    return of(config).toPromise()
+  }
+
+  handleWorkflow(request: any): Observable<any> {
+    return this.http.post<any>(API_END_POINTS.WORKFLOW_HANDLER, request)
+  }
 }
diff --git a/project/ws/app/src/lib/routes/users/services/users.service.ts b/project/ws/app/src/lib/routes/users/services/users.service.ts
index 393f6486a..d872beb5f 100644
--- a/project/ws/app/src/lib/routes/users/services/users.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/users.service.ts
@@ -117,14 +117,11 @@ export class UsersService {
     return this.http.post<any>(`${API_END_POINTS.NEW_USER_UN_BLOCK_API}`, org)
   }
 
-  getAllKongUsers(depId: string, userStatus: number, pageLimit: number = 20, offsetNum: number = 0, searchText?: string): Observable<any> {
+  getAllKongUsers(filters: any, pageLimit: number = 20, offsetNum: number = 0, searchText?: string): Observable<any> {
     let reqBody
     reqBody = {
       request: {
-        filters: {
-          rootOrgId: depId,
-          status: userStatus,
-        },
+        filters: filters,
         limit: pageLimit,
         offset: offsetNum,
         query: searchText,

From e74da68835ee84dee439aabdfb3b3e75134fd8f6 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Sat, 4 May 2024 01:12:20 +0530
Subject: [PATCH 570/887] Copying userview code to new allusers component

---
 .../all-users/all-users.component.html        |  60 ++++++---
 .../all-users/all-users.component.ts          |  67 +++++++---
 .../users-view/users-view.component.html      | 123 +-----------------
 3 files changed, 92 insertions(+), 158 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.html
index 41800e41d..a0e39548d 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.html
@@ -1,5 +1,14 @@
 <div class="flex flex-4 flex-column main-flex-box">
   <mat-card class="no-border">
+    <!-- <mat-card-header class="flex-custom-m">
+      <div class="flex-1" role="link" tabindex="0">
+        <div class="flex flex-1">
+          <mat-card-title class="flex-4 mobile-margin text-capitalize">
+            <span class="h-600-s-20-m color-87">Users</span>
+          </mat-card-title>
+        </div>
+      </div>
+    </mat-card-header> -->
     <mat-card-title class="flex-4 mobile-margin text-capitalize margin-bottom-l">
       <span class="h-600-s-20-m color-87">Users</span>
     </mat-card-title>
@@ -9,7 +18,9 @@
           <div class="flex-4 mobile-margin text-capitalize mat-h2">Note:</div>
           <ng-container *ngFor="let note of reportsNoteList">
             <div class="flex gap-4 mb-4">
-              <mat-icon class="infoIcon">error_outline</mat-icon>
+              <div>
+                <mat-icon class="infoIcon">error_outline</mat-icon>
+              </div>
               <div [innerHTML]="sanitizeHtml(note)"></div>
             </div>
           </ng-container>
@@ -18,7 +29,9 @@
           <div class="reportsDemoVideo flex flex-column flex-middle justify-center margin-top-m"
             (click)="openVideoPopup()">
             <mat-icon class="video_icon mb-2">play_circle</mat-icon>
-            Watch how it works
+            <div>
+              Watch how it works
+            </div>
           </div>
         </div>
       </mat-card-content>
@@ -26,34 +39,43 @@
     <mat-card-content>
       <div class="flex flex-1 flex-column margin-fix">
         <div class="flex flex-1 filter max-height-60">
-          <a routerLink="/app/home/users/all-users" routerLinkActive="router-link-active" class="filter-option"
+          <!-- <a routerLink="/app/home/users/active" routerLinkActive="router-link-active" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'active',
+              'ws-mat-accent-border font-medium':currentFilter !== 'active'}" mat-button
+            (click)="filter('active'); tabTelemetry('active', 0)" role="button">Registered</a>
+          <a routerLink="/app/home/users/inactive" routerLinkActive="router-link-active" class="filter-option"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'inactive',
+                          'ws-mat-accent-border font-medium':currentFilter !== 'inactive'}" mat-button
+            (click)="filter('inactive'); tabTelemetry('inactive', 1)" role="button">Inactive</a>
+          <a routerLink="/app/home/users/upload" routerLinkActive="router-link-active" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'upload',
+                                      'ws-mat-accent-border font-medium':currentFilter !== 'upload'}" mat-button
+            (click)="filter('upload'); tabTelemetry('upload', 2)" role="button">File uploads</a> -->
+
+          <a routerLink="/app/home/users/allusers" routerLinkActive="router-link-active" class="filter-option"
             [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'allusers','ws-mat-accent-border font-medium':currentFilter !== 'allusers'}"
             mat-button (click)="filter('allusers'); tabTelemetry('allusers', 0)" role="button">All users
             ({{activeUsersDataCount}})</a>
 
-          <a routerLink="/app/home/users/all-users/verified" routerLinkActive="router-link-active" class="filter-option"
+          <a routerLink="/app/home/users/verified" routerLinkActive="router-link-active" class="filter-option"
             [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'verified','ws-mat-accent-border font-medium':currentFilter !== 'verified'}"
             mat-button (click)="filter('verified'); tabTelemetry('verified', 0)" role="button">Verified
             ({{verifiedUsersDataCount}})</a>
 
-          <a routerLink="/app/home/users/all-users/nonverified" routerLinkActive="router-link-active"
-            class="filter-option"
+          <a routerLink="/app/home/users/nonverified" routerLinkActive="router-link-active" class="filter-option"
             [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'nonverified','ws-mat-accent-border font-medium':currentFilter !== 'nonverified'}"
             mat-button (click)="filter('nonverified'); tabTelemetry('nonverified', 0)" role="button">Non-verified
             ({{nonverifiedUsersDataCount}})</a>
 
-          <a routerLink="/app/home/users/all-users/notmyuser" routerLinkActive="router-link-active"
-            class="filter-option"
+          <!-- <a routerLink="/app/home/users/notmyuser" routerLinkActive="router-link-active" class="filter-option"
             [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'notmyuser','ws-mat-accent-border font-medium':currentFilter !== 'notmyuser'}"
             mat-button (click)="filter('notmyuser'); tabTelemetry('notmyuser', 0)" role="button">Not my user
-            ({{notmyuserUsersDataCount}})</a>
+            ({{notmyuserUsersDataCount}})</a> -->
         </div>
       </div>
       <!-- <ws-widget-org-user-table-v2 [userId]="currentUser" [tableData]="tabledata" [data]="dataForTable"
-                [isUpload]=false [isCreate]=true (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuActions($event)"
-                (searchByEnterKey)="onEnterkySearch($event)" (pageChangeClick)="onPaginateChange($event)"
-                [showEditOnCondition]=true [totalRecords]="userDataTotalCount" [tabChangeIndex]="pageIndex">
-              </ws-widget-org-user-table-v2> -->
+        [isUpload]=false [isCreate]=true (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuActions($event)"
+        (searchByEnterKey)="onEnterkySearch($event)" (pageChangeClick)="onPaginateChange($event)"
+        [showEditOnCondition]=true [totalRecords]="userDataTotalCount" [tabChangeIndex]="pageIndex">
+      </ws-widget-org-user-table-v2> -->
 
       <ng-container *ngIf="usersData && currentFilter === 'allusers'">
         <div *ngIf="usersData?.count > 0">
@@ -62,7 +84,7 @@
             (searchByEnterKey)="onEnterkySearch($event)"
             (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
         </div>
-        <p class="text-center" *ngIf="usersData?.count === 0">No users found</p>
+        <p class="margin-top-l margin-bottom-l" *ngIf="usersData?.count === 0">No users found</p>
       </ng-container>
       <ng-container *ngIf="usersData && currentFilter === 'verified'">
         <div *ngIf="usersData?.count > 0">
@@ -71,7 +93,7 @@
             (searchByEnterKey)="onEnterkySearch($event)"
             (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
         </div>
-        <p class="text-center" *ngIf="usersData?.count === 0">No users found</p>
+        <p class="margin-top-l margin-bottom-l" *ngIf="usersData?.count === 0">No users found</p>
       </ng-container>
       <ng-container *ngIf="usersData && currentFilter === 'nonverified'">
         <div *ngIf="usersData?.count > 0">
@@ -80,17 +102,17 @@
             (searchByEnterKey)="onEnterkySearch($event)"
             (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
         </div>
-        <p class="text-center" *ngIf="usersData?.count === 0">No users found</p>
+        <p class="margin-top-l margin-bottom-l" *ngIf="usersData?.count === 0">No users found</p>
       </ng-container>
-      <ng-container *ngIf="usersData && currentFilter === 'notmyuser'">
+      <!-- <ng-container *ngIf="usersData && currentFilter === 'notmyuser'">
         <div *ngIf="usersData?.count > 0">
           <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
             [totalRecords]="notmyuserUsersDataCount" [tabChangeIndex]="pageIndex"
             (searchByEnterKey)="onEnterkySearch($event)"
             (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
         </div>
-        <p class="text-center" *ngIf="usersData?.count === 0">No users found</p>
-      </ng-container>
+        <p class="margin-top-l margin-bottom-l" *ngIf="usersData?.count === 0">No users found</p>
+      </ng-container> -->
 
       <ng-container *ngIf="currentFilter === 'upload'">
         <ws-app-users-upload></ws-app-users-upload>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.ts
index 37448cdef..7d2b8fb61 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.ts
@@ -1,21 +1,22 @@
 import { Component, OnDestroy, OnInit } from '@angular/core'
 import { MatDialog } from '@angular/material/dialog'
 import { ActivatedRoute, Router } from '@angular/router'
-import { PageEvent } from '@angular/material'
-import { EventService } from '@sunbird-cb/utils'
-import { DomSanitizer, SafeHtml } from '@angular/platform-browser'
 /* tslint:disable */
 import _ from 'lodash'
 /* tslint:enable */
-
+// import { environment } from 'src/environments/environment'
+import { PageEvent } from '@angular/material'
+import { EventService } from '@sunbird-cb/utils'
 import { NsContent } from '@sunbird-cb/collection'
-import { ReportsVideoComponent } from '../../reports-video/reports-video.component'
+import { DomSanitizer, SafeHtml } from '@angular/platform-browser'
 import { NSProfileDataV2 } from '../../../models/profile-v2.model'
-import { TelemetryEvents } from '../../../../../head/_services/telemetry.event.model'
-
 import { UsersService } from '../../../../users/services/users.service'
 import { LoaderService } from '../../../../../../../../../../src/app/services/loader.service'
+import { TelemetryEvents } from '../../../../../head/_services/telemetry.event.model'
 import { ProfileV2UtillService } from '../../../services/home-utill.service'
+import { ReportsVideoComponent } from '../../reports-video/reports-video.component'
+
+// import * as XLSX from 'xlsx'
 
 @Component({
   selector: 'ws-all-users',
@@ -26,10 +27,10 @@ import { ProfileV2UtillService } from '../../../services/home-utill.service'
   host: { class: 'flex flex-1 margin-top-l' },
   /* tslint:enable */
 })
-
 export class AllUsersComponent implements OnInit, OnDestroy {
-
-  // Math: any
+  /* tslint:disable */
+  Math: any
+  /* tslint:enable */
   currentFilter = 'allusers'
   filterPath = '/app/home/users'
   discussionList!: any
@@ -38,6 +39,7 @@ export class AllUsersComponent implements OnInit, OnDestroy {
   userDetails: any
   location!: string | null
   tabs: any
+  // tabsData: NSProfileDataV2.IProfileTab[]
   currentUser!: any
   connectionRequests!: any[]
   data: any = []
@@ -66,17 +68,32 @@ export class AllUsersComponent implements OnInit, OnDestroy {
     public dialog: MatDialog,
     private route: ActivatedRoute,
     private router: Router,
+    // private snackBar: MatSnackBar,
     private events: EventService,
     private loaderService: LoaderService,
     private profileUtilSvc: ProfileV2UtillService,
     private sanitizer: DomSanitizer,
+    // private telemetrySvc: TelemetryService,
+    // private configSvc: ConfigurationsService,
+    // private discussService: DiscussService,
+    // private configSvc: ConfigurationsService,
+    // private networkV2Service: NetworkV2Service,
+    // private profileV2Svc: ProfileV2Service
     private usersService: UsersService
   ) {
-    // this.Math = Math
+    this.Math = Math
     this.configSvc = this.route.parent && this.route.parent.snapshot.data.configService
     this.currentUser = this.configSvc.userProfile && this.configSvc.userProfile.userId
+
+    // this.usersData = _.get(this.route, 'snapshot.data.usersList.data') || {}
+    // this.filterData()
   }
 
+  ngOnDestroy() {
+    // if (this.tabs) {
+    //   this.tabs.unsubscribe()
+    // }
+  }
   ngOnInit() {
     this.rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
     this.searchQuery = ''
@@ -159,7 +176,9 @@ export class AllUsersComponent implements OnInit, OnDestroy {
     if (this.isMdoAdmin) {
       if (roles && roles.length > 0) {
         return true
+        //   return (roles.includes('PUBLIC') && roles.length === 1)
       }
+      // return false
     }
     return true
   }
@@ -187,8 +206,25 @@ export class AllUsersComponent implements OnInit, OnDestroy {
   getUsers(query: string, currentFilter: any) {
     this.loaderService.changeLoad.next(true)
     const usersData: any[] = []
-    const status = currentFilter === 'allusers' ? 1 : 1
-    this.usersService.getAllKongUsers(this.rootOrgId, status, this.limit, this.pageIndex, query).subscribe((data: any) => {
+    let filtreq = {}
+    if (currentFilter === 'allusers') {
+      filtreq = {
+        'rootOrgId': this.rootOrgId,
+        'status': 1,
+      }
+    } else if (currentFilter === 'verified') {
+      filtreq = {
+        'rootOrgId': this.rootOrgId,
+        'profileDetails.profileStatus': 'VERIFIED'
+      }
+    } else if (currentFilter === 'nonverified') {
+      filtreq = {
+        'rootOrgId': this.rootOrgId,
+        'profileDetails.profileStatus': 'NOT-VERIFIED'
+      }
+    }
+
+    this.usersService.getAllKongUsers(filtreq, this.limit, this.pageIndex, query).subscribe((data: any) => {
       this.usersData = data.result.response
       if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
         _.filter(this.usersData.content, { isDeleted: false }).forEach((user: any) => {
@@ -279,7 +315,4 @@ export class AllUsersComponent implements OnInit, OnDestroy {
     this.limit = event.pageSize
     this.filterData(this.searchQuery)
   }
-
-  ngOnDestroy() {
-  }
-}
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index a0e39548d..90c6b6463 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -1,122 +1 @@
-<div class="flex flex-4 flex-column main-flex-box">
-  <mat-card class="no-border">
-    <!-- <mat-card-header class="flex-custom-m">
-      <div class="flex-1" role="link" tabindex="0">
-        <div class="flex flex-1">
-          <mat-card-title class="flex-4 mobile-margin text-capitalize">
-            <span class="h-600-s-20-m color-87">Users</span>
-          </mat-card-title>
-        </div>
-      </div>
-    </mat-card-header> -->
-    <mat-card-title class="flex-4 mobile-margin text-capitalize margin-bottom-l">
-      <span class="h-600-s-20-m color-87">Users</span>
-    </mat-card-title>
-    <mat-card class="mb-8">
-      <mat-card-content class="flex gap-10">
-        <div class="section-1">
-          <div class="flex-4 mobile-margin text-capitalize mat-h2">Note:</div>
-          <ng-container *ngFor="let note of reportsNoteList">
-            <div class="flex gap-4 mb-4">
-              <div>
-                <mat-icon class="infoIcon">error_outline</mat-icon>
-              </div>
-              <div [innerHTML]="sanitizeHtml(note)"></div>
-            </div>
-          </ng-container>
-        </div>
-        <div class="reportsDemo flex justify-end section-2">
-          <div class="reportsDemoVideo flex flex-column flex-middle justify-center margin-top-m"
-            (click)="openVideoPopup()">
-            <mat-icon class="video_icon mb-2">play_circle</mat-icon>
-            <div>
-              Watch how it works
-            </div>
-          </div>
-        </div>
-      </mat-card-content>
-    </mat-card>
-    <mat-card-content>
-      <div class="flex flex-1 flex-column margin-fix">
-        <div class="flex flex-1 filter max-height-60">
-          <!-- <a routerLink="/app/home/users/active" routerLinkActive="router-link-active" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'active',
-              'ws-mat-accent-border font-medium':currentFilter !== 'active'}" mat-button
-            (click)="filter('active'); tabTelemetry('active', 0)" role="button">Registered</a>
-          <a routerLink="/app/home/users/inactive" routerLinkActive="router-link-active" class="filter-option"
-            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'inactive',
-                          'ws-mat-accent-border font-medium':currentFilter !== 'inactive'}" mat-button
-            (click)="filter('inactive'); tabTelemetry('inactive', 1)" role="button">Inactive</a>
-          <a routerLink="/app/home/users/upload" routerLinkActive="router-link-active" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'upload',
-                                      'ws-mat-accent-border font-medium':currentFilter !== 'upload'}" mat-button
-            (click)="filter('upload'); tabTelemetry('upload', 2)" role="button">File uploads</a> -->
-
-          <a routerLink="/app/home/users/allusers" routerLinkActive="router-link-active" class="filter-option"
-            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'allusers','ws-mat-accent-border font-medium':currentFilter !== 'allusers'}"
-            mat-button (click)="filter('allusers'); tabTelemetry('allusers', 0)" role="button">All users
-            ({{activeUsersDataCount}})</a>
-
-          <a routerLink="/app/home/users/verified" routerLinkActive="router-link-active" class="filter-option"
-            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'verified','ws-mat-accent-border font-medium':currentFilter !== 'verified'}"
-            mat-button (click)="filter('verified'); tabTelemetry('verified', 0)" role="button">Verified
-            ({{verifiedUsersDataCount}})</a>
-
-          <a routerLink="/app/home/users/nonverified" routerLinkActive="router-link-active" class="filter-option"
-            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'nonverified','ws-mat-accent-border font-medium':currentFilter !== 'nonverified'}"
-            mat-button (click)="filter('nonverified'); tabTelemetry('nonverified', 0)" role="button">Non-verified
-            ({{nonverifiedUsersDataCount}})</a>
-
-          <!-- <a routerLink="/app/home/users/notmyuser" routerLinkActive="router-link-active" class="filter-option"
-            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'notmyuser','ws-mat-accent-border font-medium':currentFilter !== 'notmyuser'}"
-            mat-button (click)="filter('notmyuser'); tabTelemetry('notmyuser', 0)" role="button">Not my user
-            ({{notmyuserUsersDataCount}})</a> -->
-        </div>
-      </div>
-      <!-- <ws-widget-org-user-table-v2 [userId]="currentUser" [tableData]="tabledata" [data]="dataForTable"
-        [isUpload]=false [isCreate]=true (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuActions($event)"
-        (searchByEnterKey)="onEnterkySearch($event)" (pageChangeClick)="onPaginateChange($event)"
-        [showEditOnCondition]=true [totalRecords]="userDataTotalCount" [tabChangeIndex]="pageIndex">
-      </ws-widget-org-user-table-v2> -->
-
-      <ng-container *ngIf="usersData && currentFilter === 'allusers'">
-        <div *ngIf="usersData?.count > 0">
-          <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
-            [totalRecords]="activeUsersDataCount" [tabChangeIndex]="pageIndex" [isApprovals]="false"
-            (searchByEnterKey)="onEnterkySearch($event)"
-            (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
-        </div>
-        <p class="margin-top-l margin-bottom-l" *ngIf="usersData?.count === 0">No users found</p>
-      </ng-container>
-      <ng-container *ngIf="usersData && currentFilter === 'verified'">
-        <div *ngIf="usersData?.count > 0">
-          <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
-            [totalRecords]="verifiedUsersDataCount" [tabChangeIndex]="pageIndex"
-            (searchByEnterKey)="onEnterkySearch($event)"
-            (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
-        </div>
-        <p class="margin-top-l margin-bottom-l" *ngIf="usersData?.count === 0">No users found</p>
-      </ng-container>
-      <ng-container *ngIf="usersData && currentFilter === 'nonverified'">
-        <div *ngIf="usersData?.count > 0">
-          <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
-            [totalRecords]="nonverifiedUsersDataCount" [tabChangeIndex]="pageIndex"
-            (searchByEnterKey)="onEnterkySearch($event)"
-            (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
-        </div>
-        <p class="margin-top-l margin-bottom-l" *ngIf="usersData?.count === 0">No users found</p>
-      </ng-container>
-      <!-- <ng-container *ngIf="usersData && currentFilter === 'notmyuser'">
-        <div *ngIf="usersData?.count > 0">
-          <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
-            [totalRecords]="notmyuserUsersDataCount" [tabChangeIndex]="pageIndex"
-            (searchByEnterKey)="onEnterkySearch($event)"
-            (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
-        </div>
-        <p class="margin-top-l margin-bottom-l" *ngIf="usersData?.count === 0">No users found</p>
-      </ng-container> -->
-
-      <ng-container *ngIf="currentFilter === 'upload'">
-        <ws-app-users-upload></ws-app-users-upload>
-      </ng-container>
-    </mat-card-content>
-  </mat-card>
-</div>
\ No newline at end of file
+<router-outlet></router-outlet>
\ No newline at end of file

From 8b3badc4fd77671fcb2ce46543e90e5244963e41 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Sun, 5 May 2024 12:51:59 +0530
Subject: [PATCH 571/887] Updated approval listing conditions

---
 .../user-cards/user-card.component.html       |  2 +-
 .../user-cards/user-card.component.ts         | 14 +++--
 .../approval-pending.component.ts             | 58 +++++++++----------
 3 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 334130427..d53a5a73c 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -507,7 +507,7 @@
         </div>
       </mat-expansion-panel-header>
 
-      <div class="panel-body" *ngIf="appData.user">
+      <div class="panel-body" *ngIf="appData?.user">
         <form [formGroup]="approveUserDataForm" class="margin-top-m">
           <!-- <button mat-button class="my-4 mr-4" (click)="addRejection()">add reason</button>
               <button mat-button class="my-4 mr-4" (click)="updateRejection()">update reason</button> -->
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index bd9a4ae4d..01452219f 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -154,12 +154,14 @@ export class UserCardComponent implements OnInit {
   // for approvals
   async getUserMappedData(approvalData: any) {
     approvalData.forEach((data: any) => {
-      const id = data.userWorkflow.userInfo.wid
-      this.usersSvc.getUserById(id).subscribe((res: any) => {
-        if (res) {
-          data.user = res
-        }
-      })
+      if (data.userWorkflow && data.userWorkflow.userInfo) {
+        const id = data.userWorkflow.userInfo.wid
+        this.usersSvc.getUserById(id).subscribe((res: any) => {
+          if (res) {
+            data.user = res
+          }
+        })
+      }
     })
   }
 
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
index 7f1d923eb..3c2855ed9 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
@@ -125,19 +125,19 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   }
 
   fetchApprovals() {
-    const conditions = [
-      ['location', 'Country'],
-      ['designation', 'Designation'],
-      ['group', 'Group'],
-      ['name', 'Organisation Name'],
-      ['orgNameOther', 'Other Organisation Name'],
-      ['industry', 'Industry'],
-      ['industryOther', 'Other Industry'],
-      ['doj', 'Date of Joining'],
-      ['organisationType', 'Type of Organisation'],
-      ['orgDesc', 'Organisation Description'],
-      ['verifiedKarmayogi', 'Verified Karmayogi'],
-    ]
+    // const conditions = [
+    //   ['location', 'Country'],
+    //   ['designation', 'Designation'],
+    //   ['group', 'Group'],
+    //   ['name', 'Organisation Name'],
+    //   ['orgNameOther', 'Other Organisation Name'],
+    //   ['industry', 'Industry'],
+    //   ['industryOther', 'Other Industry'],
+    //   ['doj', 'Date of Joining'],
+    //   ['organisationType', 'Type of Organisation'],
+    //   ['orgDesc', 'Organisation Description'],
+    //   ['verifiedKarmayogi', 'Verified Karmayogi'],
+    // ]
 
     if (this.departName) {
       const req = {
@@ -149,8 +149,9 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
       }
       this.apprService.getApprovals(req).subscribe(res => {
         this.data = []
+        let newarray: any = []
         let currentdate: Date
-        this.approvalTotalCount = res.result.count
+        // this.approvalTotalCount = res.result.count
         const resData = res.result.data
         resData.forEach((approval: any) => {
           let keys = ''
@@ -161,32 +162,30 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
               if (fields.length > 0) {
                 fields.forEach((field: any) => {
                   if (Object.keys(field.fromValue).length > 0) {
-
                     keys += `${_.first(Object.keys(field.fromValue))}, `
                   } else {
                     keys += `${_.first(Object.keys(field.toValue))}, `
                   }
+
+                  const labelKey = Object.keys(field.toValue)[0]
+                  if (labelKey === 'designation' || labelKey === 'group') {
+                    if (newarray.find((u: any) => u.userInfo.wid === approval.userInfo.wid) === undefined) {
+                      newarray.push(approval)
+                    }
+                  }
                 })
               }
             }
           })
+        })
 
+        newarray.forEach((appr: any) => {
           this.data.push({
-            fullname: approval.userInfo ? `${approval.userInfo.first_name}` : '--',
-            // fullname: approval.userInfo ? `${approval.userInfo.first_name} ${approval.userInfo.last_name}` : '--',
-            // requestedon: `${currentdate.getDate()}
-            //   requestedon: `${currentdate.getDate()}
-            // ${moment(currentdate.getMonth() + 1, 'MM').format('MMM')}
-            // ${currentdate.getFullYear()}
-            // ${currentdate.getHours()} :
-            // ${currentdate.getMinutes()} :
-            // ${currentdate.getSeconds()}`,
-            // requestedon: this.datePipe.transform(currentdate, 'dd MMM y'),
-            // fields: keys.slice(0, -1),
+            fullname: appr.userInfo ? `${appr.userInfo.first_name}` : '--',
             requestedon: currentdate,
-            fields: this.replaceWords(keys, conditions),
-            userWorkflow: approval,
-            tag: (approval.userInfo && approval.userInfo.tag) ? `${approval.userInfo.tag}` : '',
+            // fields: this.replaceWords(keys, conditions),
+            userWorkflow: appr,
+            tag: (appr.userInfo && appr.userInfo.tag) ? `${appr.userInfo.tag}` : '',
           })
           this.data.sort((a: any, b: any) => {
             const textA = a.fullname.toUpperCase()
@@ -194,6 +193,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
             return (textA < textB) ? -1 : (textA > textB) ? 1 : 0
           })
         })
+        this.approvalTotalCount = this.data.length
       })
     } else {
       this.snackbar.open('Please connect to your SPV admin, to update MDO name.')

From 20e162250fb179e43776ee252fddacf02a14abbf Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Sun, 5 May 2024 18:23:33 +0530
Subject: [PATCH 572/887] Updated approval flows & UI updates

---
 .../user-cards/user-card.component.html       |  43 +++++--
 .../user-cards/user-card.component.scss       |  82 ++++++-------
 .../user-cards/user-card.component.ts         | 109 ++++++++++--------
 .../approval-pending.component.ts             |  13 +--
 4 files changed, 131 insertions(+), 116 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index d53a5a73c..00da63df0 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -328,7 +328,7 @@
             </div>
 
             <div class="flex flex-row margin-top-l">
-              <button mat-raised-button type="submit" (click)="onSubmit(updateUserDataForm, user)"
+              <button mat-raised-button type="submit" (click)="onSubmit(updateUserDataForm, user, panel)"
                 class="margin-right-m btn-success btn-responsive successbtn" [disabled]="updateUserDataForm?.invalid">
                 <span class="text-white" i18n>
                   Update
@@ -505,6 +505,11 @@
             </div>
           </div>
         </div>
+
+        <div class="float-right">
+          <p class="mat-body-2 margin-top-l margin-right-m"><mat-icon class="orangeicon">error</mat-icon>
+            {{appData?.userWorkflow?.wfInfo.length}} approval pending</p>
+        </div>
       </mat-expansion-panel-header>
 
       <div class="panel-body" *ngIf="appData?.user">
@@ -544,7 +549,7 @@
                 </mat-radio-group>
               </div> -->
               <ng-container *ngFor="let field of needApprovalList">
-                <div class="md:w-1/3">
+                <div class="md:w-1/3 margin-bottom-s">
                   <div *ngIf="field.fieldKey !== 'verifiedKarmayogi'">
                     <label class="view-text-label">{{field.label}}</label>
                   </div>
@@ -564,7 +569,8 @@
                         (click)="onClickHandleWorkflow(field,'APPROVE')">Approve</mat-radio-button>
                       <mat-radio-button value="reject"
                         (click)="onClickHandleWorkflow(field,'REJECT')">Reject</mat-radio-button>
-                      <mat-icon class="margin-left-m" *ngIf="field.action === 'REJECT' && comment !== ''"
+                      <mat-icon class="margin-left-m editreasonicon cursor-pointer"
+                        *ngIf="field.action === 'REJECT' && comment !== ''"
                         (click)="updateRejection(field)">chat_bubble</mat-icon>
                     </mat-radio-group>
                   </div>
@@ -685,7 +691,7 @@
         </div>
 
         <div class="flex flex-row margin-top-l">
-          <button mat-raised-button type="submit" (click)="onApprovalSubmit()"
+          <button mat-raised-button type="submit" (click)="onApprovalSubmit(panel)"
             class="margin-right-m btn-success btn-responsive successbtn" [disabled]="actionList.length === 0">
             <span class="text-white" i18n>
               Update
@@ -712,22 +718,39 @@
 </div>
 
 <ng-template #rejectDialog>
-  <form>
+  <form class="rejectdialog">
     <p mat-dialog-title class="dialog-title">Reason for rejection</p>
     <mat-dialog-content>
-      <!-- <p class="appr-text margin-top-l">Please specify the reason for rejection</p> -->
-      <!-- <textarea rows="4" [(ngModel)]="comment" placeholder="Type the description in fewer than 100 characters"
-        name="comment" class="reject-reason-text"></textarea> -->
-
       <mat-form-field class="w-full mt-5" appearance="outline">
         <textarea matInput class="reason-text-area" [(ngModel)]="comment" name="reason"
           placeholder="Type the description in fewer than 100 characters" i18n-placeholder resizable="none"></textarea>
       </mat-form-field>
     </mat-dialog-content>
     <mat-dialog-actions class="flex flex-wrap justify-end">
+      <button mat-raised-button class="btn-success btn-responsive successbtn" [mat-dialog-close]="true"
+        [disabled]="!comment">
+        <span class="text-white">Submit</span></button>
       <button mat-raised-button class="btn-success btn-responsive cancelbtn" matDialogClose>Cancel</button>
+    </mat-dialog-actions>
+  </form>
+</ng-template>
+
+<ng-template #updaterejectDialog>
+  <form class="rejectdialog">
+    <p mat-dialog-title class="dialog-title">Reason for rejection
+      <mat-icon (click)="showedit()" *ngIf="!showeditText" class="float-right cursor-pointer">edit_square</mat-icon>
+    </p>
+    <mat-dialog-content>
+      <p class="margin-top-l margin-bottom-l" *ngIf="!showeditText">{{comment}}</p>
+      <mat-form-field class="w-full mt-5" appearance="outline" *ngIf="showeditText">
+        <textarea matInput class="reason-text-area" [(ngModel)]="comment" name="reason"
+          placeholder="Type the description in fewer than 100 characters" i18n-placeholder resizable="none"></textarea>
+      </mat-form-field>
+    </mat-dialog-content>
+    <mat-dialog-actions class="flex flex-wrap justify-end" *ngIf="showeditText">
       <button mat-raised-button class="btn-success btn-responsive successbtn" [mat-dialog-close]="true">
-        <span class="text-white">Submit</span></button>
+        <span class="text-white">Update</span></button>
+      <button mat-raised-button class="btn-success btn-responsive cancelbtn" matDialogClose>Cancel</button>
     </mat-dialog-actions>
   </form>
 </ng-template>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
index 087df89ca..c911449c0 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
@@ -16,7 +16,7 @@
     display: block !important;
   }
   .float-left {
-    width: 86%;
+    width: 82%;
   }
 
   .initialcircle {
@@ -76,7 +76,15 @@
     }
   }
 }
+::ng-deep .mat-expansion-panel-header .mat-expansion-indicator::after {
+    content: "+";
+    border: 0;
+    transform: none;
+  }
 
+::ng-deep .mat-expansion-panel-header.mat-expanded .mat-expansion-indicator::after {
+    content: "-";
+}
 ::ng-deep .initialcircle .circle-l {
   border-radius: 50% !important;
   width: 60px !important;
@@ -270,55 +278,33 @@ label {
     padding: 0px !important;
   }
 }
+.orangeicon {
+  color: #e99e38;
+  vertical-align: middle;
+  height: 30px !important;
+}
+.editreasonicon {
+  vertical-align: middle;
+  color: #666 !important;
+}
+::ng-deep .mat-dialog-container {
+  padding: 0 !important;
+  overflow: unset !important;
+}
 
-.rejection {
-
-  .header {
-    height: 80px;
-    background-color: rgba(27, 76, 161, 1);
-    color: rgba(255, 255, 255, 1);
-    font-size: 24px;
-    font-weight: 700;
-
-    .editBox {
-      width: 24px;
-      cursor: pointer;
-    }
-  }
-
-  .reason-description {
-    padding: 20px;
-    font-size: 14px;
-    color: rgba(0, 0, 0, 1);
+.rejectdialog {
+  .mat-dialog-title {
+    background: #1b4ca1;
+    color: #fff;
+    padding: 1em 1em;
+    font: 500 18px/24px Montserrat !important;
   }
-
-  .reason-text-area {
-    height: 170px;
-    resize: none;
+  .mat-dialog-content {
+    margin: 0 !important;
+    padding: 0 24px !important;
   }
-
-  .footer {
-    height: 75px;
-    background-color: rgba(241, 240, 244, 1);
-
-    // .submit-btn {
-    //   height: 40px;
-    //   padding: 12px, 16px, 12px, 16px;
-    //   background-color: rgba(27, 76, 161, 1);
-    //   color: rgba(255, 255, 255, 1);
-    //   font-size: 14px;
-    //   font-weight: 700;
-    //   border-radius: 4px;
-    // }
-
-    // .cancel-btn {
-    //   height: 40px;
-    //   padding: 12px, 16px, 12px, 16px;
-    //   color: rgba(27, 76, 161, 1);
-    //   border: 1px solid rgba(27, 76, 161, 1);
-    //   font-size: 14px;
-    //   font-weight: 700;
-    //   border-radius: 4px;
-    // }
+  .mat-dialog-actions {
+    padding: 10px 24px !important;
+    margin-bottom: 0 !important;
   }
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 01452219f..dca5b7df8 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -9,7 +9,7 @@ import { COMMA, ENTER } from '@angular/cdk/keycodes'
 // tslint:disable-next-line
 import _ from 'lodash'
 import { RolesService } from '../../../users/services/roles.service'
-import { ActivatedRoute, Router } from '@angular/router'
+import { ActivatedRoute } from '@angular/router'
 import { Observable, Subscription } from 'rxjs'
 import { debounceTime, distinctUntilChanged, map, startWith } from 'rxjs/operators'
 import { environment } from '../../../../../../../../../src/environments/environment'
@@ -42,10 +42,11 @@ export class UserCardComponent implements OnInit {
   @Output() paginationData = new EventEmitter()
   @Output() searchByEnterKey = new EventEmitter()
   @ViewChildren(MatExpansionPanel) panels!: QueryList<MatExpansionPanel>
-  @ViewChild('approveDialog', { static: false })
-  approveDialog!: TemplateRef<any>
+
   @ViewChild('rejectDialog', { static: false })
   rejectDialog!: TemplateRef<any>
+  @ViewChild('updaterejectDialog', { static: false })
+  updaterejectDialog!: TemplateRef<any>
 
   @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator | any
   startIndex = 0
@@ -97,9 +98,10 @@ export class UserCardComponent implements OnInit {
   qpParam: any
   department: any
   approvalData: any
+  showeditText = false
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-    private dialog: MatDialog, private router: Router, private approvalSvc: ApprovalsService,
+    private dialog: MatDialog, private approvalSvc: ApprovalsService,
     private route: ActivatedRoute, private snackBar: MatSnackBar,
     private events: EventService) {
     // this.route.data.subscribe((data: any) => {
@@ -275,53 +277,53 @@ export class UserCardComponent implements OnInit {
       this.actionList = []
       this.comment = ''
       this.getApprovalList(data)
-    }
-
-    this.roleservice.getAllRoles().subscribe((data: any) => {
-      const parseRoledata = JSON.parse(data.result.response.value)
-      this.orgTypeList = parseRoledata.orgTypeList
-
-      // New code for roles
-      for (let i = 0; i < this.orgTypeList.length; i += 1) {
-        if (this.orgTypeList[i].name === 'MDO') {
-          _.each(this.orgTypeList[i].roles, rolesObject => {
-            // if (this.isMdoAdmin) {
-            //   if (rolesObject === 'PUBLIC') {
-            //     this.uniqueRoles.push({
-            //       roleName: rolesObject, description: rolesObject,
-            //     })
-            //   }
-            //   if (rolesObject === 'MDO_DASHBOARD_USER') {
-            //     this.uniqueRoles.push({
-            //       roleName: rolesObject, description: rolesObject,
-            //     })
-            //   }
-            // } else {
-            // if (this.isMdoLeader) {
-            if (rolesObject !== 'MDO_LEADER') {
-              this.uniqueRoles.push({
-                roleName: rolesObject, description: rolesObject,
-              })
+    } else {
+      this.roleservice.getAllRoles().subscribe((data: any) => {
+        const parseRoledata = JSON.parse(data.result.response.value)
+        this.orgTypeList = parseRoledata.orgTypeList
+
+        // New code for roles
+        for (let i = 0; i < this.orgTypeList.length; i += 1) {
+          if (this.orgTypeList[i].name === 'MDO') {
+            _.each(this.orgTypeList[i].roles, rolesObject => {
+              // if (this.isMdoAdmin) {
+              //   if (rolesObject === 'PUBLIC') {
+              //     this.uniqueRoles.push({
+              //       roleName: rolesObject, description: rolesObject,
+              //     })
+              //   }
+              //   if (rolesObject === 'MDO_DASHBOARD_USER') {
+              //     this.uniqueRoles.push({
+              //       roleName: rolesObject, description: rolesObject,
+              //     })
+              //   }
+              // } else {
+              // if (this.isMdoLeader) {
+              if (rolesObject !== 'MDO_LEADER') {
+                this.uniqueRoles.push({
+                  roleName: rolesObject, description: rolesObject,
+                })
+                // }
+              }
               // }
-            }
-            // }
-          })
+            })
+          }
         }
-      }
-      this.uniqueRoles.forEach((role: any) => {
-        if (!this.rolesList.some((item: any) => item.roleName === role.roleName)) {
-          this.rolesList.push(role)
+        this.uniqueRoles.forEach((role: any) => {
+          if (!this.rolesList.some((item: any) => item.roleName === role.roleName)) {
+            this.rolesList.push(role)
+          }
+        })
+        const usrRoles = profileDataAll.organisations[0] && profileDataAll.organisations[0].roles
+          ? profileDataAll.organisations[0].roles : []
+        if (usrRoles.length > 0) {
+          usrRoles.forEach((role: any) => {
+            this.orguserRoles.push(role)
+            this.modifyUserRoles(role)
+          })
         }
       })
-      const usrRoles = profileDataAll.organisations[0] && profileDataAll.organisations[0].roles
-        ? profileDataAll.organisations[0].roles : []
-      if (usrRoles.length > 0) {
-        usrRoles.forEach((role: any) => {
-          this.orguserRoles.push(role)
-          this.modifyUserRoles(role)
-        })
-      }
-    })
+    }
   }
 
   setUserDetails(user: any) {
@@ -662,7 +664,7 @@ export class UserCardComponent implements OnInit {
   //   })
   // }
 
-  onSubmit(form: any, user: any) {
+  onSubmit(form: any, user: any, panel: any) {
     // console.log('user -------', user)
     // console.log('form *******', form)
     if (form.valid) {
@@ -727,7 +729,8 @@ export class UserCardComponent implements OnInit {
               if (res) {
                 this.updateUserDataForm.reset({ roles: '' })
                 this.openSnackbar('User role updated Successfully')
-                this.router.navigate(['/app/home/users/allusers'])
+                // this.router.navigate(['/app/home/users/allusers'])
+                this.closeOtherPanels(panel)
               }
             })
           } else {
@@ -804,17 +807,18 @@ export class UserCardComponent implements OnInit {
     })
   }
 
-  onApprovalSubmit() {
+  onApprovalSubmit(panel: any) {
     // console.log('this.actionList', this.actionList)
     if (this.actionList.length > 0) {
       this.actionList.forEach((req: any) => {
         this.onApproveOrRejectClick(req)
+        this.closeOtherPanels(panel)
       })
     }
   }
 
   updateRejection(field: any) {
-    const dialogRef = this.dialog.open(this.rejectDialog, {
+    const dialogRef = this.dialog.open(this.updaterejectDialog, {
       width: '770px',
     })
     dialogRef.afterClosed().subscribe(result => {
@@ -828,7 +832,10 @@ export class UserCardComponent implements OnInit {
         dialogRef.close()
       }
     })
+  }
 
+  showedit() {
+    this.showeditText = true
   }
 
   onClickAllHandleWorkflow(approvalList: any[], action: string) {
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
index 3c2855ed9..4f22bd914 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
@@ -154,19 +154,18 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
         // this.approvalTotalCount = res.result.count
         const resData = res.result.data
         resData.forEach((approval: any) => {
-          let keys = ''
+          // let keys = ''
           approval.wfInfo.forEach((wf: any) => {
             currentdate = new Date(wf.createdOn)
             if (typeof wf.updateFieldValues === 'string') {
               const fields = JSON.parse(wf.updateFieldValues)
               if (fields.length > 0) {
                 fields.forEach((field: any) => {
-                  if (Object.keys(field.fromValue).length > 0) {
-                    keys += `${_.first(Object.keys(field.fromValue))}, `
-                  } else {
-                    keys += `${_.first(Object.keys(field.toValue))}, `
-                  }
-
+                  // if (Object.keys(field.fromValue).length > 0) {
+                  //   keys += `${_.first(Object.keys(field.fromValue))}, `
+                  // } else {
+                  //   keys += `${_.first(Object.keys(field.toValue))}, `
+                  // }
                   const labelKey = Object.keys(field.toValue)[0]
                   if (labelKey === 'designation' || labelKey === 'group') {
                     if (newarray.find((u: any) => u.userInfo.wid === approval.userInfo.wid) === undefined) {

From 09f4c051a22f30843fd5dd8716f8c4469c2a031b Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Sun, 5 May 2024 18:54:08 +0530
Subject: [PATCH 573/887] Updated all users routing

---
 .../lib/routes/home/home.rounting.module.ts   |  6 +++---
 .../all-users/all-users.component.html        |  5 +++--
 .../all-users/all-users.component.ts          | 21 ++++---------------
 .../bulk-upload/bulk-upload.component.html    |  2 +-
 4 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/home.rounting.module.ts b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
index c7745d716..1c635fdf4 100644
--- a/project/ws/app/src/lib/routes/home/home.rounting.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
@@ -58,10 +58,10 @@ const routes: Routes = [
           {
             path: '',
             pathMatch: 'full',
-            redirectTo: 'all-users',
+            redirectTo: 'allusers',
           },
           {
-            path: 'all-users',
+            path: 'allusers',
             component: AllUsersComponent,
             resolve: {
               usersList: UsersListResolve,
@@ -76,7 +76,7 @@ const routes: Routes = [
             },
           },
           {
-            path: 'all-users/:tab',
+            path: 'allusers/:tab',
             component: AllUsersComponent,
             resolve: {
               usersList: UsersListResolve,
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.html
index a0e39548d..fae9da899 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.html
@@ -55,12 +55,13 @@
             mat-button (click)="filter('allusers'); tabTelemetry('allusers', 0)" role="button">All users
             ({{activeUsersDataCount}})</a>
 
-          <a routerLink="/app/home/users/verified" routerLinkActive="router-link-active" class="filter-option"
+          <a routerLink="/app/home/users/allusers/verified" routerLinkActive="router-link-active" class="filter-option"
             [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'verified','ws-mat-accent-border font-medium':currentFilter !== 'verified'}"
             mat-button (click)="filter('verified'); tabTelemetry('verified', 0)" role="button">Verified
             ({{verifiedUsersDataCount}})</a>
 
-          <a routerLink="/app/home/users/nonverified" routerLinkActive="router-link-active" class="filter-option"
+          <a routerLink="/app/home/users/allusers/nonverified" routerLinkActive="router-link-active"
+            class="filter-option"
             [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'nonverified','ws-mat-accent-border font-medium':currentFilter !== 'nonverified'}"
             mat-button (click)="filter('nonverified'); tabTelemetry('nonverified', 0)" role="button">Non-verified
             ({{nonverifiedUsersDataCount}})</a>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.ts
index 7d2b8fb61..f695e2562 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.ts
@@ -100,12 +100,12 @@ export class AllUsersComponent implements OnInit, OnDestroy {
     if (this.configSvc.unMappedUser && this.configSvc.unMappedUser.roles) {
       this.isMdoAdmin = this.configSvc.unMappedUser.roles.includes('MDO_ADMIN')
     }
-    this.filterData('')
+    // this.filterData('')
 
     this.getUsers('', 'allusers')
     this.getUsers('', 'verified')
     this.getUsers('', 'nonverified')
-    this.getUsers('', 'notmyuser')
+    // this.getUsers('', 'notmyuser')
 
     this.reportsNoteList = [
       `Easily create users individually or in bulk.`,
@@ -135,6 +135,7 @@ export class AllUsersComponent implements OnInit, OnDestroy {
 
   filter(filter: string) {
     this.currentFilter = filter
+    // console.log('filter---------', filter)
     this.pageIndex = 0
     this.currentOffset = 0
     this.limit = 20
@@ -153,21 +154,6 @@ export class AllUsersComponent implements OnInit, OnDestroy {
     )
   }
 
-  get dataForTable() {
-    switch (this.currentFilter) {
-      case 'allusers':
-        return this.activeUsersData
-      case 'verified':
-        return this.verifiedUsersData
-      case 'nonverified':
-        return this.nonverifiedUsersData
-      case 'notmyuser':
-        return this.notmyuserUsersData
-      default:
-        return []
-    }
-  }
-
   filterData(query: string) {
     this.getUsers(query, this.currentFilter)
   }
@@ -204,6 +190,7 @@ export class AllUsersComponent implements OnInit, OnDestroy {
   }
 
   getUsers(query: string, currentFilter: any) {
+    // console.log('currentFilter', currentFilter)
     this.loaderService.changeLoad.next(true)
     const usersData: any[] = []
     let filtreq = {}
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
index 8a1063c87..36acbdb42 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
@@ -1,6 +1,6 @@
 <div class="flex flex-col gap-6">
   <div class="flex flex-row gap-4 items-center">
-    <mat-icon class="cursor-pointer" [routerLink]="['/app/home/users/all-users']">arrow_back</mat-icon>
+    <mat-icon class="cursor-pointer" [routerLink]="['/app/home/users/allusers']">arrow_back</mat-icon>
     <div class="flex font-bold">Bulk Profile Update</div>
   </div>
 

From c985b2347d23aca46e6d35160f74a5c03022da44 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Mon, 6 May 2024 12:15:48 +0530
Subject: [PATCH 574/887] Reverted all users routing & updated edit flow

---
 .../components/search/search.component.html   |   2 +-
 .../user-cards/user-card.component.html       |  38 ++-
 .../user-cards/user-card.component.scss       |   9 +-
 .../user-cards/user-card.component.ts         | 105 +++---
 .../lib/routes/home/home.rounting.module.ts   | 152 +++++----
 .../users-view/users-view.component.html      | 123 ++++++-
 .../users-view/users-view.component.scss      |   4 +-
 .../routes/users-view/users-view.component.ts | 300 +++++++++++++++++-
 8 files changed, 615 insertions(+), 118 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.html b/project/ws/app/src/lib/routes/home/components/search/search.component.html
index dbe6d6f21..073231336 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.html
@@ -18,7 +18,7 @@
         </button>
     </div>
     <div class="flex flex-end" *ngIf="!isApprovals">
-        <button mat-button type="button" class="search-btn" [routerLink]="['/app/home/users/bulk-upload']"
+        <button mat-button type="button" class="search-btn" [routerLink]="['/app/home/bulk-upload']"
             [ngClass]="{'disable': isContentLive}">Create user</button>
     </div>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 00da63df0..4eb7bd07f 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -7,7 +7,7 @@
     <mat-expansion-panel class="user-card" *ngFor="let user of usersData?.content" #panel
       (opened)="closeOtherPanels(panel)">
       <mat-expansion-panel-header (click)="getUerData(user)">
-        <div class="float-left" (click)="$event.stopPropagation();">
+        <div class="float-left width88" (click)="$event.stopPropagation();">
           <div class="initialcircle display-inline-block margin-right-m">
             <!-- <span>AB</span> -->
             <ws-widget-avatar-photo [name]="getUseravatarName(user)" [photoUrl]="user?.photo" size="l">
@@ -67,7 +67,12 @@
                     Designation is mandatory
                   </mat-error>
                 </mat-form-field>
-                <mat-icon class="verified-icon margin-left-xs">check_circle</mat-icon>
+                <mat-icon class="verified-icon margin-left-xs"
+                  *ngIf="user?.profileDetails?.profileStatus === 'VERIFIED'">
+                  check_circle</mat-icon>
+                <mat-icon class="nonverified-icon margin-left-xs"
+                  *ngIf="user?.profileDetails?.profileStatus === 'NOT-VERIFIED'">
+                  check_circle</mat-icon>
               </div>
 
               <div class="md:w-1/3">
@@ -83,7 +88,12 @@
                     Group is mandatory
                   </mat-error>
                 </mat-form-field>
-                <mat-icon class="verified-icon margin-left-xs">check_circle</mat-icon>
+                <mat-icon class="verified-icon margin-left-xs"
+                  *ngIf="user?.profileDetails?.profileStatus === 'VERIFIED'">
+                  check_circle</mat-icon>
+                <mat-icon class="nonverified-icon margin-left-xs"
+                  *ngIf="user?.profileDetails?.profileStatus === 'NOT-VERIFIED'">
+                  check_circle</mat-icon>
               </div>
             </div>
           </div>
@@ -358,16 +368,28 @@
               <label class="view-text-label">Designation</label>
               <p>{{user.profileDetails && user.profileDetails.professionalDetails &&
                 user.profileDetails.professionalDetails.designation ?
-                user.profileDetails.professionalDetails.designation : '-'}} <mat-icon
-                  class="verified-icon">check_circle</mat-icon></p>
+                user.profileDetails.professionalDetails.designation : '-'}}
+                <mat-icon class="verified-icon margin-left-xs"
+                  *ngIf="user?.profileDetails?.profileStatus === 'VERIFIED'">
+                  check_circle</mat-icon>
+                <mat-icon class="nonverified-icon margin-left-xs"
+                  *ngIf="user?.profileDetails?.profileStatus === 'NOT-VERIFIED'">
+                  check_circle</mat-icon>
+              </p>
             </div>
 
             <div class="md:w-1/3">
               <label class="view-text-label">Group</label>
               <p>{{user.profileDetails && user.profileDetails.additionalProperties &&
                 user.profileDetails.additionalProperties.group ?
-                user.profileDetails.additionalProperties.group : '-'}} <mat-icon
-                  class="verified-icon">check_circle</mat-icon></p>
+                user.profileDetails.additionalProperties.group : '-'}}
+                <mat-icon class="verified-icon margin-left-xs"
+                  *ngIf="user?.profileDetails?.profileStatus === 'VERIFIED'">
+                  check_circle</mat-icon>
+                <mat-icon class="nonverified-icon margin-left-xs"
+                  *ngIf="user?.profileDetails?.profileStatus === 'NOT-VERIFIED'">
+                  check_circle</mat-icon>
+              </p>
             </div>
           </div>
         </div>
@@ -483,7 +505,7 @@
     <mat-expansion-panel class="user-card" *ngFor="let appData of approvalData" #panel
       (opened)="closeOtherPanels(panel)">
       <mat-expansion-panel-header (click)="getUerData(appData.user, appData.userWorkflow);">
-        <div class="float-left" (click)="$event.stopPropagation();">
+        <div class="float-left width82" (click)="$event.stopPropagation();">
           <div class="initialcircle display-inline-block margin-right-s" *ngIf="appData?.user">
             <ws-widget-avatar-photo [name]="getUseravatarName(appData?.user)" [photoUrl]="appData?.user?.photo"
               size="l">
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
index c911449c0..da50f674a 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
@@ -15,9 +15,12 @@
   .mat-content{
     display: block !important;
   }
-  .float-left {
+  .width82 {
     width: 82%;
   }
+  .width88 {
+    width: 88%;
+  }
 
   .initialcircle {
     vertical-align: text-bottom;
@@ -80,10 +83,14 @@
     content: "+";
     border: 0;
     transform: none;
+    font-size: 24px !important;
+    padding: 6px !important;
   }
 
 ::ng-deep .mat-expansion-panel-header.mat-expanded .mat-expansion-indicator::after {
     content: "-";
+    font-size: 24px !important;
+    padding: 6px !important;
 }
 ::ng-deep .initialcircle .circle-l {
   border-radius: 50% !important;
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index dca5b7df8..fb4a6c70e 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -99,6 +99,7 @@ export class UserCardComponent implements OnInit {
   department: any
   approvalData: any
   showeditText = false
+  today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
     private dialog: MatDialog, private approvalSvc: ApprovalsService,
@@ -328,7 +329,6 @@ export class UserCardComponent implements OnInit {
 
   setUserDetails(user: any) {
     if (user && user.profileDetails) {
-      // this.updateUserDataForm.controls['employeeID'].setValue('')
       // this.updateUserDataForm.controls['ehrmsID'].setValue('')
       if (user.profileDetails.professionalDetails) {
         if (user.profileDetails.professionalDetails.designation) {
@@ -340,7 +340,8 @@ export class UserCardComponent implements OnInit {
         if (user.profileDetails.additionalProperties.group) {
           // this.updateUserDataForm.controls['group'].setValue(user.profileDetails.additionalProperties.group)
           this.updateUserDataForm.patchValue({
-            group: user.profileDetails.additionalProperties.group
+            // group: user.profileDetails.additionalProperties.group
+            group: _.get(user, 'profileDetails.additionalProperties.group'),
           })
         }
       }
@@ -409,7 +410,6 @@ export class UserCardComponent implements OnInit {
                     wfId: wf.wfId,
                   })
                 )
-                console.log('needApprovalList', this.needApprovalList)
               }
             })
           }
@@ -659,59 +659,56 @@ export class UserCardComponent implements OnInit {
 
   //   dialogRef.afterClosed().subscribe(result => {
   //     if (result.btnResponse) {
-  //       // console.log(result)
   //     }
   //   })
   // }
 
   onSubmit(form: any, user: any, panel: any) {
-    // console.log('user -------', user)
-    // console.log('form *******', form)
     if (form.valid) {
-      const tags = user.profileDetails && user.profileDetails.additionalProperties && user.profileDetails.additionalProperties.tags ?
-        user.profileDetails.additionalProperties.tags : []
-      if (tags !== this.selectedtags) {
-        this.reqbody = {
-          request: {
-            userId: user.userId,
-            profileDetails: {
-              personalDetails: {
-                dob: this.updateUserDataForm.controls['dob'].value,
-                domicileMedium: this.updateUserDataForm.controls['domicileMedium'].value,
-                gender: this.updateUserDataForm.controls['gender'].value,
-                category: this.updateUserDataForm.controls['category'].value,
-                mobile: this.updateUserDataForm.controls['mobile'].value,
-                primaryEmail: this.updateUserDataForm.controls['primaryEmail'].value,
-              },
-              professionalDetails: [
-                {
-                  designation: this.updateUserDataForm.controls['designation'].value,
-                  group: this.updateUserDataForm.controls['group'].value,
-                },
-              ],
-              additionalProperties: {
-                tag: this.selectedtags,
-              },
-              employmentDetails: {
-                pinCode: this.updateUserDataForm.controls['pincode'].value,
+      // const tags = user.profileDetails && user.profileDetails.additionalProperties && user.profileDetails.additionalProperties.tags ?
+      //   user.profileDetails.additionalProperties.tags : []
+      // if (tags !== this.selectedtags) {
+      this.reqbody = {
+        request: {
+          userId: user.userId,
+          profileDetails: {
+            personalDetails: {
+              dob: this.updateUserDataForm.controls['dob'].value,
+              domicileMedium: this.updateUserDataForm.controls['domicileMedium'].value,
+              gender: this.updateUserDataForm.controls['gender'].value,
+              category: this.updateUserDataForm.controls['category'].value,
+              mobile: this.updateUserDataForm.controls['mobile'].value,
+              primaryEmail: this.updateUserDataForm.controls['primaryEmail'].value,
+            },
+            professionalDetails: [
+              {
+                designation: this.updateUserDataForm.controls['designation'].value,
+                group: this.updateUserDataForm.controls['group'].value,
               },
+            ],
+            additionalProperties: {
+              tag: this.selectedtags,
             },
-          },
-        }
-      } else {
-        this.reqbody = {
-          request: {
-            userId: user.userId,
-            profileDetails: {
-              professionalDetails: [
-                {
-                  designation: this.updateUserDataForm.controls['designation'].value,
-                },
-              ],
+            employmentDetails: {
+              pinCode: this.updateUserDataForm.controls['pincode'].value,
             },
           },
-        }
+        },
       }
+      // } else {
+      //   this.reqbody = {
+      //     request: {
+      //       userId: user.userId,
+      //       profileDetails: {
+      //         professionalDetails: [
+      //           {
+      //             designation: this.updateUserDataForm.controls['designation'].value,
+      //           },
+      //         ],
+      //       },
+      //     },
+      //   }
+      // }
       this.usersSvc.updateUserDetails(this.reqbody).subscribe(dres => {
         if (dres) {
           this.openSnackbar('User updated Successfully')
@@ -729,15 +726,26 @@ export class UserCardComponent implements OnInit {
               if (res) {
                 this.updateUserDataForm.reset({ roles: '' })
                 this.openSnackbar('User role updated Successfully')
+                panel.close()
                 // this.router.navigate(['/app/home/users/allusers'])
-                this.closeOtherPanels(panel)
+
+                this.usersSvc.getUserById(user.userId).subscribe((res: any) => {
+                  if (res) {
+                    user = res
+                    user.enableEdit = false
+                  }
+                })
               }
             })
           } else {
             this.openSnackbar('Select new roles')
           }
         }
-      })
+      },
+        // tslint:disable-next-line: align
+        (err: { error: any }) => {
+          this.openSnackbar(err.error.params.errmsg)
+        })
     }
   }
 
@@ -808,11 +816,10 @@ export class UserCardComponent implements OnInit {
   }
 
   onApprovalSubmit(panel: any) {
-    // console.log('this.actionList', this.actionList)
     if (this.actionList.length > 0) {
       this.actionList.forEach((req: any) => {
         this.onApproveOrRejectClick(req)
-        this.closeOtherPanels(panel)
+        panel.close()
       })
     }
   }
diff --git a/project/ws/app/src/lib/routes/home/home.rounting.module.ts b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
index 1c635fdf4..13f589bb7 100644
--- a/project/ws/app/src/lib/routes/home/home.rounting.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
@@ -16,7 +16,7 @@ import { ReportsSectionComponent } from './routes/reports-section/reports-sectio
 import { TrainingPlanDashboardComponent } from './routes/training-plan-dashboard/training-plan-dashboard.component'
 import { ApprovalPendingComponent } from './routes/approvals/approval-pending/approval-pending.component'
 import { WelcomeComponent } from './routes/welcome/welcome.component'
-import { AllUsersComponent } from './routes/users-view/all-users/all-users.component'
+// import { AllUsersComponent } from './routes/users-view/all-users/all-users.component'
 import { BulkUploadComponent } from './routes/users-view/bulk-upload/bulk-upload.component'
 
 import { PageResolve } from '@sunbird-cb/utils'
@@ -46,66 +46,112 @@ const routes: Routes = [
           module: 'Home',
         },
       },
+      // {
+      //   path: 'users',
+      //   component: UsersViewComponent,
+      //   resolve: {
+      //     usersList: UsersListResolve,
+      //     pageData: PageResolve,
+      //     configService: ConfigResolveService,
+      //   },
+      //   children: [
+      //     {
+      //       path: '',
+      //       pathMatch: 'full',
+      //       redirectTo: 'allusers',
+      //     },
+      //     {
+      //       path: 'allusers',
+      //       component: AllUsersComponent,
+      //       resolve: {
+      //         usersList: UsersListResolve,
+      //         pageData: PageResolve,
+      //         configService: ConfigResolveService,
+      //       },
+      //       data: {
+      //         pageId: 'users',
+      //         module: 'User',
+      //         pageType: 'feature',
+      //         pageKey: 'users-view',
+      //       },
+      //     },
+      //     {
+      //       path: 'allusers/:tab',
+      //       component: AllUsersComponent,
+      //       resolve: {
+      //         usersList: UsersListResolve,
+      //         pageData: PageResolve,
+      //         configService: ConfigResolveService,
+      //       },
+      //       data: {
+      //         pageId: 'users',
+      //         module: 'User',
+      //         pageType: 'feature',
+      //         pageKey: 'users-view',
+      //       },
+      //     },
+      //     {
+      //       path: 'bulk-upload',
+      //       component: BulkUploadComponent,
+      //       resolve: {
+      //         usersList: UsersListResolve,
+      //         pageData: PageResolve,
+      //         configService: ConfigResolveService,
+      //       },
+      //       data: {
+      //         pageId: 'users',
+      //         module: 'User',
+      //         pageType: 'feature',
+      //         pageKey: 'users-view',
+      //       },
+      //     },
+      //   ],
+      // },
+      {
+        path: 'users/:tab',
+        component: UsersViewComponent,
+        resolve: {
+          usersList: UsersListResolve,
+          pageData: PageResolve,
+          configService: ConfigResolveService,
+        },
+        data: {
+          pageId: 'users',
+          module: 'User',
+          pageType: 'feature',
+          pageKey: 'users-view',
+        },
+      },
       {
         path: 'users',
+        redirectTo: 'users/allusers',
         component: UsersViewComponent,
         resolve: {
           usersList: UsersListResolve,
           pageData: PageResolve,
           configService: ConfigResolveService,
         },
-        children: [
-          {
-            path: '',
-            pathMatch: 'full',
-            redirectTo: 'allusers',
-          },
-          {
-            path: 'allusers',
-            component: AllUsersComponent,
-            resolve: {
-              usersList: UsersListResolve,
-              pageData: PageResolve,
-              configService: ConfigResolveService,
-            },
-            data: {
-              pageId: 'users',
-              module: 'User',
-              pageType: 'feature',
-              pageKey: 'users-view',
-            },
-          },
-          {
-            path: 'allusers/:tab',
-            component: AllUsersComponent,
-            resolve: {
-              usersList: UsersListResolve,
-              pageData: PageResolve,
-              configService: ConfigResolveService,
-            },
-            data: {
-              pageId: 'users',
-              module: 'User',
-              pageType: 'feature',
-              pageKey: 'users-view',
-            },
-          },
-          {
-            path: 'bulk-upload',
-            component: BulkUploadComponent,
-            resolve: {
-              usersList: UsersListResolve,
-              pageData: PageResolve,
-              configService: ConfigResolveService,
-            },
-            data: {
-              pageId: 'users',
-              module: 'User',
-              pageType: 'feature',
-              pageKey: 'users-view',
-            },
-          },
-        ],
+        data: {
+          pageId: 'users',
+          module: 'User',
+          pageType: 'feature',
+          pageKey: 'users-view',
+        },
+      },
+      {
+        path: 'bulk-upload',
+        component: BulkUploadComponent,
+        resolve: {
+          usersList: UsersListResolve,
+          pageData: PageResolve,
+          configService: ConfigResolveService,
+        },
+        data: {
+          pageId: 'users',
+          module: 'User',
+          pageType: 'feature',
+          pageKey: 'users-view',
+        },
       },
       {
         path: 'about',
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index 90c6b6463..952558944 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -1 +1,122 @@
-<router-outlet></router-outlet>
\ No newline at end of file
+<div class="flex flex-4 flex-column main-flex-box">
+  <mat-card class="no-border">
+    <!-- <mat-card-header class="flex-custom-m">
+      <div class="flex-1" role="link" tabindex="0">
+        <div class="flex flex-1">
+          <mat-card-title class="flex-4 mobile-margin text-capitalize">
+            <span class="h-600-s-20-m color-87">Users</span>
+          </mat-card-title>
+        </div>
+      </div>
+    </mat-card-header> -->
+    <mat-card-title class="flex-4 mobile-margin text-capitalize margin-bottom-l">
+      <span class="h-600-s-20-m color-87">Users</span>
+    </mat-card-title>
+    <mat-card class="mb-8">
+      <mat-card-content class="flex gap-10">
+        <div class="section-1">
+          <div class="flex-4 mobile-margin text-capitalize mat-h2">Note:</div>
+          <ng-container *ngFor="let note of reportsNoteList">
+            <div class="flex gap-4 mb-4">
+              <div>
+                <mat-icon class="infoIcon">error_outline</mat-icon>
+              </div>
+              <div [innerHTML]="sanitizeHtml(note)"></div>
+            </div>
+          </ng-container>
+        </div>
+        <div class="reportsDemo flex justify-end section-2">
+          <div class="reportsDemoVideo flex flex-column flex-middle justify-center margin-top-m"
+            (click)="openVideoPopup()">
+            <mat-icon class="video_icon mb-2">play_circle</mat-icon>
+            <div>
+              Watch how it works
+            </div>
+          </div>
+        </div>
+      </mat-card-content>
+    </mat-card>
+    <mat-card-content>
+      <div class="flex flex-1 flex-column margin-fix">
+        <div class="flex flex-1 filter max-height-60">
+          <!-- <a routerLink="/app/home/users/active" routerLinkActive="router-link-active" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'active',
+              'ws-mat-accent-border font-medium':currentFilter !== 'active'}" mat-button
+            (click)="filter('active'); tabTelemetry('active', 0)" role="button">Registered</a>
+          <a routerLink="/app/home/users/inactive" routerLinkActive="router-link-active" class="filter-option"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'inactive',
+                          'ws-mat-accent-border font-medium':currentFilter !== 'inactive'}" mat-button
+            (click)="filter('inactive'); tabTelemetry('inactive', 1)" role="button">Inactive</a>
+          <a routerLink="/app/home/users/upload" routerLinkActive="router-link-active" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'upload',
+                                      'ws-mat-accent-border font-medium':currentFilter !== 'upload'}" mat-button
+            (click)="filter('upload'); tabTelemetry('upload', 2)" role="button">File uploads</a> -->
+
+          <a routerLink="/app/home/users/allusers" routerLinkActive="router-link-active" class="filter-option"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'allusers','ws-mat-accent-border font-medium':currentFilter !== 'allusers'}"
+            mat-button (click)="filter('allusers'); tabTelemetry('allusers', 0)" role="button">All users
+            ({{activeUsersDataCount}})</a>
+
+          <a routerLink="/app/home/users/verified" routerLinkActive="router-link-active" class="filter-option"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'verified','ws-mat-accent-border font-medium':currentFilter !== 'verified'}"
+            mat-button (click)="filter('verified'); tabTelemetry('verified', 0)" role="button">Verified
+            ({{verifiedUsersDataCount}})</a>
+
+          <a routerLink="/app/home/users/nonverified" routerLinkActive="router-link-active" class="filter-option"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'nonverified','ws-mat-accent-border font-medium':currentFilter !== 'nonverified'}"
+            mat-button (click)="filter('nonverified'); tabTelemetry('nonverified', 0)" role="button">Non-verified
+            ({{nonverifiedUsersDataCount}})</a>
+
+          <!-- <a routerLink="/app/home/users/notmyuser" routerLinkActive="router-link-active" class="filter-option"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'notmyuser','ws-mat-accent-border font-medium':currentFilter !== 'notmyuser'}"
+            mat-button (click)="filter('notmyuser'); tabTelemetry('notmyuser', 0)" role="button">Not my user
+            ({{notmyuserUsersDataCount}})</a> -->
+        </div>
+      </div>
+      <!-- <ws-widget-org-user-table-v2 [userId]="currentUser" [tableData]="tabledata" [data]="dataForTable"
+        [isUpload]=false [isCreate]=true (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuActions($event)"
+        (searchByEnterKey)="onEnterkySearch($event)" (pageChangeClick)="onPaginateChange($event)"
+        [showEditOnCondition]=true [totalRecords]="userDataTotalCount" [tabChangeIndex]="pageIndex">
+      </ws-widget-org-user-table-v2> -->
+
+      <ng-container *ngIf="usersData && currentFilter === 'allusers'">
+        <div *ngIf="usersData?.count > 0">
+          <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
+            [totalRecords]="activeUsersDataCount" [tabChangeIndex]="pageIndex" [isApprovals]="false"
+            (searchByEnterKey)="onEnterkySearch($event)"
+            (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
+        </div>
+        <p class="margin-top-l margin-bottom-l" *ngIf="usersData?.count === 0">No users found</p>
+      </ng-container>
+      <ng-container *ngIf="usersData && currentFilter === 'verified'">
+        <div *ngIf="usersData?.count > 0">
+          <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
+            [totalRecords]="verifiedUsersDataCount" [tabChangeIndex]="pageIndex"
+            (searchByEnterKey)="onEnterkySearch($event)"
+            (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
+        </div>
+        <p class="margin-top-l margin-bottom-l" *ngIf="usersData?.count === 0">No users found</p>
+      </ng-container>
+      <ng-container *ngIf="usersData && currentFilter === 'nonverified'">
+        <div *ngIf="usersData?.count > 0">
+          <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
+            [totalRecords]="nonverifiedUsersDataCount" [tabChangeIndex]="pageIndex"
+            (searchByEnterKey)="onEnterkySearch($event)"
+            (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
+        </div>
+        <p class="margin-top-l margin-bottom-l" *ngIf="usersData?.count === 0">No users found</p>
+      </ng-container>
+      <!-- <ng-container *ngIf="usersData && currentFilter === 'notmyuser'">
+        <div *ngIf="usersData?.count > 0">
+          <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
+            [totalRecords]="notmyuserUsersDataCount" [tabChangeIndex]="pageIndex"
+            (searchByEnterKey)="onEnterkySearch($event)"
+            (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
+        </div>
+        <p class="margin-top-l margin-bottom-l" *ngIf="usersData?.count === 0">No users found</p>
+      </ng-container> -->
+
+      <!-- <ng-container *ngIf="currentFilter === 'upload'">
+        <ws-app-users-upload></ws-app-users-upload>
+      </ng-container> -->
+    </mat-card-content>
+  </mat-card>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.scss b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.scss
index 7d8cdf05b..f78c12356 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.scss
@@ -79,7 +79,9 @@
     margin: 0 $size-l 0 $size-l;
   }
 }
-
+::ng-deep.overlay {
+  display: none !important;
+}
 .overflow {
   // @include breakpoint-xs {
   //   width: 10em;
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 91fa4b1f7..e73c08c98 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -1,4 +1,20 @@
 import { Component, OnDestroy, OnInit } from '@angular/core'
+import { MatDialog } from '@angular/material/dialog'
+import { ActivatedRoute, Router } from '@angular/router'
+/* tslint:disable */
+import _ from 'lodash'
+/* tslint:enable */
+// import { environment } from 'src/environments/environment'
+import { PageEvent } from '@angular/material'
+import { EventService } from '@sunbird-cb/utils'
+import { NsContent } from '@sunbird-cb/collection'
+import { DomSanitizer, SafeHtml } from '@angular/platform-browser'
+import { NSProfileDataV2 } from '../../models/profile-v2.model'
+import { UsersService } from '../../../users/services/users.service'
+import { LoaderService } from '../../../../../../../../../src/app/services/loader.service'
+import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
+import { ProfileV2UtillService } from '../../services/home-utill.service'
+import { ReportsVideoComponent } from '../reports-video/reports-video.component'
 
 @Component({
   selector: 'ws-app-users-view',
@@ -9,9 +25,285 @@ import { Component, OnDestroy, OnInit } from '@angular/core'
   /* tslint:enable */
 })
 export class UsersViewComponent implements OnInit, OnDestroy {
-  constructor() { }
+  /* tslint:disable */
+  Math: any
+  /* tslint:enable */
+  currentFilter = 'allusers'
+  // filterPath = '/app/home/users'
+  discussionList!: any
+  discussProfileData!: any
+  portalProfile!: NSProfileDataV2.IProfile
+  userDetails: any
+  location!: string | null
+  tabs: any
+  isLoading = false
+  // tabsData: NSProfileDataV2.IProfileTab[]
+  currentUser!: any
+  connectionRequests!: any[]
+  data: any = []
+  usersData!: any
+  configSvc: any
+  activeUsersData!: any[]
+  verifiedUsersData!: any[]
+  nonverifiedUsersData!: any[]
+  notmyuserUsersData!: any[]
+
+  activeUsersDataCount?: number | 0
+  verifiedUsersDataCount?: number | 0
+  nonverifiedUsersDataCount?: number | 0
+  notmyuserUsersDataCount?: number | 0
+  content: NsContent.IContent = {} as NsContent.IContent
+  isMdoAdmin = false
+
+  reportsNoteList: string[] = []
+
+  currentOffset = 0
+  limit = 20
+  pageIndex = 0
+  searchQuery = ''
+  rootOrgId: any
+  constructor(
+    public dialog: MatDialog,
+    private route: ActivatedRoute,
+    private router: Router,
+    // private snackBar: MatSnackBar,
+    private events: EventService,
+    private loaderService: LoaderService,
+    private profileUtilSvc: ProfileV2UtillService,
+    private sanitizer: DomSanitizer,
+    // private telemetrySvc: TelemetryService,
+    // private configSvc: ConfigurationsService,
+    // private discussService: DiscussService,
+    // private configSvc: ConfigurationsService,
+    // private networkV2Service: NetworkV2Service,
+    // private profileV2Svc: ProfileV2Service
+    private usersService: UsersService
+  ) {
+    this.Math = Math
+    this.configSvc = this.route.parent && this.route.parent.snapshot.data.configService
+    this.currentUser = this.configSvc.userProfile && this.configSvc.userProfile.userId
+
+    // this.usersData = _.get(this.route, 'snapshot.data.usersList.data') || {}
+    // this.filterData()
+  }
+
+  ngOnDestroy() {
+    // if (this.tabs) {
+    //   this.tabs.unsubscribe()
+    // }
+  }
+  ngOnInit() {
+    this.rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
+    this.searchQuery = ''
+    if (this.configSvc.unMappedUser && this.configSvc.unMappedUser.roles) {
+      this.isMdoAdmin = this.configSvc.unMappedUser.roles.includes('MDO_ADMIN')
+    }
+    // this.filterData('')
+
+    this.getUsers('', 'allusers')
+    // this.getUsers('', 'verified')
+    // this.getUsers('', 'nonverified')
+    // this.getUsers('', 'notmyuser')
+
+    this.reportsNoteList = [
+      `Easily create users individually or in bulk.`,
+      `Edit any user profile within your organization.`,
+      `Verified Users: Users with all their primary fields approved.`,
+      // tslint:disable-next-line: max-line-length
+      `Non-Verified Users: Users whose one or more primary fields are yet to be approved. You can help by reviewing and approving their requests.`,
+      `Not My User: Remove a user from your organization with a simple click.`,
+    ]
+  }
+
+  sanitizeHtml(html: string): SafeHtml {
+    return this.sanitizer.bypassSecurityTrustHtml(html)
+  }
+
+  openVideoPopup() {
+    this.dialog.open(ReportsVideoComponent, {
+      data: {
+        videoLink: 'https://www.youtube.com/embed/tgbNymZ7vqY?autoplay=1&mute=1',
+      },
+      disableClose: true,
+      width: '50%',
+      height: '60%',
+      panelClass: 'overflow-visable',
+    })
+  }
+
+  filter(filter: string) {
+    this.currentFilter = filter
+    // console.log('filter---------', filter)
+    this.pageIndex = 0
+    this.currentOffset = 0
+    this.limit = 20
+    this.searchQuery = ''
+    this.filterData(this.searchQuery)
+  }
+
+  public tabTelemetry(label: string, index: number) {
+    const data: TelemetryEvents.ITelemetryTabData = {
+      label,
+      index,
+    }
+    this.events.handleTabTelemetry(
+      TelemetryEvents.EnumInteractSubTypes.USER_TAB,
+      data,
+    )
+  }
+
+  filterData(query: string) {
+    this.getUsers(query, this.currentFilter)
+  }
+
+  showEditUser(roles: any): boolean {
+    if (this.isMdoAdmin) {
+      if (roles && roles.length > 0) {
+        return true
+        //   return (roles.includes('PUBLIC') && roles.length === 1)
+      }
+      // return false
+    }
+    return true
+  }
+
+  blockedUsers() {
+    const blockedUsersData: any[] = []
+    if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
+      _.filter(this.usersData.content, { isDeleted: false }).forEach((user: any) => {
+        blockedUsersData.push({
+          fullname: user ? `${user.firstName}` : null,
+          // fullname: user ? `${user.firstName} ${user.lastName}` : null,
+          email: user.personalDetails && user.personalDetails.primaryEmail ?
+            this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
+          role: user.roles,
+          userId: user.id,
+          active: !user.isDeleted,
+          blocked: user.blocked,
+          roles: _.join(_.map(user.roleInfo, i => `<li>${i}</li>`), ''),
+        })
+      })
+    }
+    return blockedUsersData
+  }
+
+  getUsers(query: string, currentFilter: any) {
+    // console.log('currentFilter', currentFilter)
+    this.loaderService.changeLoad.next(true)
+    const usersData: any[] = []
+    let filtreq = {}
+    if (currentFilter === 'allusers') {
+      filtreq = {
+        'rootOrgId': this.rootOrgId,
+        'status': 1,
+      }
+    } else if (currentFilter === 'verified') {
+      filtreq = {
+        'rootOrgId': this.rootOrgId,
+        'profileDetails.profileStatus': 'VERIFIED'
+      }
+    } else if (currentFilter === 'nonverified') {
+      filtreq = {
+        'rootOrgId': this.rootOrgId,
+        'profileDetails.profileStatus': 'NOT-VERIFIED'
+      }
+    }
+
+    this.usersService.getAllKongUsers(filtreq, this.limit, this.pageIndex, query).subscribe((data: any) => {
+      this.usersData = data.result.response
+      if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
+        _.filter(this.usersData.content, { isDeleted: false }).forEach((user: any) => {
+          // tslint:disable-next-line
+          const org = { roles: _.get(_.first(_.filter(user.organisations, { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') }
+          usersData.push({
+            fullname: user ? `${user.firstName}` : null,
+            // fullname: user ? `${user.firstName} ${user.lastName}` : null,
+            email: user.personalDetails && user.personalDetails.primaryEmail ?
+              this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
+            role: org.roles || [],
+            userId: user.id,
+            active: !user.isDeleted,
+            blocked: user.blocked,
+            roles: _.join(_.map((org.roles || []), i => `<li>${i}</li>`), ''),
+            orgId: user.rootOrgId,
+            orgName: user.rootOrgName,
+            allowEditUser: this.showEditUser(org.roles),
+          })
+        })
+
+        usersData.sort((a: any, b: any) => {
+          const textA = a.fullname.toUpperCase()
+          const textB = b.fullname.toUpperCase()
+          return (textA < textB) ? -1 : (textA > textB) ? 1 : 0
+        })
+      }
+      if (this.currentFilter === 'allusers') {
+        this.activeUsersData = usersData
+        this.activeUsersDataCount = this.usersData.count
+      } else if (this.currentFilter === 'verified') {
+        this.verifiedUsersData = usersData
+        this.verifiedUsersDataCount = this.usersData.count
+      } else if (this.currentFilter === 'nonverified') {
+        this.notmyuserUsersData = usersData
+        this.nonverifiedUsersDataCount = this.usersData.count
+      } else if (this.currentFilter === 'notmyuser') {
+        this.notmyuserUsersData = usersData
+        this.notmyuserUsersDataCount = this.usersData.count
+      }
+      return usersData
+    })
+  }
+
+  clickHandler(event: any) {
+    switch (event.type) {
+      case 'createUser':
+        this.onCreateClick()
+        break
+      case 'upload':
+        this.onUploadClick()
+        break
+    }
+  }
+
+  onCreateClick() {
+    this.router.navigate([`/app/users/create-user`])
+    this.events.raiseInteractTelemetry(
+      {
+        type: TelemetryEvents.EnumInteractTypes.CLICK,
+        subType: TelemetryEvents.EnumInteractSubTypes.CREATE_BTN,
+        id: 'create-user-btn',
+      },
+      {}
+    )
+  }
+
+  onUploadClick() {
+    this.filter('upload')
+  }
+
+  onRoleClick(user: any) {
+    this.router.navigate([`/app/users/${user.userId}/details`])
+    this.events.raiseInteractTelemetry(
+      {
+        type: TelemetryEvents.EnumInteractTypes.CLICK,
+        subType: TelemetryEvents.EnumInteractSubTypes.CARD_CONTENT,
+        id: TelemetryEvents.EnumIdtype.USER_ROW,
+      },
+      {
+        id: user.userId,
+        type: TelemetryEvents.EnumIdtype.USER,
+      }
+    )
+  }
 
-  ngOnInit() { }
+  onEnterkySearch(enterValue: any) {
+    this.searchQuery = enterValue
+    this.filterData(this.searchQuery)
+  }
 
-  ngOnDestroy() { }
-}
\ No newline at end of file
+  onPaginateChange(event: PageEvent) {
+    this.pageIndex = event.pageIndex
+    this.limit = event.pageSize
+    this.filterData(this.searchQuery)
+  }
+}

From 1ba69fe460e0fc4d73882585c4d1503e3dac55c9 Mon Sep 17 00:00:00 2001
From: Vinod Kumar Shyave <121538586+vShyave@users.noreply.github.com>
Date: Mon, 6 May 2024 18:24:21 +0530
Subject: [PATCH 575/887] Single user creation UI is ready

---
 .../user-cards/user-card.component.ts         |  17 +-
 .../ws/app/src/lib/routes/home/home.module.ts |   4 +
 .../lib/routes/home/home.rounting.module.ts   |   6 +-
 .../approval-pending.component.ts             |   2 +-
 .../all-users/all-users.component.ts          |  14 +-
 .../bulk-upload/bulk-upload.component.html    |   8 +-
 .../single-user-creation.component.html       | 147 ++++++++++++++++++
 .../single-user-creation.component.scss       |  61 ++++++++
 .../single-user-creation.component.spec.ts    |  25 +++
 .../single-user-creation.component.ts         | 146 +++++++++++++++++
 .../user-creation.component.html              |  19 +++
 .../user-creation.component.scss              |   5 +
 .../user-creation.component.spec.ts           |  25 +++
 .../user-creation/user-creation.component.ts  |  22 +++
 .../routes/users-view/users-view.component.ts |   2 +-
 .../routes/users/services/users.service.ts    |   7 +-
 .../app-footer/app-footer.component.html      |  18 ++-
 .../app-footer/app-footer.component.scss      |   2 +-
 src/styles/_ws-common.scss                    |  21 ++-
 19 files changed, 502 insertions(+), 49 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
 create mode 100644 project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.scss
 create mode 100644 project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
 create mode 100644 project/ws/app/src/lib/routes/home/routes/users-view/user-creation/user-creation.component.html
 create mode 100644 project/ws/app/src/lib/routes/home/routes/users-view/user-creation/user-creation.component.scss
 create mode 100644 project/ws/app/src/lib/routes/home/routes/users-view/user-creation/user-creation.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/home/routes/users-view/user-creation/user-creation.component.ts

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index bd9a4ae4d..61ad24c84 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -99,9 +99,9 @@ export class UserCardComponent implements OnInit {
   approvalData: any
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-    private dialog: MatDialog, private router: Router, private approvalSvc: ApprovalsService,
-    private route: ActivatedRoute, private snackBar: MatSnackBar,
-    private events: EventService) {
+              private dialog: MatDialog, private router: Router, private approvalSvc: ApprovalsService,
+              private route: ActivatedRoute, private snackBar: MatSnackBar,
+              private events: EventService) {
     // this.route.data.subscribe((data: any) => {
     //   this.profileData = data.pageData.data.profileData
     // })
@@ -211,7 +211,7 @@ export class UserCardComponent implements OnInit {
         countryCode: '+91',
       })
     },
-      (_err: any) => {
+                                                  (_err: any) => {
       })
   }
 
@@ -275,8 +275,8 @@ export class UserCardComponent implements OnInit {
       this.getApprovalList(data)
     }
 
-    this.roleservice.getAllRoles().subscribe((data: any) => {
-      const parseRoledata = JSON.parse(data.result.response.value)
+    this.roleservice.getAllRoles().subscribe((_data: any) => {
+      const parseRoledata = JSON.parse(_data.result.response.value)
       this.orgTypeList = parseRoledata.orgTypeList
 
       // New code for roles
@@ -336,7 +336,7 @@ export class UserCardComponent implements OnInit {
         if (user.profileDetails.additionalProperties.group) {
           // this.updateUserDataForm.controls['group'].setValue(user.profileDetails.additionalProperties.group)
           this.updateUserDataForm.patchValue({
-            group: user.profileDetails.additionalProperties.group
+            group: user.profileDetails.additionalProperties.group,
           })
         }
       }
@@ -405,7 +405,6 @@ export class UserCardComponent implements OnInit {
                     wfId: wf.wfId,
                   })
                 )
-                console.log('needApprovalList', this.needApprovalList)
               }
             })
           }
@@ -576,7 +575,7 @@ export class UserCardComponent implements OnInit {
 
   addRejection(field: any) {
     const rejectinDetails = {
-      field: field,
+      field,
       header: {
         headerText: 'Reason of rejection',
         showEditButton: false,
diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index abc1de3a1..5eecd81a3 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -71,6 +71,8 @@ import { AllUsersComponent } from './routes/users-view/all-users/all-users.compo
 import { BulkUploadComponent } from './routes/users-view/bulk-upload/bulk-upload.component'
 import { VerifyOtpComponent } from './routes/users-view/verify-otp/verify-otp.component'
 import { FileProgressComponent } from './routes/users-view/file-progress/file-progress.component'
+import { UserCreationComponent } from './routes/users-view/user-creation/user-creation.component'
+import { SingleUserCreationComponent } from './routes/users-view/single-user-creation/single-user-creation.component'
 
 @NgModule({
   declarations: [
@@ -108,6 +110,8 @@ import { FileProgressComponent } from './routes/users-view/file-progress/file-pr
     AllUsersComponent,
     VerifyOtpComponent,
     FileProgressComponent,
+    UserCreationComponent,
+    SingleUserCreationComponent,
   ],
   imports: [
     CommonModule,
diff --git a/project/ws/app/src/lib/routes/home/home.rounting.module.ts b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
index c7745d716..4698035c9 100644
--- a/project/ws/app/src/lib/routes/home/home.rounting.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
@@ -17,12 +17,12 @@ import { TrainingPlanDashboardComponent } from './routes/training-plan-dashboard
 import { ApprovalPendingComponent } from './routes/approvals/approval-pending/approval-pending.component'
 import { WelcomeComponent } from './routes/welcome/welcome.component'
 import { AllUsersComponent } from './routes/users-view/all-users/all-users.component'
-import { BulkUploadComponent } from './routes/users-view/bulk-upload/bulk-upload.component'
 
 import { PageResolve } from '@sunbird-cb/utils'
 import { HomeResolve } from './resolvers/home-resolve'
 import { ConfigResolveService } from './resolvers/config-resolve.service'
 import { UsersListResolve } from './resolvers/users-list-resolve.service'
+import { UserCreationComponent } from './routes/users-view/user-creation/user-creation.component'
 
 const routes: Routes = [
   {
@@ -91,8 +91,8 @@ const routes: Routes = [
             },
           },
           {
-            path: 'bulk-upload',
-            component: BulkUploadComponent,
+            path: 'user-creation',
+            component: UserCreationComponent,
             resolve: {
               usersList: UsersListResolve,
               pageData: PageResolve,
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
index 7f1d923eb..5928b3c1b 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
@@ -213,7 +213,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   replaceWords(inputString: any, wordConditions: any) {
     return wordConditions.reduce((acc: any, [word, condition]: any) => {
       return acc.replace(new RegExp(word, 'gi'), condition)
-    }, inputString)
+    },                           inputString)
   }
 
   onPaginateChange(event: PageEvent) {
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.ts
index 7d2b8fb61..f106be4f2 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.ts
@@ -209,18 +209,18 @@ export class AllUsersComponent implements OnInit, OnDestroy {
     let filtreq = {}
     if (currentFilter === 'allusers') {
       filtreq = {
-        'rootOrgId': this.rootOrgId,
-        'status': 1,
+        rootOrgId: this.rootOrgId,
+        status: 1,
       }
     } else if (currentFilter === 'verified') {
       filtreq = {
-        'rootOrgId': this.rootOrgId,
-        'profileDetails.profileStatus': 'VERIFIED'
+        rootOrgId: this.rootOrgId,
+        'profileDetails.profileStatus': 'VERIFIED',
       }
     } else if (currentFilter === 'nonverified') {
       filtreq = {
-        'rootOrgId': this.rootOrgId,
-        'profileDetails.profileStatus': 'NOT-VERIFIED'
+        rootOrgId: this.rootOrgId,
+        'profileDetails.profileStatus': 'NOT-VERIFIED',
       }
     }
 
@@ -315,4 +315,4 @@ export class AllUsersComponent implements OnInit, OnDestroy {
     this.limit = event.pageSize
     this.filterData(this.searchQuery)
   }
-}
\ No newline at end of file
+}
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
index 8a1063c87..4c39386c3 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
@@ -1,11 +1,6 @@
 <div class="flex flex-col gap-6">
-  <div class="flex flex-row gap-4 items-center">
-    <mat-icon class="cursor-pointer" [routerLink]="['/app/home/users/all-users']">arrow_back</mat-icon>
-    <div class="flex font-bold">Bulk Profile Update</div>
-  </div>
-
   <div class="flex flex-col gap-4 bulk-container">
-    <div class="flex font-bold">Bulk Profile Update</div>
+    <div class="flex font-bold">Bulk user creation</div>
     <div class="flex flex-row gap-8">
       <div class="flex-1">
         <div class="flex flex-col gap-6 dashed-card">
@@ -53,7 +48,6 @@
         <div class="flex flex-row justify-between items-center">
           <div class="flex flex-row gap-1">
             <div class="font-bold">File Information</div>
-            <mat-icon class="ws-mat-black40-text">info_outline</mat-icon>
           </div>
           <div class="flex flex-row gap-2 outline-button items-center" (click)="handleDownloadFile(list)">
             <mat-icon>download_2</mat-icon>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
new file mode 100644
index 000000000..febc5d7f6
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
@@ -0,0 +1,147 @@
+<div class="flex flex-col gap-6 bulk-container">
+  <div class="text-xl font-semibold">User Details</div>
+
+  <form [formGroup]="userCreationForm" class="flex flex-col gap-6">
+    <div class="flex flex-row gap-6">
+      <div class="input-container">
+        <div class="label required">Full name</div>
+        <input type="text" class="input-text" formControlName="fullName" placeholder="Type here" />
+        <mat-error class="text-xs"
+          *ngIf="userCreationForm.get('fullName').touched && userCreationForm.get('fullName').invalid">
+          Please enter your full name
+        </mat-error>
+      </div>
+      <div class="input-container">
+        <div class="label required">Email</div>
+        <input type="text" class="input-text" formControlName="primaryEmail" placeholder="Type here" />
+        <mat-error class="text-xs"
+          *ngIf="userCreationForm.get('primaryEmail').touched && userCreationForm.get('primaryEmail').invalid">
+          Please enter a valid email address
+        </mat-error>
+      </div>
+    </div>
+
+    <div class="flex flex-row gap-6">
+      <div class="input-container">
+        <div class="label required">Mobile number</div>
+        <input type="text" class="input-text" formControlName="mobile" maxlength="10" placeholder="Type here" />
+        <mat-error class="text-xs"
+          *ngIf="userCreationForm.get('mobile').touched && userCreationForm.get('mobile').invalid">
+          Please enter a valid mobile number
+        </mat-error>
+      </div>
+
+      <div class="input-container">
+        <div class="label required">Designation</div>
+        <mat-form-field class="profile-form-field">
+          <div class="flex flex-row auto-complete-row">
+            <input type="text" class="input-text" aria-label="Designation" matInput formControlName="designation"
+              [matAutocomplete]="designationAuto" />
+            <mat-icon>arrow_drop_down</mat-icon>
+          </div>
+          <mat-autocomplete #designationAuto="matAutocomplete">
+            <mat-option *ngFor="let designation of masterData?.designation" [value]="designation.name">
+              {{ designation.name }}
+            </mat-option>
+          </mat-autocomplete>
+        </mat-form-field>
+      </div>
+    </div>
+
+    <div class="flex flex-row gap-6">
+      <div class="input-container">
+        <div class="label required">Group</div>
+        <mat-form-field class="profile-form-field">
+          <mat-select formControlName="group">
+            <mat-option value="">Choose a group</mat-option>
+            <mat-option *ngFor="let group of masterData.group" value="{{group}}">{{ group }}</mat-option>
+          </mat-select>
+        </mat-form-field>
+      </div>
+      <div class="input-container">
+        <div class="label">Date of birth</div>
+        <mat-form-field class="profile-form-field">
+          <input matInput class="input-text icon-include-input" [matDatepicker]="picker" readonly
+            formControlName="dob" />
+          <mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
+          <mat-datepicker #picker></mat-datepicker>
+        </mat-form-field>
+      </div>
+    </div>
+
+    <div class="flex flex-row gap-6">
+      <div class="input-container">
+        <div class="label">Mother tongue</div>
+        <mat-form-field class="profile-form-field">
+          <div class="flex flex-row auto-complete-row">
+            <input type="text" class="input-text" aria-label="Domicile medium" matInput formControlName="domicileMedium"
+              [matAutocomplete]="languageAuto" />
+            <mat-icon>arrow_drop_down</mat-icon>
+          </div>
+          <mat-autocomplete #languageAuto="matAutocomplete">
+            <mat-option *ngFor="let language of masterData?.language" [value]="language?.name">
+              {{ language?.name }}
+            </mat-option>
+          </mat-autocomplete>
+        </mat-form-field>
+      </div>
+      <div class="input-container">
+        <div class="label">Gender</div>
+        <mat-form-field class="profile-form-field">
+          <mat-select formControlName="gender">
+            <mat-option value="">Select gender</mat-option>
+            <mat-option value="Male">Male</mat-option>
+            <mat-option value="Female">Female</mat-option>
+            <mat-option value="Others">Others</mat-option>
+          </mat-select>
+        </mat-form-field>
+      </div>
+    </div>
+
+    <div class="flex flex-row gap-6">
+      <div class="input-container">
+        <div class="label">Category</div>
+        <mat-form-field class="profile-form-field">
+          <mat-select formControlName="category">
+            <mat-option value="">Select category</mat-option>
+            <mat-option value="General">General</mat-option>
+            <mat-option value="OBC">OBC</mat-option>
+            <mat-option value="SC">SC</mat-option>
+            <mat-option value="ST">ST</mat-option>
+          </mat-select>
+        </mat-form-field>
+      </div>
+      <div class="input-container">
+        <div class="label">Office pin code</div>
+        <input type="text" class="input-text" formControlName="pincode" placeholder="Type here" />
+      </div>
+    </div>
+
+    <div class="flex flex-row gap-6">
+      <div class="input-container">
+        <div class="label">Tags</div>
+        <input type="text" class="input-text" formControlName="tags" placeholder="Enter tags" />
+      </div>
+      <div class="input-container"></div>
+    </div>
+
+    <div class="flex flex-row gap-6">
+      <div class="input-container">
+        <div class="label required mb-2">Role</div>
+        <div class="flex flex-col gap-4">
+          <div class="flex flex-row gap-4" *ngFor="let item of [1, 2, 3, 4, 5, 6, 7, 8]">
+            <div class="flex-1">CBP_ADMIN</div>
+            <mat-checkbox></mat-checkbox>
+          </div>
+        </div>
+      </div>
+      <div class="input-container"></div>
+    </div>
+
+    <div class="flex flex-row gap-4">
+      <button class="action-button" [disabled]="userCreationForm?.invalid"
+        [ngClass]="{'disable-button': userCreationForm?.invalid}">Create user</button>
+      <button class="outline-button" (click)="handleFormClear()">Clear</button>
+    </div>
+  </form>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.scss b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.scss
new file mode 100644
index 000000000..9ec7fae90
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.scss
@@ -0,0 +1,61 @@
+@import 'ws-common';
+
+.bulk-container {
+  box-shadow: 0px 1px 5px 0px #0000001F, 0px 2px 2px 0px #00000024, 0px 3px 1px -2px #00000033;
+  padding: 24px;
+  border: 1px solid $border-color;
+}
+
+.required {
+  &::after {
+    color: $color-red;
+    content: ' *';
+    display:inline;
+  }
+}
+
+.input-container {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+
+  .label {
+    color: #212529;
+    font-size: 14px;
+    font-weight: 700;
+  }
+}
+
+.icon-include-input {
+  width: calc(100% + -12px);
+  margin: 0px !important;
+}
+
+.auto-complete-row {
+  border: 1px solid $border-color;
+  border-radius: 4px;
+
+  input {
+    border: none;
+    margin: 0px !important;
+  }
+
+  .mat-icon {
+    display: flex;
+    align-items: center;
+    position: relative;
+    top: 16px;
+    left: -16px;
+    font-size: 24px;
+    width: 20px;
+    height: 18px;
+    color: rgba(0, 0, 0, 0.54);
+  }
+}
+
+::ng-deep .profile-form-field {
+  .mat-form-field-suffix {
+    position: relative;
+    left: -16px;
+  }
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.spec.ts b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.spec.ts
new file mode 100644
index 000000000..f55e5e4a7
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
+
+import { SingleUserCreationComponent } from './single-user-creation.component'
+
+describe('SingleUserCreationComponent', () => {
+  let component: SingleUserCreationComponent
+  let fixture: ComponentFixture<SingleUserCreationComponent>
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [SingleUserCreationComponent],
+    })
+    .compileComponents()
+  }))
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SingleUserCreationComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
+
+  it('should create', () => {
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
new file mode 100644
index 000000000..321b413ac
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
@@ -0,0 +1,146 @@
+import { Component, OnDestroy, OnInit } from '@angular/core'
+import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'
+import { MomentDateAdapter } from '@angular/material-moment-adapter'
+import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE } from '@angular/material/core'
+import { MatSnackBar } from '@angular/material'
+import { HttpErrorResponse } from '@angular/common/http'
+
+import { UsersService } from '../../../../users/services/users.service'
+import { Subject } from 'rxjs'
+import { debounceTime, distinctUntilChanged, startWith, takeUntil } from 'rxjs/operators'
+
+export const MY_FORMATS = {
+  parse: {
+    dateInput: 'LL',
+  },
+  display: {
+    dateInput: 'DD-MM-YYYY',
+    monthYearLabel: 'YYYY',
+    dateA11yLabel: 'LL',
+    monthYearA11yLabel: 'YYYY',
+  },
+}
+
+const EMAIL_PATTERN = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/
+const MOBILE_PATTERN = /^[0]?[6789]\d{9}$/
+const PIN_CODE_PATTERN = /^[1-9][0-9]{5}$/
+
+@Component({
+  selector: 'ws-single-user-creation',
+  templateUrl: './single-user-creation.component.html',
+  styleUrls: ['./single-user-creation.component.scss'],
+  providers: [
+    { provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE] },
+    { provide: MAT_DATE_FORMATS, useValue: MY_FORMATS },
+  ],
+})
+export class SingleUserCreationComponent implements OnInit, OnDestroy {
+
+  private destroySubject$ = new Subject()
+  masterData: any = {}
+  userCreationForm = this.formBuilder.group({
+    fullName: new FormControl('', [Validators.required]),
+    primaryEmail: new FormControl('', [Validators.required, Validators.pattern(EMAIL_PATTERN)]),
+    mobile: new FormControl('', [Validators.required, Validators.pattern(MOBILE_PATTERN), Validators.minLength(10)]),
+    organization: new FormControl(''),
+    designation: new FormControl(''),
+    group: new FormControl(''),
+    dob: new FormControl(''),
+    domicileMedium: new FormControl(''),
+    gender: new FormControl(''),
+    pincode: new FormControl('', [Validators.pattern(PIN_CODE_PATTERN)]),
+    category: new FormControl(''),
+    tags: new FormControl([]),
+    roles: new FormControl([], [Validators.required]),
+  })
+  constructor(
+    private formBuilder: FormBuilder,
+    private usersService: UsersService,
+    private matSnackBar: MatSnackBar
+  ) {
+    if (this.userCreationForm.get('designation')) {
+      // tslint:disable-next-line
+      this.userCreationForm.get('designation')!.valueChanges
+        .pipe(
+          debounceTime(100),
+          distinctUntilChanged(),
+          startWith(''),
+        )
+        .subscribe(res => {
+          if (this.masterData && this.masterData.designation) {
+            this.masterData.designation = this.masterData.designationBackup.filter((item: any) =>
+              item.name.toLowerCase().includes(res && res.toLowerCase()))
+          }
+        })
+    }
+
+    if (this.userCreationForm.get('domicileMedium')) {
+      // tslint:disable-next-line
+      this.userCreationForm.get('domicileMedium')!.valueChanges
+        .pipe(
+          debounceTime(100),
+          distinctUntilChanged(),
+          startWith(''),
+        )
+        .subscribe(res => {
+          if (this.masterData && this.masterData.language) {
+            this.masterData.language = this.masterData.languageBackup.filter((item: any) =>
+              item.name.toLowerCase().includes(res && res.toLowerCase()))
+          }
+        })
+    }
+  }
+
+  ngOnInit() {
+    this.getDesignation()
+    this.getMasterLanguages()
+    this.getGroups()
+  }
+
+  getDesignation(): void {
+    this.usersService.getDesignations()
+      .pipe(takeUntil(this.destroySubject$))
+      .subscribe((_res: any) => {
+        this.masterData['designation'] = _res.responseData
+        this.masterData['designationBackup'] = _res.responseData
+      }, (_err: HttpErrorResponse) => {
+        if (!_err.ok) {
+          this.matSnackBar.open('Unable to fetch designation details, please try again later!')
+        }
+      })
+  }
+
+  getMasterLanguages(): void {
+    this.usersService.getMasterLanguages()
+      .pipe(takeUntil(this.destroySubject$))
+      .subscribe((res: any) => {
+        this.masterData['language'] = res.languages
+        this.masterData['languageBackup'] = res.languages
+      }, (_err: HttpErrorResponse) => {
+        if (!_err.ok) {
+          this.matSnackBar.open('Unable to fetch master language details, please try again later!')
+        }
+      })
+  }
+
+  getGroups(): void {
+    this.usersService.getGroups()
+      .pipe(takeUntil(this.destroySubject$))
+      .subscribe((res: any) => {
+        this.masterData['group'] = res.result.response
+      }, (_err: HttpErrorResponse) => {
+        if (!_err.ok) {
+          this.matSnackBar.open('Unable to fetch group data, please try again later!')
+        }
+      })
+  }
+
+  handleFormClear(): void {
+    this.userCreationForm.reset()
+  }
+
+  ngOnDestroy(): void {
+
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/user-creation/user-creation.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/user-creation/user-creation.component.html
new file mode 100644
index 000000000..f92e90538
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/user-creation/user-creation.component.html
@@ -0,0 +1,19 @@
+<div class="flex flex-col gap-6">
+  <div class="flex flex-row gap-4 items-center">
+    <mat-icon class="cursor-pointer" [routerLink]="['/app/home/users/all-users']">arrow_back</mat-icon>
+    <div class="flex font-bold">User Creation&nbsp;/&nbsp;{{ tabSelected }}</div>
+  </div>
+
+  <mat-tab-group class="user-creation-mat-group" (selectedTabChange)="handleTabChanged($event)">
+    <mat-tab label="Bulk Creation">
+      <div class="mt-6">
+        <ws-bulk-upload></ws-bulk-upload>
+      </div>
+    </mat-tab>
+    <mat-tab label="Individual Creation">
+      <div class="mt-6">
+        <ws-single-user-creation></ws-single-user-creation>
+      </div>
+    </mat-tab>
+  </mat-tab-group>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/user-creation/user-creation.component.scss b/project/ws/app/src/lib/routes/home/routes/users-view/user-creation/user-creation.component.scss
new file mode 100644
index 000000000..00ac3c277
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/user-creation/user-creation.component.scss
@@ -0,0 +1,5 @@
+::ng-deep .user-creation-mat-group {
+  .mat-tab-body-content {
+    overflow: hidden !important;
+  }
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/user-creation/user-creation.component.spec.ts b/project/ws/app/src/lib/routes/home/routes/users-view/user-creation/user-creation.component.spec.ts
new file mode 100644
index 000000000..d9960f7ed
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/user-creation/user-creation.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
+
+import { UserCreationComponent } from './user-creation.component'
+
+describe('UserCreationComponent', () => {
+  let component: UserCreationComponent
+  let fixture: ComponentFixture<UserCreationComponent>
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [UserCreationComponent],
+    })
+    .compileComponents()
+  }))
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(UserCreationComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
+
+  it('should create', () => {
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/user-creation/user-creation.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/user-creation/user-creation.component.ts
new file mode 100644
index 000000000..683d27b70
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/user-creation/user-creation.component.ts
@@ -0,0 +1,22 @@
+import { Component, OnInit } from '@angular/core'
+import { MatTabChangeEvent } from '@angular/material'
+
+@Component({
+  selector: 'ws-user-creation',
+  templateUrl: './user-creation.component.html',
+  styleUrls: ['./user-creation.component.scss'],
+})
+
+export class UserCreationComponent implements OnInit {
+
+  tabSelected = 'Bulk Creation'
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+  handleTabChanged(event: MatTabChangeEvent) {
+    this.tabSelected = event.tab.textLabel
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 91fa4b1f7..d4c43fcaa 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -14,4 +14,4 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   ngOnInit() { }
 
   ngOnDestroy() { }
-}
\ No newline at end of file
+}
diff --git a/project/ws/app/src/lib/routes/users/services/users.service.ts b/project/ws/app/src/lib/routes/users/services/users.service.ts
index d872beb5f..e2c6bef8f 100644
--- a/project/ws/app/src/lib/routes/users/services/users.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/users.service.ts
@@ -9,9 +9,7 @@ import _ from 'lodash'
 const API_END_POINTS = {
   GET_ALL_USERS: '/apis/proxies/v8/user/v1/search',
   GET_MY_DEPARTMENT: '/apis/protected/v8/portal/mdo/mydepartment?allUsers=true',
-  // CREATE_USER: 'apis/protected/v8/admin/userRegistration/create-user',
   CREATE_USER: 'apis/protected/v8/user/profileDetails/createUser',
-  // PROFILE_REGISTRY: 'apis/protected/v8/user/profileRegistry/getUserRegistryByUser/',
   PROFILE_REGISTRY_V1: '/apis/proxies/v8/api/user/v2/read/',
   PROFILE_REGISTRY_V2: '/apis/proxies/v8/api/user/v2/read',
   CREATE_PROFILE_REGISTRY: '/apis/protected/v8/user/profileRegistry/createUserRegistryV2',
@@ -33,7 +31,6 @@ const API_END_POINTS = {
   GET_GROUPS: '/api/user/v1/groups',
   getMasterNationlity: '/apis/protected/v8/user/profileRegistry/getMasterNationalities',
   editProfileDetails: '/apis/proxies/v8/user/v1/extPatch',
-  // GET_BULKUPLOAD_DATA: '/apis/protected/v8/admin/userRegistration/bulkUploadData',
 }
 
 @Injectable({
@@ -121,7 +118,7 @@ export class UsersService {
     let reqBody
     reqBody = {
       request: {
-        filters: filters,
+        filters,
         limit: pageLimit,
         offset: offsetNum,
         query: searchText,
@@ -184,7 +181,7 @@ export class UsersService {
     return this.http.get<any>(url)
   }
 
-  getDesignations(_req: any) {
+  getDesignations(_req?: any) {
     return this.http.get<any>(API_END_POINTS.getDesignation)
   }
 
diff --git a/src/app/component/app-footer/app-footer.component.html b/src/app/component/app-footer/app-footer.component.html
index e6c804f5c..1d84f7a9c 100644
--- a/src/app/component/app-footer/app-footer.component.html
+++ b/src/app/component/app-footer/app-footer.component.html
@@ -1,15 +1,17 @@
 <div class="mat-toolbar mat-ws-mat-primary-text footer-container px-6 sm:px-10 py-1-5">
-  <div class="mat-body text-right flex-1">
+  <div class="flex w-full items-center mat-body justify-end">
     <ng-container i18n>
-      <span i18n>&copy; Copyright 2024 -2025</span>
-      <!--       &nbsp;&nbsp; | &nbsp;&nbsp;
-      <a routerLink="/app/home/about" i18n> <span i18n>About Us</span></a>
-      &nbsp;&nbsp; | &nbsp;&nbsp;
-      <a routerLink="/app/tnc" i18n>Privacy</a> -->
+      <span i18n>&copy; Copyright 2024 - 2025</span>
       <!-- &nbsp;&nbsp; | &nbsp;&nbsp;
+      <a routerLink="/app/home/about" i18n>
+        <span i18n>About Us</span>
+      </a>
+      &nbsp;&nbsp; | &nbsp;&nbsp;
+      <a routerLink="/app/tnc" i18n>Privacy</a>
+      &nbsp;&nbsp; | &nbsp;&nbsp;
       <a routerLink="/app/info/faq" i18n>Help </a>
-       &
-      <a routerLink="/public/contact" i18n> Contact</a>-->
+      &amp;
+      <a routerLink="/public/contact" i18n> Contact</a> -->
     </ng-container>
   </div>
 </div>
\ No newline at end of file
diff --git a/src/app/component/app-footer/app-footer.component.scss b/src/app/component/app-footer/app-footer.component.scss
index f995ed95a..2c1655b73 100644
--- a/src/app/component/app-footer/app-footer.component.scss
+++ b/src/app/component/app-footer/app-footer.component.scss
@@ -14,6 +14,6 @@
 }
 
 .py-1-5 {
-  padding-top: 0.5rem;
+  padding-top: 1.25rem;
   padding-bottom: 1.25rem;
 }
diff --git a/src/styles/_ws-common.scss b/src/styles/_ws-common.scss
index cd077a6c5..90e6e3ced 100644
--- a/src/styles/_ws-common.scss
+++ b/src/styles/_ws-common.scss
@@ -13,8 +13,6 @@
 }
 
 %page-center {
-  // max-width: $page-center;
-  // max-width: $max-screen;
   margin-left: 0 !important;
   margin-right: auto !important;
 }
@@ -22,7 +20,6 @@
 %height-mat-toolbar-sibling {
   height: calc(100% - #{$mat-toolbar-xs});
 
-  // padding: $size-m;
   @include breakpoint-gt-xs {
     height: calc(100% - #{$mat-toolbar-gt-xs});
   }
@@ -60,6 +57,11 @@ $color-red: #D13924;
   }
 }
 
+.disable-button {
+  opacity: 0.75;
+  cursor: not-allowed;
+}
+
 .input-text {
   padding: 12px 16px;
   border-radius: 4px;
@@ -67,6 +69,8 @@ $color-red: #D13924;
   font-family: $font-family-lato;
   letter-spacing: 0.25px;
   width: calc(100% - 36px);
+  margin: 7px 0px !important;
+  height: 24px;
 }
 
 .grid-container-25 {
@@ -130,15 +134,17 @@ $color-red: #D13924;
 }
 
 .justify-between {
-    justify-content: space-between;
+  justify-content: space-between;
 }
 
 .w-full {
-    width: 100%;
+  width: 100%;
 }
+
 .w-48p {
-    width: 48% !important;
+  width: 48% !important;
 }
+
 .w80 {
   width: 95px !important;
 }
@@ -146,10 +152,11 @@ $color-red: #D13924;
 .w82 {
   width: 82px !important;
 }
+
 .w-minus-w80 {
   max-width: calc(100% - 80px) !important;
 }
 
 .w-minus-w50 {
   max-width: calc(100% - 50%) !important;
-}
\ No newline at end of file
+}

From 4f5425e950cd6e6193cd1662c24cb1d98d92a12c Mon Sep 17 00:00:00 2001
From: Vinod Kumar Shyave <121538586+vShyave@users.noreply.github.com>
Date: Mon, 6 May 2024 18:27:55 +0530
Subject: [PATCH 576/887] Fixed lint errors

---
 .../single-user-creation/single-user-creation.component.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
index 321b413ac..d819479e1 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnDestroy, OnInit } from '@angular/core'
-import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'
+import { FormBuilder, FormControl, Validators } from '@angular/forms'
 import { MomentDateAdapter } from '@angular/material-moment-adapter'
 import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE } from '@angular/material/core'
 import { MatSnackBar } from '@angular/material'

From 3a5d8716a893c8b5cc08e829c601a5a411b33cea Mon Sep 17 00:00:00 2001
From: Vinod Kumar Shyave <121538586+vShyave@users.noreply.github.com>
Date: Mon, 6 May 2024 18:31:51 +0530
Subject: [PATCH 577/887] Fixed lint errors

---
 .../single-user-creation.component.html                     | 6 +++---
 .../single-user-creation/single-user-creation.component.ts  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
index febc5d7f6..22e901760 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
@@ -7,7 +7,7 @@
         <div class="label required">Full name</div>
         <input type="text" class="input-text" formControlName="fullName" placeholder="Type here" />
         <mat-error class="text-xs"
-          *ngIf="userCreationForm.get('fullName').touched && userCreationForm.get('fullName').invalid">
+          *ngIf="userCreationForm && userCreationForm.get('fullName').touched && userCreationForm.get('fullName').invalid">
           Please enter your full name
         </mat-error>
       </div>
@@ -15,7 +15,7 @@
         <div class="label required">Email</div>
         <input type="text" class="input-text" formControlName="primaryEmail" placeholder="Type here" />
         <mat-error class="text-xs"
-          *ngIf="userCreationForm.get('primaryEmail').touched && userCreationForm.get('primaryEmail').invalid">
+          *ngIf="userCreationForm && userCreationForm.get('primaryEmail').touched && userCreationForm.get('primaryEmail').invalid">
           Please enter a valid email address
         </mat-error>
       </div>
@@ -26,7 +26,7 @@
         <div class="label required">Mobile number</div>
         <input type="text" class="input-text" formControlName="mobile" maxlength="10" placeholder="Type here" />
         <mat-error class="text-xs"
-          *ngIf="userCreationForm.get('mobile').touched && userCreationForm.get('mobile').invalid">
+          *ngIf="userCreationForm && userCreationForm.get('mobile').touched && userCreationForm.get('mobile').invalid">
           Please enter a valid mobile number
         </mat-error>
       </div>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
index d819479e1..96e00d109 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
@@ -103,7 +103,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((_res: any) => {
         this.masterData['designation'] = _res.responseData
         this.masterData['designationBackup'] = _res.responseData
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch designation details, please try again later!')
         }
@@ -116,7 +116,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((res: any) => {
         this.masterData['language'] = res.languages
         this.masterData['languageBackup'] = res.languages
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch master language details, please try again later!')
         }
@@ -128,7 +128,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
         this.masterData['group'] = res.result.response
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch group data, please try again later!')
         }

From 4b8fe78784514f9e7818b25f5abbd7a748d89fc2 Mon Sep 17 00:00:00 2001
From: Vinod Kumar Shyave <121538586+vShyave@users.noreply.github.com>
Date: Mon, 6 May 2024 18:35:26 +0530
Subject: [PATCH 578/887] Fixed lint errors

---
 .../single-user-creation.component.html                     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
index 22e901760..6f4222930 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
@@ -7,7 +7,7 @@
         <div class="label required">Full name</div>
         <input type="text" class="input-text" formControlName="fullName" placeholder="Type here" />
         <mat-error class="text-xs"
-          *ngIf="userCreationForm && userCreationForm.get('fullName').touched && userCreationForm.get('fullName').invalid">
+          *ngIf="userCreationForm?.get('fullName')?.touched && userCreationForm?.get('fullName')?.invalid">
           Please enter your full name
         </mat-error>
       </div>
@@ -15,7 +15,7 @@
         <div class="label required">Email</div>
         <input type="text" class="input-text" formControlName="primaryEmail" placeholder="Type here" />
         <mat-error class="text-xs"
-          *ngIf="userCreationForm && userCreationForm.get('primaryEmail').touched && userCreationForm.get('primaryEmail').invalid">
+          *ngIf="userCreationForm?.get('primaryEmail')?.touched && userCreationForm?.get('primaryEmail')?.invalid">
           Please enter a valid email address
         </mat-error>
       </div>
@@ -26,7 +26,7 @@
         <div class="label required">Mobile number</div>
         <input type="text" class="input-text" formControlName="mobile" maxlength="10" placeholder="Type here" />
         <mat-error class="text-xs"
-          *ngIf="userCreationForm && userCreationForm.get('mobile').touched && userCreationForm.get('mobile').invalid">
+          *ngIf="userCreationForm?.get('mobile')?.touched && userCreationForm?.get('mobile')?.invalid">
           Please enter a valid mobile number
         </mat-error>
       </div>

From 03b11923a0687fd106693c16f3fb7d6e6242abb2 Mon Sep 17 00:00:00 2001
From: Vinod Kumar Shyave <121538586+vShyave@users.noreply.github.com>
Date: Mon, 6 May 2024 21:25:22 +0530
Subject: [PATCH 579/887] After resolving conflicts

---
 .../home/components/user-cards/user-card.component.ts     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index dc05daabe..83b973e27 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -102,9 +102,9 @@ export class UserCardComponent implements OnInit {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-    private dialog: MatDialog, private approvalSvc: ApprovalsService,
-    private route: ActivatedRoute, private snackBar: MatSnackBar,
-    private events: EventService) {
+              private dialog: MatDialog, private approvalSvc: ApprovalsService,
+              private route: ActivatedRoute, private snackBar: MatSnackBar,
+              private events: EventService) {
     // this.route.data.subscribe((data: any) => {
     //   this.profileData = data.pageData.data.profileData
     // })
@@ -216,7 +216,7 @@ export class UserCardComponent implements OnInit {
         countryCode: '+91',
       })
     },
-      (_err: any) => {
+                                                  (_err: any) => {
       })
   }
 

From 74223160b289e27a4eda995de0ed71b6dd0a1e69 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Mon, 6 May 2024 21:54:50 +0530
Subject: [PATCH 580/887] Updated fixes & approvals conditions

---
 .../components/search/search.component.html   |  8 ++
 .../user-cards/user-card.component.html       | 76 ++++++++---------
 .../user-cards/user-card.component.ts         | 85 ++++++++++---------
 .../approval-pending.component.ts             |  6 ++
 4 files changed, 95 insertions(+), 80 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.html b/project/ws/app/src/lib/routes/home/components/search/search.component.html
index 073231336..8b9bfeeec 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.html
@@ -21,4 +21,12 @@
         <button mat-button type="button" class="search-btn" [routerLink]="['/app/home/bulk-upload']"
             [ngClass]="{'disable': isContentLive}">Create user</button>
     </div>
+    <!-- <div class="flex flex-end margin-right-s" *ngIf="isApprovals">
+        <button mat-button type="button" class="search-btn" [ngClass]="{'disable': isContentLive}">Approve all
+            requests</button>
+    </div>
+    <div class="flex flex-end" *ngIf="isApprovals">
+        <button mat-button type="button" class="search-btn" [routerLink]="" [ngClass]="{'disable': isContentLive}">Bulk
+            profile update</button>
+    </div> -->
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 4eb7bd07f..ef2fafe34 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -33,8 +33,8 @@
               &&
               user?.profileDetails?.professionalDetails?.designation ?
               user?.profileDetails?.professionalDetails?.designation : '-'}}</div>
-            <!-- <div class="mat-caption ws-mat-black40-text">Verified on: {{user.requestedon | date: 'dd/MM/yyyy'}}</div> -->
-            <div class="mat-caption ws-mat-black40-text">Verified on: 02/05/2024</div>
+            <div class="mat-caption ws-mat-black40-text" *ngIf="user?.profileDetails?.profileStatus === 'VERIFIED'">
+              Verified on: {{user?.profileDetails?.profileStatusVerifiedOn | date: 'dd/MM/yyyy'}}</div>
           </div>
         </div>
         <div class="float-right">
@@ -49,22 +49,21 @@
         <form [formGroup]="updateUserDataForm" class="margin-top-m">
           <div class="inner-body">
             Primary Details <mat-icon class="ws-mat-black40-text custominfo">info_outline</mat-icon>
-            <p class="float-right mat-body-2"><mat-slide-toggle>Mark this user as non-verified</mat-slide-toggle></p>
+            <p class="float-right mat-body-2" *ngIf="user?.profileDetails?.profileStatus === 'VERIFIED'">
+              <mat-slide-toggle>Mark this user as non-verified</mat-slide-toggle>
+            </p>
             <div class="flex flex-row margin-top-m">
               <div class="md:w-1/3">
-                <label class="margin-remove-bottom form-label required">Designation</label>
+                <label class="margin-remove-bottom form-label required">Group</label>
                 <mat-form-field appearance="outline">
-                  <mat-select #designation formControlName="designation" i18n-placeholder
-                    placeholder="Select designation"
-                    (selectionChange)="otherDropDownChange(designation?.value, 'designation')">
-                    <mat-option [value]="designation?.name" *ngFor="let designation of designationsMeta">
-                      {{designation?.name}}
+                  <mat-select #group formControlName="group" i18n-placeholder placeholder="Select group">
+                    <mat-option [value]="g" *ngFor="let g of groupsList">
+                      {{g.name}}
                     </mat-option>
-                    <mat-option [value]="'Other'">Other</mat-option>
                   </mat-select>
-                  <mat-error [hidden]="false" i18n="Designation Error | Explains designation is required"
-                    *ngIf="updateUserDataForm?.controls['designation'].errors?.required">
-                    Designation is mandatory
+                  <mat-error [hidden]="false" i18n="Group Error | Explains group is required"
+                    *ngIf="updateUserDataForm?.controls['group'].errors?.required">
+                    Group is mandatory
                   </mat-error>
                 </mat-form-field>
                 <mat-icon class="verified-icon margin-left-xs"
@@ -74,18 +73,20 @@
                   *ngIf="user?.profileDetails?.profileStatus === 'NOT-VERIFIED'">
                   check_circle</mat-icon>
               </div>
-
               <div class="md:w-1/3">
-                <label class="margin-remove-bottom form-label required">Group</label>
+                <label class="margin-remove-bottom form-label required">Designation</label>
                 <mat-form-field appearance="outline">
-                  <mat-select #group formControlName="group" i18n-placeholder placeholder="Select group">
-                    <mat-option [value]="g" *ngFor="let g of groupsList">
-                      {{g.name}}
+                  <mat-select #designation formControlName="designation" i18n-placeholder
+                    placeholder="Select designation"
+                    (selectionChange)="otherDropDownChange(designation?.value, 'designation')">
+                    <mat-option [value]="designation?.name" *ngFor="let designation of designationsMeta">
+                      {{designation?.name}}
                     </mat-option>
+                    <mat-option [value]="'Other'">Other</mat-option>
                   </mat-select>
-                  <mat-error [hidden]="false" i18n="Group Error | Explains group is required"
-                    *ngIf="updateUserDataForm?.controls['group'].errors?.required">
-                    Group is mandatory
+                  <mat-error [hidden]="false" i18n="Designation Error | Explains designation is required"
+                    *ngIf="updateUserDataForm?.controls['designation'].errors?.required">
+                    Designation is mandatory
                   </mat-error>
                 </mat-form-field>
                 <mat-icon class="verified-icon margin-left-xs"
@@ -365,10 +366,10 @@
           </div>
           <div class="flex flex-row margin-top-m">
             <div class="md:w-1/3">
-              <label class="view-text-label">Designation</label>
-              <p>{{user.profileDetails && user.profileDetails.professionalDetails &&
-                user.profileDetails.professionalDetails.designation ?
-                user.profileDetails.professionalDetails.designation : '-'}}
+              <label class="view-text-label">Group</label>
+              <p>{{user.profileDetails && user.profileDetails.additionalProperties &&
+                user.profileDetails.additionalProperties.group ?
+                user.profileDetails.additionalProperties.group : '-'}}
                 <mat-icon class="verified-icon margin-left-xs"
                   *ngIf="user?.profileDetails?.profileStatus === 'VERIFIED'">
                   check_circle</mat-icon>
@@ -377,12 +378,11 @@
                   check_circle</mat-icon>
               </p>
             </div>
-
             <div class="md:w-1/3">
-              <label class="view-text-label">Group</label>
-              <p>{{user.profileDetails && user.profileDetails.additionalProperties &&
-                user.profileDetails.additionalProperties.group ?
-                user.profileDetails.additionalProperties.group : '-'}}
+              <label class="view-text-label">Designation</label>
+              <p>{{user.profileDetails && user.profileDetails.professionalDetails &&
+                user.profileDetails.professionalDetails.designation ?
+                user.profileDetails.professionalDetails.designation : '-'}}
                 <mat-icon class="verified-icon margin-left-xs"
                   *ngIf="user?.profileDetails?.profileStatus === 'VERIFIED'">
                   check_circle</mat-icon>
@@ -530,7 +530,7 @@
 
         <div class="float-right">
           <p class="mat-body-2 margin-top-l margin-right-m"><mat-icon class="orangeicon">error</mat-icon>
-            {{appData?.userWorkflow?.wfInfo.length}} approval pending</p>
+            {{appData?.needApprovalList.length}} approval pending</p>
         </div>
       </mat-expansion-panel-header>
 
@@ -570,21 +570,17 @@
                   <mat-radio-button value="reject" (click)="addRejection('group')">Reject</mat-radio-button>
                 </mat-radio-group>
               </div> -->
-              <ng-container *ngFor="let field of needApprovalList">
+              <ng-container *ngFor="let field of appData.needApprovalList">
                 <div class="md:w-1/3 margin-bottom-s">
-                  <div *ngIf="field.fieldKey !== 'verifiedKarmayogi'">
-                    <label class="view-text-label">{{field.label}}</label>
-                  </div>
-                  <div [class]="field.fieldKey === 'verifiedKarmayogi'">
-                    <span [hidden]="field.fieldKey === 'verifiedKarmayogi'">
+                  <label class="view-text-label">{{field.label}}</label>
+                  <div>
+                    <span>
                       <input type="text" class="appr-text-field margin-bottom-s" [value]="field.value">
                       <mat-icon class="verified-icon margin-left-s"
                         *ngIf="field.action === 'APPROVE'">check_circle</mat-icon>
                       <mat-icon class="nonverified-icon margin-left-s"
                         *ngIf="field.action === 'REJECT'">cancel</mat-icon>
                     </span>
-                    <label class="appr-text-label mt-2" *ngIf="field.fieldKey === 'verifiedKarmayogi'">{{field.label}}
-                    </label>
                     <mat-radio-group aria-label="Select an option" name="approveDesignation"
                       formControlName="approveDesignation" class="mat-caption margin-top-s">
                       <mat-radio-button value="approve" class="margin-right-s"
@@ -728,7 +724,7 @@
         </div>
       </div>
       <div class="panel-body" *ngIf="!appData?.user">
-        <p class="text-center">No user data</p>
+        <p class="text-center margin-top-m">No user data</p>
       </div>
     </mat-expansion-panel>
   </mat-accordion>
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index fb4a6c70e..ada99377a 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -9,7 +9,7 @@ import { COMMA, ENTER } from '@angular/cdk/keycodes'
 // tslint:disable-next-line
 import _ from 'lodash'
 import { RolesService } from '../../../users/services/roles.service'
-import { ActivatedRoute } from '@angular/router'
+import { ActivatedRoute, Router } from '@angular/router'
 import { Observable, Subscription } from 'rxjs'
 import { debounceTime, distinctUntilChanged, map, startWith } from 'rxjs/operators'
 import { environment } from '../../../../../../../../../src/environments/environment'
@@ -76,7 +76,7 @@ export class UserCardComponent implements OnInit {
   masterLanguagesEntries: any
   genderList = ['Male', 'Female', 'Others']
   categoryList = ['General', 'OBC', 'SC', 'ST', 'Others']
-  needApprovalList: any[] = []
+  // needApprovalList: any[] = []
   profileData: any[] = []
   userwfData!: any
   comment = ''
@@ -88,6 +88,8 @@ export class UserCardComponent implements OnInit {
   pincodePattern = '(^[0-9]{6}$)'
   yearPattern = '(^[0-9]{4}$)'
 
+  userGroup: any
+
   otpSend = false
   otpVerified = false
   OTP_TIMER = environment.resendOTPTIme
@@ -104,10 +106,7 @@ export class UserCardComponent implements OnInit {
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
     private dialog: MatDialog, private approvalSvc: ApprovalsService,
     private route: ActivatedRoute, private snackBar: MatSnackBar,
-    private events: EventService) {
-    // this.route.data.subscribe((data: any) => {
-    //   this.profileData = data.pageData.data.profileData
-    // })
+    private events: EventService, private router: Router) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', [Validators.required]),
       group: new FormControl('', [Validators.required]),
@@ -141,14 +140,16 @@ export class UserCardComponent implements OnInit {
 
   ngOnInit() {
     this.currentFilter = this.route.snapshot.params['tab'] || 'allusers'
-
+    // console.log('this.currentFilter', this.currentFilter)
     if (this.isApprovals && this.usersData && this.usersData.length > 0) {
       this.approvalData = this.usersData
       this.getUserMappedData(this.approvalData)
-
       this.approvalSvc.getProfileConfig().then((res: any) => {
         this.profileData = res && res.profileData
       })
+      if (this.profileData) {
+        this.getFieldsMappedData(this.approvalData)
+      }
     } else {
       this.init()
     }
@@ -168,6 +169,37 @@ export class UserCardComponent implements OnInit {
     })
   }
 
+  async getFieldsMappedData(approvalData: any) {
+    approvalData.forEach((appdata: any) => {
+      if (appdata.userWorkflow.wfInfo && appdata.userWorkflow.wfInfo.length > 0) {
+        appdata.needApprovalList = []
+        appdata.userWorkflow.wfInfo.forEach((wf: any) => {
+          if (typeof wf.updateFieldValues === 'string') {
+            const fields = JSON.parse(wf.updateFieldValues)
+            if (fields.length > 0) {
+              fields.forEach((field: any) => {
+                const labelKey = Object.keys(field.toValue)[0]
+                const feildNameObj = labelKey === 'designation' ? 'Designation' : 'Group'
+                if (labelKey === 'designation' || labelKey === 'group') {
+                  appdata.needApprovalList.push(
+                    Object.assign({
+                      wf,
+                      feildName: labelKey,
+                      label: feildNameObj,
+                      value: field.toValue[labelKey],
+                      fieldKey: field.fieldKey,
+                      wfId: wf.wfId,
+                    })
+                  )
+                }
+              })
+            }
+          }
+        })
+      }
+    })
+  }
+
   async init() {
     await this.loadDesignations()
     await this.loadGroups()
@@ -274,7 +306,7 @@ export class UserCardComponent implements OnInit {
     this.updateTags(profileData)
 
     if (this.isApprovals) {
-      this.needApprovalList = []
+      // this.needApprovalList = []
       this.actionList = []
       this.comment = ''
       this.getApprovalList(data)
@@ -338,11 +370,9 @@ export class UserCardComponent implements OnInit {
 
       if (user.profileDetails.additionalProperties) {
         if (user.profileDetails.additionalProperties.group) {
-          // this.updateUserDataForm.controls['group'].setValue(user.profileDetails.additionalProperties.group)
-          this.updateUserDataForm.patchValue({
-            // group: user.profileDetails.additionalProperties.group
-            group: _.get(user, 'profileDetails.additionalProperties.group'),
-          })
+          // this.updateUserDataForm.patchValue({ group: _.get(user, 'profileDetails.additionalProperties.group') })
+          // this.userGroup = user.profileDetails.additionalProperties.
+          this.updateUserDataForm.controls.group.setValue(user.profileDetails.additionalProperties.group)
         }
       }
 
@@ -391,31 +421,6 @@ export class UserCardComponent implements OnInit {
 
   getApprovalList(approvalData: any) {
     this.userwfData = approvalData
-    if (approvalData.wfInfo && approvalData.wfInfo.length > 0) {
-      approvalData.wfInfo.forEach((wf: any) => {
-        if (typeof wf.updateFieldValues === 'string') {
-          const fields = JSON.parse(wf.updateFieldValues)
-          if (fields.length > 0) {
-            fields.forEach((field: any) => {
-              const labelKey = Object.keys(field.toValue)[0]
-              const feildNameObj = this.profileData.filter(userData => userData.key === labelKey)[0]
-              if (labelKey === 'designation' || labelKey === 'group') {
-                this.needApprovalList.push(
-                  Object.assign({
-                    wf,
-                    feildName: labelKey,
-                    label: feildNameObj ? feildNameObj.name : null,
-                    value: field.toValue[labelKey],
-                    fieldKey: field.fieldKey,
-                    wfId: wf.wfId,
-                  })
-                )
-              }
-            })
-          }
-        }
-      })
-    }
   }
 
   cancelSubmit() {
@@ -727,7 +732,7 @@ export class UserCardComponent implements OnInit {
                 this.updateUserDataForm.reset({ roles: '' })
                 this.openSnackbar('User role updated Successfully')
                 panel.close()
-                // this.router.navigate(['/app/home/users/allusers'])
+                this.router.navigate(['/app/home/users/allusers'])
 
                 this.usersSvc.getUserById(user.userId).subscribe((res: any) => {
                   if (res) {
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
index 4f22bd914..bcc5bd09a 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
@@ -215,6 +215,12 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
     }, inputString)
   }
 
+  onEnterkySearch(enterValue: any) {
+    // this.data.filter((user: any) => enterValue.includes(user.userInfo.first_name))
+    const filterValue = enterValue.toLowerCase()
+    this.data = this.data.filter((user: any) => user.userInfo.first_name.toLowerCase().includes(filterValue))
+  }
+
   onPaginateChange(event: PageEvent) {
     this.pageIndex = event.pageIndex
     this.limit = event.pageSize

From 4737f6d65774adc207544f899e29ebccb310f322 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Mon, 6 May 2024 22:15:14 +0530
Subject: [PATCH 581/887] lint issue fixed

---
 .../home/components/user-cards/user-card.component.ts     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index daf45477c..4d1f2a368 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -104,9 +104,9 @@ export class UserCardComponent implements OnInit {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-    private dialog: MatDialog, private approvalSvc: ApprovalsService,
-    private route: ActivatedRoute, private snackBar: MatSnackBar,
-    private events: EventService, private router: Router) {
+              private dialog: MatDialog, private approvalSvc: ApprovalsService,
+              private route: ActivatedRoute, private snackBar: MatSnackBar,
+              private events: EventService, private router: Router) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', [Validators.required]),
       group: new FormControl('', [Validators.required]),
@@ -248,7 +248,7 @@ export class UserCardComponent implements OnInit {
         countryCode: '+91',
       })
     },
-      (_err: any) => {
+                                                  (_err: any) => {
       })
   }
 

From becb7c5e7d6acc49aaaabddae72919dbd5886212 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Mon, 6 May 2024 22:59:16 +0530
Subject: [PATCH 582/887] Added bulk upload approval component

---
 .../components/search/search.component.html   |  10 +-
 .../user-cards/user-card.component.ts         |   1 +
 .../ws/app/src/lib/routes/home/home.module.ts |   2 +
 .../lib/routes/home/home.rounting.module.ts   |  15 ++
 .../bulk-upload/bulk-upload.component.html    |  99 ++++++++++
 .../bulk-upload/bulk-upload.component.scss    |  71 +++++++
 .../bulk-upload/bulk-upload.component.ts      | 181 ++++++++++++++++++
 7 files changed, 374 insertions(+), 5 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
 create mode 100644 project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.scss
 create mode 100644 project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts

diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.html b/project/ws/app/src/lib/routes/home/components/search/search.component.html
index 8ef9155a5..245039489 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.html
@@ -18,15 +18,15 @@
         </button>
     </div>
     <div class="flex flex-end" *ngIf="!isApprovals">
-        <button mat-button type="button" class="search-btn" [routerLink]="['/app/home/user-creation']"
+        <button mat-button type="button" class="search-btn" [routerLink]="['/app/home/bulk-upload']"
             [ngClass]="{'disable': isContentLive}">Create user</button>
     </div>
-    <!-- <div class="flex flex-end margin-right-s" *ngIf="isApprovals">
+    <div class="flex flex-end margin-right-s" *ngIf="isApprovals">
         <button mat-button type="button" class="search-btn" [ngClass]="{'disable': isContentLive}">Approve all
             requests</button>
     </div>
     <div class="flex flex-end" *ngIf="isApprovals">
-        <button mat-button type="button" class="search-btn" [routerLink]="" [ngClass]="{'disable': isContentLive}">Bulk
-            profile update</button>
-    </div> -->
+        <button mat-button type="button" class="search-btn" [routerLink]="['/app/home/approvals/bulkupdate']"
+            [ngClass]="{'disable': isContentLive}">Bulk profile update</button>
+    </div>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index daf45477c..0a303fff3 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -816,6 +816,7 @@ export class UserCardComponent implements OnInit {
           this.openSnackbar('Request Approved')
         }
         this.comment = ''
+        this.router.navigate(['/app/home/approvals/profileverification'])
         // this.needApprovalList = this.needApprovalList.filter(wf => wf.wfId !== res.result.data.wfIds[0])
       }
     })
diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index 5eecd81a3..cd7d7fea0 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -73,6 +73,7 @@ import { VerifyOtpComponent } from './routes/users-view/verify-otp/verify-otp.co
 import { FileProgressComponent } from './routes/users-view/file-progress/file-progress.component'
 import { UserCreationComponent } from './routes/users-view/user-creation/user-creation.component'
 import { SingleUserCreationComponent } from './routes/users-view/single-user-creation/single-user-creation.component'
+import { BulkUploadApprovalComponent } from './routes/approvals/bulk-upload/bulk-upload.component'
 
 @NgModule({
   declarations: [
@@ -112,6 +113,7 @@ import { SingleUserCreationComponent } from './routes/users-view/single-user-cre
     FileProgressComponent,
     UserCreationComponent,
     SingleUserCreationComponent,
+    BulkUploadApprovalComponent,
   ],
   imports: [
     CommonModule,
diff --git a/project/ws/app/src/lib/routes/home/home.rounting.module.ts b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
index 93041fa34..d0a8cc718 100644
--- a/project/ws/app/src/lib/routes/home/home.rounting.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
@@ -24,6 +24,7 @@ import { HomeResolve } from './resolvers/home-resolve'
 import { ConfigResolveService } from './resolvers/config-resolve.service'
 import { UsersListResolve } from './resolvers/users-list-resolve.service'
 import { UserCreationComponent } from './routes/users-view/user-creation/user-creation.component'
+import { BulkUploadApprovalComponent } from './routes/approvals/bulk-upload/bulk-upload.component'
 
 const routes: Routes = [
   {
@@ -233,6 +234,20 @@ const routes: Routes = [
               configService: ConfigResolveService,
             },
           },
+          {
+            path: 'bulkupdate',
+            component: BulkUploadApprovalComponent,
+            data: {
+              pageId: 'approvals-bulkupdate',
+              module: 'Approvals',
+              pageType: 'feature',
+              pageKey: 'approval-view',
+            },
+            resolve: {
+              pageData: PageResolve,
+              configService: ConfigResolveService,
+            },
+          },
         ],
       },
       {
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
new file mode 100644
index 000000000..5426a777b
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
@@ -0,0 +1,99 @@
+<div class="flex flex-col gap-6">
+  <div class="flex flex-col gap-4 bulk-container">
+    <div class="flex font-bold">Bulk profile update</div>
+    <div class="flex flex-row gap-8">
+      <div class="flex-1">
+        <div class="flex flex-col gap-6 dashed-card">
+          <div>Open &amp; follow these instruction</div>
+          <div class="flex flex-col gap-4">
+            <ol class="custom-ol">
+              <li>Keep the row of the items you wish to process</li>
+              <li>Keep the row of the items you wish to process</li>
+              <li>Delete the entire row you do not intend to process</li>
+            </ol>
+          </div>
+          <div class="flex flex-row gap-6">
+            <button class="outline-button" (click)="handleDownloadSampleFile()">Download Sample File</button>
+          </div>
+        </div>
+      </div>
+      <div class="flex-1">
+        <div class="flex flex-col gap-2 dashed-card items-center">
+          <div class="flex cursor-pointer" (click)="fileInput.click()" (dblclick)="$event.preventDefault()">
+            <img src="/assets/icons/csv-file.svg" alt="CSV file logo" />
+          </div>
+          <div *ngIf="showFileError" class="error-msg">Upload CSV format file only</div>
+          <div class="flex flex-col items-center">
+            <div class="text-primary cursor-pointer" (click)="fileInput.click()" (dblclick)="$event.preventDefault()">
+              Browse files</div>
+            <input hidden type="file" #fileInput (click)="handleFileClick($event)" (change)="handleOnFileChange($event)"
+              name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();"
+              accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel, .xlsx, .xls" />
+            <!-- <div class="flex">or</div>
+            <div class="flex">Drag file to upload</div> -->
+          </div>
+          <div class="flex flex-col items-center">
+            <div class="flex">Max file size: 100 MB</div>
+            <div class="flex">Supported file types: CSV</div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="text-base font-bold">File logs</div>
+  <div class="flex flex-col gap-6">
+    <div class="file-container" *ngFor="let list of lastUploadList | slice:startIndex:lastIndex">
+      <div class="flex flex-col gap-4">
+        <div class="flex flex-row justify-between items-center">
+          <div class="flex flex-row gap-1">
+            <div class="font-bold">File Information</div>
+          </div>
+          <div class="flex flex-row gap-2 outline-button items-center" (click)="handleDownloadFile(list)">
+            <mat-icon>download_2</mat-icon>
+            Download error log
+          </div>
+        </div>
+        <div class="grid grid-flow-row sm:grid-flow-col gap-10 grid-col grid-container-25">
+          <div class="flex flex-col">
+            <div class="label">Name</div>
+            <div class="value">{{ list?.fileName }}</div>
+          </div>
+          <div class="flex flex-col">
+            <div class="label">Status</div>
+            <div class="value">{{ list?.status }}</div>
+          </div>
+          <div class="flex flex-col">
+            <div class="label">Failed Records</div>
+            <div class="value">{{ list?.failedRecordsCount }}</div>
+          </div>
+          <div class="flex flex-col">
+            <div class="label">Success Records</div>
+            <div class="value">{{ list?.successfulRecordsCount }}</div>
+          </div>
+        </div>
+        <div class="grid grid-flow-row sm:grid-flow-col gap-10 grid-col grid-container-25">
+          <div class="flex flex-col">
+            <div class="label">Total Records</div>
+            <div class="value">{{ list?.totalRecords }}</div>
+          </div>
+          <div class="flex flex-col">
+            <div class="label">Initiated On</div>
+            <div class="value">{{ list?.dateCreatedOn | date: 'dd MMM yyyy h:mm a' }}</div>
+          </div>
+          <div class="flex flex-col">
+            <div class="label">Completed ON</div>
+            <div class="value">{{ list?.dateUpdatedOn | date: 'dd MMM yyyy h:mm a' }}</div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="flex flex-row justify-end mt-4">
+    <mat-paginator [pageSize]="pageSize" [length]="lastUploadList.length" [pageSizeOptions]="sizeOptions"
+      (page)="handleChangePage($event)"></mat-paginator>
+  </div>
+
+
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.scss b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.scss
new file mode 100644
index 000000000..71148d579
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.scss
@@ -0,0 +1,71 @@
+@import 'ws-common';
+
+.bulk-container, .file-container {
+  box-shadow: 0px 1px 5px 0px #0000001F, 0px 2px 2px 0px #00000024, 0px 3px 1px -2px #00000033;
+  padding: 24px;
+  border: 1px solid $border-color;
+
+  .label {
+    font-size: 12px;
+    font-weight: 400;
+    color: rgba($color: #000000, $alpha: 0.6);
+  }
+
+  .value {
+    font-size: 14px;
+    line-height: 18px;
+    color: rgba($color: #000000, $alpha: 0.88);
+  }
+
+  .outline-button {
+    padding: 8px 16px;
+  }
+}
+
+.dashed-card {
+  border: 1px dashed $border-color;
+  padding: 24px;
+  font-size: 14px;
+
+  .custom-ol {
+    margin: 0px;
+    padding-left: 12px;
+  }
+
+  .text-primary {
+    color: $color-blue;
+    font-weight: bold;
+  }
+}
+
+.error-msg {
+  color: $color-red;
+  font-weight: 600;
+  font-size: 14px;
+}
+
+::ng-deep .common-modal {
+  width: 420px;
+  padding: 0px;
+
+  .mat-dialog-container {
+    border-radius: 12px;
+    background-color: #EEE !important;
+  }
+}
+
+::ng-deep .progress-modal {
+  width: 920px;
+  height: 420px;
+
+  .mat-dialog-container {
+    border-radius: 4px;
+    background-color: #FFF !important;
+  }
+}
+
+@media screen and (max-width: 641px) {
+  ::ng-deep .common-modal, ::ng-deep .progress-modal {
+    max-width: 90vw !important;
+  }
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
new file mode 100644
index 000000000..13715feaa
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
@@ -0,0 +1,181 @@
+import { Component, OnInit, OnDestroy, AfterViewInit } from '@angular/core'
+import { MatSnackBar, PageEvent, MatDialog } from '@angular/material'
+import { HttpErrorResponse } from '@angular/common/http'
+import { ActivatedRoute } from '@angular/router'
+// tslint:disable-next-line
+import _ from 'lodash'
+import { Subject } from 'rxjs'
+import { takeUntil } from 'rxjs/operators'
+
+import { FileService } from '../../../../users/services/upload.service'
+import { UsersService } from '../../../../users/services/users.service'
+import { FileProgressComponent } from '../../users-view/file-progress/file-progress.component'
+import { VerifyOtpComponent } from '../../users-view/verify-otp/verify-otp.component'
+
+@Component({
+  selector: 'ws-bulk-upload-approval',
+  templateUrl: './bulk-upload.component.html',
+  styleUrls: ['./bulk-upload.component.scss'],
+})
+export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDestroy {
+
+  lastUploadList: any[] = []
+  private destroySubject$ = new Subject()
+  downloadSampleFilePath = ''
+  downloadAsFileName = ''
+  rootOrgId: any
+
+  showFileError = false
+  public fileName: any
+  fileSelected!: any
+  userProfile: any
+  fileUploadDialogInstance: any
+
+  sizeOptions = [10, 20]
+  startIndex = 0
+  lastIndex: any
+  pageSize = 10
+
+  constructor(
+    private fileService: FileService,
+    private matSnackBar: MatSnackBar,
+    private router: ActivatedRoute,
+    public dialog: MatDialog,
+    private usersService: UsersService
+  ) {
+    this.rootOrgId = _.get(this.router.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
+    this.userProfile = _.get(this.router.snapshot.parent, 'data.configService.userProfileV2')
+
+    this.router.data.subscribe(data => {
+      if (data && data.pageData) {
+        this.downloadSampleFilePath = data.pageData.data.downloadSampleFilePath
+        this.downloadAsFileName = data.pageData.data.downloadAsFileName
+      }
+    })
+  }
+
+  ngOnInit() {
+    this.getBulkStatusList()
+  }
+
+  ngAfterViewInit(): void {
+    this.lastIndex = this.sizeOptions[0]
+  }
+
+  getBulkStatusList(): void {
+    this.fileService.getBulkUploadDataV1(this.rootOrgId)
+      .pipe(takeUntil(this.destroySubject$))
+      .subscribe((res: any) => {
+        this.lastUploadList = res.result.content
+      }, (error: HttpErrorResponse) => {
+        if (!error.ok) {
+          this.matSnackBar.open('Unable to get Bulk status list')
+        }
+      })
+  }
+
+  showFileUploadProgress(): void {
+    this.fileUploadDialogInstance = this.dialog.open(FileProgressComponent, {
+      data: {},
+      disableClose: true,
+      panelClass: 'progress-modal',
+    })
+  }
+
+  handleDownloadFile(listObj: any): void {
+    const filePath = `/apis/proxies/v8/workflow/admin/bulkuploadfile/download/${listObj.fileName}`
+    window.open(filePath, '_blank')
+  }
+
+  handleDownloadSampleFile(): void {
+    this.fileService.download(this.downloadSampleFilePath, this.downloadAsFileName)
+  }
+
+  handleFileClick(event: any): void {
+    event.target.value = ''
+  }
+
+  sendOTP(): void {
+    this.generateAndVerifyOTP(this.userProfile.email ? 'email' : 'phone')
+  }
+
+  generateAndVerifyOTP(contactType: string, resendFlag?: string): void {
+    const postValue = contactType === 'email' ? this.userProfile.email : this.userProfile.mobile
+    this.usersService.sendOtp(postValue, contactType)
+      .pipe(takeUntil(this.destroySubject$))
+      .subscribe((_res: any) => {
+        this.matSnackBar.open(`An OTP has been sent to your ${contactType === 'phone' ? 'Mobile number'
+          : 'Email address'}, (Valid for 15 min's)`)
+        if (!resendFlag) {
+          this.verifyOTP(contactType)
+        }
+      }, (error: HttpErrorResponse) => {
+        if (!error.ok) {
+          this.matSnackBar.open(_.get(error, 'error.params.errmsg') || `Unable to send OTP to your ${contactType}, please try again later!`)
+        }
+      })
+  }
+
+  handleOnFileChange(event: any): void {
+    this.showFileError = false
+    const fileList = (<HTMLInputElement>event.target).files
+    if (fileList && fileList.length > 0) {
+      const file: File = fileList[0]
+      this.fileName = file.name
+      this.fileSelected = file
+      this.sendOTP()
+    }
+  }
+
+  verifyOTP(contactType: string): void {
+    const dialogRef = this.dialog.open(VerifyOtpComponent, {
+      data: { type: contactType, email: this.userProfile.email, mobile: this.userProfile.mobile },
+      disableClose: true,
+      panelClass: 'common-modal',
+    })
+
+    dialogRef.componentInstance.resendOTP.subscribe((_cType: any) => {
+      this.generateAndVerifyOTP(_cType, 'resend')
+    })
+
+    dialogRef.componentInstance.otpVerified.subscribe((_data: boolean) => {
+      this.showFileUploadProgress()
+      this.uploadCSVFile()
+    })
+  }
+
+  uploadCSVFile(): void {
+    if (this.fileService.validateFile(this.fileName)) {
+      if (this.fileSelected) {
+        const formData: FormData = new FormData()
+        formData.append('data', this.fileSelected, this.fileName)
+        this.fileService.upload(this.fileName, formData)
+          .pipe(takeUntil(this.destroySubject$))
+          .subscribe((_res: any) => {
+            this.fileUploadDialogInstance.close()
+            this.matSnackBar.open('File uploaded successfully!')
+            this.fileName = ''
+            this.fileSelected = ''
+            this.getBulkStatusList()
+          }, (_err: HttpErrorResponse) => {
+            if (!_err.ok) {
+              this.matSnackBar.open('Uploading CSV file failed due to some error, please try again later!')
+            }
+          })
+      }
+    } else {
+      this.showFileError = true
+    }
+  }
+
+  handleChangePage(_event: PageEvent): void {
+    this.pageSize = _event.pageSize
+    this.startIndex = (_event.pageIndex) * _event.pageSize
+    this.lastIndex = this.startIndex + _event.pageSize
+  }
+
+  ngOnDestroy(): void {
+    this.destroySubject$.unsubscribe()
+  }
+
+}

From cbb59cbf5e23b191f0d3d8f81e1afec71cb256cd Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Mon, 6 May 2024 23:54:26 +0530
Subject: [PATCH 583/887] Updated bulk upload approval component

---
 .../components/search/search.component.html   |  2 +-
 .../bulk-upload/bulk-upload.component.html    | 20 ++++++++++++-------
 .../bulk-upload/bulk-upload.component.ts      |  6 +++---
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.html b/project/ws/app/src/lib/routes/home/components/search/search.component.html
index 245039489..263432518 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.html
@@ -18,7 +18,7 @@
         </button>
     </div>
     <div class="flex flex-end" *ngIf="!isApprovals">
-        <button mat-button type="button" class="search-btn" [routerLink]="['/app/home/bulk-upload']"
+        <button mat-button type="button" class="search-btn" [routerLink]="['/app/home/user-creation']"
             [ngClass]="{'disable': isContentLive}">Create user</button>
     </div>
     <div class="flex flex-end margin-right-s" *ngIf="isApprovals">
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
index 5426a777b..eebf5f24f 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
@@ -1,4 +1,9 @@
 <div class="flex flex-col gap-6">
+  <div class="flex flex-row gap-4 items-center">
+    <mat-icon class="cursor-pointer" [routerLink]="['/app/home/approvals/profileverification']">arrow_back</mat-icon>
+    <div class="flex font-bold">Bulk profile update</div>
+  </div>
+
   <div class="flex flex-col gap-4 bulk-container">
     <div class="flex font-bold">Bulk profile update</div>
     <div class="flex flex-row gap-8">
@@ -49,7 +54,8 @@
           <div class="flex flex-row gap-1">
             <div class="font-bold">File Information</div>
           </div>
-          <div class="flex flex-row gap-2 outline-button items-center" (click)="handleDownloadFile(list)">
+          <div class="flex flex-row gap-2 outline-button items-center" *ngIf="list?.status !== 'SUCCESSFUL'"
+            (click)="handleDownloadFile(list)">
             <mat-icon>download_2</mat-icon>
             Download error log
           </div>
@@ -57,7 +63,7 @@
         <div class="grid grid-flow-row sm:grid-flow-col gap-10 grid-col grid-container-25">
           <div class="flex flex-col">
             <div class="label">Name</div>
-            <div class="value">{{ list?.fileName }}</div>
+            <div class="value">{{ list?.filename }}</div>
           </div>
           <div class="flex flex-col">
             <div class="label">Status</div>
@@ -65,25 +71,25 @@
           </div>
           <div class="flex flex-col">
             <div class="label">Failed Records</div>
-            <div class="value">{{ list?.failedRecordsCount }}</div>
+            <div class="value">{{ list?.failedrecordscount }}</div>
           </div>
           <div class="flex flex-col">
             <div class="label">Success Records</div>
-            <div class="value">{{ list?.successfulRecordsCount }}</div>
+            <div class="value">{{ list?.successfulrecordscount }}</div>
           </div>
         </div>
         <div class="grid grid-flow-row sm:grid-flow-col gap-10 grid-col grid-container-25">
           <div class="flex flex-col">
             <div class="label">Total Records</div>
-            <div class="value">{{ list?.totalRecords }}</div>
+            <div class="value">{{ list?.totalrecords }}</div>
           </div>
           <div class="flex flex-col">
             <div class="label">Initiated On</div>
-            <div class="value">{{ list?.dateCreatedOn | date: 'dd MMM yyyy h:mm a' }}</div>
+            <div class="value">{{ list?.datecreatedon | date: 'dd MMM yyyy h:mm a' }}</div>
           </div>
           <div class="flex flex-col">
             <div class="label">Completed ON</div>
-            <div class="value">{{ list?.dateUpdatedOn | date: 'dd MMM yyyy h:mm a' }}</div>
+            <div class="value">{{ list?.dateupdatedon | date: 'dd MMM yyyy h:mm a' }}</div>
           </div>
         </div>
       </div>
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
index 13715feaa..1e85e6a07 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
@@ -63,7 +63,7 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
   }
 
   getBulkStatusList(): void {
-    this.fileService.getBulkUploadDataV1(this.rootOrgId)
+    this.fileService.getBulkApprovalUploadDataV1()
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
         this.lastUploadList = res.result.content
@@ -83,7 +83,7 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
   }
 
   handleDownloadFile(listObj: any): void {
-    const filePath = `/apis/proxies/v8/workflow/admin/bulkuploadfile/download/${listObj.fileName}`
+    const filePath = `/apis/proxies/v8/workflow/admin/bulkuploadfile/download/${listObj.filename}`
     window.open(filePath, '_blank')
   }
 
@@ -149,7 +149,7 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
       if (this.fileSelected) {
         const formData: FormData = new FormData()
         formData.append('data', this.fileSelected, this.fileName)
-        this.fileService.upload(this.fileName, formData)
+        this.fileService.uploadApproval(this.fileName, formData)
           .pipe(takeUntil(this.destroySubject$))
           .subscribe((_res: any) => {
             this.fileUploadDialogInstance.close()

From 6ca05200dd4780fdfa6e33ebce0b9dee149b3825 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Tue, 7 May 2024 11:40:04 +0530
Subject: [PATCH 584/887] Lint fix

---
 .../routes/approvals/bulk-upload/bulk-upload.component.ts   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
index 1e85e6a07..f3e73e42e 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
@@ -67,7 +67,7 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
         this.lastUploadList = res.result.content
-      }, (error: HttpErrorResponse) => {
+      },         (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open('Unable to get Bulk status list')
         }
@@ -109,7 +109,7 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
         if (!resendFlag) {
           this.verifyOTP(contactType)
         }
-      }, (error: HttpErrorResponse) => {
+      },         (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open(_.get(error, 'error.params.errmsg') || `Unable to send OTP to your ${contactType}, please try again later!`)
         }
@@ -157,7 +157,7 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
             this.fileName = ''
             this.fileSelected = ''
             this.getBulkStatusList()
-          }, (_err: HttpErrorResponse) => {
+          },         (_err: HttpErrorResponse) => {
             if (!_err.ok) {
               this.matSnackBar.open('Uploading CSV file failed due to some error, please try again later!')
             }

From 363449de5d29ec72aa475f418b748ec82a852a99 Mon Sep 17 00:00:00 2001
From: Vinod Kumar Shyave <121538586+vShyave@users.noreply.github.com>
Date: Wed, 8 May 2024 14:41:50 +0530
Subject: [PATCH 585/887] Roles and Tags functionality added

---
 .../single-user-creation.component.html       | 29 +++++--
 .../single-user-creation.component.scss       |  4 +
 .../single-user-creation.component.ts         | 87 +++++++++++++++++--
 3 files changed, 103 insertions(+), 17 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
index 6f4222930..e4889d88f 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
@@ -32,7 +32,7 @@
       </div>
 
       <div class="input-container">
-        <div class="label required">Designation</div>
+        <div class="label">Designation</div>
         <mat-form-field class="profile-form-field">
           <div class="flex flex-row auto-complete-row">
             <input type="text" class="input-text" aria-label="Designation" matInput formControlName="designation"
@@ -50,7 +50,7 @@
 
     <div class="flex flex-row gap-6">
       <div class="input-container">
-        <div class="label required">Group</div>
+        <div class="label">Group</div>
         <mat-form-field class="profile-form-field">
           <mat-select formControlName="group">
             <mat-option value="">Choose a group</mat-option>
@@ -120,7 +120,17 @@
     <div class="flex flex-row gap-6">
       <div class="input-container">
         <div class="label">Tags</div>
-        <input type="text" class="input-text" formControlName="tags" placeholder="Enter tags" />
+        <input type="text" class="input-text" matInput i18n-placeholder="Type tag here"
+          placeholder="Type tag here and press enter" [matChipInputFor]="chipListTags" autocomplete="off"
+          maxlength="100" [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
+          (matChipInputTokenEnd)="handleAddTags($event)" />
+        <mat-chip-list #chipListTags>
+          <mat-chip *ngFor="let tag of userCreationForm?.get('tags')?.value" [selectable]="true" [removable]="true"
+            (removed)="handleRemoveTag(tag)">
+            {{ tag }}
+            <mat-icon matChipRemove>cancel</mat-icon>
+          </mat-chip>
+        </mat-chip-list>
       </div>
       <div class="input-container"></div>
     </div>
@@ -129,18 +139,19 @@
       <div class="input-container">
         <div class="label required mb-2">Role</div>
         <div class="flex flex-col gap-4">
-          <div class="flex flex-row gap-4" *ngFor="let item of [1, 2, 3, 4, 5, 6, 7, 8]">
-            <div class="flex-1">CBP_ADMIN</div>
-            <mat-checkbox></mat-checkbox>
+          <div class="flex flex-row gap-4" *ngFor="let role of masterData?.mdoRoles">
+            <div class="flex-1">{{ role }}</div>
+            <mat-checkbox (change)="handleRolesCheck($event, role)"></mat-checkbox>
           </div>
         </div>
       </div>
       <div class="input-container"></div>
     </div>
-
+    userCreationForm = {{ userCreationForm.value | json }}
+    userCreationForm?.invalid = {{ userCreationForm?.invalid }}
     <div class="flex flex-row gap-4">
-      <button class="action-button" [disabled]="userCreationForm?.invalid"
-        [ngClass]="{'disable-button': userCreationForm?.invalid}">Create user</button>
+      <button class="action-button" [ngClass]="{'disable-button': userCreationForm?.invalid}"
+        [disabled]="userCreationForm?.invalid" (click)="handleUserCreation()">Create user</button>
       <button class="outline-button" (click)="handleFormClear()">Clear</button>
     </div>
   </form>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.scss b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.scss
index 9ec7fae90..e50e9411b 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.scss
@@ -26,6 +26,10 @@
   }
 }
 
+.input-text.mat-chip-input {
+  flex: 1 0 0px;
+}
+
 .icon-include-input {
   width: calc(100% + -12px);
   margin: 0px !important;
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
index 96e00d109..4f8e1f2f6 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
@@ -2,13 +2,15 @@ import { Component, OnDestroy, OnInit } from '@angular/core'
 import { FormBuilder, FormControl, Validators } from '@angular/forms'
 import { MomentDateAdapter } from '@angular/material-moment-adapter'
 import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE } from '@angular/material/core'
-import { MatSnackBar } from '@angular/material'
+import { MatCheckboxChange, MatChipInputEvent, MatSnackBar } from '@angular/material'
 import { HttpErrorResponse } from '@angular/common/http'
-
-import { UsersService } from '../../../../users/services/users.service'
+import { COMMA, ENTER } from '@angular/cdk/keycodes'
 import { Subject } from 'rxjs'
 import { debounceTime, distinctUntilChanged, startWith, takeUntil } from 'rxjs/operators'
 
+import { UsersService } from '../../../../users/services/users.service'
+import { RolesService } from '../../../../users/services/roles.service'
+
 export const MY_FORMATS = {
   parse: {
     dateInput: 'LL',
@@ -37,12 +39,12 @@ const PIN_CODE_PATTERN = /^[1-9][0-9]{5}$/
 export class SingleUserCreationComponent implements OnInit, OnDestroy {
 
   private destroySubject$ = new Subject()
+  separatorKeysCodes: number[] = [ENTER, COMMA]
   masterData: any = {}
   userCreationForm = this.formBuilder.group({
     fullName: new FormControl('', [Validators.required]),
     primaryEmail: new FormControl('', [Validators.required, Validators.pattern(EMAIL_PATTERN)]),
     mobile: new FormControl('', [Validators.required, Validators.pattern(MOBILE_PATTERN), Validators.minLength(10)]),
-    organization: new FormControl(''),
     designation: new FormControl(''),
     group: new FormControl(''),
     dob: new FormControl(''),
@@ -53,10 +55,12 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
     tags: new FormControl([]),
     roles: new FormControl([], [Validators.required]),
   })
+
   constructor(
     private formBuilder: FormBuilder,
     private usersService: UsersService,
-    private matSnackBar: MatSnackBar
+    private matSnackBar: MatSnackBar,
+    private rolesService: RolesService
   ) {
     if (this.userCreationForm.get('designation')) {
       // tslint:disable-next-line
@@ -95,6 +99,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
     this.getDesignation()
     this.getMasterLanguages()
     this.getGroups()
+    this.getOrgRolesList()
   }
 
   getDesignation(): void {
@@ -103,7 +108,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((_res: any) => {
         this.masterData['designation'] = _res.responseData
         this.masterData['designationBackup'] = _res.responseData
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch designation details, please try again later!')
         }
@@ -116,7 +121,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((res: any) => {
         this.masterData['language'] = res.languages
         this.masterData['languageBackup'] = res.languages
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch master language details, please try again later!')
         }
@@ -128,17 +133,83 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
         this.masterData['group'] = res.result.response
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch group data, please try again later!')
         }
       })
   }
 
+  getOrgRolesList(): void {
+    this.rolesService.getAllRoles()
+      .pipe(takeUntil(this.destroySubject$))
+      .subscribe((res: any) => {
+        if (res && res.result && res.result.response.value) {
+          this.masterData['rolesList'] = JSON.parse(res.result.response.value)
+          if (Array.isArray(this.masterData.rolesList.orgTypeList)) {
+            const mdoArray = this.masterData.rolesList.orgTypeList.find((elem: any) => elem.name === 'MDO')
+            this.masterData['mdoRoles'] = mdoArray.roles
+          }
+        }
+      }, (_err: HttpErrorResponse) => {
+        if (!_err.ok) {
+          this.matSnackBar.open('Unable to fetch roles list, please try again later!')
+        }
+      })
+  }
+
+  handleRolesCheck(event: MatCheckboxChange, role: string): void {
+    if (event.checked) {
+      if (this.userCreationForm.get('roles')) {
+        // tslint:disable-next-line
+        this.userCreationForm.get('roles')!.value.push(role)
+      }
+    } else {
+      if (this.userCreationForm.get('roles')) {
+        // tslint:disable-next-line
+        const indexValue = this.userCreationForm.get('roles')!.value.indexOf(role)
+        if (indexValue > -1) {
+          // tslint:disable-next-line
+          this.userCreationForm.get('roles')!.value.splice(indexValue, 1)
+        }
+      }
+    }
+  }
+
+  handleAddTags(event: MatChipInputEvent): void {
+    const value = event.value as string
+    if ((value && value.trim()) && this.userCreationForm.get('roles')) {
+      // tslint:disable-next-line
+      this.userCreationForm.get('tags')!.value.push(value)
+    }
+    if (event.input) {
+      event.input.value = ''
+    }
+  }
+
+  handleRemoveTag(tag: any): void {
+    if (this.userCreationForm.get('roles')) {
+      // tslint:disable-next-line
+      const indexValue = this.userCreationForm.get('tags')!.value.indexOf(tag)
+      if (indexValue > -1) {
+        // tslint:disable-next-line
+        this.userCreationForm.get('tags')!.value.splice(indexValue, 1)
+      }
+    }
+  }
+
   handleFormClear(): void {
     this.userCreationForm.reset()
   }
 
+  handleUserCreation(): void {
+    const dataToSubmit = { ...this.userCreationForm.value }
+    if (dataToSubmit.dob) {
+      // tslint:disable-next-line
+      dataToSubmit.dob = `${new Date(dataToSubmit.dob).getDate()}-${new Date(dataToSubmit.dob).getMonth() + 1}-${new Date(dataToSubmit.dob).getFullYear()}`
+    }
+  }
+
   ngOnDestroy(): void {
 
   }

From b18dc6a0e929605614ed12240c26fa1651a608f0 Mon Sep 17 00:00:00 2001
From: Vinod Kumar Shyave <121538586+vShyave@users.noreply.github.com>
Date: Wed, 8 May 2024 16:19:46 +0530
Subject: [PATCH 586/887] Create user API is integrated

---
 .../single-user-creation.component.html       |  5 ++-
 .../single-user-creation.component.ts         | 35 ++++++++++++-------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
index e4889d88f..5eb7e30a4 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
@@ -141,14 +141,13 @@
         <div class="flex flex-col gap-4">
           <div class="flex flex-row gap-4" *ngFor="let role of masterData?.mdoRoles">
             <div class="flex-1">{{ role }}</div>
-            <mat-checkbox (change)="handleRolesCheck($event, role)"></mat-checkbox>
+            <mat-checkbox #rolesCheckbox (change)="handleRolesCheck($event, role)"></mat-checkbox>
           </div>
         </div>
       </div>
       <div class="input-container"></div>
     </div>
-    userCreationForm = {{ userCreationForm.value | json }}
-    userCreationForm?.invalid = {{ userCreationForm?.invalid }}
+
     <div class="flex flex-row gap-4">
       <button class="action-button" [ngClass]="{'disable-button': userCreationForm?.invalid}"
         [disabled]="userCreationForm?.invalid" (click)="handleUserCreation()">Create user</button>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
index 4f8e1f2f6..dc8570901 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnDestroy, OnInit } from '@angular/core'
+import { Component, ElementRef, OnDestroy, OnInit, QueryList, ViewChildren } from '@angular/core'
 import { FormBuilder, FormControl, Validators } from '@angular/forms'
 import { MomentDateAdapter } from '@angular/material-moment-adapter'
 import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE } from '@angular/material/core'
@@ -38,9 +38,11 @@ const PIN_CODE_PATTERN = /^[1-9][0-9]{5}$/
 })
 export class SingleUserCreationComponent implements OnInit, OnDestroy {
 
+  @ViewChildren("rolesCheckbox") checkboxes!: QueryList<ElementRef>
   private destroySubject$ = new Subject()
   separatorKeysCodes: number[] = [ENTER, COMMA]
   masterData: any = {}
+  rolesArr: string[] = []
   userCreationForm = this.formBuilder.group({
     fullName: new FormControl('', [Validators.required]),
     primaryEmail: new FormControl('', [Validators.required, Validators.pattern(EMAIL_PATTERN)]),
@@ -160,20 +162,16 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
 
   handleRolesCheck(event: MatCheckboxChange, role: string): void {
     if (event.checked) {
-      if (this.userCreationForm.get('roles')) {
-        // tslint:disable-next-line
-        this.userCreationForm.get('roles')!.value.push(role)
-      }
+      this.rolesArr.push(role)
     } else {
-      if (this.userCreationForm.get('roles')) {
-        // tslint:disable-next-line
-        const indexValue = this.userCreationForm.get('roles')!.value.indexOf(role)
-        if (indexValue > -1) {
-          // tslint:disable-next-line
-          this.userCreationForm.get('roles')!.value.splice(indexValue, 1)
-        }
+      if (this.rolesArr.indexOf(role) > -1) {
+        this.rolesArr.splice(this.rolesArr.indexOf(role), 1)
       }
     }
+
+    this.userCreationForm.patchValue({
+      roles: this.rolesArr
+    })
   }
 
   handleAddTags(event: MatChipInputEvent): void {
@@ -200,6 +198,9 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
 
   handleFormClear(): void {
     this.userCreationForm.reset()
+    this.checkboxes.forEach((elem: any) => {
+      elem.checked = false
+    })
   }
 
   handleUserCreation(): void {
@@ -208,6 +209,16 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       // tslint:disable-next-line
       dataToSubmit.dob = `${new Date(dataToSubmit.dob).getDate()}-${new Date(dataToSubmit.dob).getMonth() + 1}-${new Date(dataToSubmit.dob).getFullYear()}`
     }
+    this.usersService.createUser(dataToSubmit)
+      .pipe(takeUntil(this.destroySubject$))
+      .subscribe((_res: any) => {
+        this.matSnackBar.open('User created successfully!')
+        this.handleFormClear()
+      }, (_err: HttpErrorResponse) => {
+        if (!_err.ok) {
+          this.matSnackBar.open('Unable to create user, please try again later!')
+        }
+      })
   }
 
   ngOnDestroy(): void {

From fda5c8d19ded29e9a03416e7f719765574cb0881 Mon Sep 17 00:00:00 2001
From: Vinod Kumar Shyave <121538586+vShyave@users.noreply.github.com>
Date: Wed, 8 May 2024 16:21:19 +0530
Subject: [PATCH 587/887] Create user API is integrated

---
 .../single-user-creation.component.ts              | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
index dc8570901..56a49d6b9 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
@@ -38,7 +38,7 @@ const PIN_CODE_PATTERN = /^[1-9][0-9]{5}$/
 })
 export class SingleUserCreationComponent implements OnInit, OnDestroy {
 
-  @ViewChildren("rolesCheckbox") checkboxes!: QueryList<ElementRef>
+  @ViewChildren('rolesCheckbox') checkboxes!: QueryList<ElementRef>
   private destroySubject$ = new Subject()
   separatorKeysCodes: number[] = [ENTER, COMMA]
   masterData: any = {}
@@ -110,7 +110,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((_res: any) => {
         this.masterData['designation'] = _res.responseData
         this.masterData['designationBackup'] = _res.responseData
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch designation details, please try again later!')
         }
@@ -123,7 +123,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((res: any) => {
         this.masterData['language'] = res.languages
         this.masterData['languageBackup'] = res.languages
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch master language details, please try again later!')
         }
@@ -135,7 +135,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
         this.masterData['group'] = res.result.response
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch group data, please try again later!')
         }
@@ -153,7 +153,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
             this.masterData['mdoRoles'] = mdoArray.roles
           }
         }
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch roles list, please try again later!')
         }
@@ -170,7 +170,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
     }
 
     this.userCreationForm.patchValue({
-      roles: this.rolesArr
+      roles: this.rolesArr,
     })
   }
 
@@ -214,7 +214,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((_res: any) => {
         this.matSnackBar.open('User created successfully!')
         this.handleFormClear()
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to create user, please try again later!')
         }

From e5fc6e48e9f384b549388a85378d20f9fcc69f79 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Wed, 8 May 2024 17:03:33 +0530
Subject: [PATCH 588/887] Added approve all flow & validations

---
 .../components/search/search.component.html   |   6 +-
 .../components/search/search.component.scss   |   3 +
 .../components/search/search.component.ts     |   7 +-
 .../user-cards/user-card.component.html       | 262 ++++++-----
 .../user-cards/user-card.component.ts         | 411 ++++--------------
 .../approval-pending.component.html           |  20 +-
 .../approval-pending.component.ts             |  91 +++-
 7 files changed, 336 insertions(+), 464 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.html b/project/ws/app/src/lib/routes/home/components/search/search.component.html
index 263432518..3604d6fe3 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.html
@@ -21,9 +21,9 @@
         <button mat-button type="button" class="search-btn" [routerLink]="['/app/home/user-creation']"
             [ngClass]="{'disable': isContentLive}">Create user</button>
     </div>
-    <div class="flex flex-end margin-right-s" *ngIf="isApprovals">
-        <button mat-button type="button" class="search-btn" [ngClass]="{'disable': isContentLive}">Approve all
-            requests</button>
+    <div class="flex flex-end margin-right-s" *ngIf="isApprovals && showApproveALL">
+        <button mat-button type="button" class="search-btn" (click)="approveAll()"
+            [disabled]="disableApproveALL">Approve all requests</button>
     </div>
     <div class="flex flex-end" *ngIf="isApprovals">
         <button mat-button type="button" class="search-btn" [routerLink]="['/app/home/approvals/bulkupdate']"
diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.scss b/project/ws/app/src/lib/routes/home/components/search/search.component.scss
index dcb221562..526013db6 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.scss
@@ -42,6 +42,9 @@
 .btn-disabled {
     background: rgba(0, 0, 0, 0.16) !important;
 }
+.mat-button[disabled] {
+  opacity: 0.6 !important;
+}
 
 .disable {
   opacity: 0.3;
diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.ts b/project/ws/app/src/lib/routes/home/components/search/search.component.ts
index 73cde224f..4d4a81cde 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.ts
@@ -13,7 +13,10 @@ import { UsersService } from '../../../users/services/users.service'
 export class SearchComponent implements OnInit {
   @Input() from: any = ''
   @Input() isApprovals: any
+  @Input() showApproveALL: any
+  @Input() disableApproveALL: any
   @Output() handleApiData = new EventEmitter()
+  @Output() handleapproveAll = new EventEmitter()
   searchText = ''
   filterVisibilityFlag = false
   clearFilter = false
@@ -95,7 +98,9 @@ export class SearchComponent implements OnInit {
     this.pageSize = 20
   }
 
-  createUser() { }
+  approveAll() {
+    this.handleapproveAll.emit()
+  }
 
   sort() { }
 }
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index ef2fafe34..d65d8be79 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -1,5 +1,6 @@
-<div class="searchfilter">
-  <ws-app-searchuser (handleApiData)="onSearch($event)" [isApprovals]="isApprovals"></ws-app-searchuser>
+<div class="searchfilter" *ngIf="!isApprovals">
+  <ws-app-searchuser (handleApiData)="onSearch($event)" (handleapproveAll)="onApproveALL()"
+    [showApproveALL]="showApproveALL"></ws-app-searchuser>
 </div>
 
 <div *ngIf="!isApprovals">
@@ -58,7 +59,7 @@
                 <mat-form-field appearance="outline">
                   <mat-select #group formControlName="group" i18n-placeholder placeholder="Select group">
                     <mat-option [value]="g" *ngFor="let g of groupsList">
-                      {{g.name}}
+                      {{g}}
                     </mat-option>
                   </mat-select>
                   <mat-error [hidden]="false" i18n="Group Error | Explains group is required"
@@ -497,11 +498,15 @@
       </div>
     </mat-expansion-panel>
   </mat-accordion>
+
+  <div *ngIf="usersData && usersData?.content.length === 0">
+    <p class="margin-top-xl margin-bottom-xl">No users found</p>
+  </div>
 </div>
 
 <!-- for Approvals page -->
 <div *ngIf="isApprovals">
-  <mat-accordion [multi]="true">
+  <mat-accordion [multi]="true" *ngIf="approvalData">
     <mat-expansion-panel class="user-card" *ngFor="let appData of approvalData" #panel
       (opened)="closeOtherPanels(panel)">
       <mat-expansion-panel-header (click)="getUerData(appData.user, appData.userWorkflow);">
@@ -529,12 +534,12 @@
         </div>
 
         <div class="float-right">
-          <p class="mat-body-2 margin-top-l margin-right-m"><mat-icon class="orangeicon">error</mat-icon>
+          <p class="mat-body-2 margin-top-m margin-right-m"><mat-icon class="orangeicon">error</mat-icon>
             {{appData?.needApprovalList.length}} approval pending</p>
         </div>
       </mat-expansion-panel-header>
 
-      <div class="panel-body" *ngIf="appData?.user">
+      <div class="panel-body">
         <form [formGroup]="approveUserDataForm" class="margin-top-m">
           <!-- <button mat-button class="my-4 mr-4" (click)="addRejection()">add reason</button>
               <button mat-button class="my-4 mr-4" (click)="updateRejection()">update reason</button> -->
@@ -571,8 +576,30 @@
                 </mat-radio-group>
               </div> -->
               <ng-container *ngFor="let field of appData.needApprovalList">
-                <div class="md:w-1/3 margin-bottom-s">
-                  <label class="view-text-label">{{field.label}}</label>
+                <div class="md:w-1/3 margin-bottom-s" *ngIf="field.label === 'Group'">
+                  <label class="view-text-label">Group</label>
+                  <div>
+                    <span>
+                      <input type="text" class="appr-text-field margin-bottom-s" [value]="field.value">
+                      <mat-icon class="verified-icon margin-left-s"
+                        *ngIf="field.action === 'APPROVE'">check_circle</mat-icon>
+                      <mat-icon class="nonverified-icon margin-left-s"
+                        *ngIf="field.action === 'REJECT'">cancel</mat-icon>
+                    </span>
+                    <mat-radio-group aria-label="Select an option" name="approveGroup" formControlName="approveGroup"
+                      class="mat-caption margin-top-s">
+                      <mat-radio-button value="approvegroup" class="margin-right-s"
+                        (click)="onClickHandleWorkflow(field,'APPROVE')">Approve</mat-radio-button>
+                      <mat-radio-button value="rejectgroup"
+                        (click)="onClickHandleWorkflow(field,'REJECT')">Reject</mat-radio-button>
+                      <mat-icon class="margin-left-m editreasonicon cursor-pointer"
+                        *ngIf="field.action === 'REJECT' && comment !== ''"
+                        (click)="updateRejection(field)">chat_bubble</mat-icon>
+                    </mat-radio-group>
+                  </div>
+                </div>
+                <div class="md:w-1/3 margin-bottom-s" *ngIf="field.label === 'Designation'">
+                  <label class="view-text-label">Designation</label>
                   <div>
                     <span>
                       <input type="text" class="appr-text-field margin-bottom-s" [value]="field.value">
@@ -583,9 +610,9 @@
                     </span>
                     <mat-radio-group aria-label="Select an option" name="approveDesignation"
                       formControlName="approveDesignation" class="mat-caption margin-top-s">
-                      <mat-radio-button value="approve" class="margin-right-s"
+                      <mat-radio-button value="approvedesg" class="margin-right-s"
                         (click)="onClickHandleWorkflow(field,'APPROVE')">Approve</mat-radio-button>
-                      <mat-radio-button value="reject"
+                      <mat-radio-button value="rejectdesg"
                         (click)="onClickHandleWorkflow(field,'REJECT')">Reject</mat-radio-button>
                       <mat-icon class="margin-left-m editreasonicon cursor-pointer"
                         *ngIf="field.action === 'REJECT' && comment !== ''"
@@ -594,140 +621,135 @@
                   </div>
                 </div>
               </ng-container>
-              <!-- <div style="margin-top: 17px; margin-left: 155px;" *ngIf="needApprovalList.length > 1">
-                <button mat-icon-button aria-label="Reject" id="reject"
-                  (click)="onClickAllHandleWorkflow(needApprovalList,'REJECT')">
-                  <span class="mat-button-wrapper" style="color: white; padding:13px;"> Reject All </span>
-                </button>
-                <button mat-icon-button aria-label="Accept" id="accept" class="accept-btn"
-                  (click)="onClickAllHandleWorkflow(needApprovalList,'APPROVE')">
-                  <span class="mat-button-wrapper" style="color:white; padding:13px;"> Approve All </span>
-                </button>
-              </div> -->
             </div>
           </div>
-        </form>
-        <hr>
-        <div class="inner-body margin-top-m mat-body-2">
-          <div class="margin-bottom-m">
-            <span class="font-bold">Other Details</span> <mat-icon
-              class="ws-mat-black40-text infoicon">info_outline</mat-icon>
-          </div>
-
-          <div class="flex flex-row margin-top-m">
-            <div class="md:w-1/4">
-              <label class="view-text-label">Employee ID</label>
-              <p>{{appData.user.empID ? appData.user.empID : '-'}}</p>
+          <hr>
+          <div class="inner-body margin-top-m mat-body-2" *ngIf="appData?.user">
+            <div class="margin-bottom-m">
+              <span class="font-bold">Other Details</span> <mat-icon
+                class="ws-mat-black40-text infoicon">info_outline</mat-icon>
             </div>
 
-            <div class="md:w-1/4">
-              <label class="view-text-label">Email</label>
-              <p>{{appData.user.profileDetails && appData.user.profileDetails.personalDetails ?
-                appData.user.profileDetails.personalDetails.primaryEmail : '-'}}</p>
-            </div>
+            <div class="flex flex-row margin-top-m">
+              <div class="md:w-1/4">
+                <label class="view-text-label">Employee ID</label>
+                <p>{{appData.user.empID ? appData.user.empID : '-'}}</p>
+              </div>
 
-            <div class="md:w-1/4">
-              <label class="view-text-label">Mobile Number</label>
-              <p>{{appData.user.profileDetails && appData.user.profileDetails.personalDetails ?
-                appData.user.profileDetails.personalDetails.mobile : '-'}}</p>
-            </div>
+              <div class="md:w-1/4">
+                <label class="view-text-label">Email</label>
+                <p>{{appData.user.profileDetails && appData.user.profileDetails.personalDetails ?
+                  appData.user.profileDetails.personalDetails.primaryEmail : '-'}}</p>
+              </div>
 
-            <div class="md:w-1/4">
-              <label class="view-text-label">Gender</label>
-              <p>{{appData.user.profileDetails && appData.user.profileDetails.personalDetails &&
-                appData.user.profileDetails.personalDetails.gender ?
-                appData.user.profileDetails.personalDetails.gender : '-'}}</p>
-            </div>
-          </div>
-          <div class="flex flex-row margin-top-m">
-            <div class="md:w-1/4">
-              <label class="view-text-label">Date Of Birth</label>
-              <p>{{appData.user.profileDetails && appData.user.profileDetails.personalDetails &&
-                appData.user.profileDetails.personalDetails.dob
-                ? appData.user.profileDetails.personalDetails.dob
-                : '-'}}</p>
-            </div>
+              <div class="md:w-1/4">
+                <label class="view-text-label">Mobile Number</label>
+                <p>{{appData.user.profileDetails && appData.user.profileDetails.personalDetails ?
+                  appData.user.profileDetails.personalDetails.mobile : '-'}}</p>
+              </div>
 
-            <div class="md:w-1/4">
-              <label class="view-text-label">Mother Tongue</label>
-              <p>{{appData.user.profileDetails && appData.user.profileDetails.personalDetails &&
-                appData.user.profileDetails.personalDetails.domicileMedium ?
-                appData.user.profileDetails.personalDetails.domicileMedium : '-'}}</p>
+              <div class="md:w-1/4">
+                <label class="view-text-label">Gender</label>
+                <p>{{appData.user.profileDetails && appData.user.profileDetails.personalDetails &&
+                  appData.user.profileDetails.personalDetails.gender ?
+                  appData.user.profileDetails.personalDetails.gender : '-'}}</p>
+              </div>
             </div>
+            <div class="flex flex-row margin-top-m">
+              <div class="md:w-1/4">
+                <label class="view-text-label">Date Of Birth</label>
+                <p>{{appData.user.profileDetails && appData.user.profileDetails.personalDetails &&
+                  appData.user.profileDetails.personalDetails.dob
+                  ? appData.user.profileDetails.personalDetails.dob
+                  : '-'}}</p>
+              </div>
 
-            <div class="md:w-1/4">
-              <label class="view-text-label">Category</label>
-              <p>{{appData.user.profileDetails && appData.user.profileDetails.personalDetails &&
-                appData.user.profileDetails.personalDetails.category ?
-                appData.user.profileDetails.personalDetails.category : '-'}}</p>
-            </div>
+              <div class="md:w-1/4">
+                <label class="view-text-label">Mother Tongue</label>
+                <p>{{appData.user.profileDetails && appData.user.profileDetails.personalDetails &&
+                  appData.user.profileDetails.personalDetails.domicileMedium ?
+                  appData.user.profileDetails.personalDetails.domicileMedium : '-'}}</p>
+              </div>
 
-            <div class="md:w-1/4">
-              <label class="view-text-label">Pay Band</label>
-              <p>{{appData.user.profileDetails && appData.user.profileDetails.employmentDetails &&
-                appData.user.profileDetails.employmentDetails.payType ?
-                appData.user.profileDetails.employmentDetails.payType : '-'}}</p>
-            </div>
-          </div>
-          <div class="flex flex-row margin-top-m">
-            <div class="md:w-1/4">
-              <label class="view-text-label">Office Pin Code</label>
-              <p>{{appData.user.profileDetails && appData.user.profileDetails.employmentDetails &&
-                appData.user.profileDetails.employmentDetails.pinCode ?
-                appData.user.profileDetails.employmentDetails.pinCode : '-'}}</p>
-            </div>
+              <div class="md:w-1/4">
+                <label class="view-text-label">Category</label>
+                <p>{{appData.user.profileDetails && appData.user.profileDetails.personalDetails &&
+                  appData.user.profileDetails.personalDetails.category ?
+                  appData.user.profileDetails.personalDetails.category : '-'}}</p>
+              </div>
 
-            <div class="md:w-1/4">
-              <label class="view-text-label">eHRMS ID</label>
-              <p>{{appData.user.ehrmsID ? appData.user.ehrmsID : '-'}}</p>
+              <div class="md:w-1/4">
+                <label class="view-text-label">Pay Band</label>
+                <p>{{appData.user.profileDetails && appData.user.profileDetails.employmentDetails &&
+                  appData.user.profileDetails.employmentDetails.payType ?
+                  appData.user.profileDetails.employmentDetails.payType : '-'}}</p>
+              </div>
             </div>
+            <div class="flex flex-row margin-top-m">
+              <div class="md:w-1/4">
+                <label class="view-text-label">Office Pin Code</label>
+                <p>{{appData.user.profileDetails && appData.user.profileDetails.employmentDetails &&
+                  appData.user.profileDetails.employmentDetails.pinCode ?
+                  appData.user.profileDetails.employmentDetails.pinCode : '-'}}</p>
+              </div>
 
-            <div class="md:w-1/2">
-              <label class="view-text-label">Tags</label>
-              <div *ngIf="appData?.user?.profileDetails && appData?.user?.profileDetails?.additionalProperties &&
+              <div class="md:w-1/4">
+                <label class="view-text-label">eHRMS ID</label>
+                <p>{{appData.user.ehrmsID ? appData.user.ehrmsID : '-'}}</p>
+              </div>
+
+              <div class="md:w-1/2">
+                <label class="view-text-label">Tags</label>
+                <div *ngIf="appData?.user?.profileDetails && appData?.user?.profileDetails?.additionalProperties &&
                     appData?.user?.profileDetails?.additionalProperties?.tag &&
                     appData?.user?.profileDetails?.additionalProperties?.tag.length > 0">
-                <ul class="tagslist">
-                  <li *ngFor="let t of appData?.user?.profileDetails?.additionalProperties.tag">{{t}}</li>
-                </ul>
+                  <ul class="tagslist">
+                    <li *ngFor="let t of appData?.user?.profileDetails?.additionalProperties.tag">{{t}}</li>
+                  </ul>
+                </div>
+                <p *ngIf="appData?.user?.profileDetails && !appData?.user?.profileDetails?.additionalProperties">-</p>
               </div>
-              <p *ngIf="appData?.user?.profileDetails && !appData?.user?.profileDetails?.additionalProperties">-</p>
             </div>
-          </div>
-          <div class="flex flex-row margin-top-m">
-            <div class="md:w-1/1">
-              <label class="view-text-label">Roles</label>
-              <div *ngIf="appData?.user?.organisations && appData?.user?.organisations[0]?.roles.length > 0">
-                <ul class="roleslist">
-                  <li *ngFor="let t of appData?.user?.organisations[0]?.roles">{{t}}
-                  </li>
-                </ul>
+            <div class="flex flex-row margin-top-m">
+              <div class="md:w-1/1">
+                <label class="view-text-label">Roles</label>
+                <div *ngIf="appData?.user?.organisations && appData?.user?.organisations[0]?.roles.length > 0">
+                  <ul class="roleslist">
+                    <li *ngFor="let t of appData?.user?.organisations[0]?.roles">{{t}}
+                    </li>
+                  </ul>
+                </div>
+                <p *ngIf="appData?.user?.organisations && appData?.user?.organisations[0].roles.length === 0">-</p>
               </div>
-              <p *ngIf="appData?.user?.organisations && appData?.user?.organisations[0].roles.length === 0">-</p>
             </div>
           </div>
-        </div>
 
-        <div class="flex flex-row margin-top-l">
-          <button mat-raised-button type="submit" (click)="onApprovalSubmit(panel)"
-            class="margin-right-m btn-success btn-responsive successbtn" [disabled]="actionList.length === 0">
-            <span class="text-white" i18n>
-              Update
-            </span>
-          </button>
-          <button mat-raised-button type="submit" (click)="onApprovalCancel()"
-            class="btn-success btn-responsive cancelbtn">
-            <span i18n>
-              Cancel
-            </span>
-          </button>
-        </div>
-      </div>
-      <div class="panel-body" *ngIf="!appData?.user">
-        <p class="text-center margin-top-m">No user data</p>
+          <div class="panel-body" *ngIf="!appData?.user">
+            <p class="text-center margin-top-m">No user data</p>
+          </div>
+
+          <div class="flex flex-row margin-top-l">
+            <button mat-raised-button type="submit" (click)="onApprovalSubmit(panel)"
+              class="margin-right-m btn-success btn-responsive successbtn" [disabled]="!approveUserDataForm.valid">
+              <span class="text-white" i18n>
+                Update
+              </span>
+            </button>
+            <button mat-raised-button type="submit" (click)="onApprovalCancel()"
+              class="btn-success btn-responsive cancelbtn">
+              <span i18n>
+                Cancel
+              </span>
+            </button>
+          </div>
+        </form>
       </div>
     </mat-expansion-panel>
   </mat-accordion>
+
+  <div *ngIf="!approvalData">
+    <p class="margin-top-xl margin-bottom-xl">No approval requests</p>
+  </div>
 </div>
 
 <div class="flex flex-row justify-center">
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index fc6ae675c..6e84fb4a4 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -9,13 +9,13 @@ import { COMMA, ENTER } from '@angular/cdk/keycodes'
 // tslint:disable-next-line
 import _ from 'lodash'
 import { RolesService } from '../../../users/services/roles.service'
-import { ActivatedRoute, Router } from '@angular/router'
+import { ActivatedRoute } from '@angular/router'
 import { Observable, Subscription } from 'rxjs'
 import { debounceTime, distinctUntilChanged, map, startWith } from 'rxjs/operators'
 import { environment } from '../../../../../../../../../src/environments/environment'
 // import { OtpService } from '../../../users/services/otp.service'
 // import { ConfigurationsService } from '@sunbird-cb/utils'
-import { RejectionPopupComponent } from '../rejection-popup/rejection-popup.component'
+// import { RejectionPopupComponent } from '../rejection-popup/rejection-popup.component'
 import { APP_DATE_FORMATS, AppDateAdapter } from '../../../events/routes/format-datepicker'
 import { ApprovalsService } from '../../services/approvals.service'
 import { EventService } from '@sunbird-cb/utils'
@@ -41,6 +41,7 @@ export class UserCardComponent implements OnInit {
 
   @Output() paginationData = new EventEmitter()
   @Output() searchByEnterKey = new EventEmitter()
+  @Output() disableButton = new EventEmitter()
   @ViewChildren(MatExpansionPanel) panels!: QueryList<MatExpansionPanel>
 
   @ViewChild('rejectDialog', { static: false })
@@ -104,9 +105,9 @@ export class UserCardComponent implements OnInit {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-              private dialog: MatDialog, private approvalSvc: ApprovalsService,
-              private route: ActivatedRoute, private snackBar: MatSnackBar,
-              private events: EventService, private router: Router) {
+    private dialog: MatDialog, private approvalSvc: ApprovalsService,
+    private route: ActivatedRoute, private snackBar: MatSnackBar,
+    private events: EventService) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', [Validators.required]),
       group: new FormControl('', [Validators.required]),
@@ -117,7 +118,7 @@ export class UserCardComponent implements OnInit {
       countryCode: new FormControl('+91', [Validators.required]),
       mobile: new FormControl('', [Validators.required, Validators.pattern(this.phoneNumberPattern)]),
       tags: new FormControl('', [Validators.pattern(this.namePatern)]),
-      roles: new FormControl('', [Validators.required]),
+      roles: new FormControl('', []),
       domicileMedium: new FormControl('', [Validators.required]),
       gender: new FormControl('', [Validators.required]),
       category: new FormControl('', [Validators.required]),
@@ -125,8 +126,8 @@ export class UserCardComponent implements OnInit {
     })
 
     this.approveUserDataForm = new FormGroup({
-      approveDesignation: new FormControl('', []),
-      approveGroup: new FormControl('', []),
+      approveDesignation: new FormControl('', [Validators.required]),
+      approveGroup: new FormControl('', [Validators.required]),
     })
 
     const fullProfile = _.get(this.route.snapshot, 'data.configService')
@@ -141,14 +142,16 @@ export class UserCardComponent implements OnInit {
   ngOnInit() {
     this.currentFilter = this.route.snapshot.params['tab'] || 'allusers'
     // console.log('this.currentFilter', this.currentFilter)
-    if (this.isApprovals && this.usersData && this.usersData.length > 0) {
+    if (this.isApprovals && this.usersData) {
       this.approvalData = this.usersData
-      this.getUserMappedData(this.approvalData)
-      this.approvalSvc.getProfileConfig().then((res: any) => {
-        this.profileData = res && res.profileData
-      })
-      if (this.profileData) {
-        this.getFieldsMappedData(this.approvalData)
+      if (this.approvalData && this.approvalData.length > 0) {
+        this.getUserMappedData(this.approvalData)
+        this.approvalSvc.getProfileConfig().then((res: any) => {
+          this.profileData = res && res.profileData
+        })
+        if (this.profileData) {
+          this.getFieldsMappedData(this.approvalData)
+        }
       }
     } else {
       this.init()
@@ -220,9 +223,7 @@ export class UserCardComponent implements OnInit {
     await this.usersSvc.getGroups().subscribe(
       (data: any) => {
         const res = data.result.response
-        res.map((value: any) => {
-          this.groupsList.push({ name: value })
-        })
+        this.groupsList = res
       },
       (_err: any) => {
       })
@@ -248,7 +249,7 @@ export class UserCardComponent implements OnInit {
         countryCode: '+91',
       })
     },
-                                                  (_err: any) => {
+      (_err: any) => {
       })
   }
 
@@ -370,9 +371,7 @@ export class UserCardComponent implements OnInit {
 
       if (user.profileDetails.additionalProperties) {
         if (user.profileDetails.additionalProperties.group) {
-          // this.updateUserDataForm.patchValue({ group: _.get(user, 'profileDetails.additionalProperties.group') })
-          // this.userGroup = user.profileDetails.additionalProperties.
-          this.updateUserDataForm.controls.group.setValue(user.profileDetails.additionalProperties.group)
+          this.updateUserDataForm.controls['group'].setValue(user.profileDetails.additionalProperties.group)
         }
       }
 
@@ -387,7 +386,10 @@ export class UserCardComponent implements OnInit {
           this.updateUserDataForm.controls['gender'].setValue(user.profileDetails.personalDetails.mobile)
         }
         if (user.profileDetails.personalDetails.dob) {
-          this.updateUserDataForm.controls['dob'].setValue(user.profileDetails.personalDetails.dob)
+          // this.updateUserDataForm.controls['dob'].setValue(user.profileDetails.personalDetails.dob)
+          this.updateUserDataForm.patchValue({
+            dob: this.getDateFromText(user.profileDetails.personalDetails.dob)
+          })
         }
         if (user.profileDetails.personalDetails.domicileMedium) {
           this.updateUserDataForm.controls['domicileMedium'].setValue(user.profileDetails.personalDetails.domicileMedium)
@@ -403,12 +405,21 @@ export class UserCardComponent implements OnInit {
         }
         if (user.profileDetails.employmentDetails.employeeCode) {
           this.updateUserDataForm.controls['employeeID'].setValue(user.profileDetails.employmentDetails.employeeCode)
-
         }
       }
     }
   }
 
+  private getDateFromText(dateString: string): any {
+    if (dateString) {
+      const splitValues: string[] = dateString.split('-')
+      const [dd, mm, yyyy] = splitValues
+      const dateToBeConverted = `${yyyy}-${mm}-${dd}`
+      return new Date(dateToBeConverted)
+    }
+    return ''
+  }
+
   getUseravatarName(user: any) {
     let name = ''
     if (user && user.profileDetails && user.profileDetails.personalDetails.firstname) {
@@ -479,196 +490,13 @@ export class UserCardComponent implements OnInit {
     this.startIndex = (pe.pageIndex) * pe.pageSize
     this.lastIndex = pe.pageSize
     this.paginationData.emit({ pageIndex: this.startIndex, pageSize: pe.pageSize })
-    // this.startIndex = this.pageIndex
   }
 
   onSearch(event: any) {
     this.searchByEnterKey.emit(event)
   }
 
-  // sendOtp() {
-  //   const mob = this.updateUserDataForm.get('mobile')
-  //   if (mob && mob.value && Math.floor(mob.value) && mob.valid) {
-  //     this.otpService.sendOtp(mob.value).subscribe(() => {
-  //       this.otpSend = true
-  //       alert('An OTP has been sent to your mobile number')
-  //       this.startCountDown()
-  //       // tslint:disable-next-line: align
-  //     }, (error: any) => {
-  //       this.snackBar.open(_.get(error, 'error.params.errmsg') || 'Please try again later')
-  //     })
-  //   } else {
-  //     this.snackBar.open('Please enter a valid mobile number')
-  //   }
-  // }
-  // resendOTP() {
-  //   const mob = this.updateUserDataForm.get('mobile')
-  //   if (mob && mob.value && Math.floor(mob.value) && mob.valid) {
-  //     this.otpService.resendOtp(mob.value).subscribe((res: any) => {
-  //       if ((_.get(res, 'result.response')).toUpperCase() === 'SUCCESS') {
-  //         this.otpSend = true
-  //         this.disableVerifyBtn = false
-  //         alert('An OTP has been sent to your mobile number')
-  //         this.startCountDown()
-  //       }
-  //       // tslint:disable-next-line: align
-  //     }, (error: any) => {
-  //       this.snackBar.open(_.get(error, 'error.params.errmsg') || 'Please try again later')
-  //     })
-  //   } else {
-  //     this.snackBar.open('Please enter a valid mobile number')
-  //   }
-  // }
-  // verifyOtp(otp: any) {
-  //   const mob = this.updateUserDataForm.get('mobile')
-  //   if (otp && otp.value) {
-  //     if (mob && mob.value && Math.floor(mob.value) && mob.valid) {
-  //       this.otpService.verifyOTP(otp.value, mob.value).subscribe((res: any) => {
-  //         if ((_.get(res, 'result.response')).toUpperCase() === 'SUCCESS') {
-  //           this.otpVerified = true
-  //           const reqUpdates = {
-  //             request: {
-  //               userId: this.configSvc.unMappedUser.id,
-  //               profileDetails: {
-  //                 personalDetails: {
-  //                   mobile: mob.value,
-  //                   phoneVerified: true,
-  //                 },
-  //               },
-  //             },
-  //           }
-  //           this.usersSvc.editProfileDetails(reqUpdates).subscribe((updateRes: any) => {
-
-  //             if (updateRes) {
-  //               this.isMobileVerified = true
-  //             }
-  //             // tslint:disable-next-line:align
-  //           }, (error: any) => {
-
-  //             this.snackBar.open(_.get(error, 'error.params.errmsg') || 'Please try again later')
-  //           }
-  //           )
-  //         }
-  //         // tslint:disable-next-line: align
-  //       }, (error: any) => {
-  //         this.snackBar.open(_.get(error, 'error.params.errmsg') || 'Please try again later')
-  //         if (error.error && error.error.result) {
-  //           this.disableVerifyBtn = error.error.result.remainingAttempt === 0 ? true : false
-  //         }
-  //       })
-  //     }
-  //   }
-  // }
-  // startCountDown() {
-  //   const startTime = Date.now()
-  //   this.timeLeftforOTP = this.OTP_TIMER
-  //   if (this.OTP_TIMER > 0
-  //   ) {
-  //     this.timerSubscription = interval(1000)
-  //       .pipe(
-  //         map(
-  //           () =>
-  //             startTime + this.OTP_TIMER - Date.now(),
-  //         ),
-  //       )
-  //       .subscribe((_timeRemaining: any) => {
-  //         this.timeLeftforOTP -= 1
-  //         if (this.timeLeftforOTP < 0) {
-  //           this.timeLeftforOTP = 0
-  //           if (this.timerSubscription) {
-  //             this.timerSubscription.unsubscribe()
-  //           }
-  //         }
-  //       })
-  //   }
-  // }
-
-  addRejection(field: any) {
-    const rejectinDetails = {
-      field,
-      header: {
-        headerText: 'Reason of rejection',
-        showEditButton: false,
-      },
-      body: {
-        reason: '',
-        placeholder: 'Type the decription in fewer than 100 characters',
-        showTextArea: true,
-      },
-      footer: {
-        showFooter: true,
-        buttons: [
-          {
-            btnType: 'submit',
-            btnText: 'Submit',
-            response: true,
-          },
-          {
-            btnType: 'cancel',
-            btnText: 'Cancel',
-            response: false,
-          },
-        ],
-      },
-    }
-
-    const dialogRef = this.dialog.open(RejectionPopupComponent, {
-      data: rejectinDetails,
-      width: '1100px',
-      disableClose: true,
-      panelClass: 'rejection-modal',
-      autoFocus: false,
-    })
-
-    dialogRef.afterClosed().subscribe(result => {
-      if (result.btnResponse) {
-        // console.log(result)
-      }
-    })
-  }
-
-  // updateRejection() {
-  //   const rejectinDetails = {
-  //     header: {
-  //       headerText: 'Reason of rejection',
-  //       showEditButton: true,
-  //     },
-  //     body: {
-  //       reason: `You're not in Group C.Please provide the request with the correct entry.`,
-  //       placeholder: 'Type the decription in fewer than 100 characters',
-  //       showTextArea: false,
-  //     },
-  //     footer: {
-  //       showFooter: false,
-  //       buttons: [
-  //         {
-  //           btnType: 'submit',
-  //           btnText: 'Update',
-  //           response: true,
-  //         },
-  //         {
-  //           btnType: 'cancel',
-  //           btnText: 'Cancel',
-  //           response: false,
-  //         },
-  //       ],
-  //     },
-  //   }
-
-  //   const dialogRef = this.dialog.open(RejectionPopupComponent, {
-  //     data: rejectinDetails,
-  //     width: '1100px',
-  //     disableClose: true,
-  //     panelClass: 'rejection-modal',
-  //   })
-
-  //   dialogRef.afterClosed().subscribe(result => {
-  //     if (result.btnResponse) {
-  //     }
-  //   })
-  // }
-
-  onSubmit(form: any, user: any, panel: any) {
+  onSubmit(form: any, user: any) {
     if (form.valid) {
       // const tags = user.profileDetails && user.profileDetails.additionalProperties && user.profileDetails.additionalProperties.tags ?
       //   user.profileDetails.additionalProperties.tags : []
@@ -717,34 +545,44 @@ export class UserCardComponent implements OnInit {
       this.usersSvc.updateUserDetails(this.reqbody).subscribe(dres => {
         if (dres) {
           this.openSnackbar('User updated Successfully')
+          if (this.isMdoLeader) {
+            if (form.value.roles !== this.orguserRoles) {
+              const dreq = {
+                request: {
+                  organisationId: this.department,
+                  userId: user.userId,
+                  roles: Array.from(this.userRoles),
+                },
+              }
 
-          if (form.value.roles !== this.orguserRoles) {
-            const dreq = {
-              request: {
-                organisationId: this.department,
-                userId: user.userId,
-                roles: Array.from(this.userRoles),
-              },
+              this.usersSvc.addUserToDepartment(dreq).subscribe(res => {
+                if (res) {
+                  this.updateUserDataForm.reset({ roles: '' })
+                  this.openSnackbar('User role updated Successfully')
+                  // panel.close()
+                  // this.router.navigate(['/app/home/users/allusers'])
+
+                  this.usersSvc.getUserById(user.userId).subscribe((_res: any) => {
+                    if (_res) {
+                      // tslint:disable-next-line
+                      user = _res
+                      user['enableEdit'] = false
+                    }
+                  })
+                }
+              })
+            } else {
+              this.openSnackbar('Select new roles')
             }
-
-            this.usersSvc.addUserToDepartment(dreq).subscribe(res => {
+          } else {
+            user['enableEdit'] = false
+            this.usersSvc.getUserById(user.userId).subscribe((res: any) => {
               if (res) {
-                this.updateUserDataForm.reset({ roles: '' })
-                this.openSnackbar('User role updated Successfully')
-                panel.close()
-                this.router.navigate(['/app/home/users/allusers'])
-
-                this.usersSvc.getUserById(user.userId).subscribe((_res: any) => {
-                  if (_res) {
-                    // tslint:disable-next-line
-                    user = _res
-                    user['enableEdit'] = false
-                  }
-                })
+                // tslint:disable-next-line
+                user = res
+                user.enableEdit = false
               }
             })
-          } else {
-            this.openSnackbar('Select new roles')
           }
         }
       },
@@ -779,6 +617,7 @@ export class UserCardComponent implements OnInit {
       this.actionList.push(req)
       // this.onApproveOrRejectClick(req)
     } else {
+      this.comment = ''
       const dialogRef = this.dialog.open(this.rejectDialog, {
         width: '770px',
       })
@@ -786,6 +625,7 @@ export class UserCardComponent implements OnInit {
         if (result) {
           // this.onApproveOrRejectClick(req)
           req.comment = this.comment
+          field.comment = this.comment
           this.actionList.push(req)
         } else {
           dialogRef.close()
@@ -807,31 +647,39 @@ export class UserCardComponent implements OnInit {
 
   // single aprrove or reject
   onApproveOrRejectClick(req: any) {
-    req.comment = this.comment
     this.approvalSvc.handleWorkflow(req).subscribe((res: any) => {
       if (res.result.data) {
-        if (res.result.data.status === 'REJECTED') {
-          this.openSnackbar('Request Rejected Successfully')
-        } else {
-          this.openSnackbar('Request Approved')
-        }
-        this.comment = ''
-        this.router.navigate(['/app/home/approvals/profileverification'])
-        // this.needApprovalList = this.needApprovalList.filter(wf => wf.wfId !== res.result.data.wfIds[0])
+        // this.openSnackbar('Request approved successfully')
       }
     })
   }
 
   onApprovalSubmit(panel: any) {
     if (this.actionList.length > 0) {
-      this.actionList.forEach((req: any) => {
+      const datalength = this.actionList.length
+      this.actionList.forEach((req: any, index: any) => {
+        if (req.action === 'APPROVE') {
+          req.comment = ''
+        }
         this.onApproveOrRejectClick(req)
-        panel.close()
+
+        if (index === datalength - 1) {
+          panel.close()
+          this.comment = ''
+          setTimeout(() => {
+            this.openSnackbar('Request approved successfully')
+          }, 100)
+        }
+        this.approvalData = this.approvalData.filter((wf: any) => { wf.userWorkflow.userInfo.wid !== req.userId })
+        if (this.approvalData.length === 0) {
+          this.disableButton.emit()
+        }
       })
     }
   }
 
   updateRejection(field: any) {
+    this.comment = field.comment
     const dialogRef = this.dialog.open(this.updaterejectDialog, {
       width: '770px',
     })
@@ -840,6 +688,7 @@ export class UserCardComponent implements OnInit {
         this.actionList.forEach((req: any) => {
           if (req.wfId === field.wfId) {
             req.comment = this.comment
+            field.comment = this.comment
           }
         })
       } else {
@@ -851,82 +700,4 @@ export class UserCardComponent implements OnInit {
   showedit() {
     this.showeditText = true
   }
-
-  onClickAllHandleWorkflow(approvalList: any[], action: string) {
-    let user1Id = ''
-    let application1Id = ''
-
-    if (approvalList && approvalList.length > 0) {
-      approvalList.forEach(approvalItem => {
-        user1Id = approvalItem.wf.userId
-        application1Id = approvalItem.wf.applicationId
-      })
-    }
-    if (action === 'APPROVE') {
-      // const dialogRef = this.dialog.open(this.approveDialog, {
-      //   width: '770px',
-      // })
-      // dialogRef.afterClosed().subscribe(result => {
-      // if (result) {
-      const req: any = {
-        action,
-        state: 'SEND_FOR_APPROVAL',
-        userId: user1Id,
-        actorUserId: this.userwfData.userInfo.wid,
-        serviceName: 'profile',
-      }
-      if (approvalList.length > 0) {
-        approvalList.forEach((approvalAttribute: any) => {
-          this.listupdateFieldValues = JSON.parse(approvalAttribute.wf.updateFieldValues)
-          req['applicationId'] = approvalAttribute.wf.applicationId
-          req['wfId'] = approvalAttribute.wf.wfId
-          req['updateFieldValues'] = this.listupdateFieldValues
-          this.onApproveOrRejectClick(req)
-        })
-      }
-      // } else {
-      //   dialogRef.close()
-      // }
-      // })
-    } else {
-      const dialogRef = this.dialog.open(this.rejectDialog, {
-        width: '770px',
-      })
-      dialogRef.afterClosed().subscribe(result => {
-        if (result) {
-          const req: any = {
-            action,
-            state: 'SEND_FOR_APPROVAL',
-            userId: user1Id,
-            actorUserId: this.userwfData.userInfo.wid,
-            serviceName: 'profile',
-          }
-
-          if (approvalList.length > 0) {
-            approvalList.forEach((approvalAttribute: any) => {
-              this.listupdateFieldValues = JSON.parse(approvalAttribute.wf.updateFieldValues)
-              req['applicationId'] = approvalAttribute.wf.applicationId
-              req['wfId'] = approvalAttribute.wf.wfId
-              req['updateFieldValues'] = this.listupdateFieldValues
-              this.onApproveOrRejectClick(req)
-            })
-          }
-        } else {
-          dialogRef.close()
-        }
-      })
-    }
-
-    this.events.raiseInteractTelemetry(
-      {
-        type: TelemetryEvents.EnumInteractTypes.CLICK,
-        subType: TelemetryEvents.EnumInteractSubTypes.BTN_CONTENT,
-      },
-      {
-        id: application1Id,
-        type: TelemetryEvents.EnumIdtype.APPLICATION,
-
-      }
-    )
-  }
 }
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
index e64b25c3d..b1204bbc0 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
@@ -42,29 +42,33 @@
         </div>
       </div>
       <ng-container *ngIf="currentFilter === 'profileverification'">
-        <ng-container *ngIf="getTableData && getTableData.length > 0">
+        <div class="searchfilter">
+          <ws-app-searchuser (handleApiData)="onSearch($event)" [isApprovals]="true" (handleapproveAll)="onApproveALL()"
+            [showApproveALL]="showApproveALL" [disableApproveALL]="disableApproveALL"></ws-app-searchuser>
+        </div>
+        <ng-container *ngIf="data && data.length > 0">
           <!-- <ws-widget-org-user-table-v2 [tableData]="tabledata" [data]="data" (eOnRowClick)="onApprovalClick($event)"
             [totalRecords]="approvalTotalCount" (pageChangeClick)="onPaginateChange($event)">
           </ws-widget-org-user-table-v2> -->
           <ws-widget-user-card [currentFilter]="currentFilter" [usersData]="data" [isApprovals]="true"
             [totalRecords]="approvalTotalCount" [tabChangeIndex]="pageIndex"
-            (searchByEnterKey)="onEnterkySearch($event)"
+            (searchByEnterKey)="onEnterkySearch($event)" (disableButton)="showButton()"
             (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
         </ng-container>
-        <ng-container *ngIf="!getTableData || getTableData.length === 0">
-          <p class="text-center">No approvals pending</p>
+        <ng-container *ngIf="!data || data.length === 0">
+          <p class="margin-top-xl margin-bottom-xl">No approvals</p>
         </ng-container>
       </ng-container>
       <ng-container *ngIf="currentFilter === 'transfers'">
         <!-- <ws-app-profle-approval-bulk-upload></ws-app-profle-approval-bulk-upload> -->
-        <ng-container *ngIf="getTableData && getTableData.length > 0">
+        <ng-container *ngIf="data && data.length > 0">
           <ws-widget-user-card [currentFilter]="currentFilter" [usersData]="data" [isApprovals]="true"
             [totalRecords]="approvalTotalCount" [tabChangeIndex]="pageIndex"
-            (searchByEnterKey)="onEnterkySearch($event)"
+            (searchByEnterKey)="onEnterkySearch($event)" (disableButton)="showButton()"
             (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
         </ng-container>
-        <ng-container *ngIf="!getTableData || getTableData.length === 0">
-          <p class="text-center">No approvals pending</p>
+        <ng-container *ngIf="!data || data.length === 0">
+          <p class="margin-top-xl margin-bottom-xl">No approvals</p>
         </ng-container>
       </ng-container>
     </mat-card-content>
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
index 966c107e1..599ce86b4 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
@@ -19,6 +19,7 @@ import { ApprovalsService } from '../../../services/approvals.service'
 
 export class ApprovalPendingComponent implements OnInit, OnDestroy {
   data: any = []
+  approvalData: any = []
   currentFilter = 'profileverification'
   discussionList!: any
   discussProfileData!: any
@@ -29,6 +30,8 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   currentOffset = 0
   configSvc: any
   reportsNoteList: string[] = []
+  showApproveALL = false
+  disableApproveALL = false
 
   constructor(
     private router: Router,
@@ -193,32 +196,37 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
           })
         })
         this.approvalTotalCount = this.data.length
+        this.approvalData = this.data
+        if (this.data && this.data.length > 0) {
+          this.showApproveALL = true
+          this.disableApproveALL = false
+        }
       })
     } else {
       this.snackbar.open('Please connect to your SPV admin, to update MDO name.')
     }
   }
 
-  get getTableData() {
-    if (this.data.length > 0) {
-      this.data.forEach((element: any) => {
-        // element.requestedon = this.datePipe.transform(element.requestedon, 'dd MMM y')
-        element.requestedon = element.requestedon
-      })
-    }
-    return this.data
-  }
+  // get getTableData() {
+  //   if (this.data.length > 0) {
+  //     this.data.forEach((element: any) => {
+  //       // element.requestedon = this.datePipe.transform(element.requestedon, 'dd MMM y')
+  //       element.requestedon = element.requestedon
+  //     })
+  //   }
+  //   return this.data
+  // }
 
   replaceWords(inputString: any, wordConditions: any) {
     return wordConditions.reduce((acc: any, [word, condition]: any) => {
       return acc.replace(new RegExp(word, 'gi'), condition)
-    },                           inputString)
+    }, inputString)
   }
 
-  onEnterkySearch(enterValue: any) {
+  onSearch(enterValue: any) {
     // this.data.filter((user: any) => enterValue.includes(user.userInfo.first_name))
     const filterValue = enterValue.toLowerCase()
-    this.data = this.data.filter((user: any) => user.userInfo.first_name.toLowerCase().includes(filterValue))
+    this.data = this.approvalData.filter((user: any) => user.fullname.toLowerCase().includes(filterValue))
   }
 
   onPaginateChange(event: PageEvent) {
@@ -230,4 +238,63 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
 
   ngOnDestroy(): void { }
 
+  onApproveAllReqs(req: any) {
+    this.apprService.handleWorkflow(req).subscribe((res: any) => {
+      if (res.result.data) {
+      }
+    })
+  }
+  onApproveALL() {
+    this.disableApproveALL = true
+    if (this.data && this.data.length > 0) {
+      const datalength = this.data.length
+      this.data.forEach((data: any, index: any) => {
+        if (data.userWorkflow.wfInfo && data.userWorkflow.wfInfo.length > 0) {
+          const action = 'APPROVE'
+          data.userWorkflow.wfInfo.forEach((wf: any) => {
+            const req: any = {
+              action,
+              state: 'SEND_FOR_APPROVAL',
+              userId: wf.userId,
+              actorUserId: data.userWorkflow.userInfo.wid,
+              serviceName: 'profile',
+            }
+            const listupdateFieldValues = JSON.parse(wf.updateFieldValues)
+            req['applicationId'] = wf.applicationId
+            req['wfId'] = wf.wfId
+            req['updateFieldValues'] = listupdateFieldValues
+            this.onApproveAllReqs(req)
+
+            this.events.raiseInteractTelemetry(
+              {
+                type: TelemetryEvents.EnumInteractTypes.CLICK,
+                subType: TelemetryEvents.EnumInteractSubTypes.BTN_CONTENT,
+              },
+              {
+                id: wf.applicationId,
+                type: TelemetryEvents.EnumIdtype.APPLICATION,
+              }
+            )
+          })
+        }
+
+        if (index === datalength - 1) {
+          setTimeout(() => {
+            this.openSnackbar('All requests are Approved')
+            this.fetchApprovals()
+          }, 200)
+        }
+      })
+    }
+  }
+
+  private openSnackbar(primaryMsg: string, duration: number = 5000) {
+    this.snackbar.open(primaryMsg, 'X', {
+      duration,
+    })
+  }
+
+  showButton() {
+    this.disableApproveALL = true
+  }
 }

From a0e84530a8e6fd8a6af63aabdcfd11920beaddef Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Wed, 8 May 2024 17:18:29 +0530
Subject: [PATCH 589/887] Updated employee ID mapping

---
 .../home/components/user-cards/user-card.component.html       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index d65d8be79..a949eb2bc 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -633,7 +633,9 @@
             <div class="flex flex-row margin-top-m">
               <div class="md:w-1/4">
                 <label class="view-text-label">Employee ID</label>
-                <p>{{appData.user.empID ? appData.user.empID : '-'}}</p>
+                <p>{{appData.user.profileDetails && appData.user.profileDetails.employmentDetails &&
+                  appData.user.profileDetails.employmentDetails.employeeCode ?
+                  appData.user.profileDetails.employmentDetails.employeeCode : '-'}}</p>
               </div>
 
               <div class="md:w-1/4">

From fb2ab0d2c4ce4a0c05d5d7f134d4010329139703 Mon Sep 17 00:00:00 2001
From: Vinod Kumar Shyave <121538586+vShyave@users.noreply.github.com>
Date: Thu, 9 May 2024 09:58:47 +0530
Subject: [PATCH 590/887] after fixing lint errors

---
 .../routes/home/components/user-cards/user-card.component.ts  | 3 ++-
 .../approvals/approval-pending/approval-pending.component.ts  | 4 ++--
 .../single-user-creation/single-user-creation.component.ts    | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 6e84fb4a4..dc24b3a4a 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -388,7 +388,7 @@ export class UserCardComponent implements OnInit {
         if (user.profileDetails.personalDetails.dob) {
           // this.updateUserDataForm.controls['dob'].setValue(user.profileDetails.personalDetails.dob)
           this.updateUserDataForm.patchValue({
-            dob: this.getDateFromText(user.profileDetails.personalDetails.dob)
+            dob: this.getDateFromText(user.profileDetails.personalDetails.dob),
           })
         }
         if (user.profileDetails.personalDetails.domicileMedium) {
@@ -670,6 +670,7 @@ export class UserCardComponent implements OnInit {
             this.openSnackbar('Request approved successfully')
           }, 100)
         }
+        // tslint:disable-next-line
         this.approvalData = this.approvalData.filter((wf: any) => { wf.userWorkflow.userInfo.wid !== req.userId })
         if (this.approvalData.length === 0) {
           this.disableButton.emit()
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
index 599ce86b4..3ec64b6e0 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
@@ -220,7 +220,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   replaceWords(inputString: any, wordConditions: any) {
     return wordConditions.reduce((acc: any, [word, condition]: any) => {
       return acc.replace(new RegExp(word, 'gi'), condition)
-    }, inputString)
+    },                           inputString)
   }
 
   onSearch(enterValue: any) {
@@ -282,7 +282,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
           setTimeout(() => {
             this.openSnackbar('All requests are Approved')
             this.fetchApprovals()
-          }, 200)
+          },         200)
         }
       })
     }
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
index 56a49d6b9..4b0d1d4ae 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
@@ -222,7 +222,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
   }
 
   ngOnDestroy(): void {
-
+    this.destroySubject$.unsubscribe()
   }
 
 }

From 5339dd690e835246d06844f2a0c87bf80d28bcba Mon Sep 17 00:00:00 2001
From: Vinod Kumar Shyave <121538586+vShyave@users.noreply.github.com>
Date: Thu, 9 May 2024 10:00:04 +0530
Subject: [PATCH 591/887] after fixing lint errors

---
 .../home/components/user-cards/user-card.component.ts  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index dc24b3a4a..e7ce9da36 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -105,9 +105,9 @@ export class UserCardComponent implements OnInit {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-    private dialog: MatDialog, private approvalSvc: ApprovalsService,
-    private route: ActivatedRoute, private snackBar: MatSnackBar,
-    private events: EventService) {
+              private dialog: MatDialog, private approvalSvc: ApprovalsService,
+              private route: ActivatedRoute, private snackBar: MatSnackBar,
+              private events: EventService) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', [Validators.required]),
       group: new FormControl('', [Validators.required]),
@@ -249,7 +249,7 @@ export class UserCardComponent implements OnInit {
         countryCode: '+91',
       })
     },
-      (_err: any) => {
+                                                  (_err: any) => {
       })
   }
 
@@ -668,7 +668,7 @@ export class UserCardComponent implements OnInit {
           this.comment = ''
           setTimeout(() => {
             this.openSnackbar('Request approved successfully')
-          }, 100)
+          },         100)
         }
         // tslint:disable-next-line
         this.approvalData = this.approvalData.filter((wf: any) => { wf.userWorkflow.userInfo.wid !== req.userId })

From ff481f9342da2eef43fd7f715924984da5dbfbd7 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Thu, 9 May 2024 17:20:55 +0530
Subject: [PATCH 592/887] Updated bulk upload instruction texts

---
 .../bulk-upload/bulk-upload.component.html      | 17 ++++++++++-------
 .../bulk-upload/bulk-upload.component.scss      |  2 +-
 .../bulk-upload/bulk-upload.component.html      | 17 ++++++++++-------
 .../bulk-upload/bulk-upload.component.scss      |  2 +-
 .../single-user-creation.component.ts           | 12 ++++++------
 5 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
index eebf5f24f..2e9547c29 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
@@ -8,13 +8,15 @@
     <div class="flex font-bold">Bulk profile update</div>
     <div class="flex flex-row gap-8">
       <div class="flex-1">
-        <div class="flex flex-col gap-6 dashed-card">
-          <div>Open &amp; follow these instruction</div>
+        <div class="flex flex-col gap-3 dashed-card">
+          <div>Follow these steps to update multiple user profiles:</div>
           <div class="flex flex-col gap-4">
             <ol class="custom-ol">
-              <li>Keep the row of the items you wish to process</li>
-              <li>Keep the row of the items you wish to process</li>
-              <li>Delete the entire row you do not intend to process</li>
+              <li>Download the Sample File ZIP.</li>
+              <li>Fill in user details in the Sample File.</li>
+              <li>Verify via OTP.</li>
+              <li>Upload the populated sample csv file.</li>
+              <li>Check the upload results for confirmation.</li>
             </ol>
           </div>
           <div class="flex flex-row gap-6">
@@ -24,7 +26,8 @@
       </div>
       <div class="flex-1">
         <div class="flex flex-col gap-2 dashed-card items-center">
-          <div class="flex cursor-pointer" (click)="fileInput.click()" (dblclick)="$event.preventDefault()">
+          <div class="flex cursor-pointer margin-top-m" (click)="fileInput.click()"
+            (dblclick)="$event.preventDefault()">
             <img src="/assets/icons/csv-file.svg" alt="CSV file logo" />
           </div>
           <div *ngIf="showFileError" class="error-msg">Upload CSV format file only</div>
@@ -37,7 +40,7 @@
             <!-- <div class="flex">or</div>
             <div class="flex">Drag file to upload</div> -->
           </div>
-          <div class="flex flex-col items-center">
+          <div class="flex flex-col items-center margin-bottom-m">
             <div class="flex">Max file size: 100 MB</div>
             <div class="flex">Supported file types: CSV</div>
           </div>
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.scss b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.scss
index 71148d579..9c0ba6f35 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.scss
@@ -24,7 +24,7 @@
 
 .dashed-card {
   border: 1px dashed $border-color;
-  padding: 24px;
+  padding: 20px 24px;
   font-size: 14px;
 
   .custom-ol {
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
index 4c39386c3..2bc3ea598 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
@@ -3,13 +3,15 @@
     <div class="flex font-bold">Bulk user creation</div>
     <div class="flex flex-row gap-8">
       <div class="flex-1">
-        <div class="flex flex-col gap-6 dashed-card">
-          <div>Open &amp; follow these instruction</div>
+        <div class="flex flex-col gap-3 dashed-card">
+          <div>Follow these steps to create users in bulk:</div>
           <div class="flex flex-col gap-4">
             <ol class="custom-ol">
-              <li>Keep the row of the items you wish to process</li>
-              <li>Keep the row of the items you wish to process</li>
-              <li>Delete the entire row you do not intend to process</li>
+              <li>Download the Sample File ZIP.</li>
+              <li>Fill in user details in the Sample File.</li>
+              <li>Verify via OTP.</li>
+              <li>Upload the populated sample csv file.</li>
+              <li>Check the upload results for confirmation.</li>
             </ol>
           </div>
           <div class="flex flex-row gap-6">
@@ -19,7 +21,8 @@
       </div>
       <div class="flex-1">
         <div class="flex flex-col gap-2 dashed-card items-center">
-          <div class="flex cursor-pointer" (click)="fileInput.click()" (dblclick)="$event.preventDefault()">
+          <div class="flex cursor-pointer margin-top-m" (click)="fileInput.click()"
+            (dblclick)="$event.preventDefault()">
             <img src="/assets/icons/csv-file.svg" alt="CSV file logo" />
           </div>
           <div *ngIf="showFileError" class="error-msg">Upload CSV format file only</div>
@@ -32,7 +35,7 @@
             <!-- <div class="flex">or</div>
             <div class="flex">Drag file to upload</div> -->
           </div>
-          <div class="flex flex-col items-center">
+          <div class="flex flex-col items-center margin-bottom-m">
             <div class="flex">Max file size: 100 MB</div>
             <div class="flex">Supported file types: CSV</div>
           </div>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.scss b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.scss
index 71148d579..9c0ba6f35 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.scss
@@ -24,7 +24,7 @@
 
 .dashed-card {
   border: 1px dashed $border-color;
-  padding: 24px;
+  padding: 20px 24px;
   font-size: 14px;
 
   .custom-ol {
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
index 56a49d6b9..028b9c478 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
@@ -110,7 +110,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((_res: any) => {
         this.masterData['designation'] = _res.responseData
         this.masterData['designationBackup'] = _res.responseData
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch designation details, please try again later!')
         }
@@ -123,7 +123,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((res: any) => {
         this.masterData['language'] = res.languages
         this.masterData['languageBackup'] = res.languages
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch master language details, please try again later!')
         }
@@ -135,7 +135,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
         this.masterData['group'] = res.result.response
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch group data, please try again later!')
         }
@@ -153,7 +153,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
             this.masterData['mdoRoles'] = mdoArray.roles
           }
         }
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch roles list, please try again later!')
         }
@@ -214,7 +214,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((_res: any) => {
         this.matSnackBar.open('User created successfully!')
         this.handleFormClear()
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to create user, please try again later!')
         }
@@ -222,7 +222,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
   }
 
   ngOnDestroy(): void {
-
+    this.destroySubject$.unsubscribe()
   }
 
 }

From ebc81e11fc7bc0312d9e0bc3ccb791275c6718ff Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Thu, 9 May 2024 17:41:55 +0530
Subject: [PATCH 593/887] Added filter UI

---
 .../components/filter/filter.component.scss   | 12 +++++++--
 .../components/filter/filter.component.ts     | 25 ++++++++++---------
 .../components/search/search.component.html   |  4 +++
 .../components/search/search.component.ts     |  6 ++---
 .../routes/users/services/users.service.ts    |  3 +++
 5 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/filter/filter.component.scss b/project/ws/app/src/lib/routes/home/components/filter/filter.component.scss
index 29a876084..d73edeced 100644
--- a/project/ws/app/src/lib/routes/home/components/filter/filter.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/filter/filter.component.scss
@@ -26,7 +26,7 @@
     margin:26px 25px;
 }
 
-.filter-content {    
+.filter-content {
     padding: 18px 0px;
     margin: 0px 25px;
 }
@@ -97,7 +97,7 @@
 }
 
 .filter ::ng-deep .mat-expansion-panel-header {
-    height: 24px !important; 
+    height: 24px !important;
 }
 
 .spacer {
@@ -166,4 +166,12 @@
 ::-webkit-scrollbar-thumb {
   background-color: darkgrey;
   outline: 1px solid slategrey;
+}
+
+::ng-deep .mat-drawer.mat-drawer-side {
+    z-index: 1;
+}
+
+::ng-deep ws-app-nav-bar {
+    z-index: 999 !important;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
index 914a150cf..d6761d6c0 100644
--- a/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
@@ -3,8 +3,9 @@ import {
   Output, QueryList, ViewChildren, ChangeDetectionStrategy, AfterContentChecked,
 } from '@angular/core'
 import { FormControl } from '@angular/forms'
-import { TrainingPlanDataSharingService } from '../../../training-plan/services/training-plan-data-share.service'
+// import { TrainingPlanDataSharingService } from '../../../training-plan/services/training-plan-data-share.service'
 import { TrainingPlanService } from '../../../training-plan/services/traininig-plan.service'
+import { UsersService } from '../../../users/services/users.service'
 @Component({
   selector: 'ws-app-filter',
   templateUrl: './filter.component.html',
@@ -43,17 +44,17 @@ export class FilterComponent implements OnInit, AfterContentChecked {
   constructor(
     private cdref: ChangeDetectorRef,
     private trainingPlanService: TrainingPlanService,
-    private tpdsSvc: TrainingPlanDataSharingService) { }
+    private usersSvc: UsersService) { }
 
   ngOnInit() {
-    this.tpdsSvc.filterToggle.subscribe((data: any) => {
+    this.usersSvc.filterToggle.subscribe((data: any) => {
       if (data && data.status) {
         if (data.from === 'content') {
           this.getFilterEntity()
           // this.getProviders()
         } else {
-          // if(this.tpdsSvc.trainingPlanAssigneeData &&
-          //   this.tpdsSvc.trainingPlanAssigneeData.category === 'Custom Users') {
+          // if(this.usersSvc.trainingPlanAssigneeData &&
+          //   this.usersSvc.trainingPlanAssigneeData.category === 'Custom Users') {
           //   this.getDesignation();
           // }
           if (!this.designationList.length) {
@@ -71,7 +72,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
       }
     })
 
-    this.tpdsSvc.clearFilter.subscribe((result: any) => {
+    this.usersSvc.clearFilter.subscribe((result: any) => {
       if (result && result.status) {
         this.from = result.from
         this.clearFilter()
@@ -114,7 +115,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
 
   hideFilter() {
     // this.toggleFilter.emit(false)
-    this.tpdsSvc.filterToggle.next({ from: '', status: false })
+    this.usersSvc.filterToggle.next({ from: '', status: false })
   }
 
   checkedProviders(event: any, item: any) {
@@ -273,12 +274,12 @@ export class FilterComponent implements OnInit, AfterContentChecked {
   applyFilter() {
     if (this.from === 'content') {
       // this.getFilterData.emit(this.filterObj)
-      this.tpdsSvc.getFilterDataObject.next(this.filterObj)
+      this.usersSvc.getFilterDataObject.next(this.filterObj)
     } else {
-      this.tpdsSvc.getFilterDataObject.next(this.assigneeFilterObj)
+      this.usersSvc.getFilterDataObject.next(this.assigneeFilterObj)
       // this.getFilterData.emit(this.assigneeFilterObj)
     }
-    this.tpdsSvc.filterToggle.next({ from: '', status: false })
+    this.usersSvc.filterToggle.next({ from: '', status: false })
   }
 
   clearFilter() {
@@ -298,10 +299,10 @@ export class FilterComponent implements OnInit, AfterContentChecked {
 
     if (this.from === 'content') {
       // this.getFilterData.emit(this.filterObj)
-      // this.tpdsSvc.getFilterDataObject.next(this.filterObj)
+      // this.usersSvc.getFilterDataObject.next(this.filterObj)
     } else {
       // this.getFilterData.emit(this.assigneeFilterObj)
-      // this.tpdsSvc.getFilterDataObject.next(this.assigneeFilterObj)
+      // this.usersSvc.getFilterDataObject.next(this.assigneeFilterObj)
     }
 
     if (this.checkboxes) {
diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.html b/project/ws/app/src/lib/routes/home/components/search/search.component.html
index 3604d6fe3..d65651107 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.html
@@ -29,4 +29,8 @@
         <button mat-button type="button" class="search-btn" [routerLink]="['/app/home/approvals/bulkupdate']"
             [ngClass]="{'disable': isContentLive}">Bulk profile update</button>
     </div>
+</div>
+
+<div [hidden]="!filterVisibilityFlag">
+    <ws-app-filter [from]="from"></ws-app-filter>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.ts b/project/ws/app/src/lib/routes/home/components/search/search.component.ts
index 4d4a81cde..886651b84 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.ts
@@ -35,14 +35,14 @@ export class SearchComponent implements OnInit {
     //   if (pageData) {
     //     this.pageIndex = pageData.pageIndex
     //     this.pageSize = pageData.pageSize
-    //     this.getContent()
+    //     // this.getContent()
     //   }
     // })
   }
 
   openFilter() {
     this.filterVisibilityFlag = true
-    // this.tpdsSvc.filterToggle.next({ from: this.from, status: true })
+    this.usersSvc.filterToggle.next({ from: this.from, status: true })
     // if (this.document.getElementById('top-nav-bar')) {
     //   const ele: any = this.document.getElementById('top-nav-bar')
     //   ele.style.zIndex = '1'
@@ -52,7 +52,7 @@ export class SearchComponent implements OnInit {
 
   hideFilter(event: any) {
     this.filterVisibilityFlag = event
-    // this.tpdsSvc.filterToggle.next({ from: '', status: false })
+    this.usersSvc.filterToggle.next({ from: '', status: false })
     // if (this.document.getElementById('top-nav-bar')) {
     //   const ele: any = this.document.getElementById('top-nav-bar')
     //   ele.style.zIndex = '1000'
diff --git a/project/ws/app/src/lib/routes/users/services/users.service.ts b/project/ws/app/src/lib/routes/users/services/users.service.ts
index e2c6bef8f..937821a34 100644
--- a/project/ws/app/src/lib/routes/users/services/users.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/users.service.ts
@@ -38,6 +38,9 @@ const API_END_POINTS = {
 })
 export class UsersService {
   handleContentPageChange = new Subject()
+  filterToggle = new Subject()
+  clearFilter = new Subject()
+  getFilterDataObject = new Subject()
   constructor(private http: HttpClient) { }
   getAllUsers(filter: object): Observable<any> {
     return this.http.post<any>(`${API_END_POINTS.GET_ALL_USERS}`, filter).pipe(map(res => _.get(res, 'result.response')))

From 47817ec234a75367a6b723c0c5a63c7bdcb40ac7 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Thu, 9 May 2024 18:08:45 +0530
Subject: [PATCH 594/887] Lint fix

---
 .../components/user-cards/user-card.component.ts   | 14 ++++++++------
 .../approval-pending/approval-pending.component.ts |  4 ++--
 .../single-user-creation.component.ts              | 10 +++++-----
 .../home/routes/users-view/users-view.component.ts |  8 ++++++--
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 6e84fb4a4..55c94aff4 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -105,9 +105,9 @@ export class UserCardComponent implements OnInit {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-    private dialog: MatDialog, private approvalSvc: ApprovalsService,
-    private route: ActivatedRoute, private snackBar: MatSnackBar,
-    private events: EventService) {
+              private dialog: MatDialog, private approvalSvc: ApprovalsService,
+              private route: ActivatedRoute, private snackBar: MatSnackBar,
+              private events: EventService) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', [Validators.required]),
       group: new FormControl('', [Validators.required]),
@@ -249,7 +249,7 @@ export class UserCardComponent implements OnInit {
         countryCode: '+91',
       })
     },
-      (_err: any) => {
+                                                  (_err: any) => {
       })
   }
 
@@ -388,7 +388,7 @@ export class UserCardComponent implements OnInit {
         if (user.profileDetails.personalDetails.dob) {
           // this.updateUserDataForm.controls['dob'].setValue(user.profileDetails.personalDetails.dob)
           this.updateUserDataForm.patchValue({
-            dob: this.getDateFromText(user.profileDetails.personalDetails.dob)
+            dob: this.getDateFromText(user.profileDetails.personalDetails.dob),
           })
         }
         if (user.profileDetails.personalDetails.domicileMedium) {
@@ -668,8 +668,10 @@ export class UserCardComponent implements OnInit {
           this.comment = ''
           setTimeout(() => {
             this.openSnackbar('Request approved successfully')
-          }, 100)
+          },         100)
         }
+
+        // tslint:disable-next-line
         this.approvalData = this.approvalData.filter((wf: any) => { wf.userWorkflow.userInfo.wid !== req.userId })
         if (this.approvalData.length === 0) {
           this.disableButton.emit()
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
index 599ce86b4..3ec64b6e0 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
@@ -220,7 +220,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   replaceWords(inputString: any, wordConditions: any) {
     return wordConditions.reduce((acc: any, [word, condition]: any) => {
       return acc.replace(new RegExp(word, 'gi'), condition)
-    }, inputString)
+    },                           inputString)
   }
 
   onSearch(enterValue: any) {
@@ -282,7 +282,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
           setTimeout(() => {
             this.openSnackbar('All requests are Approved')
             this.fetchApprovals()
-          }, 200)
+          },         200)
         }
       })
     }
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
index 028b9c478..4b0d1d4ae 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
@@ -110,7 +110,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((_res: any) => {
         this.masterData['designation'] = _res.responseData
         this.masterData['designationBackup'] = _res.responseData
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch designation details, please try again later!')
         }
@@ -123,7 +123,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((res: any) => {
         this.masterData['language'] = res.languages
         this.masterData['languageBackup'] = res.languages
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch master language details, please try again later!')
         }
@@ -135,7 +135,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
         this.masterData['group'] = res.result.response
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch group data, please try again later!')
         }
@@ -153,7 +153,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
             this.masterData['mdoRoles'] = mdoArray.roles
           }
         }
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch roles list, please try again later!')
         }
@@ -214,7 +214,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((_res: any) => {
         this.matSnackBar.open('User created successfully!')
         this.handleFormClear()
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to create user, please try again later!')
         }
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 3bace50f3..1d9540ba8 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -200,12 +200,16 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     } else if (currentFilter === 'verified') {
       filtreq = {
         rootOrgId: this.rootOrgId,
-        'profileDetails.profileStatus': 'VERIFIED',
+        profileDetails: {
+          profileStatus: 'VERIFIED',
+        },
       }
     } else if (currentFilter === 'nonverified') {
       filtreq = {
         rootOrgId: this.rootOrgId,
-        'profileDetails.profileStatus': 'NOT-VERIFIED',
+        profileDetails: {
+          profileStatus: 'NOT-VERIFIED',
+        },
       }
     }
 

From bdf7040219718ac1d145db2992cb14a9b7d9c48d Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Fri, 10 May 2024 18:59:52 +0530
Subject: [PATCH 595/887] Added verified & nonverified API integrations & flow
 updates

---
 .../user-cards/user-card.component.html       |  25 ++-
 .../user-cards/user-card.component.ts         |  23 ++-
 .../users-view/users-view.component.html      |  48 ++---
 .../routes/users-view/users-view.component.ts | 181 +++++++++---------
 4 files changed, 139 insertions(+), 138 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index a949eb2bc..7db74af02 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -5,8 +5,7 @@
 
 <div *ngIf="!isApprovals">
   <mat-accordion [multi]="true">
-    <mat-expansion-panel class="user-card" *ngFor="let user of usersData?.content" #panel
-      (opened)="closeOtherPanels(panel)">
+    <mat-expansion-panel class="user-card" *ngFor="let user of usersData" #panel (opened)="closeOtherPanels(panel)">
       <mat-expansion-panel-header (click)="getUerData(user)">
         <div class="float-left width88" (click)="$event.stopPropagation();">
           <div class="initialcircle display-inline-block margin-right-m">
@@ -15,9 +14,13 @@
             </ws-widget-avatar-photo>
           </div>
           <div class="username display-inline-block">
-            <div class="mat-subheading-2 margin-remove"
-              *ngIf="user?.profileDetails && user?.profileDetails?.personalDetails">
-              {{user?.profileDetails?.personalDetails?.firstname}}
+            <div class="mat-subheading-2 margin-remove">
+              <span *ngIf="user?.profileDetails && user?.profileDetails?.personalDetails">
+                {{user?.profileDetails?.personalDetails?.firstname}}
+              </span>
+              <span *ngIf="!user?.profileDetails?.personalDetails">
+                {{user?.firstName}}
+              </span>
               <span class="status-label margin-left-s verified"
                 *ngIf="user?.profileDetails?.profileStatus === 'VERIFIED'">Verified
                 <mat-icon>check_circle</mat-icon></span>
@@ -25,10 +28,6 @@
                 *ngIf="user?.profileDetails?.profileStatus === 'NOT-VERIFIED'">Non-verified
                 <mat-icon>check_circle</mat-icon></span>
             </div>
-
-            <div class="mat-subheading-2 display-inline-block margin-remove" *ngIf="!user?.profileDetails">
-              {{user?.firstName}}
-            </div>
             <div class="mat-body-2 ws-mat-black40-text">{{user?.profileDetails &&
               user?.profileDetails?.professionalDetails
               &&
@@ -368,9 +367,9 @@
           <div class="flex flex-row margin-top-m">
             <div class="md:w-1/3">
               <label class="view-text-label">Group</label>
-              <p>{{user.profileDetails && user.profileDetails.additionalProperties &&
-                user.profileDetails.additionalProperties.group ?
-                user.profileDetails.additionalProperties.group : '-'}}
+              <p>{{user.profileDetails && user.profileDetails.professionalDetails &&
+                user.profileDetails.professionalDetails[0].group ?
+                user.profileDetails.professionalDetails[0].group : '-'}}
                 <mat-icon class="verified-icon margin-left-xs"
                   *ngIf="user?.profileDetails?.profileStatus === 'VERIFIED'">
                   check_circle</mat-icon>
@@ -499,7 +498,7 @@
     </mat-expansion-panel>
   </mat-accordion>
 
-  <div *ngIf="usersData && usersData?.content.length === 0">
+  <div *ngIf="usersData && usersData.length === 0">
     <p class="margin-top-xl margin-bottom-xl">No users found</p>
   </div>
 </div>
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 55c94aff4..32d521704 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -105,9 +105,9 @@ export class UserCardComponent implements OnInit {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-              private dialog: MatDialog, private approvalSvc: ApprovalsService,
-              private route: ActivatedRoute, private snackBar: MatSnackBar,
-              private events: EventService) {
+    private dialog: MatDialog, private approvalSvc: ApprovalsService,
+    private route: ActivatedRoute, private snackBar: MatSnackBar,
+    private events: EventService) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', [Validators.required]),
       group: new FormControl('', [Validators.required]),
@@ -249,7 +249,7 @@ export class UserCardComponent implements OnInit {
         countryCode: '+91',
       })
     },
-                                                  (_err: any) => {
+      (_err: any) => {
       })
   }
 
@@ -367,14 +367,11 @@ export class UserCardComponent implements OnInit {
         if (user.profileDetails.professionalDetails.designation) {
           this.updateUserDataForm.controls['designation'].setValue(user.profileDetails.professionalDetails.designation)
         }
-      }
+        if (user.profileDetails.professionalDetails[0].group) {
+          this.updateUserDataForm.controls['group'].setValue(user.profileDetails.professionalDetails[0].group)
 
-      if (user.profileDetails.additionalProperties) {
-        if (user.profileDetails.additionalProperties.group) {
-          this.updateUserDataForm.controls['group'].setValue(user.profileDetails.additionalProperties.group)
         }
       }
-
       if (user.profileDetails.personalDetails) {
         if (user.profileDetails.personalDetails.primaryEmail) {
           this.updateUserDataForm.controls['primaryEmail'].setValue(user.profileDetails.personalDetails.primaryEmail)
@@ -422,8 +419,10 @@ export class UserCardComponent implements OnInit {
 
   getUseravatarName(user: any) {
     let name = ''
-    if (user && user.profileDetails && user.profileDetails.personalDetails.firstname) {
-      name = `${user.profileDetails.personalDetails.firstname}`
+    if (user && user.profileDetails && user.profileDetails.personalDetails) {
+      if (user.profileDetails.personalDetails.firstname) {
+        name = `${user.profileDetails.personalDetails.firstname}`
+      }
     } else {
       name = `${user.firstName}`
     }
@@ -668,7 +667,7 @@ export class UserCardComponent implements OnInit {
           this.comment = ''
           setTimeout(() => {
             this.openSnackbar('Request approved successfully')
-          },         100)
+          }, 100)
         }
 
         // tslint:disable-next-line
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index 952558944..f58dfcc89 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -77,32 +77,32 @@
         [showEditOnCondition]=true [totalRecords]="userDataTotalCount" [tabChangeIndex]="pageIndex">
       </ws-widget-org-user-table-v2> -->
 
-      <ng-container *ngIf="usersData && currentFilter === 'allusers'">
-        <div *ngIf="usersData?.count > 0">
-          <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
-            [totalRecords]="activeUsersDataCount" [tabChangeIndex]="pageIndex" [isApprovals]="false"
-            (searchByEnterKey)="onEnterkySearch($event)"
-            (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
-        </div>
-        <p class="margin-top-l margin-bottom-l" *ngIf="usersData?.count === 0">No users found</p>
+      <ng-container *ngIf="currentFilter === 'allusers'">
+        <!-- <div *ngIf="activeUsersDataCount > 0"> -->
+        <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="activeUsersData"
+          [totalRecords]="activeUsersDataCount" [tabChangeIndex]="pageIndex" [isApprovals]="false"
+          (searchByEnterKey)="onEnterkySearch($event)"
+          (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
+        <!-- </div> -->
+        <!-- <p class="margin-top-l margin-bottom-l" *ngIf="activeUsersDataCount === 0">No users found</p> -->
       </ng-container>
-      <ng-container *ngIf="usersData && currentFilter === 'verified'">
-        <div *ngIf="usersData?.count > 0">
-          <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
-            [totalRecords]="verifiedUsersDataCount" [tabChangeIndex]="pageIndex"
-            (searchByEnterKey)="onEnterkySearch($event)"
-            (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
-        </div>
-        <p class="margin-top-l margin-bottom-l" *ngIf="usersData?.count === 0">No users found</p>
+      <ng-container *ngIf="currentFilter === 'verified'">
+        <!-- <div *ngIf="verifiedUsersDataCount > 0"> -->
+        <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="verifiedUsersData"
+          [totalRecords]="verifiedUsersDataCount" [tabChangeIndex]="pageIndex"
+          (searchByEnterKey)="onEnterkySearch($event)"
+          (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
+        <!-- </div> -->
+        <!-- <p class="margin-top-l margin-bottom-l" *ngIf="verifiedUsersDataCount === 0">No users found</p> -->
       </ng-container>
-      <ng-container *ngIf="usersData && currentFilter === 'nonverified'">
-        <div *ngIf="usersData?.count > 0">
-          <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
-            [totalRecords]="nonverifiedUsersDataCount" [tabChangeIndex]="pageIndex"
-            (searchByEnterKey)="onEnterkySearch($event)"
-            (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
-        </div>
-        <p class="margin-top-l margin-bottom-l" *ngIf="usersData?.count === 0">No users found</p>
+      <ng-container *ngIf="currentFilter === 'nonverified'">
+        <!-- <div *ngIf="nonverifiedUsersDataCount > 0"> -->
+        <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="nonverifiedUsersData"
+          [totalRecords]="nonverifiedUsersDataCount" [tabChangeIndex]="pageIndex"
+          (searchByEnterKey)="onEnterkySearch($event)"
+          (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
+        <!-- </div> -->
+        <!-- <p class="margin-top-l margin-bottom-l" *ngIf="nonverifiedUsersDataCount === 0">No users found</p> -->
       </ng-container>
       <!-- <ng-container *ngIf="usersData && currentFilter === 'notmyuser'">
         <div *ngIf="usersData?.count > 0">
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 1d9540ba8..a7e79ffbf 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -13,7 +13,7 @@ import { NSProfileDataV2 } from '../../models/profile-v2.model'
 import { UsersService } from '../../../users/services/users.service'
 import { LoaderService } from '../../../../../../../../../src/app/services/loader.service'
 import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
-import { ProfileV2UtillService } from '../../services/home-utill.service'
+// import { ProfileV2UtillService } from '../../services/home-utill.service'
 import { ReportsVideoComponent } from '../reports-video/reports-video.component'
 
 @Component({
@@ -69,7 +69,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     // private snackBar: MatSnackBar,
     private events: EventService,
     private loaderService: LoaderService,
-    private profileUtilSvc: ProfileV2UtillService,
+    // private profileUtilSvc: ProfileV2UtillService,
     private sanitizer: DomSanitizer,
     // private telemetrySvc: TelemetryService,
     // private configSvc: ConfigurationsService,
@@ -93,6 +93,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     // }
   }
   ngOnInit() {
+    this.currentFilter = this.route.snapshot.params['tab'] || 'allusers'
     this.rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
     this.searchQuery = ''
     if (this.configSvc.unMappedUser && this.configSvc.unMappedUser.roles) {
@@ -100,10 +101,9 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     }
     // this.filterData('')
 
-    this.getUsers('', 'allusers')
-    // this.getUsers('', 'verified')
-    // this.getUsers('', 'nonverified')
-    // this.getUsers('', 'notmyuser')
+    this.getAllUsers('')
+    this.getVUsers('')
+    this.getNVUsers('')
 
     this.reportsNoteList = [
       `Easily create users individually or in bulk.`,
@@ -133,7 +133,6 @@ export class UsersViewComponent implements OnInit, OnDestroy {
 
   filter(filter: string) {
     this.currentFilter = filter
-    // console.log('filter---------', filter)
     this.pageIndex = 0
     this.currentOffset = 0
     this.limit = 20
@@ -153,7 +152,14 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   }
 
   filterData(query: string) {
-    this.getUsers(query, this.currentFilter)
+    // this.getUsers(query, this.currentFilter)
+    if (this.currentFilter === 'allusers') {
+      this.getAllUsers(query)
+    } else if (this.currentFilter === 'verified') {
+      this.getVUsers(query)
+    } else if (this.currentFilter === 'nonverified') {
+      this.getNVUsers(query)
+    }
   }
 
   showEditUser(roles: any): boolean {
@@ -167,94 +173,91 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     return true
   }
 
-  blockedUsers() {
-    const blockedUsersData: any[] = []
-    if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
-      _.filter(this.usersData.content, { isDeleted: false }).forEach((user: any) => {
-        blockedUsersData.push({
-          fullname: user ? `${user.firstName}` : null,
-          // fullname: user ? `${user.firstName} ${user.lastName}` : null,
-          email: user.personalDetails && user.personalDetails.primaryEmail ?
-            this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
-          role: user.roles,
-          userId: user.id,
-          active: !user.isDeleted,
-          blocked: user.blocked,
-          roles: _.join(_.map(user.roleInfo, i => `<li>${i}</li>`), ''),
-        })
-      })
+  // blockedUsers() {
+  //   const blockedUsersData: any[] = []
+  //   if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
+  //     _.filter(this.usersData.content, { isDeleted: false }).forEach((user: any) => {
+  //       blockedUsersData.push({
+  //         fullname: user ? `${user.firstName}` : null,
+  //         // fullname: user ? `${user.firstName} ${user.lastName}` : null,
+  //         email: user.personalDetails && user.personalDetails.primaryEmail ?
+  //           this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
+  //         role: user.roles,
+  //         userId: user.id,
+  //         active: !user.isDeleted,
+  //         blocked: user.blocked,
+  //         roles: _.join(_.map(user.roleInfo, i => `<li>${i}</li>`), ''),
+  //       })
+  //     })
+  //   }
+  //   return blockedUsersData
+  // }
+
+  async getAllUsers(query: string) {
+    this.loaderService.changeLoad.next(true)
+    // const usersData: any[] = []
+    let filtreq = {
+      rootOrgId: this.rootOrgId,
+      status: 1,
     }
-    return blockedUsersData
-  }
 
-  getUsers(query: string, currentFilter: any) {
-    // console.log('currentFilter', currentFilter)
+    this.usersService.getAllKongUsers(filtreq, this.limit, this.pageIndex, query).subscribe((data: any) => {
+      const allusersData = data.result.response
+      // if (allusersData && allusersData.content && allusersData.content.length > 0) {
+      //   _.filter(allusersData.content, { isDeleted: false }).forEach((user: any) => {
+      //     // tslint:disable-next-line
+      //     const org = { roles: _.get(_.first(_.filter(user.organisations, { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') }
+      //     usersData.push({
+      //       fullname: user ? `${user.firstName}` : null,
+      //       // fullname: user ? `${user.firstName} ${user.lastName}` : null,
+      //       email: user.personalDetails && user.personalDetails.primaryEmail ?
+      //         this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
+      //       role: org.roles || [],
+      //       userId: user.id,
+      //       active: !user.isDeleted,
+      //       blocked: user.blocked,
+      //       roles: _.join(_.map((org.roles || []), i => `<li>${i}</li>`), ''),
+      //       orgId: user.rootOrgId,
+      //       orgName: user.rootOrgName,
+      //       allowEditUser: this.showEditUser(org.roles),
+      //     })
+      //   })
+
+      //   usersData.sort((a: any, b: any) => {
+      //     const textA = a.fullname.toUpperCase()
+      //     const textB = b.fullname.toUpperCase()
+      //     return (textA < textB) ? -1 : (textA > textB) ? 1 : 0
+      //   })
+      // }
+      this.activeUsersData = allusersData.content
+      this.activeUsersDataCount = data.result.response.count
+    })
+  }
+  async getVUsers(query: string) {
     this.loaderService.changeLoad.next(true)
-    const usersData: any[] = []
-    let filtreq = {}
-    if (currentFilter === 'allusers') {
-      filtreq = {
-        rootOrgId: this.rootOrgId,
-        status: 1,
-      }
-    } else if (currentFilter === 'verified') {
-      filtreq = {
-        rootOrgId: this.rootOrgId,
-        profileDetails: {
-          profileStatus: 'VERIFIED',
-        },
-      }
-    } else if (currentFilter === 'nonverified') {
-      filtreq = {
-        rootOrgId: this.rootOrgId,
-        profileDetails: {
-          profileStatus: 'NOT-VERIFIED',
-        },
-      }
+    const filtreq = {
+      rootOrgId: this.rootOrgId,
+      'profileDetails.profileStatus': 'VERIFIED',
     }
 
     this.usersService.getAllKongUsers(filtreq, this.limit, this.pageIndex, query).subscribe((data: any) => {
-      this.usersData = data.result.response
-      if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
-        _.filter(this.usersData.content, { isDeleted: false }).forEach((user: any) => {
-          // tslint:disable-next-line
-          const org = { roles: _.get(_.first(_.filter(user.organisations, { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') }
-          usersData.push({
-            fullname: user ? `${user.firstName}` : null,
-            // fullname: user ? `${user.firstName} ${user.lastName}` : null,
-            email: user.personalDetails && user.personalDetails.primaryEmail ?
-              this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
-            role: org.roles || [],
-            userId: user.id,
-            active: !user.isDeleted,
-            blocked: user.blocked,
-            roles: _.join(_.map((org.roles || []), i => `<li>${i}</li>`), ''),
-            orgId: user.rootOrgId,
-            orgName: user.rootOrgName,
-            allowEditUser: this.showEditUser(org.roles),
-          })
-        })
+      const allusersData = data.result.response
+      this.verifiedUsersData = allusersData.content
+      this.verifiedUsersDataCount = data.result.response.count
+    })
+  }
 
-        usersData.sort((a: any, b: any) => {
-          const textA = a.fullname.toUpperCase()
-          const textB = b.fullname.toUpperCase()
-          return (textA < textB) ? -1 : (textA > textB) ? 1 : 0
-        })
-      }
-      if (this.currentFilter === 'allusers') {
-        this.activeUsersData = usersData
-        this.activeUsersDataCount = this.usersData.count
-      } else if (this.currentFilter === 'verified') {
-        this.verifiedUsersData = usersData
-        this.verifiedUsersDataCount = this.usersData.count
-      } else if (this.currentFilter === 'nonverified') {
-        this.notmyuserUsersData = usersData
-        this.nonverifiedUsersDataCount = this.usersData.count
-      } else if (this.currentFilter === 'notmyuser') {
-        this.notmyuserUsersData = usersData
-        this.notmyuserUsersDataCount = this.usersData.count
-      }
-      return usersData
+  async getNVUsers(query: string) {
+    this.loaderService.changeLoad.next(true)
+    const filtreq = {
+      rootOrgId: this.rootOrgId,
+      'profileDetails.profileStatus': 'NOT-VERIFIED',
+    }
+
+    this.usersService.getAllKongUsers(filtreq, this.limit, this.pageIndex, query).subscribe((data: any) => {
+      const allusersData = data.result.response
+      this.nonverifiedUsersData = allusersData.content
+      this.nonverifiedUsersDataCount = data.result.response.count
     })
   }
 

From 0eee0715547f9b571f4d26a6c5788018de797917 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Sat, 11 May 2024 10:54:31 +0530
Subject: [PATCH 596/887] lint updates

---
 .../home/components/user-cards/user-card.component.ts      | 7 ++++---
 .../routes/home/routes/users-view/users-view.component.ts  | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 32d521704..c81da8b47 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -294,7 +294,7 @@ export class UserCardComponent implements OnInit {
   }
 
   onEditUser(user: any) {
-    user.enableEdit = true
+    user.enableEdit = !user.enableEdit
     this.setUserDetails(user)
   }
 
@@ -495,7 +495,7 @@ export class UserCardComponent implements OnInit {
     this.searchByEnterKey.emit(event)
   }
 
-  onSubmit(form: any, user: any) {
+  onSubmit(form: any, user: any, panel: any) {
     if (form.valid) {
       // const tags = user.profileDetails && user.profileDetails.additionalProperties && user.profileDetails.additionalProperties.tags ?
       //   user.profileDetails.additionalProperties.tags : []
@@ -558,7 +558,7 @@ export class UserCardComponent implements OnInit {
                 if (res) {
                   this.updateUserDataForm.reset({ roles: '' })
                   this.openSnackbar('User role updated Successfully')
-                  // panel.close()
+                  panel.close()
                   // this.router.navigate(['/app/home/users/allusers'])
 
                   this.usersSvc.getUserById(user.userId).subscribe((_res: any) => {
@@ -580,6 +580,7 @@ export class UserCardComponent implements OnInit {
                 // tslint:disable-next-line
                 user = res
                 user.enableEdit = false
+                panel.close()
               }
             })
           }
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index a7e79ffbf..be184d24b 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -196,7 +196,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   async getAllUsers(query: string) {
     this.loaderService.changeLoad.next(true)
     // const usersData: any[] = []
-    let filtreq = {
+    const filtreq = {
       rootOrgId: this.rootOrgId,
       status: 1,
     }
@@ -206,7 +206,8 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       // if (allusersData && allusersData.content && allusersData.content.length > 0) {
       //   _.filter(allusersData.content, { isDeleted: false }).forEach((user: any) => {
       //     // tslint:disable-next-line
-      //     const org = { roles: _.get(_.first(_.filter(user.organisations, { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') }
+      //     const org = { roles: _.get(_.first(_.filter(user.organisations,
+      // { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') }
       //     usersData.push({
       //       fullname: user ? `${user.firstName}` : null,
       //       // fullname: user ? `${user.firstName} ${user.lastName}` : null,

From 3f3065bcf97e9d7995c9957684688d210a2f2418 Mon Sep 17 00:00:00 2001
From: Vinod Kumar Shyave <121538586+vShyave@users.noreply.github.com>
Date: Mon, 13 May 2024 16:33:22 +0530
Subject: [PATCH 597/887] after fixing lint errors

---
 .../routes/users-view/bulk-upload/bulk-upload.component.ts  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts
index e4a18d5e4..86db6be6f 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts
@@ -67,7 +67,7 @@ export class BulkUploadComponent implements OnInit, AfterViewInit, OnDestroy {
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
         this.lastUploadList = res.result.content
-      },         (error: HttpErrorResponse) => {
+      }, (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open('Unable to get Bulk status list')
         }
@@ -109,7 +109,7 @@ export class BulkUploadComponent implements OnInit, AfterViewInit, OnDestroy {
         if (!resendFlag) {
           this.verifyOTP(contactType)
         }
-      },         (error: HttpErrorResponse) => {
+      }, (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open(_.get(error, 'error.params.errmsg') || `Unable to send OTP to your ${contactType}, please try again later!`)
         }
@@ -157,7 +157,7 @@ export class BulkUploadComponent implements OnInit, AfterViewInit, OnDestroy {
             this.fileName = ''
             this.fileSelected = ''
             this.getBulkStatusList()
-          },         (_err: HttpErrorResponse) => {
+          }, (_err: HttpErrorResponse) => {
             if (!_err.ok) {
               this.matSnackBar.open('Uploading CSV file failed due to some error, please try again later!')
             }

From cb7a13d85df035722cb8f5b5338651724658b652 Mon Sep 17 00:00:00 2001
From: Vinod Kumar Shyave <121538586+vShyave@users.noreply.github.com>
Date: Mon, 13 May 2024 16:34:37 +0530
Subject: [PATCH 598/887] after fixing lint errors

---
 .../routes/users-view/bulk-upload/bulk-upload.component.ts  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts
index 86db6be6f..e4a18d5e4 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts
@@ -67,7 +67,7 @@ export class BulkUploadComponent implements OnInit, AfterViewInit, OnDestroy {
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
         this.lastUploadList = res.result.content
-      }, (error: HttpErrorResponse) => {
+      },         (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open('Unable to get Bulk status list')
         }
@@ -109,7 +109,7 @@ export class BulkUploadComponent implements OnInit, AfterViewInit, OnDestroy {
         if (!resendFlag) {
           this.verifyOTP(contactType)
         }
-      }, (error: HttpErrorResponse) => {
+      },         (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open(_.get(error, 'error.params.errmsg') || `Unable to send OTP to your ${contactType}, please try again later!`)
         }
@@ -157,7 +157,7 @@ export class BulkUploadComponent implements OnInit, AfterViewInit, OnDestroy {
             this.fileName = ''
             this.fileSelected = ''
             this.getBulkStatusList()
-          }, (_err: HttpErrorResponse) => {
+          },         (_err: HttpErrorResponse) => {
             if (!_err.ok) {
               this.matSnackBar.open('Uploading CSV file failed due to some error, please try again later!')
             }

From ebc652d92e2c026fa71003640d4727c0ef3821a8 Mon Sep 17 00:00:00 2001
From: Vinod Kumar Shyave <121538586+vShyave@users.noreply.github.com>
Date: Tue, 14 May 2024 11:26:37 +0530
Subject: [PATCH 599/887] Single user creation is done

---
 .../single-user-creation.component.html       | 12 ++---
 .../single-user-creation.component.ts         | 47 ++++++++++++++-----
 2 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
index 5eb7e30a4..e52f90168 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
@@ -5,17 +5,17 @@
     <div class="flex flex-row gap-6">
       <div class="input-container">
         <div class="label required">Full name</div>
-        <input type="text" class="input-text" formControlName="fullName" placeholder="Type here" />
+        <input type="text" class="input-text" formControlName="firstName" placeholder="Type here" />
         <mat-error class="text-xs"
-          *ngIf="userCreationForm?.get('fullName')?.touched && userCreationForm?.get('fullName')?.invalid">
+          *ngIf="userCreationForm?.get('firstName')?.touched && userCreationForm?.get('firstName')?.invalid">
           Please enter your full name
         </mat-error>
       </div>
       <div class="input-container">
         <div class="label required">Email</div>
-        <input type="text" class="input-text" formControlName="primaryEmail" placeholder="Type here" />
+        <input type="text" class="input-text" formControlName="email" placeholder="Type here" />
         <mat-error class="text-xs"
-          *ngIf="userCreationForm?.get('primaryEmail')?.touched && userCreationForm?.get('primaryEmail')?.invalid">
+          *ngIf="userCreationForm?.get('email')?.touched && userCreationForm?.get('email')?.invalid">
           Please enter a valid email address
         </mat-error>
       </div>
@@ -24,9 +24,9 @@
     <div class="flex flex-row gap-6">
       <div class="input-container">
         <div class="label required">Mobile number</div>
-        <input type="text" class="input-text" formControlName="mobile" maxlength="10" placeholder="Type here" />
+        <input type="text" class="input-text" formControlName="phone" maxlength="10" placeholder="Type here" />
         <mat-error class="text-xs"
-          *ngIf="userCreationForm?.get('mobile')?.touched && userCreationForm?.get('mobile')?.invalid">
+          *ngIf="userCreationForm?.get('phone')?.touched && userCreationForm?.get('phone')?.invalid">
           Please enter a valid mobile number
         </mat-error>
       </div>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
index 4b0d1d4ae..d4ee999c6 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
@@ -7,9 +7,12 @@ import { HttpErrorResponse } from '@angular/common/http'
 import { COMMA, ENTER } from '@angular/cdk/keycodes'
 import { Subject } from 'rxjs'
 import { debounceTime, distinctUntilChanged, startWith, takeUntil } from 'rxjs/operators'
-
+/* tslint:disable */
+import _ from 'lodash'
+/* tslint:enable */
 import { UsersService } from '../../../../users/services/users.service'
 import { RolesService } from '../../../../users/services/roles.service'
+import { ActivatedRoute } from '@angular/router'
 
 export const MY_FORMATS = {
   parse: {
@@ -43,10 +46,12 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
   separatorKeysCodes: number[] = [ENTER, COMMA]
   masterData: any = {}
   rolesArr: string[] = []
+  fullProfile: any
   userCreationForm = this.formBuilder.group({
-    fullName: new FormControl('', [Validators.required]),
-    primaryEmail: new FormControl('', [Validators.required, Validators.pattern(EMAIL_PATTERN)]),
-    mobile: new FormControl('', [Validators.required, Validators.pattern(MOBILE_PATTERN), Validators.minLength(10)]),
+    email: new FormControl('', [Validators.required, Validators.pattern(EMAIL_PATTERN)]),
+    firstName: new FormControl('', [Validators.required]),
+    phone: new FormControl('', [Validators.required, Validators.pattern(MOBILE_PATTERN), Validators.minLength(10)]),
+    channel: new FormControl(''),
     designation: new FormControl(''),
     group: new FormControl(''),
     dob: new FormControl(''),
@@ -62,8 +67,12 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
     private formBuilder: FormBuilder,
     private usersService: UsersService,
     private matSnackBar: MatSnackBar,
-    private rolesService: RolesService
+    private rolesService: RolesService,
+    private activatedRouter: ActivatedRoute
   ) {
+
+    this.fullProfile = _.get(this.activatedRouter.snapshot, 'data.configService')
+
     if (this.userCreationForm.get('designation')) {
       // tslint:disable-next-line
       this.userCreationForm.get('designation')!.valueChanges
@@ -102,6 +111,9 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
     this.getMasterLanguages()
     this.getGroups()
     this.getOrgRolesList()
+    this.userCreationForm.patchValue({
+      channel: (this.fullProfile && this.fullProfile.unMappedUser.channel) || '',
+    })
   }
 
   getDesignation(): void {
@@ -110,7 +122,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((_res: any) => {
         this.masterData['designation'] = _res.responseData
         this.masterData['designationBackup'] = _res.responseData
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch designation details, please try again later!')
         }
@@ -123,7 +135,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((res: any) => {
         this.masterData['language'] = res.languages
         this.masterData['languageBackup'] = res.languages
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch master language details, please try again later!')
         }
@@ -135,7 +147,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
         this.masterData['group'] = res.result.response
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch group data, please try again later!')
         }
@@ -153,7 +165,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
             this.masterData['mdoRoles'] = mdoArray.roles
           }
         }
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch roles list, please try again later!')
         }
@@ -209,14 +221,25 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       // tslint:disable-next-line
       dataToSubmit.dob = `${new Date(dataToSubmit.dob).getDate()}-${new Date(dataToSubmit.dob).getMonth() + 1}-${new Date(dataToSubmit.dob).getFullYear()}`
     }
-    this.usersService.createUser(dataToSubmit)
+
+    if (!this.userCreationForm.value.channel) {
+      this.matSnackBar.open('Channel info is empty! So unable to create user')
+      return
+    }
+
+    const postData = {
+      personalDetails: '',
+    }
+    postData.personalDetails = dataToSubmit
+
+    this.usersService.createUser(postData)
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((_res: any) => {
         this.matSnackBar.open('User created successfully!')
         this.handleFormClear()
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
-          this.matSnackBar.open('Unable to create user, please try again later!')
+          this.matSnackBar.open(_.get(_err, 'error.params.errmsg') || 'Unable to create user, please try again later!')
         }
       })
   }

From e7cf0d3f65f4d7597f8a45cb422f64a741684dcd Mon Sep 17 00:00:00 2001
From: Vinod Kumar Shyave <121538586+vShyave@users.noreply.github.com>
Date: Tue, 14 May 2024 11:27:48 +0530
Subject: [PATCH 600/887] Single user creation is done

---
 .../single-user-creation.component.ts                  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
index d4ee999c6..53348f646 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
@@ -122,7 +122,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((_res: any) => {
         this.masterData['designation'] = _res.responseData
         this.masterData['designationBackup'] = _res.responseData
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch designation details, please try again later!')
         }
@@ -135,7 +135,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((res: any) => {
         this.masterData['language'] = res.languages
         this.masterData['languageBackup'] = res.languages
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch master language details, please try again later!')
         }
@@ -147,7 +147,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
         this.masterData['group'] = res.result.response
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch group data, please try again later!')
         }
@@ -165,7 +165,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
             this.masterData['mdoRoles'] = mdoArray.roles
           }
         }
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch roles list, please try again later!')
         }
@@ -237,7 +237,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((_res: any) => {
         this.matSnackBar.open('User created successfully!')
         this.handleFormClear()
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open(_.get(_err, 'error.params.errmsg') || 'Unable to create user, please try again later!')
         }

From 410b113d1bcf98aff78620ce7dbbac40a3915521 Mon Sep 17 00:00:00 2001
From: Vinod Kumar Shyave <121538586+vShyave@users.noreply.github.com>
Date: Tue, 14 May 2024 12:19:19 +0530
Subject: [PATCH 601/887] after fixing lint errors

---
 .../home/components/user-cards/user-card.component.ts  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index e2dd33741..5d04f19b8 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -105,9 +105,9 @@ export class UserCardComponent implements OnInit {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-    private dialog: MatDialog, private approvalSvc: ApprovalsService,
-    private route: ActivatedRoute, private snackBar: MatSnackBar,
-    private events: EventService) {
+              private dialog: MatDialog, private approvalSvc: ApprovalsService,
+              private route: ActivatedRoute, private snackBar: MatSnackBar,
+              private events: EventService) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', [Validators.required]),
       group: new FormControl('', [Validators.required]),
@@ -249,7 +249,7 @@ export class UserCardComponent implements OnInit {
         countryCode: '+91',
       })
     },
-      (_err: any) => {
+                                                  (_err: any) => {
       })
   }
 
@@ -668,7 +668,7 @@ export class UserCardComponent implements OnInit {
           this.comment = ''
           setTimeout(() => {
             this.openSnackbar('Request approved successfully')
-          }, 100)
+          },         100)
         }
         // tslint:disable-next-line
         this.approvalData = this.approvalData.filter((wf: any) => { wf.userWorkflow.userInfo.wid !== req.userId })

From 7c480e430599ea53a4d09108acf4799e5ed84a8d Mon Sep 17 00:00:00 2001
From: Vinod Kumar Shyave <121538586+vShyave@users.noreply.github.com>
Date: Tue, 14 May 2024 16:32:04 +0530
Subject: [PATCH 602/887] Fixed lint errors

---
 .../lib/routes/home/components/filter/filter.component.ts   | 5 ++++-
 project/ws/app/src/lib/routes/home/home.module.ts           | 2 ++
 .../ws/app/src/lib/routes/users/services/users.service.ts   | 6 +++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
index d6761d6c0..ca01e9cf1 100644
--- a/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
@@ -44,9 +44,11 @@ export class FilterComponent implements OnInit, AfterContentChecked {
   constructor(
     private cdref: ChangeDetectorRef,
     private trainingPlanService: TrainingPlanService,
-    private usersSvc: UsersService) { }
+    private usersSvc: UsersService) {
+  }
 
   ngOnInit() {
+    if (!this.usersSvc.filterToggle) return
     this.usersSvc.filterToggle.subscribe((data: any) => {
       if (data && data.status) {
         if (data.from === 'content') {
@@ -72,6 +74,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
       }
     })
 
+    if (!this.usersSvc.clearFilter) return
     this.usersSvc.clearFilter.subscribe((result: any) => {
       if (result && result.status) {
         this.from = result.from
diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index cd7d7fea0..06f3ecd72 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -35,6 +35,7 @@ import { InitResolver } from './resolvers/init-resolve.service'
 import { MdoInfoService } from './services/mdoinfo.service'
 import { UploadService } from './services/upload.service'
 import { TrainingPlanDashboardService } from './services/training-plan-dashboard.service'
+import { UsersService } from '../users/services/users.service'
 
 import { HomeComponent } from './routes/home/home.component'
 import { UsersViewComponent } from './routes/users-view/users-view.component'
@@ -188,6 +189,7 @@ import { BulkUploadApprovalComponent } from './routes/approvals/bulk-upload/bulk
     MdoInfoService,
     UploadService,
     TrainingPlanDashboardService,
+    UsersService,
   ],
 })
 export class HomeModule {
diff --git a/project/ws/app/src/lib/routes/users/services/users.service.ts b/project/ws/app/src/lib/routes/users/services/users.service.ts
index 937821a34..d39f79a53 100644
--- a/project/ws/app/src/lib/routes/users/services/users.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/users.service.ts
@@ -33,15 +33,15 @@ const API_END_POINTS = {
   editProfileDetails: '/apis/proxies/v8/user/v1/extPatch',
 }
 
-@Injectable({
-  providedIn: 'root',
-})
+@Injectable()
 export class UsersService {
   handleContentPageChange = new Subject()
   filterToggle = new Subject()
   clearFilter = new Subject()
   getFilterDataObject = new Subject()
+
   constructor(private http: HttpClient) { }
+
   getAllUsers(filter: object): Observable<any> {
     return this.http.post<any>(`${API_END_POINTS.GET_ALL_USERS}`, filter).pipe(map(res => _.get(res, 'result.response')))
   }

From 499d17f7524270eb42dd3d7b5307168bbd8e070a Mon Sep 17 00:00:00 2001
From: Vinod Kumar Shyave <121538586+vShyave@users.noreply.github.com>
Date: Tue, 14 May 2024 16:33:17 +0530
Subject: [PATCH 603/887] fixed lint errors

---
 .../src/lib/routes/home/components/filter/filter.component.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
index ca01e9cf1..e8c294af0 100644
--- a/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
@@ -48,7 +48,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
   }
 
   ngOnInit() {
-    if (!this.usersSvc.filterToggle) return
+    if (!this.usersSvc.filterToggle) { return }
     this.usersSvc.filterToggle.subscribe((data: any) => {
       if (data && data.status) {
         if (data.from === 'content') {
@@ -74,7 +74,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
       }
     })
 
-    if (!this.usersSvc.clearFilter) return
+    if (!this.usersSvc.clearFilter) { return }
     this.usersSvc.clearFilter.subscribe((result: any) => {
       if (result && result.status) {
         this.from = result.from

From b1bc4f26b8e365e8f8ae44eeb7683eaec2153155 Mon Sep 17 00:00:00 2001
From: sohail amjad <sohail.amjad@tarento.com>
Date: Tue, 14 May 2024 17:52:24 +0530
Subject: [PATCH 604/887] create demand request

---
 .../create-request-form.component.html        | 283 ++++++++++++++++
 .../create-request-form.component.scss        |  93 ++++++
 .../create-request-form.component.spec.ts     |  25 ++
 .../create-request-form.component.ts          | 305 ++++++++++++++++++
 .../request-list/request-list.component.html  |  33 ++
 .../request-list/request-list.component.scss  |  31 ++
 .../request-list.component.spec.ts            |  25 ++
 .../request-list/request-list.component.ts    |  25 ++
 .../ws/app/src/lib/routes/home/home.module.ts |   4 +
 .../lib/routes/home/home.rounting.module.ts   |  29 ++
 .../lib/routes/home/services/home.servive.ts  |  19 ++
 11 files changed, 872 insertions(+)
 create mode 100644 project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
 create mode 100644 project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.scss
 create mode 100644 project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
 create mode 100644 project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
 create mode 100644 project/ws/app/src/lib/routes/home/components/request-list/request-list.component.scss
 create mode 100644 project/ws/app/src/lib/routes/home/components/request-list/request-list.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts

diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
new file mode 100644
index 000000000..886d84e41
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
@@ -0,0 +1,283 @@
+<div class="flex flex-4 flex-column main-container">
+    <mat-card class="card-section">
+      <!-- <mat-card-header class="flex-custom-m">
+        <div class="flex-1" role="link" tabindex="1">
+          <div class="flex flex-1">
+            <mat-card-title class="flex-4 mobile-margin mat-h2">
+              Roles and access
+            </mat-card-title>
+          </div>
+        </div>
+      </mat-card-header> -->
+      <mat-card-title class="flex-4 mobile-margin mat-h2 title-request">
+        Request Content
+      </mat-card-title>
+      <mat-card-content>
+        <div class="form-element">
+            <form [formGroup]="requestForm">
+                <div class="title-name">
+                    <div class="fonm-element-label label-text">Title <span class="required"></span></div>
+                    <mat-form-field appearance="outline" class="w-full" fxFlex="40">
+                        <input class="w-full" matInput placeholder="Enter Title" formControlName="TitleName" maxlength="70">
+                        <mat-hint align="end">{{ requestForm.controls['TitleName'].value.length }} / 70</mat-hint>                    
+                        <mat-error *ngIf="requestForm.controls['TitleName'].hasError('required')">
+                        Title is Mandatory
+                        </mat-error>
+                        <mat-error
+                        *ngIf="requestForm.controls['TitleName'].hasError('minlength') && !requestForm.controls['TitleName'].errors?.pattern"
+                        i18n="name Error|Explains name is required">
+                        Minimum characters left to create {{10 - requestForm.controls['TitleName'].value.length}}
+                      </mat-error>
+                      <mat-error *ngIf="requestForm.controls['TitleName'].errors?.pattern"
+                        i18n="name Error|Explains name is required">
+                        Only {{specialCharList}} characters are supported
+                      </mat-error>
+                      <mat-hint>
+                        Only {{specialCharList}} characters are supported
+                      </mat-hint>
+                    </mat-form-field>
+                </div>
+                <div class="title-name">
+                    <div class="fonm-element-label label-text">Objective <span class="required"></span></div>
+                    <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
+                        <input class="w-full" matInput placeholder="Enter Objective" formControlName="Objective" maxlength="500">
+                        <mat-hint align="end">{{ requestForm.controls['Objective'].value.length }} / 500</mat-hint>                    
+                        <mat-error *ngIf="requestForm.controls['Objective'].hasError('required')">
+                        Objective is Mandatory
+                        </mat-error>
+                        <mat-error
+                        *ngIf="requestForm.controls['Objective'].hasError('minlength') && !requestForm.controls['Objective'].errors?.pattern"
+                        i18n="name Error|Explains name is required">
+                        Minimum characters left to create {{10 - requestForm.controls['Objective'].value.length}}
+                      </mat-error>
+                      <mat-error *ngIf="requestForm.controls['Objective'].errors?.pattern"
+                        i18n="name Error|Explains name is required">
+                        Only {{specialCharList}} characters are supported
+                      </mat-error>
+                      <mat-hint>
+                        Only {{specialCharList}} characters are supported
+                      </mat-hint>
+                    </mat-form-field>
+                </div>
+                <div class="title-name">
+                    <div class="fonm-element-label label-text">Type of user</div>
+                    <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
+                        <input class="w-full" matInput placeholder="Enter Objective" formControlName="userType" maxlength="500">
+                        <mat-hint align="end">{{ requestForm.controls['userType'].value.length }} / 500</mat-hint>                    
+                        <mat-error
+                        *ngIf="requestForm.controls['userType'].hasError('minlength') && !requestForm.controls['userType'].errors?.pattern"
+                        i18n="name Error|Explains name is required">
+                        Minimum characters left to create {{10 - requestForm.controls['userType'].value.length}}
+                      </mat-error>
+                      <mat-error *ngIf="requestForm.controls['userType'].errors?.pattern"
+                        i18n="name Error|Explains name is required">
+                        Only {{specialCharList}} characters are supported
+                      </mat-error>
+                      <mat-hint>
+                        Only {{specialCharList}} characters are supported
+                      </mat-hint>
+                    </mat-form-field>
+                </div>
+                <div class="title-name">
+                    <div class="fonm-element-label label-text">Learning Mode</div>
+                    <div class="mt-5">
+                    <mat-radio-group aria-label="Select an option" formControlName="learningMode" >
+                        <mat-radio-button class="learning-section"  *ngFor="let item of learningList"  [value]="item"  >{{item}}</mat-radio-button>
+                    
+                      </mat-radio-group>
+                    </div>
+                </div>
+                
+                <div class="title-name">
+                    <span class="comp-heading">Targeted Competencies</span>
+                    <div>
+                        <div class="fonm-element-label label-text">Competency Area</div>
+                        <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
+                            <mat-select placeholder="Select Area" formControlName="compArea" (selectionChange)="onAreaSelection($event)">
+                                <mat-option *ngFor="let type of competencyList"  [value]="type">
+                                    {{type.name}}
+                                </mat-option>
+                            </mat-select>
+                        </mat-form-field>
+                    </div>
+                <div *ngIf="allCompetencyTheme && allCompetencyTheme.length > 0">
+                    <div class="fonm-element-label label-text">Competency Theme</div>
+                    <mat-form-field appearance="outline" class="w-full" fxFlex="40">
+                        <mat-label>Select theme</mat-label>
+                        <mat-select (openedChange)="openedChange($event,'themeText')"  (selectionChange)="onThemeSelection($event)" formControlName="compTheme"  multiple>
+                      
+                          <mat-select-trigger>
+                            <mat-chip-list>
+                              <mat-chip *ngFor="let item of requestForm.get('compTheme').value"
+                                [removable]="true" (removed)="onThemeRemoved(item)">
+                                {{ item.name }}
+                                <mat-icon matChipRemove>cancel</mat-icon>
+                              </mat-chip>
+                            </mat-chip-list>
+                          </mat-select-trigger>
+                          <mat-optgroup>
+                            <mat-form-field floatLabel="never">
+                              <input #search autocomplete="off" placeholder="Search" (keyup)="searchValueData($event,'themeText')"  formControlName="themeText" matInput>
+                              <button [disableRipple]="true" *ngIf="search.value" matSuffix mat-icon-button aria-label="Clear"
+                                (click)="clearSearch($event,'themeText')"><mat-icon>close</mat-icon></button>
+                            </mat-form-field>
+                          </mat-optgroup>
+                          <mat-optgroup *ngIf="filterCompetencyThemes.length === 0">
+                            <div>No results found!</div>
+                          </mat-optgroup>
+                          <mat-option *ngFor="let option of filterCompetencyThemes"  [value]="option">{{option.name}}</mat-option>
+                      
+                        </mat-select>
+                      </mat-form-field>
+                    
+                    <!-- <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
+                        <mat-select placeholder="Select Competency Theme" formControlName="compTheme" (selectionChange)="onThemeSelection($event)">
+                            <mat-option *ngFor="let option of allCompetencyTheme" [value]="option">
+                                {{option.name}}
+                            </mat-option>
+                        </mat-select>
+                    </mat-form-field> -->
+                </div>
+
+                <div *ngIf="allCompetencySubtheme && allCompetencySubtheme.length > 0">
+                    <div class="fonm-element-label label-text">Competency Sub Theme</div>
+                    <mat-form-field appearance="outline" class="w-full" fxFlex="40">
+                        <mat-label>Select Sub theme</mat-label>
+                        <mat-select (openedChange)="openedChange($event,'subthemeText')" (selectionChange)="onSubThemeSelection($event)" formControlName="compSubTheme"  multiple>
+                      
+                          <mat-select-trigger>
+                            <mat-chip-list>
+                              <mat-chip *ngFor="let item of requestForm.get('compSubTheme').value"
+                                [removable]="true" (removed)="onSubThemeRemoved(item)">
+                                {{ item.name }}
+                                <mat-icon matChipRemove>cancel</mat-icon>
+                              </mat-chip>
+                            </mat-chip-list>
+                          </mat-select-trigger>
+                          <mat-optgroup>
+                            <mat-form-field floatLabel="never">
+                              <input #search autocomplete="off" placeholder="Search" (keyup)="searchValueData($event,'subthemeText')"  formControlName="subthemeText" matInput>
+                              <button [disableRipple]="true" *ngIf="search.value" matSuffix mat-icon-button aria-label="Clear"
+                                (click)="clearSearch($event,'subthemeText')"><mat-icon>close</mat-icon></button>
+                            </mat-form-field>
+                          </mat-optgroup>
+                          <mat-optgroup *ngIf="filteredSubTheme.length === 0">
+                            <div>No results found!</div>
+                          </mat-optgroup>
+                          <mat-option *ngFor="let option of filteredSubTheme"  [value]="option">{{option.name}}</mat-option>
+                      
+                        </mat-select>
+                      </mat-form-field>
+
+                    <!-- <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
+                        <mat-select placeholder="Select Competency sub-Theme" formControlName="compSubTheme" >
+                            <mat-option *ngFor="let option of allCompetencySubtheme" [value]="option">
+                                {{option.name}}
+                            </mat-option>
+                        </mat-select>
+                    </mat-form-field> -->
+                </div>
+                </div>
+                <!-- <div class="title-name">
+                   
+                </div> -->
+
+                <div class="title-text">
+                    <div class="fonm-element-label label-text">Refrence Link</div>
+                    <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
+                        <input class="w-full" matInput placeholder="Provide reference link" formControlName="referenceLink">
+                        </mat-form-field>
+
+                    
+                </div>
+                <div class="title-text">
+                    <div class="fonm-element-label label-text">Request Type<span class="required"></span></div>
+                    <div class="mt-5">
+                    <mat-radio-group aria-label="Select an option"    formControlName="requestType" >
+                        <mat-radio-button class="learning-section"  *ngFor="let item of requestTypeList" [value]="item" (change)="selectRequestType(item)">{{item}}</mat-radio-button>
+                    
+                      </mat-radio-group>
+                    </div>
+                </div>
+                <div class="title-name" *ngIf="isAssignee">
+                    <div class="fonm-element-label label-text">Assignee <span class="required"></span></div>
+                    <div class="">
+                        <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
+                            <mat-select placeholder="Choose the Assignee" formControlName="assignee">
+                          
+                              <!-- <mat-select-trigger>
+                                <mat-chip-list>
+                                  <mat-chip 
+                                    [removable]="true" (removed)="onProviderRemoved(requestForm.get('assignee').value)">
+                                    {{ requestForm.get('assignee').value.orgName}}
+                                    <mat-icon matChipRemove>cancel</mat-icon>
+                                  </mat-chip>
+                                </mat-chip-list>
+                                {{requestForm.get('compTheme').value}}
+                              </mat-select-trigger> -->
+                          
+                              <mat-option *ngFor="let option of requestTypeData" [value]="option">{{option.orgName}}</mat-option>
+                          
+                            </mat-select>
+                          </mat-form-field>
+                        <!-- <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
+                            <mat-select placeholder="Choose the Assignee" formControlName="assignee" >
+                                <mat-option *ngFor="let option of requestTypeData"  [value]="option">
+                                    {{option.orgName}}
+                                </mat-option>
+                            </mat-select>
+                        </mat-form-field> -->
+                    </div>
+                </div>
+                <div class="title-name" *ngIf="isBroadCast">
+                    <div class="fonm-element-label label-text">Preffered Providers <span class="required"></span></div>
+                    <div class="">
+                        <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
+                            <mat-select placeholder="Choose the provider" (openedChange)="openedChange($event,'providerText')" formControlName="providers"  multiple>
+                          
+                              <mat-select-trigger>
+                                <mat-chip-list>
+                                  <mat-chip *ngFor="let item of requestForm.get('providers').value"
+                                    [removable]="true" (removed)="onProviderRemoved(item)">
+                                    {{ item.orgName }}
+                                    <mat-icon matChipRemove>cancel</mat-icon>
+                                  </mat-chip>
+                                </mat-chip-list>
+                                <!-- {{requestForm.get('compTheme').value | json}} -->
+                              </mat-select-trigger>
+                              <mat-optgroup>
+                                <mat-form-field floatLabel="never">
+                                  <input #search autocomplete="off" placeholder="Search" (keyup)="searchValueData($event,'providerText')"  formControlName="providerText" matInput>
+                                  <button [disableRipple]="true" *ngIf="search.value" matSuffix mat-icon-button aria-label="Clear"
+                                    (click)="clearSearch($event,'providerText')"><mat-icon>close</mat-icon></button>
+                                </mat-form-field>
+                              </mat-optgroup>
+                              <mat-optgroup *ngIf="filteredRequestType.length === 0">
+                                <div>No results found!</div>
+                              </mat-optgroup>
+                          
+                              <mat-option *ngFor="let option of filteredRequestType" [value]="option">{{option.orgName}}</mat-option>
+                          
+                            </mat-select>
+                          </mat-form-field>
+                        <!-- <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
+                            <mat-select placeholder="Choose the provider" formControlName="providers" >
+                                <mat-option *ngFor="let option of requestTypeData" [value]="option">
+                                    {{option.orgName}}
+                                </mat-option>
+                            </mat-select>
+                        </mat-form-field> -->
+                    </div>
+                </div>
+
+                <div class="flex flex-start margin-top-l">
+                    <button mat-button class="submit-btn margin-right-xs" type="button" (click)="submit()" [disabled]="!requestForm.valid">Submit</button>
+                    <button mat-button class="close-btn " type="button" >Cancel</button>
+                   
+                  </div>
+            </form>
+        </div>
+        
+      </mat-card-content>
+    </mat-card>
+  </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.scss b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.scss
new file mode 100644
index 000000000..0234db31e
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.scss
@@ -0,0 +1,93 @@
+.main-container {
+    padding: 0.5%;
+    .card-section {
+        padding: 2%;
+        .title-request {
+            font-family: 'Montserrat';
+            font-weight: 600;
+            font-size: 20px;
+            line-height: 30px;
+        }
+       
+        .title-name {
+            margin-top: 20px;
+            .label-text {
+                font-family: 'lato';
+                font-weight: 700;
+                font-size: 14px;
+                line-height: 21px;
+            }
+                        .learning-section {
+                            padding: 16px;
+                            border: 1px solid #0000002e;
+                            margin-right: 18px;
+                            padding-top: 9px;
+                            padding-right: 69px;
+                            padding-left: 10px;
+                        }
+        //    ::ng-deep .field-height {
+        //     height: 200px !important;
+        // }
+          .comp-heading {
+            font-family: 'lato';
+            font-size: 14px;
+            font-weight: 700;
+            line-height: 21px;
+          }
+           
+        }
+        .title-text {
+            font-family: 'lato';
+            font-size: 14px;
+            font-weight: 700;
+            line-height: 21px;
+            color: #212529;
+            .learning-section {
+                padding: 16px;
+                border: 1px solid #0000002e;
+                margin-right: 18px;
+                padding-top: 9px;
+                padding-right: 69px;
+                padding-left: 10px;
+            }
+        }
+        .close-btn {
+            color: #1b4ca1!important;
+            border: 1px solid #1b4ca1;
+            border-radius: 4px;
+            width: auto;
+        }
+      
+        .submit-btn {
+          width: 9%;
+          background: #1b4ca1 !important;
+          color: white !important;
+          font-family: 'Lato';
+          font-weight: 700;
+          font-size: 14px;
+        }
+       
+    }
+   
+}
+
+::ng-deep.mat-pseudo-checkbox-checked {
+    background: #0074b6 !important;
+  }
+  
+  ::ng-deep.mat-radio-inner-circle {
+      background-color: #0074b6!important;
+  }
+  
+  ::ng-deep.ws-mat-accent-border {
+      border: 1px solid rgba(0, 0, 0, 0.16);
+      padding: 8px 12px !important;
+      border-radius: 4px !important;
+  }
+  
+  ::ng-deep.mat-option.mat-selected:not(.mat-option-disabled) {
+    color: rgba(0, 0, 0, 0.87) !important;
+  }
+  .mat-button[disabled] {
+    opacity: 0.6;
+  }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.spec.ts b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.spec.ts
new file mode 100644
index 000000000..6fe177a56
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
+
+import { CreateRequestFormComponent } from './create-request-form.component'
+
+describe('CreateRequestFormComponent', () => {
+  let component: CreateRequestFormComponent
+  let fixture: ComponentFixture<CreateRequestFormComponent>
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [CreateRequestFormComponent],
+    })
+    .compileComponents()
+  }))
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CreateRequestFormComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
+
+  it('should create', () => {
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
new file mode 100644
index 000000000..c74eb185d
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
@@ -0,0 +1,305 @@
+import { Component, OnInit } from '@angular/core'
+import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'
+import { ProfileV2Service } from '../../../services/home.servive'
+
+@Component({
+  selector: 'ws-app-create-request-form',
+  templateUrl: './create-request-form.component.html',
+  styleUrls: ['./create-request-form.component.scss'],
+})
+export class CreateRequestFormComponent implements OnInit {
+  requestForm!: FormGroup
+  specialCharList = `( a-z/A-Z , 0-9 . _ - $ / \ : [ ]' ' !)`
+  // tslint:disable-next-line:max-line-length
+  noSpecialChar = new RegExp(/^[\u0900-\u097F\u0980-\u09FF\u0C00-\u0C7F\u0B80-\u0BFF\u0C80-\u0CFF\u0D00-\u0D7F\u0A80-\u0AFF\u0B00-\u0B7F\u0A00-\u0A7Fa-zA-Z0-9()$[\]\\.:,_/ -]*$/)
+  learningList = ['Self-paced', 'Instructor-led']
+  requestTypeList = ['Single', 'Broadcast']
+  competencyList: any[] = []
+  allCompetencyTheme: any[] = []
+  seletedCompetencyArea: any
+  seletedCompetencyTheme: any = []
+  allCompetencySubtheme: any[] = []
+  seletedCompetencySubTheme: any[] = []
+  requestTypeData: any[] = []
+  isAssignee = false
+  isBroadCast = false
+  filterCompetencyThemes: any[] = []
+  filteredSubTheme: any[] = []
+  filteredRequestType: any[] = []
+  subthemeCheckedList: any[] = []
+  resData=''
+
+  constructor(private formBuilder: FormBuilder,
+    private homeService: ProfileV2Service,
+  ) {
+    this.requestForm = this.formBuilder.group({
+      TitleName: new FormControl('', [Validators.required, Validators.pattern(this.noSpecialChar), Validators.minLength(10)]),
+      Objective:  new FormControl('', [Validators.required, Validators.pattern(this.noSpecialChar)]),
+      userType:  new FormControl('', [Validators.pattern(this.noSpecialChar)]),
+      learningMode:  new FormControl(''),
+      compArea: new FormControl(''),
+      compTheme: new FormControl(''),
+      compSubTheme: new FormControl(''),
+      referenceLink: new FormControl(''),
+      requestType: new FormControl('', Validators.required),
+      assignee: new FormControl(''),
+      providers: new FormControl(''),
+      themeText: new FormControl(''),
+      subthemeText: new FormControl(''),
+      providerText: new FormControl(''),
+    })
+
+   }
+
+  ngOnInit() {
+    this.getFilterEntity()
+    this.getRequestTypeList()
+
+  }
+
+  searchValueData(e: any, searchValue: any) {
+    if (searchValue === 'themeText') {
+      this.requestForm.controls['themeText'].valueChanges.subscribe((newValue: any) => {
+        this.filterCompetencyThemes = this.filterValues(newValue, this.allCompetencyTheme)
+      })
+    } else if (searchValue === 'subthemeText') {
+      this.requestForm.controls['subthemeText'].valueChanges.subscribe((newValue: any) => {
+        this.filteredSubTheme = this.filterValues(newValue, this.allCompetencySubtheme)
+      })
+    } else if (searchValue === 'providerText' || e) {
+      this.requestForm.controls['providerText'].valueChanges.subscribe((newValue: any) => {
+        this.filteredRequestType = this.filterOrgValues(newValue, this.requestTypeData)
+      })
+    }
+
+  }
+
+  filterValues(searchValue: string, array: any) {
+    return array.filter((value: any) =>
+      value.name.toLowerCase().includes(searchValue.toLowerCase()))
+  }
+
+  filterOrgValues(searchValue: string, array: any) {
+    return array.filter((value: any) =>
+      value.orgName.toLowerCase().includes(searchValue.toLowerCase()))
+  }
+
+  getFilterEntity() {
+    const filterObj = {
+      search: {
+        type: 'Competency Area',
+      },
+      filter: {
+        isDetail: true,
+      },
+    }
+    this.homeService.getFilterEntity(filterObj).subscribe((res: any) => {
+      this.competencyList = res
+    })
+  }
+
+  getRequestTypeList() {
+    const requestObj = {
+      request: {
+        filters: {
+          isCbp: true,
+        },
+      },
+    }
+    this.homeService.getRequestTypeList(requestObj).subscribe(data => {
+      this.requestTypeData = data
+      this.filteredRequestType = [...this.requestTypeData]
+    })
+  }
+
+  selectRequestType(item: any) {
+   if (item === 'Single') {
+     this.isAssignee = true
+     this.isBroadCast = false
+   } else if (item === 'Broadcast') {
+    this.isBroadCast = true
+    this.isAssignee = false
+   }
+
+  }
+
+  resetCompSubfields() {
+    // this.enableCompetencyAdd = false
+    // this.allCompetencySubtheme = []
+    // this.seletedCompetencyTheme = []
+    // this.seletedCompetencySubTheme = []
+  }
+
+  openedChange(e: any, searchControl: any) {
+    // Set search textbox value as empty while opening selectbox
+    this.requestForm.controls[searchControl].patchValue('')
+    // Focus to search textbox while clicking on selectbox
+    if (e === true) {
+      // this.contentForm.value.provider.focus()
+    }
+  }
+
+  // Method to clear search values from textbox
+  clearSearch(event: any, searchControl: any) {
+    event.stopPropagation()
+    this.requestForm.controls[searchControl].patchValue('')
+  }
+
+ // on selection change of competency area and assign value to allCompetencyTheme
+  onAreaSelection(option: any) {
+    this.allCompetencySubtheme = []
+    this.filteredSubTheme = []
+    this.allCompetencyTheme = []
+    this.resetCompSubfields()
+    this.competencyList.forEach((val: any) => {
+      if (option.value.name === val.name) {
+        this.seletedCompetencyArea = val
+        // this.allCompetencyTheme = val.children
+        val.children.forEach((item: any) => {
+          item.selected = false
+          this.allCompetencyTheme.push(item)
+          this.filterCompetencyThemes = [...this.allCompetencyTheme]
+        })
+      }
+    })
+  }
+
+  // On Selection of Competency theme and assign value to filteredSubTheme
+  onThemeSelection(option: any) {
+    this.filteredSubTheme = []
+    this.allCompetencySubtheme = []
+    // this.enableCompetencyAdd = false
+    const index = this.seletedCompetencyTheme.findIndex((object: any) => object.name === option.value.name)
+    if (index === -1) {
+      this.allCompetencyTheme.forEach((val: any) => {
+        option.value.forEach((data: any) => {
+          if (data.name === val.name) {
+          val.selected = true
+          this.seletedCompetencyTheme.push(val)
+          val.children.forEach((item: any) => {
+            item.selected = false
+            item.compThemeID = val.id
+            this.allCompetencySubtheme.push(item)
+            this.filteredSubTheme = [...this.allCompetencySubtheme]
+          })
+        }
+        })
+      })
+    } else {
+      this.seletedCompetencyTheme[index].selected = false
+
+      const id = this.seletedCompetencyTheme[index].id
+      this.seletedCompetencyTheme.splice(index, 1)
+      if (this.seletedCompetencyTheme.length === 0) {
+        this.seletedCompetencySubTheme = []
+      }
+      this.allCompetencySubtheme = this.allCompetencySubtheme.filter((item: any) => item.compThemeID !== id)
+      this.seletedCompetencySubTheme = this.seletedCompetencySubTheme.filter((item: any) => item.compThemeID !== id)
+    }
+  }
+
+  onSubThemeSelection(event: any) {
+   this.subthemeCheckedList = [...event.value]
+   this.subthemeCheckedList.forEach((item: any) => {
+      item.checked = true
+   })
+
+  }
+
+  onThemeRemoved(theme: any) {
+    this.allCompetencySubtheme = []
+    this.filteredSubTheme = []
+    const compThemeControl = this.requestForm.get('compTheme') as FormControl | null
+    if (compThemeControl) {
+      const themes = compThemeControl.value
+      if (themes) {
+        const index = themes.indexOf(theme)
+        if (index >= 0) {
+          themes.splice(index, 1)
+          compThemeControl.setValue(themes)
+          if (themes.length) {
+            themes.forEach((child: any) => {
+              child.children.forEach((innerChild: any) => {
+                this.allCompetencySubtheme.push(innerChild)
+            this.filteredSubTheme = [...this.allCompetencySubtheme]
+            // const constSubthemeCont = this.requestForm.get('compSubTheme') as FormControl | null
+            // if(constSubthemeCont){
+            //   constSubthemeCont.setValue(this.filteredSubTheme);
+            // }
+
+              })
+            })
+          } else {
+            this.allCompetencySubtheme = []
+            this.filteredSubTheme = []
+          }
+
+        }
+      }
+    }
+  }
+
+  onSubThemeRemoved(theme: any) {
+    const compSubThemeControl = this.requestForm.get('compSubTheme') as FormControl | null
+    if (compSubThemeControl) {
+      const themes = compSubThemeControl.value
+      if (themes) {
+        const index = themes.indexOf(theme)
+        if (index >= 0) {
+          themes.splice(index, 1)
+          compSubThemeControl.setValue(themes)
+        }
+      }
+    }
+  }
+
+  onProviderRemoved(provider: any) {
+    const compThemeControl = this.requestForm.get('providers') as FormControl | null
+    if (compThemeControl) {
+      const themes = compThemeControl.value
+      if (themes) {
+        const index = themes.indexOf(provider)
+        if (index >= 0) {
+          themes.splice(index, 1)
+          compThemeControl.setValue(themes)
+        }
+      }
+    }
+  }
+
+  submit() {
+    const request = {
+      title: this.requestForm.value.TitleName,
+      objective: this.requestForm.value.Objective,
+      typeOfUser: this.requestForm.value.userType,
+      learningMode: this.requestForm.value.learningMode,
+      competencies: {
+        select_area: 'Functional',
+        select_theme: 'Data Science',
+        select_sub_theme: 'Basic',
+      },
+      referenceLink: this.requestForm.value.referenceLink,
+      requestType: this.requestForm.value.requestType,
+      preferredProvider: [
+        {
+          providerName: 'Provider 1',
+          providerId: '23456',
+        },
+        {
+          providerName: 'Provider 2',
+          providerId: '3456789',
+        },
+      ],
+      status: 'Unassigned',
+      source: 'MDOID',
+
+    }
+
+    this.homeService.createDemand(request).subscribe(res => {
+      this.resData =res
+
+    })
+
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
new file mode 100644
index 000000000..b38e61c34
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
@@ -0,0 +1,33 @@
+<div class="request-container">
+    <h2>Content Request</h2>
+    <mat-card class="mb-8">
+        <mat-card-content class="flex gap-10">
+            <div class="section-1">
+                <div class="flex-4 mobile-margin text-capitalize mat-h2">Note:</div>
+                <ng-container *ngFor="let note of requestList">
+                    <div class="flex gap-4 mb-4">
+                        <div>
+                            <mat-icon class="infoIcon">error_outline</mat-icon>
+                        </div>
+                        <div [innerHTML]="sanitizeHtml(note)"></div>
+                    </div>
+                </ng-container>
+            </div>
+            <div class="reportsDemo flex justify-end section-2">
+                <div class="reportsDemoVideo flex flex-column flex-middle justify-center margin-top-m"
+                    (click)="openVideoPopup()">
+                    <mat-icon class="video_icon mb-2">play_circle</mat-icon>
+                    <div>
+                        Watch how it works
+                    </div>
+                </div>
+            </div>
+        </mat-card-content>
+    </mat-card>
+
+    <div class="create-action">
+        <button mat-button type="button" class="search-btn" [routerLink]="['/app/home/create-request-form']">Request Content</button>
+
+
+    </div>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.scss b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.scss
new file mode 100644
index 000000000..f246e0a55
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.scss
@@ -0,0 +1,31 @@
+.reportsDemo {
+
+
+    .reportsDemoVideo {
+      width: 290px;
+      height: 163px;
+      border-radius: 5px;
+      background-color: #FDEAD5;
+      font-weight: 600;
+      pointer-events: all;
+      cursor: pointer;
+
+      .video_icon {
+        font-size: 32px;
+      }
+    }
+  }
+
+  .create-action {
+    display: flex;
+    justify-content: end;
+    .search-btn {
+        background: #1b4ca1 !important;
+        color: white !important;
+        font-family: 'Lato';
+        font-weight: 700;
+        font-size: 14px;
+        border-radius: 4px;
+        min-width: 138px;
+    }
+  }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.spec.ts b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.spec.ts
new file mode 100644
index 000000000..269076cef
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
+
+import { RequestListComponent } from './request-list.component'
+
+describe('RequestListComponent', () => {
+  let component: RequestListComponent
+  let fixture: ComponentFixture<RequestListComponent>
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [RequestListComponent],
+    })
+    .compileComponents()
+  }))
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(RequestListComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
+
+  it('should create', () => {
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
new file mode 100644
index 000000000..95beca751
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
@@ -0,0 +1,25 @@
+import { Component, OnInit } from '@angular/core'
+import { DomSanitizer, SafeHtml } from '@angular/platform-browser'
+
+@Component({
+  selector: 'ws-app-request-list',
+  templateUrl: './request-list.component.html',
+  styleUrls: ['./request-list.component.scss'],
+})
+export class RequestListComponent implements OnInit {
+
+  constructor(private sanitizer: DomSanitizer) { }
+  requestList: any[] = [
+    `These reports contain Personally Identifiable Information (PII) data.
+      Please use them cautiously.`,
+      `Your access to the report is available until.
+      Please contact your MDO Leader to renew your access.`,
+  ]
+
+  ngOnInit() {
+  }
+  sanitizeHtml(html: string): SafeHtml {
+    return this.sanitizer.bypassSecurityTrustHtml(html)
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index cd7d7fea0..511b07a27 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -74,6 +74,8 @@ import { FileProgressComponent } from './routes/users-view/file-progress/file-pr
 import { UserCreationComponent } from './routes/users-view/user-creation/user-creation.component'
 import { SingleUserCreationComponent } from './routes/users-view/single-user-creation/single-user-creation.component'
 import { BulkUploadApprovalComponent } from './routes/approvals/bulk-upload/bulk-upload.component'
+import { RequestListComponent } from './components/request-list/request-list.component'
+import { CreateRequestFormComponent } from './components/request-list/create-request-form/create-request-form.component'
 
 @NgModule({
   declarations: [
@@ -114,6 +116,8 @@ import { BulkUploadApprovalComponent } from './routes/approvals/bulk-upload/bulk
     UserCreationComponent,
     SingleUserCreationComponent,
     BulkUploadApprovalComponent,
+    RequestListComponent,
+    CreateRequestFormComponent,
   ],
   imports: [
     CommonModule,
diff --git a/project/ws/app/src/lib/routes/home/home.rounting.module.ts b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
index d0a8cc718..46b565f17 100644
--- a/project/ws/app/src/lib/routes/home/home.rounting.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
@@ -25,6 +25,8 @@ import { ConfigResolveService } from './resolvers/config-resolve.service'
 import { UsersListResolve } from './resolvers/users-list-resolve.service'
 import { UserCreationComponent } from './routes/users-view/user-creation/user-creation.component'
 import { BulkUploadApprovalComponent } from './routes/approvals/bulk-upload/bulk-upload.component'
+import { RequestListComponent } from './components/request-list/request-list.component'
+import { CreateRequestFormComponent } from './components/request-list/create-request-form/create-request-form.component'
 
 const routes: Routes = [
   {
@@ -310,6 +312,33 @@ const routes: Routes = [
           pageData: PageResolve,
         },
       },
+      {
+        path: 'request-list',
+        component: RequestListComponent,
+        data: {
+          pageId: 'request-list',
+          pageType: 'feature',
+          pageKey: 'request-list',
+        },
+        resolve: {
+          configService: ConfigResolveService,
+          pageData: PageResolve,
+        },
+      },
+      {
+        path: 'create-request-form',
+        component: CreateRequestFormComponent,
+        data: {
+          pageId: 'create-request-form',
+          pageType: 'feature',
+          pageKey: 'create-request-form',
+        },
+        resolve: {
+          configService: ConfigResolveService,
+          pageData: PageResolve,
+        },
+      },
+
     ],
   },
   {
diff --git a/project/ws/app/src/lib/routes/home/services/home.servive.ts b/project/ws/app/src/lib/routes/home/services/home.servive.ts
index 969dbecf2..057b32117 100644
--- a/project/ws/app/src/lib/routes/home/services/home.servive.ts
+++ b/project/ws/app/src/lib/routes/home/services/home.servive.ts
@@ -3,9 +3,12 @@ import { HttpClient } from '@angular/common/http'
 import { Observable } from 'rxjs'
 import { NSProfileDataV2 } from '../models/profile-v2.model'
 import { map } from 'rxjs/operators'
+// tslint:disable
+import _ from 'lodash'
 
 const PROTECTED_SLAG_V8 = '/apis/protected/v8'
 
+
 const API_END_POINTS = {
   DISCUSS_PROFILE: '/apis/protected/v8/discussionHub/users',
   PROFILE_DETAIL: `${PROTECTED_SLAG_V8}/social/post/timeline`,
@@ -16,6 +19,9 @@ const API_END_POINTS = {
   // GET_MY_DEPARTMENT: '/apis/protected/v8/portal/mdo/mydepartment?allUsers=false',
   GET_MY_DEPARTMENT_ALL: '/apis/protected/v8/portal/mdo/mydepartment?allUsers=true',
   GET_USER_DETAILS: `/apis/protected/v8/user/details?ts='${Date.now()}`,
+  GET_FILTER_ENTITY: 'apis/proxies/v8/competency/v4/search',
+  GET_REQUEST_TYPE_LIST:'/apis/proxies/v8/org/v1/search',
+  CREATE_DEMAND_REQUEST:'/apis/proxies/v8/demand/content/create'
 }
 
 @Injectable({
@@ -48,4 +54,17 @@ export class ProfileV2Service {
   getUserDetails(): Observable<any> {
     return this.http.get<any>(`${API_END_POINTS.GET_USER_DETAILS}`)
   }
+
+  getFilterEntity(filter: object): Observable<any> {
+    return this.http.post<any>(`${API_END_POINTS.GET_FILTER_ENTITY}`, filter).pipe(map(res => _.get(res, 'result.competency')))
+  }
+
+  getRequestTypeList(request:any):Observable<any>{
+    return this.http.post<any>(`${API_END_POINTS.GET_REQUEST_TYPE_LIST}`,request).pipe(map(res=> _.get(res, 'result.response.content')))
+  }
+
+  createDemand(request:any){
+   return this.http.post<any>(`${API_END_POINTS.CREATE_DEMAND_REQUEST}`,request)
+  }
+
 }

From b607fdcda20fc91ac9cf2cc34684607a3140c6b1 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Thu, 16 May 2024 16:26:03 +0530
Subject: [PATCH 605/887] updated cancel button condition

---
 .../components/user-cards/user-card.component.html  |  2 +-
 .../components/user-cards/user-card.component.ts    | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 7db74af02..73189afd4 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -345,7 +345,7 @@
                   Update
                 </span>
               </button>
-              <button mat-raised-button type="submit" (click)="cancelSubmit()"
+              <button mat-raised-button type="submit" (click)="cancelSubmit(user)"
                 class="btn-success btn-responsive cancelbtn">
                 <span i18n>
                   Cancel
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 5d04f19b8..e1b1d7db1 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -105,9 +105,9 @@ export class UserCardComponent implements OnInit {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-              private dialog: MatDialog, private approvalSvc: ApprovalsService,
-              private route: ActivatedRoute, private snackBar: MatSnackBar,
-              private events: EventService) {
+    private dialog: MatDialog, private approvalSvc: ApprovalsService,
+    private route: ActivatedRoute, private snackBar: MatSnackBar,
+    private events: EventService) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', [Validators.required]),
       group: new FormControl('', [Validators.required]),
@@ -249,7 +249,7 @@ export class UserCardComponent implements OnInit {
         countryCode: '+91',
       })
     },
-                                                  (_err: any) => {
+      (_err: any) => {
       })
   }
 
@@ -433,8 +433,9 @@ export class UserCardComponent implements OnInit {
     this.userwfData = approvalData
   }
 
-  cancelSubmit() {
+  cancelSubmit(user: any) {
     this.updateUserDataForm.reset()
+    user.enableEdit = !user.enableEdit
   }
 
   modifyUserRoles(role: string) {
@@ -668,7 +669,7 @@ export class UserCardComponent implements OnInit {
           this.comment = ''
           setTimeout(() => {
             this.openSnackbar('Request approved successfully')
-          },         100)
+          }, 100)
         }
         // tslint:disable-next-line
         this.approvalData = this.approvalData.filter((wf: any) => { wf.userWorkflow.userInfo.wid !== req.userId })

From 3c3877fff1abd9a80d6f5b71fee37c190964b398 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Fri, 17 May 2024 11:30:29 +0530
Subject: [PATCH 606/887] Added mark as nonverified flow & edit or canel flows

---
 .../user-cards/user-card.component.html       | 17 +++---
 .../user-cards/user-card.component.ts         | 58 ++++++++++++++-----
 .../users-view/users-view.component.html      | 12 ++--
 3 files changed, 59 insertions(+), 28 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 73189afd4..7f97aa482 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -50,7 +50,8 @@
           <div class="inner-body">
             Primary Details <mat-icon class="ws-mat-black40-text custominfo">info_outline</mat-icon>
             <p class="float-right mat-body-2" *ngIf="user?.profileDetails?.profileStatus === 'VERIFIED'">
-              <mat-slide-toggle>Mark this user as non-verified</mat-slide-toggle>
+              <mat-slide-toggle (click)="markStatus('NOT-VERIFIED', user)">Mark this user as
+                non-verified</mat-slide-toggle>
             </p>
             <div class="flex flex-row margin-top-m">
               <div class="md:w-1/3">
@@ -318,12 +319,14 @@
                   aria-label="Roles label" i18n="Role label|Label which explains the user to select the roles">
                   Role
                 </label>
-                <mat-selection-list id="roles" formControlName="roles" #roles class="roles-list">
-                  <mat-list-option *ngFor="let role of rolesList" (click)="modifyUserRoles(role.roleName)"
-                    [selected]="userRoles.has(role.roleName)" [value]="role?.roleName">
-                    {{role.roleName}}
-                  </mat-list-option>
-                </mat-selection-list>
+                <div>
+                  <mat-selection-list id="roles" formControlName="roles" #roles class="roles-list">
+                    <mat-list-option *ngFor="let role of rolesList" (click)="modifyUserRoles(role.roleName)"
+                      [selected]="userRoles.has(role.roleName)" [value]="role?.roleName">
+                      {{role.roleName}}
+                    </mat-list-option>
+                  </mat-selection-list>
+                </div>
               </div>
 
               <div class="md:w-1/2" *ngIf="isMdoAdmin">
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index e1b1d7db1..99c405290 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -42,6 +42,7 @@ export class UserCardComponent implements OnInit {
   @Output() paginationData = new EventEmitter()
   @Output() searchByEnterKey = new EventEmitter()
   @Output() disableButton = new EventEmitter()
+  @Output() updateList = new EventEmitter()
   @ViewChildren(MatExpansionPanel) panels!: QueryList<MatExpansionPanel>
 
   @ViewChild('rejectDialog', { static: false })
@@ -249,6 +250,7 @@ export class UserCardComponent implements OnInit {
         countryCode: '+91',
       })
     },
+      // tslint:disable-next-line
       (_err: any) => {
       })
   }
@@ -560,15 +562,16 @@ export class UserCardComponent implements OnInit {
                   this.updateUserDataForm.reset({ roles: '' })
                   this.openSnackbar('User role updated Successfully')
                   panel.close()
+                  this.updateList.emit()
                   // this.router.navigate(['/app/home/users/allusers'])
 
-                  this.usersSvc.getUserById(user.userId).subscribe((_res: any) => {
-                    if (_res) {
-                      // tslint:disable-next-line
-                      user = _res
-                      user['enableEdit'] = false
-                    }
-                  })
+                  // this.usersSvc.getUserById(user.userId).subscribe((_res: any) => {
+                  //   if (_res) {
+                  //     // tslint:disable-next-line
+                  //     user = _res
+                  //     user['enableEdit'] = false
+                  //   }
+                  // })
                 }
               })
             } else {
@@ -576,14 +579,16 @@ export class UserCardComponent implements OnInit {
             }
           } else {
             user['enableEdit'] = false
-            this.usersSvc.getUserById(user.userId).subscribe((res: any) => {
-              if (res) {
-                // tslint:disable-next-line
-                user = res
-                user.enableEdit = false
-                panel.close()
-              }
-            })
+
+            panel.close()
+            this.updateList.emit()
+            // this.usersSvc.getUserById(user.userId).subscribe((res: any) => {
+            //   if (res) {
+            //     // tslint:disable-next-line
+            //     user = res
+            //     user.enableEdit = false
+            //   }
+            // })
           }
         }
       },
@@ -669,6 +674,7 @@ export class UserCardComponent implements OnInit {
           this.comment = ''
           setTimeout(() => {
             this.openSnackbar('Request approved successfully')
+            // tslint:disable-next-line
           }, 100)
         }
         // tslint:disable-next-line
@@ -702,4 +708,26 @@ export class UserCardComponent implements OnInit {
   showedit() {
     this.showeditText = true
   }
+
+  markStatus(status: any, user: any) {
+    const reqbody = {
+      request: {
+        userId: user.userId,
+        profileDetails: {
+          profileStatus: status
+        },
+      },
+    }
+
+    this.usersSvc.updateUserDetails(reqbody).subscribe(dres => {
+      if (dres) {
+        this.openSnackbar('User status updated Successfully')
+        this.updateList.emit()
+      }
+    },
+      // tslint:disable-next-line: align
+      (err: { error: any }) => {
+        this.openSnackbar(err.error.params.errmsg)
+      })
+  }
 }
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index f58dfcc89..978af357d 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -81,8 +81,8 @@
         <!-- <div *ngIf="activeUsersDataCount > 0"> -->
         <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="activeUsersData"
           [totalRecords]="activeUsersDataCount" [tabChangeIndex]="pageIndex" [isApprovals]="false"
-          (searchByEnterKey)="onEnterkySearch($event)"
-          (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
+          (searchByEnterKey)="onEnterkySearch($event)" (paginationData)="onPaginateChange($event)"
+          (updateList)="getUsers('')"></ws-widget-user-card>
         <!-- </div> -->
         <!-- <p class="margin-top-l margin-bottom-l" *ngIf="activeUsersDataCount === 0">No users found</p> -->
       </ng-container>
@@ -90,8 +90,8 @@
         <!-- <div *ngIf="verifiedUsersDataCount > 0"> -->
         <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="verifiedUsersData"
           [totalRecords]="verifiedUsersDataCount" [tabChangeIndex]="pageIndex"
-          (searchByEnterKey)="onEnterkySearch($event)"
-          (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
+          (searchByEnterKey)="onEnterkySearch($event)" (paginationData)="onPaginateChange($event)"
+          (updateList)="getVUsers('')"></ws-widget-user-card>
         <!-- </div> -->
         <!-- <p class="margin-top-l margin-bottom-l" *ngIf="verifiedUsersDataCount === 0">No users found</p> -->
       </ng-container>
@@ -99,8 +99,8 @@
         <!-- <div *ngIf="nonverifiedUsersDataCount > 0"> -->
         <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="nonverifiedUsersData"
           [totalRecords]="nonverifiedUsersDataCount" [tabChangeIndex]="pageIndex"
-          (searchByEnterKey)="onEnterkySearch($event)"
-          (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
+          (searchByEnterKey)="onEnterkySearch($event)" (paginationData)="onPaginateChange($event)"
+          (updateList)="getNVUsers('')"></ws-widget-user-card>
         <!-- </div> -->
         <!-- <p class="margin-top-l margin-bottom-l" *ngIf="nonverifiedUsersDataCount === 0">No users found</p> -->
       </ng-container>

From 448532e97dea5a417ae85ccc3e64abfcb7ad8d73 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Fri, 17 May 2024 11:40:27 +0530
Subject: [PATCH 607/887] lint fix

---
 .../home/components/user-cards/user-card.component.ts     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 99c405290..7cc1363d7 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -106,9 +106,9 @@ export class UserCardComponent implements OnInit {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-    private dialog: MatDialog, private approvalSvc: ApprovalsService,
-    private route: ActivatedRoute, private snackBar: MatSnackBar,
-    private events: EventService) {
+              private dialog: MatDialog, private approvalSvc: ApprovalsService,
+              private route: ActivatedRoute, private snackBar: MatSnackBar,
+              private events: EventService) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', [Validators.required]),
       group: new FormControl('', [Validators.required]),
@@ -714,7 +714,7 @@ export class UserCardComponent implements OnInit {
       request: {
         userId: user.userId,
         profileDetails: {
-          profileStatus: status
+          profileStatus: status,
         },
       },
     }

From bc0d75a46078561d46def9eaa3214496c195be17 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Fri, 17 May 2024 12:35:29 +0530
Subject: [PATCH 608/887] Added list options alignment

---
 .../routes/home/components/user-cards/user-card.component.html  | 2 +-
 .../routes/home/components/user-cards/user-card.component.scss  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 7f97aa482..63a8fc669 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -314,7 +314,7 @@
             </div>
 
             <div class="flex flex-row margin-top-m">
-              <div class="md:w-1/2" *ngIf="!isMdoAdmin">
+              <div class="md:w-1/1" *ngIf="!isMdoAdmin">
                 <label for="roles" class="margin-remove-bottom form-label required" i18n-aria-label
                   aria-label="Roles label" i18n="Role label|Label which explains the user to select the roles">
                   Role
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
index da50f674a..ba2bb4956 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
@@ -255,6 +255,8 @@ label {
     margin-right: 12px;
     height: auto;
     padding: 0.7em 0;
+    display: ruby;
+    height: 50px;
   }
 
   .mat-form-field-disabled .mat-form-field-outline {

From a127df751e3a3d5949e8758397cc53f8b351763a Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Tue, 21 May 2024 14:37:15 +0530
Subject: [PATCH 609/887] update for kar-202-logout-issue

---
 package.json                             | 2 +-
 src/app/component/root/root.component.ts | 3 +++
 src/app/services/init.service.ts         | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6fdd85adf..becd6f681 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "@sunbird-cb/design-system": "0.0.1",
     "@sunbird-cb/rain-dashboards": "0.4.33",
     "@sunbird-cb/resolver": "^1.0.0",
-    "@sunbird-cb/utils": "^1.0.15",
+    "@sunbird-cb/utils": "^1.0.17",
     "@types/file-saver": "^2.0.1",
     "@sunbird-cb/micro-surveys": "2.0.13",
     "brace": "^0.11.1",
diff --git a/src/app/component/root/root.component.ts b/src/app/component/root/root.component.ts
index 3096dac76..a1a5dc00e 100644
--- a/src/app/component/root/root.component.ts
+++ b/src/app/component/root/root.component.ts
@@ -127,6 +127,9 @@ export class RootComponent implements OnInit, AfterViewInit {
         }
       }
       if (event instanceof NavigationStart) {
+        if (event.url.includes('public/home')) {
+          window.location.href = '/public/logout'
+        }
         if (event.url.includes('embed')) {
           this.isNavBarRequired = false
         } else if (event.url.includes('author/') && this.isInIframe) {
diff --git a/src/app/services/init.service.ts b/src/app/services/init.service.ts
index 82a19caea..66aa1c5ae 100644
--- a/src/app/services/init.service.ts
+++ b/src/app/services/init.service.ts
@@ -328,6 +328,7 @@ export class InitService {
           } else {
             this.configSvc.unMappedUser.orgProfile = null
           }
+          localStorage.setItem('login', 'true')
 
         } else {
           this.authSvc.force_logout()

From dff7f92278d1b757bef4abe058ddd8a4b5198614 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Tue, 21 May 2024 15:05:48 +0530
Subject: [PATCH 610/887] Added notmyuser list integrations & mapping updated

---
 .../user-cards/user-card.component.html       | 62 ++++++++++++++-----
 .../user-cards/user-card.component.scss       | 16 +++++
 .../user-cards/user-card.component.ts         | 35 +++++++----
 .../single-user-creation.component.html       |  4 +-
 .../single-user-creation.component.ts         | 14 ++---
 .../users-view/users-view.component.html      | 32 +++-------
 .../routes/users-view/users-view.component.ts | 17 +++++
 7 files changed, 121 insertions(+), 59 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 63a8fc669..70bb86bcd 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -27,21 +27,26 @@
               <span class="status-label margin-left-s nonverified"
                 *ngIf="user?.profileDetails?.profileStatus === 'NOT-VERIFIED'">Non-verified
                 <mat-icon>check_circle</mat-icon></span>
+              <span class="status-label margin-left-s notmyuser"
+                *ngIf="user?.profileDetails?.profileStatus === 'NOT-MY-USER'">Not my user
+                <mat-icon>error</mat-icon></span>
             </div>
             <div class="mat-body-2 ws-mat-black40-text">{{user?.profileDetails &&
               user?.profileDetails?.professionalDetails
               &&
-              user?.profileDetails?.professionalDetails?.designation ?
-              user?.profileDetails?.professionalDetails?.designation : '-'}}</div>
+              user?.profileDetails?.professionalDetails[0]?.designation ?
+              user?.profileDetails?.professionalDetails[0]?.designation : '-'}}</div>
             <div class="mat-caption ws-mat-black40-text" *ngIf="user?.profileDetails?.profileStatus === 'VERIFIED'">
               Verified on: {{user?.profileDetails?.profileStatusVerifiedOn | date: 'dd/MM/yyyy'}}</div>
           </div>
         </div>
-        <div class="float-right">
-          <div class="button margin-top-m mat-body" (click)="onEditUser(user);$event.stopPropagation();"
-            *ngIf="isMdoAdmin || isMdoLeader">
+        <div class="float-right" *ngIf="isMdoAdmin || isMdoLeader">
+          <div class="button margin-top-m mat-body" (click)="onEditUser(user, panel);$event.stopPropagation();"
+            *ngIf="currentFilter !== 'notmyuser'">
             <mat-icon>edit</mat-icon> Edit
           </div>
+          <div class="button margin-top-m mat-body" (click)="confirmReassign(confirm, user);$event.stopPropagation();"
+            *ngIf="currentFilter === 'notmyuser'">Reassign</div>
         </div>
       </mat-expansion-panel-header>
 
@@ -72,7 +77,7 @@
                   check_circle</mat-icon>
                 <mat-icon class="nonverified-icon margin-left-xs"
                   *ngIf="user?.profileDetails?.profileStatus === 'NOT-VERIFIED'">
-                  check_circle</mat-icon>
+                  cancel</mat-icon>
               </div>
               <div class="md:w-1/3">
                 <label class="margin-remove-bottom form-label required">Designation</label>
@@ -95,7 +100,7 @@
                   check_circle</mat-icon>
                 <mat-icon class="nonverified-icon margin-left-xs"
                   *ngIf="user?.profileDetails?.profileStatus === 'NOT-VERIFIED'">
-                  check_circle</mat-icon>
+                  cancel</mat-icon>
               </div>
             </div>
           </div>
@@ -378,20 +383,20 @@
                   check_circle</mat-icon>
                 <mat-icon class="nonverified-icon margin-left-xs"
                   *ngIf="user?.profileDetails?.profileStatus === 'NOT-VERIFIED'">
-                  check_circle</mat-icon>
+                  cancel</mat-icon>
               </p>
             </div>
             <div class="md:w-1/3">
               <label class="view-text-label">Designation</label>
               <p>{{user.profileDetails && user.profileDetails.professionalDetails &&
-                user.profileDetails.professionalDetails.designation ?
-                user.profileDetails.professionalDetails.designation : '-'}}
+                user.profileDetails.professionalDetails[0].designation ?
+                user.profileDetails.professionalDetails[0].designation : '-'}}
                 <mat-icon class="verified-icon margin-left-xs"
                   *ngIf="user?.profileDetails?.profileStatus === 'VERIFIED'">
                   check_circle</mat-icon>
                 <mat-icon class="nonverified-icon margin-left-xs"
                   *ngIf="user?.profileDetails?.profileStatus === 'NOT-VERIFIED'">
-                  check_circle</mat-icon>
+                  cancel</mat-icon>
               </p>
             </div>
           </div>
@@ -469,7 +474,9 @@
 
             <div class="md:w-1/4">
               <label class="view-text-label">eHRMS ID</label>
-              <p>{{user.ehrmsID ? user.ehrmsID : '-'}}</p>
+              <p>{{user.profileDetails && user.profileDetails.additionalProperties &&
+                user.profileDetails.additionalProperties.externalSystemId ?
+                user.profileDetails.additionalProperties.externalSystemId : '-'}}</p>
             </div>
 
             <div class="md:w-1/2">
@@ -528,8 +535,8 @@
             </div>
             <div class="mat-body-2 ws-mat-black40-text">{{appData.user &&
               appData.user.profileDetails.professionalDetails &&
-              appData.user.profileDetails.professionalDetails.designation ?
-              appData.user.profileDetails.professionalDetails.designation : '-'}}</div>
+              appData.user.profileDetails.professionalDetails[0].designation ?
+              appData.user.profileDetails.professionalDetails[0].designation : '-'}}</div>
             <div class="mat-caption ws-mat-black40-text">Requested on: {{appData.requestedon | date: 'dd/MM/yyyy'}}
             </div>
           </div>
@@ -699,7 +706,9 @@
 
               <div class="md:w-1/4">
                 <label class="view-text-label">eHRMS ID</label>
-                <p>{{appData.user.ehrmsID ? appData.user.ehrmsID : '-'}}</p>
+                <p>{{appData.user.profileDetails && appData.user.profileDetails.additionalProperties &&
+                  appData.user.profileDetails.additionalProperties.externalSystemId ?
+                  appData.user.profileDetails.additionalProperties.externalSystemId : '-'}}</p>
               </div>
 
               <div class="md:w-1/2">
@@ -797,4 +806,27 @@
       <button mat-raised-button class="btn-success btn-responsive cancelbtn" matDialogClose>Cancel</button>
     </mat-dialog-actions>
   </form>
+</ng-template>
+
+<ng-template #confirm>
+  <div class="confirm-dialog text-center padding-l">
+    <mat-icon class="infoIcon orangeicon-dialog">error_outline</mat-icon>
+    <div mat-dialog-content i18n class="margin-top-xs blue-text">
+      Are you sure you want to re-assign this user to your MDO?
+    </div>
+    <div class="mat-caption margin-top-xs">Note: The user will be shifted to non-verified tab</div>
+    <div mat-dialog-actions class="flex-center margin-top-s">
+      <button mat-raised-button type="submit" [mat-dialog-close]="false"
+        class="margin-right-m  btn-success btn-responsive cancelbtn">
+        <span i18n>
+          No
+        </span>
+      </button>
+      <button mat-raised-button type="submit" [mat-dialog-close]="true" class="btn-success btn-responsive successbtn">
+        <span class="text-white" i18n>
+          Yes
+        </span>
+      </button>
+    </div>
+  </div>
 </ng-template>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
index ba2bb4956..f8c903a95 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
@@ -57,6 +57,9 @@
   .status-label.nonverified {
     background: #D13924;
   }
+  .status-label.notmyuser {
+    background: #e99e38;
+  }
 
   .verified-icon {
     color: #1D8923;
@@ -64,6 +67,9 @@
   .nonverified-icon {
     color: #D13924;
   }
+  .notmyuser-icon {
+    color: #e99e38;
+  }
 
  .button {
     color: #1B4CA1;
@@ -292,6 +298,12 @@ label {
   vertical-align: middle;
   height: 30px !important;
 }
+.orangeicon-dialog {
+  color: #e99e38;
+  vertical-align: middle;
+  height: 45px !important;
+  font-size: 36px;
+}
 .editreasonicon {
   vertical-align: middle;
   color: #666 !important;
@@ -316,4 +328,8 @@ label {
     padding: 10px 24px !important;
     margin-bottom: 0 !important;
   }
+}
+
+.blue-text {
+  color:#1B4CA1;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 7cc1363d7..cceb16e54 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -106,9 +106,9 @@ export class UserCardComponent implements OnInit {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-              private dialog: MatDialog, private approvalSvc: ApprovalsService,
-              private route: ActivatedRoute, private snackBar: MatSnackBar,
-              private events: EventService) {
+    private dialog: MatDialog, private approvalSvc: ApprovalsService,
+    private route: ActivatedRoute, private snackBar: MatSnackBar,
+    private events: EventService) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', [Validators.required]),
       group: new FormControl('', [Validators.required]),
@@ -141,8 +141,6 @@ export class UserCardComponent implements OnInit {
   }
 
   ngOnInit() {
-    this.currentFilter = this.route.snapshot.params['tab'] || 'allusers'
-    // console.log('this.currentFilter', this.currentFilter)
     if (this.isApprovals && this.usersData) {
       this.approvalData = this.usersData
       if (this.approvalData && this.approvalData.length > 0) {
@@ -295,7 +293,8 @@ export class UserCardComponent implements OnInit {
     return result
   }
 
-  onEditUser(user: any) {
+  onEditUser(user: any, pnael: any) {
+    pnael.open()
     user.enableEdit = !user.enableEdit
     this.setUserDetails(user)
   }
@@ -364,14 +363,17 @@ export class UserCardComponent implements OnInit {
 
   setUserDetails(user: any) {
     if (user && user.profileDetails) {
-      // this.updateUserDataForm.controls['ehrmsID'].setValue('')
+      if (user.profileDetails.additionalProperties) {
+        if (user.profileDetails.additionalProperties.externalSystemId) {
+          this.updateUserDataForm.controls['ehrmsID'].setValue(user.profileDetails.additionalProperties.externalSystemId)
+        }
+      }
       if (user.profileDetails.professionalDetails) {
-        if (user.profileDetails.professionalDetails.designation) {
-          this.updateUserDataForm.controls['designation'].setValue(user.profileDetails.professionalDetails.designation)
+        if (user.profileDetails.professionalDetails[0].designation) {
+          this.updateUserDataForm.controls['designation'].setValue(user.profileDetails.professionalDetails[0].designation)
         }
         if (user.profileDetails.professionalDetails[0].group) {
           this.updateUserDataForm.controls['group'].setValue(user.profileDetails.professionalDetails[0].group)
-
         }
       }
       if (user.profileDetails.personalDetails) {
@@ -382,7 +384,7 @@ export class UserCardComponent implements OnInit {
           this.updateUserDataForm.controls['mobile'].setValue(user.profileDetails.personalDetails.mobile)
         }
         if (user.profileDetails.personalDetails.gender) {
-          this.updateUserDataForm.controls['gender'].setValue(user.profileDetails.personalDetails.mobile)
+          this.updateUserDataForm.controls['gender'].setValue(user.profileDetails.personalDetails.gender)
         }
         if (user.profileDetails.personalDetails.dob) {
           // this.updateUserDataForm.controls['dob'].setValue(user.profileDetails.personalDetails.dob)
@@ -730,4 +732,15 @@ export class UserCardComponent implements OnInit {
         this.openSnackbar(err.error.params.errmsg)
       })
   }
+
+  confirmReassign(template: any, user: any) {
+    const dialog = this.dialog.open(template, {
+      width: '500px',
+    })
+    dialog.afterClosed().subscribe((v: any) => {
+      if (v) {
+        this.markStatus('NOT-VERIFIED', user)
+      }
+    })
+  }
 }
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
index e52f90168..6d7772475 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
@@ -32,7 +32,7 @@
       </div>
 
       <div class="input-container">
-        <div class="label">Designation</div>
+        <div class="label required">Designation</div>
         <mat-form-field class="profile-form-field">
           <div class="flex flex-row auto-complete-row">
             <input type="text" class="input-text" aria-label="Designation" matInput formControlName="designation"
@@ -50,7 +50,7 @@
 
     <div class="flex flex-row gap-6">
       <div class="input-container">
-        <div class="label">Group</div>
+        <div class="label required">Group</div>
         <mat-form-field class="profile-form-field">
           <mat-select formControlName="group">
             <mat-option value="">Choose a group</mat-option>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
index 53348f646..0cf9b0fd1 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
@@ -52,8 +52,8 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
     firstName: new FormControl('', [Validators.required]),
     phone: new FormControl('', [Validators.required, Validators.pattern(MOBILE_PATTERN), Validators.minLength(10)]),
     channel: new FormControl(''),
-    designation: new FormControl(''),
-    group: new FormControl(''),
+    designation: new FormControl('', [Validators.required]),
+    group: new FormControl('', [Validators.required]),
     dob: new FormControl(''),
     domicileMedium: new FormControl(''),
     gender: new FormControl(''),
@@ -122,7 +122,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((_res: any) => {
         this.masterData['designation'] = _res.responseData
         this.masterData['designationBackup'] = _res.responseData
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch designation details, please try again later!')
         }
@@ -135,7 +135,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((res: any) => {
         this.masterData['language'] = res.languages
         this.masterData['languageBackup'] = res.languages
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch master language details, please try again later!')
         }
@@ -147,7 +147,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
         this.masterData['group'] = res.result.response
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch group data, please try again later!')
         }
@@ -165,7 +165,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
             this.masterData['mdoRoles'] = mdoArray.roles
           }
         }
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch roles list, please try again later!')
         }
@@ -237,7 +237,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((_res: any) => {
         this.matSnackBar.open('User created successfully!')
         this.handleFormClear()
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open(_.get(_err, 'error.params.errmsg') || 'Unable to create user, please try again later!')
         }
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index 978af357d..eca83b5bb 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -65,10 +65,10 @@
             mat-button (click)="filter('nonverified'); tabTelemetry('nonverified', 0)" role="button">Non-verified
             ({{nonverifiedUsersDataCount}})</a>
 
-          <!-- <a routerLink="/app/home/users/notmyuser" routerLinkActive="router-link-active" class="filter-option"
+          <a routerLink="/app/home/users/notmyuser" routerLinkActive="router-link-active" class="filter-option"
             [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'notmyuser','ws-mat-accent-border font-medium':currentFilter !== 'notmyuser'}"
             mat-button (click)="filter('notmyuser'); tabTelemetry('notmyuser', 0)" role="button">Not my user
-            ({{notmyuserUsersDataCount}})</a> -->
+            ({{notmyuserUsersDataCount}})</a>
         </div>
       </div>
       <!-- <ws-widget-org-user-table-v2 [userId]="currentUser" [tableData]="tabledata" [data]="dataForTable"
@@ -78,45 +78,29 @@
       </ws-widget-org-user-table-v2> -->
 
       <ng-container *ngIf="currentFilter === 'allusers'">
-        <!-- <div *ngIf="activeUsersDataCount > 0"> -->
         <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="activeUsersData"
           [totalRecords]="activeUsersDataCount" [tabChangeIndex]="pageIndex" [isApprovals]="false"
           (searchByEnterKey)="onEnterkySearch($event)" (paginationData)="onPaginateChange($event)"
           (updateList)="getUsers('')"></ws-widget-user-card>
-        <!-- </div> -->
-        <!-- <p class="margin-top-l margin-bottom-l" *ngIf="activeUsersDataCount === 0">No users found</p> -->
       </ng-container>
       <ng-container *ngIf="currentFilter === 'verified'">
-        <!-- <div *ngIf="verifiedUsersDataCount > 0"> -->
         <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="verifiedUsersData"
           [totalRecords]="verifiedUsersDataCount" [tabChangeIndex]="pageIndex"
           (searchByEnterKey)="onEnterkySearch($event)" (paginationData)="onPaginateChange($event)"
           (updateList)="getVUsers('')"></ws-widget-user-card>
-        <!-- </div> -->
-        <!-- <p class="margin-top-l margin-bottom-l" *ngIf="verifiedUsersDataCount === 0">No users found</p> -->
       </ng-container>
       <ng-container *ngIf="currentFilter === 'nonverified'">
-        <!-- <div *ngIf="nonverifiedUsersDataCount > 0"> -->
         <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="nonverifiedUsersData"
           [totalRecords]="nonverifiedUsersDataCount" [tabChangeIndex]="pageIndex"
           (searchByEnterKey)="onEnterkySearch($event)" (paginationData)="onPaginateChange($event)"
           (updateList)="getNVUsers('')"></ws-widget-user-card>
-        <!-- </div> -->
-        <!-- <p class="margin-top-l margin-bottom-l" *ngIf="nonverifiedUsersDataCount === 0">No users found</p> -->
       </ng-container>
-      <!-- <ng-container *ngIf="usersData && currentFilter === 'notmyuser'">
-        <div *ngIf="usersData?.count > 0">
-          <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="usersData"
-            [totalRecords]="notmyuserUsersDataCount" [tabChangeIndex]="pageIndex"
-            (searchByEnterKey)="onEnterkySearch($event)"
-            (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
-        </div>
-        <p class="margin-top-l margin-bottom-l" *ngIf="usersData?.count === 0">No users found</p>
-      </ng-container> -->
-
-      <!-- <ng-container *ngIf="currentFilter === 'upload'">
-        <ws-app-users-upload></ws-app-users-upload>
-      </ng-container> -->
+      <ng-container *ngIf="currentFilter === 'notmyuser'">
+        <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="notmyuserUsersData"
+          [totalRecords]="notmyuserUsersDataCount" [tabChangeIndex]="pageIndex"
+          (searchByEnterKey)="onEnterkySearch($event)" (paginationData)="onPaginateChange($event)"
+          (updateList)="getNMUsers('')"></ws-widget-user-card>
+      </ng-container>
     </mat-card-content>
   </mat-card>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index be184d24b..6a9f8d60c 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -104,6 +104,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     this.getAllUsers('')
     this.getVUsers('')
     this.getNVUsers('')
+    this.getNMUsers('')
 
     this.reportsNoteList = [
       `Easily create users individually or in bulk.`,
@@ -159,6 +160,8 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       this.getVUsers(query)
     } else if (this.currentFilter === 'nonverified') {
       this.getNVUsers(query)
+    } else if (this.currentFilter === 'notmyuser') {
+      this.getNMUsers(query)
     }
   }
 
@@ -262,6 +265,20 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     })
   }
 
+  async getNMUsers(query: string) {
+    this.loaderService.changeLoad.next(true)
+    const filtreq = {
+      rootOrgId: this.rootOrgId,
+      'profileDetails.profileStatus': 'NOT-MY-USER',
+    }
+
+    this.usersService.getAllKongUsers(filtreq, this.limit, this.pageIndex, query).subscribe((data: any) => {
+      const allusersData = data.result.response
+      this.notmyuserUsersData = allusersData.content
+      this.notmyuserUsersDataCount = data.result.response.count
+    })
+  }
+
   clickHandler(event: any) {
     switch (event.type) {
       case 'createUser':

From cebdb1ad7f5932c5d0c17be4e8eec5fd835add81 Mon Sep 17 00:00:00 2001
From: Haritest <haridasksd@gmail.com>
Date: Tue, 21 May 2024 16:40:55 +0530
Subject: [PATCH 611/887] Update Dockerfile node version updated

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index b533e6b03..e1d06adf6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:14.15
+FROM node:16.20.2
 
 WORKDIR /app
 COPY . .

From 765ae2bafe1142e9f2620864a229edbea9e53c3b Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Tue, 21 May 2024 17:00:08 +0530
Subject: [PATCH 612/887] Lint fixes & mapping updated

---
 .../components/user-cards/user-card.component.html     |  8 +++++++-
 .../home/components/user-cards/user-card.component.ts  | 10 +++++++++-
 .../single-user-creation.component.ts                  | 10 +++++-----
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 70bb86bcd..bd78e3945 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -36,8 +36,14 @@
               &&
               user?.profileDetails?.professionalDetails[0]?.designation ?
               user?.profileDetails?.professionalDetails[0]?.designation : '-'}}</div>
-            <div class="mat-caption ws-mat-black40-text" *ngIf="user?.profileDetails?.profileStatus === 'VERIFIED'">
+            <div class="mat-caption ws-mat-black40-text"
+              *ngIf="user?.profileDetails?.profileStatus === 'VERIFIED' && user?.profileDetails?.profileStatusVerifiedOn">
               Verified on: {{user?.profileDetails?.profileStatusVerifiedOn | date: 'dd/MM/yyyy'}}</div>
+            <div class="mat-caption ws-mat-black40-text"
+              *ngIf="user?.profileDetails?.profileStatus !== 'VERIFIED' && user?.profileDetails?.profileStatusVerifiedOn">
+              Marked on: {{user?.profileDetails?.profileStatusVerifiedOn | date: 'dd/MM/yyyy'}}</div>
+            <div class="mat-caption ws-mat-black40-text" *ngIf="!user?.profileDetails?.profileStatusVerifiedOn">
+              -</div>
           </div>
         </div>
         <div class="float-right" *ngIf="isMdoAdmin || isMdoLeader">
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index cceb16e54..21dd3ee0c 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -384,7 +384,15 @@ export class UserCardComponent implements OnInit {
           this.updateUserDataForm.controls['mobile'].setValue(user.profileDetails.personalDetails.mobile)
         }
         if (user.profileDetails.personalDetails.gender) {
-          this.updateUserDataForm.controls['gender'].setValue(user.profileDetails.personalDetails.gender)
+          if (user.profileDetails.personalDetails.gender === 'FEMALE') {
+            this.updateUserDataForm.controls['gender'].setValue('Female')
+          } else if (user.profileDetails.personalDetails.gender === 'MALE') {
+            this.updateUserDataForm.controls['gender'].setValue('Male')
+          } else if (user.profileDetails.personalDetails.gender === 'OTHERS') {
+            this.updateUserDataForm.controls['gender'].setValue('Others')
+          } else {
+            this.updateUserDataForm.controls['gender'].setValue(user.profileDetails.personalDetails.gender)
+          }
         }
         if (user.profileDetails.personalDetails.dob) {
           // this.updateUserDataForm.controls['dob'].setValue(user.profileDetails.personalDetails.dob)
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
index 0cf9b0fd1..ac920682e 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
@@ -122,7 +122,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((_res: any) => {
         this.masterData['designation'] = _res.responseData
         this.masterData['designationBackup'] = _res.responseData
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch designation details, please try again later!')
         }
@@ -135,7 +135,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((res: any) => {
         this.masterData['language'] = res.languages
         this.masterData['languageBackup'] = res.languages
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch master language details, please try again later!')
         }
@@ -147,7 +147,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
         this.masterData['group'] = res.result.response
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch group data, please try again later!')
         }
@@ -165,7 +165,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
             this.masterData['mdoRoles'] = mdoArray.roles
           }
         }
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch roles list, please try again later!')
         }
@@ -237,7 +237,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((_res: any) => {
         this.matSnackBar.open('User created successfully!')
         this.handleFormClear()
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open(_.get(_err, 'error.params.errmsg') || 'Unable to create user, please try again later!')
         }

From a741e582eac674b6b997eba15eb291693b3c4344 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Tue, 21 May 2024 17:44:05 +0530
Subject: [PATCH 613/887] Updated bulk download url

---
 .../users-view/bulk-upload/bulk-upload.component.ts   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts
index e4a18d5e4..5ee2ace34 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts
@@ -67,7 +67,8 @@ export class BulkUploadComponent implements OnInit, AfterViewInit, OnDestroy {
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
         this.lastUploadList = res.result.content
-      },         (error: HttpErrorResponse) => {
+        // tslint:disable-next-line
+      }, (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open('Unable to get Bulk status list')
         }
@@ -83,7 +84,7 @@ export class BulkUploadComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   handleDownloadFile(listObj: any): void {
-    const filePath = `/apis/proxies/v8/workflow/admin/bulkuploadfile/download/${listObj.fileName}`
+    const filePath = `/apis/proxies/v8/user/v1/bulkuser/download/${listObj.fileName}`
     window.open(filePath, '_blank')
   }
 
@@ -109,7 +110,8 @@ export class BulkUploadComponent implements OnInit, AfterViewInit, OnDestroy {
         if (!resendFlag) {
           this.verifyOTP(contactType)
         }
-      },         (error: HttpErrorResponse) => {
+        // tslint:disable-next-line
+      }, (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open(_.get(error, 'error.params.errmsg') || `Unable to send OTP to your ${contactType}, please try again later!`)
         }
@@ -157,7 +159,8 @@ export class BulkUploadComponent implements OnInit, AfterViewInit, OnDestroy {
             this.fileName = ''
             this.fileSelected = ''
             this.getBulkStatusList()
-          },         (_err: HttpErrorResponse) => {
+            // tslint:disable-next-line
+          }, (_err: HttpErrorResponse) => {
             if (!_err.ok) {
               this.matSnackBar.open('Uploading CSV file failed due to some error, please try again later!')
             }

From 807227dd222075e40db3fecf401c34bdbeaf909b Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Tue, 21 May 2024 18:07:07 +0530
Subject: [PATCH 614/887] Lint fix

---
 .../home/components/user-cards/user-card.component.ts       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 21dd3ee0c..9f545e9fe 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -106,9 +106,9 @@ export class UserCardComponent implements OnInit {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-    private dialog: MatDialog, private approvalSvc: ApprovalsService,
-    private route: ActivatedRoute, private snackBar: MatSnackBar,
-    private events: EventService) {
+              private dialog: MatDialog, private approvalSvc: ApprovalsService,
+              private route: ActivatedRoute, private snackBar: MatSnackBar,
+              private events: EventService) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', [Validators.required]),
       group: new FormControl('', [Validators.required]),

From afece4674dbcf702905375f7c899dd87a342c76a Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Tue, 21 May 2024 20:04:38 +0530
Subject: [PATCH 615/887] update for logout issue

---
 .../routes/public/public-contact/public-contact.component.ts | 5 ++++-
 .../routes/public/public-logout/public-logout.component.ts   | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/app/routes/public/public-contact/public-contact.component.ts b/src/app/routes/public/public-contact/public-contact.component.ts
index 1106998e1..13439cbc3 100644
--- a/src/app/routes/public/public-contact/public-contact.component.ts
+++ b/src/app/routes/public/public-contact/public-contact.component.ts
@@ -20,7 +20,10 @@ export class PublicContactComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     this.subscriptionContact = this.activateRoute.data.subscribe(data => {
-      this.contactPage = data.pageData.data
+      if (data && data.pageData && data.pageData.data) {
+        this.contactPage = data.pageData.data
+      }
+
     })
     if (this.configSvc.instanceConfig) {
       this.contactUsMail = this.configSvc.instanceConfig.mailIds.contactUs
diff --git a/src/app/routes/public/public-logout/public-logout.component.ts b/src/app/routes/public/public-logout/public-logout.component.ts
index 0fb4a50fb..f98a64013 100644
--- a/src/app/routes/public/public-logout/public-logout.component.ts
+++ b/src/app/routes/public/public-logout/public-logout.component.ts
@@ -24,7 +24,9 @@ export class PublicLogoutComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     this.subscriptionContact = this.activateRoute.data.subscribe(data => {
-      this.contactPage = data.pageData.data
+      if (data && data.pageData && data.pageData.data) {
+        this.contactPage = data.pageData.data
+      }
     })
     if (this.configSvc.instanceConfig) {
       this.contactUsMail = this.configSvc.instanceConfig.mailIds.contactUs

From 4fc9e1d2d616d3e42987ef4744e0a42a33dfa332 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Wed, 22 May 2024 11:56:18 +0530
Subject: [PATCH 616/887] Fixed 4703

---
 .../src/lib/routes/home/components/search/search.component.html | 2 +-
 .../src/lib/routes/home/components/search/search.component.ts   | 1 +
 .../routes/home/components/user-cards/user-card.component.html  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.html b/project/ws/app/src/lib/routes/home/components/search/search.component.html
index d65651107..c9de039cc 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.html
@@ -17,7 +17,7 @@
             Apply Filter <mat-icon class="margin-right-xs">filter_list</mat-icon>
         </button>
     </div>
-    <div class="flex flex-end" *ngIf="!isApprovals">
+    <div class="flex flex-end" *ngIf="!isApprovals && currentFilter === 'allusers'">
         <button mat-button type="button" class="search-btn" [routerLink]="['/app/home/user-creation']"
             [ngClass]="{'disable': isContentLive}">Create user</button>
     </div>
diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.ts b/project/ws/app/src/lib/routes/home/components/search/search.component.ts
index 886651b84..b61456324 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.ts
@@ -15,6 +15,7 @@ export class SearchComponent implements OnInit {
   @Input() isApprovals: any
   @Input() showApproveALL: any
   @Input() disableApproveALL: any
+  @Input() currentFilter: any
   @Output() handleApiData = new EventEmitter()
   @Output() handleapproveAll = new EventEmitter()
   searchText = ''
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index bd78e3945..bba4619e9 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -1,6 +1,6 @@
 <div class="searchfilter" *ngIf="!isApprovals">
   <ws-app-searchuser (handleApiData)="onSearch($event)" (handleapproveAll)="onApproveALL()"
-    [showApproveALL]="showApproveALL"></ws-app-searchuser>
+    [showApproveALL]="showApproveALL" [currentFilter]="currentFilter"></ws-app-searchuser>
 </div>
 
 <div *ngIf="!isApprovals">

From 950aceed635df2f99c3a957e40e1262acd5f3095 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Wed, 22 May 2024 12:13:44 +0530
Subject: [PATCH 617/887] Fixed 4706

---
 .../single-user-creation.component.ts            | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
index ac920682e..73adfbf1f 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
@@ -26,9 +26,9 @@ export const MY_FORMATS = {
   },
 }
 
-const EMAIL_PATTERN = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/
-const MOBILE_PATTERN = /^[0]?[6789]\d{9}$/
-const PIN_CODE_PATTERN = /^[1-9][0-9]{5}$/
+const EMAIL_PATTERN = `^[\\w\-\\.]+@([\\w-]+\\.)+[\\w-]{2,4}$`
+const MOBILE_PATTERN = '^((\\+91-?)|0)?[0-9]{10}$'
+const PIN_CODE_PATTERN = '(^[0-9]{6}$)'
 
 @Component({
   selector: 'ws-single-user-creation',
@@ -122,7 +122,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((_res: any) => {
         this.masterData['designation'] = _res.responseData
         this.masterData['designationBackup'] = _res.responseData
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch designation details, please try again later!')
         }
@@ -135,7 +135,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((res: any) => {
         this.masterData['language'] = res.languages
         this.masterData['languageBackup'] = res.languages
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch master language details, please try again later!')
         }
@@ -147,7 +147,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
         this.masterData['group'] = res.result.response
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch group data, please try again later!')
         }
@@ -165,7 +165,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
             this.masterData['mdoRoles'] = mdoArray.roles
           }
         }
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch roles list, please try again later!')
         }
@@ -237,7 +237,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((_res: any) => {
         this.matSnackBar.open('User created successfully!')
         this.handleFormClear()
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open(_.get(_err, 'error.params.errmsg') || 'Unable to create user, please try again later!')
         }

From 0a806a5dafbf3f7018fab62564495b4ffb74bbf0 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Thu, 23 May 2024 12:20:44 +0530
Subject: [PATCH 618/887] Sorted bulk list, updated edit button, fullname
 validation in user creation

---
 .../components/user-cards/user-card.component.html     |  2 +-
 .../approvals/bulk-upload/bulk-upload.component.html   |  2 +-
 .../approvals/bulk-upload/bulk-upload.component.scss   |  1 +
 .../users-view/bulk-upload/bulk-upload.component.html  |  9 +++++----
 .../users-view/bulk-upload/bulk-upload.component.scss  |  1 +
 .../single-user-creation.component.html                | 10 +++++++---
 .../single-user-creation.component.ts                  |  3 ++-
 .../user-creation/user-creation.component.html         |  2 +-
 8 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index bba4619e9..ebc343145 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -48,7 +48,7 @@
         </div>
         <div class="float-right" *ngIf="isMdoAdmin || isMdoLeader">
           <div class="button margin-top-m mat-body" (click)="onEditUser(user, panel);$event.stopPropagation();"
-            *ngIf="currentFilter !== 'notmyuser'">
+            *ngIf="currentFilter !== 'notmyuser' && !user?.enableEdit">
             <mat-icon>edit</mat-icon> Edit
           </div>
           <div class="button margin-top-m mat-body" (click)="confirmReassign(confirm, user);$event.stopPropagation();"
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
index 2e9547c29..fd329b046 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
@@ -51,7 +51,7 @@
 
   <div class="text-base font-bold">File logs</div>
   <div class="flex flex-col gap-6">
-    <div class="file-container" *ngFor="let list of lastUploadList | slice:startIndex:lastIndex">
+    <div class="file-container" *ngFor="let list of lastUploadList | orderBy:'datecreatedon':'desc'">
       <div class="flex flex-col gap-4">
         <div class="flex flex-row justify-between items-center">
           <div class="flex flex-row gap-1">
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.scss b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.scss
index 9c0ba6f35..e3a57ab3e 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.scss
@@ -15,6 +15,7 @@
     font-size: 14px;
     line-height: 18px;
     color: rgba($color: #000000, $alpha: 0.88);
+    word-break: break-all;
   }
 
   .outline-button {
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
index 2bc3ea598..85ea79f52 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
@@ -1,6 +1,6 @@
 <div class="flex flex-col gap-6">
   <div class="flex flex-col gap-4 bulk-container">
-    <div class="flex font-bold">Bulk user creation</div>
+    <div class="flex font-bold">Bulk creation</div>
     <div class="flex flex-row gap-8">
       <div class="flex-1">
         <div class="flex flex-col gap-3 dashed-card">
@@ -46,13 +46,14 @@
 
   <div class="text-base font-bold">File logs</div>
   <div class="flex flex-col gap-6">
-    <div class="file-container" *ngFor="let list of lastUploadList | slice:startIndex:lastIndex">
+    <div class="file-container" *ngFor="let list of lastUploadList | orderBy:'dateCreatedOn':'desc'">
       <div class="flex flex-col gap-4">
         <div class="flex flex-row justify-between items-center">
           <div class="flex flex-row gap-1">
             <div class="font-bold">File Information</div>
           </div>
-          <div class="flex flex-row gap-2 outline-button items-center" (click)="handleDownloadFile(list)">
+          <div class="flex flex-row gap-2 outline-button items-center" *ngIf="list?.status !== 'SUCCESSFUL'"
+            (click)="handleDownloadFile(list)">
             <mat-icon>download_2</mat-icon>
             Download error log
           </div>
@@ -85,7 +86,7 @@
             <div class="value">{{ list?.dateCreatedOn | date: 'dd MMM yyyy h:mm a' }}</div>
           </div>
           <div class="flex flex-col">
-            <div class="label">Completed ON</div>
+            <div class="label">Completed On</div>
             <div class="value">{{ list?.dateUpdatedOn | date: 'dd MMM yyyy h:mm a' }}</div>
           </div>
         </div>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.scss b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.scss
index 9c0ba6f35..e3a57ab3e 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.scss
@@ -15,6 +15,7 @@
     font-size: 14px;
     line-height: 18px;
     color: rgba($color: #000000, $alpha: 0.88);
+    word-break: break-all;
   }
 
   .outline-button {
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
index 6d7772475..a13f4fa74 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
@@ -5,10 +5,14 @@
     <div class="flex flex-row gap-6">
       <div class="input-container">
         <div class="label required">Full name</div>
-        <input type="text" class="input-text" formControlName="firstName" placeholder="Type here" />
+        <input type="text" class="input-text" formControlName="firstName" placeholder="Type here" maxlength="50" />
         <mat-error class="text-xs"
-          *ngIf="userCreationForm?.get('firstName')?.touched && userCreationForm?.get('firstName')?.invalid">
-          Please enter your full name
+          *ngIf="userCreationForm?.get('firstName')?.touched && userCreationForm?.controls['firstName'].errors?.pattern">
+          Please enter a valid name
+        </mat-error>
+        <mat-error class="text-xs"
+          *ngIf="userCreationForm?.get('firstName')?.touched && userCreationForm?.controls['firstName'].errors?.required">
+          Full name is mandatory
         </mat-error>
       </div>
       <div class="input-container">
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
index 73adfbf1f..60fe3986c 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
@@ -47,9 +47,10 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
   masterData: any = {}
   rolesArr: string[] = []
   fullProfile: any
+  namePatern = `^[a-zA-Z\\s\\']{1,50}$`
   userCreationForm = this.formBuilder.group({
     email: new FormControl('', [Validators.required, Validators.pattern(EMAIL_PATTERN)]),
-    firstName: new FormControl('', [Validators.required]),
+    firstName: new FormControl('', [Validators.required, Validators.pattern(this.namePatern)]),
     phone: new FormControl('', [Validators.required, Validators.pattern(MOBILE_PATTERN), Validators.minLength(10)]),
     channel: new FormControl(''),
     designation: new FormControl('', [Validators.required]),
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/user-creation/user-creation.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/user-creation/user-creation.component.html
index f92e90538..5bdbf2315 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/user-creation/user-creation.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/user-creation/user-creation.component.html
@@ -1,7 +1,7 @@
 <div class="flex flex-col gap-6">
   <div class="flex flex-row gap-4 items-center">
     <mat-icon class="cursor-pointer" [routerLink]="['/app/home/users/all-users']">arrow_back</mat-icon>
-    <div class="flex font-bold">User Creation&nbsp;/&nbsp;{{ tabSelected }}</div>
+    <div class="flex font-bold">User creation</div>
   </div>
 
   <mat-tab-group class="user-creation-mat-group" (selectedTabChange)="handleTabChanged($event)">

From dc51002138b4dfb50cb9608750af20444a76a2fd Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Thu, 23 May 2024 15:46:26 +0530
Subject: [PATCH 619/887] Fixed 4805, 4719

---
 .../home/components/user-cards/user-card.component.ts | 11 ++++++-----
 .../user-creation/user-creation.component.html        |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 9f545e9fe..193b76bf1 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -106,9 +106,9 @@ export class UserCardComponent implements OnInit {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-              private dialog: MatDialog, private approvalSvc: ApprovalsService,
-              private route: ActivatedRoute, private snackBar: MatSnackBar,
-              private events: EventService) {
+    private dialog: MatDialog, private approvalSvc: ApprovalsService,
+    private route: ActivatedRoute, private snackBar: MatSnackBar,
+    private events: EventService) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', [Validators.required]),
       group: new FormControl('', [Validators.required]),
@@ -556,7 +556,6 @@ export class UserCardComponent implements OnInit {
       // }
       this.usersSvc.updateUserDetails(this.reqbody).subscribe(dres => {
         if (dres) {
-          this.openSnackbar('User updated Successfully')
           if (this.isMdoLeader) {
             if (form.value.roles !== this.orguserRoles) {
               const dreq = {
@@ -570,7 +569,8 @@ export class UserCardComponent implements OnInit {
               this.usersSvc.addUserToDepartment(dreq).subscribe(res => {
                 if (res) {
                   this.updateUserDataForm.reset({ roles: '' })
-                  this.openSnackbar('User role updated Successfully')
+                  // this.openSnackbar('User role updated Successfully')q
+                  this.openSnackbar('User updated Successfully')
                   panel.close()
                   this.updateList.emit()
                   // this.router.navigate(['/app/home/users/allusers'])
@@ -592,6 +592,7 @@ export class UserCardComponent implements OnInit {
 
             panel.close()
             this.updateList.emit()
+            this.openSnackbar('User updated Successfully')
             // this.usersSvc.getUserById(user.userId).subscribe((res: any) => {
             //   if (res) {
             //     // tslint:disable-next-line
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/user-creation/user-creation.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/user-creation/user-creation.component.html
index 5bdbf2315..7da492a37 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/user-creation/user-creation.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/user-creation/user-creation.component.html
@@ -1,6 +1,6 @@
 <div class="flex flex-col gap-6">
   <div class="flex flex-row gap-4 items-center">
-    <mat-icon class="cursor-pointer" [routerLink]="['/app/home/users/all-users']">arrow_back</mat-icon>
+    <mat-icon class="cursor-pointer" [routerLink]="['/app/home/users/allusers']">arrow_back</mat-icon>
     <div class="flex font-bold">User creation</div>
   </div>
 

From 34835f6896906c15f352adf4bdd0d16bfe8e1b14 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Thu, 23 May 2024 17:40:56 +0530
Subject: [PATCH 620/887] Fixed upload format file

---
 .../routes/approvals/bulk-upload/bulk-upload.component.html | 6 +++---
 .../users-view/bulk-upload/bulk-upload.component.html       | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
index fd329b046..55e2cb526 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
@@ -15,7 +15,7 @@
               <li>Download the Sample File ZIP.</li>
               <li>Fill in user details in the Sample File.</li>
               <li>Verify via OTP.</li>
-              <li>Upload the populated sample csv file.</li>
+              <li>Upload the populated sample file.</li>
               <li>Check the upload results for confirmation.</li>
             </ol>
           </div>
@@ -30,7 +30,7 @@
             (dblclick)="$event.preventDefault()">
             <img src="/assets/icons/csv-file.svg" alt="CSV file logo" />
           </div>
-          <div *ngIf="showFileError" class="error-msg">Upload CSV format file only</div>
+          <div *ngIf="showFileError" class="error-msg">Upload xsls format file only</div>
           <div class="flex flex-col items-center">
             <div class="text-primary cursor-pointer" (click)="fileInput.click()" (dblclick)="$event.preventDefault()">
               Browse files</div>
@@ -42,7 +42,7 @@
           </div>
           <div class="flex flex-col items-center margin-bottom-m">
             <div class="flex">Max file size: 100 MB</div>
-            <div class="flex">Supported file types: CSV</div>
+            <div class="flex">Supported file types: xsls</div>
           </div>
         </div>
       </div>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
index 85ea79f52..6ac832d37 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
@@ -10,7 +10,7 @@
               <li>Download the Sample File ZIP.</li>
               <li>Fill in user details in the Sample File.</li>
               <li>Verify via OTP.</li>
-              <li>Upload the populated sample csv file.</li>
+              <li>Upload the populated sample file.</li>
               <li>Check the upload results for confirmation.</li>
             </ol>
           </div>
@@ -25,7 +25,7 @@
             (dblclick)="$event.preventDefault()">
             <img src="/assets/icons/csv-file.svg" alt="CSV file logo" />
           </div>
-          <div *ngIf="showFileError" class="error-msg">Upload CSV format file only</div>
+          <div *ngIf="showFileError" class="error-msg">Upload xsls format file only</div>
           <div class="flex flex-col items-center">
             <div class="text-primary cursor-pointer" (click)="fileInput.click()" (dblclick)="$event.preventDefault()">
               Browse files</div>
@@ -37,7 +37,7 @@
           </div>
           <div class="flex flex-col items-center margin-bottom-m">
             <div class="flex">Max file size: 100 MB</div>
-            <div class="flex">Supported file types: CSV</div>
+            <div class="flex">Supported file types: xsls</div>
           </div>
         </div>
       </div>

From 1817a57c5d0c0e5a0f1451badb58b3deb696df00 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Fri, 24 May 2024 10:50:46 +0530
Subject: [PATCH 621/887] Updated verfied date parameter

---
 .../user-cards/user-card.component.html       | 11 ++++----
 .../routes/users-view/users-view.component.ts | 27 -------------------
 2 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index ebc343145..490536515 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -36,13 +36,12 @@
               &&
               user?.profileDetails?.professionalDetails[0]?.designation ?
               user?.profileDetails?.professionalDetails[0]?.designation : '-'}}</div>
-            <div class="mat-caption ws-mat-black40-text"
+            <!-- <div class="mat-caption ws-mat-black40-text"
               *ngIf="user?.profileDetails?.profileStatus === 'VERIFIED' && user?.profileDetails?.profileStatusVerifiedOn">
-              Verified on: {{user?.profileDetails?.profileStatusVerifiedOn | date: 'dd/MM/yyyy'}}</div>
-            <div class="mat-caption ws-mat-black40-text"
-              *ngIf="user?.profileDetails?.profileStatus !== 'VERIFIED' && user?.profileDetails?.profileStatusVerifiedOn">
-              Marked on: {{user?.profileDetails?.profileStatusVerifiedOn | date: 'dd/MM/yyyy'}}</div>
-            <div class="mat-caption ws-mat-black40-text" *ngIf="!user?.profileDetails?.profileStatusVerifiedOn">
+              Verified on: {{user?.profileDetails?.profileStatusUpdatedOn | date: 'dd/MM/yyyy'}}</div> -->
+            <div class="mat-caption ws-mat-black40-text" *ngIf="user?.profileDetails?.profileStatusUpdatedOn">
+              Marked on: {{user?.profileDetails?.profileStatusUpdatedOn | date: 'dd/MM/yyyy'}}</div>
+            <div class="mat-caption ws-mat-black40-text" *ngIf="!user?.profileDetails?.profileStatusUpdatedOn">
               -</div>
           </div>
         </div>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 6a9f8d60c..a74dd8de7 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -206,33 +206,6 @@ export class UsersViewComponent implements OnInit, OnDestroy {
 
     this.usersService.getAllKongUsers(filtreq, this.limit, this.pageIndex, query).subscribe((data: any) => {
       const allusersData = data.result.response
-      // if (allusersData && allusersData.content && allusersData.content.length > 0) {
-      //   _.filter(allusersData.content, { isDeleted: false }).forEach((user: any) => {
-      //     // tslint:disable-next-line
-      //     const org = { roles: _.get(_.first(_.filter(user.organisations,
-      // { organisationId: _.get(this.configSvc, 'unMappedUser.rootOrg.id') })), 'roles') }
-      //     usersData.push({
-      //       fullname: user ? `${user.firstName}` : null,
-      //       // fullname: user ? `${user.firstName} ${user.lastName}` : null,
-      //       email: user.personalDetails && user.personalDetails.primaryEmail ?
-      //         this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
-      //       role: org.roles || [],
-      //       userId: user.id,
-      //       active: !user.isDeleted,
-      //       blocked: user.blocked,
-      //       roles: _.join(_.map((org.roles || []), i => `<li>${i}</li>`), ''),
-      //       orgId: user.rootOrgId,
-      //       orgName: user.rootOrgName,
-      //       allowEditUser: this.showEditUser(org.roles),
-      //     })
-      //   })
-
-      //   usersData.sort((a: any, b: any) => {
-      //     const textA = a.fullname.toUpperCase()
-      //     const textB = b.fullname.toUpperCase()
-      //     return (textA < textB) ? -1 : (textA > textB) ? 1 : 0
-      //   })
-      // }
       this.activeUsersData = allusersData.content
       this.activeUsersDataCount = data.result.response.count
     })

From e5a9b356e946f388c8be4cb34b3150e12682761f Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Fri, 24 May 2024 12:01:33 +0530
Subject: [PATCH 622/887] bulck-upload otp poup ui issue fix

---
 .../home/components/user-cards/user-card.component.scss       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
index f8c903a95..5a9e64588 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
@@ -288,7 +288,7 @@ label {
   }
 }
 
-::ng-deep .rejection-modal {
+:host ::ng-deep .rejection-modal {
   .mat-dialog-container {
     padding: 0px !important;
   }
@@ -308,7 +308,7 @@ label {
   vertical-align: middle;
   color: #666 !important;
 }
-::ng-deep .mat-dialog-container {
+:host ::ng-deep .mat-dialog-container {
   padding: 0 !important;
   overflow: unset !important;
 }

From 0134b982e6b93a468d298191adc3973ca5457b5c Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Fri, 24 May 2024 12:25:50 +0530
Subject: [PATCH 623/887] Added thisis my user toggle

---
 .../routes/home/components/user-cards/user-card.component.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 490536515..08f7e0b76 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -63,6 +63,9 @@
               <mat-slide-toggle (click)="markStatus('NOT-VERIFIED', user)">Mark this user as
                 non-verified</mat-slide-toggle>
             </p>
+            <p class="float-right mat-body-2" *ngIf="user?.profileDetails?.profileStatus === 'NOT-VERIFIED'">
+              <mat-slide-toggle (click)="markStatus('VERIFIED', user)">This is my user</mat-slide-toggle>
+            </p>
             <div class="flex flex-row margin-top-m">
               <div class="md:w-1/3">
                 <label class="margin-remove-bottom form-label required">Group</label>

From 607512cc5198f045005650662a5132b4ee6ae387 Mon Sep 17 00:00:00 2001
From: sohail amjad <sohail.amjad@tarento.com>
Date: Fri, 24 May 2024 12:58:45 +0530
Subject: [PATCH 624/887] resolved

---
 .../assign-list-popup.component.html          |  46 ++
 .../assign-list-popup.component.scss          |  22 +
 .../assign-list-popup.component.spec.ts       |  25 +
 .../assign-list-popup.component.ts            |  51 ++
 .../competency-view.component.html            |  62 ++
 .../competency-view.component.scss            | 143 +++++
 .../competency-view.component.spec.ts         |  25 +
 .../competency-view.component.ts              |  59 ++
 .../create-request-form.component.html        | 176 ++++--
 .../create-request-form.component.scss        |  58 ++
 .../create-request-form.component.ts          | 556 +++++++++++++-----
 .../request-list/request-list.component.html  |  15 +-
 .../request-list/request-list.component.scss  |  31 +-
 .../request-list/request-list.component.ts    | 220 ++++++-
 .../ws/app/src/lib/routes/home/home.module.ts |   6 +
 .../lib/routes/home/services/home.servive.ts  |  17 +-
 16 files changed, 1321 insertions(+), 191 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.html
 create mode 100644 project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.scss
 create mode 100644 project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.ts
 create mode 100644 project/ws/app/src/lib/routes/home/components/request-list/competency-view/competency-view.component.html
 create mode 100644 project/ws/app/src/lib/routes/home/components/request-list/competency-view/competency-view.component.scss
 create mode 100644 project/ws/app/src/lib/routes/home/components/request-list/competency-view/competency-view.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/home/components/request-list/competency-view/competency-view.component.ts

diff --git a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.html b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.html
new file mode 100644
index 000000000..ec78acb00
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.html
@@ -0,0 +1,46 @@
+<div class="main-container">
+    <h2>Assign</h2>
+    <div class="full-table-container">
+        <form [formGroup]="requestForm">
+            <mat-radio-group formControlName="assignee">
+                <table mat-table [dataSource]="providers" class="mat-elevation-z8 full-height">
+    
+                    <!-- Radio Button Column -->
+                    <ng-container matColumnDef="select">
+                        <th mat-header-cell *matHeaderCellDef></th>
+                        <td mat-cell *matCellDef="let provider">
+                            <mat-radio-button [value]="provider.orgName"></mat-radio-button>
+                        </td>
+                    </ng-container>
+    
+                    <!-- Provider Name Column -->
+                    <ng-container matColumnDef="providerName">
+                        <th mat-header-cell *matHeaderCellDef>Provider Name</th>
+                        <td mat-cell *matCellDef="let provider">{{ provider.orgName }}</td>
+                    </ng-container>
+    
+                    <!-- Details Column -->
+                    <ng-container matColumnDef="details">
+                        <th mat-header-cell *matHeaderCellDef>Details</th>
+                        <td mat-cell *matCellDef="let provider">{{ provider.details }}</td>
+                    </ng-container>
+    
+                    <!-- ETA Column -->
+                    <ng-container matColumnDef="eta">
+                        <th mat-header-cell *matHeaderCellDef>ETA</th>
+                        <td mat-cell *matCellDef="let provider">{{ provider.eta | date }}</td>
+                    </ng-container>
+    
+                    <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+                    <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
+                </table>
+            </mat-radio-group>
+    
+            <div class="actions">
+                <button mat-raised-button color="primary" (click)="assign()">Assign</button>
+                <button mat-raised-button color="accent" (click)="cancel()">Cancel</button>
+            </div>
+        </form>
+    </div>
+  </div>
+  
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.scss b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.scss
new file mode 100644
index 000000000..c183040db
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.scss
@@ -0,0 +1,22 @@
+.main-container {
+    width: 100%;
+    height: 100%;
+  }
+  ::ng-deep {
+  table {
+    width: 100%;
+    margin-bottom: 16px; 
+  }
+}
+
+.mat-elevation-z8 {
+    box-shadow: none !important;
+ }
+
+  
+  .actions {
+    display: flex;
+    justify-content: flex-end;
+    gap: 8px;
+  }
+  
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.spec.ts b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.spec.ts
new file mode 100644
index 000000000..f43fe4df6
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
+
+import { AssignListPopupComponent } from './assign-list-popup.component'
+
+describe('AssignListPopupComponent', () => {
+  let component: AssignListPopupComponent
+  let fixture: ComponentFixture<AssignListPopupComponent>
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [AssignListPopupComponent],
+    })
+    .compileComponents()
+  }))
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AssignListPopupComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
+
+  it('should create', () => {
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.ts
new file mode 100644
index 000000000..2b07ed41f
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.ts
@@ -0,0 +1,51 @@
+import { Component, OnInit } from '@angular/core'
+import { FormBuilder, FormControl, FormGroup } from '@angular/forms'
+
+@Component({
+  selector: 'ws-app-assign-list-popup',
+  templateUrl: './assign-list-popup.component.html',
+  styleUrls: ['./assign-list-popup.component.scss'],
+})
+export class AssignListPopupComponent implements OnInit {
+  requestForm!: FormGroup
+  providers = [
+    { orgName: 'Microsoft',
+     details: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec suscipit orci in ultricies aliq.',
+      eta: new Date('2024-02-21') },
+    { orgName: 'Google',
+     details: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec suscipit orci in ultricies aliq.',
+     eta: new Date('2024-02-21') },
+    { orgName: 'IBM',
+     details: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec suscipit orci in ultricies aliq.',
+      eta: new Date('2024-02-21') },
+    { orgName: 'ISB',
+     details: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec suscipit orci in ultricies aliq.',
+      eta: new Date('2024-02-21') },
+    { orgName: 'CP',
+     details: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec suscipit orci in ultricies aliq.',
+      eta: new Date('2024-02-21') },
+  ]
+  displayedColumns: string[] = ['select', 'providerName', 'details', 'eta']
+
+  constructor(private fb: FormBuilder) {}
+
+  ngOnInit() {
+    this.requestForm = this.fb.group({
+      assignee: new FormControl(''),
+    })
+  }
+
+  assign() {
+    const selectedProvider = this.requestForm.value.assignee
+    if (selectedProvider) {
+      // Implement your assign logic here
+    } else {
+    }
+  }
+
+  cancel() {
+    this.requestForm.reset()
+    // Implement your cancel logic here
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/competency-view/competency-view.component.html b/project/ws/app/src/lib/routes/home/components/request-list/competency-view/competency-view.component.html
new file mode 100644
index 000000000..a4466459a
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/components/request-list/competency-view/competency-view.component.html
@@ -0,0 +1,62 @@
+<mat-card class="competency-view-card" *ngIf="dData && dData.name">
+    <mat-card-content class="flex flex-1 custom">
+      <span class="mat-h2 font-medium">{{dData.name}}</span>
+      <h3 class="mat-h3">{{dData.description}}</h3>
+      <div class="flex">
+        <h3 class="mat-h3">Competency type: &nbsp;</h3>
+        <span class="mat-h3 font-medium">{{dData?.additionalProperties?.competencyType || dData?.competencyType}}</span>
+      </div>
+      <div>
+        <mat-radio-group class="flex tgl-group margin-top-s flex-wrap level-group-container" aria-label="Select an option"
+          name="competencyLevel" [(ngModel)]="levelSelected" *ngIf="dData?.children.length > 0">
+          <mat-radio-button matInput [name]="'radio-' + item.id" color="banner"
+            class="example-radio-button w-full mb-5 pt-3 pl-5 pr-5" *ngFor="let item of dData?.children" [value]="item">
+            <span class="pl-2 pt-3">{{item.level}}</span>
+            <span class="mat-body-1 ws-mat-black60-text" [innerHtml]="item.formatedText"></span>
+          </mat-radio-button>
+        </mat-radio-group>
+      </div>
+    </mat-card-content>
+    <mat-card-actions class="flex flex-row-reverse responsive">
+      <div class="mb-2 ml-2 mr-2 ws-mat-accent-text view-all wid-auro">
+        <a href="javascript:void(0)" mat-button mat-dialog-close i18n-aria-label class="flex">
+          <span i18n>{{'Close'}}</span>
+        </a>
+      </div>
+      <div class="mb-2 view-all wid-auro others text-white">
+        <a href="javascript:void(0)" mat-button i18n-aria-label  (click)="remove()">
+          <span i18n>{{'Remove'}}</span>
+        </a>
+
+      </div>
+    </mat-card-actions>
+  </mat-card>
+  
+  <mat-card class="competency-view-card" *ngIf="dData && !dData.name">
+    <mat-card-content class="flex flex-1 custom margin-remove">
+      <div class="flex">
+        <h3 class="mat-h3">Competency area: &nbsp;</h3>
+        <span class="mat-h3 font-medium">{{dData.competencyArea}}</span>
+      </div>
+      <div class="flex">
+        <h3 class="mat-h3">Competency theme: &nbsp;</h3>
+        <span class="mat-h3 font-medium">{{dData?.competencyTheme}}</span>
+      </div>
+      <div class="flex">
+        <h3 class="mat-h3">Competency subtheme: &nbsp;</h3>
+        <span class="mat-h3 font-medium">{{dData?.competencySubTheme}}</span>
+      </div>
+    </mat-card-content>
+    <mat-card-actions class="flex flex-row-reverse responsive">
+      <div class="mb-2 ml-2 mr-2 ws-mat-accent-text view-all wid-auro">
+        <a href="javascript:void(0)" mat-button mat-dialog-close i18n-aria-label class="flex">
+          <span i18n>{{'Close'}}</span>
+        </a>
+      </div>
+      <div class="mb-2 view-all wid-auro others text-white">
+        <a href="javascript:void(0)" mat-button i18n-aria-label  (click)="remove()">
+          <span i18n>{{'Remove'}}</span>
+        </a>
+      </div>
+    </mat-card-actions>
+  </mat-card>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/competency-view/competency-view.component.scss b/project/ws/app/src/lib/routes/home/components/request-list/competency-view/competency-view.component.scss
new file mode 100644
index 000000000..e48e8b2fc
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/components/request-list/competency-view/competency-view.component.scss
@@ -0,0 +1,143 @@
+@import 'ws-common';
+@import 'ws-vars';
+@import 'ws-mixins';
+
+.competency-view-card {
+  flex: 1;
+  height: auto;
+  min-width: 346px;
+  min-width: 346px;
+  box-shadow: none !important;
+  height: fit-content;
+  min-height: -webkit-fill-available;
+
+  // width: max-content;
+  @include breakpoint-xs {
+    width: auto;
+    min-width: auto;
+  }
+}
+
+.responsive {
+  @include breakpoint-xs {
+    flex-direction: column-reverse;
+  }
+}
+
+.wid-auro {
+  width: fit-content;
+
+  @include breakpoint-xs {
+    margin-left: auto !important;
+    margin-right: auto !important;
+  }
+}
+
+.others {
+  background: #0074B6 0% 0% no-repeat padding-box;
+  border-radius: 4px;
+
+  @include breakpoint-xs {
+    margin: auto !important;
+    margin-left: 1rem;
+  }
+}
+
+.font-medium {
+  font-weight: 500 !important;
+}
+
+.dot:before {
+  content: '•';
+  margin: 1rem;
+}
+
+.mobile {
+  @include breakpoint-xs {
+    flex: 1;
+  }
+
+  @include breakpoint-s {
+    flex: 1;
+  }
+}
+
+.mobile2 {
+  @include breakpoint-xs {
+    margin-top: $size-s;
+  }
+
+  // @include breakpoint-s {
+  //   margin-top: $size-s;
+  // }
+}
+
+.tag {
+  display: flex;
+  margin: 0 10px;
+  padding: 3px 15px;
+  font-size: 12px;
+  min-width: 50px;
+  justify-content: center;
+  border-radius: 20px 5px 5px 20px;
+}
+
+.noocoments {
+  flex: 1;
+  text-align: right;
+  margin-right: $size-m;
+}
+
+.custom {
+  flex-direction: column;
+
+  @include breakpoint-xs {
+    flex-direction: column;
+  }
+}
+
+.custom-reverse {
+  flex-direction: column;
+
+  @include breakpoint-xs {
+    flex-direction: column;
+  }
+}
+
+.view-all {
+  display: flex;
+  // margin: 0 auto;
+  border: 1px solid;
+  box-shadow: 0px 10px 30p;
+  border-radius: 4px;
+  // border-color: lightgrey;
+}
+
+.add-comp {
+  right: 0;
+  display: flex;
+  position: absolute;
+  top: 0;
+  height: 48px;
+  width: 48px;
+  background: rgb(29, 137, 35) !important;
+}
+
+.margin-0 {
+  margin: 0;
+}
+
+.pad-4 {
+  padding: 4px;
+}
+
+.example-header-image {
+  // background-image: url('https://material.angular.io/assets/img/examples/shiba1.jpg');
+  background-size: cover;
+}
+
+.level-group-container {
+  height: 250px !important;
+  overflow: hidden;
+  overflow-y: auto;
+}
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/competency-view/competency-view.component.spec.ts b/project/ws/app/src/lib/routes/home/components/request-list/competency-view/competency-view.component.spec.ts
new file mode 100644
index 000000000..22140c1a0
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/components/request-list/competency-view/competency-view.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
+
+import { CompetencyViewComponent } from './competency-view.component'
+
+describe('CompetencyViewComponent', () => {
+  let component: CompetencyViewComponent
+  let fixture: ComponentFixture<CompetencyViewComponent>
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [CompetencyViewComponent],
+    })
+    .compileComponents()
+  }))
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CompetencyViewComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
+
+  it('should create', () => {
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/competency-view/competency-view.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/competency-view/competency-view.component.ts
new file mode 100644
index 000000000..8cb4b3581
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/components/request-list/competency-view/competency-view.component.ts
@@ -0,0 +1,59 @@
+import { Component, Inject, OnInit } from '@angular/core'
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'
+import { DomSanitizer, SafeHtml } from '@angular/platform-browser'
+
+@Component({
+  selector: 'ws-app-competency-view',
+  templateUrl: './competency-view.component.html',
+  styleUrls: ['./competency-view.component.scss'],
+})
+export class CompetencyViewComponent implements OnInit {
+
+  levelSelected: any
+  constructor(
+    public dialogRef: MatDialogRef<CompetencyViewComponent>,
+    private sanitized: DomSanitizer,
+    @Inject(MAT_DIALOG_DATA) public dData: any
+  ) { }
+  ngOnInit() {
+    if (this.dData && this.dData.children && this.dData.children.length > 0) {
+      if (this.dData.selectedLevelId) {
+        this.levelSelected = this.dData.children.filter((v: any) => v.id === this.dData.selectedLevelId)[0]
+      } else {
+        this.levelSelected = this.dData.children[0]
+      }
+      this.dData.children.forEach((element: any) => {
+        element['formatedText'] = this.formate(element.description)
+      })
+    }
+  }
+  add() {
+    this.dialogRef.close({
+      id: this.dData.id,
+      action: 'ADD',
+      childId: (this.levelSelected && Object.keys(this.levelSelected).length > 0) ? this.levelSelected.id : '',
+    })
+  }
+  remove() {
+    this.dialogRef.close({
+      id: this.dData.id || this.dData,
+      action: 'DELETE',
+    })
+  }
+
+  formate(text: string): SafeHtml {
+    let newText = '<ul class="pl-6">'
+    if (text) {
+      const splitTest = text.split('•')
+      for (let index = 0; index < text.split('•').length; index += 1) {
+        const text1 = splitTest[index]
+        if (text1 && text1.trim()) {
+          newText += `<li>${text1.trim()}</li>`
+        }
+      }
+    }
+    newText += `</ul>`
+    return this.sanitized.bypassSecurityTrustHtml(newText)
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
index 886d84e41..b7c128c12 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
@@ -9,9 +9,13 @@
           </div>
         </div>
       </mat-card-header> -->
-      <mat-card-title class="flex-4 mobile-margin mat-h2 title-request">
-        Request Content
-      </mat-card-title>
+      <span class="flex">
+        <mat-icon class="arrow-btn" (click)="navigateBack()">arrow_back</mat-icon>
+        <mat-card-title class="flex-4 mobile-margin mat-h2 title-request">
+          {{isHideData ? 'Go Back':'Request Content'}}
+        </mat-card-title>
+      </span>
+      
       <mat-card-content>
         <div class="form-element">
             <form [formGroup]="requestForm">
@@ -62,7 +66,7 @@
                 <div class="title-name">
                     <div class="fonm-element-label label-text">Type of user</div>
                     <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
-                        <input class="w-full" matInput placeholder="Enter Objective" formControlName="userType" maxlength="500">
+                        <input class="w-full" matInput placeholder="Enter Type of user" formControlName="userType" maxlength="500">
                         <mat-hint align="end">{{ requestForm.controls['userType'].value.length }} / 500</mat-hint>                    
                         <mat-error
                         *ngIf="requestForm.controls['userType'].hasError('minlength') && !requestForm.controls['userType'].errors?.pattern"
@@ -82,7 +86,7 @@
                     <div class="fonm-element-label label-text">Learning Mode</div>
                     <div class="mt-5">
                     <mat-radio-group aria-label="Select an option" formControlName="learningMode" >
-                        <mat-radio-button class="learning-section"  *ngFor="let item of learningList"  [value]="item"  >{{item}}</mat-radio-button>
+                        <mat-radio-button class="learning-section"  *ngFor="let item of learningList"  [value]="item.key"  >{{item.name}}</mat-radio-button>
                     
                       </mat-radio-group>
                     </div>
@@ -90,7 +94,7 @@
                 
                 <div class="title-name">
                     <span class="comp-heading">Targeted Competencies</span>
-                    <div>
+                    <!-- <div>
                         <div class="fonm-element-label label-text">Competency Area</div>
                         <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
                             <mat-select placeholder="Select Area" formControlName="compArea" (selectionChange)="onAreaSelection($event)">
@@ -99,8 +103,109 @@
                                 </mat-option>
                             </mat-select>
                         </mat-form-field>
+                    </div> -->
+
+                    <div class="flex-1">
+                      <div class="margin-bottom-m">
+                        <p class="mat-subheading-2">Competency Area</p>
+                        <ng-container *ngIf="filteredallCompetencies">
+                          <mat-radio-group name="competencyArea" class="flex tgl-group margin-top-s flex-wrap"
+                          formControlName="compArea">
+                            <mat-radio-button matInput [name]="'radio-' + option.name"
+                              class="flex flex-row itm-center ws-mat-accent-border margin-right-s"
+                              *ngFor="let option of filteredallCompetencies" [value]="option.name"
+                              (change)="compAreaSelected(option)">
+                              <span class="mat-body-2">{{option.name}}</span>
+                            </mat-radio-button>
+                          </mat-radio-group>
+                        </ng-container>
+                      </div>
+    
+                  <div class="margin-bottom-m" *ngIf="allCompetencyTheme && allCompetencyTheme.length > 0">
+                        <p class="mat-subheading-2">Competency Theme</p>
+                        <div class="flex flex-1 flex-row margin-fix search">
+                          <mat-form-field appearance="outline" class="autocomplete-form" color="primary"
+                            [floatLabel]="'never'">
+                            <mat-icon matPrefix class="search-home flex items-center justify-center">search</mat-icon>
+                            <mat-label>Search</mat-label>
+                            <input type="search" #searchInput class="ml-2 flex-1" i18n-placeholder="search"
+                              [placeholder]="'Search'" i18-aria-label aria-label="Search" matInput
+                              formControlName="queryThemeControl" maxlength="50"
+                              (keyup)="updateQuery('theme')" />
+                          </mat-form-field>
+                          <button class="margin-top-s" mat-icon-button (click)="resetSearch('theme')">
+                            <mat-icon>refresh</mat-icon>
+                          </button>
+                        </div>
+                        <div>
+                          <span class="display-inline-block complabels mat-caption cursor-pointer"
+                            [ngClass]="{active: (seletedCompetencyTheme && option.id === seletedCompetencyTheme.id)}"
+                            (click)="compThemeSelected(option)"
+                            *ngFor="let option of filteredallCompetencyTheme">{{option.name}}</span>
+                        </div>
+                      </div>
+    
+                       <div class="margin-bottom-m" *ngIf="allCompetencySubtheme && allCompetencySubtheme.length > 0">
+                        <p class="mat-subheading-2">Competency Sub theme</p>
+                        <div class="flex flex-1 flex-row margin-fix search">
+                          <mat-form-field appearance="outline" class="autocomplete-form" color="primary"
+                            [floatLabel]="'never'">
+                            <mat-icon matPrefix class="search-home flex items-center justify-center">search</mat-icon>
+                            <mat-label>Search</mat-label>
+                            <input type="search" #searchInput class="ml-2 flex-1" i18n-placeholder="search"
+                              [placeholder]="'Search'" i18-aria-label aria-label="Search" matInput
+                              formControlName="querySubThemeControl" maxlength="50"
+                              (keyup)="updateQuery('subtheme')" />
+                          </mat-form-field>
+                          <button class="margin-top-s" mat-icon-button (click)="resetSearch('subtheme')">
+                            <mat-icon>refresh</mat-icon>
+                          </button>
+                        </div>
+                        <div>
+                          <span class="display-inline-block complabels mat-caption cursor-pointer"
+                            [ngClass]="{active: (seletedCompetencySubTheme && option.id === seletedCompetencySubTheme.id)}"
+                            (click)="compSubThemeSelected(option)"
+                            *ngFor="let option of filteredallCompetencySubtheme">{{option.name}}</span>
+                        </div>
+                      </div> 
+    
+                      <div class="margin-bottom-l">
+                        <button mat-raised-button type="button"
+                          class="ws-mat-default-text ws-mat-accent-border-active compbutton"
+                          [disabled]="!enableCompetencyAdd" (click)="addCompetency()">
+                          <span class="mat-subheading-2 padding-xs" i18n style="vertical-align: unset;">Add</span>
+                        </button>
+                      </div>
                     </div>
-                <div *ngIf="allCompetencyTheme && allCompetencyTheme.length > 0">
+                      <div class="flex new-mobile">
+                <div class="flex-1" >
+                  <div class="flex flex-1" *ngIf="requestForm.controls?.competencies_v5?.value?.length > 0">
+                    <table class="compt-table width-1-1 text-left margin-bottom-xl" cellspacing="0">
+                      <tr>
+                        <th class="padding-xs ws-mat-black60-text mat-body-1">Area</th>
+                        <th class="padding-xs ws-mat-black60-text mat-body-1">Theme</th>
+                        <th class="padding-xs ws-mat-black60-text mat-body-1">Sub theme</th>
+                      </tr>
+                      <tr   *ngFor="let comp of requestForm.controls?.competencies_v5?.value"  [attr.disabled]="isHideData ? true : null" (click)=view(comp)>
+                        <td  class="padding-xs mat-body-1 cursor-pointer">{{comp.competencyArea}}</td>
+                        <td class="padding-xs mat-body-1 cursor-pointer">{{comp.competencyTheme || comp.name}}</td>
+                        <td class="padding-xs mat-body-1 cursor-pointer">{{comp.competencySubTheme ||
+                          comp.selectedLevelLevel}}</td>
+                      </tr>
+                    </table>
+                  </div>
+                </div>
+                <div class="" *ngIf="showSaveButton() && isEditEnabled"> 
+                  <button mat-raised-button type="button" style="line-height: 48px;"
+                  class="ws-mat-default-text ws-mat-accent-border-active"
+                  (click)="!requestForm.invalid ? data.emit('save') : showToasterMessage('mandatoryFields')">
+                  <span class="mat-subheading-2 padding-xs" i18n style="vertical-align: unset;">Save</span>
+                </button>
+                </div>
+              </div>
+
+           <!-- //old design -->
+                <!-- <div *ngIf="allCompetencyTheme && allCompetencyTheme.length > 0">
                     <div class="fonm-element-label label-text">Competency Theme</div>
                     <mat-form-field appearance="outline" class="w-full" fxFlex="40">
                         <mat-label>Select theme</mat-label>
@@ -129,14 +234,6 @@
                       
                         </mat-select>
                       </mat-form-field>
-                    
-                    <!-- <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
-                        <mat-select placeholder="Select Competency Theme" formControlName="compTheme" (selectionChange)="onThemeSelection($event)">
-                            <mat-option *ngFor="let option of allCompetencyTheme" [value]="option">
-                                {{option.name}}
-                            </mat-option>
-                        </mat-select>
-                    </mat-form-field> -->
                 </div>
 
                 <div *ngIf="allCompetencySubtheme && allCompetencySubtheme.length > 0">
@@ -169,14 +266,8 @@
                         </mat-select>
                       </mat-form-field>
 
-                    <!-- <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
-                        <mat-select placeholder="Select Competency sub-Theme" formControlName="compSubTheme" >
-                            <mat-option *ngFor="let option of allCompetencySubtheme" [value]="option">
-                                {{option.name}}
-                            </mat-option>
-                        </mat-select>
-                    </mat-form-field> -->
-                </div>
+                  
+                </div> -->
                 </div>
                 <!-- <div class="title-name">
                    
@@ -204,29 +295,10 @@
                     <div class="">
                         <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
                             <mat-select placeholder="Choose the Assignee" formControlName="assignee">
-                          
-                              <!-- <mat-select-trigger>
-                                <mat-chip-list>
-                                  <mat-chip 
-                                    [removable]="true" (removed)="onProviderRemoved(requestForm.get('assignee').value)">
-                                    {{ requestForm.get('assignee').value.orgName}}
-                                    <mat-icon matChipRemove>cancel</mat-icon>
-                                  </mat-chip>
-                                </mat-chip-list>
-                                {{requestForm.get('compTheme').value}}
-                              </mat-select-trigger> -->
-                          
                               <mat-option *ngFor="let option of requestTypeData" [value]="option">{{option.orgName}}</mat-option>
                           
                             </mat-select>
                           </mat-form-field>
-                        <!-- <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
-                            <mat-select placeholder="Choose the Assignee" formControlName="assignee" >
-                                <mat-option *ngFor="let option of requestTypeData"  [value]="option">
-                                    {{option.orgName}}
-                                </mat-option>
-                            </mat-select>
-                        </mat-form-field> -->
                     </div>
                 </div>
                 <div class="title-name" *ngIf="isBroadCast">
@@ -235,7 +307,7 @@
                         <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
                             <mat-select placeholder="Choose the provider" (openedChange)="openedChange($event,'providerText')" formControlName="providers"  multiple>
                           
-                              <mat-select-trigger>
+                              <mat-select-trigger [ngClass]="{'disbaledSelect':isHideData}">
                                 <mat-chip-list>
                                   <mat-chip *ngFor="let item of requestForm.get('providers').value"
                                     [removable]="true" (removed)="onProviderRemoved(item)">
@@ -255,26 +327,24 @@
                               <mat-optgroup *ngIf="filteredRequestType.length === 0">
                                 <div>No results found!</div>
                               </mat-optgroup>
-                          
+                              <!-- <mat-option *ngFor="let option of requestObjData.preferredProvider" [value]="option.providerName">{{option.providerName}}</mat-option> -->
                               <mat-option *ngFor="let option of filteredRequestType" [value]="option">{{option.orgName}}</mat-option>
                           
                             </mat-select>
                           </mat-form-field>
-                        <!-- <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
-                            <mat-select placeholder="Choose the provider" formControlName="providers" >
-                                <mat-option *ngFor="let option of requestTypeData" [value]="option">
-                                    {{option.orgName}}
-                                </mat-option>
-                            </mat-select>
-                        </mat-form-field> -->
                     </div>
                 </div>
 
-                <div class="flex flex-start margin-top-l">
-                    <button mat-button class="submit-btn margin-right-xs" type="button" (click)="submit()" [disabled]="!requestForm.valid">Submit</button>
+                <div class="flex flex-start margin-top-l" *ngIf="!isHideData">
+                    <button mat-button class="submit-btn margin-right-xs" type="button" (click)="showConformationPopUp()" [disabled]="!requestForm.valid">Submit</button>
                     <button mat-button class="close-btn " type="button" >Cancel</button>
                    
                   </div>
+
+                  <div class="flex flex-start margin-top-l" *ngIf="isHideData">
+                    <button mat-button class="close-btn" (click)="navigateBack()" type="button" >Cancel</button>
+                   
+                  </div>
             </form>
         </div>
         
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.scss b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.scss
index 0234db31e..2fae81151 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.scss
@@ -2,6 +2,11 @@
     padding: 0.5%;
     .card-section {
         padding: 2%;
+        .arrow-btn {
+          padding-right: 1%;
+          width: 20px;
+          cursor: pointer;
+        }
         .title-request {
             font-family: 'Montserrat';
             font-weight: 600;
@@ -34,6 +39,13 @@
             font-weight: 700;
             line-height: 21px;
           }
+
+          .disbaledSelect {
+           pointer-events: none;
+           cursor: not-allowed;
+          }
+
+          
            
         }
         .title-text {
@@ -90,4 +102,50 @@
   }
   .mat-button[disabled] {
     opacity: 0.6;
+  }
+ .compt-table tr[disabled] {
+    color: #aaa; /* Gray out the text */
+    pointer-events: none; /* Disable pointer events */
+    cursor: not-allowed; /* Change cursor to indicate disabled state */
+  }
+    .compt-table th,
+    .compt-table td {
+      border: 1px solid #eaeaea;
+    
+    }
+  
+  .complabels {
+    color: #ffffff !important;
+    background: #000;
+    padding: 5px 10px;
+    border-radius: 6px;
+    margin: 4px 8px 4px 0;
+  }
+  
+  .complabels.active {
+    background: #ffffff;
+    color: #555555 !important;
+    border: 1px solid #000;
+  }
+
+  .forms-table {
+    border-spacing: 0 6px;
+  
+    tr {
+      background-color: rgba(0, 116, 182, 0.2);
+      border-radius: 4px 4px 4px 4px;
+  
+      td:nth-child(1) {
+        border-radius: 4px 0px 0px 4px;
+      }
+  
+      td:nth-child(2) {
+        border-radius: 0 4px 4px 0px;
+      }
+  
+      .usericon {
+        vertical-align: bottom;
+        padding: 0 4px;
+      }
+    }
   }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
index c74eb185d..fbc17bfc6 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
@@ -1,6 +1,11 @@
 import { Component, OnInit } from '@angular/core'
 import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'
 import { ProfileV2Service } from '../../../services/home.servive'
+import { ActivatedRoute, Router } from '@angular/router'
+import { MatDialog, MatSnackBar } from '@angular/material'
+import { CompetencyViewComponent } from '../competency-view/competency-view.component'
+import { ConfirmationBoxComponent } from '../../../../training-plan/components/confirmation-box/confirmation.box.component'
+import _ from 'lodash'
 
 @Component({
   selector: 'ws-app-create-request-form',
@@ -12,14 +17,24 @@ export class CreateRequestFormComponent implements OnInit {
   specialCharList = `( a-z/A-Z , 0-9 . _ - $ / \ : [ ]' ' !)`
   // tslint:disable-next-line:max-line-length
   noSpecialChar = new RegExp(/^[\u0900-\u097F\u0980-\u09FF\u0C00-\u0C7F\u0B80-\u0BFF\u0C80-\u0CFF\u0D00-\u0D7F\u0A80-\u0AFF\u0B00-\u0B7F\u0A00-\u0A7Fa-zA-Z0-9()$[\]\\.:,_/ -]*$/)
-  learningList = ['Self-paced', 'Instructor-led']
+  // learningList = ['Self-paced', 'Instructor-led']
+  learningList = [
+    {
+      name: 'Self-paced',
+      key: 'self-paced',
+    },
+    {
+      name: 'Instructor-led',
+      key: 'instructor-led',
+    },
+  ]
   requestTypeList = ['Single', 'Broadcast']
   competencyList: any[] = []
   allCompetencyTheme: any[] = []
   seletedCompetencyArea: any
   seletedCompetencyTheme: any = []
   allCompetencySubtheme: any[] = []
-  seletedCompetencySubTheme: any[] = []
+  seletedCompetencySubTheme: any
   requestTypeData: any[] = []
   isAssignee = false
   isBroadCast = false
@@ -27,10 +42,32 @@ export class CreateRequestFormComponent implements OnInit {
   filteredSubTheme: any[] = []
   filteredRequestType: any[] = []
   subthemeCheckedList: any[] = []
-  resData=''
+  resData = ''
+  fullProfile: any
+  userId: any
+  allCompetencies: any[] = []
+  filteredallCompetencies: any[] = []
+  statusValue: any
+  enableCompetencyAdd = false
+  filteredallCompetencyTheme: any = []
+  filteredallCompetencySubtheme: any = []
+  dialogRefs: any
+  demandId: any
+  actionBtnName: any
+  requestObjData: any
+  isHideData = false
+
+  competencyCtrl!: FormControl
+  competencyArea!: FormControl
+  competencyTheme!: FormControl
+  competencySubtheme!: FormControl
 
   constructor(private formBuilder: FormBuilder,
-    private homeService: ProfileV2Service,
+              private homeService: ProfileV2Service,
+              private activatedRouter: ActivatedRoute,
+              private snackBar: MatSnackBar,
+              private router: Router,
+              public dialog: MatDialog,
   ) {
     this.requestForm = this.formBuilder.group({
       TitleName: new FormControl('', [Validators.required, Validators.pattern(this.noSpecialChar), Validators.minLength(10)]),
@@ -38,25 +75,101 @@ export class CreateRequestFormComponent implements OnInit {
       userType:  new FormControl('', [Validators.pattern(this.noSpecialChar)]),
       learningMode:  new FormControl(''),
       compArea: new FormControl(''),
-      compTheme: new FormControl(''),
-      compSubTheme: new FormControl(''),
       referenceLink: new FormControl(''),
       requestType: new FormControl('', Validators.required),
-      assignee: new FormControl(''),
-      providers: new FormControl(''),
-      themeText: new FormControl(''),
-      subthemeText: new FormControl(''),
+      assignee: new FormControl({}),
+      providers: new FormControl([[]]),
       providerText: new FormControl(''),
+      queryThemeControl: new FormControl(''),
+      querySubThemeControl: new FormControl(''),
+      competencies_v5: [],
     })
 
    }
 
   ngOnInit() {
-    this.getFilterEntity()
     this.getRequestTypeList()
+    this.fullProfile = _.get(this.activatedRouter.snapshot, 'data.configService')
+    this.userId = this.fullProfile.userProfile.userId
+    this.competencyArea = new FormControl('')
+    this.competencyTheme = new FormControl('')
+    this.competencySubtheme = new FormControl('')
+
+    this.getFilterEntity()
+
+    this.activatedRouter.queryParams.subscribe(params => {
+      if (params['id']) {
+        this.demandId = params.id
+        this.actionBtnName = params.name
+      }
+    })
 
   }
 
+  getRequestDataById() {
+    this.homeService.getRequestDataById(this.demandId).subscribe((data: any) => {
+     if (data) {
+      this.requestObjData = data
+       this.setRequestData()
+     }
+    }
+  )
+  }
+
+  setRequestData() {
+    this.requestForm.setValue({
+      TitleName: this.requestObjData.title,
+      Objective: this.requestObjData.objective,
+      userType: this.requestObjData.typeOfUser ? this.requestObjData.typeOfUser : '',
+      learningMode: this.requestObjData.learningMode ? this.requestObjData.learningMode : '',
+      competencies_v5: [],
+      referenceLink: this.requestObjData.referenceLink ?  this.requestObjData.referenceLink : '',
+      providers: [],
+      assignee: {},
+      requestType: this.requestObjData.requestType,
+      compArea: '',
+      providerText: '',
+      queryThemeControl: '',
+      querySubThemeControl: '',
+    })
+   const value = this.requestForm.controls.competencies_v5.value || []
+   this.requestObjData.competencies.map((comp: any) => {
+    const obj = {
+      competencyArea: comp.area,
+      competencyTheme: comp.sub_theme,
+      competencySubTheme: comp.theme,
+     }
+     value.push(obj)
+   })
+
+     this.requestForm.controls.competencies_v5.setValue(value)
+
+    this.selectRequestType(this.requestObjData.requestType)
+   if (this.filteredRequestType) {
+    const abc = this.filteredRequestType.filter(option =>
+      this.requestObjData.preferredProvider.some((res: any) =>
+         res.providerName === option.orgName
+    )
+  )
+  this.requestForm.controls['providers'].setValue(abc)
+   }
+
+   if (this.requestTypeData) {
+    if (this.requestObjData.assignedProvider) {
+      const assignData = this.requestTypeData.find(option =>
+        this.requestObjData.assignedProvider.providerName === option.orgName
+       )
+       if (assignData) {
+         this.requestForm.controls['assignee'].setValue(assignData)
+       }
+    }
+   }
+  }
+
+  navigateBack() {
+    this.router.navigateByUrl('/app/home/request-list')
+  }
+
   searchValueData(e: any, searchValue: any) {
     if (searchValue === 'themeText') {
       this.requestForm.controls['themeText'].valueChanges.subscribe((newValue: any) => {
@@ -94,7 +207,12 @@ export class CreateRequestFormComponent implements OnInit {
       },
     }
     this.homeService.getFilterEntity(filterObj).subscribe((res: any) => {
-      this.competencyList = res
+      if (res) {
+        this.competencyList = res
+        this.allCompetencies = res
+          this.filteredallCompetencies = this.allCompetencies
+      }
+
     })
   }
 
@@ -109,6 +227,14 @@ export class CreateRequestFormComponent implements OnInit {
     this.homeService.getRequestTypeList(requestObj).subscribe(data => {
       this.requestTypeData = data
       this.filteredRequestType = [...this.requestTypeData]
+      if (this.demandId) {
+        this.getRequestDataById()
+        if (this.actionBtnName === 'view') {
+          this.requestForm.disable()
+          this.isHideData = true
+        }
+      }
+
     })
   }
 
@@ -116,20 +242,25 @@ export class CreateRequestFormComponent implements OnInit {
    if (item === 'Single') {
      this.isAssignee = true
      this.isBroadCast = false
+     this.statusValue = 'Assigned'
+     this.requestForm.controls['providers'].setValue('')
+     this.requestForm.controls['providers'].clearValidators()
+     this.requestForm.controls['providers'].updateValueAndValidity() //
+     this.requestForm.controls['assignee'].setValidators([Validators.required])
+     this.requestForm.controls['assignee'].updateValueAndValidity()
    } else if (item === 'Broadcast') {
-    this.isBroadCast = true
-    this.isAssignee = false
+    this.statusValue = 'Unassigned'
+     this.isBroadCast = true
+     this.isAssignee = false
+     this.requestForm.controls['assignee'].setValue('')
+     this.requestForm.controls['assignee'].clearValidators()
+     this.requestForm.controls['assignee'].updateValueAndValidity()
+     this.requestForm.controls['providers'].setValidators([Validators.required])
+     this.requestForm.controls['providers'].updateValueAndValidity()
    }
 
   }
 
-  resetCompSubfields() {
-    // this.enableCompetencyAdd = false
-    // this.allCompetencySubtheme = []
-    // this.seletedCompetencyTheme = []
-    // this.seletedCompetencySubTheme = []
-  }
-
   openedChange(e: any, searchControl: any) {
     // Set search textbox value as empty while opening selectbox
     this.requestForm.controls[searchControl].patchValue('')
@@ -145,114 +276,189 @@ export class CreateRequestFormComponent implements OnInit {
     this.requestForm.controls[searchControl].patchValue('')
   }
 
- // on selection change of competency area and assign value to allCompetencyTheme
-  onAreaSelection(option: any) {
-    this.allCompetencySubtheme = []
-    this.filteredSubTheme = []
-    this.allCompetencyTheme = []
-    this.resetCompSubfields()
-    this.competencyList.forEach((val: any) => {
-      if (option.value.name === val.name) {
-        this.seletedCompetencyArea = val
-        // this.allCompetencyTheme = val.children
-        val.children.forEach((item: any) => {
-          item.selected = false
-          this.allCompetencyTheme.push(item)
-          this.filterCompetencyThemes = [...this.allCompetencyTheme]
-        })
+  updateQuery(field: any) {
+    if (field === 'theme') {
+      this.requestForm.controls['queryThemeControl'].valueChanges.subscribe((newValue: any) => {
+        this.filteredallCompetencyTheme = this.filterValues(newValue, this.allCompetencyTheme)
+      })
+      // this.filteredallCompetencyTheme = this.filterValues(key, this.allCompetencyTheme)
+    } else {
+      this.requestForm.controls['querySubThemeControl'].valueChanges.subscribe((newValue: any) => {
+        this.filteredallCompetencySubtheme = this.filterValues(newValue, this.allCompetencySubtheme)
+      })
+      // this.filteredallCompetencySubtheme = this.filterValues(newValue, this.allCompetencySubtheme)
+    }
+  }
+
+  resetSearch(field: any) {
+    if (field === 'theme') {
+      this.requestForm.controls['queryThemeControl'].setValue('')
+      this.filteredallCompetencyTheme = this.allCompetencyTheme
+      if (!this.seletedCompetencySubTheme) {
+        this.filteredallCompetencySubtheme = []
+        this.requestForm.controls['querySubThemeControl'].setValue('')
+      } else {
+        this.requestForm.controls['querySubThemeControl'].setValue('')
       }
-    })
+    } else {
+      this.requestForm.controls['querySubThemeControl'].setValue('')
+      this.filteredallCompetencySubtheme = this.allCompetencySubtheme
+    }
   }
 
-  // On Selection of Competency theme and assign value to filteredSubTheme
-  onThemeSelection(option: any) {
-    this.filteredSubTheme = []
+  resetCompSubfields() {
+    this.enableCompetencyAdd = false
     this.allCompetencySubtheme = []
-    // this.enableCompetencyAdd = false
-    const index = this.seletedCompetencyTheme.findIndex((object: any) => object.name === option.value.name)
-    if (index === -1) {
-      this.allCompetencyTheme.forEach((val: any) => {
-        option.value.forEach((data: any) => {
-          if (data.name === val.name) {
-          val.selected = true
-          this.seletedCompetencyTheme.push(val)
-          val.children.forEach((item: any) => {
-            item.selected = false
-            item.compThemeID = val.id
-            this.allCompetencySubtheme.push(item)
-            this.filteredSubTheme = [...this.allCompetencySubtheme]
-          })
-        }
-        })
-      })
-    } else {
-      this.seletedCompetencyTheme[index].selected = false
+    this.filteredallCompetencyTheme = []
+    this.filteredallCompetencySubtheme = []
+    this.requestForm.controls['queryThemeControl'].setValue('')
+    this.requestForm.controls['querySubThemeControl'].setValue('')
+    this.seletedCompetencyTheme = ''
+    this.seletedCompetencySubTheme = ''
+  }
 
-      const id = this.seletedCompetencyTheme[index].id
-      this.seletedCompetencyTheme.splice(index, 1)
-      if (this.seletedCompetencyTheme.length === 0) {
-        this.seletedCompetencySubTheme = []
-      }
-      this.allCompetencySubtheme = this.allCompetencySubtheme.filter((item: any) => item.compThemeID !== id)
-      this.seletedCompetencySubTheme = this.seletedCompetencySubTheme.filter((item: any) => item.compThemeID !== id)
+ // on selection change of competency area and assign value to allCompetencyTheme
+ compAreaSelected(option: any) {
+  this.resetCompSubfields()
+  this.allCompetencies.forEach((val: any) => {
+    if (option.name === val.name) {
+      this.seletedCompetencyArea = val
+      this.allCompetencyTheme = val.children
+      this.filteredallCompetencyTheme = this.allCompetencyTheme
+
+    }
+  })
+}
+
+compThemeSelected(option: any) {
+  this.enableCompetencyAdd = false
+  this.allCompetencyTheme.forEach((val: any) => {
+    if (option.name === val.name) {
+      this.seletedCompetencyTheme = val
+      this.allCompetencySubtheme = val.children
+      this.filteredallCompetencySubtheme = this.allCompetencySubtheme
+    }
+  })
+}
+
+compSubThemeSelected(option: any) {
+  this.enableCompetencyAdd = true
+  this.allCompetencySubtheme.forEach((val: any) => {
+    if (option.name === val.name) {
+      this.seletedCompetencySubTheme = val
+    }
+  })
+}
+
+resetCompfields() {
+  this.enableCompetencyAdd = false
+  this.requestForm.controls['compArea'].setValue('')
+  this.allCompetencyTheme = []
+  this.allCompetencySubtheme = []
+  this.filteredallCompetencyTheme = []
+  this.filteredallCompetencySubtheme = []
+  this.requestForm.controls['queryThemeControl'].setValue('')
+  this.requestForm.controls['querySubThemeControl'].setValue('')
+}
+
+canPush(arr: any[], obj: any) {
+  for (const item of arr) {
+    // if (test.id === obj.id) {
+    if (item.competencyAreaId === obj.competencyAreaId && item.competencyThemeId === obj.competencyThemeId
+      && item.competencySubThemeId === obj.competencySubThemeId) {
+      return false
     }
   }
+  return true
 
-  onSubThemeSelection(event: any) {
-   this.subthemeCheckedList = [...event.value]
-   this.subthemeCheckedList.forEach((item: any) => {
-      item.checked = true
-   })
+}
 
+refreshData() {
+  const searchObj = {
+    search: {
+      type: 'Competency Area',
+    },
+    filter: {
+      isDetail: true,
+    },
   }
+  this.homeService.getFilterEntity(searchObj).subscribe((response: any) => {
+    if (response) {
+      this.allCompetencies = response
+      this.filteredallCompetencies = this.allCompetencies
+    }
+  })
+}
 
-  onThemeRemoved(theme: any) {
-    this.allCompetencySubtheme = []
-    this.filteredSubTheme = []
-    const compThemeControl = this.requestForm.get('compTheme') as FormControl | null
-    if (compThemeControl) {
-      const themes = compThemeControl.value
-      if (themes) {
-        const index = themes.indexOf(theme)
-        if (index >= 0) {
-          themes.splice(index, 1)
-          compThemeControl.setValue(themes)
-          if (themes.length) {
-            themes.forEach((child: any) => {
-              child.children.forEach((innerChild: any) => {
-                this.allCompetencySubtheme.push(innerChild)
-            this.filteredSubTheme = [...this.allCompetencySubtheme]
-            // const constSubthemeCont = this.requestForm.get('compSubTheme') as FormControl | null
-            // if(constSubthemeCont){
-            //   constSubthemeCont.setValue(this.filteredSubTheme);
-            // }
-
-              })
-            })
-          } else {
-            this.allCompetencySubtheme = []
-            this.filteredSubTheme = []
-          }
+addCompetency() {
+  if (this.seletedCompetencyArea && this.seletedCompetencyTheme && this.seletedCompetencySubTheme) {
+    const obj = {
+      competencyArea: this.seletedCompetencyArea.name,
+      competencyAreaId: this.seletedCompetencyArea.id,
+      competencyAreaDescription: this.seletedCompetencyArea.description,
+      competencyTheme: this.seletedCompetencyTheme.name,
+      competencyThemeId: this.seletedCompetencyTheme.id,
+      competecnyThemeDescription: this.seletedCompetencyTheme.description,
+      competencyThemeType: this.seletedCompetencyTheme.additionalProperties.themeType,
+      competencySubTheme: this.seletedCompetencySubTheme.name,
+      competencySubThemeId: this.seletedCompetencySubTheme.id,
+      competecnySubThemeDescription: this.seletedCompetencySubTheme.description,
+    }
 
-        }
-      }
+    const value = this.requestForm.controls.competencies_v5.value || []
+    if (this.canPush(value, obj)) {
+      value.push(obj)
+      this.requestForm.controls.competencies_v5.setValue(value)
+      this.resetCompfields()
+      this.refreshData()
+    } else {
+      this.snackBar.open('This competency is already added')
+      this.resetCompfields()
     }
   }
 
-  onSubThemeRemoved(theme: any) {
-    const compSubThemeControl = this.requestForm.get('compSubTheme') as FormControl | null
-    if (compSubThemeControl) {
-      const themes = compSubThemeControl.value
-      if (themes) {
-        const index = themes.indexOf(theme)
-        if (index >= 0) {
-          themes.splice(index, 1)
-          compSubThemeControl.setValue(themes)
-        }
+}
+
+removeCompetency(id: any): void {
+  if (id && !id.competencyArea) {
+    const index = _.findIndex(this.requestForm.controls.competencies_v5.value, { id })
+    this.requestForm.controls.competencies_v5.value.splice(index, 1)
+    this.requestForm.controls.competencies_v5.setValue(this.requestForm.controls.competencies_v5.value)
+    this.refreshData()
+  } else {
+    this.requestForm.controls.competencies_v5.value.forEach((item: any, index: any) => {
+      if (item.competencyAreaId === id.competencyAreaId && item.competencyThemeId === id.competencyThemeId
+        && item.competencySubThemeId === id.competencySubThemeId) {
+        this.requestForm.controls.competencies_v5.value.splice(index, 1)
+        this.requestForm.controls.competencies_v5.setValue(this.requestForm.controls.competencies_v5.value)
+        this.refreshData()
       }
-    }
+    })
   }
 
+}
+
+view(item?: any) {
+  // const seletedItem = this.allCompetencies.filter((v: any) => v.id === (item && item.id))[0]
+  // item['children'] = (seletedItem && seletedItem.children) ? seletedItem.children : []
+  const dialogRef = this.dialog.open(CompetencyViewComponent, {
+    // minHeight: 'auto',
+    width: '30%',
+    panelClass: 'remove-pad',
+    data: item,
+    autoFocus: false,
+  })
+  dialogRef.afterClosed().subscribe((response: any) => {
+
+    if (response && response.action === 'ADD') {
+      // this.addCompetency(response)
+      // this.refreshData(this.currentActivePage)
+    } else if (response && response.action === 'DELETE') {
+      this.removeCompetency(response.id)
+    }
+  })
+}
+
   onProviderRemoved(provider: any) {
     const compThemeControl = this.requestForm.get('providers') as FormControl | null
     if (compThemeControl) {
@@ -267,39 +473,127 @@ export class CreateRequestFormComponent implements OnInit {
     }
   }
 
+  showSaveButton() {
+
+  }
+
+  showConformationPopUp() {
+    this.dialogRefs = this.dialog.open(ConfirmationBoxComponent, {
+      disableClose: true,
+      data: {
+        type: 'conformation',
+        icon: 'radio_on',
+        title: 'Are you sure you want to Create a demand?',
+        // subTitle: 'You wont be able to revert this',
+        primaryAction: 'Confirm',
+        secondaryAction: 'Cancel',
+      },
+      autoFocus: false,
+    })
+
+this.dialogRefs.afterClosed().subscribe((_res: any) => {
+  if (_res === 'confirmed') {
+    this.submit()
+  }
+})
+}
+
   submit() {
-    const request = {
+    let providerList: any[] = []
+    if (this.requestForm.value.providers) {
+      providerList = this.requestForm.value.providers.map((item: any) => ({
+        providerName: item.orgName,
+        providerId: item.id,
+      }))
+    }
+    let assigneeProvider: any
+    if (this.requestForm.value.assignee) {
+      assigneeProvider = {
+        providerName: this.requestForm.value.assignee.orgName,
+        providerId: this.requestForm.value.assignee.id,
+      }
+    }
+
+    let competencyDataList: any[] = []
+    if (this.requestForm.value.competencies_v5) {
+      competencyDataList = this.requestForm.value.competencies_v5.map((item: any) => ({
+        area: item.competencyArea,
+        theme: item.competencyTheme,
+        sub_theme: item.competencySubTheme,
+      }))
+    }
+
+    const request: any = {
       title: this.requestForm.value.TitleName,
       objective: this.requestForm.value.Objective,
       typeOfUser: this.requestForm.value.userType,
-      learningMode: this.requestForm.value.learningMode,
-      competencies: {
-        select_area: 'Functional',
-        select_theme: 'Data Science',
-        select_sub_theme: 'Basic',
-      },
+      // learningMode: this.requestForm.value.learningMode.toLowerCase(),
+      competencies: competencyDataList,
       referenceLink: this.requestForm.value.referenceLink,
       requestType: this.requestForm.value.requestType,
-      preferredProvider: [
-        {
-          providerName: 'Provider 1',
-          providerId: '23456',
-        },
-        {
-          providerName: 'Provider 2',
-          providerId: '3456789',
-        },
-      ],
-      status: 'Unassigned',
-      source: 'MDOID',
+      preferredProvider: providerList,
+      assignedProvider: assigneeProvider,
+      status: this.statusValue,
+      source: this.userId,
 
     }
 
+    if (this.requestForm.value.learningMode) {
+      request.learningMode = this.requestForm.value.learningMode.toLowerCase()
+    }
+    this.showDialogBox('progress')
     this.homeService.createDemand(request).subscribe(res => {
-      this.resData =res
+      this.resData = res
+      this.dialogRefs.close()
+      this.showDialogBox('progress-completed')
+
+      setTimeout(() => {
+        this.dialogRefs.close()
+        if (this.resData) {
+          this.router.navigateByUrl('/app/home/request-list')
+      }
+      },         1000)
+    }
+  )
+   }
+
+   showDialogBox(event: any) {
+    const dialogData: any = {}
+    switch (event) {
+      case 'progress':
+        dialogData['type'] = 'progress'
+        dialogData['icon'] = 'vega'
+        dialogData['title'] = 'Processing your request'
+        dialogData['subTitle'] = `Wait a second , your request is processing………`
+        break
+      case 'progress-completed':
+        dialogData['type'] = 'progress-completed'
+        dialogData['icon'] = 'accept_icon'
+        dialogData['title'] = 'Processing your request'
+        dialogData['subTitle'] = `Wait a second , your request is processing………`
+        dialogData['primaryAction'] = 'Redirecting....'
+        break
+    }
 
+    this.openDialoagBox(dialogData)
+  }
+
+  openDialoagBox(dialogData: any) {
+    this.dialogRefs = this.dialog.open(ConfirmationBoxComponent, {
+      disableClose: true,
+      data: {
+        type: dialogData.type,
+        icon: dialogData.icon,
+        title: dialogData.title,
+        subTitle: dialogData.subTitle,
+        primaryAction: dialogData.primaryAction,
+        secondaryAction: dialogData.secondaryAction,
+      },
+      autoFocus: false,
     })
 
+    this.dialogRefs.afterClosed().subscribe(() => {
+    })
   }
 
 }
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
index b38e61c34..58a2de999 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
@@ -24,10 +24,17 @@ <h2>Content Request</h2>
             </div>
         </mat-card-content>
     </mat-card>
-
     <div class="create-action">
         <button mat-button type="button" class="search-btn" [routerLink]="['/app/home/create-request-form']">Request Content</button>
-
-
     </div>
-</div>
\ No newline at end of file
+    
+    <div class="margin-top-l custom-table" *ngIf="requestListData"
+     [ngClass]="{ 'assignedClass':isAssigned }" 
+     > 
+    <ws-widget-org-user-table  [tableData]="tabledata" [data]="requestListData" [actionMenuItem]="pageConfig?.data?.actionMenu"  (actionsClick)="menuSelected($event)" (eOnRowClick)="viewDetails($event)">
+    </ws-widget-org-user-table>
+    <mat-paginator [pageSize]="pageSize" [length]="this.requestCount" [pageSizeOptions]="[20,30,40]"
+    (page)="onChangePage($event)"></mat-paginator>
+</div>
+
+</div>
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.scss b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.scss
index f246e0a55..b261ed110 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.scss
@@ -28,4 +28,33 @@
         border-radius: 4px;
         min-width: 138px;
     }
-  }
\ No newline at end of file
+  }
+
+  ::ng-deep {
+    .custom-table .cdk-column-status .textclass {
+    padding: 10px  !important;
+    border-radius: 10px !important;
+    color: white !important;
+  }
+  .unassignedClass .cdk-column-status .textclass {
+    background-color: #000000 !important;
+    opacity: 60%;
+  }
+  .assignedClass .cdk-column-status .textclass {
+    background-color: #1D8923;
+  }
+  .custom-table .search {
+    display: none !important;
+  }
+  .custom-table .cdk-column-title .textclass {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: initial;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+  }
+  .custom-table .example-container .mat-paginator {
+    display: none !important;
+  }
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
index 95beca751..4ee1fab39 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
@@ -1,5 +1,14 @@
 import { Component, OnInit } from '@angular/core'
 import { DomSanitizer, SafeHtml } from '@angular/platform-browser'
+import { ITableData } from '@sunbird-cb/collection/lib/ui-org-table/interface/interfaces'
+import { ProfileV2Service } from '../../services/home.servive'
+import { DatePipe } from '@angular/common'
+import { ActivatedRoute, Router } from '@angular/router'
+import { MatDialog } from '@angular/material'
+import { ConfirmationBoxComponent } from '../../../training-plan/components/confirmation-box/confirmation.box.component'
+import { AssignListPopupComponent } from './assign-list-popup/assign-list-popup.component'
+import _ from 'lodash'
+
 
 @Component({
   selector: 'ws-app-request-list',
@@ -7,8 +16,50 @@ import { DomSanitizer, SafeHtml } from '@angular/platform-browser'
   styleUrls: ['./request-list.component.scss'],
 })
 export class RequestListComponent implements OnInit {
+  tabledata: ITableData = {
+    columns: [
+      { displayName: 'Request Id', key: 'demand_id' },
+      { displayName: 'Title', key: 'title' },
+      // { displayName: 'Requestor', key: 'batchesCount' },
+      { displayName: 'Request Type', key: 'requestType' },
+      { displayName: 'Request Status', key: 'status' },
+      { displayName: 'Assignee', key: 'assignedProvider' },
+      { displayName: 'Requested On', key: 'createdOn' },
+      // { displayName: 'Interest', key: 'batchesCount' },
+    ],
+    needCheckBox: false,
+    needHash: false,
+    sortColumn: 'fullname',
+    sortState: 'asc',
+    needUserMenus: false,
+    actions: [],
+    actionColumnName: 'Action',
+    cbpPlanMenu: true,
+  }
+  getTableData: any[] = []
+  requestListData: any
+  isUnassigned = false
+  isAssigned = false
+  inProgress = false
+  invalid = false
+  assignProvider: any
+  pageConfig: any
+  configSvc: any
+  dialogRef: any
+  queryParams: any
+  pageNo = 0
+  pageSize = 10
+  requestCount: any
+  invalidRes: any
+  detailsEvent: any
 
-  constructor(private sanitizer: DomSanitizer) { }
+  constructor(private sanitizer: DomSanitizer,
+              private homeService: ProfileV2Service,
+              private datePipe: DatePipe,
+              private activeRoute: ActivatedRoute,
+              private dialog: MatDialog,
+              private router: Router
+  ) { }
   requestList: any[] = [
     `These reports contain Personally Identifiable Information (PII) data.
       Please use them cautiously.`,
@@ -17,9 +68,176 @@ export class RequestListComponent implements OnInit {
   ]
 
   ngOnInit() {
+    this.configSvc = this.activeRoute.snapshot.data['configService']
+    this.getRequestList()
+    this.pageConfig = this.activeRoute.snapshot.data['pageData']
+    this.hasAccess()
+    // this.tableData =
+
+  }
+
+  hasAccess() {
+    let flag = false
+    if (this.pageConfig && this.pageConfig.data && this.pageConfig.data.actionMenu) {
+      this.pageConfig.data.actionMenu.map((_v: any) => {
+        flag = false
+        _v.enabledFor.forEach((ele: any) => {
+          if (this.configSvc.userRoles.has(ele)) {
+            flag = true
+            if (ele === 'mdo_leader') {
+              _v.isMdoLeader = true
+            }
+            if (ele === 'mdo_admin') {
+              _v.isMdoAdmin = true
+            }
+          }
+        })
+        _v.userAccess = flag
+      })
+    }
+  }
+
+  menuSelected(_event: any) {
+  switch (_event.action) {
+    case 'viewContent':
+
+      this.queryParams = {
+      id: _event.row.demand_id,
+      name: 'view',
+    }
+      this.router.navigate(['/app/home/create-request-form'], { queryParams: this.queryParams })
+      break
+    case 'invalidContent':
+      this.showConformationModal(_event.row, _event.action)
+      break
+    case 'assignContent':
+       this.openAssignlistPopup()
+      break
+    case 'reAssignContent':
+      // this.showConformationModal(_event.row, _event.action)
+      break
+    case 'copyContent':
+        this.queryParams = {
+          id: _event.row.demand_id,
+          name: 'copy',
+        }
+          this.router.navigate(['/app/home/create-request-form'], { queryParams: this.queryParams })
+      break
+  }
+
+  }
+
+  onChangePage(event: any) {
+  this.pageNo = event.pageIndex
+  this.pageSize = event.pageSize
+  this.getRequestList()
+  }
+
+  showConformationModal(_selectedRow: any, _type: any) {
+    this.dialogRef = this.dialog.open(ConfirmationBoxComponent, {
+      disableClose: true,
+      data: {
+        type: 'conformation',
+        icon: 'radio_on',
+        title: (_type === 'invalidContent') ? 'Are you sure you want to mark this as invalid.' :
+          (_type === 'publishContent') ? 'Are you sure you want to publish the plan?' : '',
+        subTitle: '',
+        primaryAction: 'Yes',
+        secondaryAction: 'No',
+      },
+      autoFocus: false,
+    })
+
+    this.dialogRef.afterClosed().subscribe((_res: any) => {
+      if (_res === 'confirmed') {
+        if (_type === 'invalidContent') {
+          this.invalidContent(_selectedRow)
+        }
+        //  else if (_type === 'publishContent') {
+        //   this.publishContentData(_selectedRow)
+        // }
+      }
+    })
   }
+
+  invalidContent(row: any) {
+   const request = {
+    demand_id: row.demand_id,
+    newStatus: 'Invalid',
+   }
+   this.homeService.markAsInvalid(request).subscribe(res => {
+     this.invalidRes = res
+     this.getRequestList()
+    }
+  )
+
+  }
+
+  openAssignlistPopup() {
+    this.dialogRef = this.dialog.open(AssignListPopupComponent, {
+      disableClose: false,
+      width: '90%',
+      height: '70vh',
+      data: {},
+      autoFocus: false,
+    })
+
+    this.dialogRef.afterClosed().subscribe((_res: any) => {
+      if (_res === 'confirmed') {
+        // if (_type === 'invalidContent') {
+        //   this.invalidContent(_selectedRow)
+        // }
+        //  else if (_type === 'publishContent') {
+        //   this.publishContentData(_selectedRow)
+        // }
+      }
+    })
+  }
+
   sanitizeHtml(html: string): SafeHtml {
     return this.sanitizer.bypassSecurityTrustHtml(html)
   }
 
+  getRequestList() {
+    const request = {
+        filterCriteriaMap: {},
+        requestedFields: [],
+        facets: [],
+        pageNumber: this.pageNo,
+        pageSize: this.pageSize,
+        orderBy: 'createdOn',
+        orderDirection: 'ASC',
+    }
+    this.homeService.getRequestList(request).subscribe(res => {
+      this.requestListData = res.data
+      if (this.requestListData) {
+      this.requestCount = res.totalCount
+        this.requestListData.map((data: any) => {
+          if (data.createdOn) {
+            data.createdOn = this.datePipe.transform(data.createdOn, 'MMM d, y')
+          }
+          if (data.assignedProvider) {
+            data.assignedProvider = data.assignedProvider.providerName
+          }
+          if (data.status === 'Unassigned') {
+           this.isUnassigned =  true
+          } else if (data.status === 'Assigned') {
+           this.isAssigned =  true
+          } else if (data.status === 'Inprogress') {
+            this.inProgress =  true
+           } else if (data.status === 'invalid') {
+            this.invalid =  true
+           }
+        })
+
+      }
+
+    })
+
+  }
+
+  viewDetails(e: any) {
+    this.detailsEvent = e
+  }
+
 }
diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index d2a64dd3a..98cd018e6 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -77,6 +77,8 @@ import { SingleUserCreationComponent } from './routes/users-view/single-user-cre
 import { BulkUploadApprovalComponent } from './routes/approvals/bulk-upload/bulk-upload.component'
 import { RequestListComponent } from './components/request-list/request-list.component'
 import { CreateRequestFormComponent } from './components/request-list/create-request-form/create-request-form.component'
+import { CompetencyViewComponent } from './components/request-list/competency-view/competency-view.component'
+import { AssignListPopupComponent } from './components/request-list/assign-list-popup/assign-list-popup.component'
 
 @NgModule({
   declarations: [
@@ -119,6 +121,8 @@ import { CreateRequestFormComponent } from './components/request-list/create-req
     BulkUploadApprovalComponent,
     RequestListComponent,
     CreateRequestFormComponent,
+    CompetencyViewComponent,
+    AssignListPopupComponent,
   ],
   imports: [
     CommonModule,
@@ -187,6 +191,8 @@ import { CreateRequestFormComponent } from './components/request-list/create-req
     RejectionPopupComponent,
     VerifyOtpComponent,
     FileProgressComponent,
+    CompetencyViewComponent,
+    AssignListPopupComponent,
   ],
   providers: [
     InitResolver,
diff --git a/project/ws/app/src/lib/routes/home/services/home.servive.ts b/project/ws/app/src/lib/routes/home/services/home.servive.ts
index 057b32117..9ca72a68a 100644
--- a/project/ws/app/src/lib/routes/home/services/home.servive.ts
+++ b/project/ws/app/src/lib/routes/home/services/home.servive.ts
@@ -21,7 +21,10 @@ const API_END_POINTS = {
   GET_USER_DETAILS: `/apis/protected/v8/user/details?ts='${Date.now()}`,
   GET_FILTER_ENTITY: 'apis/proxies/v8/competency/v4/search',
   GET_REQUEST_TYPE_LIST:'/apis/proxies/v8/org/v1/search',
-  CREATE_DEMAND_REQUEST:'/apis/proxies/v8/demand/content/create'
+  CREATE_DEMAND_REQUEST:'/apis/proxies/v8/demand/content/create',
+  GET_REQUEST_DATA:'/apis/proxies/v8/demand/content/search',
+  MARK_INVALID:'/apis/proxies/v8/demand/content/update/status',
+  GET_REQUEST_DATA_BYID: 'apis/proxies/v8/demand/content/read'
 }
 
 @Injectable({
@@ -67,4 +70,16 @@ export class ProfileV2Service {
    return this.http.post<any>(`${API_END_POINTS.CREATE_DEMAND_REQUEST}`,request)
   }
 
+  getRequestList(request:any){
+   return this.http.post<any>(`${API_END_POINTS.GET_REQUEST_DATA}`,request).pipe(map(res=>_.get(res,'result.result')))
+  }
+
+  markAsInvalid(request:any){
+    return this.http.post<any>(`${API_END_POINTS.MARK_INVALID}`,request)
+   }
+
+  getRequestDataById(demandId:any) {
+    return this.http.get<any>(`${API_END_POINTS.GET_REQUEST_DATA_BYID}/${demandId}`).pipe(map(res=>_.get(res, 'result.result')))
+  }
+
 }

From b747efebf7c75b3fe3b17f94426d9c65fb17d58a Mon Sep 17 00:00:00 2001
From: sohail amjad <sohail.amjad@tarento.com>
Date: Fri, 24 May 2024 13:02:46 +0530
Subject: [PATCH 625/887] resolved

---
 .../home/components/request-list/request-list.component.ts      | 2 --
 1 file changed, 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
index 4ee1fab39..b18aab3d8 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
@@ -8,8 +8,6 @@ import { MatDialog } from '@angular/material'
 import { ConfirmationBoxComponent } from '../../../training-plan/components/confirmation-box/confirmation.box.component'
 import { AssignListPopupComponent } from './assign-list-popup/assign-list-popup.component'
 import _ from 'lodash'
-
-
 @Component({
   selector: 'ws-app-request-list',
   templateUrl: './request-list.component.html',

From 656d37ae67219583ef196c4c4e37084929e960ae Mon Sep 17 00:00:00 2001
From: sohail amjad <sohail.amjad@tarento.com>
Date: Fri, 24 May 2024 13:06:32 +0530
Subject: [PATCH 626/887] resolved

---
 .../home/components/request-list/request-list.component.ts       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
index b18aab3d8..84e44d15a 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
@@ -7,7 +7,6 @@ import { ActivatedRoute, Router } from '@angular/router'
 import { MatDialog } from '@angular/material'
 import { ConfirmationBoxComponent } from '../../../training-plan/components/confirmation-box/confirmation.box.component'
 import { AssignListPopupComponent } from './assign-list-popup/assign-list-popup.component'
-import _ from 'lodash'
 @Component({
   selector: 'ws-app-request-list',
   templateUrl: './request-list.component.html',

From 2bb4a2e077bb4f7431179721d43235762c04d59b Mon Sep 17 00:00:00 2001
From: sohail amjad <sohail.amjad@tarento.com>
Date: Fri, 24 May 2024 13:13:42 +0530
Subject: [PATCH 627/887] resolved

---
 .../create-request-form/create-request-form.component.html    | 2 +-
 .../home/components/request-list/request-list.component.ts    | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
index b7c128c12..8255e339e 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
@@ -195,7 +195,7 @@
                     </table>
                   </div>
                 </div>
-                <div class="" *ngIf="showSaveButton() && isEditEnabled"> 
+                <div class="" *ngIf="showSaveButton()"> 
                   <button mat-raised-button type="button" style="line-height: 48px;"
                   class="ws-mat-default-text ws-mat-accent-border-active"
                   (click)="!requestForm.invalid ? data.emit('save') : showToasterMessage('mandatoryFields')">
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
index 84e44d15a..23d136403 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
@@ -73,6 +73,10 @@ export class RequestListComponent implements OnInit {
 
   }
 
+  openVideoPopup(){
+    
+  }
+
   hasAccess() {
     let flag = false
     if (this.pageConfig && this.pageConfig.data && this.pageConfig.data.actionMenu) {

From c2f438fcbd0ce4c889120a52497451174eb3001a Mon Sep 17 00:00:00 2001
From: sohail amjad <sohail.amjad@tarento.com>
Date: Fri, 24 May 2024 13:17:08 +0530
Subject: [PATCH 628/887] resolved

---
 .../home/components/request-list/request-list.component.ts    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
index 23d136403..206e9841c 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
@@ -73,8 +73,8 @@ export class RequestListComponent implements OnInit {
 
   }
 
-  openVideoPopup(){
-    
+  openVideoPopup() {
+
   }
 
   hasAccess() {

From 743adc43b9864c763b190ef8a36c76b1e6a5d87c Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Fri, 24 May 2024 15:15:27 +0530
Subject: [PATCH 629/887] update for kar-202-logout-issue

---
 src/app/services/init.service.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/app/services/init.service.ts b/src/app/services/init.service.ts
index 66aa1c5ae..780ae3f95 100644
--- a/src/app/services/init.service.ts
+++ b/src/app/services/init.service.ts
@@ -19,7 +19,7 @@ import {
   NsInstanceConfig,
   // NsUser,
   UserPreferenceService,
-  AuthKeycloakService,
+  // AuthKeycloakService,
 } from '@sunbird-cb/utils'
 import { map } from 'rxjs/operators'
 import { environment } from '../../environments/environment'
@@ -53,7 +53,7 @@ export class InitService {
   constructor(
     private logger: LoggerService,
     private configSvc: ConfigurationsService,
-    private authSvc: AuthKeycloakService,
+    // private authSvc: AuthKeycloakService,
     private widgetResolverService: WidgetResolverService,
     private settingsSvc: BtnSettingsService,
     private userPreference: UserPreferenceService,
@@ -331,7 +331,8 @@ export class InitService {
           localStorage.setItem('login', 'true')
 
         } else {
-          this.authSvc.force_logout()
+          // this.authSvc.force_logout()
+          await this.http.get('/apis/reset').toPromise()
         }
         const details = {
           group: [],

From f5f083e7c24bc1f732bcf5146d76164ec52145a6 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Fri, 24 May 2024 18:04:58 +0530
Subject: [PATCH 630/887] update for mdo portal medium issue fix

---
 .../home/components/user-cards/user-card.component.html   | 4 ++--
 .../home/components/user-cards/user-card.component.scss   | 8 +++++++-
 .../home/components/user-cards/user-card.component.ts     | 1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 08f7e0b76..137b1d99d 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -465,12 +465,12 @@
                 user.profileDetails.personalDetails.category : '-'}}</p>
             </div>
 
-            <div class="md:w-1/4">
+            <!-- <div class="md:w-1/4">
               <label class="view-text-label">Pay Band</label>
               <p>{{user.profileDetails && user.profileDetails.employmentDetails &&
                 user.profileDetails.employmentDetails.payType ?
                 user.profileDetails.employmentDetails.payType : '-'}}</p>
-            </div>
+            </div> -->
           </div>
           <div class="flex flex-row margin-top-m">
             <div class="md:w-1/4">
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
index 5a9e64588..8fb6456d4 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
@@ -9,7 +9,7 @@
   border-radius: 5px !important;
 
   .mat-expansion-panel-header {
-    padding: 14px 24px !important;
+    padding: 10px 24px !important;
   }
 
   .mat-content{
@@ -85,6 +85,12 @@
     }
   }
 }
+
+::ng-deep .mat-expansion-panel-header {
+  min-height: 48px !important;
+  height: inherit !important;
+}
+
 ::ng-deep .mat-expansion-panel-header .mat-expansion-indicator::after {
     content: "+";
     border: 0;
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 193b76bf1..381f18abb 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -143,6 +143,7 @@ export class UserCardComponent implements OnInit {
   ngOnInit() {
     if (this.isApprovals && this.usersData) {
       this.approvalData = this.usersData
+      console.log('this.approvalData--', this.approvalData)
       if (this.approvalData && this.approvalData.length > 0) {
         this.getUserMappedData(this.approvalData)
         this.approvalSvc.getProfileConfig().then((res: any) => {

From 79261ff14131ba315b77620ceab5f7e437f53d57 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Fri, 24 May 2024 19:38:47 +0530
Subject: [PATCH 631/887] update for kar-202 logout issue

---
 src/app/services/init.service.ts | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/app/services/init.service.ts b/src/app/services/init.service.ts
index 780ae3f95..fa3c691b4 100644
--- a/src/app/services/init.service.ts
+++ b/src/app/services/init.service.ts
@@ -332,7 +332,8 @@ export class InitService {
 
         } else {
           // this.authSvc.force_logout()
-          await this.http.get('/apis/reset').toPromise()
+          // await this.http.get('/apis/reset').toPromise()
+          window.location.href = `${this.defaultRedirectUrl}apis/reset`
         }
         const details = {
           group: [],
@@ -560,4 +561,13 @@ export class InitService {
     })
     return returnValue
   }
+
+  private get defaultRedirectUrl(): string {
+    try {
+      const baseUrl = document.baseURI
+      return baseUrl || location.origin
+    } catch (error) {
+      return location.origin
+    }
+  }
 }

From 700272f47751d141ba0105f64ae31372ca9a9de0 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Sat, 25 May 2024 22:45:06 +0530
Subject: [PATCH 632/887] Fixed 4868,4803,4800,4793,4787,4786

---
 .../user-cards/user-card.component.html       | 52 ++++++-------------
 .../user-cards/user-card.component.scss       |  3 ++
 .../user-cards/user-card.component.ts         | 21 ++++----
 3 files changed, 29 insertions(+), 47 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 08f7e0b76..906db98ff 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -5,7 +5,8 @@
 
 <div *ngIf="!isApprovals">
   <mat-accordion [multi]="true">
-    <mat-expansion-panel class="user-card" *ngFor="let user of usersData" #panel (opened)="closeOtherPanels(panel)">
+    <mat-expansion-panel class="user-card" *ngFor="let user of usersData | orderBy: 'firstName':'asc'" #panel
+      (opened)="closeOtherPanels(panel)">
       <mat-expansion-panel-header (click)="getUerData(user)">
         <div class="float-left width88" (click)="$event.stopPropagation();">
           <div class="initialcircle display-inline-block margin-right-m">
@@ -203,7 +204,7 @@
             </div>
             <div class="flex flex-row margin-top-m">
               <div class="md:w-1/3">
-                <label class="margin-remove-bottom form-label required">Date of Birth</label>
+                <label class="margin-remove-bottom form-label">Date of Birth</label>
                 <mat-form-field appearance="outline" class="customdob">
                   <input id="birthDate" matInput #dob formControlName="dob" [matDatepicker]="picker" i18n-placeholder
                     (focus)="picker.open()" placeholder="Choose date of birth" [min]="1/1/1900" [max]="today">
@@ -217,7 +218,7 @@
               </div>
 
               <div class="md:w-1/3">
-                <label class="margin-remove-bottom form-label required">Mother Tongue</label>
+                <label class="margin-remove-bottom form-label">Mother Tongue</label>
                 <mat-form-field appearance="outline">
                   <input id="language" matInput type="text" placeholder="Type here" i18n-placeholder="Mother Tongue"
                     formControlName="domicileMedium" [matAutocomplete]="motherTongueAuto" i18n-aria-label
@@ -240,7 +241,7 @@
               </div>
 
               <div class="md:w-1/3">
-                <label class="margin-remove-bottom form-label required">Gender</label>
+                <label class="margin-remove-bottom form-label">Gender</label>
                 <mat-form-field appearance="outline">
                   <mat-select #gender formControlName="gender" i18n-placeholder placeholder="Select gender">
                     <mat-option [value]="gender" *ngFor="let gender of genderList">
@@ -256,7 +257,7 @@
 
             <div class="flex flex-row margin-top-m">
               <div class="md:w-1/3">
-                <label class="margin-remove-bottom form-label required">Office Pin Code</label>
+                <label class="margin-remove-bottom form-label">Office Pin Code</label>
                 <mat-form-field appearance="outline">
                   <input id="pinCode" #pincode type="text" matInput placeholder="Type here" formControlName="pincode"
                     i18n-aria-label aria-label="Pin Code input field" autocomplete="off"
@@ -270,12 +271,12 @@
               <div class="md:w-1/3">
                 <label class="margin-remove-bottom form-label">eHRMS ID</label>
                 <mat-form-field appearance="outline">
-                  <input type="text" matInput #ehrmsID formControlName="ehrmsID" placeholder="Type here">
+                  <input type="text" matInput #ehrmsID formControlName="ehrmsID">
                 </mat-form-field>
               </div>
 
               <div class="md:w-1/3">
-                <label class="margin-remove-bottom form-label required">Category</label>
+                <label class="margin-remove-bottom form-label">Category</label>
                 <mat-form-field appearance="outline">
                   <mat-select #category formControlName="category" i18n-placeholder placeholder="Select category">
                     <mat-option [value]="ctg" *ngFor="let ctg of categoryList">
@@ -524,7 +525,7 @@
 <!-- for Approvals page -->
 <div *ngIf="isApprovals">
   <mat-accordion [multi]="true" *ngIf="approvalData">
-    <mat-expansion-panel class="user-card" *ngFor="let appData of approvalData" #panel
+    <mat-expansion-panel class="user-card" *ngFor="let appData of approvalData | orderBy: 'firstName':'asc'" #panel
       (opened)="closeOtherPanels(panel)">
       <mat-expansion-panel-header (click)="getUerData(appData.user, appData.userWorkflow);">
         <div class="float-left width82" (click)="$event.stopPropagation();">
@@ -566,38 +567,13 @@
                 class="ws-mat-black40-text infoicon">info_outline</mat-icon>
             </div>
             <div class="flex flex-row margin-top-m">
-              <!-- <div class="md:w-1/3">
-                <label class="view-text-label">Designation</label>
-                <p>{{appData.user.profileDetails && appData.user.profileDetails.professionalDetails &&
-                  appData.user.profileDetails.professionalDetails.designation ?
-                  appData.user.profileDetails.professionalDetails.designation : '-'}} <mat-icon
-                    class="verified-icon">check_circle</mat-icon></p>
-                <mat-radio-group aria-label="Select an option" name="approveDesignation"
-                  formControlName="approveDesignation">
-                  <mat-radio-button value="approve" class="margin-right-s">Approve</mat-radio-button>
-                  <mat-radio-button value="reject" (click)="addRejection('designation')">Reject</mat-radio-button>
-                </mat-radio-group>
-              </div>
-
-              <div class="md:w-1/3">
-                <label class="view-text-label">Group</label>
-                <p>{{appData.user.profileDetails && appData.user.profileDetails.additionalProperties &&
-                  appData.user.profileDetails.additionalProperties.group ?
-                  appData.user.profileDetails.additionalProperties.group : '-'}} <mat-icon
-                    class="verified-icon">check_circle</mat-icon>
-                </p>
-
-                <mat-radio-group aria-label="Select an option" name="approveGroup" formControlName="approveGroup">
-                  <mat-radio-button value="approve" class="margin-right-s">Approve</mat-radio-button>
-                  <mat-radio-button value="reject" (click)="addRejection('group')">Reject</mat-radio-button>
-                </mat-radio-group>
-              </div> -->
               <ng-container *ngFor="let field of appData.needApprovalList">
                 <div class="md:w-1/3 margin-bottom-s" *ngIf="field.label === 'Group'">
                   <label class="view-text-label">Group</label>
                   <div>
                     <span>
-                      <input type="text" class="appr-text-field margin-bottom-s" [value]="field.value">
+                      <input type="text" class="appr-text-field margin-bottom-s" [value]="field.value"
+                        [disabled]="true">
                       <mat-icon class="verified-icon margin-left-s"
                         *ngIf="field.action === 'APPROVE'">check_circle</mat-icon>
                       <mat-icon class="nonverified-icon margin-left-s"
@@ -619,7 +595,8 @@
                   <label class="view-text-label">Designation</label>
                   <div>
                     <span>
-                      <input type="text" class="appr-text-field margin-bottom-s" [value]="field.value">
+                      <input type="text" class="appr-text-field margin-bottom-s" [value]="field.value"
+                        [disabled]="true">
                       <mat-icon class="verified-icon margin-left-s"
                         *ngIf="field.action === 'APPROVE'">check_circle</mat-icon>
                       <mat-icon class="nonverified-icon margin-left-s"
@@ -751,7 +728,8 @@
 
           <div class="flex flex-row margin-top-l">
             <button mat-raised-button type="submit" (click)="onApprovalSubmit(panel)"
-              class="margin-right-m btn-success btn-responsive successbtn" [disabled]="!approveUserDataForm.valid">
+              class="margin-right-m btn-success btn-responsive successbtn"
+              [disabled]="appData.needApprovalList.length !== actionList.length">
               <span class="text-white" i18n>
                 Update
               </span>
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
index f8c903a95..b5156518d 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
@@ -63,12 +63,15 @@
 
   .verified-icon {
     color: #1D8923;
+    vertical-align: bottom;
   }
   .nonverified-icon {
     color: #D13924;
+    vertical-align: bottom;
   }
   .notmyuser-icon {
     color: #e99e38;
+    vertical-align: bottom;
   }
 
  .button {
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 193b76bf1..cdb9ddd56 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -112,23 +112,23 @@ export class UserCardComponent implements OnInit {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', [Validators.required]),
       group: new FormControl('', [Validators.required]),
-      employeeID: new FormControl({ value: '', disabled: true }, []),
+      employeeID: new FormControl('', []),
       ehrmsID: new FormControl({ value: '', disabled: true }, []),
-      dob: new FormControl('', [Validators.required]),
+      dob: new FormControl('', []),
       primaryEmail: new FormControl('', [Validators.required, Validators.email, Validators.pattern(this.emailRegix)]),
       countryCode: new FormControl('+91', [Validators.required]),
       mobile: new FormControl('', [Validators.required, Validators.pattern(this.phoneNumberPattern)]),
       tags: new FormControl('', [Validators.pattern(this.namePatern)]),
-      roles: new FormControl('', []),
-      domicileMedium: new FormControl('', [Validators.required]),
-      gender: new FormControl('', [Validators.required]),
-      category: new FormControl('', [Validators.required]),
-      pincode: new FormControl('', [Validators.required]),
+      roles: new FormControl('', [Validators.required]),
+      domicileMedium: new FormControl('', []),
+      gender: new FormControl('', []),
+      category: new FormControl('', []),
+      pincode: new FormControl('', []),
     })
 
     this.approveUserDataForm = new FormGroup({
-      approveDesignation: new FormControl('', [Validators.required]),
-      approveGroup: new FormControl('', [Validators.required]),
+      approveDesignation: new FormControl('', []),
+      approveGroup: new FormControl('', []),
     })
 
     const fullProfile = _.get(this.route.snapshot, 'data.configService')
@@ -410,7 +410,7 @@ export class UserCardComponent implements OnInit {
 
       if (user.profileDetails.employmentDetails) {
         if (user.profileDetails.employmentDetails.pinCode) {
-          this.updateUserDataForm.controls['pincode'].setValue(user.profileDetails.employmentDetails.pincode)
+          this.updateUserDataForm.controls['pincode'].setValue(user.profileDetails.employmentDetails.pinCode)
         }
         if (user.profileDetails.employmentDetails.employeeCode) {
           this.updateUserDataForm.controls['employeeID'].setValue(user.profileDetails.employmentDetails.employeeCode)
@@ -708,6 +708,7 @@ export class UserCardComponent implements OnInit {
           if (req.wfId === field.wfId) {
             req.comment = this.comment
             field.comment = this.comment
+            this.showeditText = false
           }
         })
       } else {

From 093925eb9de25d765500fbea7ea47a4d413fa4e8 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Sat, 25 May 2024 22:50:12 +0530
Subject: [PATCH 633/887] update for mdo user profile issues

---
 .../user-cards/user-card.component.html       | 18 +++++++++---------
 .../user-cards/user-card.component.scss       |  4 ++++
 .../user-cards/user-card.component.ts         | 11 +++++++----
 .../single-user-creation.component.html       | 19 ++++++++++++++++---
 .../single-user-creation.component.scss       |  4 ++++
 5 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 137b1d99d..ea5dff32d 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -426,13 +426,13 @@
 
             <div class="md:w-1/4">
               <label class="view-text-label">Email</label>
-              <p>{{user.profileDetails && user.profileDetails.personalDetails ?
+              <p class="word-wrap">{{user.profileDetails && user.profileDetails.personalDetails ?
                 user.profileDetails.personalDetails.primaryEmail : '-'}}</p>
             </div>
 
             <div class="md:w-1/4">
               <label class="view-text-label">Mobile Number</label>
-              <p>{{user.profileDetails && user.profileDetails.personalDetails ?
+              <p>+91-{{user.profileDetails && user.profileDetails.personalDetails ?
                 user.profileDetails.personalDetails.mobile : '-'}}</p>
             </div>
 
@@ -475,9 +475,9 @@
           <div class="flex flex-row margin-top-m">
             <div class="md:w-1/4">
               <label class="view-text-label">Office Pin Code</label>
-              <p>{{user.profileDetails && user.profileDetails.employmentDetails &&
-                user.profileDetails.employmentDetails.pinCode ?
-                user.profileDetails.employmentDetails.pinCode : '-'}}</p>
+              <p>{{user.profileDetails && user.profileDetails.personalDetails &&
+                user.profileDetails.personalDetails.pinCode ?
+                user.profileDetails.personalDetails.pinCode : '-'}}</p>
             </div>
 
             <div class="md:w-1/4">
@@ -663,7 +663,7 @@
 
               <div class="md:w-1/4">
                 <label class="view-text-label">Mobile Number</label>
-                <p>{{appData.user.profileDetails && appData.user.profileDetails.personalDetails ?
+                <p>+91-{{appData.user.profileDetails && appData.user.profileDetails.personalDetails ?
                   appData.user.profileDetails.personalDetails.mobile : '-'}}</p>
               </div>
 
@@ -707,9 +707,9 @@
             <div class="flex flex-row margin-top-m">
               <div class="md:w-1/4">
                 <label class="view-text-label">Office Pin Code</label>
-                <p>{{appData.user.profileDetails && appData.user.profileDetails.employmentDetails &&
-                  appData.user.profileDetails.employmentDetails.pinCode ?
-                  appData.user.profileDetails.employmentDetails.pinCode : '-'}}</p>
+                <p>{{appData.user.profileDetails && appData.user.profileDetails.personalDetails &&
+                  appData.user.profileDetails.personalDetails.pinCode ?
+                  appData.user.profileDetails.personalDetails.pinCode : '-'}}</p>
               </div>
 
               <div class="md:w-1/4">
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
index 8fb6456d4..62a7fa7f2 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
@@ -338,4 +338,8 @@ label {
 
 .blue-text {
   color:#1B4CA1;
+}
+
+.word-wrap {
+  word-wrap: break-word;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 381f18abb..878ebe473 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -143,7 +143,6 @@ export class UserCardComponent implements OnInit {
   ngOnInit() {
     if (this.isApprovals && this.usersData) {
       this.approvalData = this.usersData
-      console.log('this.approvalData--', this.approvalData)
       if (this.approvalData && this.approvalData.length > 0) {
         this.getUserMappedData(this.approvalData)
         this.approvalSvc.getProfileConfig().then((res: any) => {
@@ -363,7 +362,9 @@ export class UserCardComponent implements OnInit {
   }
 
   setUserDetails(user: any) {
+
     if (user && user.profileDetails) {
+      console.log(user.profileDetails)
       if (user.profileDetails.additionalProperties) {
         if (user.profileDetails.additionalProperties.externalSystemId) {
           this.updateUserDataForm.controls['ehrmsID'].setValue(user.profileDetails.additionalProperties.externalSystemId)
@@ -407,12 +408,13 @@ export class UserCardComponent implements OnInit {
         if (user.profileDetails.personalDetails.category) {
           this.updateUserDataForm.controls['category'].setValue(user.profileDetails.personalDetails.category)
         }
+        if (user.profileDetails.personalDetails.pinCode) {
+          this.updateUserDataForm.controls['pincode'].setValue(user.profileDetails.personalDetails.pinCode)
+        }
       }
 
       if (user.profileDetails.employmentDetails) {
-        if (user.profileDetails.employmentDetails.pinCode) {
-          this.updateUserDataForm.controls['pincode'].setValue(user.profileDetails.employmentDetails.pincode)
-        }
+
         if (user.profileDetails.employmentDetails.employeeCode) {
           this.updateUserDataForm.controls['employeeID'].setValue(user.profileDetails.employmentDetails.employeeCode)
         }
@@ -574,6 +576,7 @@ export class UserCardComponent implements OnInit {
                   this.openSnackbar('User updated Successfully')
                   panel.close()
                   this.updateList.emit()
+                  this.searchByEnterKey.emit('')
                   // this.router.navigate(['/app/home/users/allusers'])
 
                   // this.usersSvc.getUserById(user.userId).subscribe((_res: any) => {
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
index a13f4fa74..3b79f8ab3 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
@@ -37,7 +37,7 @@
 
       <div class="input-container">
         <div class="label required">Designation</div>
-        <mat-form-field class="profile-form-field">
+        <mat-form-field class="profile-form-field required-select" appearance="none">
           <div class="flex flex-row auto-complete-row">
             <input type="text" class="input-text" aria-label="Designation" matInput formControlName="designation"
               [matAutocomplete]="designationAuto" />
@@ -48,6 +48,10 @@
               {{ designation.name }}
             </mat-option>
           </mat-autocomplete>
+          <mat-error class="text-xs"
+            *ngIf="userCreationForm?.get('designation')?.touched && userCreationForm?.get('designation')?.invalid">
+            Please choose a designation
+          </mat-error>
         </mat-form-field>
       </div>
     </div>
@@ -55,11 +59,15 @@
     <div class="flex flex-row gap-6">
       <div class="input-container">
         <div class="label required">Group</div>
-        <mat-form-field class="profile-form-field">
+        <mat-form-field class="profile-form-field required-select" appearance="none">
           <mat-select formControlName="group">
             <mat-option value="">Choose a group</mat-option>
             <mat-option *ngFor="let group of masterData.group" value="{{group}}">{{ group }}</mat-option>
           </mat-select>
+          <mat-error class="text-xs"
+            *ngIf="userCreationForm?.get('group')?.touched && userCreationForm?.get('group')?.invalid">
+            Please choose a group
+          </mat-error>
         </mat-form-field>
       </div>
       <div class="input-container">
@@ -117,7 +125,12 @@
       </div>
       <div class="input-container">
         <div class="label">Office pin code</div>
-        <input type="text" class="input-text" formControlName="pincode" placeholder="Type here" />
+        <input type="text" class="input-text" formControlName="pincode" placeholder="Type here" pattern="^[0-9]{1,6}$"
+          maxlength="6" />
+        <mat-error class="text-xs"
+          *ngIf="userCreationForm?.get('pincode')?.touched && userCreationForm?.get('pincode')?.invalid">
+          Please enter valid pin
+        </mat-error>
       </div>
     </div>
 
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.scss b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.scss
index e50e9411b..7c3cc1ee5 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.scss
@@ -62,4 +62,8 @@
     position: relative;
     left: -16px;
   }
+}
+
+::ng-deep .required-select .mat-form-field-subscript-wrapper {
+  margin-top: 20px;
 }
\ No newline at end of file

From bd31284d153c31cf855112b3cfab6f04cecf3656 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Sat, 25 May 2024 22:52:18 +0530
Subject: [PATCH 634/887] update for mdo user profile issues

---
 .../lib/routes/home/components/user-cards/user-card.component.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 878ebe473..fd765b8ac 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -364,7 +364,6 @@ export class UserCardComponent implements OnInit {
   setUserDetails(user: any) {
 
     if (user && user.profileDetails) {
-      console.log(user.profileDetails)
       if (user.profileDetails.additionalProperties) {
         if (user.profileDetails.additionalProperties.externalSystemId) {
           this.updateUserDataForm.controls['ehrmsID'].setValue(user.profileDetails.additionalProperties.externalSystemId)

From 84aef119609f9102714de4cc80a11be0ec0e4631 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Sat, 25 May 2024 23:20:24 +0530
Subject: [PATCH 635/887] update for mdo user profile issue

---
 .../components/user-cards/user-card.component.html    |  1 -
 .../home/components/user-cards/user-card.component.ts | 11 +++++++++--
 .../single-user-creation.component.ts                 | 10 +++++-----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index ea5dff32d..43130f191 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -2,7 +2,6 @@
   <ws-app-searchuser (handleApiData)="onSearch($event)" (handleapproveAll)="onApproveALL()"
     [showApproveALL]="showApproveALL" [currentFilter]="currentFilter"></ws-app-searchuser>
 </div>
-
 <div *ngIf="!isApprovals">
   <mat-accordion [multi]="true">
     <mat-expansion-panel class="user-card" *ngFor="let user of usersData" #panel (opened)="closeOtherPanels(panel)">
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index fd765b8ac..d69164cd0 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, OnInit, Output, QueryList, TemplateRef, ViewChild, ViewChildren } from '@angular/core'
+import { Component, EventEmitter, Input, OnChanges, OnInit, Output, QueryList, TemplateRef, ViewChild, ViewChildren } from '@angular/core'
 import { FormGroup, FormControl, Validators } from '@angular/forms'
 import { UsersService } from '../../../users/services/users.service'
 import {
@@ -30,7 +30,7 @@ import { TelemetryEvents } from '../../../../head/_services/telemetry.event.mode
     { provide: MAT_DATE_FORMATS, useValue: APP_DATE_FORMATS },
   ],
 })
-export class UserCardComponent implements OnInit {
+export class UserCardComponent implements OnInit, OnChanges {
   @Input() userId: any
   @Input() tableData: any
   @Input() usersData: any
@@ -141,6 +141,7 @@ export class UserCardComponent implements OnInit {
   }
 
   ngOnInit() {
+
     if (this.isApprovals && this.usersData) {
       this.approvalData = this.usersData
       if (this.approvalData && this.approvalData.length > 0) {
@@ -157,6 +158,12 @@ export class UserCardComponent implements OnInit {
     }
   }
 
+  ngOnChanges() {
+    if (this.usersData) {
+      this.usersData = _.orderBy(this.usersData, item => item.profileDetails.personalDetails.firstname, ['asc'])
+    }
+  }
+
   // for approvals
   async getUserMappedData(approvalData: any) {
     approvalData.forEach((data: any) => {
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
index 60fe3986c..92e53d904 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
@@ -123,7 +123,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((_res: any) => {
         this.masterData['designation'] = _res.responseData
         this.masterData['designationBackup'] = _res.responseData
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch designation details, please try again later!')
         }
@@ -136,7 +136,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((res: any) => {
         this.masterData['language'] = res.languages
         this.masterData['languageBackup'] = res.languages
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch master language details, please try again later!')
         }
@@ -148,7 +148,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
         this.masterData['group'] = res.result.response
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch group data, please try again later!')
         }
@@ -166,7 +166,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
             this.masterData['mdoRoles'] = mdoArray.roles
           }
         }
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch roles list, please try again later!')
         }
@@ -238,7 +238,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((_res: any) => {
         this.matSnackBar.open('User created successfully!')
         this.handleFormClear()
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open(_.get(_err, 'error.params.errmsg') || 'Unable to create user, please try again later!')
         }

From 243f667be3efae08e8eccc4c6c44394ffc1fbfec Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Sun, 26 May 2024 18:35:13 +0530
Subject: [PATCH 636/887] fixing update button disbale issue on single approval
 request

---
 .../user-cards/user-card.component.html       |  2 +-
 .../user-cards/user-card.component.ts         | 21 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 43130f191..736193cfd 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -750,7 +750,7 @@
 
           <div class="flex flex-row margin-top-l">
             <button mat-raised-button type="submit" (click)="onApprovalSubmit(panel)"
-              class="margin-right-m btn-success btn-responsive successbtn" [disabled]="!approveUserDataForm.valid">
+              class="margin-right-m btn-success btn-responsive successbtn" [disabled]="!enableUpdateButton(appData)">
               <span class="text-white" i18n>
                 Update
               </span>
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index d69164cd0..94998edc2 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -140,6 +140,21 @@ export class UserCardComponent implements OnInit, OnChanges {
     }
   }
 
+  enableUpdateButton(appData: any): boolean {
+    let enableBtn = true
+    if (appData.needApprovalList) {
+      appData.needApprovalList.forEach((field: any) => {
+        if (field.label === 'Group' && this.approveUserDataForm.get('approveGroup')!.invalid) {
+          enableBtn = false
+        }
+        if (field.label === 'Designation' && this.approveUserDataForm.get('approveDesignation')!.invalid) {
+          enableBtn = false
+        }
+      })
+    }
+    return enableBtn
+  }
+
   ngOnInit() {
 
     if (this.isApprovals && this.usersData) {
@@ -160,7 +175,11 @@ export class UserCardComponent implements OnInit, OnChanges {
 
   ngOnChanges() {
     if (this.usersData) {
-      this.usersData = _.orderBy(this.usersData, item => item.profileDetails.personalDetails.firstname, ['asc'])
+      this.usersData = _.orderBy(this.usersData, item => {
+        if (item.profileDetails && item.profileDetails.personalDetails) {
+          item.profileDetails.personalDetails.firstname
+        }
+      }, ['asc'])
     }
   }
 

From 29f6a8d28a045eab82be5e3b586bad7481d6ccbe Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Sun, 26 May 2024 19:12:21 +0530
Subject: [PATCH 637/887] lint errors fix

---
 .../components/user-cards/user-card.component.ts   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 94998edc2..8d05c4cdf 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -106,9 +106,9 @@ export class UserCardComponent implements OnInit, OnChanges {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-    private dialog: MatDialog, private approvalSvc: ApprovalsService,
-    private route: ActivatedRoute, private snackBar: MatSnackBar,
-    private events: EventService) {
+              private dialog: MatDialog, private approvalSvc: ApprovalsService,
+              private route: ActivatedRoute, private snackBar: MatSnackBar,
+              private events: EventService) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', [Validators.required]),
       group: new FormControl('', [Validators.required]),
@@ -144,10 +144,10 @@ export class UserCardComponent implements OnInit, OnChanges {
     let enableBtn = true
     if (appData.needApprovalList) {
       appData.needApprovalList.forEach((field: any) => {
-        if (field.label === 'Group' && this.approveUserDataForm.get('approveGroup')!.invalid) {
+        if (field.label === 'Group' && this.approveUserDataForm.controls.approveGroup.invalid) {
           enableBtn = false
         }
-        if (field.label === 'Designation' && this.approveUserDataForm.get('approveDesignation')!.invalid) {
+        if (field.label === 'Designation' && this.approveUserDataForm.controls.approveDesignation.invalid) {
           enableBtn = false
         }
       })
@@ -177,9 +177,9 @@ export class UserCardComponent implements OnInit, OnChanges {
     if (this.usersData) {
       this.usersData = _.orderBy(this.usersData, item => {
         if (item.profileDetails && item.profileDetails.personalDetails) {
-          item.profileDetails.personalDetails.firstname
+          return item.profileDetails.personalDetails.firstname
         }
-      }, ['asc'])
+      },                         ['asc'])
     }
   }
 

From c3645092f5856fe6627ab042bc7864c8ce408725 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Mon, 27 May 2024 09:00:44 +0530
Subject: [PATCH 638/887] Fixed roles issue

---
 .../user-cards/user-card.component.html          | 16 ++++++++--------
 .../components/user-cards/user-card.component.ts |  8 +++++++-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index d3eabbf91..26110f312 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -327,7 +327,7 @@
             </div>
 
             <div class="flex flex-row margin-top-m">
-              <div class="md:w-1/1" *ngIf="!isMdoAdmin">
+              <div class="md:w-1/1" *ngIf="isMdoLeader || isBoth">
                 <label for="roles" class="margin-remove-bottom form-label required" i18n-aria-label
                   aria-label="Roles label" i18n="Role label|Label which explains the user to select the roles">
                   Role
@@ -342,7 +342,7 @@
                 </div>
               </div>
 
-              <div class="md:w-1/2" *ngIf="isMdoAdmin">
+              <div class="md:w-1/2" *ngIf="!isMdoLeader">
                 <label class="view-text-label">Roles</label>
                 <div *ngIf="user?.organisations && user?.organisations[0].roles.length > 0">
                   <ul class="roleslist">
@@ -475,9 +475,9 @@
           <div class="flex flex-row margin-top-m">
             <div class="md:w-1/4">
               <label class="view-text-label">Office Pin Code</label>
-              <p>{{user.profileDetails && user.profileDetails.personalDetails &&
-                user.profileDetails.personalDetails.pinCode ?
-                user.profileDetails.personalDetails.pinCode : '-'}}</p>
+              <p>{{user.profileDetails && user.profileDetails.employmentDetails &&
+                user.profileDetails.employmentDetails.pinCode ?
+                user.profileDetails.employmentDetails.pinCode : '-'}}</p>
             </div>
 
             <div class="md:w-1/4">
@@ -683,9 +683,9 @@
             <div class="flex flex-row margin-top-m">
               <div class="md:w-1/4">
                 <label class="view-text-label">Office Pin Code</label>
-                <p>{{appData.user.profileDetails && appData.user.profileDetails.personalDetails &&
-                  appData.user.profileDetails.personalDetails.pinCode ?
-                  appData.user.profileDetails.personalDetails.pinCode : '-'}}</p>
+                <p>{{appData.user.profileDetails && appData.user.profileDetails.employmentDetails &&
+                  appData.user.profileDetails.employmentDetails.pinCode ?
+                  appData.user.profileDetails.employmentDetails.pinCode : '-'}}</p>
               </div>
 
               <div class="md:w-1/4">
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 5c705e164..bf701d0c2 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -63,6 +63,7 @@ export class UserCardComponent implements OnInit, OnChanges {
   orguserRoles: any = []
   isMdoAdmin = false
   isMdoLeader = false
+  isBoth = false
   updateUserDataForm: FormGroup
   approveUserDataForm: FormGroup
   designationsMeta: any = []
@@ -137,10 +138,14 @@ export class UserCardComponent implements OnInit, OnChanges {
     if (fullProfile.unMappedUser && fullProfile.unMappedUser.roles) {
       this.isMdoAdmin = fullProfile.unMappedUser.roles.includes('MDO_ADMIN')
       this.isMdoLeader = fullProfile.unMappedUser.roles.includes('MDO_LEADER')
+      this.isBoth = fullProfile.unMappedUser.roles.includes('MDO_LEADER') && fullProfile.unMappedUser.roles.includes('MDO_ADMIN')
     }
   }
 
   ngOnInit() {
+    if (this.usersData && this.usersData.length > 0) {
+      this.usersData = _.orderBy(this.usersData, item => item.firstName, ['asc'])
+    }
 
     if (this.isApprovals && this.usersData) {
       this.approvalData = this.usersData
@@ -160,7 +165,7 @@ export class UserCardComponent implements OnInit, OnChanges {
 
   ngOnChanges() {
     if (this.usersData) {
-      this.usersData = _.orderBy(this.usersData, item => item.profileDetails.personalDetails.firstname, ['asc'])
+      this.usersData = _.orderBy(this.usersData, item => item.firstName, ['asc'])
     }
   }
 
@@ -198,6 +203,7 @@ export class UserCardComponent implements OnInit, OnChanges {
                       value: field.toValue[labelKey],
                       fieldKey: field.fieldKey,
                       wfId: wf.wfId,
+                      approvalrequested: true,
                     })
                   )
                 }

From d707e296be560127439f3f09621d8ed00ddd278d Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Mon, 27 May 2024 09:09:59 +0530
Subject: [PATCH 639/887] Fixed lint issue

---
 .../home/components/user-cards/user-card.component.ts     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 82c8faf3a..f64fb86be 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -107,9 +107,9 @@ export class UserCardComponent implements OnInit, OnChanges {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-    private dialog: MatDialog, private approvalSvc: ApprovalsService,
-    private route: ActivatedRoute, private snackBar: MatSnackBar,
-    private events: EventService) {
+              private dialog: MatDialog, private approvalSvc: ApprovalsService,
+              private route: ActivatedRoute, private snackBar: MatSnackBar,
+              private events: EventService) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', [Validators.required]),
       group: new FormControl('', [Validators.required]),
@@ -184,7 +184,7 @@ export class UserCardComponent implements OnInit, OnChanges {
         if (item.profileDetails && item.profileDetails.personalDetails) {
           return item.profileDetails.personalDetails.firstname
         }
-      }, ['asc'])
+      },                         ['asc'])
     }
   }
 

From 9a4b204311b9c9a1482856e2a542b6e0af1fedf5 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Mon, 27 May 2024 15:23:37 +0530
Subject: [PATCH 640/887] Fixed 4902

---
 .../home/components/user-cards/user-card.component.html     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 26110f312..0186dca4b 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -761,7 +761,8 @@
     <mat-dialog-content>
       <mat-form-field class="w-full mt-5" appearance="outline">
         <textarea matInput class="reason-text-area" [(ngModel)]="comment" name="reason"
-          placeholder="Type the description in fewer than 100 characters" i18n-placeholder resizable="none"></textarea>
+          placeholder="Type the description in fewer than 100 characters" i18n-placeholder resizable="none"
+          maxlength="100"></textarea>
       </mat-form-field>
     </mat-dialog-content>
     <mat-dialog-actions class="flex flex-wrap justify-end">
@@ -782,7 +783,8 @@
       <p class="margin-top-l margin-bottom-l" *ngIf="!showeditText">{{comment}}</p>
       <mat-form-field class="w-full mt-5" appearance="outline" *ngIf="showeditText">
         <textarea matInput class="reason-text-area" [(ngModel)]="comment" name="reason"
-          placeholder="Type the description in fewer than 100 characters" i18n-placeholder resizable="none"></textarea>
+          placeholder="Type the description in fewer than 100 characters" i18n-placeholder resizable="none"
+          maxlength="100"></textarea>
       </mat-form-field>
     </mat-dialog-content>
     <mat-dialog-actions class="flex flex-wrap justify-end" *ngIf="showeditText">

From 4dfbb8a955ed37cc90f3caae33ae841e2da252be Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Mon, 27 May 2024 15:39:56 +0530
Subject: [PATCH 641/887] Fixed dialog spacing issue

---
 .../home/components/user-cards/user-card.component.scss     | 4 ++--
 .../routes/users-view/verify-otp/verify-otp.component.scss  | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
index 93636295f..a8be6364c 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
@@ -297,7 +297,7 @@ label {
   }
 }
 
-:host ::ng-deep .rejection-modal {
+::ng-deep .rejection-modal {
   .mat-dialog-container {
     padding: 0px !important;
   }
@@ -317,7 +317,7 @@ label {
   vertical-align: middle;
   color: #666 !important;
 }
-:host ::ng-deep .mat-dialog-container {
+::ng-deep .mat-dialog-container {
   padding: 0 !important;
   overflow: unset !important;
 }
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.scss b/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.scss
index 84245f08b..9999c7f6d 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.scss
@@ -1,6 +1,10 @@
 @import 'ws-common';
-
+::ng-deep .mat-dialog-container {
+  padding: 0 !important;
+  overflow: unset !important;
+}
 .verify-otp-dialog {
+  padding: 22px !important;
   .timer-div {
     margin-bottom: 16px;
 

From af762364749a58dd22ec71aac39cdc7680edf40a Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Mon, 27 May 2024 18:37:16 +0530
Subject: [PATCH 642/887] Added condition for 4801 issue

---
 .../user-cards/user-card.component.html       | 11 ++++++
 .../user-cards/user-card.component.ts         | 35 +++++++++++++++----
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 0186dca4b..37510e033 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -614,6 +614,17 @@
                   </div>
                 </div>
               </ng-container>
+
+              <ng-container *ngFor="let field of appData.noneedApprovalList">
+                <div class="md:w-1/3 margin-bottom-s" *ngIf="field.label === 'Group'">
+                  <label class="view-text-label">Group</label>
+                  <input type="text" class="appr-text-field margin-bottom-s" [value]="field.value" [disabled]="true">
+                </div>
+                <div class="md:w-1/3 margin-bottom-s" *ngIf="field.label === 'Designation'">
+                  <label class="view-text-label">Designation</label>
+                  <input type="text" class="appr-text-field margin-bottom-s" [value]="field.value" [disabled]="true">
+                </div>
+              </ng-container>
             </div>
           </div>
           <hr>
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index f64fb86be..304f3ee80 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -107,9 +107,9 @@ export class UserCardComponent implements OnInit, OnChanges {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-              private dialog: MatDialog, private approvalSvc: ApprovalsService,
-              private route: ActivatedRoute, private snackBar: MatSnackBar,
-              private events: EventService) {
+    private dialog: MatDialog, private approvalSvc: ApprovalsService,
+    private route: ActivatedRoute, private snackBar: MatSnackBar,
+    private events: EventService) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', [Validators.required]),
       group: new FormControl('', [Validators.required]),
@@ -184,7 +184,8 @@ export class UserCardComponent implements OnInit, OnChanges {
         if (item.profileDetails && item.profileDetails.personalDetails) {
           return item.profileDetails.personalDetails.firstname
         }
-      },                         ['asc'])
+        // tslint:disable-next-line
+      }, ['asc'])
     }
   }
 
@@ -196,6 +197,30 @@ export class UserCardComponent implements OnInit, OnChanges {
         this.usersSvc.getUserById(id).subscribe((res: any) => {
           if (res) {
             data.user = res
+
+            if (data.user) {
+              if (data.needApprovalList && data.needApprovalList.length === 1) {
+                data.noneedApprovalList = []
+                if (data.needApprovalList[0].feildName === 'group') {
+                  console.log('appdata.needApprovalList[0]', data)
+                  const obj = {
+                    label: 'Designation',
+                    feildName: 'designation',
+                    value: data.user.profileDetails.professionalDetails[0].designation || '',
+                  }
+                  data.noneedApprovalList.push(obj)
+                }
+                if (data.needApprovalList[0].feildName === 'designation') {
+                  console.log('appdata.needApprovalList[0]', data)
+                  const obj = {
+                    label: 'Group',
+                    feildName: 'group',
+                    value: data.user.profileDetails.professionalDetails[0].group || '',
+                  }
+                  data.noneedApprovalList.push(obj)
+                }
+              }
+            }
           }
         })
       }
@@ -222,7 +247,6 @@ export class UserCardComponent implements OnInit, OnChanges {
                       value: field.toValue[labelKey],
                       fieldKey: field.fieldKey,
                       wfId: wf.wfId,
-                      approvalrequested: true,
                     })
                   )
                 }
@@ -394,7 +418,6 @@ export class UserCardComponent implements OnInit, OnChanges {
   }
 
   setUserDetails(user: any) {
-
     if (user && user.profileDetails) {
       if (user.profileDetails.additionalProperties) {
         if (user.profileDetails.additionalProperties.externalSystemId) {

From 4a42d18b707b2d3aa1acb74cd5259d75c405da60 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Tue, 28 May 2024 12:08:42 +0530
Subject: [PATCH 643/887] Fixed 4924,4880,4810,4801,4784,4757,4704 & commented
 sort,filter & transfer tab

---
 .../components/search/search.component.html   |  4 +--
 .../user-cards/user-card.component.html       | 33 +++++++++++++++----
 .../user-cards/user-card.component.scss       |  6 ++--
 .../user-cards/user-card.component.ts         | 16 ++++++---
 .../approval-pending.component.html           |  4 +--
 .../bulk-upload/bulk-upload.component.html    |  3 +-
 .../bulk-upload/bulk-upload.component.html    |  5 ++-
 .../single-user-creation.component.html       |  1 +
 8 files changed, 49 insertions(+), 23 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.html b/project/ws/app/src/lib/routes/home/components/search/search.component.html
index c9de039cc..f2a68222e 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.html
@@ -7,7 +7,7 @@
                 placeholder="Search" type="Standard" [ngClass]="{'disable': isContentLive}">
         </div>
     </div>
-    <div class="filter-section flex">
+    <!-- <div class="filter-section flex">
         <button mat-button type="button" (click)="sort()" class="apply-filter margin-right-s">
             <mat-icon class="margin-right-xs">sort</mat-icon> Sort
         </button>
@@ -16,7 +16,7 @@
         <button mat-button type="button" (click)="openFilter()" class="apply-filter margin-right-s">
             Apply Filter <mat-icon class="margin-right-xs">filter_list</mat-icon>
         </button>
-    </div>
+    </div> -->
     <div class="flex flex-end" *ngIf="!isApprovals && currentFilter === 'allusers'">
         <button mat-button type="button" class="search-btn" [routerLink]="['/app/home/user-creation']"
             [ngClass]="{'disable': isContentLive}">Create user</button>
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 37510e033..ea48798eb 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -36,13 +36,9 @@
               &&
               user?.profileDetails?.professionalDetails[0]?.designation ?
               user?.profileDetails?.professionalDetails[0]?.designation : '-'}}</div>
-            <!-- <div class="mat-caption ws-mat-black40-text"
-              *ngIf="user?.profileDetails?.profileStatus === 'VERIFIED' && user?.profileDetails?.profileStatusVerifiedOn">
-              Verified on: {{user?.profileDetails?.profileStatusUpdatedOn | date: 'dd/MM/yyyy'}}</div> -->
             <div class="mat-caption ws-mat-black40-text" *ngIf="user?.profileDetails?.profileStatusUpdatedOn">
-              Marked on: {{user?.profileDetails?.profileStatusUpdatedOn | date: 'dd/MM/yyyy'}}</div>
-            <div class="mat-caption ws-mat-black40-text" *ngIf="!user?.profileDetails?.profileStatusUpdatedOn">
-              -</div>
+              Marked on: {{user?.profileDetails?.profileStatusUpdatedOn}}</div>
+            <div class="mat-caption ws-mat-black40-text" *ngIf="!user?.profileDetails?.profileStatusUpdatedOn">-</div>
           </div>
         </div>
         <div class="float-right" *ngIf="isMdoAdmin || isMdoLeader">
@@ -64,7 +60,8 @@
                 non-verified</mat-slide-toggle>
             </p>
             <p class="float-right mat-body-2" *ngIf="user?.profileDetails?.profileStatus === 'NOT-VERIFIED'">
-              <mat-slide-toggle (click)="markStatus('VERIFIED', user)">This is my user</mat-slide-toggle>
+              <mat-slide-toggle (click)="markStatus('NOT-MY-USER', user)" [checked]="true">This is my
+                user</mat-slide-toggle>
             </p>
             <div class="flex flex-row margin-top-m">
               <div class="md:w-1/3">
@@ -827,4 +824,26 @@
       </button>
     </div>
   </div>
+</ng-template>
+
+<ng-template #updateconfirm>
+  <div class="confirm-dialog text-center padding-l">
+    <mat-icon class="infoIcon orangeicon-dialog">error_outline</mat-icon>
+    <div mat-dialog-content i18n class="margin-top-xs blue-text">
+      Are you sure you want to update?
+    </div>
+    <div mat-dialog-actions class="flex-center margin-top-s">
+      <button mat-raised-button type="submit" [mat-dialog-close]="false"
+        class="margin-right-m  btn-success btn-responsive cancelbtn">
+        <span i18n>
+          No
+        </span>
+      </button>
+      <button mat-raised-button type="submit" [mat-dialog-close]="true" class="btn-success btn-responsive successbtn">
+        <span class="text-white" i18n>
+          Yes
+        </span>
+      </button>
+    </div>
+  </div>
 </ng-template>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
index a8be6364c..254194462 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
@@ -63,15 +63,15 @@
 
   .verified-icon {
     color: #1D8923;
-    vertical-align: bottom;
+    vertical-align: sub;
   }
   .nonverified-icon {
     color: #D13924;
-    vertical-align: bottom;
+    vertical-align: sub;
   }
   .notmyuser-icon {
     color: #e99e38;
-    vertical-align: bottom;
+    vertical-align: sub;
   }
 
  .button {
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 304f3ee80..c68d763c1 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -140,6 +140,18 @@ export class UserCardComponent implements OnInit, OnChanges {
       this.isMdoLeader = fullProfile.unMappedUser.roles.includes('MDO_LEADER')
       this.isBoth = fullProfile.unMappedUser.roles.includes('MDO_LEADER') && fullProfile.unMappedUser.roles.includes('MDO_ADMIN')
     }
+
+    if (this.usersData && this.usersData.length > 0) {
+      this.usersData = _.orderBy(this.usersData, item => item.firstName, ['asc'])
+
+      // formatting profileStatusUpdatedOn value
+      this.usersData.forEach((u: any) => {
+        if (u.profileDetails.profileStatusUpdatedOn) {
+          const val = u.profileDetails.profileStatusUpdatedOn.split(' ')
+          u.profileDetails.profileStatusUpdatedOn = val[0]
+        }
+      })
+    }
   }
 
   enableUpdateButton(appData: any): boolean {
@@ -158,10 +170,6 @@ export class UserCardComponent implements OnInit, OnChanges {
   }
 
   ngOnInit() {
-    if (this.usersData && this.usersData.length > 0) {
-      this.usersData = _.orderBy(this.usersData, item => item.firstName, ['asc'])
-    }
-
     if (this.isApprovals && this.usersData) {
       this.approvalData = this.usersData
       if (this.approvalData && this.approvalData.length > 0) {
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
index b1204bbc0..2c3b3b417 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
@@ -35,10 +35,10 @@
             mat-button (click)="filter('profileverification'); tabTelemetry('toapprove', 0)" role="button">Profile
             Verifications ({{approvalTotalCount}})</a>
 
-          <a routerLink="/app/home/approvals/transfers" class="filter-option"
+          <!-- <a routerLink="/app/home/approvals/transfers" class="filter-option"
             [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'transfers', 'ws-mat-accent-border font-medium':currentFilter !== 'transfers'}"
             mat-button (click)="filter('transfers'); tabTelemetry('transfers', 1)" role="button">Transfers
-            ({{approvalTotalCount}})</a>
+            ({{approvalTotalCount}})</a> -->
         </div>
       </div>
       <ng-container *ngIf="currentFilter === 'profileverification'">
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
index 55e2cb526..c1004e617 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
@@ -35,8 +35,7 @@
             <div class="text-primary cursor-pointer" (click)="fileInput.click()" (dblclick)="$event.preventDefault()">
               Browse files</div>
             <input hidden type="file" #fileInput (click)="handleFileClick($event)" (change)="handleOnFileChange($event)"
-              name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();"
-              accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel, .xlsx, .xls" />
+              name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();" accept=".xlsx, .xls" />
             <!-- <div class="flex">or</div>
             <div class="flex">Drag file to upload</div> -->
           </div>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
index 6ac832d37..357ccfe47 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
@@ -1,6 +1,6 @@
 <div class="flex flex-col gap-6">
   <div class="flex flex-col gap-4 bulk-container">
-    <div class="flex font-bold">Bulk creation</div>
+    <div class="flex font-bold">Bulk Creation</div>
     <div class="flex flex-row gap-8">
       <div class="flex-1">
         <div class="flex flex-col gap-3 dashed-card">
@@ -30,8 +30,7 @@
             <div class="text-primary cursor-pointer" (click)="fileInput.click()" (dblclick)="$event.preventDefault()">
               Browse files</div>
             <input hidden type="file" #fileInput (click)="handleFileClick($event)" (change)="handleOnFileChange($event)"
-              name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();"
-              accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel, .xlsx, .xls" />
+              name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();" accept=".xlsx, .xls" />
             <!-- <div class="flex">or</div>
             <div class="flex">Drag file to upload</div> -->
           </div>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
index 3b79f8ab3..1476336da 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
@@ -1,3 +1,4 @@
+<div class="mat-title">Create a New User</div>
 <div class="flex flex-col gap-6 bulk-container">
   <div class="text-xl font-semibold">User Details</div>
 

From f775621c103e70dce632476307f07d3a6e2eefc5 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Tue, 28 May 2024 12:15:40 +0530
Subject: [PATCH 644/887] Fixed lint issue

---
 .../home/components/user-cards/user-card.component.ts     | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index c68d763c1..77fa2e48e 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -107,9 +107,9 @@ export class UserCardComponent implements OnInit, OnChanges {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-    private dialog: MatDialog, private approvalSvc: ApprovalsService,
-    private route: ActivatedRoute, private snackBar: MatSnackBar,
-    private events: EventService) {
+              private dialog: MatDialog, private approvalSvc: ApprovalsService,
+              private route: ActivatedRoute, private snackBar: MatSnackBar,
+              private events: EventService) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', [Validators.required]),
       group: new FormControl('', [Validators.required]),
@@ -210,7 +210,6 @@ export class UserCardComponent implements OnInit, OnChanges {
               if (data.needApprovalList && data.needApprovalList.length === 1) {
                 data.noneedApprovalList = []
                 if (data.needApprovalList[0].feildName === 'group') {
-                  console.log('appdata.needApprovalList[0]', data)
                   const obj = {
                     label: 'Designation',
                     feildName: 'designation',
@@ -219,7 +218,6 @@ export class UserCardComponent implements OnInit, OnChanges {
                   data.noneedApprovalList.push(obj)
                 }
                 if (data.needApprovalList[0].feildName === 'designation') {
-                  console.log('appdata.needApprovalList[0]', data)
                   const obj = {
                     label: 'Group',
                     feildName: 'group',

From ae3d8113ae50b8e2aee603fddca3ad157e249aa0 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Tue, 28 May 2024 18:13:33 +0530
Subject: [PATCH 645/887] Fixed 4805

---
 .../user-cards/user-card.component.html       |  31 ++++-
 .../user-cards/user-card.component.ts         | 118 +++++++++++-------
 2 files changed, 100 insertions(+), 49 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index ea48798eb..cae7c211e 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -339,7 +339,7 @@
                 </div>
               </div>
 
-              <div class="md:w-1/2" *ngIf="!isMdoLeader">
+              <div class="md:w-1/1" *ngIf="!isMdoLeader">
                 <label class="view-text-label">Roles</label>
                 <div *ngIf="user?.organisations && user?.organisations[0].roles.length > 0">
                   <ul class="roleslist">
@@ -352,7 +352,8 @@
             </div>
 
             <div class="flex flex-row margin-top-l">
-              <button mat-raised-button type="submit" (click)="onSubmit(updateUserDataForm, user, panel)"
+              <button mat-raised-button type="submit"
+                (click)="confirmUpdate(updateconfirm, updateUserDataForm, user, panel)"
                 class="margin-right-m btn-success btn-responsive successbtn" [disabled]="updateUserDataForm?.invalid">
                 <span class="text-white" i18n>
                   Update
@@ -734,14 +735,14 @@
           </div>
 
           <div class="flex flex-row margin-top-l">
-            <button mat-raised-button type="submit" (click)="onApprovalSubmit(panel)"
+            <button mat-raised-button type="submit" (click)="confirmApproval(approvalconfirm, panel)"
               class="margin-right-m btn-success btn-responsive successbtn"
               [disabled]="appData.needApprovalList.length !== actionList.length">
               <span class="text-white" i18n>
                 Update
               </span>
             </button>
-            <button mat-raised-button type="submit" (click)="onApprovalCancel()"
+            <button mat-raised-button type="submit" (click)="onApprovalCancel(panel)"
               class="btn-success btn-responsive cancelbtn">
               <span i18n>
                 Cancel
@@ -846,4 +847,26 @@
       </button>
     </div>
   </div>
+</ng-template>
+
+<ng-template #approvalconfirm>
+  <div class="confirm-dialog text-center padding-l">
+    <mat-icon class="infoIcon orangeicon-dialog">error_outline</mat-icon>
+    <div mat-dialog-content i18n class="margin-top-xs blue-text">
+      Are you sure you want to save changes?
+    </div>
+    <div mat-dialog-actions class="flex-center margin-top-s">
+      <button mat-raised-button type="submit" [mat-dialog-close]="false"
+        class="margin-right-m  btn-success btn-responsive cancelbtn">
+        <span i18n>
+          No
+        </span>
+      </button>
+      <button mat-raised-button type="submit" [mat-dialog-close]="true" class="btn-success btn-responsive successbtn">
+        <span class="text-white" i18n>
+          Yes
+        </span>
+      </button>
+    </div>
+  </div>
 </ng-template>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 77fa2e48e..6e46138f9 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -107,9 +107,9 @@ export class UserCardComponent implements OnInit, OnChanges {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-              private dialog: MatDialog, private approvalSvc: ApprovalsService,
-              private route: ActivatedRoute, private snackBar: MatSnackBar,
-              private events: EventService) {
+    private dialog: MatDialog, private approvalSvc: ApprovalsService,
+    private route: ActivatedRoute, private snackBar: MatSnackBar,
+    private events: EventService) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', [Validators.required]),
       group: new FormControl('', [Validators.required]),
@@ -269,6 +269,7 @@ export class UserCardComponent implements OnInit, OnChanges {
     await this.loadGroups()
     await this.loadLangauages()
     await this.loadCountryCodes()
+    await this.loadRoles()
   }
 
   async loadDesignations() {
@@ -315,6 +316,13 @@ export class UserCardComponent implements OnInit, OnChanges {
       })
   }
 
+  async loadRoles() {
+    this.roleservice.getAllRoles().subscribe((_data: any) => {
+      const parseRoledata = JSON.parse(_data.result.response.value)
+      this.orgTypeList = parseRoledata.orgTypeList
+    })
+  }
+
   closeOtherPanels(openPanel: MatExpansionPanel) {
     this.panels.forEach(panel => {
       if (panel !== openPanel) {
@@ -359,6 +367,7 @@ export class UserCardComponent implements OnInit, OnChanges {
     pnael.open()
     user.enableEdit = !user.enableEdit
     this.setUserDetails(user)
+    this.mapRoles(user)
   }
 
   getUerData(user: any, data: any) {
@@ -375,51 +384,40 @@ export class UserCardComponent implements OnInit, OnChanges {
       this.comment = ''
       this.getApprovalList(data)
     } else {
-      this.roleservice.getAllRoles().subscribe((_data: any) => {
-        const parseRoledata = JSON.parse(_data.result.response.value)
-        this.orgTypeList = parseRoledata.orgTypeList
-
-        // New code for roles
-        for (let i = 0; i < this.orgTypeList.length; i += 1) {
-          if (this.orgTypeList[i].name === 'MDO') {
-            _.each(this.orgTypeList[i].roles, rolesObject => {
-              // if (this.isMdoAdmin) {
-              //   if (rolesObject === 'PUBLIC') {
-              //     this.uniqueRoles.push({
-              //       roleName: rolesObject, description: rolesObject,
-              //     })
-              //   }
-              //   if (rolesObject === 'MDO_DASHBOARD_USER') {
-              //     this.uniqueRoles.push({
-              //       roleName: rolesObject, description: rolesObject,
-              //     })
-              //   }
-              // } else {
-              // if (this.isMdoLeader) {
-              if (rolesObject !== 'MDO_LEADER') {
-                this.uniqueRoles.push({
-                  roleName: rolesObject, description: rolesObject,
-                })
-                // }
-              }
-              // }
-            })
-          }
-        }
-        this.uniqueRoles.forEach((role: any) => {
-          if (!this.rolesList.some((item: any) => item.roleName === role.roleName)) {
-            this.rolesList.push(role)
-          }
-        })
-        const usrRoles = profileDataAll.organisations[0] && profileDataAll.organisations[0].roles
-          ? profileDataAll.organisations[0].roles : []
-        if (usrRoles.length > 0) {
-          usrRoles.forEach((role: any) => {
-            this.orguserRoles.push(role)
-            this.modifyUserRoles(role)
+      this.mapRoles(user)
+    }
+  }
+
+  mapRoles(user: any) {
+    if (this.orgTypeList && this.orgTypeList.length > 0) {
+      // New code for roles
+      for (let i = 0; i < this.orgTypeList.length; i += 1) {
+        if (this.orgTypeList[i].name === 'MDO') {
+          _.each(this.orgTypeList[i].roles, rolesObject => {
+            if (rolesObject !== 'MDO_LEADER') {
+              this.uniqueRoles.push({
+                roleName: rolesObject, description: rolesObject,
+              })
+            }
           })
         }
+      }
+      this.uniqueRoles.forEach((role: any) => {
+        if (!this.rolesList.some((item: any) => item.roleName === role.roleName)) {
+          this.rolesList.push(role)
+        }
       })
+      const usrRoles = user.organisations[0] && user.organisations[0].roles
+        ? user.organisations[0].roles : []
+      if (usrRoles.length > 0) {
+        usrRoles.forEach((role: any) => {
+          this.orguserRoles.push(role)
+          this.modifyUserRoles(role)
+        })
+      }
+    } else {
+      this.loadRoles()
+      this.mapRoles(user)
     }
   }
 
@@ -819,4 +817,34 @@ export class UserCardComponent implements OnInit, OnChanges {
       }
     })
   }
+
+  confirmUpdate(template: any, updateUserDataForm: any, user: any, panel: any) {
+    const dialog = this.dialog.open(template, {
+      width: '500px',
+    })
+    dialog.afterClosed().subscribe((v: any) => {
+      if (v) {
+        this.onSubmit(updateUserDataForm, user, panel)
+      } else {
+        this.cancelSubmit(user)
+      }
+    })
+  }
+
+  confirmApproval(template: any, panel: any) {
+    const dialog = this.dialog.open(template, {
+      width: '500px',
+    })
+    dialog.afterClosed().subscribe((v: any) => {
+      if (v) {
+        this.onApprovalSubmit(panel)
+      } else {
+        panel.close()
+      }
+    })
+  }
+
+  onApprovalCancel(panel: any) {
+    panel.close()
+  }
 }

From 8731f3868650a02dedcb6041e10e7badde951134 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Tue, 28 May 2024 19:12:11 +0530
Subject: [PATCH 646/887] Fixed 4947

---
 .../routes/home/components/user-cards/user-card.component.ts   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 6e46138f9..9b5e9bffa 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -78,7 +78,7 @@ export class UserCardComponent implements OnInit, OnChanges {
   masterLanguages: Observable<any[]> | undefined
   masterLanguagesEntries: any
   genderList = ['Male', 'Female', 'Others']
-  categoryList = ['General', 'OBC', 'SC', 'ST', 'Others']
+  categoryList = ['General', 'OBC', 'SC', 'ST']
   // needApprovalList: any[] = []
   profileData: any[] = []
   userwfData!: any
@@ -413,6 +413,7 @@ export class UserCardComponent implements OnInit, OnChanges {
         usrRoles.forEach((role: any) => {
           this.orguserRoles.push(role)
           this.modifyUserRoles(role)
+          this.updateUserDataForm.controls['roles'].setValue(usrRoles)
         })
       }
     } else {

From be5266579df16aaa166c453899ad24d6a3004575 Mon Sep 17 00:00:00 2001
From: Vinod Kumar Shyave <121538586+vShyave@users.noreply.github.com>
Date: Wed, 29 May 2024 11:56:23 +0530
Subject: [PATCH 647/887] KB-4938, 4722, 4946 is fixed

---
 .../bulk-upload/bulk-upload.component.html       |  5 ++---
 .../bulk-upload/bulk-upload.component.html       |  5 ++---
 .../single-user-creation.component.ts            | 16 ++++++++--------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
index c1004e617..4067581d5 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
@@ -56,10 +56,9 @@
           <div class="flex flex-row gap-1">
             <div class="font-bold">File Information</div>
           </div>
-          <div class="flex flex-row gap-2 outline-button items-center" *ngIf="list?.status !== 'SUCCESSFUL'"
-            (click)="handleDownloadFile(list)">
+          <div class="flex flex-row gap-2 outline-button items-center" (click)="handleDownloadFile(list)">
             <mat-icon>download_2</mat-icon>
-            Download error log
+            {{ list?.status !== 'SUCCESSFUL' ? 'Download error log' : 'Download file' }}
           </div>
         </div>
         <div class="grid grid-flow-row sm:grid-flow-col gap-10 grid-col grid-container-25">
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
index 357ccfe47..bc64c3cd9 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
@@ -51,10 +51,9 @@
           <div class="flex flex-row gap-1">
             <div class="font-bold">File Information</div>
           </div>
-          <div class="flex flex-row gap-2 outline-button items-center" *ngIf="list?.status !== 'SUCCESSFUL'"
-            (click)="handleDownloadFile(list)">
+          <div class="flex flex-row gap-2 outline-button items-center" (click)="handleDownloadFile(list)">
             <mat-icon>download_2</mat-icon>
-            Download error log
+            {{ list?.status !== 'SUCCESSFUL' ? 'Download error log' : 'Download file' }}
           </div>
         </div>
         <div class="grid grid-flow-row sm:grid-flow-col gap-10 grid-col grid-container-25">
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
index 92e53d904..0a7c15ecd 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
@@ -26,9 +26,9 @@ export const MY_FORMATS = {
   },
 }
 
-const EMAIL_PATTERN = `^[\\w\-\\.]+@([\\w-]+\\.)+[\\w-]{2,4}$`
-const MOBILE_PATTERN = '^((\\+91-?)|0)?[0-9]{10}$'
-const PIN_CODE_PATTERN = '(^[0-9]{6}$)'
+const EMAIL_PATTERN = /^[a-zA-Z0-9](\.?[a-zA-Z0-9_]+)*@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/
+const MOBILE_PATTERN = /^[0]?[6789]\d{9}$/
+const PIN_CODE_PATTERN = /^[1-9][0-9]{5}$/
 
 @Component({
   selector: 'ws-single-user-creation',
@@ -123,7 +123,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((_res: any) => {
         this.masterData['designation'] = _res.responseData
         this.masterData['designationBackup'] = _res.responseData
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch designation details, please try again later!')
         }
@@ -136,7 +136,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((res: any) => {
         this.masterData['language'] = res.languages
         this.masterData['languageBackup'] = res.languages
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch master language details, please try again later!')
         }
@@ -148,7 +148,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
         this.masterData['group'] = res.result.response
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch group data, please try again later!')
         }
@@ -166,7 +166,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
             this.masterData['mdoRoles'] = mdoArray.roles
           }
         }
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch roles list, please try again later!')
         }
@@ -238,7 +238,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((_res: any) => {
         this.matSnackBar.open('User created successfully!')
         this.handleFormClear()
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open(_.get(_err, 'error.params.errmsg') || 'Unable to create user, please try again later!')
         }

From a366360569201e56b9ee12f34aac2bb0bdefe8c2 Mon Sep 17 00:00:00 2001
From: Vinod Kumar Shyave <121538586+vShyave@users.noreply.github.com>
Date: Wed, 29 May 2024 11:57:41 +0530
Subject: [PATCH 648/887] KB-4938, 4722, 4946 is fixed

---
 .../single-user-creation.component.ts                  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
index 0a7c15ecd..ae4c94c0f 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
@@ -123,7 +123,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((_res: any) => {
         this.masterData['designation'] = _res.responseData
         this.masterData['designationBackup'] = _res.responseData
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch designation details, please try again later!')
         }
@@ -136,7 +136,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((res: any) => {
         this.masterData['language'] = res.languages
         this.masterData['languageBackup'] = res.languages
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch master language details, please try again later!')
         }
@@ -148,7 +148,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
         this.masterData['group'] = res.result.response
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch group data, please try again later!')
         }
@@ -166,7 +166,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
             this.masterData['mdoRoles'] = mdoArray.roles
           }
         }
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch roles list, please try again later!')
         }
@@ -238,7 +238,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((_res: any) => {
         this.matSnackBar.open('User created successfully!')
         this.handleFormClear()
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open(_.get(_err, 'error.params.errmsg') || 'Unable to create user, please try again later!')
         }

From c8d51509a53b6ad5c79a32d76c2da853cf533c94 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Wed, 29 May 2024 15:40:36 +0530
Subject: [PATCH 649/887] update for bulk upload issues

---
 .../bulk-upload/bulk-upload.component.html          | 10 ++++++----
 .../approvals/bulk-upload/bulk-upload.component.ts  | 13 ++++++++++---
 .../bulk-upload/bulk-upload.component.html          |  7 ++++---
 .../users-view/bulk-upload/bulk-upload.component.ts |  7 +++++++
 4 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
index 4067581d5..30a4059a9 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
@@ -30,7 +30,7 @@
             (dblclick)="$event.preventDefault()">
             <img src="/assets/icons/csv-file.svg" alt="CSV file logo" />
           </div>
-          <div *ngIf="showFileError" class="error-msg">Upload xsls format file only</div>
+          <div *ngIf="showFileError" class="error-msg">Upload xlsx format file only</div>
           <div class="flex flex-col items-center">
             <div class="text-primary cursor-pointer" (click)="fileInput.click()" (dblclick)="$event.preventDefault()">
               Browse files</div>
@@ -41,7 +41,7 @@
           </div>
           <div class="flex flex-col items-center margin-bottom-m">
             <div class="flex">Max file size: 100 MB</div>
-            <div class="flex">Supported file types: xsls</div>
+            <div class="flex">Supported file types: xlsx</div>
           </div>
         </div>
       </div>
@@ -50,7 +50,8 @@
 
   <div class="text-base font-bold">File logs</div>
   <div class="flex flex-col gap-6">
-    <div class="file-container" *ngFor="let list of lastUploadList | orderBy:'datecreatedon':'desc'">
+    <div class="file-container"
+      *ngFor="let list of lastUploadList | slice : startIndex : lastIndex | orderBy:'datecreatedon':'desc'">
       <div class="flex flex-col gap-4">
         <div class="flex flex-row justify-between items-center">
           <div class="flex flex-row gap-1">
@@ -89,7 +90,7 @@
             <div class="value">{{ list?.datecreatedon | date: 'dd MMM yyyy h:mm a' }}</div>
           </div>
           <div class="flex flex-col">
-            <div class="label">Completed ON</div>
+            <div class="label">Completed On</div>
             <div class="value">{{ list?.dateupdatedon | date: 'dd MMM yyyy h:mm a' }}</div>
           </div>
         </div>
@@ -100,6 +101,7 @@
   <div class="flex flex-row justify-end mt-4">
     <mat-paginator [pageSize]="pageSize" [length]="lastUploadList.length" [pageSizeOptions]="sizeOptions"
       (page)="handleChangePage($event)"></mat-paginator>
+
   </div>
 
 
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
index f3e73e42e..d3b620b8f 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
@@ -62,12 +62,19 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
     this.lastIndex = this.sizeOptions[0]
   }
 
+  onChangePage(pe: PageEvent) {
+    this.startIndex = pe.pageIndex * pe.pageSize
+    this.lastIndex = (pe.pageIndex + 1) * pe.pageSize
+
+    // this.startIndex = this.pageIndex
+  }
+
   getBulkStatusList(): void {
     this.fileService.getBulkApprovalUploadDataV1()
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
         this.lastUploadList = res.result.content
-      },         (error: HttpErrorResponse) => {
+      }, (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open('Unable to get Bulk status list')
         }
@@ -109,7 +116,7 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
         if (!resendFlag) {
           this.verifyOTP(contactType)
         }
-      },         (error: HttpErrorResponse) => {
+      }, (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open(_.get(error, 'error.params.errmsg') || `Unable to send OTP to your ${contactType}, please try again later!`)
         }
@@ -157,7 +164,7 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
             this.fileName = ''
             this.fileSelected = ''
             this.getBulkStatusList()
-          },         (_err: HttpErrorResponse) => {
+          }, (_err: HttpErrorResponse) => {
             if (!_err.ok) {
               this.matSnackBar.open('Uploading CSV file failed due to some error, please try again later!')
             }
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
index bc64c3cd9..e46bee73a 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
@@ -25,7 +25,7 @@
             (dblclick)="$event.preventDefault()">
             <img src="/assets/icons/csv-file.svg" alt="CSV file logo" />
           </div>
-          <div *ngIf="showFileError" class="error-msg">Upload xsls format file only</div>
+          <div *ngIf="showFileError" class="error-msg">Upload xlsx format file only</div>
           <div class="flex flex-col items-center">
             <div class="text-primary cursor-pointer" (click)="fileInput.click()" (dblclick)="$event.preventDefault()">
               Browse files</div>
@@ -36,7 +36,7 @@
           </div>
           <div class="flex flex-col items-center margin-bottom-m">
             <div class="flex">Max file size: 100 MB</div>
-            <div class="flex">Supported file types: xsls</div>
+            <div class="flex">Supported file types: xlsx</div>
           </div>
         </div>
       </div>
@@ -45,7 +45,8 @@
 
   <div class="text-base font-bold">File logs</div>
   <div class="flex flex-col gap-6">
-    <div class="file-container" *ngFor="let list of lastUploadList | orderBy:'dateCreatedOn':'desc'">
+    <div class="file-container"
+      *ngFor="let list of lastUploadList | slice : startIndex : lastIndex | orderBy:'dateCreatedOn':'desc'">
       <div class="flex flex-col gap-4">
         <div class="flex flex-row justify-between items-center">
           <div class="flex flex-row gap-1">
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts
index 5ee2ace34..9660dfd08 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts
@@ -62,6 +62,13 @@ export class BulkUploadComponent implements OnInit, AfterViewInit, OnDestroy {
     this.lastIndex = this.sizeOptions[0]
   }
 
+  onChangePage(pe: PageEvent) {
+    this.startIndex = pe.pageIndex * pe.pageSize
+    this.lastIndex = (pe.pageIndex + 1) * pe.pageSize
+
+    // this.startIndex = this.pageIndex
+  }
+
   getBulkStatusList(): void {
     this.fileService.getBulkUploadDataV1(this.rootOrgId)
       .pipe(takeUntil(this.destroySubject$))

From 4b03e16c8b0d2a4aed1d0b66aa791c49209d7242 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Wed, 29 May 2024 15:43:06 +0530
Subject: [PATCH 650/887] update for bulkupload lint issue

---
 .../home/components/user-cards/user-card.component.ts       | 6 +++---
 .../routes/approvals/bulk-upload/bulk-upload.component.ts   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 9b5e9bffa..a97e9b543 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -107,9 +107,9 @@ export class UserCardComponent implements OnInit, OnChanges {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-    private dialog: MatDialog, private approvalSvc: ApprovalsService,
-    private route: ActivatedRoute, private snackBar: MatSnackBar,
-    private events: EventService) {
+              private dialog: MatDialog, private approvalSvc: ApprovalsService,
+              private route: ActivatedRoute, private snackBar: MatSnackBar,
+              private events: EventService) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', [Validators.required]),
       group: new FormControl('', [Validators.required]),
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
index d3b620b8f..930a2256b 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
@@ -74,7 +74,7 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
         this.lastUploadList = res.result.content
-      }, (error: HttpErrorResponse) => {
+      },         (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open('Unable to get Bulk status list')
         }
@@ -116,7 +116,7 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
         if (!resendFlag) {
           this.verifyOTP(contactType)
         }
-      }, (error: HttpErrorResponse) => {
+      },         (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open(_.get(error, 'error.params.errmsg') || `Unable to send OTP to your ${contactType}, please try again later!`)
         }
@@ -164,7 +164,7 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
             this.fileName = ''
             this.fileSelected = ''
             this.getBulkStatusList()
-          }, (_err: HttpErrorResponse) => {
+          },         (_err: HttpErrorResponse) => {
             if (!_err.ok) {
               this.matSnackBar.open('Uploading CSV file failed due to some error, please try again later!')
             }

From c9c64468b11eaa8c6436e5a1faea7ada4b67d985 Mon Sep 17 00:00:00 2001
From: Vinod Kumar Shyave <121538586+vShyave@users.noreply.github.com>
Date: Wed, 29 May 2024 17:23:24 +0530
Subject: [PATCH 651/887] Enabled Public always & MDO_LEADER hidden

---
 .../single-user-creation.component.html       | 11 +++--
 .../single-user-creation.component.ts         | 49 ++++++++++++++-----
 2 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
index 1476336da..00af3c325 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
@@ -157,10 +157,13 @@
       <div class="input-container">
         <div class="label required mb-2">Role</div>
         <div class="flex flex-col gap-4">
-          <div class="flex flex-row gap-4" *ngFor="let role of masterData?.mdoRoles">
-            <div class="flex-1">{{ role }}</div>
-            <mat-checkbox #rolesCheckbox (change)="handleRolesCheck($event, role)"></mat-checkbox>
-          </div>
+          <ng-container *ngFor="let role of masterData?.mdoRoles">
+            <div class="flex flex-row gap-4" *ngIf="role !== 'MDO_LEADER'">
+              <div class="flex-1">{{ role }}</div>
+              <mat-checkbox value="{{ role }}" #rolesCheckbox [checked]="role === 'PUBLIC'"
+                [disabled]="role === 'PUBLIC'" (change)="handleRolesCheck($event, role)"></mat-checkbox>
+            </div>
+          </ng-container>
         </div>
       </div>
       <div class="input-container"></div>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
index ae4c94c0f..8c8526c1c 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
@@ -1,4 +1,4 @@
-import { Component, ElementRef, OnDestroy, OnInit, QueryList, ViewChildren } from '@angular/core'
+import { AfterViewInit, Component, ElementRef, OnDestroy, OnInit, QueryList, ViewChildren } from '@angular/core'
 import { FormBuilder, FormControl, Validators } from '@angular/forms'
 import { MomentDateAdapter } from '@angular/material-moment-adapter'
 import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE } from '@angular/material/core'
@@ -39,9 +39,10 @@ const PIN_CODE_PATTERN = /^[1-9][0-9]{5}$/
     { provide: MAT_DATE_FORMATS, useValue: MY_FORMATS },
   ],
 })
-export class SingleUserCreationComponent implements OnInit, OnDestroy {
+export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDestroy {
 
   @ViewChildren('rolesCheckbox') checkboxes!: QueryList<ElementRef>
+  defaultRole = ['PUBLIC']
   private destroySubject$ = new Subject()
   separatorKeysCodes: number[] = [ENTER, COMMA]
   masterData: any = {}
@@ -112,6 +113,18 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
     this.getMasterLanguages()
     this.getGroups()
     this.getOrgRolesList()
+  }
+
+  ngAfterViewInit(): void {
+    this.setDefaultValue()
+
+  }
+
+  setDefaultValue(): void {
+    if (this.userCreationForm.get('roles')) {
+      // tslint:disable-next-line
+      this.userCreationForm.get('roles')!.patchValue(this.defaultRole)
+    }
     this.userCreationForm.patchValue({
       channel: (this.fullProfile && this.fullProfile.unMappedUser.channel) || '',
     })
@@ -123,7 +136,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((_res: any) => {
         this.masterData['designation'] = _res.responseData
         this.masterData['designationBackup'] = _res.responseData
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch designation details, please try again later!')
         }
@@ -136,7 +149,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((res: any) => {
         this.masterData['language'] = res.languages
         this.masterData['languageBackup'] = res.languages
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch master language details, please try again later!')
         }
@@ -148,7 +161,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
         this.masterData['group'] = res.result.response
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch group data, please try again later!')
         }
@@ -166,7 +179,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
             this.masterData['mdoRoles'] = mdoArray.roles
           }
         }
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch roles list, please try again later!')
         }
@@ -181,18 +194,23 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
         this.rolesArr.splice(this.rolesArr.indexOf(role), 1)
       }
     }
-
-    this.userCreationForm.patchValue({
-      roles: this.rolesArr,
-    })
+    // tslint:disable-next-line
+    this.userCreationForm.get('roles')!.patchValue([...this.defaultRole, ...this.rolesArr])
   }
 
   handleAddTags(event: MatChipInputEvent): void {
     const value = event.value as string
-    if ((value && value.trim()) && this.userCreationForm.get('roles')) {
+    // tslint:disable-next-line
+    if (!this.userCreationForm.get('tags')!.value) {
+      // tslint:disable-next-line
+      this.userCreationForm.get('tags')!.patchValue([])
+    }
+
+    if ((value && value.trim()) && this.userCreationForm.get('tags')) {
       // tslint:disable-next-line
       this.userCreationForm.get('tags')!.value.push(value)
     }
+
     if (event.input) {
       event.input.value = ''
     }
@@ -212,8 +230,13 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
   handleFormClear(): void {
     this.userCreationForm.reset()
     this.checkboxes.forEach((elem: any) => {
-      elem.checked = false
+      if (elem.value !== 'PUBLIC') {
+        elem.checked = false
+      }
     })
+    // this.initForm()
+    this.rolesArr = []
+    this.setDefaultValue()
   }
 
   handleUserCreation(): void {
@@ -238,7 +261,7 @@ export class SingleUserCreationComponent implements OnInit, OnDestroy {
       .subscribe((_res: any) => {
         this.matSnackBar.open('User created successfully!')
         this.handleFormClear()
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open(_.get(_err, 'error.params.errmsg') || 'Unable to create user, please try again later!')
         }

From 01dde60ca91a96358b6f66fe62e6ca508076e537 Mon Sep 17 00:00:00 2001
From: Vinod Kumar Shyave <121538586+vShyave@users.noreply.github.com>
Date: Wed, 29 May 2024 17:25:08 +0530
Subject: [PATCH 652/887] Enabled Public always & MDO_LEADER hidden

---
 .../single-user-creation.component.ts                  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
index 8c8526c1c..748a960c0 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
@@ -136,7 +136,7 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
       .subscribe((_res: any) => {
         this.masterData['designation'] = _res.responseData
         this.masterData['designationBackup'] = _res.responseData
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch designation details, please try again later!')
         }
@@ -149,7 +149,7 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
       .subscribe((res: any) => {
         this.masterData['language'] = res.languages
         this.masterData['languageBackup'] = res.languages
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch master language details, please try again later!')
         }
@@ -161,7 +161,7 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
         this.masterData['group'] = res.result.response
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch group data, please try again later!')
         }
@@ -179,7 +179,7 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
             this.masterData['mdoRoles'] = mdoArray.roles
           }
         }
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch roles list, please try again later!')
         }
@@ -261,7 +261,7 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
       .subscribe((_res: any) => {
         this.matSnackBar.open('User created successfully!')
         this.handleFormClear()
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open(_.get(_err, 'error.params.errmsg') || 'Unable to create user, please try again later!')
         }

From aa79dca63f4b04859326c82dc26ba2728f517283 Mon Sep 17 00:00:00 2001
From: sohail amjad <sohail.amjad@tarento.com>
Date: Wed, 29 May 2024 17:40:33 +0530
Subject: [PATCH 653/887] manage request implementation

---
 .../assign-list-popup.component.ts            |  14 +-
 .../create-request-form.component.ts          |   2 +
 .../request-list/request-list.component.html  | 106 +++++-
 .../request-list/request-list.component.scss  | 327 +++++++++++++++---
 .../request-list/request-list.component.ts    |  26 +-
 .../lib/routes/home/services/home.servive.ts  |   2 +
 6 files changed, 419 insertions(+), 58 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.ts
index 2b07ed41f..8586ec0d8 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.ts
@@ -27,14 +27,22 @@ export class AssignListPopupComponent implements OnInit {
   ]
   displayedColumns: string[] = ['select', 'providerName', 'details', 'eta']
 
-  constructor(private fb: FormBuilder) {}
-
-  ngOnInit() {
+  constructor(private fb: FormBuilder,
+  ) {
     this.requestForm = this.fb.group({
       assignee: new FormControl(''),
     })
   }
 
+  ngOnInit() {
+   
+  }
+
+
+  getAssigneeList(){
+
+  }
+
   assign() {
     const selectedProvider = this.requestForm.value.assignee
     if (selectedProvider) {
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
index fbc17bfc6..6a900d4f3 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
@@ -5,7 +5,9 @@ import { ActivatedRoute, Router } from '@angular/router'
 import { MatDialog, MatSnackBar } from '@angular/material'
 import { CompetencyViewComponent } from '../competency-view/competency-view.component'
 import { ConfirmationBoxComponent } from '../../../../training-plan/components/confirmation-box/confirmation.box.component'
+/* tslint:disable */
 import _ from 'lodash'
+/* tslint:enable */
 
 @Component({
   selector: 'ws-app-create-request-form',
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
index 58a2de999..b9aa758db 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
@@ -27,14 +27,116 @@ <h2>Content Request</h2>
     <div class="create-action">
         <button mat-button type="button" class="search-btn" [routerLink]="['/app/home/create-request-form']">Request Content</button>
     </div>
+
+    <div class="nav-container">
+        <div class="sidenav-content">
+          <div class="table-class">
+            <table mat-table [dataSource]="dataSource">
+              <ng-container matColumnDef="RequestId">
+                <th mat-header-cell *matHeaderCellDef>Request ID </th>
+                <td mat-cell class="title-class" *matCellDef="let element">{{element?.demand_id}}</td>
+              </ng-container>
+  
+              <ng-container matColumnDef="title">
+                <th mat-header-cell *matHeaderCellDef>Title </th>
+                <td mat-cell class="title-class" *matCellDef="let element">{{element?.title}}</td>
+              </ng-container>
+  
+              <ng-container matColumnDef="requestType">
+                <th mat-header-cell *matHeaderCellDef>Request Type </th>
+                <td mat-cell class="title-class" *matCellDef="let element">{{element?.requestType}}</td>
+              </ng-container>
+  
+              <ng-container matColumnDef="requestStatus">
+                <th mat-header-cell *matHeaderCellDef>Request Status </th>
+                <td mat-cell class="title-class" *matCellDef="let element">{{element?.status}}</td>
+              </ng-container>
+  
+              <ng-container matColumnDef="assignee">
+                <th mat-header-cell *matHeaderCellDef>Assignee </th>
+                <td mat-cell class="title-class" *matCellDef="let element">{{element?.assignedProvider}}</td>
+              </ng-container>
+  
+              <ng-container matColumnDef="requestedOn">
+                <th mat-header-cell *matHeaderCellDef>Requested On </th>
+                <td mat-cell class="title-class" *matCellDef="let element">{{element?.createdOn | date}}</td>
+              </ng-container>
+
+              <ng-container matColumnDef="interests">
+                <th mat-header-cell *matHeaderCellDef>Interests</th>
+                <td mat-cell class="title-class" *matCellDef="let element">
+                    <a class="action-btn-view"  (click)="showInterestPopup()"
+                    href="javascript:void(0)">{{element?.interestCount}}</a>
+                </td>
+              </ng-container>
+  
+              <ng-container matColumnDef="details">
+                <th mat-header-cell *matHeaderCellDef>Details</th>
+                <td mat-cell *matCellDef="let element">
+                  <mat-icon (click)="navigateToDetails(element.demand_id)" class="cursor-pointer">visibility</mat-icon>
+                </td>
+              </ng-container>
+  
+              <ng-container matColumnDef="action">
+                <th mat-header-cell *matHeaderCellDef>Action</th>
+                <td mat-cell  *matCellDef="let element">
+                
+                  <!-- <a class="action-btn-view" *ngIf="element.status === 'Unassigned'" (click)="showInterestPopup()"
+                    href="javascript:void(0)">Show
+                    Interest</a> -->
+
+
+                      <span>
+                    <button mat-icon-button [matMenuTriggerFor]="menu" aria-label="Example icon-button with a menu">
+                      <mat-icon>more_vert</mat-icon>
+                    </button>
+                    <mat-menu #menu="matMenu">
+                      <button mat-menu-item (click)="onClickMenu(element,'viewContent')">
+                        <span >View</span>
+                      </button>
+                      <button *ngIf="element.status === statusKey.Unassigned && element.status!== statusKey.Inprogress &&  element.status!== statusKey.invalid " mat-menu-item (click)="onClickMenu(element,'invalidContent')">
+                        <span>Mark as invalid</span>
+                      </button>
+                      <button mat-menu-item *ngIf="element.status!== statusKey.Assigned && element.interestCount >0 && element.status!== statusKey.Inprogress &&  element.status!== statusKey.invalid" (click)="onClickMenu(element,'assignContent')">
+                        <span>Assign</span>
+                      </button>
+                      <button *ngIf="element.status === statusKey.Assigned && element.status!== statusKey.Inprogress &&  element.status!== statusKey.invalid " mat-menu-item (click)="onClickMenu(element,'reAssignContent')">
+                        <span> Re-Assign</span>
+                      </button>
+                      <button mat-menu-item (click)="onClickMenu(element,'copyContent')">
+                        <span>Copy</span>
+                      </button>
+                    </mat-menu>
+                  </span>
+                </td>
+  
+  
+              </ng-container>
+  
+              <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+              <tr mat-row *matRowDef="let row;columns:displayedColumns"></tr>
+  
+  
+            </table>
+  
+            <mat-paginator [pageSize]="pageSize" [length]="this.requestCount" [pageSizeOptions]="[10,20,40]"
+              (page)="onChangePage($event)"></mat-paginator>
+  
+  
+          </div>
+  
+  
+  
+        </div>
+    </div>
     
-    <div class="margin-top-l custom-table" *ngIf="requestListData"
+    <!-- <div class="margin-top-l custom-table" *ngIf="requestListData"
      [ngClass]="{ 'assignedClass':isAssigned }" 
      > 
     <ws-widget-org-user-table  [tableData]="tabledata" [data]="requestListData" [actionMenuItem]="pageConfig?.data?.actionMenu"  (actionsClick)="menuSelected($event)" (eOnRowClick)="viewDetails($event)">
     </ws-widget-org-user-table>
     <mat-paginator [pageSize]="pageSize" [length]="this.requestCount" [pageSizeOptions]="[20,30,40]"
     (page)="onChangePage($event)"></mat-paginator>
-</div>
+</div> -->
 
 </div>
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.scss b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.scss
index b261ed110..652743b58 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.scss
@@ -1,60 +1,295 @@
-.reportsDemo {
+@import "ws-common";
+@import "ws-mixins";
 
 
-    .reportsDemoVideo {
-      width: 290px;
-      height: 163px;
-      border-radius: 5px;
-      background-color: #FDEAD5;
-      font-weight: 600;
-      pointer-events: all;
-      cursor: pointer;
 
-      .video_icon {
-        font-size: 32px;
-      }
-    }
+table {
+  width: 100%;
+}
+
+.userTable {
+  box-shadow: none;
+}
+
+table tr {
+  height: 70px !important;
+}
+
+// ::ng-deep {
+//   table tr td .cdk-column-title .title-class {
+//     width: 13% !important;
+//   }
+// }
+
+// table tr td .cdk-column-title .cdk-column-assignee {
+//   width: 13% !important;
+// }
+
+table tr .cdk-column-title {
+  width: 18% !important;
+}
+
+table tr .cdk-column-RequestId {
+  width: 9% !important;
+}
+
+table tr .cdk-column-assignee {
+  width: 17% !important;
+}
+
+.action-btn-view {
+  color: #1B4CA1;
+  font-family: Lato;
+  font-size: 14px;
+  font-weight: 400;
+  line-height: 16.8px;
+  text-decoration: underline !important;
+}
+
+.title-class {
+  font-family: Lato;
+  font-size: 14px;
+  font-weight: 400;
+  line-height: 16.8px;
+}
+
+.search-border {
+  border-color: #cecece;
+}
+
+.color-60 {
+  color: rgba(0, 0, 0, .6) !important;
+}
+
+.nav-container {
+  position: relative;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  // min-height: 180vh;
+}
+
+.mt-1 {
+  margin-top: 2rem !important;
+}
+
+.m-auto {
+  margin: auto;
+}
+
+.searchinput {
+  padding: $size-xs;
+}
+
+.text-white {
+  color: white !important;
+}
+
+.small-list-logo {
+  width: 64px;
+  height: 36px;
+}
+
+.new-mat-table {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+}
+
+.new-row {
+  padding: 0.65em 0 0.65em 0;
+}
+
+.filter {
+  .filter-option {
+    margin: $size-xs $size-m;
+    /* border-bottom: darkslateblue; */
+    border-radius: 0;
+    border-bottom-width: 2px;
+    border-top-width: 0;
+    border-left-width: 0;
+    border-right-width: 0;
   }
+}
 
-  .create-action {
-    display: flex;
-    justify-content: end;
-    .search-btn {
-        background: #1b4ca1 !important;
-        color: white !important;
-        font-family: 'Lato';
-        font-weight: 700;
-        font-size: 14px;
-        border-radius: 4px;
-        min-width: 138px;
-    }
+.hand {
+  cursor: pointer;
+}
+
+.vertical-align {
+  vertical-align: text-bottom;
+}
+
+.width-300 {
+  width: 300px;
+}
+
+.font-size-m {
+  font-size: 16px;
+}
+
+.border-bottom {
+  border-bottom: 1px solid lightgray;
+}
+
+.mat-drawer-content {
+  overflow: hidden !important;
+}
+
+.pointer {
+  cursor: pointer;
+}
+
+.margin-right-xxl {
+  margin-right: 50px;
+}
+
+.margin-horizontal-s {
+  margin-left: 3%;
+  margin-right: 2%;
+}
+
+.flex-dynamic {
+  justify-content: flex-start;
+
+  @include breakpoint-gt-s {
+    justify-content: center;
   }
 
-  ::ng-deep {
-    .custom-table .cdk-column-status .textclass {
-    padding: 10px  !important;
-    border-radius: 10px !important;
-    color: white !important;
+  @include breakpoint-gt-xs {
+    justify-content: center;
   }
-  .unassignedClass .cdk-column-status .textclass {
-    background-color: #000000 !important;
-    opacity: 60%;
+
+  @include breakpoint-xs {
+    justify-content: center;
   }
-  .assignedClass .cdk-column-status .textclass {
-    background-color: #1D8923;
+
+  @include breakpoint-gt-m {
+    justify-content: flex-start;
   }
-  .custom-table .search {
-    display: none !important;
+}
+
+.large-icon {
+  font-size: 32px;
+  width: 32px;
+  height: 32px;
+}
+
+.sidenav {
+  width: 20%;
+  min-width: 250px;
+  // padding-left: $size-m;
+  background: inherit;
+  box-shadow: none;
+  // margin-bottom: 32px;
+}
+
+.sidenav-content {
+  margin: 0;
+  padding: 0 $size-m $size-l;
+  box-sizing: border-box;
+  min-height: calc(100vh);
+}
+
+.reportsDemo {
+
+
+  .reportsDemoVideo {
+    width: 290px;
+    height: 163px;
+    border-radius: 5px;
+    background-color: #FDEAD5;
+    font-weight: 600;
+    pointer-events: all;
+    cursor: pointer;
+
+    .video_icon {
+      font-size: 32px;
+    }
   }
-  .custom-table .cdk-column-title .textclass {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: initial;
-    display: -webkit-box;
-    -webkit-line-clamp: 2;
-    -webkit-box-orient: vertical;
+}
+
+.grid {
+  display: grid;
+  grid-template-columns: 1fr 0.3fr;
+  grid-auto-columns: minmax(auto, 300px);
+  width: 90%;
+}
+
+.close-button {
+  margin-right: 50px;
+}
+
+.hidden {
+  display: none;
+}
+
+.border-right {
+  border-right: 1px solid #cecece;
+}
+
+:host ::ng-deep .search {
+  .mat-form-field-wrapper {
+    padding-bottom: 0px !important;
   }
-  .custom-table .example-container .mat-paginator {
-    display: none !important;
+
+  .mat-form-field-infix {
+    border-top-width: 2px !important;
+    margin: auto;
+  }
+}
+
+.border-0 {
+  border: 0;
+}
+
+.min-width-4 {
+  min-width: 400px;
+}
+
+ws-auth-content-card-v2 {
+  display: contents;
+}
+
+// @import 'ws-vars';
+// @import 'ws-mixins';
+$size-xs: 8px;
+$size-s: 12px;
+$size-m: 16px;
+$size-l: 24px;
+$size-xl: 32px;
+$size-xxl: 40px;
+$card-standard-width: 268px;
+
+@mixin breakpoint-xs {
+  @media only screen and (max-width: 599px) {
+    @content;
+  }
+}
+
+$title-line-count: 2;
+
+mat-header-row {
+  min-height: 40px;
+}
+
+.mat-header-cell {
+  background-color: #F5F5F5;
+}
+
+.flex-update {
+  flex-direction: row;
+
+  @include breakpoint-xs {
+    flex-direction: row;
+  }
+
+
+}
+
+.flex-custom-m {
+  @include breakpoint-xs {
+    flex-direction: column;
   }
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
index 206e9841c..44f7bb9be 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
@@ -4,9 +4,15 @@ import { ITableData } from '@sunbird-cb/collection/lib/ui-org-table/interface/in
 import { ProfileV2Service } from '../../services/home.servive'
 import { DatePipe } from '@angular/common'
 import { ActivatedRoute, Router } from '@angular/router'
-import { MatDialog } from '@angular/material'
+import { MatDialog, MatTableDataSource } from '@angular/material'
 import { ConfirmationBoxComponent } from '../../../training-plan/components/confirmation-box/confirmation.box.component'
 import { AssignListPopupComponent } from './assign-list-popup/assign-list-popup.component'
+export enum statusValue {
+  Assigned= "Assigned",
+  Unassigned = "Unassigned",
+  Inprogress = "Inprogress",
+  invalid = "invalid"
+}
 @Component({
   selector: 'ws-app-request-list',
   templateUrl: './request-list.component.html',
@@ -49,6 +55,10 @@ export class RequestListComponent implements OnInit {
   requestCount: any
   invalidRes: any
   detailsEvent: any
+  dataSource:any;
+  displayedColumns: string[] = ["RequestId", "title", "requestType", "requestStatus", "assignee", "requestedOn", "interests", "action"]
+  statusKey = statusValue
+
 
   constructor(private sanitizer: DomSanitizer,
               private homeService: ProfileV2Service,
@@ -64,6 +74,7 @@ export class RequestListComponent implements OnInit {
       Please contact your MDO Leader to renew your access.`,
   ]
 
+
   ngOnInit() {
     this.configSvc = this.activeRoute.snapshot.data['configService']
     this.getRequestList()
@@ -98,18 +109,19 @@ export class RequestListComponent implements OnInit {
     }
   }
 
-  menuSelected(_event: any) {
-  switch (_event.action) {
+
+  onClickMenu(item: any,action:string) {
+  switch (action) {
     case 'viewContent':
 
       this.queryParams = {
-      id: _event.row.demand_id,
+      id: item.demand_id,
       name: 'view',
     }
       this.router.navigate(['/app/home/create-request-form'], { queryParams: this.queryParams })
       break
     case 'invalidContent':
-      this.showConformationModal(_event.row, _event.action)
+      this.showConformationModal(item, action)
       break
     case 'assignContent':
        this.openAssignlistPopup()
@@ -119,7 +131,7 @@ export class RequestListComponent implements OnInit {
       break
     case 'copyContent':
         this.queryParams = {
-          id: _event.row.demand_id,
+          id: item.demand_id,
           name: 'copy',
         }
           this.router.navigate(['/app/home/create-request-form'], { queryParams: this.queryParams })
@@ -230,7 +242,7 @@ export class RequestListComponent implements OnInit {
             this.invalid =  true
            }
         })
-
+        this.dataSource = new MatTableDataSource<any>(this.requestListData)
       }
 
     })
diff --git a/project/ws/app/src/lib/routes/home/services/home.servive.ts b/project/ws/app/src/lib/routes/home/services/home.servive.ts
index 9ca72a68a..ed5951499 100644
--- a/project/ws/app/src/lib/routes/home/services/home.servive.ts
+++ b/project/ws/app/src/lib/routes/home/services/home.servive.ts
@@ -5,6 +5,8 @@ import { NSProfileDataV2 } from '../models/profile-v2.model'
 import { map } from 'rxjs/operators'
 // tslint:disable
 import _ from 'lodash'
+/* tslint:enable */
+
 
 const PROTECTED_SLAG_V8 = '/apis/protected/v8'
 

From a3260e82e253e5b03cfc02f2f6ec34f079b438f2 Mon Sep 17 00:00:00 2001
From: sohail amjad <sohail.amjad@tarento.com>
Date: Wed, 29 May 2024 17:59:57 +0530
Subject: [PATCH 654/887] added css for request content btn

---
 .../request-list/request-list.component.scss       | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.scss b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.scss
index 652743b58..6d6f86ae3 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.scss
@@ -209,6 +209,20 @@ table tr .cdk-column-assignee {
     }
   }
 }
+.create-action {
+  display: flex;
+  justify-content: end;
+  margin-bottom: 21px;
+  .search-btn {
+      background: #1b4ca1 !important;
+      color: white !important;
+      font-family: 'Lato';
+      font-weight: 700;
+      font-size: 14px;
+      border-radius: 4px;
+      min-width: 138px;
+  }
+}
 
 .grid {
   display: grid;

From 3f4a25c05eaa29012cd9d394ec2da1b2f26c6067 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Thu, 30 May 2024 09:11:58 +0530
Subject: [PATCH 655/887] Fixed 5011,4971,3710,4792,4791

---
 .../user-cards/user-card.component.html       | 12 ++--
 .../user-cards/user-card.component.ts         | 66 ++++++++-----------
 .../users-view/users-view.component.html      |  2 +-
 .../routes/users-view/users-view.component.ts |  8 ++-
 4 files changed, 40 insertions(+), 48 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index cae7c211e..e6fe7769f 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -85,7 +85,7 @@
                   cancel</mat-icon>
               </div>
               <div class="md:w-1/3">
-                <label class="margin-remove-bottom form-label required">Designation</label>
+                <label class="margin-remove-bottom form-label">Designation</label>
                 <mat-form-field appearance="outline">
                   <mat-select #designation formControlName="designation" i18n-placeholder
                     placeholder="Select designation"
@@ -117,7 +117,7 @@
               <div class="md:w-1/3">
                 <label class="margin-remove-bottom form-label">Employee ID</label>
                 <mat-form-field appearance="outline">
-                  <input type="text" matInput #employeeID formControlName="employeeID">
+                  <input type="text" matInput #employeeID formControlName="employeeID" maxlength="15">
                 </mat-form-field>
               </div>
 
@@ -430,7 +430,7 @@
 
             <div class="md:w-1/4">
               <label class="view-text-label">Mobile Number</label>
-              <p>+91-{{user.profileDetails && user.profileDetails.personalDetails ?
+              <p>+91 {{user.profileDetails && user.profileDetails.personalDetails ?
                 user.profileDetails.personalDetails.mobile : '-'}}</p>
             </div>
 
@@ -648,7 +648,7 @@
 
               <div class="md:w-1/4">
                 <label class="view-text-label">Mobile Number</label>
-                <p>+91-{{appData.user.profileDetails && appData.user.profileDetails.personalDetails ?
+                <p>+91 {{appData.user.profileDetails && appData.user.profileDetails.personalDetails ?
                   appData.user.profileDetails.personalDetails.mobile : '-'}}</p>
               </div>
 
@@ -682,12 +682,12 @@
                   appData.user.profileDetails.personalDetails.category : '-'}}</p>
               </div>
 
-              <div class="md:w-1/4">
+              <!-- <div class="md:w-1/4">
                 <label class="view-text-label">Pay Band</label>
                 <p>{{appData.user.profileDetails && appData.user.profileDetails.employmentDetails &&
                   appData.user.profileDetails.employmentDetails.payType ?
                   appData.user.profileDetails.employmentDetails.payType : '-'}}</p>
-              </div>
+              </div> -->
             </div>
             <div class="flex flex-row margin-top-m">
               <div class="md:w-1/4">
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 9b5e9bffa..7c7450bfb 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -111,7 +111,7 @@ export class UserCardComponent implements OnInit, OnChanges {
     private route: ActivatedRoute, private snackBar: MatSnackBar,
     private events: EventService) {
     this.updateUserDataForm = new FormGroup({
-      designation: new FormControl('', [Validators.required]),
+      designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),
       employeeID: new FormControl('', []),
       ehrmsID: new FormControl({ value: '', disabled: true }, []),
@@ -364,10 +364,23 @@ export class UserCardComponent implements OnInit, OnChanges {
   }
 
   onEditUser(user: any, pnael: any) {
-    pnael.open()
-    user.enableEdit = !user.enableEdit
-    this.setUserDetails(user)
-    this.mapRoles(user)
+    this.usersSvc.getUserById(user.userId).subscribe((res: any) => {
+      if (res) {
+        user = res
+        this.usersData.forEach((u: any) => {
+          if (u.userId === user.userId) {
+            u.enableEdit = true
+            user.enableEdit = true
+          } else {
+            u.enableEdit = false
+          }
+        })
+
+        pnael.open()
+        this.setUserDetails(user)
+        this.mapRoles(user)
+      }
+    })
   }
 
   getUerData(user: any, data: any) {
@@ -384,7 +397,13 @@ export class UserCardComponent implements OnInit, OnChanges {
       this.comment = ''
       this.getApprovalList(data)
     } else {
-      this.mapRoles(user)
+      this.usersSvc.getUserById(user.userId).subscribe((res: any) => {
+        if (res) {
+          user = res
+          user.enableEdit = false
+          this.mapRoles(user)
+        }
+      })
     }
   }
 
@@ -410,10 +429,10 @@ export class UserCardComponent implements OnInit, OnChanges {
       const usrRoles = user.organisations[0] && user.organisations[0].roles
         ? user.organisations[0].roles : []
       if (usrRoles.length > 0) {
+        this.updateUserDataForm.controls['roles'].setValue(usrRoles)
         usrRoles.forEach((role: any) => {
           this.orguserRoles.push(role)
           this.modifyUserRoles(role)
-          this.updateUserDataForm.controls['roles'].setValue(usrRoles)
         })
       }
     } else {
@@ -574,9 +593,6 @@ export class UserCardComponent implements OnInit, OnChanges {
 
   onSubmit(form: any, user: any, panel: any) {
     if (form.valid) {
-      // const tags = user.profileDetails && user.profileDetails.additionalProperties && user.profileDetails.additionalProperties.tags ?
-      //   user.profileDetails.additionalProperties.tags : []
-      // if (tags !== this.selectedtags) {
       this.reqbody = {
         request: {
           userId: user.userId,
@@ -604,20 +620,6 @@ export class UserCardComponent implements OnInit, OnChanges {
           },
         },
       }
-      // } else {
-      //   this.reqbody = {
-      //     request: {
-      //       userId: user.userId,
-      //       profileDetails: {
-      //         professionalDetails: [
-      //           {
-      //             designation: this.updateUserDataForm.controls['designation'].value,
-      //           },
-      //         ],
-      //       },
-      //     },
-      //   }
-      // }
       this.usersSvc.updateUserDetails(this.reqbody).subscribe(dres => {
         if (dres) {
           if (this.isMdoLeader) {
@@ -638,15 +640,6 @@ export class UserCardComponent implements OnInit, OnChanges {
                   panel.close()
                   this.updateList.emit()
                   this.searchByEnterKey.emit('')
-                  // this.router.navigate(['/app/home/users/allusers'])
-
-                  // this.usersSvc.getUserById(user.userId).subscribe((_res: any) => {
-                  //   if (_res) {
-                  //     // tslint:disable-next-line
-                  //     user = _res
-                  //     user['enableEdit'] = false
-                  //   }
-                  // })
                 }
               })
             } else {
@@ -658,13 +651,6 @@ export class UserCardComponent implements OnInit, OnChanges {
             panel.close()
             this.updateList.emit()
             this.openSnackbar('User updated Successfully')
-            // this.usersSvc.getUserById(user.userId).subscribe((res: any) => {
-            //   if (res) {
-            //     // tslint:disable-next-line
-            //     user = res
-            //     user.enableEdit = false
-            //   }
-            // })
           }
         }
       },
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index eca83b5bb..cde4b37d8 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -81,7 +81,7 @@
         <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="activeUsersData"
           [totalRecords]="activeUsersDataCount" [tabChangeIndex]="pageIndex" [isApprovals]="false"
           (searchByEnterKey)="onEnterkySearch($event)" (paginationData)="onPaginateChange($event)"
-          (updateList)="getUsers('')"></ws-widget-user-card>
+          (updateList)="getAllUsers('')"></ws-widget-user-card>
       </ng-container>
       <ng-container *ngIf="currentFilter === 'verified'">
         <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="verifiedUsersData"
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index a74dd8de7..058fcbba0 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -207,7 +207,13 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     this.usersService.getAllKongUsers(filtreq, this.limit, this.pageIndex, query).subscribe((data: any) => {
       const allusersData = data.result.response
       this.activeUsersData = allusersData.content
-      this.activeUsersDataCount = data.result.response.count
+      this.activeUsersData = this.activeUsersData.filter((wf: any) => { return wf.profileDetails.profileStatus !== 'NOT-MY-USER' })
+      if (allusersData.count > this.activeUsersData.length) {
+        const count = allusersData.count - this.activeUsersData.length
+        this.activeUsersDataCount = allusersData.count - count
+      } else {
+        this.activeUsersDataCount = allusersData.count
+      }
     })
   }
   async getVUsers(query: string) {

From fcf5cbc581c7bf2861a64239b514ff5722f90e51 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Thu, 30 May 2024 11:21:45 +0530
Subject: [PATCH 656/887] Fixed employeeId pattern & removed errors not
 required ones

---
 .../user-cards/user-card.component.html       | 24 +++++++++----------
 .../user-cards/user-card.component.ts         |  3 ++-
 .../routes/users-view/users-view.component.ts | 12 +++++-----
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index e6fe7769f..d49ebe8e0 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -95,10 +95,10 @@
                     </mat-option>
                     <mat-option [value]="'Other'">Other</mat-option>
                   </mat-select>
-                  <mat-error [hidden]="false" i18n="Designation Error | Explains designation is required"
+                  <!-- <mat-error [hidden]="false" i18n="Designation Error | Explains designation is required"
                     *ngIf="updateUserDataForm?.controls['designation'].errors?.required">
                     Designation is mandatory
-                  </mat-error>
+                  </mat-error> -->
                 </mat-form-field>
                 <mat-icon class="verified-icon margin-left-xs"
                   *ngIf="user?.profileDetails?.profileStatus === 'VERIFIED'">
@@ -207,9 +207,9 @@
                   <mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
                   <mat-datepicker #picker (closed)="dob.blur()" i18n-aria-label aria-label="Date picker">
                   </mat-datepicker>
-                  <mat-error [hidden]="false" i18n="Date of Birth Error | Explains name is required">
+                  <!-- <mat-error [hidden]="false" i18n="Date of Birth Error | Explains name is required">
                     Date of birth is mandatory
-                  </mat-error>
+                  </mat-error> -->
                 </mat-form-field>
               </div>
 
@@ -223,11 +223,11 @@
                     i18n-aria-label aria-label="Please choose a value from the list provided above.">
                     Please choose a value from the list provided above
                   </mat-error> -->
-                  <mat-error [hidden]="false" i18n="domicileMedium Error|Explains Domicile Medium is required"
+                  <!-- <mat-error [hidden]="false" i18n="domicileMedium Error|Explains Domicile Medium is required"
                     *ngIf="updateUserDataForm?.controls['domicileMedium'].errors?.required" i18n-aria-label
                     aria-label="Domicile Medium is mandatory">
                     Mother Tongue is mandatory
-                  </mat-error>
+                  </mat-error> -->
                 </mat-form-field>
                 <mat-autocomplete #motherTongueAuto="matAutocomplete" autoActiveFirstOption="true">
                   <mat-option *ngFor="let option of masterLanguages | async" [value]="option.name">
@@ -244,9 +244,9 @@
                       {{gender}}
                     </mat-option>
                   </mat-select>
-                  <mat-error [hidden]="false" i18n="Gender Error | Explains gender is required">
+                  <!-- <mat-error [hidden]="false" i18n="Gender Error | Explains gender is required">
                     Gender is mandatory
-                  </mat-error>
+                  </mat-error> -->
                 </mat-form-field>
               </div>
             </div>
@@ -258,9 +258,9 @@
                   <input id="pinCode" #pincode type="text" matInput placeholder="Type here" formControlName="pincode"
                     i18n-aria-label aria-label="Pin Code input field" autocomplete="off"
                     (keypress)="numericOnly($event)" maxlength="6">
-                  <mat-error [hidden]="false" i18n="Pin code | Explains pin code is required">
+                  <!-- <mat-error [hidden]="false" i18n="Pin code | Explains pin code is required">
                     Pin code is mandatory
-                  </mat-error>
+                  </mat-error> -->
                 </mat-form-field>
               </div>
 
@@ -279,9 +279,9 @@
                       {{ctg}}
                     </mat-option>
                   </mat-select>
-                  <mat-error [hidden]="false" i18n="Category Error | Explains category is required">
+                  <!-- <mat-error [hidden]="false" i18n="Category Error | Explains category is required">
                     Category is mandatory
-                  </mat-error>
+                  </mat-error> -->
                 </mat-form-field>
               </div>
             </div>
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 7c7450bfb..109e1b4a6 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -90,6 +90,7 @@ export class UserCardComponent implements OnInit, OnChanges {
   emailRegix = `^[\\w\-\\.]+@([\\w-]+\\.)+[\\w-]{2,4}$`
   pincodePattern = '(^[0-9]{6}$)'
   yearPattern = '(^[0-9]{4}$)'
+  empIDPattern = `/^[a-z0-9]+$/i`
 
   userGroup: any
 
@@ -113,7 +114,7 @@ export class UserCardComponent implements OnInit, OnChanges {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),
-      employeeID: new FormControl('', []),
+      employeeID: new FormControl('', [Validators.pattern(this.empIDPattern)]),
       ehrmsID: new FormControl({ value: '', disabled: true }, []),
       dob: new FormControl('', []),
       primaryEmail: new FormControl('', [Validators.required, Validators.email, Validators.pattern(this.emailRegix)]),
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 058fcbba0..d1d51057b 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -208,12 +208,12 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       const allusersData = data.result.response
       this.activeUsersData = allusersData.content
       this.activeUsersData = this.activeUsersData.filter((wf: any) => { return wf.profileDetails.profileStatus !== 'NOT-MY-USER' })
-      if (allusersData.count > this.activeUsersData.length) {
-        const count = allusersData.count - this.activeUsersData.length
-        this.activeUsersDataCount = allusersData.count - count
-      } else {
-        this.activeUsersDataCount = allusersData.count
-      }
+      // if (allusersData.count > this.activeUsersData.length) {
+      //   const count = allusersData.count - this.activeUsersData.length
+      //   this.activeUsersDataCount = allusersData.count - count
+      // } else {
+      this.activeUsersDataCount = allusersData.count
+      // }
     })
   }
   async getVUsers(query: string) {

From 2c74c1edb9d286bb7da15d27adacbffa30206fe6 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Thu, 30 May 2024 11:48:37 +0530
Subject: [PATCH 657/887] Lint fixes

---
 .../user-cards/user-card.component.ts         | 17 +++++++-------
 .../routes/users-view/users-view.component.ts |  2 +-
 .../routes/users/services/users.service.ts    | 23 +++++++++++++++++++
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 109e1b4a6..b2a5510cd 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -365,28 +365,28 @@ export class UserCardComponent implements OnInit, OnChanges {
   }
 
   onEditUser(user: any, pnael: any) {
+    let userval = user
     this.usersSvc.getUserById(user.userId).subscribe((res: any) => {
       if (res) {
-        user = res
+        userval = res
         this.usersData.forEach((u: any) => {
           if (u.userId === user.userId) {
             u.enableEdit = true
-            user.enableEdit = true
+            userval.enableEdit = true
           } else {
             u.enableEdit = false
           }
         })
 
         pnael.open()
-        this.setUserDetails(user)
-        this.mapRoles(user)
+        this.setUserDetails(userval)
       }
     })
   }
 
   getUerData(user: any, data: any) {
     user.enableEdit = false
-    const profileDataAll = user
+    let profileDataAll = user
     this.userStatus = profileDataAll.isDeleted ? 'Inactive' : 'Active'
 
     const profileData = profileDataAll.profileDetails
@@ -400,9 +400,9 @@ export class UserCardComponent implements OnInit, OnChanges {
     } else {
       this.usersSvc.getUserById(user.userId).subscribe((res: any) => {
         if (res) {
-          user = res
-          user.enableEdit = false
-          this.mapRoles(user)
+          profileDataAll = res
+          profileDataAll.enableEdit = false
+          this.mapRoles(profileDataAll)
         }
       })
     }
@@ -500,6 +500,7 @@ export class UserCardComponent implements OnInit, OnChanges {
           this.updateUserDataForm.controls['employeeID'].setValue(user.profileDetails.employmentDetails.employeeCode)
         }
       }
+      this.mapRoles(user)
     }
   }
 
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index d1d51057b..36c101b6c 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -207,7 +207,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     this.usersService.getAllKongUsers(filtreq, this.limit, this.pageIndex, query).subscribe((data: any) => {
       const allusersData = data.result.response
       this.activeUsersData = allusersData.content
-      this.activeUsersData = this.activeUsersData.filter((wf: any) => { return wf.profileDetails.profileStatus !== 'NOT-MY-USER' })
+      this.activeUsersData = this.activeUsersData.filter((wf: any) => wf.profileDetails.profileStatus !== 'NOT-MY-USER')
       // if (allusersData.count > this.activeUsersData.length) {
       //   const count = allusersData.count - this.activeUsersData.length
       //   this.activeUsersDataCount = allusersData.count - count
diff --git a/project/ws/app/src/lib/routes/users/services/users.service.ts b/project/ws/app/src/lib/routes/users/services/users.service.ts
index d39f79a53..084002809 100644
--- a/project/ws/app/src/lib/routes/users/services/users.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/users.service.ts
@@ -31,6 +31,8 @@ const API_END_POINTS = {
   GET_GROUPS: '/api/user/v1/groups',
   getMasterNationlity: '/apis/protected/v8/user/profileRegistry/getMasterNationalities',
   editProfileDetails: '/apis/proxies/v8/user/v1/extPatch',
+  getPendingFields: '/apis/proxies/v8/workflow/v2/userWFApplicationFieldsSearch',
+  getApprovalPendingFields: '/apis/proxies/v8/workflow/v2/userWFApplicationFieldsSearch',
 }
 
 @Injectable()
@@ -238,4 +240,25 @@ export class UsersService {
   editProfileDetails(data: any) {
     return this.http.post<any>(API_END_POINTS.editProfileDetails, data)
   }
+
+  listApprovalPendingFields() {
+    return this.http.post<any>(API_END_POINTS.getPendingFields, {
+      serviceName: 'profile',
+      applicationStatus: 'SEND_FOR_APPROVAL',
+    })
+  }
+
+  fetchApprovalPendingFields() {
+    return this.http.post<any>(API_END_POINTS.getApprovalPendingFields, {
+      serviceName: 'profile',
+      applicationStatus: 'SEND_FOR_APPROVAL',
+    })
+  }
+
+  listRejectedFields() {
+    return this.http.post<any>(API_END_POINTS.getPendingFields, {
+      serviceName: 'profile',
+      applicationStatus: 'REJECTED',
+    })
+  }
 }

From 2b4ed41adb7341bfd86850203688343bfa744e60 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Thu, 30 May 2024 12:07:56 +0530
Subject: [PATCH 658/887] fixing transfer changes wip

---
 .../user-cards/user-card.component.html       |  4 +-
 .../user-cards/user-card.component.ts         | 17 +++++-
 .../approval-pending.component.html           | 20 +++----
 .../approval-pending.component.ts             | 57 +++++++++++++++----
 4 files changed, 73 insertions(+), 25 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 08f7e0b76..a5d79625e 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -628,9 +628,9 @@
                     <mat-radio-group aria-label="Select an option" name="approveDesignation"
                       formControlName="approveDesignation" class="mat-caption margin-top-s">
                       <mat-radio-button value="approvedesg" class="margin-right-s"
-                        (click)="onClickHandleWorkflow(field,'APPROVE')">Approve</mat-radio-button>
+                        (click)="onClickHandleWorkflow(field,'APPROVE', appData)">Approve</mat-radio-button>
                       <mat-radio-button value="rejectdesg"
-                        (click)="onClickHandleWorkflow(field,'REJECT')">Reject</mat-radio-button>
+                        (click)="onClickHandleWorkflow(field,'REJECT', appData)">Reject</mat-radio-button>
                       <mat-icon class="margin-left-m editreasonicon cursor-pointer"
                         *ngIf="field.action === 'REJECT' && comment !== ''"
                         (click)="updateRejection(field)">chat_bubble</mat-icon>
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 193b76bf1..dc0cf501e 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -617,7 +617,7 @@ export class UserCardComponent implements OnInit {
   }
 
   // for approval & rejection
-  onClickHandleWorkflow(field: any, action: string) {
+  onClickHandleWorkflow(field: any, action: string, appData: any = undefined) {
     field.action = action
     const req = {
       action,
@@ -660,6 +660,21 @@ export class UserCardComponent implements OnInit {
         type: TelemetryEvents.EnumIdtype.APPLICATION,
       }
     )
+
+    if (this.currentFilter === 'transfers' && appData !== undefined) {
+      appData.needApprovalList.forEach((otherField: any) => {
+        if (otherField.label !== field.label) {
+          this.onClickHandleWorkflow(field, action)
+        }
+      })
+      if (field.label === 'Group') {
+        const designationValue = action === 'APPROVE' ? 'approvedesg' : 'rejectdesg'
+        this.approveUserDataForm.controls.approveDesignation.setValue(designationValue)
+      } else {
+        const groupValue = action === 'APPROVE' ? 'approvegroup' : 'rejectgroup'
+        this.approveUserDataForm.controls.approveGroup.setValue(groupValue)
+      }
+    }
   }
 
   // single aprrove or reject
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
index b1204bbc0..be496ffac 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
@@ -33,12 +33,12 @@
           <a routerLink="/app/home/approvals/profileverification" class="filter-option"
             [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'profileverification', 'ws-mat-accent-border font-medium':currentFilter !== 'profileverification'}"
             mat-button (click)="filter('profileverification'); tabTelemetry('toapprove', 0)" role="button">Profile
-            Verifications ({{approvalTotalCount}})</a>
+            Verifications ({{profileVerificationCount}})</a>
 
           <a routerLink="/app/home/approvals/transfers" class="filter-option"
             [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'transfers', 'ws-mat-accent-border font-medium':currentFilter !== 'transfers'}"
             mat-button (click)="filter('transfers'); tabTelemetry('transfers', 1)" role="button">Transfers
-            ({{approvalTotalCount}})</a>
+            ({{transfersCount}})</a>
         </div>
       </div>
       <ng-container *ngIf="currentFilter === 'profileverification'">
@@ -46,28 +46,28 @@
           <ws-app-searchuser (handleApiData)="onSearch($event)" [isApprovals]="true" (handleapproveAll)="onApproveALL()"
             [showApproveALL]="showApproveALL" [disableApproveALL]="disableApproveALL"></ws-app-searchuser>
         </div>
-        <ng-container *ngIf="data && data.length > 0">
+        <ng-container *ngIf="profileVerificationCount > 0">
           <!-- <ws-widget-org-user-table-v2 [tableData]="tabledata" [data]="data" (eOnRowClick)="onApprovalClick($event)"
             [totalRecords]="approvalTotalCount" (pageChangeClick)="onPaginateChange($event)">
           </ws-widget-org-user-table-v2> -->
-          <ws-widget-user-card [currentFilter]="currentFilter" [usersData]="data" [isApprovals]="true"
-            [totalRecords]="approvalTotalCount" [tabChangeIndex]="pageIndex"
+          <ws-widget-user-card [currentFilter]="currentFilter" [usersData]="profileVerificationData" [isApprovals]="true"
+            [totalRecords]="profileVerificationCount" [tabChangeIndex]="pageIndex"
             (searchByEnterKey)="onEnterkySearch($event)" (disableButton)="showButton()"
             (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
         </ng-container>
-        <ng-container *ngIf="!data || data.length === 0">
+        <ng-container *ngIf="!profileVerificationData || profileVerificationData.length === 0">
           <p class="margin-top-xl margin-bottom-xl">No approvals</p>
         </ng-container>
       </ng-container>
       <ng-container *ngIf="currentFilter === 'transfers'">
         <!-- <ws-app-profle-approval-bulk-upload></ws-app-profle-approval-bulk-upload> -->
-        <ng-container *ngIf="data && data.length > 0">
-          <ws-widget-user-card [currentFilter]="currentFilter" [usersData]="data" [isApprovals]="true"
-            [totalRecords]="approvalTotalCount" [tabChangeIndex]="pageIndex"
+        <ng-container *ngIf="transfersData && transfersData.length > 0">
+          <ws-widget-user-card [currentFilter]="currentFilter" [usersData]="transfersData" [isApprovals]="true"
+            [totalRecords]="transfersCount" [tabChangeIndex]="pageIndex"
             (searchByEnterKey)="onEnterkySearch($event)" (disableButton)="showButton()"
             (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
         </ng-container>
-        <ng-container *ngIf="!data || data.length === 0">
+        <ng-container *ngIf="!transfersData || transfersData.length === 0">
           <p class="margin-top-xl margin-bottom-xl">No approvals</p>
         </ng-container>
       </ng-container>
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
index 3ec64b6e0..cc219fa16 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
@@ -19,12 +19,16 @@ import { ApprovalsService } from '../../../services/approvals.service'
 
 export class ApprovalPendingComponent implements OnInit, OnDestroy {
   data: any = []
+  profileVerificationData: any = []
+  transfersData: any = []
   approvalData: any = []
+  allTransfersData: any = []
+  allprofileVerificationData: any = []
   currentFilter = 'profileverification'
   discussionList!: any
   discussProfileData!: any
   departName = ''
-  approvalTotalCount = 0
+  // approvalTotalCount = 0
   limit = 20
   pageIndex = 0
   currentOffset = 0
@@ -32,6 +36,8 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   reportsNoteList: string[] = []
   showApproveALL = false
   disableApproveALL = false
+  transfersCount = 0
+  profileVerificationCount = 0
 
   constructor(
     private router: Router,
@@ -150,6 +156,13 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
         offset: this.currentOffset,
         limit: this.limit,
       }
+      this.allTransfersData = []
+      this.transfersData = []
+      this.allprofileVerificationData = []
+      this.profileVerificationData = []
+      this.transfersCount = 0
+      this.profileVerificationCount = 0
+
       this.apprService.getApprovals(req).subscribe(res => {
         this.data = []
         const newarray: any = []
@@ -182,22 +195,38 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
         })
 
         newarray.forEach((appr: any) => {
-          this.data.push({
+
+          const requestData = {
             fullname: appr.userInfo ? `${appr.userInfo.first_name}` : '--',
             requestedon: currentdate,
             // fields: this.replaceWords(keys, conditions),
             userWorkflow: appr,
             tag: (appr.userInfo && appr.userInfo.tag) ? `${appr.userInfo.tag}` : '',
-          })
-          this.data.sort((a: any, b: any) => {
-            const textA = a.fullname.toUpperCase()
-            const textB = b.fullname.toUpperCase()
-            return (textA < textB) ? -1 : (textA > textB) ? 1 : 0
-          })
+          }
+
+          if (appr!.wfInfo[0] && appr!.wfInfo[0].orgTansferRequest) {
+            this.transfersData.push(requestData)
+          } else {
+            this.profileVerificationData.push(requestData)
+          }
+        })
+        this.transfersData.sort((a: any, b: any) => {
+          const textA = a.fullname.toUpperCase()
+          const textB = b.fullname.toUpperCase()
+          return (textA < textB) ? -1 : (textA > textB) ? 1 : 0
         })
-        this.approvalTotalCount = this.data.length
-        this.approvalData = this.data
-        if (this.data && this.data.length > 0) {
+        this.profileVerificationData.sort((a: any, b: any) => {
+          const textA = a.fullname.toUpperCase()
+          const textB = b.fullname.toUpperCase()
+          return (textA < textB) ? -1 : (textA > textB) ? 1 : 0
+        })
+        this.transfersCount = this.transfersData.length
+        this.profileVerificationCount = this.profileVerificationData.length
+
+        this.allTransfersData = this.transfersData
+        this.allprofileVerificationData = this.profileVerificationData
+
+        if ((this.transfersData && this.transfersData.length > 0) || (this.profileVerificationData && this.profileVerificationData.length > 0)) {
           this.showApproveALL = true
           this.disableApproveALL = false
         }
@@ -226,7 +255,11 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   onSearch(enterValue: any) {
     // this.data.filter((user: any) => enterValue.includes(user.userInfo.first_name))
     const filterValue = enterValue.toLowerCase()
-    this.data = this.approvalData.filter((user: any) => user.fullname.toLowerCase().includes(filterValue))
+    if (this.currentFilter === 'profileverification') {
+      this.profileVerificationData = this.allprofileVerificationData.filter((user: any) => user.fullname.toLowerCase().includes(filterValue))
+    } else {
+      this.transfersData = this.allTransfersData.filter((user: any) => user.fullname.toLowerCase().includes(filterValue))
+    }
   }
 
   onPaginateChange(event: PageEvent) {

From 7ff41303969b716155c942a50fe93762e8850f9e Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Thu, 30 May 2024 15:29:06 +0530
Subject: [PATCH 659/887] KB-4782 Users sub-menu should be displayed in the
 alphabetical order. KB-4725 UI is breaking if the name of the user is lengthy

---
 .../user-cards/user-card.component.html       | 51 ++++++++++---------
 .../user-cards/user-card.component.scss       |  4 ++
 .../user-cards/user-card.component.ts         |  4 +-
 3 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index d49ebe8e0..8c251f766 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -4,32 +4,35 @@
 </div>
 <div *ngIf="!isApprovals">
   <mat-accordion [multi]="true">
-    <mat-expansion-panel class="user-card" *ngFor="let user of usersData | orderBy: 'firstName':'asc'" #panel
-      (opened)="closeOtherPanels(panel)">
+    <mat-expansion-panel class="user-card" *ngFor="let user of usersData" #panel (opened)="closeOtherPanels(panel)">
       <mat-expansion-panel-header (click)="getUerData(user)">
-        <div class="float-left width88" (click)="$event.stopPropagation();">
+        <div class="float-left width88 flex" (click)="$event.stopPropagation();">
           <div class="initialcircle display-inline-block margin-right-m">
             <!-- <span>AB</span> -->
             <ws-widget-avatar-photo [name]="getUseravatarName(user)" [photoUrl]="user?.photo" size="l">
             </ws-widget-avatar-photo>
           </div>
           <div class="username display-inline-block">
-            <div class="mat-subheading-2 margin-remove">
-              <span *ngIf="user?.profileDetails && user?.profileDetails?.personalDetails">
-                {{user?.profileDetails?.personalDetails?.firstname}}
-              </span>
-              <span *ngIf="!user?.profileDetails?.personalDetails">
-                {{user?.firstName}}
-              </span>
-              <span class="status-label margin-left-s verified"
-                *ngIf="user?.profileDetails?.profileStatus === 'VERIFIED'">Verified
-                <mat-icon>check_circle</mat-icon></span>
-              <span class="status-label margin-left-s nonverified"
-                *ngIf="user?.profileDetails?.profileStatus === 'NOT-VERIFIED'">Non-verified
-                <mat-icon>check_circle</mat-icon></span>
-              <span class="status-label margin-left-s notmyuser"
-                *ngIf="user?.profileDetails?.profileStatus === 'NOT-MY-USER'">Not my user
-                <mat-icon>error</mat-icon></span>
+            <div class="mat-subheading-2 margin-remove flex">
+              <div class="word-wrap userName">
+                <span *ngIf="user?.profileDetails && user?.profileDetails?.personalDetails">
+                  {{user?.profileDetails?.personalDetails?.firstname}}
+                </span>
+                <span *ngIf="!user?.profileDetails?.personalDetails">
+                  {{user?.firstName}}
+                </span>
+              </div>
+              <div>
+                <span class="status-label margin-left-s verified"
+                  *ngIf="user?.profileDetails?.profileStatus === 'VERIFIED'">Verified
+                  <mat-icon>check_circle</mat-icon></span>
+                <span class="status-label margin-left-s nonverified"
+                  *ngIf="user?.profileDetails?.profileStatus === 'NOT-VERIFIED'">Non-verified
+                  <mat-icon>check_circle</mat-icon></span>
+                <span class="status-label margin-left-s notmyuser"
+                  *ngIf="user?.profileDetails?.profileStatus === 'NOT-MY-USER'">Not my user
+                  <mat-icon>error</mat-icon></span>
+              </div>
             </div>
             <div class="mat-body-2 ws-mat-black40-text">{{user?.profileDetails &&
               user?.profileDetails?.professionalDetails
@@ -41,8 +44,8 @@
             <div class="mat-caption ws-mat-black40-text" *ngIf="!user?.profileDetails?.profileStatusUpdatedOn">-</div>
           </div>
         </div>
-        <div class="float-right" *ngIf="isMdoAdmin || isMdoLeader">
-          <div class="button margin-top-m mat-body" (click)="onEditUser(user, panel);$event.stopPropagation();"
+        <div class="float-right flex items-center" *ngIf="isMdoAdmin || isMdoLeader">
+          <div class="button mat-body" (click)="onEditUser(user, panel);$event.stopPropagation();"
             *ngIf="currentFilter !== 'notmyuser' && !user?.enableEdit">
             <mat-icon>edit</mat-icon> Edit
           </div>
@@ -85,7 +88,7 @@
                   cancel</mat-icon>
               </div>
               <div class="md:w-1/3">
-                <label class="margin-remove-bottom form-label">Designation</label>
+                <label class="margin-remove-bottom form-label">Designation fg</label>
                 <mat-form-field appearance="outline">
                   <mat-select #designation formControlName="designation" i18n-placeholder
                     placeholder="Select designation"
@@ -525,7 +528,7 @@
     <mat-expansion-panel class="user-card" *ngFor="let appData of approvalData | orderBy: 'firstName':'asc'" #panel
       (opened)="closeOtherPanels(panel)">
       <mat-expansion-panel-header (click)="getUerData(appData.user, appData.userWorkflow);">
-        <div class="float-left width82" (click)="$event.stopPropagation();">
+        <div class="float-left width82 flex" (click)="$event.stopPropagation();">
           <div class="initialcircle display-inline-block margin-right-s" *ngIf="appData?.user">
             <ws-widget-avatar-photo [name]="getUseravatarName(appData?.user)" [photoUrl]="appData?.user?.photo"
               size="l">
@@ -536,7 +539,7 @@
             </ws-widget-avatar-photo>
           </div>
           <div class="username display-inline-block">
-            <div class="mat-subheading-2 margin-remove">
+            <div class="mat-subheading-2 margin-remove word-wrap">
               {{appData.userWorkflow.userInfo.first_name}}
             </div>
             <div class="mat-body-2 ws-mat-black40-text">{{appData.user &&
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
index 254194462..49949ad7c 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
@@ -345,4 +345,8 @@ label {
 
 .word-wrap {
   word-wrap: break-word;
+}
+
+.userName {
+  max-width: calc(100% - 100px);
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index f76eefc09..174c0b9ec 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -143,7 +143,7 @@ export class UserCardComponent implements OnInit, OnChanges {
     }
 
     if (this.usersData && this.usersData.length > 0) {
-      this.usersData = _.orderBy(this.usersData, item => item.firstName, ['asc'])
+      this.usersData = _.orderBy(this.usersData, item => item.firstName.toUpperCase(), ['asc'])
 
       // formatting profileStatusUpdatedOn value
       this.usersData.forEach((u: any) => {
@@ -191,7 +191,7 @@ export class UserCardComponent implements OnInit, OnChanges {
     if (this.usersData) {
       this.usersData = _.orderBy(this.usersData, item => {
         if (item.profileDetails && item.profileDetails.personalDetails) {
-          return item.profileDetails.personalDetails.firstname
+          return item.profileDetails.personalDetails.firstname.toUpperCase()
         }
         // tslint:disable-next-line
       }, ['asc'])

From 883b342d059032b6a1324326f7b9e02d81312ce9 Mon Sep 17 00:00:00 2001
From: sohail amjad <sohail.amjad@tarento.com>
Date: Thu, 30 May 2024 17:02:42 +0530
Subject: [PATCH 660/887] error resolved

---
 .../assign-list-popup.component.html          |  95 ++---
 .../assign-list-popup.component.scss          | 353 +++++++++++++++++-
 .../assign-list-popup.component.ts            | 114 ++++--
 .../request-list/request-list.component.ts    |  27 +-
 .../lib/routes/home/services/home.servive.ts  |  15 +-
 5 files changed, 516 insertions(+), 88 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.html b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.html
index ec78acb00..9a61bd493 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.html
+++ b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.html
@@ -1,46 +1,57 @@
 <div class="main-container">
-    <h2>Assign</h2>
-    <div class="full-table-container">
-        <form [formGroup]="requestForm">
-            <mat-radio-group formControlName="assignee">
-                <table mat-table [dataSource]="providers" class="mat-elevation-z8 full-height">
-    
-                    <!-- Radio Button Column -->
-                    <ng-container matColumnDef="select">
-                        <th mat-header-cell *matHeaderCellDef></th>
-                        <td mat-cell *matCellDef="let provider">
-                            <mat-radio-button [value]="provider.orgName"></mat-radio-button>
-                        </td>
-                    </ng-container>
-    
-                    <!-- Provider Name Column -->
-                    <ng-container matColumnDef="providerName">
-                        <th mat-header-cell *matHeaderCellDef>Provider Name</th>
-                        <td mat-cell *matCellDef="let provider">{{ provider.orgName }}</td>
-                    </ng-container>
-    
-                    <!-- Details Column -->
-                    <ng-container matColumnDef="details">
-                        <th mat-header-cell *matHeaderCellDef>Details</th>
-                        <td mat-cell *matCellDef="let provider">{{ provider.details }}</td>
-                    </ng-container>
-    
-                    <!-- ETA Column -->
-                    <ng-container matColumnDef="eta">
-                        <th mat-header-cell *matHeaderCellDef>ETA</th>
-                        <td mat-cell *matCellDef="let provider">{{ provider.eta | date }}</td>
-                    </ng-container>
-    
-                    <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-                    <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
-                </table>
-            </mat-radio-group>
-    
+  <div class="full-table-container" *ngIf="providerList.length > 0">
+    <form [formGroup]="requestForm">
+        <div class="header-section">
+            <div class="title">
+                <h2 class="titleText">{{assignText}}</h2>
+            </div>
             <div class="actions">
-                <button mat-raised-button color="primary" (click)="assign()">Assign</button>
-                <button mat-raised-button color="accent" (click)="cancel()">Cancel</button>
+                <button mat-button type="button" class="search-btn" (click)="onSubmitAssign()" >{{submitAssign}}</button>
+
+                <button mat-button class="cancel" (click)="cancel()">
+                    <span>Cancel</span>
+                </button>
+
+            </div>
+           
+          </div>
+      <mat-radio-group formControlName="assignee">
+        <div class="nav-container">
+          <div class="sidenav-content">
+            <div class="table-class">
+              <table mat-table [dataSource]="dataSource">
+                <ng-container matColumnDef="select">
+                    <th mat-header-cell *matHeaderCellDef></th>
+                  <td mat-cell class="title-class" *matCellDef="let provider">
+                    <mat-radio-button [value]="provider"></mat-radio-button>
+                  </td>
+                </ng-container>
+
+                <ng-container matColumnDef="providerName">
+                  <th mat-header-cell *matHeaderCellDef>Provider Name</th>
+                  <td mat-cell class="title-class" *matCellDef="let provider">{{ provider?.orgName ? provider?.orgName  : '_' }}</td>
+                </ng-container>
+
+                <ng-container matColumnDef="details">
+                  <th mat-header-cell *matHeaderCellDef>Details</th>
+                  <td mat-cell class="title-class" *matCellDef="let provider">{{ provider?.description ? provider?.description: '_' }}</td>
+                </ng-container>
+
+                <ng-container matColumnDef="eta">
+                  <th mat-header-cell *matHeaderCellDef>ETA</th>
+                  <td mat-cell class="title-class" *matCellDef="let provider">{{ provider?.turnAroundTime ? provider?.turnAroundTime : '_' }}</td>
+                </ng-container>
+
+                <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+                <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
+              </table>
+              <mat-paginator [pageSize]="pageSize" [length]="this.providerCount" [pageSizeOptions]="[5,10,20]"
+              (page)="onChangePage($event)"></mat-paginator>
+  
             </div>
-        </form>
-    </div>
+          </div>
+        </div>
+      </mat-radio-group>
+    </form>
   </div>
-  
\ No newline at end of file
+</div>
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.scss b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.scss
index c183040db..31207e9d2 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.scss
@@ -2,21 +2,356 @@
     width: 100%;
     height: 100%;
   }
-  ::ng-deep {
+  @import "ws-common";
+  @import "ws-mixins";
+  
+  
+  
   table {
     width: 100%;
-    margin-bottom: 16px; 
   }
-}
 
-.mat-elevation-z8 {
-    box-shadow: none !important;
- }
+  .header-section {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    padding: 0 19px;
+    margin: 14px 0 22px;
+    .title {
+      .title-text {
+        font-family: Montserrat;
+        font-size: 20px;
+        font-weight: 600;
+        line-height: 30px;
+        text-align: left;
+    
+        }
+    }
+    
+    .actions {
+     display: flex;
+     gap: 12px;
+     .search-btn {
+      background: #1b4ca1 !important;
+      color: white !important;
+      font-family: 'Lato';
+      font-weight: 700;
+      font-size: 14px;
+      border-radius: 4px;
+      min-width: 81px;
+      line-height: 21px;
+     }
+     .cancel {
+      color: #1b4ca1 !important;
+      border: 1px solid #1b4ca1 !important;
+      border-radius: 4px;
+      min-width: 81px;
+  }
+    }
+  }
 
   
-  .actions {
+  .userTable {
+    box-shadow: none;
+  }
+  
+  table tr {
+    height: 70px !important;
+  }
+  
+  // ::ng-deep {
+  //   table tr td .cdk-column-title .title-class {
+  //     width: 13% !important;
+  //   }
+  // }
+  
+  // table tr td .cdk-column-title .cdk-column-assignee {
+  //   width: 13% !important;
+  // }
+  
+  table tr .cdk-column-title {
+    width: 18% !important;
+  }
+  
+  table tr .cdk-column-RequestId {
+    width: 9% !important;
+  }
+  
+  table tr .cdk-column-assignee {
+    width: 17% !important;
+  }
+  
+  .action-btn-view {
+    color: #1B4CA1;
+    font-family: Lato;
+    font-size: 14px;
+    font-weight: 400;
+    line-height: 16.8px;
+    text-decoration: underline !important;
+  }
+  
+  .title-class {
+    font-family: Lato;
+    font-size: 14px;
+    font-weight: 400;
+    line-height: 16.8px;
+  }
+  
+  .search-border {
+    border-color: #cecece;
+  }
+  
+  .color-60 {
+    color: rgba(0, 0, 0, .6) !important;
+  }
+  
+  .nav-container {
+    position: relative;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    // min-height: 180vh;
+  }
+  
+  .mt-1 {
+    margin-top: 2rem !important;
+  }
+  
+  .m-auto {
+    margin: auto;
+  }
+  
+  .searchinput {
+    padding: $size-xs;
+  }
+  
+  .text-white {
+    color: white !important;
+  }
+  
+  .small-list-logo {
+    width: 64px;
+    height: 36px;
+  }
+  
+  .new-mat-table {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+  }
+  
+  .new-row {
+    padding: 0.65em 0 0.65em 0;
+  }
+  
+  .filter {
+    .filter-option {
+      margin: $size-xs $size-m;
+      /* border-bottom: darkslateblue; */
+      border-radius: 0;
+      border-bottom-width: 2px;
+      border-top-width: 0;
+      border-left-width: 0;
+      border-right-width: 0;
+    }
+  }
+  
+  .hand {
+    cursor: pointer;
+  }
+  
+  .vertical-align {
+    vertical-align: text-bottom;
+  }
+  
+  .width-300 {
+    width: 300px;
+  }
+  
+  .font-size-m {
+    font-size: 16px;
+  }
+  
+  .border-bottom {
+    border-bottom: 1px solid lightgray;
+  }
+  
+  .mat-drawer-content {
+    overflow: hidden !important;
+  }
+  
+  .pointer {
+    cursor: pointer;
+  }
+  
+  .margin-right-xxl {
+    margin-right: 50px;
+  }
+  
+  .margin-horizontal-s {
+    margin-left: 3%;
+    margin-right: 2%;
+  }
+  
+  .flex-dynamic {
+    justify-content: flex-start;
+  
+    @include breakpoint-gt-s {
+      justify-content: center;
+    }
+  
+    @include breakpoint-gt-xs {
+      justify-content: center;
+    }
+  
+    @include breakpoint-xs {
+      justify-content: center;
+    }
+  
+    @include breakpoint-gt-m {
+      justify-content: flex-start;
+    }
+  }
+  
+  .large-icon {
+    font-size: 32px;
+    width: 32px;
+    height: 32px;
+  }
+  
+  .sidenav {
+    width: 20%;
+    min-width: 250px;
+    // padding-left: $size-m;
+    background: inherit;
+    box-shadow: none;
+    // margin-bottom: 32px;
+  }
+  
+  .sidenav-content {
+    margin: 0;
+    padding: 0 $size-m $size-l;
+    box-sizing: border-box;
+    // min-height: calc(100vh);
+  }
+  
+  .reportsDemo {
+  
+  
+    .reportsDemoVideo {
+      width: 290px;
+      height: 163px;
+      border-radius: 5px;
+      background-color: #FDEAD5;
+      font-weight: 600;
+      pointer-events: all;
+      cursor: pointer;
+  
+      .video_icon {
+        font-size: 32px;
+      }
+    }
+  }
+  .create-action {
     display: flex;
-    justify-content: flex-end;
-    gap: 8px;
+    justify-content: end;
+    margin-bottom: 21px;
+    .search-btn {
+        background: #1b4ca1 !important;
+        color: white !important;
+        font-family: 'Lato';
+        font-weight: 700;
+        font-size: 14px;
+        border-radius: 4px;
+        min-width: 138px;
+    }
   }
+  
+  .grid {
+    display: grid;
+    grid-template-columns: 1fr 0.3fr;
+    grid-auto-columns: minmax(auto, 300px);
+    width: 90%;
+  }
+  
+  .close-button {
+    margin-right: 50px;
+  }
+  
+  .hidden {
+    display: none;
+  }
+  
+  .border-right {
+    border-right: 1px solid #cecece;
+  }
+  
+  :host ::ng-deep .search {
+    .mat-form-field-wrapper {
+      padding-bottom: 0px !important;
+    }
+  
+    .mat-form-field-infix {
+      border-top-width: 2px !important;
+      margin: auto;
+    }
+  }
+  
+  .border-0 {
+    border: 0;
+  }
+  
+  .min-width-4 {
+    min-width: 400px;
+  }
+  
+  ws-auth-content-card-v2 {
+    display: contents;
+  }
+  
+  // @import 'ws-vars';
+  // @import 'ws-mixins';
+  $size-xs: 8px;
+  $size-s: 12px;
+  $size-m: 16px;
+  $size-l: 24px;
+  $size-xl: 32px;
+  $size-xxl: 40px;
+  $card-standard-width: 268px;
+  
+  @mixin breakpoint-xs {
+    @media only screen and (max-width: 599px) {
+      @content;
+    }
+  }
+  
+  $title-line-count: 2;
+  
+  mat-header-row {
+    min-height: 40px;
+  }
+  
+  .mat-header-cell {
+    background-color: #F5F5F5;
+  }
+  
+  .flex-update {
+    flex-direction: row;
+  
+    @include breakpoint-xs {
+      flex-direction: row;
+    }
+  
+  
+  }
+  
+  .flex-custom-m {
+    @include breakpoint-xs {
+      flex-direction: column;
+    }
+  }
+
+  
+  
   
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.ts
index 8586ec0d8..3bd29f446 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.ts
@@ -1,5 +1,8 @@
-import { Component, OnInit } from '@angular/core'
+import { Component, Inject, OnInit } from '@angular/core'
 import { FormBuilder, FormControl, FormGroup } from '@angular/forms'
+import { ProfileV2Service } from '../../../services/home.servive'
+import { MAT_DIALOG_DATA, MatDialogRef, MatTableDataSource } from '@angular/material'
+import { ConfigResolveService } from '../../../resolvers/config-resolve.service'
 
 @Component({
   selector: 'ws-app-assign-list-popup',
@@ -8,26 +11,22 @@ import { FormBuilder, FormControl, FormGroup } from '@angular/forms'
 })
 export class AssignListPopupComponent implements OnInit {
   requestForm!: FormGroup
-  providers = [
-    { orgName: 'Microsoft',
-     details: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec suscipit orci in ultricies aliq.',
-      eta: new Date('2024-02-21') },
-    { orgName: 'Google',
-     details: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec suscipit orci in ultricies aliq.',
-     eta: new Date('2024-02-21') },
-    { orgName: 'IBM',
-     details: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec suscipit orci in ultricies aliq.',
-      eta: new Date('2024-02-21') },
-    { orgName: 'ISB',
-     details: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec suscipit orci in ultricies aliq.',
-      eta: new Date('2024-02-21') },
-    { orgName: 'CP',
-     details: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec suscipit orci in ultricies aliq.',
-      eta: new Date('2024-02-21') },
-  ]
   displayedColumns: string[] = ['select', 'providerName', 'details', 'eta']
+  providerList: any[] = []
+  dataSource: any
+  providerCount: any
+  pageNumber = 0
+  pageSize = 5
+  fullProfile: any
+  userId: any
+  assignText = ''
+  submitAssign = ''
 
   constructor(private fb: FormBuilder,
+              private homeService: ProfileV2Service,
+              @Inject(MAT_DIALOG_DATA) public data: any,
+              private configService: ConfigResolveService,
+              public dialogRef: MatDialogRef<AssignListPopupComponent>,
   ) {
     this.requestForm = this.fb.group({
       assignee: new FormControl(''),
@@ -35,24 +34,95 @@ export class AssignListPopupComponent implements OnInit {
   }
 
   ngOnInit() {
-   
+    this.assignText = 'Assign'
+    this.submitAssign = 'Assign'
+    this.getInterestOrgList()
+    if (this.configService['confService'].userProfile || this.configService['confService'].userProfileV2) {
+      this.fullProfile = this.configService['confService'].userProfile ? 
+      this.configService['confService'].userProfile
+       : this.configService['confService'].userProfileV2
+      this.userId =  this.fullProfile.userId
+    }
   }
 
+  setFormData() {
+    if (this.data.assignedProvider) {
+      this.assignText = 'Re-assign'
+      this.submitAssign = 'Re-Assign'
+      const assignOrgData = this.providerList.find(option =>
+        this.data.assignedProvider === option.orgName
+      )
+      if (assignOrgData) {
+        this.requestForm.controls['assignee'].setValue(assignOrgData)
+      }
+    }
+   }
 
-  getAssigneeList(){
+  getInterestOrgList() {
+    const request = {
+      filterCriteriaMap: {
+        demandId: this.data.demand_id,
 
+      },
+      requestedFields: [
+      ],
+      pageNumber: this.pageNumber,
+      pageSize: this.pageSize,
+    }
+    this.homeService.getOrgInterestList(request).subscribe(res => {
+     if (res.data) {
+      this.providerList = res.data
+      this.providerCount = res.totalCount
+      this.dataSource = new MatTableDataSource<any>(this.providerList)
+      this.setFormData()
+     }
+    }
+  )
   }
 
-  assign() {
+  getAssigneeList() {
+
+  }
+
+  onChangePage(event: any) {
+    this.pageNumber = event.pageIndex
+    this.pageSize = event.pageSize
+    this.getInterestOrgList()
+    }
+
+    onSubmitAssign() {
     const selectedProvider = this.requestForm.value.assignee
     if (selectedProvider) {
+      const request = {
+        interestId: selectedProvider.interestId ,
+        demandId: selectedProvider.demandId,
+        ownerId: selectedProvider.ownerId ,
+        orgId: selectedProvider.orgId,
+        description: selectedProvider.description ,
+        turnAroundTime: selectedProvider.turnAroundTime ,
+        orgName: selectedProvider.orgName,
+        status: selectedProvider.status,
+        createdOn: selectedProvider.createdOn ,
+        updatedOn: selectedProvider.updatedOn,
+        assignedBy: this.userId,
+      }
+      this.homeService.assignToOrg(request).subscribe(res => {
+        if (res) {
+          this.dialogRef.close({ data: 'confirmed' })
+        }
+
+      },                                              error => {
+       this.dialogRef.close({ error })
+
+      }
+    )
       // Implement your assign logic here
     } else {
     }
   }
 
   cancel() {
-    this.requestForm.reset()
+    this.dialogRef.close()
     // Implement your cancel logic here
   }
 
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
index 44f7bb9be..b45b62212 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
@@ -4,7 +4,7 @@ import { ITableData } from '@sunbird-cb/collection/lib/ui-org-table/interface/in
 import { ProfileV2Service } from '../../services/home.servive'
 import { DatePipe } from '@angular/common'
 import { ActivatedRoute, Router } from '@angular/router'
-import { MatDialog, MatTableDataSource } from '@angular/material'
+import { MatDialog, MatSnackBar, MatTableDataSource } from '@angular/material'
 import { ConfirmationBoxComponent } from '../../../training-plan/components/confirmation-box/confirmation.box.component'
 import { AssignListPopupComponent } from './assign-list-popup/assign-list-popup.component'
 export enum statusValue {
@@ -65,7 +65,8 @@ export class RequestListComponent implements OnInit {
               private datePipe: DatePipe,
               private activeRoute: ActivatedRoute,
               private dialog: MatDialog,
-              private router: Router
+              private router: Router,
+              private snackBar : MatSnackBar
   ) { }
   requestList: any[] = [
     `These reports contain Personally Identifiable Information (PII) data.
@@ -124,10 +125,10 @@ export class RequestListComponent implements OnInit {
       this.showConformationModal(item, action)
       break
     case 'assignContent':
-       this.openAssignlistPopup()
+       this.openAssignlistPopup(item)
       break
     case 'reAssignContent':
-      // this.showConformationModal(_event.row, _event.action)
+      this.openAssignlistPopup(item)
       break
     case 'copyContent':
         this.queryParams = {
@@ -181,28 +182,28 @@ export class RequestListComponent implements OnInit {
    this.homeService.markAsInvalid(request).subscribe(res => {
      this.invalidRes = res
      this.getRequestList()
+     this.snackBar.open('Marked as Invalid')
     }
   )
 
   }
 
-  openAssignlistPopup() {
+  openAssignlistPopup(item:any) {
     this.dialogRef = this.dialog.open(AssignListPopupComponent, {
       disableClose: false,
       width: '90%',
       height: '70vh',
-      data: {},
+      data: item,
       autoFocus: false,
     })
 
     this.dialogRef.afterClosed().subscribe((_res: any) => {
-      if (_res === 'confirmed') {
-        // if (_type === 'invalidContent') {
-        //   this.invalidContent(_selectedRow)
-        // }
-        //  else if (_type === 'publishContent') {
-        //   this.publishContentData(_selectedRow)
-        // }
+      if (_res && _res.data === 'confirmed') {
+         this.getRequestList()
+         this.snackBar.open('Assigned submitted Successfully')
+      }
+      else {
+        this.snackBar.open('error')
       }
     })
   }
diff --git a/project/ws/app/src/lib/routes/home/services/home.servive.ts b/project/ws/app/src/lib/routes/home/services/home.servive.ts
index ed5951499..1ad0499c5 100644
--- a/project/ws/app/src/lib/routes/home/services/home.servive.ts
+++ b/project/ws/app/src/lib/routes/home/services/home.servive.ts
@@ -25,8 +25,11 @@ const API_END_POINTS = {
   GET_REQUEST_TYPE_LIST:'/apis/proxies/v8/org/v1/search',
   CREATE_DEMAND_REQUEST:'/apis/proxies/v8/demand/content/create',
   GET_REQUEST_DATA:'/apis/proxies/v8/demand/content/search',
-  MARK_INVALID:'/apis/proxies/v8/demand/content/update/status',
-  GET_REQUEST_DATA_BYID: 'apis/proxies/v8/demand/content/read'
+  MARK_INVALID:'/apis/proxies/v8/demand/content/v1/update/status',
+  GET_REQUEST_DATA_BYID: 'apis/proxies/v8/demand/content/read',
+  GET_INTEREST_ORG_LIST:'/apis/proxies/v8/interest/v1/search',
+  ASSIGN_TO_ORG:'/apis/proxies/v8/interest/v1/assign'
+
 }
 
 @Injectable({
@@ -83,5 +86,13 @@ export class ProfileV2Service {
   getRequestDataById(demandId:any) {
     return this.http.get<any>(`${API_END_POINTS.GET_REQUEST_DATA_BYID}/${demandId}`).pipe(map(res=>_.get(res, 'result.result')))
   }
+  getOrgInterestList(request:any) {
+    return this.http.post<any>(`${API_END_POINTS.GET_INTEREST_ORG_LIST}`, request).pipe(map(res=>_.get(res, 'result.result')))
+  }
+
+  assignToOrg(request:any) {
+    return this.http.put<any>(`${API_END_POINTS.ASSIGN_TO_ORG}`, request)
+  }
+
 
 }

From 04eafc872c1832d91730fa5866ff569f59899901 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Thu, 30 May 2024 17:48:33 +0530
Subject: [PATCH 661/887] Fixed 4868,4787, fixed reloading approvals list

---
 .../user-cards/user-card.component.html       | 25 +++++---
 .../user-cards/user-card.component.scss       | 13 ++++
 .../user-cards/user-card.component.ts         | 62 ++++++++++++-------
 .../approval-pending.component.html           |  2 +-
 .../approval-pending.component.ts             | 20 +-----
 5 files changed, 73 insertions(+), 49 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index d49ebe8e0..0d5032c0f 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -117,7 +117,12 @@
               <div class="md:w-1/3">
                 <label class="margin-remove-bottom form-label">Employee ID</label>
                 <mat-form-field appearance="outline">
-                  <input type="text" matInput #employeeID formControlName="employeeID" maxlength="15">
+                  <input type="text" matInput #employeeID formControlName="employeeID">
+                  <mat-error [hidden]="false" class="custom-error"
+                    *ngIf="updateUserDataForm?.controls['employeeID'].errors?.pattern" i18n-aria-label
+                    aria-label="Please enter a valid id">
+                    Please enter a valid employee Id
+                  </mat-error>
                 </mat-form-field>
               </div>
 
@@ -141,12 +146,15 @@
 
               <div class="md:w-1/3">
                 <label class="margin-remove-bottom form-label required">Mobile number</label>
-                <mat-form-field appearance="outline" class="w82 mobile-country-code">
-                  <mat-select formControlName="countryCode" default="+91" i18n-placeholder placeholder="Select code"
+                <!-- <mat-form-field appearance="outline" class="w82 mobile-country-code"> -->
+                <!-- <mat-select formControlName="countryCode" default="+91" i18n-placeholder placeholder="Select code"
                     i18n-aria-label aria-label="Mobile Number label">
                     <mat-option [value]="code" *ngFor="let code of countryCodes">{{code}}</mat-option>
-                  </mat-select>
-                </mat-form-field>
+                  </mat-select> -->
+                <div class="country-code margin-right-xs">
+                  +91
+                </div>
+                <!-- </mat-form-field> -->
                 <mat-form-field appearance="outline" class="flex-expand w-48p">
                   <input id="mobileNumber" #mobile type="text" matInput placeholder="Type here" formControlName="mobile"
                     i18n-aria-label aria-label="Mobile Number input" maxlength="10" (keypress)="numericOnly($event)"
@@ -417,7 +425,7 @@
           <div class="flex flex-row margin-top-m">
             <div class="md:w-1/4">
               <label class="view-text-label">Employee ID</label>
-              <p>{{user.profileDetails && user.profileDetails.employmentDetails &&
+              <p class="word-wrap margin-right-l">{{user.profileDetails && user.profileDetails.employmentDetails &&
                 user.profileDetails.employmentDetails.employeeCode ?
                 user.profileDetails.employmentDetails.employeeCode : '-'}}</p>
             </div>
@@ -635,7 +643,8 @@
             <div class="flex flex-row margin-top-m">
               <div class="md:w-1/4">
                 <label class="view-text-label">Employee ID</label>
-                <p>{{appData.user.profileDetails && appData.user.profileDetails.employmentDetails &&
+                <p class="word-wrap margin-right-l">{{appData.user.profileDetails &&
+                  appData.user.profileDetails.employmentDetails &&
                   appData.user.profileDetails.employmentDetails.employeeCode ?
                   appData.user.profileDetails.employmentDetails.employeeCode : '-'}}</p>
               </div>
@@ -742,7 +751,7 @@
                 Update
               </span>
             </button>
-            <button mat-raised-button type="submit" (click)="onApprovalCancel(panel)"
+            <button mat-raised-button type="submit" (click)="onApprovalCancel(panel, appData)"
               class="btn-success btn-responsive cancelbtn">
               <span i18n>
                 Cancel
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
index 254194462..d45f4e92a 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
@@ -345,4 +345,17 @@ label {
 
 .word-wrap {
   word-wrap: break-word;
+}
+
+.country-code {
+    padding: 6px 0;
+    text-align: center;
+    width: 46px;
+    height: 26px;
+    display: inline-block;
+    position: relative;
+    top: -2px;
+    border-radius: 4px;
+    border: 1px solid rgba(0, 0, 0, .14);
+    font-family: Lato;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index b2a5510cd..2a17fff30 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -74,7 +74,7 @@ export class UserCardComponent implements OnInit, OnChanges {
   separatorKeysCodes: number[] = [ENTER, COMMA]
   namePatern = `^[a-zA-Z ]*$`
   orgTypeList: any = []
-  public countryCodes: string[] = []
+  // public countryCodes: string[] = []
   masterLanguages: Observable<any[]> | undefined
   masterLanguagesEntries: any
   genderList = ['Male', 'Female', 'Others']
@@ -90,7 +90,7 @@ export class UserCardComponent implements OnInit, OnChanges {
   emailRegix = `^[\\w\-\\.]+@([\\w-]+\\.)+[\\w-]{2,4}$`
   pincodePattern = '(^[0-9]{6}$)'
   yearPattern = '(^[0-9]{4}$)'
-  empIDPattern = `/^[a-z0-9]+$/i`
+  empIDPattern = `^[a-z0-9]+$`
 
   userGroup: any
 
@@ -118,7 +118,7 @@ export class UserCardComponent implements OnInit, OnChanges {
       ehrmsID: new FormControl({ value: '', disabled: true }, []),
       dob: new FormControl('', []),
       primaryEmail: new FormControl('', [Validators.required, Validators.email, Validators.pattern(this.emailRegix)]),
-      countryCode: new FormControl('+91', [Validators.required]),
+      // countryCode: new FormControl('+91', []),
       mobile: new FormControl('', [Validators.required, Validators.pattern(this.phoneNumberPattern)]),
       tags: new FormControl('', [Validators.pattern(this.namePatern)]),
       roles: new FormControl('', [Validators.required]),
@@ -269,7 +269,7 @@ export class UserCardComponent implements OnInit, OnChanges {
     await this.loadDesignations()
     await this.loadGroups()
     await this.loadLangauages()
-    await this.loadCountryCodes()
+    // await this.loadCountryCodes()
     await this.loadRoles()
   }
 
@@ -302,20 +302,20 @@ export class UserCardComponent implements OnInit, OnChanges {
       })
   }
 
-  async loadCountryCodes() {
-    this.usersSvc.getMasterNationlity().subscribe((data: any) => {
-      data.nationality.map((item: any) => {
-        this.countryCodes.push(item.countryCode)
-      })
+  // async loadCountryCodes() {
+  //   this.usersSvc.getMasterNationlity().subscribe((data: any) => {
+  //     data.nationality.map((item: any) => {
+  //       this.countryCodes.push(item.countryCode)
+  //     })
 
-      this.updateUserDataForm.patchValue({
-        countryCode: '+91',
-      })
-    },
-      // tslint:disable-next-line
-      (_err: any) => {
-      })
-  }
+  //     this.updateUserDataForm.patchValue({
+  //       countryCode: '+91',
+  //     })
+  //   },
+  //     // tslint:disable-next-line
+  //     (_err: any) => {
+  //     })
+  // }
 
   async loadRoles() {
     this.roleservice.getAllRoles().subscribe((_data: any) => {
@@ -393,7 +393,8 @@ export class UserCardComponent implements OnInit, OnChanges {
     this.updateTags(profileData)
 
     if (this.isApprovals) {
-      // this.needApprovalList = []
+      this.approveUserDataForm.reset()
+      user.needApprovalList = []
       this.actionList = []
       this.comment = ''
       this.getApprovalList(data)
@@ -684,7 +685,13 @@ export class UserCardComponent implements OnInit, OnChanges {
       updateFieldValues: JSON.parse(field.wf.updateFieldValues),
     }
     if (action === 'APPROVE') {
-      this.actionList.push(req)
+      // const index = this.actionList.indexOf(req.wfId)
+      const index = this.actionList.findIndex((x: any) => x.wfId === req.wfId)
+      if (index > -1) {
+        this.actionList[index] = req
+      } else {
+        this.actionList.push(req)
+      }
       // this.onApproveOrRejectClick(req)
     } else {
       this.comment = ''
@@ -696,7 +703,13 @@ export class UserCardComponent implements OnInit, OnChanges {
           // this.onApproveOrRejectClick(req)
           req.comment = this.comment
           field.comment = this.comment
-          this.actionList.push(req)
+          // const index = this.actionList.indexOf(req.wfId)
+          const index = this.actionList.findIndex((x: any) => x.wfId === req.wfId)
+          if (index > -1) {
+            this.actionList[index] = req
+          } else {
+            this.actionList.push(req)
+          }
         } else {
           dialogRef.close()
         }
@@ -732,17 +745,17 @@ export class UserCardComponent implements OnInit, OnChanges {
           req.comment = ''
         }
         this.onApproveOrRejectClick(req)
-
         if (index === datalength - 1) {
           panel.close()
           this.comment = ''
           setTimeout(() => {
             this.openSnackbar('Request approved successfully')
+            this.updateList.emit()
             // tslint:disable-next-line
           }, 100)
         }
         // tslint:disable-next-line
-        this.approvalData = this.approvalData.filter((wf: any) => { wf.userWorkflow.userInfo.wid !== req.userId })
+        // this.approvalData = this.approvalData.filter((wf: any) => { wf.userWorkflow.userInfo.wid !== req.userId })
         if (this.approvalData.length === 0) {
           this.disableButton.emit()
         }
@@ -833,7 +846,10 @@ export class UserCardComponent implements OnInit, OnChanges {
     })
   }
 
-  onApprovalCancel(panel: any) {
+  onApprovalCancel(panel: any, appData: any) {
     panel.close()
+    appData.needApprovalList.forEach((f: any) => {
+      f.action = ''
+    })
   }
 }
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
index 2c3b3b417..cccd3b455 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
@@ -53,7 +53,7 @@
           <ws-widget-user-card [currentFilter]="currentFilter" [usersData]="data" [isApprovals]="true"
             [totalRecords]="approvalTotalCount" [tabChangeIndex]="pageIndex"
             (searchByEnterKey)="onEnterkySearch($event)" (disableButton)="showButton()"
-            (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
+            (paginationData)="onPaginateChange($event)" (updateList)="fetchApprovals()"></ws-widget-user-card>
         </ng-container>
         <ng-container *ngIf="!data || data.length === 0">
           <p class="margin-top-xl margin-bottom-xl">No approvals</p>
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
index 3ec64b6e0..62a4047b9 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
@@ -128,20 +128,6 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   }
 
   fetchApprovals() {
-    // const conditions = [
-    //   ['location', 'Country'],
-    //   ['designation', 'Designation'],
-    //   ['group', 'Group'],
-    //   ['name', 'Organisation Name'],
-    //   ['orgNameOther', 'Other Organisation Name'],
-    //   ['industry', 'Industry'],
-    //   ['industryOther', 'Other Industry'],
-    //   ['doj', 'Date of Joining'],
-    //   ['organisationType', 'Type of Organisation'],
-    //   ['orgDesc', 'Organisation Description'],
-    //   ['verifiedKarmayogi', 'Verified Karmayogi'],
-    // ]
-
     if (this.departName) {
       const req = {
         serviceName: 'profile',
@@ -154,7 +140,6 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
         this.data = []
         const newarray: any = []
         let currentdate: Date
-        // this.approvalTotalCount = res.result.count
         const resData = res.result.data
         resData.forEach((approval: any) => {
           // let keys = ''
@@ -220,7 +205,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   replaceWords(inputString: any, wordConditions: any) {
     return wordConditions.reduce((acc: any, [word, condition]: any) => {
       return acc.replace(new RegExp(word, 'gi'), condition)
-    },                           inputString)
+    }, inputString)
   }
 
   onSearch(enterValue: any) {
@@ -282,7 +267,8 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
           setTimeout(() => {
             this.openSnackbar('All requests are Approved')
             this.fetchApprovals()
-          },         200)
+            /* tslint:disable */
+          }, 200)
         }
       })
     }

From 5bda90ad5697675eebd8b9db2cf13650e69c459c Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Thu, 30 May 2024 17:50:50 +0530
Subject: [PATCH 662/887] Fixed 4971 & current user is not listed

---
 .../users-view/users-view.component.html      |  4 +-
 .../routes/users-view/users-view.component.ts | 43 +++++++++++++------
 2 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index cde4b37d8..33d405a0f 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -65,10 +65,10 @@
             mat-button (click)="filter('nonverified'); tabTelemetry('nonverified', 0)" role="button">Non-verified
             ({{nonverifiedUsersDataCount}})</a>
 
-          <a routerLink="/app/home/users/notmyuser" routerLinkActive="router-link-active" class="filter-option"
+          <!-- <a routerLink="/app/home/users/notmyuser" routerLinkActive="router-link-active" class="filter-option"
             [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'notmyuser','ws-mat-accent-border font-medium':currentFilter !== 'notmyuser'}"
             mat-button (click)="filter('notmyuser'); tabTelemetry('notmyuser', 0)" role="button">Not my user
-            ({{notmyuserUsersDataCount}})</a>
+            ({{notmyuserUsersDataCount}})</a> -->
         </div>
       </div>
       <!-- <ws-widget-org-user-table-v2 [userId]="currentUser" [tableData]="tabledata" [data]="dataForTable"
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 36c101b6c..168b942f0 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -13,7 +13,6 @@ import { NSProfileDataV2 } from '../../models/profile-v2.model'
 import { UsersService } from '../../../users/services/users.service'
 import { LoaderService } from '../../../../../../../../../src/app/services/loader.service'
 import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
-// import { ProfileV2UtillService } from '../../services/home-utill.service'
 import { ReportsVideoComponent } from '../reports-video/reports-video.component'
 
 @Component({
@@ -62,26 +61,22 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   pageIndex = 0
   searchQuery = ''
   rootOrgId: any
+  currentUserStatus: any
+
   constructor(
     public dialog: MatDialog,
     private route: ActivatedRoute,
     private router: Router,
-    // private snackBar: MatSnackBar,
     private events: EventService,
     private loaderService: LoaderService,
-    // private profileUtilSvc: ProfileV2UtillService,
     private sanitizer: DomSanitizer,
-    // private telemetrySvc: TelemetryService,
-    // private configSvc: ConfigurationsService,
-    // private discussService: DiscussService,
     // private configSvc: ConfigurationsService,
-    // private networkV2Service: NetworkV2Service,
-    // private profileV2Svc: ProfileV2Service
     private usersService: UsersService
   ) {
     this.Math = Math
     this.configSvc = this.route.parent && this.route.parent.snapshot.data.configService
     this.currentUser = this.configSvc.userProfile && this.configSvc.userProfile.userId
+    this.currentUserStatus = this.configSvc.unMappedUser.profileDetails.profileStatus
 
     // this.usersData = _.get(this.route, 'snapshot.data.usersList.data') || {}
     // this.filterData()
@@ -101,10 +96,10 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     }
     // this.filterData('')
 
+    this.getNMUsers('')
     this.getAllUsers('')
     this.getVUsers('')
     this.getNVUsers('')
-    this.getNMUsers('')
 
     this.reportsNoteList = [
       `Easily create users individually or in bulk.`,
@@ -208,12 +203,16 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       const allusersData = data.result.response
       this.activeUsersData = allusersData.content
       this.activeUsersData = this.activeUsersData.filter((wf: any) => wf.profileDetails.profileStatus !== 'NOT-MY-USER')
-      // if (allusersData.count > this.activeUsersData.length) {
-      //   const count = allusersData.count - this.activeUsersData.length
-      //   this.activeUsersDataCount = allusersData.count - count
-      // } else {
       this.activeUsersDataCount = allusersData.count
-      // }
+      const i = this.activeUsersData.findIndex((wf: any) => wf.userId === this.currentUser)
+      if (i > -1) {
+        this.activeUsersData.splice(i, 1)
+        allusersData.count = allusersData.count - 1
+      }
+
+      if (this.notmyuserUsersDataCount && allusersData.count > this.notmyuserUsersDataCount) {
+        this.activeUsersDataCount = allusersData.count - this.notmyuserUsersDataCount
+      }
     })
   }
   async getVUsers(query: string) {
@@ -227,6 +226,14 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       const allusersData = data.result.response
       this.verifiedUsersData = allusersData.content
       this.verifiedUsersDataCount = data.result.response.count
+
+      if (this.currentUserStatus === 'VERIFIED') {
+        const i = this.verifiedUsersData.findIndex((wf: any) => wf.userId === this.currentUser)
+        if (i > -1) {
+          this.verifiedUsersData.splice(i, 1)
+          this.verifiedUsersDataCount = this.verifiedUsersDataCount ? this.verifiedUsersDataCount - 1 : this.verifiedUsersDataCount
+        }
+      }
     })
   }
 
@@ -241,6 +248,14 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       const allusersData = data.result.response
       this.nonverifiedUsersData = allusersData.content
       this.nonverifiedUsersDataCount = data.result.response.count
+
+      if (this.currentUserStatus === 'NOT-VERIFIED') {
+        const i = this.nonverifiedUsersData.findIndex((wf: any) => wf.userId === this.currentUser)
+        if (i > -1) {
+          this.nonverifiedUsersData.splice(i, 1)
+          this.nonverifiedUsersDataCount = this.nonverifiedUsersDataCount ? this.nonverifiedUsersDataCount - 1 : this.nonverifiedUsersDataCount
+        }
+      }
     })
   }
 

From e3475967b9289352bc00a822cf5ee1c0f0c4ee34 Mon Sep 17 00:00:00 2001
From: Venkat Kandagaddala <venky.kandagaddala@gmail.com>
Date: Thu, 30 May 2024 19:26:25 +0530
Subject: [PATCH 663/887] Bug fix - KB-5046

---
 .../routes/home/components/user-cards/user-card.component.scss  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
index 254194462..2e5818c4f 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
@@ -318,7 +318,7 @@ label {
   color: #666 !important;
 }
 ::ng-deep .mat-dialog-container {
-  padding: 0 !important;
+  //padding: 0 !important;
   overflow: unset !important;
 }
 

From dd4fa9bc9c771ec0d1b084b938f9e7916a5f2362 Mon Sep 17 00:00:00 2001
From: sohail amjad <sohail.amjad@tarento.com>
Date: Thu, 30 May 2024 20:02:46 +0530
Subject: [PATCH 664/887] added optional check

---
 .../assign-list-popup/assign-list-popup.component.html          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.html b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.html
index 9a61bd493..5fb25c75c 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.html
+++ b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.html
@@ -1,5 +1,5 @@
 <div class="main-container">
-  <div class="full-table-container" *ngIf="providerList.length > 0">
+  <div class="full-table-container" *ngIf="providerList?.length > 0">
     <form [formGroup]="requestForm">
         <div class="header-section">
             <div class="title">

From 9f2bc2d17ba508b5bd4460090d2bf3051c2549d6 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Thu, 30 May 2024 22:40:35 +0530
Subject: [PATCH 665/887] Fixed 4947

---
 .../user-cards/user-card.component.html       |  2 +-
 .../user-cards/user-card.component.ts         | 62 ++++++++++---------
 2 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 0d5032c0f..916040cde 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -6,7 +6,7 @@
   <mat-accordion [multi]="true">
     <mat-expansion-panel class="user-card" *ngFor="let user of usersData | orderBy: 'firstName':'asc'" #panel
       (opened)="closeOtherPanels(panel)">
-      <mat-expansion-panel-header (click)="getUerData(user)">
+      <mat-expansion-panel-header (click)="getUerData(user, '', panel)">
         <div class="float-left width88" (click)="$event.stopPropagation();">
           <div class="initialcircle display-inline-block margin-right-m">
             <!-- <span>AB</span> -->
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 922144e54..0a56858da 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -108,9 +108,9 @@ export class UserCardComponent implements OnInit, OnChanges {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-              private dialog: MatDialog, private approvalSvc: ApprovalsService,
-              private route: ActivatedRoute, private snackBar: MatSnackBar,
-              private events: EventService) {
+    private dialog: MatDialog, private approvalSvc: ApprovalsService,
+    private route: ActivatedRoute, private snackBar: MatSnackBar,
+    private events: EventService) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),
@@ -384,28 +384,30 @@ export class UserCardComponent implements OnInit, OnChanges {
     })
   }
 
-  getUerData(user: any, data: any) {
-    user.enableEdit = false
-    let profileDataAll = user
-    this.userStatus = profileDataAll.isDeleted ? 'Inactive' : 'Active'
+  getUerData(user: any, data: any, panel: any) {
+    if (panel.expanded) {
+      user.enableEdit = false
+      let profileDataAll = user
+      this.userStatus = profileDataAll.isDeleted ? 'Inactive' : 'Active'
 
-    const profileData = profileDataAll.profileDetails
-    this.updateTags(profileData)
+      const profileData = profileDataAll.profileDetails
+      this.updateTags(profileData)
 
-    if (this.isApprovals) {
-      this.approveUserDataForm.reset()
-      user.needApprovalList = []
-      this.actionList = []
-      this.comment = ''
-      this.getApprovalList(data)
-    } else {
-      this.usersSvc.getUserById(user.userId).subscribe((res: any) => {
-        if (res) {
-          profileDataAll = res
-          profileDataAll.enableEdit = false
-          this.mapRoles(profileDataAll)
-        }
-      })
+      if (this.isApprovals) {
+        this.approveUserDataForm.reset()
+        user.needApprovalList = []
+        this.actionList = []
+        this.comment = ''
+        this.getApprovalList(data)
+      } else {
+        this.usersSvc.getUserById(user.userId).subscribe((res: any) => {
+          if (res) {
+            profileDataAll = res
+            profileDataAll.enableEdit = false
+            this.mapRoles(profileDataAll)
+          }
+        })
+      }
     }
   }
 
@@ -507,10 +509,15 @@ export class UserCardComponent implements OnInit, OnChanges {
 
   private getDateFromText(dateString: string): any {
     if (dateString) {
-      const splitValues: string[] = dateString.split('-')
-      const [dd, mm, yyyy] = splitValues
-      const dateToBeConverted = `${yyyy}-${mm}-${dd}`
-      return new Date(dateToBeConverted)
+      const sv: string[] = dateString.split('T')
+      if (sv && sv.length > 1) {
+        return sv[0]
+      } else {
+        const splitValues: string[] = dateString.split('-')
+        const [dd, mm, yyyy] = splitValues
+        const dateToBeConverted = `${yyyy}-${mm}-${dd}`
+        return new Date(dateToBeConverted)
+      }
     }
     return ''
   }
@@ -634,7 +641,6 @@ export class UserCardComponent implements OnInit, OnChanges {
                   roles: Array.from(this.userRoles),
                 },
               }
-
               this.usersSvc.addUserToDepartment(dreq).subscribe(res => {
                 if (res) {
                   this.updateUserDataForm.reset({ roles: '' })

From 3100ae778f897c298bb4a5e6d27bb8b1696c890d Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Thu, 30 May 2024 22:56:15 +0530
Subject: [PATCH 666/887] Lint fixes

---
 .../home/components/user-cards/user-card.component.ts    | 9 ++++-----
 .../approval-pending/approval-pending.component.ts       | 2 +-
 .../home/routes/users-view/users-view.component.ts       | 3 ++-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 0a56858da..df790396b 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -512,12 +512,11 @@ export class UserCardComponent implements OnInit, OnChanges {
       const sv: string[] = dateString.split('T')
       if (sv && sv.length > 1) {
         return sv[0]
-      } else {
-        const splitValues: string[] = dateString.split('-')
-        const [dd, mm, yyyy] = splitValues
-        const dateToBeConverted = `${yyyy}-${mm}-${dd}`
-        return new Date(dateToBeConverted)
       }
+      const splitValues: string[] = dateString.split('-')
+      const [dd, mm, yyyy] = splitValues
+      const dateToBeConverted = `${yyyy}-${mm}-${dd}`
+      return new Date(dateToBeConverted)
     }
     return ''
   }
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
index 62a4047b9..d7f559d9d 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
@@ -205,7 +205,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   replaceWords(inputString: any, wordConditions: any) {
     return wordConditions.reduce((acc: any, [word, condition]: any) => {
       return acc.replace(new RegExp(word, 'gi'), condition)
-    }, inputString)
+    },                           inputString)
   }
 
   onSearch(enterValue: any) {
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 168b942f0..bfa2cdcae 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -253,7 +253,8 @@ export class UsersViewComponent implements OnInit, OnDestroy {
         const i = this.nonverifiedUsersData.findIndex((wf: any) => wf.userId === this.currentUser)
         if (i > -1) {
           this.nonverifiedUsersData.splice(i, 1)
-          this.nonverifiedUsersDataCount = this.nonverifiedUsersDataCount ? this.nonverifiedUsersDataCount - 1 : this.nonverifiedUsersDataCount
+          this.nonverifiedUsersDataCount = this.nonverifiedUsersDataCount ?
+            this.nonverifiedUsersDataCount - 1 : this.nonverifiedUsersDataCount
         }
       }
     })

From e1921c052c803d3939e601dfb575be5c6d4df173 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Thu, 30 May 2024 23:21:52 +0530
Subject: [PATCH 667/887] Fixed 4797

---
 .../routes/home/components/user-cards/user-card.component.ts  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index df790396b..bbe59c2ac 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -404,6 +404,7 @@ export class UserCardComponent implements OnInit, OnChanges {
           if (res) {
             profileDataAll = res
             profileDataAll.enableEdit = false
+            user = profileDataAll
             this.mapRoles(profileDataAll)
           }
         })
@@ -436,7 +437,8 @@ export class UserCardComponent implements OnInit, OnChanges {
         this.updateUserDataForm.controls['roles'].setValue(usrRoles)
         usrRoles.forEach((role: any) => {
           this.orguserRoles.push(role)
-          this.modifyUserRoles(role)
+          this.userRoles.add(role)
+          // this.modifyUserRoles(role)
         })
       }
     } else {

From d1dd84114dee4dbb22f839d23c172582eeebd540 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Fri, 31 May 2024 05:19:12 +0530
Subject: [PATCH 668/887] lint issue fix

---
 .../home/components/user-cards/user-card.component.ts     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index bbe59c2ac..9936f8387 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -108,9 +108,9 @@ export class UserCardComponent implements OnInit, OnChanges {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-    private dialog: MatDialog, private approvalSvc: ApprovalsService,
-    private route: ActivatedRoute, private snackBar: MatSnackBar,
-    private events: EventService) {
+              private dialog: MatDialog, private approvalSvc: ApprovalsService,
+              private route: ActivatedRoute, private snackBar: MatSnackBar,
+              private events: EventService) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),
@@ -404,7 +404,7 @@ export class UserCardComponent implements OnInit, OnChanges {
           if (res) {
             profileDataAll = res
             profileDataAll.enableEdit = false
-            user = profileDataAll
+            // user = profileDataAll
             this.mapRoles(profileDataAll)
           }
         })

From 2ad02438ea1b8115f09afc936542644fce2b7681 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Fri, 31 May 2024 12:34:25 +0530
Subject: [PATCH 669/887] Fixed approval panel & dialog padding issue

---
 .../routes/home/components/user-cards/user-card.component.html  | 2 +-
 .../routes/home/components/user-cards/user-card.component.scss  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 916040cde..23ebd273d 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -532,7 +532,7 @@
   <mat-accordion [multi]="true" *ngIf="approvalData">
     <mat-expansion-panel class="user-card" *ngFor="let appData of approvalData | orderBy: 'firstName':'asc'" #panel
       (opened)="closeOtherPanels(panel)">
-      <mat-expansion-panel-header (click)="getUerData(appData.user, appData.userWorkflow);">
+      <mat-expansion-panel-header (click)="getUerData(appData.user, appData.userWorkflow, panel);">
         <div class="float-left width82" (click)="$event.stopPropagation();">
           <div class="initialcircle display-inline-block margin-right-s" *ngIf="appData?.user">
             <ws-widget-avatar-photo [name]="getUseravatarName(appData?.user)" [photoUrl]="appData?.user?.photo"
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
index 322bbec03..9e8bfb3ca 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
@@ -323,6 +323,7 @@ label {
 }
 
 .rejectdialog {
+  margin: -24px;
   .mat-dialog-title {
     background: #1b4ca1;
     color: #fff;

From b3e18eb409409c308e4cd5b8fd2ebe391f58e41f Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Fri, 31 May 2024 12:48:05 +0530
Subject: [PATCH 670/887] removing extra code based on review points

---
 .../routes/home/components/user-cards/user-card.component.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index e6f821a52..b7ecc6046 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -88,7 +88,7 @@
                   cancel</mat-icon>
               </div>
               <div class="md:w-1/3">
-                <label class="margin-remove-bottom form-label">Designation fg</label>
+                <label class="margin-remove-bottom form-label">Designation</label>
                 <mat-form-field appearance="outline">
                   <mat-select #designation formControlName="designation" i18n-placeholder
                     placeholder="Select designation"

From b3498a3cdb6ca32e0caa0228d0e663565a7e0f45 Mon Sep 17 00:00:00 2001
From: Vinod Kumar Shyave <121538586+vShyave@users.noreply.github.com>
Date: Fri, 31 May 2024 13:01:58 +0530
Subject: [PATCH 671/887] disabled special char on tags

---
 .../single-user-creation.component.html          |  2 +-
 .../single-user-creation.component.ts            | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
index 00af3c325..a230f2832 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
@@ -140,7 +140,7 @@
         <div class="label">Tags</div>
         <input type="text" class="input-text" matInput i18n-placeholder="Type tag here"
           placeholder="Type tag here and press enter" [matChipInputFor]="chipListTags" autocomplete="off"
-          maxlength="100" [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
+          maxlength="100" [matChipInputSeparatorKeyCodes]="separatorKeysCodes" (keypress)="handleValidTags($event)"
           (matChipInputTokenEnd)="handleAddTags($event)" />
         <mat-chip-list #chipListTags>
           <mat-chip *ngFor="let tag of userCreationForm?.get('tags')?.value" [selectable]="true" [removable]="true"
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
index 748a960c0..e8a0af5c1 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
@@ -136,7 +136,7 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
       .subscribe((_res: any) => {
         this.masterData['designation'] = _res.responseData
         this.masterData['designationBackup'] = _res.responseData
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch designation details, please try again later!')
         }
@@ -149,7 +149,7 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
       .subscribe((res: any) => {
         this.masterData['language'] = res.languages
         this.masterData['languageBackup'] = res.languages
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch master language details, please try again later!')
         }
@@ -161,7 +161,7 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
         this.masterData['group'] = res.result.response
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch group data, please try again later!')
         }
@@ -179,7 +179,7 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
             this.masterData['mdoRoles'] = mdoArray.roles
           }
         }
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch roles list, please try again later!')
         }
@@ -216,6 +216,12 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
     }
   }
 
+  handleValidTags(event: any): any {
+    const charCode = event.charCode
+    // tslint:disable-next-line
+    return ((charCode > 64 && charCode < 91) || (charCode > 96 && charCode < 123) || charCode == 8 || charCode == 32 || (charCode >= 48 && charCode <= 57))
+  }
+
   handleRemoveTag(tag: any): void {
     if (this.userCreationForm.get('roles')) {
       // tslint:disable-next-line
@@ -261,7 +267,7 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
       .subscribe((_res: any) => {
         this.matSnackBar.open('User created successfully!')
         this.handleFormClear()
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open(_.get(_err, 'error.params.errmsg') || 'Unable to create user, please try again later!')
         }

From 612728efb7c34faa423ef99a233faeffd6c0289a Mon Sep 17 00:00:00 2001
From: Vinod Kumar Shyave <121538586+vShyave@users.noreply.github.com>
Date: Fri, 31 May 2024 13:03:47 +0530
Subject: [PATCH 672/887] disabled special char on tags

---
 .../single-user-creation.component.ts                  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
index e8a0af5c1..1af0aa187 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
@@ -136,7 +136,7 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
       .subscribe((_res: any) => {
         this.masterData['designation'] = _res.responseData
         this.masterData['designationBackup'] = _res.responseData
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch designation details, please try again later!')
         }
@@ -149,7 +149,7 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
       .subscribe((res: any) => {
         this.masterData['language'] = res.languages
         this.masterData['languageBackup'] = res.languages
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch master language details, please try again later!')
         }
@@ -161,7 +161,7 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
         this.masterData['group'] = res.result.response
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch group data, please try again later!')
         }
@@ -179,7 +179,7 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
             this.masterData['mdoRoles'] = mdoArray.roles
           }
         }
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch roles list, please try again later!')
         }
@@ -267,7 +267,7 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
       .subscribe((_res: any) => {
         this.matSnackBar.open('User created successfully!')
         this.handleFormClear()
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open(_.get(_err, 'error.params.errmsg') || 'Unable to create user, please try again later!')
         }

From baba1081395b6b7a3c61fc3f4e7b0a8af7c75d78 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Fri, 31 May 2024 13:06:07 +0530
Subject: [PATCH 673/887] Fixed 4868

---
 .../home/components/user-cards/user-card.component.ts    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 9936f8387..1eb3ec738 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -108,9 +108,9 @@ export class UserCardComponent implements OnInit, OnChanges {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-              private dialog: MatDialog, private approvalSvc: ApprovalsService,
-              private route: ActivatedRoute, private snackBar: MatSnackBar,
-              private events: EventService) {
+    private dialog: MatDialog, private approvalSvc: ApprovalsService,
+    private route: ActivatedRoute, private snackBar: MatSnackBar,
+    private events: EventService) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),
@@ -404,7 +404,8 @@ export class UserCardComponent implements OnInit, OnChanges {
           if (res) {
             profileDataAll = res
             profileDataAll.enableEdit = false
-            // user = profileDataAll
+            user = profileDataAll
+            this.userRoles.clear()
             this.mapRoles(profileDataAll)
           }
         })

From a97f8e02fd8fafcf5ca6c6468f26bf1200527850 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Fri, 31 May 2024 13:18:50 +0530
Subject: [PATCH 674/887] Fixed 4880

---
 .../approvals/bulk-upload/bulk-upload.component.ts   | 12 ++++++++----
 .../users-view/bulk-upload/bulk-upload.component.ts  |  6 +++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
index 930a2256b..12b0ebc70 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
@@ -74,7 +74,7 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
         this.lastUploadList = res.result.content
-      },         (error: HttpErrorResponse) => {
+      }, (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open('Unable to get Bulk status list')
         }
@@ -116,7 +116,7 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
         if (!resendFlag) {
           this.verifyOTP(contactType)
         }
-      },         (error: HttpErrorResponse) => {
+      }, (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open(_.get(error, 'error.params.errmsg') || `Unable to send OTP to your ${contactType}, please try again later!`)
         }
@@ -130,7 +130,11 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
       const file: File = fileList[0]
       this.fileName = file.name
       this.fileSelected = file
-      this.sendOTP()
+      if (this.fileService.validateFile(this.fileName)) {
+        this.sendOTP()
+      } else {
+        this.showFileError = true
+      }
     }
   }
 
@@ -164,7 +168,7 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
             this.fileName = ''
             this.fileSelected = ''
             this.getBulkStatusList()
-          },         (_err: HttpErrorResponse) => {
+          }, (_err: HttpErrorResponse) => {
             if (!_err.ok) {
               this.matSnackBar.open('Uploading CSV file failed due to some error, please try again later!')
             }
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts
index 9660dfd08..d17d146f2 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts
@@ -132,7 +132,11 @@ export class BulkUploadComponent implements OnInit, AfterViewInit, OnDestroy {
       const file: File = fileList[0]
       this.fileName = file.name
       this.fileSelected = file
-      this.sendOTP()
+      if (this.fileService.validateFile(this.fileName)) {
+        this.sendOTP()
+      } else {
+        this.showFileError = true
+      }
     }
   }
 

From 1dfc24eb9c45e99200a39ca77d01a6604926bd0b Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Fri, 31 May 2024 13:53:37 +0530
Subject: [PATCH 675/887] Fixed lint issue

---
 .../home/components/user-cards/user-card.component.ts     | 8 ++++----
 .../routes/approvals/bulk-upload/bulk-upload.component.ts | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 9182e0b13..ef9546790 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -108,9 +108,9 @@ export class UserCardComponent implements OnInit, OnChanges {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-    private dialog: MatDialog, private approvalSvc: ApprovalsService,
-    private route: ActivatedRoute, private snackBar: MatSnackBar,
-    private events: EventService) {
+              private dialog: MatDialog, private approvalSvc: ApprovalsService,
+              private route: ActivatedRoute, private snackBar: MatSnackBar,
+              private events: EventService) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),
@@ -404,7 +404,7 @@ export class UserCardComponent implements OnInit, OnChanges {
           if (res) {
             profileDataAll = res
             profileDataAll.enableEdit = false
-            user = profileDataAll
+            // user = profileDataAll
             this.userRoles.clear()
             this.mapRoles(profileDataAll)
           }
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
index 12b0ebc70..cd9233b3f 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
@@ -74,7 +74,7 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
         this.lastUploadList = res.result.content
-      }, (error: HttpErrorResponse) => {
+      },         (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open('Unable to get Bulk status list')
         }
@@ -116,7 +116,7 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
         if (!resendFlag) {
           this.verifyOTP(contactType)
         }
-      }, (error: HttpErrorResponse) => {
+      },         (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open(_.get(error, 'error.params.errmsg') || `Unable to send OTP to your ${contactType}, please try again later!`)
         }
@@ -168,7 +168,7 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
             this.fileName = ''
             this.fileSelected = ''
             this.getBulkStatusList()
-          }, (_err: HttpErrorResponse) => {
+          },         (_err: HttpErrorResponse) => {
             if (!_err.ok) {
               this.matSnackBar.open('Uploading CSV file failed due to some error, please try again later!')
             }

From 8f27763a33c656ca7b96d54329b45c3f29ab3e3c Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Fri, 31 May 2024 16:58:03 +0530
Subject: [PATCH 676/887] Fixed 4968

---
 .../user-cards/user-card.component.html          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 7161a45a5..78933b4ff 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -81,10 +81,10 @@
                   </mat-error>
                 </mat-form-field>
                 <mat-icon class="verified-icon margin-left-xs"
-                  *ngIf="user?.profileDetails?.profileStatus === 'VERIFIED'">
+                  *ngIf="user?.profileDetails?.profileGroupStatus === 'VERIFIED'">
                   check_circle</mat-icon>
                 <mat-icon class="nonverified-icon margin-left-xs"
-                  *ngIf="user?.profileDetails?.profileStatus === 'NOT-VERIFIED'">
+                  *ngIf="user?.profileDetails?.profileGroupStatus === 'NOT-VERIFIED'">
                   cancel</mat-icon>
               </div>
               <div class="md:w-1/3">
@@ -104,10 +104,10 @@
                   </mat-error> -->
                 </mat-form-field>
                 <mat-icon class="verified-icon margin-left-xs"
-                  *ngIf="user?.profileDetails?.profileStatus === 'VERIFIED'">
+                  *ngIf="user?.profileDetails?.profileDesignationStatus === 'VERIFIED'">
                   check_circle</mat-icon>
                 <mat-icon class="nonverified-icon margin-left-xs"
-                  *ngIf="user?.profileDetails?.profileStatus === 'NOT-VERIFIED'">
+                  *ngIf="user?.profileDetails?.profileDesignationStatus === 'NOT-VERIFIED'">
                   cancel</mat-icon>
               </div>
             </div>
@@ -396,10 +396,10 @@
                 user.profileDetails.professionalDetails[0].group ?
                 user.profileDetails.professionalDetails[0].group : '-'}}
                 <mat-icon class="verified-icon margin-left-xs"
-                  *ngIf="user?.profileDetails?.profileStatus === 'VERIFIED'">
+                  *ngIf="user?.profileDetails?.profileGroupStatus === 'VERIFIED'">
                   check_circle</mat-icon>
                 <mat-icon class="nonverified-icon margin-left-xs"
-                  *ngIf="user?.profileDetails?.profileStatus === 'NOT-VERIFIED'">
+                  *ngIf="user?.profileDetails?.profileGroupStatus === 'NOT-VERIFIED'">
                   cancel</mat-icon>
               </p>
             </div>
@@ -409,10 +409,10 @@
                 user.profileDetails.professionalDetails[0].designation ?
                 user.profileDetails.professionalDetails[0].designation : '-'}}
                 <mat-icon class="verified-icon margin-left-xs"
-                  *ngIf="user?.profileDetails?.profileStatus === 'VERIFIED'">
+                  *ngIf="user?.profileDetails?.profileDesignationStatus === 'VERIFIED'">
                   check_circle</mat-icon>
                 <mat-icon class="nonverified-icon margin-left-xs"
-                  *ngIf="user?.profileDetails?.profileStatus === 'NOT-VERIFIED'">
+                  *ngIf="user?.profileDetails?.profileDesignationStatus === 'NOT-VERIFIED'">
                   cancel</mat-icon>
               </p>
             </div>

From 0792753a43afb101ab00f498c3e9f10d166557d1 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Fri, 31 May 2024 18:21:53 +0530
Subject: [PATCH 677/887] Updated verified on condition

---
 .../home/components/user-cards/user-card.component.html     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 78933b4ff..dc88e33c5 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -39,9 +39,9 @@
               &&
               user?.profileDetails?.professionalDetails[0]?.designation ?
               user?.profileDetails?.professionalDetails[0]?.designation : '-'}}</div>
-            <div class="mat-caption ws-mat-black40-text" *ngIf="user?.profileDetails?.profileStatusUpdatedOn">
-              Marked on: {{user?.profileDetails?.profileStatusUpdatedOn}}</div>
-            <div class="mat-caption ws-mat-black40-text" *ngIf="!user?.profileDetails?.profileStatusUpdatedOn">-</div>
+            <div class="mat-caption ws-mat-black40-text">
+              Marked on: {{user?.profileDetails?.profileStatusUpdatedOn || ' -'}}</div>
+            <!-- <div class="mat-caption ws-mat-black40-text" *ngIf="!user?.profileDetails?.profileStatusUpdatedOn">-</div> -->
           </div>
         </div>
         <div class="float-right flex items-center" *ngIf="isMdoAdmin || isMdoLeader">

From de0f6bda13cbc53d34ff2393d1ac9bd83cbf946c Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Fri, 31 May 2024 18:56:43 +0530
Subject: [PATCH 678/887] commented unused code

---
 .../components/user-cards/user-card.component.scss     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
index 09741952c..392462e1c 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
@@ -297,11 +297,11 @@ label {
   }
 }
 
-::ng-deep .rejection-modal {
-  .mat-dialog-container {
-    padding: 0px !important;
-  }
-}
+// ::ng-deep .rejection-modal {
+//   .mat-dialog-container {
+//     padding: 0px !important;
+//   }
+// }
 .orangeicon {
   color: #e99e38;
   vertical-align: middle;

From b5aae4db0d5fa42ee4dbc8fd47056dcc9ee605d8 Mon Sep 17 00:00:00 2001
From: sohail amjad <sohail.amjad@tarento.com>
Date: Tue, 4 Jun 2024 17:15:24 +0530
Subject: [PATCH 679/887] added color of status and handled assign

---
 .../assign-list-popup.component.ts            |  2 +-
 .../request-list/request-list.component.html  |  5 ++-
 .../request-list/request-list.component.scss  | 33 +++++++++++++++++++
 .../request-list/request-list.component.ts    | 17 ++++++++++
 4 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.ts
index 3bd29f446..fdd2449f2 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.ts
@@ -104,7 +104,7 @@ export class AssignListPopupComponent implements OnInit {
         status: selectedProvider.status,
         createdOn: selectedProvider.createdOn ,
         updatedOn: selectedProvider.updatedOn,
-        assignedBy: this.userId,
+        // assignedBy: this.userId,
       }
       this.homeService.assignToOrg(request).subscribe(res => {
         if (res) {
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
index b9aa758db..26f9dcd87 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
@@ -49,7 +49,10 @@ <h2>Content Request</h2>
   
               <ng-container matColumnDef="requestStatus">
                 <th mat-header-cell *matHeaderCellDef>Request Status </th>
-                <td mat-cell class="title-class" *matCellDef="let element">{{element?.status}}</td>
+                
+                <td mat-cell class="title-class" *matCellDef="let element">
+                  <span [ngClass]="getStatusClass(element.status)">{{element?.status}}</span>
+                </td>
               </ng-container>
   
               <ng-container matColumnDef="assignee">
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.scss b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.scss
index 6d6f86ae3..4f7c2e640 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.scss
@@ -52,6 +52,39 @@ table tr .cdk-column-assignee {
   font-weight: 400;
   line-height: 16.8px;
 }
+.status-unassigned {
+  background: rgba(0, 0, 0, 0.6);
+  padding: 5px;
+  border-radius: 4px;
+  color: white;
+}
+
+.status-assigned {
+  background: rgba(29, 137, 35, 1);
+  padding: 5px;
+  border-radius: 4px;
+  color: white;
+}
+
+.status-invalid {
+  background: rgba(209, 57, 36, 1);
+  padding: 5px;
+  border-radius: 4px;
+  color: white;
+}
+
+.status-fullfill {
+  background: rgba(27, 76, 161, 1);
+  padding: 5px;
+  border-radius: 4px;
+  color: white;
+}
+.status-inprogress {
+  background: rgba(243, 150, 47, 1);
+  padding: 5px;
+  border-radius: 4px;
+  color: white;
+}
 
 .search-border {
   border-color: #cecece;
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
index b45b62212..2227113f9 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
@@ -147,6 +147,23 @@ export class RequestListComponent implements OnInit {
   this.getRequestList()
   }
 
+  getStatusClass(status: string): string {
+    switch (status) {
+      case 'Unassigned':
+        return 'status-unassigned'
+      case 'Assigned':
+        return 'status-assigned'
+      case 'Invalid':
+        return 'status-invalid'
+      case 'Fulfill':
+        return 'status-fullfill'
+        case 'InProgress':
+          return 'status-inprogress'
+      default:
+        return ''
+    }
+  }
+
   showConformationModal(_selectedRow: any, _type: any) {
     this.dialogRef = this.dialog.open(ConfirmationBoxComponent, {
       disableClose: true,

From af0a6f92386941432a6e943498274627757f0b76 Mon Sep 17 00:00:00 2001
From: sohail amjad <sohail.amjad@tarento.com>
Date: Tue, 4 Jun 2024 17:50:15 +0530
Subject: [PATCH 680/887] added check

---
 .../request-list/request-list.component.html           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
index 26f9dcd87..df8663a38 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
@@ -51,7 +51,7 @@ <h2>Content Request</h2>
                 <th mat-header-cell *matHeaderCellDef>Request Status </th>
                 
                 <td mat-cell class="title-class" *matCellDef="let element">
-                  <span [ngClass]="getStatusClass(element.status)">{{element?.status}}</span>
+                  <span [ngClass]="getStatusClass(element?.status)">{{element?.status}}</span>
                 </td>
               </ng-container>
   
@@ -76,7 +76,7 @@ <h2>Content Request</h2>
               <ng-container matColumnDef="details">
                 <th mat-header-cell *matHeaderCellDef>Details</th>
                 <td mat-cell *matCellDef="let element">
-                  <mat-icon (click)="navigateToDetails(element.demand_id)" class="cursor-pointer">visibility</mat-icon>
+                  <mat-icon (click)="navigateToDetails(element?.demand_id)" class="cursor-pointer">visibility</mat-icon>
                 </td>
               </ng-container>
   
@@ -97,13 +97,13 @@ <h2>Content Request</h2>
                       <button mat-menu-item (click)="onClickMenu(element,'viewContent')">
                         <span >View</span>
                       </button>
-                      <button *ngIf="element.status === statusKey.Unassigned && element.status!== statusKey.Inprogress &&  element.status!== statusKey.invalid " mat-menu-item (click)="onClickMenu(element,'invalidContent')">
+                      <button *ngIf="element?.status === statusKey.Unassigned && element?.status!== statusKey.Inprogress &&  element?.status!== statusKey.invalid " mat-menu-item (click)="onClickMenu(element,'invalidContent')">
                         <span>Mark as invalid</span>
                       </button>
-                      <button mat-menu-item *ngIf="element.status!== statusKey.Assigned && element.interestCount >0 && element.status!== statusKey.Inprogress &&  element.status!== statusKey.invalid" (click)="onClickMenu(element,'assignContent')">
+                      <button mat-menu-item *ngIf="element?.status!== statusKey.Assigned && element?.interestCount >0 && element?.status!== statusKey.Inprogress &&  element?.status!== statusKey.invalid" (click)="onClickMenu(element,'assignContent')">
                         <span>Assign</span>
                       </button>
-                      <button *ngIf="element.status === statusKey.Assigned && element.status!== statusKey.Inprogress &&  element.status!== statusKey.invalid " mat-menu-item (click)="onClickMenu(element,'reAssignContent')">
+                      <button *ngIf="element?.status === statusKey.Assigned && element?.status!== statusKey.Inprogress &&  element?.status!== statusKey.invalid " mat-menu-item (click)="onClickMenu(element,'reAssignContent')">
                         <span> Re-Assign</span>
                       </button>
                       <button mat-menu-item (click)="onClickMenu(element,'copyContent')">

From 6659907a4333c77283d29bd3203ae06380e6d5fb Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Tue, 4 Jun 2024 18:56:29 +0530
Subject: [PATCH 681/887] KB-5139  Employee ID field does not allow alpha
 numeric value, KB-5138 dob updated by mdo showing invalid, qa issue fixes

---
 .../user-cards/user-card.component.ts         | 48 ++++++++++++-------
 .../single-user-creation.component.html       |  4 +-
 .../single-user-creation.component.ts         |  1 +
 3 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index ef9546790..86a89741f 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -20,6 +20,7 @@ import { APP_DATE_FORMATS, AppDateAdapter } from '../../../events/routes/format-
 import { ApprovalsService } from '../../services/approvals.service'
 import { EventService } from '@sunbird-cb/utils'
 import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
+import { DatePipe } from '@angular/common'
 
 @Component({
   selector: 'ws-widget-user-card',
@@ -90,7 +91,7 @@ export class UserCardComponent implements OnInit, OnChanges {
   emailRegix = `^[\\w\-\\.]+@([\\w-]+\\.)+[\\w-]{2,4}$`
   pincodePattern = '(^[0-9]{6}$)'
   yearPattern = '(^[0-9]{4}$)'
-  empIDPattern = `^[a-z0-9]+$`
+  empIDPattern = `^[A-Za-z0-9]+$`
 
   userGroup: any
 
@@ -108,9 +109,9 @@ export class UserCardComponent implements OnInit, OnChanges {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-              private dialog: MatDialog, private approvalSvc: ApprovalsService,
-              private route: ActivatedRoute, private snackBar: MatSnackBar,
-              private events: EventService) {
+    private dialog: MatDialog, private approvalSvc: ApprovalsService,
+    private route: ActivatedRoute, private snackBar: MatSnackBar,
+    private events: EventService, private datePipe: DatePipe) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),
@@ -172,16 +173,7 @@ export class UserCardComponent implements OnInit, OnChanges {
 
   ngOnInit() {
     if (this.isApprovals && this.usersData) {
-      this.approvalData = this.usersData
-      if (this.approvalData && this.approvalData.length > 0) {
-        this.getUserMappedData(this.approvalData)
-        this.approvalSvc.getProfileConfig().then((res: any) => {
-          this.profileData = res && res.profileData
-        })
-        if (this.profileData) {
-          this.getFieldsMappedData(this.approvalData)
-        }
-      }
+      this.getApprovalData()
     } else {
       this.init()
     }
@@ -191,10 +183,28 @@ export class UserCardComponent implements OnInit, OnChanges {
     if (this.usersData) {
       this.usersData = _.orderBy(this.usersData, item => {
         if (item.profileDetails && item.profileDetails.personalDetails) {
-          return item.profileDetails.personalDetails.firstname.toUpperCase()
+          return item.profileDetails.personalDetails.firstname ?
+            item.profileDetails.personalDetails.firstname.toUpperCase() : item.firstName.toUpperCase()
         }
         // tslint:disable-next-line
       }, ['asc'])
+
+      if (this.isApprovals) {
+        this.getApprovalData()
+      }
+    }
+  }
+
+  getApprovalData() {
+    this.approvalData = this.usersData
+    if (this.approvalData && this.approvalData.length > 0) {
+      this.getUserMappedData(this.approvalData)
+      this.approvalSvc.getProfileConfig().then((res: any) => {
+        this.profileData = res && res.profileData
+      })
+      if (this.profileData) {
+        this.getFieldsMappedData(this.approvalData)
+      }
     }
   }
 
@@ -450,6 +460,7 @@ export class UserCardComponent implements OnInit, OnChanges {
 
   setUserDetails(user: any) {
     if (user && user.profileDetails) {
+      this.updateUserDataForm.reset()
       if (user.profileDetails.additionalProperties) {
         if (user.profileDetails.additionalProperties.externalSystemId) {
           this.updateUserDataForm.controls['ehrmsID'].setValue(user.profileDetails.additionalProperties.externalSystemId)
@@ -605,12 +616,13 @@ export class UserCardComponent implements OnInit, OnChanges {
 
   onSubmit(form: any, user: any, panel: any) {
     if (form.valid) {
+      const dob = this.datePipe.transform(this.updateUserDataForm.controls['dob'].value, 'dd-MM-yyyy')
       this.reqbody = {
         request: {
           userId: user.userId,
           profileDetails: {
             personalDetails: {
-              dob: this.updateUserDataForm.controls['dob'].value,
+              dob: dob,
               domicileMedium: this.updateUserDataForm.controls['domicileMedium'].value,
               gender: this.updateUserDataForm.controls['gender'].value,
               category: this.updateUserDataForm.controls['category'].value,
@@ -647,7 +659,7 @@ export class UserCardComponent implements OnInit, OnChanges {
                 if (res) {
                   this.updateUserDataForm.reset({ roles: '' })
                   // this.openSnackbar('User role updated Successfully')q
-                  this.openSnackbar('User updated Successfully')
+                  this.openSnackbar('User updated Successfully, updated data will be reflecting in sometime.')
                   panel.close()
                   this.updateList.emit()
                   this.searchByEnterKey.emit('')
@@ -661,7 +673,7 @@ export class UserCardComponent implements OnInit, OnChanges {
 
             panel.close()
             this.updateList.emit()
-            this.openSnackbar('User updated Successfully')
+            this.openSnackbar('User updated Successfully, updated data will be reflecting in sometime.')
           }
         }
       },
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
index a230f2832..1f7c0108a 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
@@ -74,8 +74,8 @@
       <div class="input-container">
         <div class="label">Date of birth</div>
         <mat-form-field class="profile-form-field">
-          <input matInput class="input-text icon-include-input" [matDatepicker]="picker" readonly
-            formControlName="dob" />
+          <input matInput class="input-text icon-include-input" [matDatepicker]="picker" readonly formControlName="dob"
+            [max]="today" />
           <mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
           <mat-datepicker #picker></mat-datepicker>
         </mat-form-field>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
index 1af0aa187..a124fcceb 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
@@ -64,6 +64,7 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
     tags: new FormControl([]),
     roles: new FormControl([], [Validators.required]),
   })
+  today = new Date()
 
   constructor(
     private formBuilder: FormBuilder,

From 258b2e4a0d4e23c5597026040f265cc7cfb4ac29 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Tue, 4 Jun 2024 19:05:19 +0530
Subject: [PATCH 682/887] MDO > Edit User > Not-verified users shows This is my
 user toggle button - should be removed

---
 .../home/components/user-cards/user-card.component.html       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index dc88e33c5..6ebe1cc09 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -62,10 +62,10 @@
               <mat-slide-toggle (click)="markStatus('NOT-VERIFIED', user)">Mark this user as
                 non-verified</mat-slide-toggle>
             </p>
-            <p class="float-right mat-body-2" *ngIf="user?.profileDetails?.profileStatus === 'NOT-VERIFIED'">
+            <!-- <p class="float-right mat-body-2" *ngIf="user?.profileDetails?.profileStatus === 'NOT-VERIFIED'">
               <mat-slide-toggle (click)="markStatus('NOT-MY-USER', user)" [checked]="true">This is my
                 user</mat-slide-toggle>
-            </p>
+            </p> -->
             <div class="flex flex-row margin-top-m">
               <div class="md:w-1/3">
                 <label class="margin-remove-bottom form-label required">Group</label>

From eb735f528419e06fb6c3bf07511533070b8d06a4 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Wed, 5 Jun 2024 15:23:37 +0530
Subject: [PATCH 683/887] Fixed logout popup padding

---
 .../components/rejection-popup/rejection-popup.component.scss | 2 +-
 .../routes/users-view/verify-otp/verify-otp.component.scss    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/rejection-popup/rejection-popup.component.scss b/project/ws/app/src/lib/routes/home/components/rejection-popup/rejection-popup.component.scss
index a87250d8a..1f76e9911 100644
--- a/project/ws/app/src/lib/routes/home/components/rejection-popup/rejection-popup.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/rejection-popup/rejection-popup.component.scss
@@ -1,6 +1,6 @@
 ::ng-deep .rejection-modal {
   .mat-dialog-container {
-    padding: 0px !important;
+    // padding: 0px !important;
   }
 }
 
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.scss b/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.scss
index 9999c7f6d..ab347e306 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.scss
@@ -1,10 +1,10 @@
 @import 'ws-common';
 ::ng-deep .mat-dialog-container {
-  padding: 0 !important;
+  // padding: 0 !important;
   overflow: unset !important;
 }
 .verify-otp-dialog {
-  padding: 22px !important;
+  // padding: 22px !important;
   .timer-div {
     margin-bottom: 16px;
 

From 11722e6782b88cc29483ec1b32014cde08c5ebc5 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Thu, 6 Jun 2024 15:37:00 +0530
Subject: [PATCH 684/887] Fixed 4792 issue

---
 .../components/user-cards/user-card.component.html   |  4 ++--
 .../components/user-cards/user-card.component.ts     | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index dc88e33c5..83c0155ef 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -121,8 +121,8 @@
                 <label class="margin-remove-bottom form-label">Employee ID</label>
                 <mat-form-field appearance="outline">
                   <input type="text" matInput #employeeID formControlName="employeeID">
-                  <mat-error [hidden]="false" class="custom-error"
-                    *ngIf="updateUserDataForm?.controls['employeeID'].errors?.pattern" i18n-aria-label
+                  <mat-error [hidden]="false" class="custom-error" *ngIf="updateUserDataForm?.controls['employeeID'].touched &&
+                    updateUserDataForm?.controls['employeeID'].errors?.pattern" i18n-aria-label
                     aria-label="Please enter a valid id">
                     Please enter a valid employee Id
                   </mat-error>
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index ef9546790..1ec88aaa5 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -21,6 +21,8 @@ import { ApprovalsService } from '../../services/approvals.service'
 import { EventService } from '@sunbird-cb/utils'
 import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
 
+const empIDPattern = /^[a-z0-9]+$/i
+
 @Component({
   selector: 'ws-widget-user-card',
   templateUrl: './user-card.component.html',
@@ -90,7 +92,6 @@ export class UserCardComponent implements OnInit, OnChanges {
   emailRegix = `^[\\w\-\\.]+@([\\w-]+\\.)+[\\w-]{2,4}$`
   pincodePattern = '(^[0-9]{6}$)'
   yearPattern = '(^[0-9]{4}$)'
-  empIDPattern = `^[a-z0-9]+$`
 
   userGroup: any
 
@@ -108,13 +109,13 @@ export class UserCardComponent implements OnInit, OnChanges {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-              private dialog: MatDialog, private approvalSvc: ApprovalsService,
-              private route: ActivatedRoute, private snackBar: MatSnackBar,
-              private events: EventService) {
+    private dialog: MatDialog, private approvalSvc: ApprovalsService,
+    private route: ActivatedRoute, private snackBar: MatSnackBar,
+    private events: EventService) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),
-      employeeID: new FormControl('', [Validators.pattern(this.empIDPattern)]),
+      employeeID: new FormControl('', [Validators.pattern(empIDPattern)]),
       ehrmsID: new FormControl({ value: '', disabled: true }, []),
       dob: new FormControl('', []),
       primaryEmail: new FormControl('', [Validators.required, Validators.email, Validators.pattern(this.emailRegix)]),
@@ -628,6 +629,7 @@ export class UserCardComponent implements OnInit, OnChanges {
             },
             employmentDetails: {
               pinCode: this.updateUserDataForm.controls['pincode'].value,
+              employeeCode: this.updateUserDataForm.controls['employeeID'].value,
             },
           },
         },

From 1229541751f0ff9f9a70bb3c79087ba60103a418 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Thu, 6 Jun 2024 22:02:00 +0530
Subject: [PATCH 685/887] Fixed 4793,4722,4792 issue

---
 .../components/user-cards/user-card.component.html   | 12 ++++++------
 .../components/user-cards/user-card.component.ts     |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 83c0155ef..fe783c0b6 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -308,12 +308,6 @@
                       [matChipInputFor]="chipListTags" autocomplete="off" maxlength="100"
                       [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
                       (matChipInputTokenEnd)="addActivity($event)" />
-                    <p class="margin-left-xs">
-                      <mat-error class="hintErr" *ngIf="updateUserDataForm?.controls['tags'].errors?.pattern"
-                        i18n="name Error|Explains name is required">
-                        Only space and alphabets are supported
-                      </mat-error>
-                    </p>
                   </div>
                 </div>
                 <div class="right-input-div">
@@ -323,6 +317,12 @@
                     <span class="text-white" i18n>Add tag</span>
                   </button>
                 </div>
+                <p class="margin-left-xs mat-caption">
+                  <mat-error class="hintErr" *ngIf="updateUserDataForm?.controls['tags'].errors?.pattern"
+                    i18n="name Error|Explains name is required">
+                    Only space and alphabets are supported
+                  </mat-error>
+                </p>
                 <mat-chip-list #chipListTags>
                   <mat-chip *ngFor="let tag of selectedtags" [selectable]="true" [removable]="true"
                     (removed)="removeActivity(tag)">
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 1ec88aaa5..0ac73f21e 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -74,7 +74,7 @@ export class UserCardComponent implements OnInit, OnChanges {
   reqbody: any
   isTagsEdited = false
   separatorKeysCodes: number[] = [ENTER, COMMA]
-  namePatern = `^[a-zA-Z ]*$`
+  namePatern = '^[a-zA-Z ]*$'
   orgTypeList: any = []
   // public countryCodes: string[] = []
   masterLanguages: Observable<any[]> | undefined
@@ -519,7 +519,7 @@ export class UserCardComponent implements OnInit, OnChanges {
       }
       const splitValues: string[] = dateString.split('-')
       const [dd, mm, yyyy] = splitValues
-      const dateToBeConverted = `${yyyy}-${mm}-${dd}`
+      const dateToBeConverted = dd.length !== 4 ? `${yyyy}-${mm}-${dd}` : `${dd}-${mm}-${yyyy}`
       return new Date(dateToBeConverted)
     }
     return ''

From 5c46f9185465cb7202ed498776a31ca7b5bbf6ab Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Fri, 7 Jun 2024 12:17:29 +0530
Subject: [PATCH 686/887] Lint fix

---
 .../home/components/user-cards/user-card.component.ts     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index e1dcf7bb2..059b27824 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -109,9 +109,9 @@ export class UserCardComponent implements OnInit, OnChanges {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-    private dialog: MatDialog, private approvalSvc: ApprovalsService,
-    private route: ActivatedRoute, private snackBar: MatSnackBar,
-    private events: EventService, private datePipe: DatePipe) {
+              private dialog: MatDialog, private approvalSvc: ApprovalsService,
+              private route: ActivatedRoute, private snackBar: MatSnackBar,
+              private events: EventService, private datePipe: DatePipe) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),
@@ -622,7 +622,7 @@ export class UserCardComponent implements OnInit, OnChanges {
           userId: user.userId,
           profileDetails: {
             personalDetails: {
-              dob: dob,
+              dob,
               domicileMedium: this.updateUserDataForm.controls['domicileMedium'].value,
               gender: this.updateUserDataForm.controls['gender'].value,
               category: this.updateUserDataForm.controls['category'].value,

From a3a8c47f22f9edace72af6859f0dfbafa030fe27 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Fri, 7 Jun 2024 12:25:29 +0530
Subject: [PATCH 687/887] Lint fix

---
 .../routes/home/components/user-cards/user-card.component.ts  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 059b27824..a4e534099 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -616,13 +616,13 @@ export class UserCardComponent implements OnInit, OnChanges {
 
   onSubmit(form: any, user: any, panel: any) {
     if (form.valid) {
-      const dob = this.datePipe.transform(this.updateUserDataForm.controls['dob'].value, 'dd-MM-yyyy')
+      const dobn = this.datePipe.transform(this.updateUserDataForm.controls['dob'].value, 'dd-MM-yyyy')
       this.reqbody = {
         request: {
           userId: user.userId,
           profileDetails: {
             personalDetails: {
-              dob,
+              dob: dobn,
               domicileMedium: this.updateUserDataForm.controls['domicileMedium'].value,
               gender: this.updateUserDataForm.controls['gender'].value,
               category: this.updateUserDataForm.controls['category'].value,

From 689980669aa820433cbdaa0d3d0833b8a2aa2e56 Mon Sep 17 00:00:00 2001
From: sohail amjad <sohail.amjad@tarento.com>
Date: Mon, 10 Jun 2024 12:26:23 +0530
Subject: [PATCH 688/887] lint issues

---
 .../assign-list-popup.component.ts            |  2 +-
 .../create-request-form.component.ts          | 12 +++++
 .../request-list/request-list.component.html  | 24 ++++++++--
 .../request-list/request-list.component.scss  | 32 ++++++++++++-
 .../request-list/request-list.component.ts    | 46 +++++++++++--------
 .../user-cards/user-card.component.ts         |  4 +-
 .../approval-pending.component.ts             |  9 ++--
 .../lib/routes/home/services/home.servive.ts  | 41 ++++++++---------
 src/mdo-assets/images/no-content-data.svg     | 22 +++++++++
 9 files changed, 139 insertions(+), 53 deletions(-)
 create mode 100644 src/mdo-assets/images/no-content-data.svg

diff --git a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.ts
index fdd2449f2..fc2ee0a85 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.ts
@@ -38,7 +38,7 @@ export class AssignListPopupComponent implements OnInit {
     this.submitAssign = 'Assign'
     this.getInterestOrgList()
     if (this.configService['confService'].userProfile || this.configService['confService'].userProfileV2) {
-      this.fullProfile = this.configService['confService'].userProfile ? 
+      this.fullProfile = this.configService['confService'].userProfile ?
       this.configService['confService'].userProfile
        : this.configService['confService'].userProfileV2
       this.userId =  this.fullProfile.userId
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
index 6a900d4f3..fb5707566 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
@@ -234,6 +234,10 @@ export class CreateRequestFormComponent implements OnInit {
         if (this.actionBtnName === 'view') {
           this.requestForm.disable()
           this.isHideData = true
+        } else if (this.actionBtnName === 'reassign') {
+            this.requestForm.disable()
+            // this.isHideData = true;
+            this.requestForm.controls['assignee'].enable()
         }
       }
 
@@ -501,6 +505,9 @@ this.dialogRefs.afterClosed().subscribe((_res: any) => {
 }
 
   submit() {
+    if (this.demandId &&  this.actionBtnName === 'reassign') {
+      this.requestForm.enable()
+    }
     let providerList: any[] = []
     if (this.requestForm.value.providers) {
       providerList = this.requestForm.value.providers.map((item: any) => ({
@@ -543,6 +550,11 @@ this.dialogRefs.afterClosed().subscribe((_res: any) => {
     if (this.requestForm.value.learningMode) {
       request.learningMode = this.requestForm.value.learningMode.toLowerCase()
     }
+
+    if (this.demandId &&  this.actionBtnName === 'reassign') {
+      request.demand_id =  this.demandId
+
+    }
     this.showDialogBox('progress')
     this.homeService.createDemand(request).subscribe(res => {
       this.resData = res
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
index df8663a38..e2b575a2d 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
@@ -31,7 +31,8 @@ <h2>Content Request</h2>
     <div class="nav-container">
         <div class="sidenav-content">
           <div class="table-class">
-            <table mat-table [dataSource]="dataSource">
+            <ng-container *ngIf="dataSource?.filteredData?.length > 0">
+            <table mat-table   [dataSource]="dataSource" > 
               <ng-container matColumnDef="RequestId">
                 <th mat-header-cell *matHeaderCellDef>Request ID </th>
                 <td mat-cell class="title-class" *matCellDef="let element">{{element?.demand_id}}</td>
@@ -68,8 +69,10 @@ <h2>Content Request</h2>
               <ng-container matColumnDef="interests">
                 <th mat-header-cell *matHeaderCellDef>Interests</th>
                 <td mat-cell class="title-class" *matCellDef="let element">
-                    <a class="action-btn-view"  (click)="showInterestPopup()"
+                    <a class="action-btn-view"  *ngIf="element?.interestCount!== 0" 
                     href="javascript:void(0)">{{element?.interestCount}}</a>
+                    <a class="" *ngIf="element?.interestCount === 0" 
+                    href="javascript:void(0)">{{element?.requestType == 'Single' ? 'N/A' : element?.interestCount}}</a>
                 </td>
               </ng-container>
   
@@ -121,8 +124,23 @@ <h2>Content Request</h2>
   
   
             </table>
+          </ng-container>
+
+            <div class="no-cbp-data" *ngIf="dataSource?.filteredData?.length === 0">
+              <div><img src="/mdo-assets/images/no-content-data.svg"></div>
+              <!-- <div class="mat-subheading-1 margin-remove">No CBP plan created yet</div> -->
+              <div>No Request yet made</div>
+              <!-- <div class="margin-top-m">
+                  <button mat-button type="button" class="search-btn"
+                  [routerLink]="['/app/home/create-request-form']">Request Content</button>
+              </div> -->
+              <div class=" margin-top-m no-content-create">
+                <button mat-button type="button" class="search-btns" [routerLink]="['/app/home/create-request-form']">Request Content</button>
+            </div>
+
+          </div>
   
-            <mat-paginator [pageSize]="pageSize" [length]="this.requestCount" [pageSizeOptions]="[10,20,40]"
+            <mat-paginator *ngIf="dataSource?.filteredData?.length > 0" [pageSize]="pageSize" [length]="this.requestCount" [pageSizeOptions]="[10,20,40]"
               (page)="onChangePage($event)"></mat-paginator>
   
   
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.scss b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.scss
index 4f7c2e640..531717dbc 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.scss
@@ -34,7 +34,7 @@ table tr .cdk-column-RequestId {
 }
 
 table tr .cdk-column-assignee {
-  width: 17% !important;
+  width: 20% !important;
 }
 
 .action-btn-view {
@@ -45,6 +45,20 @@ table tr .cdk-column-assignee {
   line-height: 16.8px;
   text-decoration: underline !important;
 }
+.no-cbp-data {
+  width: auto;
+  margin: 50px auto;
+  text-align: center;
+
+  img {
+    width: 320px;
+  }
+
+  .small-text {
+    font-size: 14px;
+    color: rgba(0, 0, 0, 0.6);
+  }
+}
 
 .title-class {
   font-family: Lato;
@@ -253,7 +267,21 @@ table tr .cdk-column-assignee {
       font-weight: 700;
       font-size: 14px;
       border-radius: 4px;
-      min-width: 138px;
+      min-width: 179px;
+  }
+}
+
+.no-content-create {
+  margin-bottom: 21px;
+  margin-left: 30px;
+  .search-btns {
+      background: #1b4ca1 !important;
+      color: white !important;
+      font-family: 'Lato';
+      font-weight: 700;
+      font-size: 14px;
+      border-radius: 4px;
+      min-width: 179px;
   }
 }
 
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
index 2227113f9..e9403bcd0 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
@@ -8,10 +8,10 @@ import { MatDialog, MatSnackBar, MatTableDataSource } from '@angular/material'
 import { ConfirmationBoxComponent } from '../../../training-plan/components/confirmation-box/confirmation.box.component'
 import { AssignListPopupComponent } from './assign-list-popup/assign-list-popup.component'
 export enum statusValue {
-  Assigned= "Assigned",
-  Unassigned = "Unassigned",
-  Inprogress = "Inprogress",
-  invalid = "invalid"
+  Assigned= 'Assigned',
+  Unassigned = 'Unassigned',
+  Inprogress = 'InProgress',
+  invalid = 'invalid',
 }
 @Component({
   selector: 'ws-app-request-list',
@@ -55,27 +55,25 @@ export class RequestListComponent implements OnInit {
   requestCount: any
   invalidRes: any
   detailsEvent: any
-  dataSource:any;
-  displayedColumns: string[] = ["RequestId", "title", "requestType", "requestStatus", "assignee", "requestedOn", "interests", "action"]
+  dataSource: any
+  displayedColumns: string[] = ['RequestId', 'title', 'requestType', 'requestStatus', 'assignee', 'requestedOn', 'interests', 'action']
   statusKey = statusValue
 
-
   constructor(private sanitizer: DomSanitizer,
               private homeService: ProfileV2Service,
               private datePipe: DatePipe,
               private activeRoute: ActivatedRoute,
               private dialog: MatDialog,
               private router: Router,
-              private snackBar : MatSnackBar
+              private snackBar: MatSnackBar
   ) { }
   requestList: any[] = [
-    `These reports contain Personally Identifiable Information (PII) data.
-      Please use them cautiously.`,
-      `Your access to the report is available until.
-      Please contact your MDO Leader to renew your access.`,
+    `You can request new content by filling out the request form. You will have the option to choose your content provider and
+     if you are unsure then you can choose the option as broadcast your request.`,
+      `Please review the interest received from various providers and assign
+      to the provider of your choice among the list.`,
   ]
 
-
   ngOnInit() {
     this.configSvc = this.activeRoute.snapshot.data['configService']
     this.getRequestList()
@@ -110,8 +108,7 @@ export class RequestListComponent implements OnInit {
     }
   }
 
-
-  onClickMenu(item: any,action:string) {
+  onClickMenu(item: any, action: string) {
   switch (action) {
     case 'viewContent':
 
@@ -128,7 +125,16 @@ export class RequestListComponent implements OnInit {
        this.openAssignlistPopup(item)
       break
     case 'reAssignContent':
-      this.openAssignlistPopup(item)
+      if (item.requestType === 'Broadcast') {
+        this.openAssignlistPopup(item)
+      } else {
+        this.queryParams = {
+          id: item.demand_id,
+          name: 'reassign',
+        }
+          this.router.navigate(['/app/home/create-request-form'], { queryParams: this.queryParams })
+      }
+
       break
     case 'copyContent':
         this.queryParams = {
@@ -205,7 +211,7 @@ export class RequestListComponent implements OnInit {
 
   }
 
-  openAssignlistPopup(item:any) {
+  openAssignlistPopup(item: any) {
     this.dialogRef = this.dialog.open(AssignListPopupComponent, {
       disableClose: false,
       width: '90%',
@@ -218,9 +224,8 @@ export class RequestListComponent implements OnInit {
       if (_res && _res.data === 'confirmed') {
          this.getRequestList()
          this.snackBar.open('Assigned submitted Successfully')
-      }
-      else {
-        this.snackBar.open('error')
+      } else {
+        // this.snackBar.open('error')
       }
     })
   }
@@ -261,6 +266,7 @@ export class RequestListComponent implements OnInit {
            }
         })
         this.dataSource = new MatTableDataSource<any>(this.requestListData)
+
       }
 
     })
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 4e9bec435..f3750ad08 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -690,7 +690,7 @@ export class UserCardComponent implements OnInit, OnChanges {
       duration,
     })
   }
-
+  /* tslint:disable */
   // for approval & rejection
   onClickHandleWorkflow(field: any, action: string, appData: any = undefined) {
     field.action = action
@@ -763,7 +763,7 @@ export class UserCardComponent implements OnInit, OnChanges {
       }
     }
   }
-
+  /* tslint:enable */
   // single aprrove or reject
   onApproveOrRejectClick(req: any) {
     this.approvalSvc.handleWorkflow(req).subscribe((res: any) => {
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
index 96bfe69f0..461973146 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
@@ -188,13 +188,14 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
             userWorkflow: appr,
             tag: (appr.userInfo && appr.userInfo.tag) ? `${appr.userInfo.tag}` : '',
           }
-
+         /* tslint:disable */
           if (appr!.wfInfo[0] && appr!.wfInfo[0].orgTansferRequest) {
             this.transfersData.push(requestData)
           } else {
             this.profileVerificationData.push(requestData)
           }
         })
+        /* tslint:enable */
         this.transfersData.sort((a: any, b: any) => {
           const textA = a.fullname.toUpperCase()
           const textB = b.fullname.toUpperCase()
@@ -211,7 +212,8 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
         this.allTransfersData = this.transfersData
         this.allprofileVerificationData = this.profileVerificationData
 
-        if ((this.transfersData && this.transfersData.length > 0) || (this.profileVerificationData && this.profileVerificationData.length > 0)) {
+        if ((this.transfersData && this.transfersData.length > 0) ||
+        (this.profileVerificationData && this.profileVerificationData.length > 0)) {
           this.showApproveALL = true
           this.disableApproveALL = false
         }
@@ -241,7 +243,8 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
     // this.data.filter((user: any) => enterValue.includes(user.userInfo.first_name))
     const filterValue = enterValue.toLowerCase()
     if (this.currentFilter === 'profileverification') {
-      this.profileVerificationData = this.allprofileVerificationData.filter((user: any) => user.fullname.toLowerCase().includes(filterValue))
+      this.profileVerificationData = this.allprofileVerificationData.filter((user: any) =>
+        user.fullname.toLowerCase().includes(filterValue))
     } else {
       this.transfersData = this.allTransfersData.filter((user: any) => user.fullname.toLowerCase().includes(filterValue))
     }
diff --git a/project/ws/app/src/lib/routes/home/services/home.servive.ts b/project/ws/app/src/lib/routes/home/services/home.servive.ts
index 1ad0499c5..b97b8c169 100644
--- a/project/ws/app/src/lib/routes/home/services/home.servive.ts
+++ b/project/ws/app/src/lib/routes/home/services/home.servive.ts
@@ -7,10 +7,8 @@ import { map } from 'rxjs/operators'
 import _ from 'lodash'
 /* tslint:enable */
 
-
 const PROTECTED_SLAG_V8 = '/apis/protected/v8'
 
-
 const API_END_POINTS = {
   DISCUSS_PROFILE: '/apis/protected/v8/discussionHub/users',
   PROFILE_DETAIL: `${PROTECTED_SLAG_V8}/social/post/timeline`,
@@ -22,13 +20,13 @@ const API_END_POINTS = {
   GET_MY_DEPARTMENT_ALL: '/apis/protected/v8/portal/mdo/mydepartment?allUsers=true',
   GET_USER_DETAILS: `/apis/protected/v8/user/details?ts='${Date.now()}`,
   GET_FILTER_ENTITY: 'apis/proxies/v8/competency/v4/search',
-  GET_REQUEST_TYPE_LIST:'/apis/proxies/v8/org/v1/search',
-  CREATE_DEMAND_REQUEST:'/apis/proxies/v8/demand/content/create',
-  GET_REQUEST_DATA:'/apis/proxies/v8/demand/content/search',
-  MARK_INVALID:'/apis/proxies/v8/demand/content/v1/update/status',
+  GET_REQUEST_TYPE_LIST: '/apis/proxies/v8/org/v1/search',
+  CREATE_DEMAND_REQUEST: '/apis/proxies/v8/demand/content/create',
+  GET_REQUEST_DATA: '/apis/proxies/v8/demand/content/search',
+  MARK_INVALID: '/apis/proxies/v8/demand/content/v1/update/status',
   GET_REQUEST_DATA_BYID: 'apis/proxies/v8/demand/content/read',
-  GET_INTEREST_ORG_LIST:'/apis/proxies/v8/interest/v1/search',
-  ASSIGN_TO_ORG:'/apis/proxies/v8/interest/v1/assign'
+  GET_INTEREST_ORG_LIST: '/apis/proxies/v8/interest/v1/search',
+  ASSIGN_TO_ORG: '/apis/proxies/v8/interest/v1/assign',
 
 }
 
@@ -67,32 +65,31 @@ export class ProfileV2Service {
     return this.http.post<any>(`${API_END_POINTS.GET_FILTER_ENTITY}`, filter).pipe(map(res => _.get(res, 'result.competency')))
   }
 
-  getRequestTypeList(request:any):Observable<any>{
-    return this.http.post<any>(`${API_END_POINTS.GET_REQUEST_TYPE_LIST}`,request).pipe(map(res=> _.get(res, 'result.response.content')))
+  getRequestTypeList(request: any): Observable<any> {
+    return this.http.post<any>(`${API_END_POINTS.GET_REQUEST_TYPE_LIST}`, request).pipe(map(res => _.get(res, 'result.response.content')))
   }
 
-  createDemand(request:any){
-   return this.http.post<any>(`${API_END_POINTS.CREATE_DEMAND_REQUEST}`,request)
+  createDemand(request: any) {
+   return this.http.post<any>(`${API_END_POINTS.CREATE_DEMAND_REQUEST}`, request)
   }
 
-  getRequestList(request:any){
-   return this.http.post<any>(`${API_END_POINTS.GET_REQUEST_DATA}`,request).pipe(map(res=>_.get(res,'result.result')))
+  getRequestList(request: any) {
+   return this.http.post<any>(`${API_END_POINTS.GET_REQUEST_DATA}`, request).pipe(map(res => _.get(res, 'result.result')))
   }
 
-  markAsInvalid(request:any){
-    return this.http.post<any>(`${API_END_POINTS.MARK_INVALID}`,request)
+  markAsInvalid(request: any) {
+    return this.http.post<any>(`${API_END_POINTS.MARK_INVALID}`, request)
    }
 
-  getRequestDataById(demandId:any) {
-    return this.http.get<any>(`${API_END_POINTS.GET_REQUEST_DATA_BYID}/${demandId}`).pipe(map(res=>_.get(res, 'result.result')))
+  getRequestDataById(demandId: any) {
+    return this.http.get<any>(`${API_END_POINTS.GET_REQUEST_DATA_BYID}/${demandId}`).pipe(map(res => _.get(res, 'result.result')))
   }
-  getOrgInterestList(request:any) {
-    return this.http.post<any>(`${API_END_POINTS.GET_INTEREST_ORG_LIST}`, request).pipe(map(res=>_.get(res, 'result.result')))
+  getOrgInterestList(request: any) {
+    return this.http.post<any>(`${API_END_POINTS.GET_INTEREST_ORG_LIST}`, request).pipe(map(res => _.get(res, 'result.result')))
   }
 
-  assignToOrg(request:any) {
+  assignToOrg(request: any) {
     return this.http.put<any>(`${API_END_POINTS.ASSIGN_TO_ORG}`, request)
   }
 
-
 }
diff --git a/src/mdo-assets/images/no-content-data.svg b/src/mdo-assets/images/no-content-data.svg
new file mode 100644
index 000000000..9f953096b
--- /dev/null
+++ b/src/mdo-assets/images/no-content-data.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="320px" height="190px" viewBox="0 0 320 190" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Group 29</title>
+    <g id="CBP-Creation-V2--(Latest-Version)" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="ACBP-creation-screen-1" transform="translate(-666, -374)">
+            <g id="Group-29" transform="translate(666, 375)">
+                <path d="M67.7124591,165.875533 L201.665367,165.875533 C202.423452,165.875533 203.162401,165.793147 203.873382,165.638675 C204.584363,165.793147 205.323312,165.875533 206.081397,165.875533 L282.625916,165.875533 C288.316707,165.875533 292.929986,161.264892 292.929986,155.577355 C292.929986,149.889819 288.316707,145.279177 282.625916,145.279177 L273.793856,145.279177 C268.103066,145.279177 263.489786,140.668536 263.489786,134.981 C263.489786,129.293463 268.103066,124.682822 273.793856,124.682822 L301.762046,124.682822 C307.452836,124.682822 312.066116,120.072181 312.066116,114.384644 C312.066116,108.697108 307.452836,104.086466 301.762046,104.086466 L269.377826,104.086466 C275.068617,104.086466 279.681896,99.4758251 279.681896,93.7882886 C279.681896,88.1007522 275.068617,83.4901109 269.377826,83.4901109 L175.169188,83.4901109 C180.859978,83.4901109 185.473257,78.8794696 185.473257,73.1919331 C185.473257,67.5043967 180.859978,62.8937554 175.169188,62.8937554 L91.2646187,62.8937554 C85.5738282,62.8937554 80.9605489,67.5043967 80.9605489,73.1919331 C80.9605489,78.8794696 85.5738282,83.4901109 91.2646187,83.4901109 L32.3842196,83.4901109 C26.693429,83.4901109 22.0801497,88.1007522 22.0801497,93.7882886 C22.0801497,99.4758251 26.693429,104.086466 32.3842196,104.086466 L69.184469,104.086466 C74.8752596,104.086466 79.4885389,108.697108 79.4885389,114.384644 C79.4885389,120.072181 74.8752596,124.682822 69.184469,124.682822 L10.3040699,124.682822 C4.61327928,124.682822 0,129.293463 0,134.981 C0,140.668536 4.61327928,145.279177 10.3040699,145.279177 L67.7124591,145.279177 C62.0216685,145.279177 57.4083892,149.889819 57.4083892,155.577355 C57.4083892,161.264892 62.0216685,165.875533 67.7124591,165.875533 Z M309.421488,165.875533 C315.263849,165.875533 320,161.14667 320,155.313299 C320,149.479929 315.263849,144.751066 309.421488,144.751066 C303.579126,144.751066 298.842975,149.479929 298.842975,155.313299 C298.842975,161.14667 303.579126,165.875533 309.421488,165.875533 Z" id="Shape" fill="#DDE8FB"></path>
+                <g id="Group-25-Copy" transform="translate(159.3211, 76.5609) rotate(-15) translate(-159.3211, -76.5609)translate(109.0731, 10.7483)" fill-rule="nonzero">
+                    <path d="M26.2405877,15.4406825 L3.9916583,15.4406825 C1.78841914,15.4438184 0.00311808297,17.239339 0,19.45519 L0,127.610744 C0.00311679319,129.826596 1.7884186,131.622117 3.9916583,131.625252 L96.5042095,131.625252 C98.7074492,131.622117 100.492751,129.826596 100.495868,127.610744 L100.495868,19.45519 C100.49275,17.239339 98.7074486,15.4438184 96.5042095,15.4406825 L73.6969697,15.4406825" id="Path" stroke="#7FAEFF" stroke-width="3"></path>
+                    <path d="M70.0216955,26.6391365 L29.0692366,26.6391365 C27.9634659,26.6379454 27.0673721,25.7805811 27.0661272,24.7226022 L27.0661272,15.3528789 C27.0673733,14.2949005 27.9634664,13.4375369 29.0692366,13.4363446 L70.0216955,13.4363446 C71.1274656,13.4375369 72.0235587,14.2949005 72.0248049,15.3528789 L72.0248049,24.7226022 C72.0235599,25.7805811 71.1274661,26.6379454 70.0216955,26.6391365 Z" id="Path" stroke="#7FAEFF" stroke-width="3"></path>
+                    <ellipse id="Oval" fill="#7FAEFF" cx="50.413352" cy="6.60139599" rx="6.61157025" ry="6.60139599"></ellipse>
+                </g>
+                <g id="Group-25" transform="translate(137.5207, 33.3701)" fill-rule="nonzero">
+                    <path d="M30.3838384,19.1300028 L4.62192014,19.1300028 C2.07080111,19.1336331 0.00361041186,21.2121999 0,23.7773582 L0,148.982579 C0.00360891843,151.547738 2.07080049,153.626306 4.62192014,153.629935 L111.741716,153.629935 C114.292836,153.626306 116.360027,151.547738 116.363636,148.982579 L116.363636,23.7773582 C116.360026,21.2121999 114.292835,19.1336331 111.741716,19.1300028 L85.3333333,19.1300028" id="Path" stroke="#000000" stroke-width="3" fill="#FFFFFF"></path>
+                    <path d="M82.5319289,31.9395202 L33.8317075,31.9395202 C32.516737,31.9380756 31.4511119,30.8982934 31.4496314,29.6152126 L31.4496314,18.2519311 C31.4511134,16.9688509 32.5167376,15.9290695 33.8317075,15.9276235 L82.5319289,15.9276235 C83.8468988,15.9290695 84.912523,16.9688509 84.9140049,18.2519311 L84.9140049,29.6152126 C84.9125244,30.8982934 83.8468994,31.9380756 82.5319289,31.9395202 Z" id="Path" stroke="#000000" stroke-width="3" fill="#FFFFFF"></path>
+                    <ellipse id="Oval" fill="#000000" cx="58.1818182" cy="7.92167519" rx="7.77964567" ry="7.92167519"></ellipse>
+                </g>
+                <path d="M159.715682,69.4951514 C159.715682,124.912076 201.876407,169.83637 253.884298,169.83637 L253.884298,181.710744 C253.884298,184.631919 251.516217,187 248.595041,187 L142.809917,187 C139.888742,187 137.520661,184.631919 137.520661,181.710744 L137.520661,57.9116202 C137.520661,54.9904447 139.888742,52.622364 142.809917,52.622364 L161.041535,52.6209118 C160.169668,58.1070249 159.715682,63.7445958 159.715682,69.4951514 Z" id="Combined-Shape" fill="#7FAEFF" opacity="0.148094541"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file

From d0d31a2aa70c02bba90b84bef4134fcf48a77ef0 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Mon, 10 Jun 2024 13:07:43 +0530
Subject: [PATCH 689/887] Added sort for all users listing & error message if
 its null

---
 .../user-cards/user-card.component.ts         | 14 +++++--
 .../routes/users-view/users-view.component.ts | 40 +++++++++----------
 .../routes/users/services/users.service.ts    |  3 ++
 3 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index a4e534099..d18abb01b 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -109,9 +109,9 @@ export class UserCardComponent implements OnInit, OnChanges {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-              private dialog: MatDialog, private approvalSvc: ApprovalsService,
-              private route: ActivatedRoute, private snackBar: MatSnackBar,
-              private events: EventService, private datePipe: DatePipe) {
+    private dialog: MatDialog, private approvalSvc: ApprovalsService,
+    private route: ActivatedRoute, private snackBar: MatSnackBar,
+    private events: EventService, private datePipe: DatePipe) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),
@@ -680,7 +680,13 @@ export class UserCardComponent implements OnInit, OnChanges {
       },
         // tslint:disable-next-line: align
         (err: { error: any }) => {
-          this.openSnackbar(err.error.params.errmsg)
+          if (err.error.params.errmsg && err.error.params.errmsg !== 'null') {
+            this.openSnackbar(err.error.params.errmsg)
+            panel.close()
+          } else {
+            this.openSnackbar('Error in updating user')
+            panel.close()
+          }
         })
     }
   }
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index bfa2cdcae..c61e03726 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -204,11 +204,11 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       this.activeUsersData = allusersData.content
       this.activeUsersData = this.activeUsersData.filter((wf: any) => wf.profileDetails.profileStatus !== 'NOT-MY-USER')
       this.activeUsersDataCount = allusersData.count
-      const i = this.activeUsersData.findIndex((wf: any) => wf.userId === this.currentUser)
-      if (i > -1) {
-        this.activeUsersData.splice(i, 1)
-        allusersData.count = allusersData.count - 1
-      }
+      // const i = this.activeUsersData.findIndex((wf: any) => wf.userId === this.currentUser)
+      // if (i > -1) {
+      //   this.activeUsersData.splice(i, 1)
+      //   allusersData.count = allusersData.count - 1
+      // }
 
       if (this.notmyuserUsersDataCount && allusersData.count > this.notmyuserUsersDataCount) {
         this.activeUsersDataCount = allusersData.count - this.notmyuserUsersDataCount
@@ -227,13 +227,13 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       this.verifiedUsersData = allusersData.content
       this.verifiedUsersDataCount = data.result.response.count
 
-      if (this.currentUserStatus === 'VERIFIED') {
-        const i = this.verifiedUsersData.findIndex((wf: any) => wf.userId === this.currentUser)
-        if (i > -1) {
-          this.verifiedUsersData.splice(i, 1)
-          this.verifiedUsersDataCount = this.verifiedUsersDataCount ? this.verifiedUsersDataCount - 1 : this.verifiedUsersDataCount
-        }
-      }
+      // if (this.currentUserStatus === 'VERIFIED') {
+      //   const i = this.verifiedUsersData.findIndex((wf: any) => wf.userId === this.currentUser)
+      //   if (i > -1) {
+      //     this.verifiedUsersData.splice(i, 1)
+      //     this.verifiedUsersDataCount = this.verifiedUsersDataCount ? this.verifiedUsersDataCount - 1 : this.verifiedUsersDataCount
+      //   }
+      // }
     })
   }
 
@@ -249,14 +249,14 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       this.nonverifiedUsersData = allusersData.content
       this.nonverifiedUsersDataCount = data.result.response.count
 
-      if (this.currentUserStatus === 'NOT-VERIFIED') {
-        const i = this.nonverifiedUsersData.findIndex((wf: any) => wf.userId === this.currentUser)
-        if (i > -1) {
-          this.nonverifiedUsersData.splice(i, 1)
-          this.nonverifiedUsersDataCount = this.nonverifiedUsersDataCount ?
-            this.nonverifiedUsersDataCount - 1 : this.nonverifiedUsersDataCount
-        }
-      }
+      // if (this.currentUserStatus === 'NOT-VERIFIED') {
+      //   const i = this.nonverifiedUsersData.findIndex((wf: any) => wf.userId === this.currentUser)
+      //   if (i > -1) {
+      //     this.nonverifiedUsersData.splice(i, 1)
+      //     this.nonverifiedUsersDataCount = this.nonverifiedUsersDataCount ?
+      //       this.nonverifiedUsersDataCount - 1 : this.nonverifiedUsersDataCount
+      //   }
+      // }
     })
   }
 
diff --git a/project/ws/app/src/lib/routes/users/services/users.service.ts b/project/ws/app/src/lib/routes/users/services/users.service.ts
index 084002809..8dabc0ad2 100644
--- a/project/ws/app/src/lib/routes/users/services/users.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/users.service.ts
@@ -127,6 +127,9 @@ export class UsersService {
         limit: pageLimit,
         offset: offsetNum,
         query: searchText,
+        sort_by: {
+          firstName: 'asc',
+        },
       },
     }
     return this.http.post<any>(`${API_END_POINTS.GET_ALL_USERS}`, reqBody)

From 87c72a02e055073937f27823cc76a9131d8ffb05 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Mon, 10 Jun 2024 15:36:41 +0530
Subject: [PATCH 690/887] Fixed 4722

---
 .../components/user-cards/user-card.component.html   |  4 ++--
 .../single-user-creation.component.ts                | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index c050a6068..5114feb53 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -306,8 +306,8 @@
                     <input class="appr-text-field w-full-imp" #tags matInput i18n-placeholder="Type here"
                       placeholder="Type here" formControlName="tags" i18n-aria-label aria-label="Type here"
                       [matChipInputFor]="chipListTags" autocomplete="off" maxlength="100"
-                      [matChipInputSeparatorKeyCodes]="separatorKeysCodes"
-                      (matChipInputTokenEnd)="addActivity($event)" />
+                      [matChipInputSeparatorKeyCodes]="separatorKeysCodes" (matChipInputTokenEnd)="addActivity($event)"
+                      maxlength="100" />
                   </div>
                 </div>
                 <div class="right-input-div">
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
index a124fcceb..38bf046bd 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
@@ -137,7 +137,7 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
       .subscribe((_res: any) => {
         this.masterData['designation'] = _res.responseData
         this.masterData['designationBackup'] = _res.responseData
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch designation details, please try again later!')
         }
@@ -150,7 +150,7 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
       .subscribe((res: any) => {
         this.masterData['language'] = res.languages
         this.masterData['languageBackup'] = res.languages
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch master language details, please try again later!')
         }
@@ -162,7 +162,7 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
         this.masterData['group'] = res.result.response
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch group data, please try again later!')
         }
@@ -180,7 +180,7 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
             this.masterData['mdoRoles'] = mdoArray.roles
           }
         }
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch roles list, please try again later!')
         }
@@ -220,7 +220,7 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
   handleValidTags(event: any): any {
     const charCode = event.charCode
     // tslint:disable-next-line
-    return ((charCode > 64 && charCode < 91) || (charCode > 96 && charCode < 123) || charCode == 8 || charCode == 32 || (charCode >= 48 && charCode <= 57))
+    return ((charCode > 64 && charCode < 91) || (charCode > 96 && charCode < 123) || charCode == 8 || charCode == 32)
   }
 
   handleRemoveTag(tag: any): void {
@@ -268,7 +268,7 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
       .subscribe((_res: any) => {
         this.matSnackBar.open('User created successfully!')
         this.handleFormClear()
-      },         (_err: HttpErrorResponse) => {
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open(_.get(_err, 'error.params.errmsg') || 'Unable to create user, please try again later!')
         }

From d7d0b1f893cc1e3dfb68e4143ae566d59cc72609 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Mon, 10 Jun 2024 16:51:07 +0530
Subject: [PATCH 691/887] Fixed lint issue

---
 .../home/components/user-cards/user-card.component.ts  |  6 +++---
 .../single-user-creation.component.ts                  | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index d18abb01b..a08eb61f7 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -109,9 +109,9 @@ export class UserCardComponent implements OnInit, OnChanges {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-    private dialog: MatDialog, private approvalSvc: ApprovalsService,
-    private route: ActivatedRoute, private snackBar: MatSnackBar,
-    private events: EventService, private datePipe: DatePipe) {
+              private dialog: MatDialog, private approvalSvc: ApprovalsService,
+              private route: ActivatedRoute, private snackBar: MatSnackBar,
+              private events: EventService, private datePipe: DatePipe) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
index 38bf046bd..ecba4112c 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
@@ -137,7 +137,7 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
       .subscribe((_res: any) => {
         this.masterData['designation'] = _res.responseData
         this.masterData['designationBackup'] = _res.responseData
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch designation details, please try again later!')
         }
@@ -150,7 +150,7 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
       .subscribe((res: any) => {
         this.masterData['language'] = res.languages
         this.masterData['languageBackup'] = res.languages
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch master language details, please try again later!')
         }
@@ -162,7 +162,7 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
         this.masterData['group'] = res.result.response
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch group data, please try again later!')
         }
@@ -180,7 +180,7 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
             this.masterData['mdoRoles'] = mdoArray.roles
           }
         }
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch roles list, please try again later!')
         }
@@ -268,7 +268,7 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
       .subscribe((_res: any) => {
         this.matSnackBar.open('User created successfully!')
         this.handleFormClear()
-      }, (_err: HttpErrorResponse) => {
+      },         (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open(_.get(_err, 'error.params.errmsg') || 'Unable to create user, please try again later!')
         }

From d13ec0839317fb0635a86beff16c7c2820b6caa7 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Mon, 10 Jun 2024 17:18:28 +0530
Subject: [PATCH 692/887] Fixed 4706

---
 .../single-user-creation/single-user-creation.component.ts   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
index ecba4112c..7248f5547 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
@@ -26,7 +26,7 @@ export const MY_FORMATS = {
   },
 }
 
-const EMAIL_PATTERN = /^[a-zA-Z0-9](\.?[a-zA-Z0-9_]+)*@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/
+// const EMAIL_PATTERN = /^[a-zA-Z0-9](\.?[a-zA-Z0-9_]+)*@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/
 const MOBILE_PATTERN = /^[0]?[6789]\d{9}$/
 const PIN_CODE_PATTERN = /^[1-9][0-9]{5}$/
 
@@ -49,8 +49,9 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
   rolesArr: string[] = []
   fullProfile: any
   namePatern = `^[a-zA-Z\\s\\']{1,50}$`
+  emailRegix = `^[\\w\-\\.]+@([\\w-]+\\.)+[\\w-]{2,4}$`
   userCreationForm = this.formBuilder.group({
-    email: new FormControl('', [Validators.required, Validators.pattern(EMAIL_PATTERN)]),
+    email: new FormControl('', [Validators.required, Validators.pattern(this.emailRegix)]),
     firstName: new FormControl('', [Validators.required, Validators.pattern(this.namePatern)]),
     phone: new FormControl('', [Validators.required, Validators.pattern(MOBILE_PATTERN), Validators.minLength(10)]),
     channel: new FormControl(''),

From 45c099e16dfd99e6ea499edcc75936845cb6ea00 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Tue, 11 Jun 2024 23:23:03 +0530
Subject: [PATCH 693/887] transfer req integration & enabled notmyuser

---
 .../components/search/search.component.html   |   5 +-
 .../user-cards/user-card.component.html       |  39 ++++-
 .../user-cards/user-card.component.ts         | 163 +++++++++++++-----
 .../approval-pending.component.html           |  15 +-
 .../approval-pending.component.ts             |  32 ++--
 .../users-view/users-view.component.html      |   4 +-
 6 files changed, 184 insertions(+), 74 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.html b/project/ws/app/src/lib/routes/home/components/search/search.component.html
index f2a68222e..63894bca2 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.html
@@ -21,11 +21,12 @@
         <button mat-button type="button" class="search-btn" [routerLink]="['/app/home/user-creation']"
             [ngClass]="{'disable': isContentLive}">Create user</button>
     </div>
-    <div class="flex flex-end margin-right-s" *ngIf="isApprovals && showApproveALL">
+    <div class="flex flex-end margin-right-s"
+        *ngIf="isApprovals && showApproveALL && currentFilter === 'profileverification'">
         <button mat-button type="button" class="search-btn" (click)="approveAll()"
             [disabled]="disableApproveALL">Approve all requests</button>
     </div>
-    <div class="flex flex-end" *ngIf="isApprovals">
+    <div class="flex flex-end" *ngIf="isApprovals && currentFilter === 'profileverification'">
         <button mat-button type="button" class="search-btn" [routerLink]="['/app/home/approvals/bulkupdate']"
             [ngClass]="{'disable': isContentLive}">Bulk profile update</button>
     </div>
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 6d1348ace..27b45bf48 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -62,10 +62,10 @@
               <mat-slide-toggle (click)="markStatus('NOT-VERIFIED', user)">Mark this user as
                 non-verified</mat-slide-toggle>
             </p>
-            <!-- <p class="float-right mat-body-2" *ngIf="user?.profileDetails?.profileStatus === 'NOT-VERIFIED'">
+            <p class="float-right mat-body-2" *ngIf="user?.profileDetails?.profileStatus === 'NOT-VERIFIED'">
               <mat-slide-toggle (click)="markStatus('NOT-MY-USER', user)" [checked]="true">This is my
                 user</mat-slide-toggle>
-            </p> -->
+            </p>
             <div class="flex flex-row margin-top-m">
               <div class="md:w-1/3">
                 <label class="margin-remove-bottom form-label required">Group</label>
@@ -565,7 +565,7 @@
         </div>
       </mat-expansion-panel-header>
 
-      <div class="panel-body">
+      <div class="panel-body profile-box">
         <form [formGroup]="approveUserDataForm" class="margin-top-m">
           <!-- <button mat-button class="my-4 mr-4" (click)="addRejection()">add reason</button>
               <button mat-button class="my-4 mr-4" (click)="updateRejection()">update reason</button> -->
@@ -573,6 +573,11 @@
             <div class="margin-bottom-m">
               <span class="font-bold">Primary Details</span> <mat-icon
                 class="ws-mat-black40-text infoicon">info_outline</mat-icon>
+              <p class="float-right mat-body-2" *ngIf="currentFilter === 'transfers'">
+                <mat-slide-toggle #toggleElement (change)="confirmNotMyUser(notmyuserconfirm, appData, $event)"
+                  [checked]="appData.enableToggle">
+                  This is my user</mat-slide-toggle>
+              </p>
             </div>
             <div class="flex flex-row margin-top-m">
               <ng-container *ngFor="let field of appData.needApprovalList">
@@ -613,9 +618,9 @@
                     <mat-radio-group aria-label="Select an option" name="approveDesignation"
                       formControlName="approveDesignation" class="mat-caption margin-top-s">
                       <mat-radio-button value="approvedesg" class="margin-right-s"
-                        (click)="onClickHandleWorkflow(field,'APPROVE', appData)">Approve</mat-radio-button>
+                        (click)="onClickHandleWorkflow(field,'APPROVE')">Approve</mat-radio-button>
                       <mat-radio-button value="rejectdesg"
-                        (click)="onClickHandleWorkflow(field,'REJECT', appData)">Reject</mat-radio-button>
+                        (click)="onClickHandleWorkflow(field,'REJECT')">Reject</mat-radio-button>
                       <mat-icon class="margin-left-m editreasonicon cursor-pointer"
                         *ngIf="field.action === 'REJECT' && comment !== ''"
                         (click)="updateRejection(field)">chat_bubble</mat-icon>
@@ -747,7 +752,7 @@
           </div>
 
           <div class="flex flex-row margin-top-l">
-            <button mat-raised-button type="submit" (click)="confirmApproval(approvalconfirm, panel)"
+            <button mat-raised-button type="submit" (click)="confirmApproval(approvalconfirm, panel, appData)"
               class="margin-right-m btn-success btn-responsive successbtn"
               [disabled]="appData.needApprovalList.length !== actionList.length">
               <span class="text-white" i18n>
@@ -881,4 +886,26 @@
       </button>
     </div>
   </div>
+</ng-template>
+
+<ng-template #notmyuserconfirm>
+  <div class="confirm-dialog text-center padding-l">
+    <mat-icon class="infoIcon orangeicon-dialog">error_outline</mat-icon>
+    <div mat-dialog-content i18n class="margin-top-xs blue-text">
+      Are you sure you want to cancel this transfer request?
+    </div>
+    <div mat-dialog-actions class="flex-center margin-top-s">
+      <button mat-raised-button type="submit" [mat-dialog-close]="false"
+        class="margin-right-m  btn-success btn-responsive cancelbtn">
+        <span i18n>
+          No
+        </span>
+      </button>
+      <button mat-raised-button type="submit" [mat-dialog-close]="true" class="btn-success btn-responsive successbtn">
+        <span class="text-white" i18n>
+          Yes
+        </span>
+      </button>
+    </div>
+  </div>
 </ng-template>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 16c303d79..263fb604c 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -1,4 +1,7 @@
-import { Component, EventEmitter, Input, OnChanges, OnInit, Output, QueryList, TemplateRef, ViewChild, ViewChildren } from '@angular/core'
+import {
+  Component, ElementRef, EventEmitter, Input, OnChanges, OnInit, Output,
+  QueryList, TemplateRef, ViewChild, ViewChildren
+} from '@angular/core'
 import { FormGroup, FormControl, Validators } from '@angular/forms'
 import { UsersService } from '../../../users/services/users.service'
 import {
@@ -52,6 +55,9 @@ export class UserCardComponent implements OnInit, OnChanges {
   updaterejectDialog!: TemplateRef<any>
 
   @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator | any
+
+  @ViewChild('toggleElement', { static: true }) ref!: ElementRef
+
   startIndex = 0
   lastIndex = 20
   pageSize = 20
@@ -109,9 +115,10 @@ export class UserCardComponent implements OnInit, OnChanges {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-              private dialog: MatDialog, private approvalSvc: ApprovalsService,
-              private route: ActivatedRoute, private snackBar: MatSnackBar,
-              private events: EventService, private datePipe: DatePipe) {
+    private dialog: MatDialog, private approvalSvc: ApprovalsService,
+    private route: ActivatedRoute, private snackBar: MatSnackBar,
+    private events: EventService,
+    private datePipe: DatePipe) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),
@@ -216,6 +223,9 @@ export class UserCardComponent implements OnInit, OnChanges {
         this.usersSvc.getUserById(id).subscribe((res: any) => {
           if (res) {
             data.user = res
+            if (this.currentFilter === 'transfers') {
+              data.enableToggle = res.profileDetails.profileStatus !== 'NOT-MY-USER' ? true : false
+            }
 
             if (data.user) {
               if (data.needApprovalList && data.needApprovalList.length === 1) {
@@ -698,7 +708,7 @@ export class UserCardComponent implements OnInit, OnChanges {
   }
   /* tslint:disable */
   // for approval & rejection
-  onClickHandleWorkflow(field: any, action: string, appData: any = undefined) {
+  onClickHandleWorkflow(field: any, action: string) {
     field.action = action
     const req = {
       action,
@@ -754,20 +764,21 @@ export class UserCardComponent implements OnInit, OnChanges {
       }
     )
 
-    if (this.currentFilter === 'transfers' && appData !== undefined) {
-      appData.needApprovalList.forEach((otherField: any) => {
-        if (otherField.label !== field.label) {
-          this.onClickHandleWorkflow(field, action)
-        }
-      })
-      if (field.label === 'Group') {
-        const designationValue = action === 'APPROVE' ? 'approvedesg' : 'rejectdesg'
-        this.approveUserDataForm.controls.approveDesignation.setValue(designationValue)
-      } else {
-        const groupValue = action === 'APPROVE' ? 'approvegroup' : 'rejectgroup'
-        this.approveUserDataForm.controls.approveGroup.setValue(groupValue)
-      }
-    }
+    // if (this.currentFilter === 'transfers' && appData !== undefined) {
+    //   appData.needApprovalList.forEach((otherField: any) => {
+    //     if (otherField.label !== field.label) {
+    //       console.log('field', field)
+    //       this.onClickHandleWorkflow(field, action)
+    //     }
+    //   })
+    //   if (field.label === 'Group') {
+    //     const designationValue = action === 'APPROVE' ? 'approvedesg' : 'rejectdesg'
+    //     this.approveUserDataForm.controls.approveDesignation.setValue(designationValue)
+    //   } else {
+    //     const groupValue = action === 'APPROVE' ? 'approvegroup' : 'rejectgroup'
+    //     this.approveUserDataForm.controls.approveGroup.setValue(groupValue)
+    //   }
+    // }
   }
   /* tslint:enable */
   // single aprrove or reject
@@ -779,32 +790,82 @@ export class UserCardComponent implements OnInit, OnChanges {
     })
   }
 
-  onApprovalSubmit(panel: any) {
+  onApprovalSubmit(panel: any, appData: any) {
     if (this.actionList.length > 0) {
-      const datalength = this.actionList.length
-      this.actionList.forEach((req: any, index: any) => {
-        if (req.action === 'APPROVE') {
-          req.comment = ''
-        }
-        this.onApproveOrRejectClick(req)
-        if (index === datalength - 1) {
-          panel.close()
-          this.comment = ''
-          setTimeout(() => {
-            this.openSnackbar('Request approved successfully')
-            this.updateList.emit()
-            // tslint:disable-next-line
-          }, 100)
-        }
-        // tslint:disable-next-line
-        // this.approvalData = this.approvalData.filter((wf: any) => { wf.userWorkflow.userInfo.wid !== req.userId })
-        if (this.approvalData.length === 0) {
-          this.disableButton.emit()
-        }
-      })
+      if (this.currentFilter === 'transfers') {
+        this.onTransferSubmit(panel, appData)
+      } else {
+        const datalength = this.actionList.length
+        this.actionList.forEach((req: any, index: any) => {
+          if (req.action === 'APPROVE') {
+            req.comment = ''
+          }
+          this.onApproveOrRejectClick(req)
+          if (index === datalength - 1) {
+            panel.close()
+            this.comment = ''
+            setTimeout(() => {
+              this.openSnackbar('Request approved successfully')
+              this.updateList.emit()
+              // tslint:disable-next-line
+            }, 100)
+          }
+          // tslint:disable-next-line
+          // this.approvalData = this.approvalData.filter((wf: any) => { wf.userWorkflow.userInfo.wid !== req.userId })
+          if (this.approvalData.length === 0) {
+            this.disableButton.emit()
+          }
+        })
+      }
     }
   }
 
+  onTransferSubmit(panel: any, appData: any) {
+    let orgReq = {}
+    appData.userWorkflow.wfInfo.forEach((wf: any) => {
+      const fields = JSON.parse(wf.updateFieldValues)
+      if (fields.length > 0) {
+        fields.forEach((field: any) => {
+          const labelKey = Object.keys(field.toValue)[0]
+          if (labelKey === 'name') {
+            orgReq = {
+              action: 'APPROVE',
+              actorUserId: wf.actorUUID,
+              applicationId: wf.applicationId,
+              serviceName: wf.serviceName,
+              state: 'SEND_FOR_APPROVAL',
+              updateFieldValues: fields,
+              userId: wf.userId,
+              wfId: wf.wfId,
+            }
+          }
+        })
+      }
+    })
+
+    this.actionList.push(orgReq)
+    const datalength = this.actionList.length
+    this.actionList.forEach((req: any, index: any) => {
+      if (req.action === 'APPROVE') {
+        req.comment = ''
+      }
+      this.onApproveOrRejectClick(req)
+      if (index === datalength - 1) {
+        panel.close()
+        this.comment = ''
+        setTimeout(() => {
+          this.openSnackbar('Request approved successfully')
+          this.updateList.emit()
+          // tslint:disable-next-line
+        }, 100)
+      }
+      if (this.approvalData.length === 0) {
+        this.disableButton.emit()
+      }
+    })
+
+  }
+
   updateRejection(field: any) {
     this.comment = field.comment
     const dialogRef = this.dialog.open(this.updaterejectDialog, {
@@ -862,6 +923,22 @@ export class UserCardComponent implements OnInit, OnChanges {
     })
   }
 
+  confirmNotMyUser(template: any, data: any, event: any) {
+    data.enableToggle = true
+    const dialog = this.dialog.open(template, {
+      width: '500px',
+    })
+    dialog.afterClosed().subscribe((v: any) => {
+      if (v) {
+        this.markStatus('NOT-MY-USER', data.user)
+        data.enableToggle = false
+      } else {
+        event.source.checked = true
+        data.enableToggle = true
+      }
+    })
+  }
+
   confirmUpdate(template: any, updateUserDataForm: any, user: any, panel: any) {
     const dialog = this.dialog.open(template, {
       width: '500px',
@@ -875,13 +952,13 @@ export class UserCardComponent implements OnInit, OnChanges {
     })
   }
 
-  confirmApproval(template: any, panel: any) {
+  confirmApproval(template: any, panel: any, appData: any) {
     const dialog = this.dialog.open(template, {
       width: '500px',
     })
     dialog.afterClosed().subscribe((v: any) => {
       if (v) {
-        this.onApprovalSubmit(panel)
+        this.onApprovalSubmit(panel, appData)
       } else {
         panel.close()
       }
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
index a13ab2f69..7fa5f03fe 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
@@ -31,14 +31,14 @@
       <div class="flex flex-1 flex-column margin-fix">
         <div class="flex flex-1 filter max-height-60">
           <a routerLink="/app/home/approvals/profileverification" class="filter-option"
-            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'profileverification', 'ws-mat-accent-border font-medium':currentFilter !== 'profileverification'}"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'profileverification', 'ws-mat-accent-border font-medium': currentFilter !== 'profileverification'}"
             mat-button (click)="filter('profileverification'); tabTelemetry('toapprove', 0)" role="button">Profile
             Verifications ({{profileVerificationCount}})</a>
 
-          <!-- <a routerLink="/app/home/approvals/transfers" class="filter-option"
-            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'transfers', 'ws-mat-accent-border font-medium':currentFilter !== 'transfers'}"
+          <a routerLink="/app/home/approvals/transfers" class="filter-option"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'transfers', 'ws-mat-accent-border font-medium': currentFilter !== 'transfers'}"
             mat-button (click)="filter('transfers'); tabTelemetry('transfers', 1)" role="button">Transfers
-            ({{transfersCount}})</a> -->
+            ({{transfersCount}})</a>
         </div>
       </div>
       <ng-container *ngIf="currentFilter === 'profileverification'">
@@ -61,10 +61,15 @@
       </ng-container>
       <ng-container *ngIf="currentFilter === 'transfers'">
         <!-- <ws-app-profle-approval-bulk-upload></ws-app-profle-approval-bulk-upload> -->
+        <div class="searchfilter">
+          <ws-app-searchuser (handleApiData)="onSearch($event)" [isApprovals]="true" (handleapproveAll)="onApproveALL()"
+            [showApproveALL]="false"></ws-app-searchuser>
+        </div>
         <ng-container *ngIf="transfersData && transfersData.length > 0">
           <ws-widget-user-card [currentFilter]="currentFilter" [usersData]="transfersData" [isApprovals]="true"
             [totalRecords]="transfersCount" [tabChangeIndex]="pageIndex" (searchByEnterKey)="onEnterkySearch($event)"
-            (disableButton)="showButton()" (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
+            (disableButton)="showButton()" (paginationData)="onPaginateChange($event)"
+            (updateList)="fetchApprovals()"></ws-widget-user-card>
         </ng-container>
         <ng-container *ngIf="!transfersData || transfersData.length === 0">
           <p class="margin-top-xl margin-bottom-xl">No approvals</p>
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
index 461973146..1002fbc91 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
@@ -56,14 +56,15 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit() {
-    this.currentFilter = this.route.snapshot.params['tab'] || 'profileverification'
+    this.currentFilter = this.route.snapshot.routeConfig && this.route.snapshot.routeConfig.path
+      ? this.route.snapshot.routeConfig.path : 'profileverification'
     // this.currentFilter = this.currentFilter === 'upload' ? 'uploadApprovals' : 'pending'
-    if (this.currentFilter === 'profileverification') {
-      this.fetchApprovals()
-    }
-    if (this.currentFilter !== 'profileverification') {
-      this.fetchApprovals()
-    }
+    // if (this.currentFilter === 'profileverification') {
+    this.fetchApprovals()
+    // }
+    // if (this.currentFilter !== 'profileverification') {
+    //   this.fetchApprovals()
+    // }
 
     this.reportsNoteList = [
       // tslint:disable-next-line: max-line-length
@@ -180,7 +181,6 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
         })
 
         newarray.forEach((appr: any) => {
-
           const requestData = {
             fullname: appr.userInfo ? `${appr.userInfo.first_name}` : '--',
             requestedon: currentdate,
@@ -188,7 +188,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
             userWorkflow: appr,
             tag: (appr.userInfo && appr.userInfo.tag) ? `${appr.userInfo.tag}` : '',
           }
-         /* tslint:disable */
+          /* tslint:disable */
           if (appr!.wfInfo[0] && appr!.wfInfo[0].orgTansferRequest) {
             this.transfersData.push(requestData)
           } else {
@@ -206,16 +206,16 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
           const textB = b.fullname.toUpperCase()
           return (textA < textB) ? -1 : (textA > textB) ? 1 : 0
         })
-        this.transfersCount = this.transfersData.length
-        this.profileVerificationCount = this.profileVerificationData.length
-
-        this.allTransfersData = this.transfersData
-        this.allprofileVerificationData = this.profileVerificationData
 
         if ((this.transfersData && this.transfersData.length > 0) ||
-        (this.profileVerificationData && this.profileVerificationData.length > 0)) {
+          (this.profileVerificationData && this.profileVerificationData.length > 0)) {
           this.showApproveALL = true
           this.disableApproveALL = false
+          this.transfersCount = this.transfersData.length
+          this.profileVerificationCount = this.profileVerificationData.length
+
+          this.allTransfersData = this.transfersData
+          this.allprofileVerificationData = this.profileVerificationData
         }
       })
     } else {
@@ -236,7 +236,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   replaceWords(inputString: any, wordConditions: any) {
     return wordConditions.reduce((acc: any, [word, condition]: any) => {
       return acc.replace(new RegExp(word, 'gi'), condition)
-    },                           inputString)
+    }, inputString)
   }
 
   onSearch(enterValue: any) {
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index 33d405a0f..cde4b37d8 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -65,10 +65,10 @@
             mat-button (click)="filter('nonverified'); tabTelemetry('nonverified', 0)" role="button">Non-verified
             ({{nonverifiedUsersDataCount}})</a>
 
-          <!-- <a routerLink="/app/home/users/notmyuser" routerLinkActive="router-link-active" class="filter-option"
+          <a routerLink="/app/home/users/notmyuser" routerLinkActive="router-link-active" class="filter-option"
             [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'notmyuser','ws-mat-accent-border font-medium':currentFilter !== 'notmyuser'}"
             mat-button (click)="filter('notmyuser'); tabTelemetry('notmyuser', 0)" role="button">Not my user
-            ({{notmyuserUsersDataCount}})</a> -->
+            ({{notmyuserUsersDataCount}})</a>
         </div>
       </div>
       <!-- <ws-widget-org-user-table-v2 [userId]="currentUser" [tableData]="tabledata" [data]="dataForTable"

From 2c83a0c3512a13957447469c7e31918e717b5785 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Tue, 11 Jun 2024 23:30:37 +0530
Subject: [PATCH 694/887] Fixed lint

---
 .../home/components/user-cards/user-card.component.ts  | 10 +++++-----
 .../approval-pending/approval-pending.component.ts     |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 263fb604c..90b4068e1 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -1,6 +1,6 @@
 import {
   Component, ElementRef, EventEmitter, Input, OnChanges, OnInit, Output,
-  QueryList, TemplateRef, ViewChild, ViewChildren
+  QueryList, TemplateRef, ViewChild, ViewChildren,
 } from '@angular/core'
 import { FormGroup, FormControl, Validators } from '@angular/forms'
 import { UsersService } from '../../../users/services/users.service'
@@ -115,10 +115,10 @@ export class UserCardComponent implements OnInit, OnChanges {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-    private dialog: MatDialog, private approvalSvc: ApprovalsService,
-    private route: ActivatedRoute, private snackBar: MatSnackBar,
-    private events: EventService,
-    private datePipe: DatePipe) {
+              private dialog: MatDialog, private approvalSvc: ApprovalsService,
+              private route: ActivatedRoute, private snackBar: MatSnackBar,
+              private events: EventService,
+              private datePipe: DatePipe) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
index 1002fbc91..fc720b5e1 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
@@ -236,7 +236,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   replaceWords(inputString: any, wordConditions: any) {
     return wordConditions.reduce((acc: any, [word, condition]: any) => {
       return acc.replace(new RegExp(word, 'gi'), condition)
-    }, inputString)
+    },                           inputString)
   }
 
   onSearch(enterValue: any) {

From 5578f475b8dfa9512272dcf5a813b242e38913ba Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Tue, 11 Jun 2024 23:39:44 +0530
Subject: [PATCH 695/887] Fixed alignment

---
 .../lib/routes/home/components/search/search.component.scss   | 2 +-
 .../home/components/user-cards/user-card.component.html       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.scss b/project/ws/app/src/lib/routes/home/components/search/search.component.scss
index 526013db6..825554ecf 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.scss
@@ -6,7 +6,7 @@
 
     .search-icon {
         position: absolute;
-        top: 16px;
+        top: 15px;
         font-size: 20px;
         left: 10px;
     }
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 27b45bf48..e0b7c8f8c 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -40,7 +40,7 @@
               user?.profileDetails?.professionalDetails[0]?.designation ?
               user?.profileDetails?.professionalDetails[0]?.designation : '-'}}</div>
             <div class="mat-caption ws-mat-black40-text">
-              Marked on: {{user?.profileDetails?.profileStatusUpdatedOn || ' -'}}</div>
+              Marked on: {{user?.profileDetails?.profileStatusUpdatedOn || ' NA'}}</div>
             <!-- <div class="mat-caption ws-mat-black40-text" *ngIf="!user?.profileDetails?.profileStatusUpdatedOn">-</div> -->
           </div>
         </div>
@@ -49,7 +49,7 @@
             *ngIf="currentFilter !== 'notmyuser' && !user?.enableEdit">
             <mat-icon>edit</mat-icon> Edit
           </div>
-          <div class="button margin-top-m mat-body" (click)="confirmReassign(confirm, user);$event.stopPropagation();"
+          <div class="button mat-body" (click)="confirmReassign(confirm, user);$event.stopPropagation();"
             *ngIf="currentFilter === 'notmyuser'">Reassign</div>
         </div>
       </mat-expansion-panel-header>

From 8f17a078c03aca4d5eacb53cfe2fe83848832089 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Wed, 12 Jun 2024 12:46:14 +0530
Subject: [PATCH 696/887] removed notmyuser filter from allusers list & update
 button configs under approvals

---
 .../lib/routes/home/components/search/search.component.html  | 5 ++---
 .../lib/routes/home/components/search/search.component.ts    | 1 +
 .../approval-pending/approval-pending.component.html         | 5 +++--
 .../routes/home/routes/users-view/users-view.component.ts    | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.html b/project/ws/app/src/lib/routes/home/components/search/search.component.html
index 63894bca2..ba72dd2d9 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.html
@@ -21,12 +21,11 @@
         <button mat-button type="button" class="search-btn" [routerLink]="['/app/home/user-creation']"
             [ngClass]="{'disable': isContentLive}">Create user</button>
     </div>
-    <div class="flex flex-end margin-right-s"
-        *ngIf="isApprovals && showApproveALL && currentFilter === 'profileverification'">
+    <div class="flex flex-end margin-right-s" *ngIf="isApprovals && showApproveALL">
         <button mat-button type="button" class="search-btn" (click)="approveAll()"
             [disabled]="disableApproveALL">Approve all requests</button>
     </div>
-    <div class="flex flex-end" *ngIf="isApprovals && currentFilter === 'profileverification'">
+    <div class="flex flex-end" *ngIf="isApprovals && showBulkUpdate">
         <button mat-button type="button" class="search-btn" [routerLink]="['/app/home/approvals/bulkupdate']"
             [ngClass]="{'disable': isContentLive}">Bulk profile update</button>
     </div>
diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.ts b/project/ws/app/src/lib/routes/home/components/search/search.component.ts
index b61456324..24cf8f6df 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.ts
@@ -14,6 +14,7 @@ export class SearchComponent implements OnInit {
   @Input() from: any = ''
   @Input() isApprovals: any
   @Input() showApproveALL: any
+  @Input() showBulkUpdate: any
   @Input() disableApproveALL: any
   @Input() currentFilter: any
   @Output() handleApiData = new EventEmitter()
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
index 7fa5f03fe..70ba45b56 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
@@ -44,7 +44,8 @@
       <ng-container *ngIf="currentFilter === 'profileverification'">
         <div class="searchfilter">
           <ws-app-searchuser (handleApiData)="onSearch($event)" [isApprovals]="true" (handleapproveAll)="onApproveALL()"
-            [showApproveALL]="showApproveALL" [disableApproveALL]="disableApproveALL"></ws-app-searchuser>
+            [showApproveALL]="showApproveALL" [showBulkUpdate]="true"
+            [disableApproveALL]="disableApproveALL"></ws-app-searchuser>
         </div>
         <ng-container *ngIf="profileVerificationCount > 0">
           <!-- <ws-widget-org-user-table-v2 [tableData]="tabledata" [data]="data" (eOnRowClick)="onApprovalClick($event)"
@@ -63,7 +64,7 @@
         <!-- <ws-app-profle-approval-bulk-upload></ws-app-profle-approval-bulk-upload> -->
         <div class="searchfilter">
           <ws-app-searchuser (handleApiData)="onSearch($event)" [isApprovals]="true" (handleapproveAll)="onApproveALL()"
-            [showApproveALL]="false"></ws-app-searchuser>
+            [showApproveALL]="false" [showBulkUpdate]="false"></ws-app-searchuser>
         </div>
         <ng-container *ngIf="transfersData && transfersData.length > 0">
           <ws-widget-user-card [currentFilter]="currentFilter" [usersData]="transfersData" [isApprovals]="true"
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index c61e03726..241311fca 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -202,7 +202,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     this.usersService.getAllKongUsers(filtreq, this.limit, this.pageIndex, query).subscribe((data: any) => {
       const allusersData = data.result.response
       this.activeUsersData = allusersData.content
-      this.activeUsersData = this.activeUsersData.filter((wf: any) => wf.profileDetails.profileStatus !== 'NOT-MY-USER')
+      // this.activeUsersData = this.activeUsersData.filter((wf: any) => wf.profileDetails.profileStatus !== 'NOT-MY-USER')
       this.activeUsersDataCount = allusersData.count
       // const i = this.activeUsersData.findIndex((wf: any) => wf.userId === this.currentUser)
       // if (i > -1) {

From a0d89955ceabdb45ab48da0111725c64bb14c471 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Wed, 12 Jun 2024 15:41:43 +0530
Subject: [PATCH 697/887] Fixed lint

---
 .../approval-pending.component.html           |  4 ----
 .../approval-pending.component.ts             | 19 +++++++++----------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
index 70ba45b56..0f7132f0f 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
@@ -48,9 +48,6 @@
             [disableApproveALL]="disableApproveALL"></ws-app-searchuser>
         </div>
         <ng-container *ngIf="profileVerificationCount > 0">
-          <!-- <ws-widget-org-user-table-v2 [tableData]="tabledata" [data]="data" (eOnRowClick)="onApprovalClick($event)"
-            [totalRecords]="approvalTotalCount" (pageChangeClick)="onPaginateChange($event)">
-          </ws-widget-org-user-table-v2> -->
           <ws-widget-user-card [currentFilter]="currentFilter" [usersData]="profileVerificationData"
             [isApprovals]="true" [totalRecords]="profileVerificationCount" [tabChangeIndex]="pageIndex"
             (searchByEnterKey)="onEnterkySearch($event)" (disableButton)="showButton()"
@@ -61,7 +58,6 @@
         </ng-container>
       </ng-container>
       <ng-container *ngIf="currentFilter === 'transfers'">
-        <!-- <ws-app-profle-approval-bulk-upload></ws-app-profle-approval-bulk-upload> -->
         <div class="searchfilter">
           <ws-app-searchuser (handleApiData)="onSearch($event)" [isApprovals]="true" (handleapproveAll)="onApproveALL()"
             [showApproveALL]="false" [showBulkUpdate]="false"></ws-app-searchuser>
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
index fc720b5e1..631bf6f47 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
@@ -95,12 +95,12 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   filter(key: string | 'timestamp' | 'best' | 'saved') {
     if (key) {
       this.currentFilter = key
-      if (key === 'profileverification') {
-        this.fetchApprovals()
-      }
-      if (key === 'transfers') {
-        this.fetchApprovals()
-      }
+      // if (key === 'profileverification') {
+      this.fetchApprovals()
+      // }
+      // if (key === 'transfers') {
+      //   this.fetchApprovals()
+      // }
     }
   }
 
@@ -207,14 +207,13 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
           return (textA < textB) ? -1 : (textA > textB) ? 1 : 0
         })
 
-        if ((this.transfersData && this.transfersData.length > 0) ||
-          (this.profileVerificationData && this.profileVerificationData.length > 0)) {
+        if (this.profileVerificationData && this.profileVerificationData.length > 0) {
           this.showApproveALL = true
           this.disableApproveALL = false
-          this.transfersCount = this.transfersData.length
+          // this.transfersCount = this.transfersData.length
           this.profileVerificationCount = this.profileVerificationData.length
 
-          this.allTransfersData = this.transfersData
+          // this.allTransfersData = this.transfersData
           this.allprofileVerificationData = this.profileVerificationData
         }
       })

From 0c6341fe4a63ca6eef59c1ecb6269b511e18445d Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Wed, 12 Jun 2024 16:01:28 +0530
Subject: [PATCH 698/887]  bulk user data sorting fix kb-5030

---
 .../approvals/bulk-upload/bulk-upload.component.ts       | 9 +++++----
 .../users-view/bulk-upload/bulk-upload.component.ts      | 3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
index cd9233b3f..aa823e5fd 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
@@ -73,8 +73,9 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
     this.fileService.getBulkApprovalUploadDataV1()
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
-        this.lastUploadList = res.result.content
-      },         (error: HttpErrorResponse) => {
+        this.lastUploadList = res.result.content.sort((a: any, b: any) =>
+          new Date(b.datecreatedon).getTime() - new Date(a.datecreatedon).getTime())
+      }, (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open('Unable to get Bulk status list')
         }
@@ -116,7 +117,7 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
         if (!resendFlag) {
           this.verifyOTP(contactType)
         }
-      },         (error: HttpErrorResponse) => {
+      }, (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open(_.get(error, 'error.params.errmsg') || `Unable to send OTP to your ${contactType}, please try again later!`)
         }
@@ -168,7 +169,7 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
             this.fileName = ''
             this.fileSelected = ''
             this.getBulkStatusList()
-          },         (_err: HttpErrorResponse) => {
+          }, (_err: HttpErrorResponse) => {
             if (!_err.ok) {
               this.matSnackBar.open('Uploading CSV file failed due to some error, please try again later!')
             }
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts
index d17d146f2..d36083116 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts
@@ -73,7 +73,8 @@ export class BulkUploadComponent implements OnInit, AfterViewInit, OnDestroy {
     this.fileService.getBulkUploadDataV1(this.rootOrgId)
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
-        this.lastUploadList = res.result.content
+        this.lastUploadList = res.result.content.sort((a: any, b: any) =>
+          new Date(b.dateCreatedOn).getTime() - new Date(a.dateCreatedOn).getTime())
         // tslint:disable-next-line
       }, (error: HttpErrorResponse) => {
         if (!error.ok) {

From 698bbd1e59e87ab8f8b4b64f46a5861e792d0cd9 Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Wed, 12 Jun 2024 16:08:20 +0530
Subject: [PATCH 699/887] lint fix

---
 .../routes/approvals/bulk-upload/bulk-upload.component.ts   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
index aa823e5fd..de58a0793 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
@@ -75,7 +75,7 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
       .subscribe((res: any) => {
         this.lastUploadList = res.result.content.sort((a: any, b: any) =>
           new Date(b.datecreatedon).getTime() - new Date(a.datecreatedon).getTime())
-      }, (error: HttpErrorResponse) => {
+      },         (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open('Unable to get Bulk status list')
         }
@@ -117,7 +117,7 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
         if (!resendFlag) {
           this.verifyOTP(contactType)
         }
-      }, (error: HttpErrorResponse) => {
+      },         (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open(_.get(error, 'error.params.errmsg') || `Unable to send OTP to your ${contactType}, please try again later!`)
         }
@@ -169,7 +169,7 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
             this.fileName = ''
             this.fileSelected = ''
             this.getBulkStatusList()
-          }, (_err: HttpErrorResponse) => {
+          },         (_err: HttpErrorResponse) => {
             if (!_err.ok) {
               this.matSnackBar.open('Uploading CSV file failed due to some error, please try again later!')
             }

From e9b62e27f7d69870313e019d3a4615648a09e463 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Wed, 12 Jun 2024 16:55:41 +0530
Subject: [PATCH 700/887] Transfer request integration

---
 .../components/search/search.component.html   |   2 +-
 .../components/search/search.component.scss   |   2 +-
 .../components/search/search.component.ts     |   3 +-
 .../user-cards/user-card.component.html       |  35 +++-
 .../user-cards/user-card.component.ts         | 154 ++++++++++++++----
 .../approval-pending.component.html           |  41 ++---
 .../approval-pending.component.ts             |  89 +++++++---
 7 files changed, 241 insertions(+), 85 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.html b/project/ws/app/src/lib/routes/home/components/search/search.component.html
index f2a68222e..ba72dd2d9 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.html
@@ -25,7 +25,7 @@
         <button mat-button type="button" class="search-btn" (click)="approveAll()"
             [disabled]="disableApproveALL">Approve all requests</button>
     </div>
-    <div class="flex flex-end" *ngIf="isApprovals">
+    <div class="flex flex-end" *ngIf="isApprovals && showBulkUpdate">
         <button mat-button type="button" class="search-btn" [routerLink]="['/app/home/approvals/bulkupdate']"
             [ngClass]="{'disable': isContentLive}">Bulk profile update</button>
     </div>
diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.scss b/project/ws/app/src/lib/routes/home/components/search/search.component.scss
index 526013db6..825554ecf 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.scss
@@ -6,7 +6,7 @@
 
     .search-icon {
         position: absolute;
-        top: 16px;
+        top: 15px;
         font-size: 20px;
         left: 10px;
     }
diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.ts b/project/ws/app/src/lib/routes/home/components/search/search.component.ts
index b61456324..37f634940 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.ts
@@ -14,6 +14,7 @@ export class SearchComponent implements OnInit {
   @Input() from: any = ''
   @Input() isApprovals: any
   @Input() showApproveALL: any
+  @Input() showBulkUpdate: any
   @Input() disableApproveALL: any
   @Input() currentFilter: any
   @Output() handleApiData = new EventEmitter()
@@ -104,4 +105,4 @@ export class SearchComponent implements OnInit {
   }
 
   sort() { }
-}
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 5114feb53..5d83efcfa 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -40,7 +40,7 @@
               user?.profileDetails?.professionalDetails[0]?.designation ?
               user?.profileDetails?.professionalDetails[0]?.designation : '-'}}</div>
             <div class="mat-caption ws-mat-black40-text">
-              Marked on: {{user?.profileDetails?.profileStatusUpdatedOn || ' -'}}</div>
+              Marked on: {{user?.profileDetails?.profileStatusUpdatedOn || ' NA'}}</div>
             <!-- <div class="mat-caption ws-mat-black40-text" *ngIf="!user?.profileDetails?.profileStatusUpdatedOn">-</div> -->
           </div>
         </div>
@@ -49,7 +49,7 @@
             *ngIf="currentFilter !== 'notmyuser' && !user?.enableEdit">
             <mat-icon>edit</mat-icon> Edit
           </div>
-          <div class="button margin-top-m mat-body" (click)="confirmReassign(confirm, user);$event.stopPropagation();"
+          <div class="button mat-body" (click)="confirmReassign(confirm, user);$event.stopPropagation();"
             *ngIf="currentFilter === 'notmyuser'">Reassign</div>
         </div>
       </mat-expansion-panel-header>
@@ -565,7 +565,7 @@
         </div>
       </mat-expansion-panel-header>
 
-      <div class="panel-body">
+      <div class="panel-body profile-box">
         <form [formGroup]="approveUserDataForm" class="margin-top-m">
           <!-- <button mat-button class="my-4 mr-4" (click)="addRejection()">add reason</button>
               <button mat-button class="my-4 mr-4" (click)="updateRejection()">update reason</button> -->
@@ -573,6 +573,11 @@
             <div class="margin-bottom-m">
               <span class="font-bold">Primary Details</span> <mat-icon
                 class="ws-mat-black40-text infoicon">info_outline</mat-icon>
+              <p class="float-right mat-body-2" *ngIf="currentFilter === 'transfers'">
+                <mat-slide-toggle #toggleElement (change)="confirmNotMyUser(notmyuserconfirm, appData, $event)"
+                  [checked]="appData.enableToggle">
+                  This is my user</mat-slide-toggle>
+              </p>
             </div>
             <div class="flex flex-row margin-top-m">
               <ng-container *ngFor="let field of appData.needApprovalList">
@@ -747,7 +752,7 @@
           </div>
 
           <div class="flex flex-row margin-top-l">
-            <button mat-raised-button type="submit" (click)="confirmApproval(approvalconfirm, panel)"
+            <button mat-raised-button type="submit" (click)="confirmApproval(approvalconfirm, panel, appData)"
               class="margin-right-m btn-success btn-responsive successbtn"
               [disabled]="appData.needApprovalList.length !== actionList.length">
               <span class="text-white" i18n>
@@ -881,4 +886,26 @@
       </button>
     </div>
   </div>
+</ng-template>
+
+<ng-template #notmyuserconfirm>
+  <div class="confirm-dialog text-center padding-l">
+    <mat-icon class="infoIcon orangeicon-dialog">error_outline</mat-icon>
+    <div mat-dialog-content i18n class="margin-top-xs blue-text">
+      Are you sure you want to cancel this transfer request?
+    </div>
+    <div mat-dialog-actions class="flex-center margin-top-s">
+      <button mat-raised-button type="submit" [mat-dialog-close]="false"
+        class="margin-right-m  btn-success btn-responsive cancelbtn">
+        <span i18n>
+          No
+        </span>
+      </button>
+      <button mat-raised-button type="submit" [mat-dialog-close]="true" class="btn-success btn-responsive successbtn">
+        <span class="text-white" i18n>
+          Yes
+        </span>
+      </button>
+    </div>
+  </div>
 </ng-template>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index a08eb61f7..f982a0a18 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -1,4 +1,7 @@
-import { Component, EventEmitter, Input, OnChanges, OnInit, Output, QueryList, TemplateRef, ViewChild, ViewChildren } from '@angular/core'
+import {
+  Component, ElementRef, EventEmitter, Input, OnChanges, OnInit, Output,
+  QueryList, TemplateRef, ViewChild, ViewChildren,
+} from '@angular/core'
 import { FormGroup, FormControl, Validators } from '@angular/forms'
 import { UsersService } from '../../../users/services/users.service'
 import {
@@ -52,6 +55,9 @@ export class UserCardComponent implements OnInit, OnChanges {
   updaterejectDialog!: TemplateRef<any>
 
   @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator | any
+
+  @ViewChild('toggleElement', { static: true }) ref!: ElementRef
+
   startIndex = 0
   lastIndex = 20
   pageSize = 20
@@ -109,9 +115,10 @@ export class UserCardComponent implements OnInit, OnChanges {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-              private dialog: MatDialog, private approvalSvc: ApprovalsService,
-              private route: ActivatedRoute, private snackBar: MatSnackBar,
-              private events: EventService, private datePipe: DatePipe) {
+    private dialog: MatDialog, private approvalSvc: ApprovalsService,
+    private route: ActivatedRoute, private snackBar: MatSnackBar,
+    private events: EventService,
+    private datePipe: DatePipe) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),
@@ -216,6 +223,9 @@ export class UserCardComponent implements OnInit, OnChanges {
         this.usersSvc.getUserById(id).subscribe((res: any) => {
           if (res) {
             data.user = res
+            if (this.currentFilter === 'transfers') {
+              data.enableToggle = res.profileDetails.profileStatus !== 'NOT-MY-USER' ? true : false
+            }
 
             if (data.user) {
               if (data.needApprovalList && data.needApprovalList.length === 1) {
@@ -696,7 +706,7 @@ export class UserCardComponent implements OnInit, OnChanges {
       duration,
     })
   }
-
+  /* tslint:disable */
   // for approval & rejection
   onClickHandleWorkflow(field: any, action: string) {
     field.action = action
@@ -753,8 +763,24 @@ export class UserCardComponent implements OnInit, OnChanges {
         type: TelemetryEvents.EnumIdtype.APPLICATION,
       }
     )
-  }
 
+    // if (this.currentFilter === 'transfers' && appData !== undefined) {
+    //   appData.needApprovalList.forEach((otherField: any) => {
+    //     if (otherField.label !== field.label) {
+    //       console.log('field', field)
+    //       this.onClickHandleWorkflow(field, action)
+    //     }
+    //   })
+    //   if (field.label === 'Group') {
+    //     const designationValue = action === 'APPROVE' ? 'approvedesg' : 'rejectdesg'
+    //     this.approveUserDataForm.controls.approveDesignation.setValue(designationValue)
+    //   } else {
+    //     const groupValue = action === 'APPROVE' ? 'approvegroup' : 'rejectgroup'
+    //     this.approveUserDataForm.controls.approveGroup.setValue(groupValue)
+    //   }
+    // }
+  }
+  /* tslint:enable */
   // single aprrove or reject
   onApproveOrRejectClick(req: any) {
     this.approvalSvc.handleWorkflow(req).subscribe((res: any) => {
@@ -764,32 +790,82 @@ export class UserCardComponent implements OnInit, OnChanges {
     })
   }
 
-  onApprovalSubmit(panel: any) {
+  onApprovalSubmit(panel: any, appData: any) {
     if (this.actionList.length > 0) {
-      const datalength = this.actionList.length
-      this.actionList.forEach((req: any, index: any) => {
-        if (req.action === 'APPROVE') {
-          req.comment = ''
-        }
-        this.onApproveOrRejectClick(req)
-        if (index === datalength - 1) {
-          panel.close()
-          this.comment = ''
-          setTimeout(() => {
-            this.openSnackbar('Request approved successfully')
-            this.updateList.emit()
-            // tslint:disable-next-line
-          }, 100)
-        }
-        // tslint:disable-next-line
-        // this.approvalData = this.approvalData.filter((wf: any) => { wf.userWorkflow.userInfo.wid !== req.userId })
-        if (this.approvalData.length === 0) {
-          this.disableButton.emit()
-        }
-      })
+      if (this.currentFilter === 'transfers') {
+        this.onTransferSubmit(panel, appData)
+      } else {
+        const datalength = this.actionList.length
+        this.actionList.forEach((req: any, index: any) => {
+          if (req.action === 'APPROVE') {
+            req.comment = ''
+          }
+          this.onApproveOrRejectClick(req)
+          if (index === datalength - 1) {
+            panel.close()
+            this.comment = ''
+            setTimeout(() => {
+              this.openSnackbar('Request approved successfully')
+              this.updateList.emit()
+              // tslint:disable-next-line
+            }, 100)
+          }
+          // tslint:disable-next-line
+          // this.approvalData = this.approvalData.filter((wf: any) => { wf.userWorkflow.userInfo.wid !== req.userId })
+          if (this.approvalData.length === 0) {
+            this.disableButton.emit()
+          }
+        })
+      }
     }
   }
 
+  onTransferSubmit(panel: any, appData: any) {
+    let orgReq = {}
+    appData.userWorkflow.wfInfo.forEach((wf: any) => {
+      const fields = JSON.parse(wf.updateFieldValues)
+      if (fields.length > 0) {
+        fields.forEach((field: any) => {
+          const labelKey = Object.keys(field.toValue)[0]
+          if (labelKey === 'name') {
+            orgReq = {
+              action: 'APPROVE',
+              actorUserId: wf.actorUUID,
+              applicationId: wf.applicationId,
+              serviceName: wf.serviceName,
+              state: 'SEND_FOR_APPROVAL',
+              updateFieldValues: fields,
+              userId: wf.userId,
+              wfId: wf.wfId,
+            }
+          }
+        })
+      }
+    })
+
+    this.actionList.push(orgReq)
+    const datalength = this.actionList.length
+    this.actionList.forEach((req: any, index: any) => {
+      if (req.action === 'APPROVE') {
+        req.comment = ''
+      }
+      this.onApproveOrRejectClick(req)
+      if (index === datalength - 1) {
+        panel.close()
+        this.comment = ''
+        setTimeout(() => {
+          this.openSnackbar('Request approved successfully')
+          this.updateList.emit()
+          // tslint:disable-next-line
+        }, 100)
+      }
+      if (this.approvalData.length === 0) {
+        this.disableButton.emit()
+      }
+    })
+
+  }
+
   updateRejection(field: any) {
     this.comment = field.comment
     const dialogRef = this.dialog.open(this.updaterejectDialog, {
@@ -847,6 +923,22 @@ export class UserCardComponent implements OnInit, OnChanges {
     })
   }
 
+  confirmNotMyUser(template: any, data: any, event: any) {
+    data.enableToggle = true
+    const dialog = this.dialog.open(template, {
+      width: '500px',
+    })
+    dialog.afterClosed().subscribe((v: any) => {
+      if (v) {
+        this.markStatus('NOT-MY-USER', data.user)
+        data.enableToggle = false
+      } else {
+        event.source.checked = true
+        data.enableToggle = true
+      }
+    })
+  }
+
   confirmUpdate(template: any, updateUserDataForm: any, user: any, panel: any) {
     const dialog = this.dialog.open(template, {
       width: '500px',
@@ -860,13 +952,13 @@ export class UserCardComponent implements OnInit, OnChanges {
     })
   }
 
-  confirmApproval(template: any, panel: any) {
+  confirmApproval(template: any, panel: any, appData: any) {
     const dialog = this.dialog.open(template, {
       width: '500px',
     })
     dialog.afterClosed().subscribe((v: any) => {
       if (v) {
-        this.onApprovalSubmit(panel)
+        this.onApprovalSubmit(panel, appData)
       } else {
         panel.close()
       }
@@ -879,4 +971,4 @@ export class UserCardComponent implements OnInit, OnChanges {
       f.action = ''
     })
   }
-}
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
index cccd3b455..0f7132f0f 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
@@ -31,43 +31,44 @@
       <div class="flex flex-1 flex-column margin-fix">
         <div class="flex flex-1 filter max-height-60">
           <a routerLink="/app/home/approvals/profileverification" class="filter-option"
-            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'profileverification', 'ws-mat-accent-border font-medium':currentFilter !== 'profileverification'}"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'profileverification', 'ws-mat-accent-border font-medium': currentFilter !== 'profileverification'}"
             mat-button (click)="filter('profileverification'); tabTelemetry('toapprove', 0)" role="button">Profile
-            Verifications ({{approvalTotalCount}})</a>
+            Verifications ({{profileVerificationCount}})</a>
 
-          <!-- <a routerLink="/app/home/approvals/transfers" class="filter-option"
-            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'transfers', 'ws-mat-accent-border font-medium':currentFilter !== 'transfers'}"
+          <a routerLink="/app/home/approvals/transfers" class="filter-option"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'transfers', 'ws-mat-accent-border font-medium': currentFilter !== 'transfers'}"
             mat-button (click)="filter('transfers'); tabTelemetry('transfers', 1)" role="button">Transfers
-            ({{approvalTotalCount}})</a> -->
+            ({{transfersCount}})</a>
         </div>
       </div>
       <ng-container *ngIf="currentFilter === 'profileverification'">
         <div class="searchfilter">
           <ws-app-searchuser (handleApiData)="onSearch($event)" [isApprovals]="true" (handleapproveAll)="onApproveALL()"
-            [showApproveALL]="showApproveALL" [disableApproveALL]="disableApproveALL"></ws-app-searchuser>
+            [showApproveALL]="showApproveALL" [showBulkUpdate]="true"
+            [disableApproveALL]="disableApproveALL"></ws-app-searchuser>
         </div>
-        <ng-container *ngIf="data && data.length > 0">
-          <!-- <ws-widget-org-user-table-v2 [tableData]="tabledata" [data]="data" (eOnRowClick)="onApprovalClick($event)"
-            [totalRecords]="approvalTotalCount" (pageChangeClick)="onPaginateChange($event)">
-          </ws-widget-org-user-table-v2> -->
-          <ws-widget-user-card [currentFilter]="currentFilter" [usersData]="data" [isApprovals]="true"
-            [totalRecords]="approvalTotalCount" [tabChangeIndex]="pageIndex"
+        <ng-container *ngIf="profileVerificationCount > 0">
+          <ws-widget-user-card [currentFilter]="currentFilter" [usersData]="profileVerificationData"
+            [isApprovals]="true" [totalRecords]="profileVerificationCount" [tabChangeIndex]="pageIndex"
             (searchByEnterKey)="onEnterkySearch($event)" (disableButton)="showButton()"
             (paginationData)="onPaginateChange($event)" (updateList)="fetchApprovals()"></ws-widget-user-card>
         </ng-container>
-        <ng-container *ngIf="!data || data.length === 0">
+        <ng-container *ngIf="!profileVerificationData || profileVerificationData.length === 0">
           <p class="margin-top-xl margin-bottom-xl">No approvals</p>
         </ng-container>
       </ng-container>
       <ng-container *ngIf="currentFilter === 'transfers'">
-        <!-- <ws-app-profle-approval-bulk-upload></ws-app-profle-approval-bulk-upload> -->
-        <ng-container *ngIf="data && data.length > 0">
-          <ws-widget-user-card [currentFilter]="currentFilter" [usersData]="data" [isApprovals]="true"
-            [totalRecords]="approvalTotalCount" [tabChangeIndex]="pageIndex"
-            (searchByEnterKey)="onEnterkySearch($event)" (disableButton)="showButton()"
-            (paginationData)="onPaginateChange($event)"></ws-widget-user-card>
+        <div class="searchfilter">
+          <ws-app-searchuser (handleApiData)="onSearch($event)" [isApprovals]="true" (handleapproveAll)="onApproveALL()"
+            [showApproveALL]="false" [showBulkUpdate]="false"></ws-app-searchuser>
+        </div>
+        <ng-container *ngIf="transfersData && transfersData.length > 0">
+          <ws-widget-user-card [currentFilter]="currentFilter" [usersData]="transfersData" [isApprovals]="true"
+            [totalRecords]="transfersCount" [tabChangeIndex]="pageIndex" (searchByEnterKey)="onEnterkySearch($event)"
+            (disableButton)="showButton()" (paginationData)="onPaginateChange($event)"
+            (updateList)="fetchApprovals()"></ws-widget-user-card>
         </ng-container>
-        <ng-container *ngIf="!data || data.length === 0">
+        <ng-container *ngIf="!transfersData || transfersData.length === 0">
           <p class="margin-top-xl margin-bottom-xl">No approvals</p>
         </ng-container>
       </ng-container>
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
index d7f559d9d..6de3c4582 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
@@ -19,12 +19,16 @@ import { ApprovalsService } from '../../../services/approvals.service'
 
 export class ApprovalPendingComponent implements OnInit, OnDestroy {
   data: any = []
+  profileVerificationData: any = []
+  transfersData: any = []
   approvalData: any = []
+  allTransfersData: any = []
+  allprofileVerificationData: any = []
   currentFilter = 'profileverification'
   discussionList!: any
   discussProfileData!: any
   departName = ''
-  approvalTotalCount = 0
+  // approvalTotalCount = 0
   limit = 20
   pageIndex = 0
   currentOffset = 0
@@ -32,6 +36,8 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   reportsNoteList: string[] = []
   showApproveALL = false
   disableApproveALL = false
+  transfersCount = 0
+  profileVerificationCount = 0
 
   constructor(
     private router: Router,
@@ -50,14 +56,15 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit() {
-    this.currentFilter = this.route.snapshot.params['tab'] || 'profileverification'
+    this.currentFilter = this.route.snapshot.routeConfig && this.route.snapshot.routeConfig.path
+      ? this.route.snapshot.routeConfig.path : 'profileverification'
     // this.currentFilter = this.currentFilter === 'upload' ? 'uploadApprovals' : 'pending'
-    if (this.currentFilter === 'profileverification') {
-      this.fetchApprovals()
-    }
-    if (this.currentFilter !== 'profileverification') {
-      this.fetchApprovals()
-    }
+    // if (this.currentFilter === 'profileverification') {
+    this.fetchApprovals()
+    // }
+    // if (this.currentFilter !== 'profileverification') {
+    //   this.fetchApprovals()
+    // }
 
     this.reportsNoteList = [
       // tslint:disable-next-line: max-line-length
@@ -88,12 +95,12 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   filter(key: string | 'timestamp' | 'best' | 'saved') {
     if (key) {
       this.currentFilter = key
-      if (key === 'profileverification') {
-        this.fetchApprovals()
-      }
-      if (key === 'transfers') {
-        this.fetchApprovals()
-      }
+      // if (key === 'profileverification') {
+      this.fetchApprovals()
+      // }
+      // if (key === 'transfers') {
+      //   this.fetchApprovals()
+      // }
     }
   }
 
@@ -136,6 +143,13 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
         offset: this.currentOffset,
         limit: this.limit,
       }
+      this.allTransfersData = []
+      this.transfersData = []
+      this.allprofileVerificationData = []
+      this.profileVerificationData = []
+      this.transfersCount = 0
+      this.profileVerificationCount = 0
+
       this.apprService.getApprovals(req).subscribe(res => {
         this.data = []
         const newarray: any = []
@@ -167,22 +181,38 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
         })
 
         newarray.forEach((appr: any) => {
-          this.data.push({
+          const requestData = {
             fullname: appr.userInfo ? `${appr.userInfo.first_name}` : '--',
             requestedon: currentdate,
             // fields: this.replaceWords(keys, conditions),
             userWorkflow: appr,
             tag: (appr.userInfo && appr.userInfo.tag) ? `${appr.userInfo.tag}` : '',
-          })
-          this.data.sort((a: any, b: any) => {
-            const textA = a.fullname.toUpperCase()
-            const textB = b.fullname.toUpperCase()
-            return (textA < textB) ? -1 : (textA > textB) ? 1 : 0
-          })
+          }
+          /* tslint:disable */
+          if (appr!.wfInfo[0] && appr!.wfInfo[0].orgTansferRequest) {
+            this.transfersData.push(requestData)
+          } else {
+            this.profileVerificationData.push(requestData)
+          }
+        })
+        /* tslint:enable */
+        this.transfersData.sort((a: any, b: any) => {
+          const textA = a.fullname.toUpperCase()
+          const textB = b.fullname.toUpperCase()
+          return (textA < textB) ? -1 : (textA > textB) ? 1 : 0
         })
-        this.approvalTotalCount = this.data.length
-        this.approvalData = this.data
-        if (this.data && this.data.length > 0) {
+        this.profileVerificationData.sort((a: any, b: any) => {
+          const textA = a.fullname.toUpperCase()
+          const textB = b.fullname.toUpperCase()
+          return (textA < textB) ? -1 : (textA > textB) ? 1 : 0
+        })
+        this.transfersCount = this.transfersData.length
+        this.profileVerificationCount = this.profileVerificationData.length
+
+        this.allTransfersData = this.transfersData
+        this.allprofileVerificationData = this.profileVerificationData
+
+        if (this.profileVerificationData && this.profileVerificationData.length > 0) {
           this.showApproveALL = true
           this.disableApproveALL = false
         }
@@ -205,13 +235,18 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   replaceWords(inputString: any, wordConditions: any) {
     return wordConditions.reduce((acc: any, [word, condition]: any) => {
       return acc.replace(new RegExp(word, 'gi'), condition)
-    },                           inputString)
+    }, inputString)
   }
 
   onSearch(enterValue: any) {
     // this.data.filter((user: any) => enterValue.includes(user.userInfo.first_name))
     const filterValue = enterValue.toLowerCase()
-    this.data = this.approvalData.filter((user: any) => user.fullname.toLowerCase().includes(filterValue))
+    if (this.currentFilter === 'profileverification') {
+      this.profileVerificationData = this.allprofileVerificationData.filter((user: any) =>
+        user.fullname.toLowerCase().includes(filterValue))
+    } else {
+      this.transfersData = this.allTransfersData.filter((user: any) => user.fullname.toLowerCase().includes(filterValue))
+    }
   }
 
   onPaginateChange(event: PageEvent) {
@@ -283,4 +318,4 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   showButton() {
     this.disableApproveALL = true
   }
-}
+}
\ No newline at end of file

From 937394d46b38b592f30697b4fa5fe19992a99dd8 Mon Sep 17 00:00:00 2001
From: sohail amjad <sohail.amjad@tarento.com>
Date: Wed, 12 Jun 2024 19:22:11 +0530
Subject: [PATCH 701/887] bug fixes and modifications

---
 .../create-request-form.component.html        |  2 +-
 .../create-request-form.component.scss        |  4 ++
 .../create-request-form.component.ts          |  3 +-
 .../request-list/request-list.component.html  |  9 ++-
 .../request-list/request-list.component.ts    | 25 ++++++-
 .../create-content.component.ts               | 66 ++++++++++++++-----
 6 files changed, 86 insertions(+), 23 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
index 8255e339e..5480cc11e 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
@@ -337,7 +337,7 @@
 
                 <div class="flex flex-start margin-top-l" *ngIf="!isHideData">
                     <button mat-button class="submit-btn margin-right-xs" type="button" (click)="showConformationPopUp()" [disabled]="!requestForm.valid">Submit</button>
-                    <button mat-button class="close-btn " type="button" >Cancel</button>
+                    <button mat-button class="close-btn" (click)="navigateBack()" type="button" >Cancel</button>
                    
                   </div>
 
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.scss b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.scss
index 2fae81151..f86d3ea9e 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.scss
@@ -100,6 +100,10 @@
   ::ng-deep.mat-option.mat-selected:not(.mat-option-disabled) {
     color: rgba(0, 0, 0, 0.87) !important;
   }
+
+  ::ng-deep.mat-form-field-flex {
+    width: 100% !important;
+}
   .mat-button[disabled] {
     opacity: 0.6;
   }
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
index fb5707566..e7317b52c 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
@@ -489,7 +489,7 @@ view(item?: any) {
       data: {
         type: 'conformation',
         icon: 'radio_on',
-        title: 'Are you sure you want to Create a demand?',
+        title:  this.actionBtnName === 'reassign'? 'Are you sure you want to Re-assign?': 'Are you sure you want to Create a demand?',
         // subTitle: 'You wont be able to revert this',
         primaryAction: 'Confirm',
         secondaryAction: 'Cancel',
@@ -565,6 +565,7 @@ this.dialogRefs.afterClosed().subscribe((_res: any) => {
         this.dialogRefs.close()
         if (this.resData) {
           this.router.navigateByUrl('/app/home/request-list')
+          this.snackBar.open('Request submitted successfully ')
       }
       },         1000)
     }
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
index e2b575a2d..c12f9777c 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
@@ -58,7 +58,7 @@ <h2>Content Request</h2>
   
               <ng-container matColumnDef="assignee">
                 <th mat-header-cell *matHeaderCellDef>Assignee </th>
-                <td mat-cell class="title-class" *matCellDef="let element">{{element?.assignedProvider}}</td>
+                <td mat-cell class="title-class" *matCellDef="let element">{{element?.assignedProvider ? element?.assignedProvider : 'Not Assigned' }}</td>
               </ng-container>
   
               <ng-container matColumnDef="requestedOn">
@@ -69,8 +69,11 @@ <h2>Content Request</h2>
               <ng-container matColumnDef="interests">
                 <th mat-header-cell *matHeaderCellDef>Interests</th>
                 <td mat-cell class="title-class" *matCellDef="let element">
-                    <a class="action-btn-view"  *ngIf="element?.interestCount!== 0" 
-                    href="javascript:void(0)">{{element?.interestCount}}</a>
+                    <a class="action-btn-view"   *ngIf="element?.interestCount!== 0" 
+                    href="javascript:void(0)"  >
+                    <span (click)="handleClick(element)">
+                      {{element?.interestCount}}
+                    </span></a>
                     <a class="" *ngIf="element?.interestCount === 0" 
                     href="javascript:void(0)">{{element?.requestType == 'Single' ? 'N/A' : element?.interestCount}}</a>
                 </td>
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
index e9403bcd0..93e8dd823 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
@@ -7,11 +7,13 @@ import { ActivatedRoute, Router } from '@angular/router'
 import { MatDialog, MatSnackBar, MatTableDataSource } from '@angular/material'
 import { ConfirmationBoxComponent } from '../../../training-plan/components/confirmation-box/confirmation.box.component'
 import { AssignListPopupComponent } from './assign-list-popup/assign-list-popup.component'
+import { LoaderService } from 'src/app/services/loader.service'
 export enum statusValue {
   Assigned= 'Assigned',
   Unassigned = 'Unassigned',
   Inprogress = 'InProgress',
-  invalid = 'invalid',
+  invalid = 'Invalid',
+  fullfill='Fulfill'
 }
 @Component({
   selector: 'ws-app-request-list',
@@ -65,7 +67,8 @@ export class RequestListComponent implements OnInit {
               private activeRoute: ActivatedRoute,
               private dialog: MatDialog,
               private router: Router,
-              private snackBar: MatSnackBar
+              private snackBar: MatSnackBar,
+              private loaderService: LoaderService,
   ) { }
   requestList: any[] = [
     `You can request new content by filling out the request form. You will have the option to choose your content provider and
@@ -87,6 +90,17 @@ export class RequestListComponent implements OnInit {
 
   }
 
+  handleClick(element: any): void {
+    if(element.status && element.status.length > 0){
+      if (element.status !== this.statusKey.Inprogress && 
+        element.status !== this.statusKey.invalid && 
+        element.status !== this.statusKey.fullfill) {
+        this.onClickMenu(element, 'assignContent');
+    }
+    }
+   
+}
+
   hasAccess() {
     let flag = false
     if (this.pageConfig && this.pageConfig.data && this.pageConfig.data.actionMenu) {
@@ -204,7 +218,10 @@ export class RequestListComponent implements OnInit {
    }
    this.homeService.markAsInvalid(request).subscribe(res => {
      this.invalidRes = res
-     this.getRequestList()
+     if(res){
+      this.getRequestList()
+     }
+     
      this.snackBar.open('Marked as Invalid')
     }
   )
@@ -235,6 +252,7 @@ export class RequestListComponent implements OnInit {
   }
 
   getRequestList() {
+    this.loaderService.changeLoaderState(true)
     const request = {
         filterCriteriaMap: {},
         requestedFields: [],
@@ -247,6 +265,7 @@ export class RequestListComponent implements OnInit {
     this.homeService.getRequestList(request).subscribe(res => {
       this.requestListData = res.data
       if (this.requestListData) {
+        this.loaderService.changeLoaderState(false)
       this.requestCount = res.totalCount
         this.requestListData.map((data: any) => {
           if (data.createdOn) {
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
index ffd474460..307df3e5b 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
@@ -1,7 +1,9 @@
 import { Component, EventEmitter, OnInit, Output } from '@angular/core'
 import { TrainingPlanDataSharingService } from './../../services/training-plan-data-share.service'
-import { MatDialog, MatSnackBar } from '@angular/material'
-import { AddContentDialogComponent } from '../../components/add-content-dialog/add-content-dialog.component'
+import { MatDialog } from '@angular/material'
+// import { AddContentDialogComponent } from '../../components/add-content-dialog/add-content-dialog.component'
+import { Router } from '@angular/router'
+import { ConfirmationBoxComponent } from '../../components/confirmation-box/confirmation.box.component'
 @Component({
   selector: 'ws-app-create-content',
   templateUrl: './create-content.component.html',
@@ -17,8 +19,13 @@ export class CreateContentComponent implements OnInit {
   selectContentCount = 0
   pageIndex: any
   pageSize: any
-  count = 0
-  constructor(private tpdsSvc: TrainingPlanDataSharingService, public dialog: MatDialog, private snackbar: MatSnackBar) { }
+  count = 0;
+  queryParams:any;
+  dialogRef:any;
+  constructor(private tpdsSvc: TrainingPlanDataSharingService, public dialog: MatDialog,
+    //  private snackbar: MatSnackBar,
+    private router: Router
+  ) { }
 
   ngOnInit() {
     this.categoryData = [
@@ -106,20 +113,49 @@ export class CreateContentComponent implements OnInit {
     this.handleSelectedChips(true)
   }
 
+  // showAddContentDialog() {
+  //   this.queryParams = {
+  //     name: 'trainingPlan',
+  //   }
+  //   this.router.navigate(['/app/home/create-request-form'],{ queryParams: this.queryParams })
+  //   // const dialogRef = this.dialog.open(AddContentDialogComponent, {
+  //   //   maxHeight: 'auto',
+  //   //   height: '60%',
+  //   //   width: '60%',
+  //   // })
+  //   // dialogRef.afterClosed().subscribe((response: any) => {
+  //   //   if (response) {
+  //   //     if (response.data.responseCode === 'OK') {
+  //   //       this.snackbar.open('Request shared successfully')
+  //   //     } else {
+  //   //       this.snackbar.open('Something went wrong please try again later!!')
+  //   //     }
+  //   //   }
+  //   // })
+  // }
+
   showAddContentDialog() {
-    const dialogRef = this.dialog.open(AddContentDialogComponent, {
-      maxHeight: 'auto',
-      height: '60%',
-      width: '60%',
+    /* tslint:disable */
+    this.dialogRef = this.dialog.open(ConfirmationBoxComponent, {
+      disableClose: true,
+      data: {
+        type: 'conformation',
+        icon: 'radio_on',
+        title: 'You have unsaved progress on your CBP plan. Clicking "Yes" will discard it and take you to request new content screen. Would you like to continue?',
+        subTitle: '',
+        primaryAction: 'Yes',
+        secondaryAction: 'No',
+      },
+      autoFocus: false,
     })
-    dialogRef.afterClosed().subscribe((response: any) => {
-      if (response) {
-        if (response.data.responseCode === 'OK') {
-          this.snackbar.open('Request shared successfully')
-        } else {
-          this.snackbar.open('Something went wrong please try again later!!')
-        }
+   /* tslint:enable */
+    this.dialogRef.afterClosed().subscribe((_res: any) => {
+      if (_res === 'confirmed') {
+        this.router.navigate(['/app/home/create-request-form'])
       }
     })
   }
+
+
+  
 }

From 382823270e0fbc3ec33497310c25944256e67b52 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Wed, 12 Jun 2024 23:05:09 +0530
Subject: [PATCH 702/887] Updated reject transfer req flow

---
 .../user-cards/user-card.component.html       |  7 +++---
 .../user-cards/user-card.component.ts         | 24 ++++++++++++++++++-
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 5d83efcfa..1b29b1de8 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -136,11 +136,11 @@
                     #primaryEmail formControlName="primaryEmail" i18n-aria-label
                     aria-label="Primary Email readonly input" maxlength="320">
                   <mat-error [hidden]="false" i18n="Primary Email Error|Explains name is required"
-                    *ngIf="updateUserDataForm?.controls['mobile'].errors?.required">
+                    *ngIf="updateUserDataForm?.controls['primaryEmail'].errors?.required">
                     Email is mandatory
                   </mat-error>
                   <mat-error [hidden]="false" class="custom-error"
-                    *ngIf="updateUserDataForm?.controls['mobile'].errors?.pattern" i18n-aria-label
+                    *ngIf="updateUserDataForm?.controls['primaryEmail'].errors?.pattern" i18n-aria-label
                     aria-label="Please enter a valid email">
                     Please enter a valid email
                   </mat-error>
@@ -575,8 +575,7 @@
                 class="ws-mat-black40-text infoicon">info_outline</mat-icon>
               <p class="float-right mat-body-2" *ngIf="currentFilter === 'transfers'">
                 <mat-slide-toggle #toggleElement (change)="confirmNotMyUser(notmyuserconfirm, appData, $event)"
-                  [checked]="appData.enableToggle">
-                  This is my user</mat-slide-toggle>
+                  [checked]="appData.enableToggle">Approve transfer</mat-slide-toggle>
               </p>
             </div>
             <div class="flex flex-row margin-top-m">
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index f982a0a18..37bfde7e3 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -930,7 +930,29 @@ export class UserCardComponent implements OnInit, OnChanges {
     })
     dialog.afterClosed().subscribe((v: any) => {
       if (v) {
-        this.markStatus('NOT-MY-USER', data.user)
+        let orgReq = {}
+        data.userWorkflow.wfInfo.forEach((wf: any) => {
+          const fields = JSON.parse(wf.updateFieldValues)
+          if (fields.length > 0) {
+            fields.forEach((field: any) => {
+              const labelKey = Object.keys(field.toValue)[0]
+              if (labelKey === 'name') {
+                orgReq = {
+                  action: 'REJECT',
+                  actorUserId: wf.actorUUID,
+                  applicationId: wf.applicationId,
+                  serviceName: wf.serviceName,
+                  state: 'SEND_FOR_APPROVAL',
+                  updateFieldValues: fields,
+                  userId: wf.userId,
+                  wfId: wf.wfId,
+                }
+              }
+            })
+          }
+        })
+        this.onApproveOrRejectClick(orgReq)
+        // this.markStatus('NOT-MY-USER', data.user)
         data.enableToggle = false
       } else {
         event.source.checked = true

From e6218a7aa44f2b33f39aed8bd580aa91a8c5d233 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Wed, 12 Jun 2024 23:14:34 +0530
Subject: [PATCH 703/887] Lint fix

---
 .../routes/home/components/search/search.component.ts  |  2 +-
 .../home/components/user-cards/user-card.component.ts  | 10 +++++-----
 .../approval-pending/approval-pending.component.ts     |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.ts b/project/ws/app/src/lib/routes/home/components/search/search.component.ts
index 37f634940..24cf8f6df 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.ts
@@ -105,4 +105,4 @@ export class SearchComponent implements OnInit {
   }
 
   sort() { }
-}
\ No newline at end of file
+}
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 37bfde7e3..55303dcfb 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -115,10 +115,10 @@ export class UserCardComponent implements OnInit, OnChanges {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-    private dialog: MatDialog, private approvalSvc: ApprovalsService,
-    private route: ActivatedRoute, private snackBar: MatSnackBar,
-    private events: EventService,
-    private datePipe: DatePipe) {
+              private dialog: MatDialog, private approvalSvc: ApprovalsService,
+              private route: ActivatedRoute, private snackBar: MatSnackBar,
+              private events: EventService,
+              private datePipe: DatePipe) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),
@@ -993,4 +993,4 @@ export class UserCardComponent implements OnInit, OnChanges {
       f.action = ''
     })
   }
-}
\ No newline at end of file
+}
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
index 6de3c4582..332bd3e40 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
@@ -235,7 +235,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   replaceWords(inputString: any, wordConditions: any) {
     return wordConditions.reduce((acc: any, [word, condition]: any) => {
       return acc.replace(new RegExp(word, 'gi'), condition)
-    }, inputString)
+    },                           inputString)
   }
 
   onSearch(enterValue: any) {

From ea3bcc542d272e235fc437c0c0ca8f59939a5a37 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Thu, 13 Jun 2024 12:21:13 +0530
Subject: [PATCH 704/887] wip users sort and filter

---
 .../components/filter/filter.component.html   |  90 +++++-
 .../components/filter/filter.component.scss   |  16 +
 .../components/filter/filter.component.ts     | 295 +++++++++++++++---
 .../components/search/search.component.html   |  22 +-
 .../components/search/search.component.ts     |  37 ++-
 .../approval-pending.component.ts             |   8 +-
 .../routes/users-view/users-view.component.ts |  27 +-
 7 files changed, 420 insertions(+), 75 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/filter/filter.component.html b/project/ws/app/src/lib/routes/home/components/filter/filter.component.html
index c2c83a336..95c570c25 100644
--- a/project/ws/app/src/lib/routes/home/components/filter/filter.component.html
+++ b/project/ws/app/src/lib/routes/home/components/filter/filter.component.html
@@ -3,7 +3,8 @@
         <div class="filter-header flex flex-1">
             <div class="flex flex-2 flex-row">
                 <div class="label">Filters</div>
-                <div class="cross-filter cursor-pointer" (click)="hideFilter()"><img src="assets/icons/close.svg"></div>
+                <div class="cross-filter cursor-pointer" (click)="hideFilter('close')"><img
+                        src="assets/icons/close.svg"></div>
             </div>
         </div>
         <div class="filter-content-container">
@@ -15,9 +16,20 @@
                                 Groups
                             </mat-panel-title>
                         </mat-expansion-panel-header>
-                        <div class="flex flex-1 flex-row category-item" *ngFor="let group of groupList">
-                            <mat-checkbox #checkboxes disableRipple class="example-margin" [checked]="group?.selected"
-                                (change)="manageSelectedGroup($event, group)">{{group?.name | titlecase}}</mat-checkbox>
+                        <div>
+                            <div class="filterSearch flex w-full">
+                                <mat-icon
+                                    class="color-60 filterSearch-icon mat-icon notranslate material-icons mat-icon-no-color">search</mat-icon>
+                                <input class="sinput filterSinput color-60 w-full" [(ngModel)]="groupSearchKey"
+                                    (ngModelChange)="searchGroup($event)" label="" placeholder="Enter group"
+                                    type="Standard">
+                            </div>
+                            <div class="flex flex-1 flex-row category-item" *ngFor="let group of filteredGroupList">
+                                <mat-checkbox #checkboxes disableRipple class="example-margin"
+                                    [checked]="group?.selected"
+                                    (change)="manageSelectedGroup($event, group)">{{group?.name |
+                                    titlecase}}</mat-checkbox>
+                            </div>
                         </div>
                     </mat-expansion-panel>
                 </mat-accordion>
@@ -30,10 +42,72 @@
                                 Designation
                             </mat-panel-title>
                         </mat-expansion-panel-header>
-                        <div class="flex flex-1 flex-row category-item" *ngFor="let des of designationList">
-                            <mat-checkbox #checkboxes disableRipple class="example-margin" [checked]="des?.selected"
-                                (change)="manageSelectedDesignation($event, des)">{{des?.name |
-                                titlecase}}</mat-checkbox>
+                        <div>
+                            <div class="filterSearch flex w-full">
+                                <mat-icon
+                                    class="color-60 filterSearch-icon mat-icon notranslate material-icons mat-icon-no-color">search</mat-icon>
+                                <input class="sinput filterSinput color-60 w-full" [(ngModel)]="designationSearchKey"
+                                    (ngModelChange)="searchDesignation($event)" label="" placeholder="Enter designation"
+                                    type="Standard">
+                            </div>
+                            <div class="flex flex-1 flex-row category-item" *ngFor="let des of filteredDesignationList">
+                                <mat-checkbox #checkboxes disableRipple class="example-margin" [checked]="des?.selected"
+                                    (change)="manageSelectedDesignation($event, des)">{{des?.name |
+                                    titlecase}}</mat-checkbox>
+                            </div>
+                        </div>
+                    </mat-expansion-panel>
+                </mat-accordion>
+            </div>
+            <!-- roles -->
+            <div class="filter-content flex flex-1">
+                <mat-accordion>
+                    <mat-expansion-panel disableRipple [expanded]="true">
+                        <mat-expansion-panel-header>
+                            <mat-panel-title>
+                                Roles
+                            </mat-panel-title>
+                        </mat-expansion-panel-header>
+                        <div>
+                            <div class="filterSearch flex w-full">
+                                <mat-icon
+                                    class="color-60 filterSearch-icon mat-icon notranslate material-icons mat-icon-no-color">search</mat-icon>
+                                <input class="sinput filterSinput color-60 w-full" [(ngModel)]="rolesSearchKey"
+                                    (ngModelChange)="searchRoles($event)" label="" placeholder="Enter roles"
+                                    type="Standard">
+                            </div>
+                            <div class="flex flex-1 flex-row category-item" *ngFor="let role of filteredRolesList">
+                                <mat-checkbox #checkboxes disableRipple class="example-margin"
+                                    [checked]="role?.selected" (change)="manageSelectedRoles($event, role)">{{role?.name
+                                    |
+                                    titlecase}}</mat-checkbox>
+                            </div>
+                        </div>
+                    </mat-expansion-panel>
+                </mat-accordion>
+            </div>
+            <!-- tage -->
+            <div class="filter-content flex flex-1">
+                <mat-accordion>
+                    <mat-expansion-panel disableRipple [expanded]="true">
+                        <mat-expansion-panel-header>
+                            <mat-panel-title>
+                                Tags
+                            </mat-panel-title>
+                        </mat-expansion-panel-header>
+                        <div>
+                            <div class="filterSearch flex w-full">
+                                <mat-icon
+                                    class="color-60 filterSearch-icon mat-icon notranslate material-icons mat-icon-no-color">search</mat-icon>
+                                <input class="sinput filterSinput color-60 w-full" [(ngModel)]="tagsSearchKey"
+                                    (ngModelChange)="searchTags($event)" label="" placeholder="Enter tags"
+                                    type="Standard">
+                            </div>
+                            <div class="flex flex-1 flex-row category-item" *ngFor="let tag of filteredTagsList">
+                                <mat-checkbox #checkboxes disableRipple class="example-margin" [checked]="tag?.selected"
+                                    (change)="manageSelectedTags($event, tag)">{{tag?.name |
+                                    titlecase}}</mat-checkbox>
+                            </div>
                         </div>
                     </mat-expansion-panel>
                 </mat-accordion>
diff --git a/project/ws/app/src/lib/routes/home/components/filter/filter.component.scss b/project/ws/app/src/lib/routes/home/components/filter/filter.component.scss
index d73edeced..8202b5ea4 100644
--- a/project/ws/app/src/lib/routes/home/components/filter/filter.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/filter/filter.component.scss
@@ -155,6 +155,22 @@
     overflow-y: auto;
 }
 
+.filterSearch {
+    position: relative;
+
+    .filterSearch-icon {
+        position: absolute;
+        top: 11px;
+        font-size: 25px;
+        left: 10px;
+    }
+
+    .filterSinput {
+        width: 100% !important;
+        padding-left: 45px !important;
+    }
+}
+
 ::-webkit-scrollbar {
     width: 4px;
 }
diff --git a/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
index e8c294af0..92ec24f23 100644
--- a/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
@@ -19,28 +19,31 @@ export class FilterComponent implements OnInit, AfterContentChecked {
   designationList: any = []
   providersList: any[] = []
   selectedProviders: any[] = []
-  competencyTypeList = [
-    { id: 'Behavioural', name: 'Behavioural' },
-    { id: 'Functional', name: 'Functional' },
-    { id: 'Domain', name: 'Domain' },
-  ]
-  groupList: any = [
-    { id: 'groupA', name: 'Group A' },
-    { id: 'groupB', name: 'Group B' },
-    { id: 'groupC', name: 'Group C' },
-    { id: 'groupD', name: 'Group D' },
-    { id: 'contractualStaff', name: 'Contractual Staff' },
-    { id: 'others', name: 'Others' },
-  ]
+  groupList: any = []
+  rolesList: any = []
+  tagsList: any = []
   competencyList: any = []
   competencyThemeList: any[] = []
   competencySubThemeList: any[] = []
   filterObj: any = { competencyArea: [], competencyTheme: [], competencySubTheme: [], providers: [] }
-  assigneeFilterObj: any = { group: [], designation: [] }
+  assigneeFilterObj: any = {
+    group: [],
+    designation: [],
+    roles: [],
+    tags: [],
+  }
   searchThemeControl = new FormControl()
   searchSubThemeControl = new FormControl()
   searchProviderControl = new FormControl()
   @ViewChildren('checkboxes') checkboxes!: QueryList<ElementRef>
+  groupSearchKey = ''
+  designationSearchKey = ''
+  rolesSearchKey = ''
+  tagsSearchKey = ''
+  filteredGroupList: any = []
+  filteredDesignationList: any = []
+  filteredRolesList: any = []
+  filteredTagsList: any = []
   constructor(
     private cdref: ChangeDetectorRef,
     private trainingPlanService: TrainingPlanService,
@@ -62,13 +65,25 @@ export class FilterComponent implements OnInit, AfterContentChecked {
           if (!this.designationList.length) {
             this.getDesignation()
           } else {
-            this.designationList.map((pitem: any) => {
-              if (pitem && this.assigneeFilterObj['designation'] && this.assigneeFilterObj['designation'].indexOf(pitem.name) > -1) {
-                pitem['selected'] = true
-              } else {
-                pitem['selected'] = false
-              }
-            })
+            this.getFilteredDesignationList()
+          }
+
+          if (!this.groupList.length) {
+            this.loadGroups()
+          } else {
+            this.getFilteredGroupList()
+          }
+
+          if (!this.rolesList.length) {
+            this.loadRoles()
+          } else {
+            this.getFilteredRolesList()
+          }
+
+          if (!this.tagsList.length) {
+            this.loadTags()
+          } else {
+            this.getFilteredTagsList()
           }
         }
       }
@@ -84,6 +99,106 @@ export class FilterComponent implements OnInit, AfterContentChecked {
     this.resetFilter()
   }
 
+  searchGroup(searchKey: string) {
+    this.groupSearchKey = searchKey.toUpperCase()
+    this.getFilteredGroupList()
+  }
+
+  searchDesignation(searchKey: string) {
+    this.designationSearchKey = searchKey.toUpperCase()
+    this.getFilteredDesignationList()
+  }
+
+  searchRoles(searchKey: string) {
+    this.rolesSearchKey = searchKey.toUpperCase()
+    this.getFilteredRolesList()
+  }
+
+  searchTags(searchKey: string) {
+    this.tagsSearchKey = searchKey.toUpperCase()
+    this.getFilteredTagsList()
+  }
+
+  getFilteredGroupList() {
+    if (this.groupList.length) {
+      const searchKey = this.groupSearchKey ? this.groupSearchKey : ''
+      this.filteredGroupList = []
+      this.groupList.forEach((groupName: any) => {
+        if (groupName.toUpperCase().includes(searchKey)) {
+          const formatedGroup: any = {
+            name: groupName
+          }
+          if (this.assigneeFilterObj['group'] && this.assigneeFilterObj['group'].indexOf(groupName) > -1) {
+            formatedGroup['selected'] = true
+          } else {
+            formatedGroup['selected'] = false
+          }
+          this.filteredGroupList.push(formatedGroup)
+        }
+      })
+    }
+  }
+
+  getFilteredDesignationList() {
+    if (this.designationList.length) {
+      const searchKey = this.designationSearchKey ? this.designationSearchKey : ''
+      this.filteredDesignationList = []
+      this.designationList.forEach((designation: any) => {
+        if (designation.name.toUpperCase().includes(searchKey)) {
+          const formatedDesignation: any = {
+            name: designation.name
+          }
+          if (this.assigneeFilterObj['designation'] && this.assigneeFilterObj['designation'].indexOf(designation.name) > -1) {
+            formatedDesignation['selected'] = true
+          } else {
+            formatedDesignation['selected'] = false
+          }
+          this.filteredDesignationList.push(formatedDesignation)
+        }
+      })
+    }
+  }
+
+  getFilteredRolesList() {
+    if (this.rolesList.length) {
+      const searchKey = this.rolesSearchKey ? this.rolesSearchKey : ''
+      this.filteredRolesList = []
+      this.rolesList.forEach((rolesName: any) => {
+        if (rolesName.toUpperCase().includes(searchKey)) {
+          const formatedRoles: any = {
+            name: rolesName
+          }
+          if (this.assigneeFilterObj['roles'] && this.assigneeFilterObj['roles'].indexOf(rolesName) > -1) {
+            formatedRoles['selected'] = true
+          } else {
+            formatedRoles['selected'] = false
+          }
+          this.filteredRolesList.push(formatedRoles)
+        }
+      })
+    }
+  }
+
+  getFilteredTagsList() {
+    if (this.tagsList.length) {
+      const searchKey = this.tagsSearchKey ? this.tagsSearchKey : ''
+      this.filteredTagsList = []
+      this.tagsList.forEach((tagsName: any) => {
+        if (tagsName.toUpperCase().includes(searchKey)) {
+          const formatedTags: any = {
+            name: tagsName
+          }
+          if (this.assigneeFilterObj['tags'] && this.assigneeFilterObj['tags'].indexOf(tagsName) > -1) {
+            formatedTags['selected'] = true
+          } else {
+            formatedTags['selected'] = false
+          }
+          this.filteredTagsList.push(formatedTags)
+        }
+      })
+    }
+  }
+
   ngAfterContentChecked() {
     this.cdref.detectChanges()
   }
@@ -116,8 +231,12 @@ export class FilterComponent implements OnInit, AfterContentChecked {
   //   })
   // }
 
-  hideFilter() {
-    // this.toggleFilter.emit(false)
+  hideFilter(filter: string) {
+    const event = {
+      filter: filter,
+      filtersList: this.assigneeFilterObj
+    }
+    this.toggleFilter.emit(event)
     this.usersSvc.filterToggle.next({ from: '', status: false })
   }
 
@@ -282,7 +401,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
       this.usersSvc.getFilterDataObject.next(this.assigneeFilterObj)
       // this.getFilterData.emit(this.assigneeFilterObj)
     }
-    this.usersSvc.filterToggle.next({ from: '', status: false })
+    this.hideFilter('applyFilter')
   }
 
   clearFilter() {
@@ -296,7 +415,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
       this.searchProviderControl.reset()
       this.resetFilter()
     } else {
-      this.assigneeFilterObj = { group: [], designation: [] }
+      this.assigneeFilterObj = { group: [], designation: [], roles: [], tags: [] }
       this.resetAssigneeFilter()
     }
 
@@ -323,10 +442,37 @@ export class FilterComponent implements OnInit, AfterContentChecked {
     }
   }
 
+  loadGroups() {
+    this.groupList = []
+    this.filteredGroupList = []
+    this.usersSvc.getGroups().subscribe(
+      (data: any) => {
+        const res = data.result.response
+        this.groupList = res
+        this.getFilteredGroupList()
+
+        // this.loadRoles() // need to remove after appis
+        // this.loadTags() // need to remove after appis
+      },
+      (_err: any) => {
+      })
+  }
+
+  loadRoles() {
+    this.rolesList = this.groupList
+    this.getFilteredRolesList()
+  }
+
+  loadTags() {
+    this.tagsList = this.groupList
+    this.getFilteredTagsList()
+  }
+
   getDesignation() {
     this.trainingPlanService.getDesignations().subscribe((res: any) => {
       if (res && res.result && res.result.response) {
         this.designationList = res.result.response.content
+        this.getFilteredDesignationList()
       }
 
     })
@@ -334,9 +480,9 @@ export class FilterComponent implements OnInit, AfterContentChecked {
 
   manageSelectedGroup(event: any, group: any) {
     if (event.checked) {
-      this.groupList.map((grp: any, index: any) => {
+      this.filteredGroupList.map((grp: any, index: any) => {
         if (grp && grp.name === group.name) {
-          this.groupList[index]['selected'] = true
+          this.filteredGroupList[index]['selected'] = true
         }
       })
       if (group) {
@@ -349,9 +495,9 @@ export class FilterComponent implements OnInit, AfterContentChecked {
         const index = this.assigneeFilterObj['group'].findIndex((x: any) => x === group.name)
         this.assigneeFilterObj['group'].splice(index, 1)
       }
-      this.groupList.map((grp: any, index: any) => {
+      this.filteredGroupList.map((grp: any, index: any) => {
         if (grp && grp.name === group.name) {
-          this.groupList[index]['selected'] = false
+          this.filteredGroupList[index]['selected'] = false
         }
       })
       if (group) {
@@ -362,7 +508,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
 
   manageSelectedDesignation(event: any, designation: any) {
     if (event.checked) {
-      this.designationList.map((ditem: any) => {
+      this.filteredDesignationList.map((ditem: any) => {
         if (ditem && ditem['name'] === designation.name) {
           ditem['selected'] = true
         }
@@ -370,7 +516,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
 
       this.assigneeFilterObj['designation'].push(designation.name)
     } else {
-      this.designationList.map((ditem: any) => {
+      this.filteredDesignationList.map((ditem: any) => {
         if (ditem && ditem['name'] === designation.name) {
           ditem['selected'] = false
         }
@@ -383,14 +529,51 @@ export class FilterComponent implements OnInit, AfterContentChecked {
     }
   }
 
-  resetFilter() {
-    if (this.competencyTypeList) {
-      this.competencyTypeList.map((citem: any) => {
-        if (citem && citem['selected']) {
-          citem['selected'] = false
+  manageSelectedTags(event: any, tags: any) {
+    if (event.checked) {
+      this.filteredTagsList.map((grp: any, index: any) => {
+        if (grp && grp.name === tags.name) {
+          this.filteredTagsList[index]['selected'] = true
+        }
+      })
+      this.assigneeFilterObj['tags'].push(tags.name)
+    } else {
+      if (this.assigneeFilterObj['tags'] &&
+        this.assigneeFilterObj['tags'].indexOf(tags.name) > -1) {
+        const index = this.assigneeFilterObj['tags'].findIndex((x: any) => x === tags.name)
+        this.assigneeFilterObj['tags'].splice(index, 1)
+      }
+      this.filteredTagsList.map((grp: any, index: any) => {
+        if (grp && grp.name === tags.name) {
+          this.filteredTagsList[index]['selected'] = false
+        }
+      })
+    }
+  }
+
+  manageSelectedRoles(event: any, role: any) {
+    if (event.checked) {
+      this.filteredRolesList.map((grp: any, index: any) => {
+        if (grp && grp.name === role.name) {
+          this.filteredRolesList[index]['selected'] = true
+        }
+      })
+      this.assigneeFilterObj['roles'].push(role.name)
+    } else {
+      if (this.assigneeFilterObj['roles'] &&
+        this.assigneeFilterObj['roles'].indexOf(role.name) > -1) {
+        const index = this.assigneeFilterObj['roles'].findIndex((x: any) => x === role.name)
+        this.assigneeFilterObj['roles'].splice(index, 1)
+      }
+      this.filteredRolesList.map((grp: any, index: any) => {
+        if (grp && grp.name === role.name) {
+          this.filteredRolesList[index]['selected'] = false
         }
       })
     }
+  }
+
+  resetFilter() {
     if (this.competencyThemeList) {
       this.competencyThemeList.map((titem: any) => {
         if (titem && titem['selected']) {
@@ -417,19 +600,35 @@ export class FilterComponent implements OnInit, AfterContentChecked {
 
   resetAssigneeFilter() {
     if (this.groupList) {
-      this.groupList.map((pitem: any) => {
-        if (pitem && pitem['selected']) {
-          pitem['selected'] = false
-        }
-      })
+      this.assigneeFilterObj['group'] = []
+      this.groupSearchKey = ''
+      // this.getFilteredGroupList()
+      // this.groupList.map((pitem: any) => {
+      //   if (pitem && pitem['selected']) {
+      //     pitem['selected'] = false
+      //   }
+      // })
     }
 
-    if (this.designationList) {
-      this.designationList.map((pitem: any) => {
-        if (pitem && pitem['selected']) {
-          pitem['selected'] = false
-        }
-      })
-    }
+
+
+    // if (this.designationList) {
+    //   this.designationList.map((pitem: any) => {
+    //     if (pitem && pitem['selected']) {
+    //       pitem['selected'] = false
+    //     }
+    //   })
+    // }
+
+    this.assigneeFilterObj['designation'] = []
+    this.designationSearchKey = ''
+
+    this.assigneeFilterObj['roles'] = []
+    this.rolesSearchKey = ''
+
+    this.assigneeFilterObj['tags'] = []
+    this.tagsSearchKey = ''
+
+    this.hideFilter('clearFilter')
   }
 }
diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.html b/project/ws/app/src/lib/routes/home/components/search/search.component.html
index f2a68222e..1913e51b3 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.html
@@ -7,16 +7,30 @@
                 placeholder="Search" type="Standard" [ngClass]="{'disable': isContentLive}">
         </div>
     </div>
-    <!-- <div class="filter-section flex">
-        <button mat-button type="button" (click)="sort()" class="apply-filter margin-right-s">
+    <div class="filter-section flex">
+        <button mat-button type="button" (click)="sort()" class="apply-filter margin-right-s"
+            [matMenuTriggerFor]="cardMenu">
             <mat-icon class="margin-right-xs">sort</mat-icon> Sort
         </button>
+        <mat-menu #cardMenu="matMenu">
+            <ng-template matMenuContent>
+                <div mat-menu-item class="flex items-center" (click)="sortData('alphabetical')">
+                    <span>Alphabetical</span>
+                </div>
+                <div mat-menu-item class="flex items-center" (click)="sortData('newest')">
+                    <span>Newest</span>
+                </div>
+                <div mat-menu-item class="flex items-center" (click)="sortData('oldest')">
+                    <span>Oldest</span>
+                </div>
+            </ng-template>
+        </mat-menu>
     </div>
     <div class="filter-section flex">
         <button mat-button type="button" (click)="openFilter()" class="apply-filter margin-right-s">
             Apply Filter <mat-icon class="margin-right-xs">filter_list</mat-icon>
         </button>
-    </div> -->
+    </div>
     <div class="flex flex-end" *ngIf="!isApprovals && currentFilter === 'allusers'">
         <button mat-button type="button" class="search-btn" [routerLink]="['/app/home/user-creation']"
             [ngClass]="{'disable': isContentLive}">Create user</button>
@@ -32,5 +46,5 @@
 </div>
 
 <div [hidden]="!filterVisibilityFlag">
-    <ws-app-filter [from]="from"></ws-app-filter>
+    <ws-app-filter [from]="from" (toggleFilter)="hideFilter($event)"></ws-app-filter>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.ts b/project/ws/app/src/lib/routes/home/components/search/search.component.ts
index b61456324..e4cf2cda0 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.ts
@@ -25,6 +25,8 @@ export class SearchComponent implements OnInit {
   pageIndex = 0
   pageSize = 20
   isContentLive = false
+  filtersList: any
+  sortOrder: string = ''
   constructor(
     // private route: ActivatedRoute,
     private usersSvc: UsersService,
@@ -52,7 +54,18 @@ export class SearchComponent implements OnInit {
   }
 
   hideFilter(event: any) {
-    this.filterVisibilityFlag = event
+    switch (event.filter) {
+      case 'applyFilter':
+        this.applyFilters(event)
+        break
+      case 'clearFilter':
+        this.applyFilters(event)
+        break
+      case 'closeFilter':
+        break
+    }
+
+    this.filterVisibilityFlag = false
     this.usersSvc.filterToggle.next({ from: '', status: false })
     // if (this.document.getElementById('top-nav-bar')) {
     //   const ele: any = this.document.getElementById('top-nav-bar')
@@ -91,7 +104,27 @@ export class SearchComponent implements OnInit {
 
   searchData(event: any) {
     this.searchText = event.target.value
-    this.handleApiData.emit(this.searchText)
+    this.emitSearchRequest()
+
+  }
+
+  sortData(sortOrder: string) {
+    this.sortOrder = sortOrder
+    this.emitSearchRequest()
+  }
+
+  emitSearchRequest() {
+    const filterKeys = {
+      searchText: this.searchText,
+      filters: this.filtersList,
+      sortOrder: this.sortOrder
+    }
+    this.handleApiData.emit(filterKeys)
+  }
+
+  applyFilters(event: any) {
+    this.filtersList = event.filtersList
+    this.emitSearchRequest()
   }
 
   resetPageIndex() {
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
index 461973146..9baf29bc9 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
@@ -188,7 +188,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
             userWorkflow: appr,
             tag: (appr.userInfo && appr.userInfo.tag) ? `${appr.userInfo.tag}` : '',
           }
-         /* tslint:disable */
+          /* tslint:disable */
           if (appr!.wfInfo[0] && appr!.wfInfo[0].orgTansferRequest) {
             this.transfersData.push(requestData)
           } else {
@@ -213,7 +213,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
         this.allprofileVerificationData = this.profileVerificationData
 
         if ((this.transfersData && this.transfersData.length > 0) ||
-        (this.profileVerificationData && this.profileVerificationData.length > 0)) {
+          (this.profileVerificationData && this.profileVerificationData.length > 0)) {
           this.showApproveALL = true
           this.disableApproveALL = false
         }
@@ -236,12 +236,12 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   replaceWords(inputString: any, wordConditions: any) {
     return wordConditions.reduce((acc: any, [word, condition]: any) => {
       return acc.replace(new RegExp(word, 'gi'), condition)
-    },                           inputString)
+    }, inputString)
   }
 
   onSearch(enterValue: any) {
     // this.data.filter((user: any) => enterValue.includes(user.userInfo.first_name))
-    const filterValue = enterValue.toLowerCase()
+    const filterValue = enterValue.searchText.toLowerCase() ? enterValue.searchText : ''
     if (this.currentFilter === 'profileverification') {
       this.profileVerificationData = this.allprofileVerificationData.filter((user: any) =>
         user.fullname.toLowerCase().includes(filterValue))
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index c61e03726..f368fd4e6 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -147,7 +147,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     )
   }
 
-  filterData(query: string) {
+  filterData(query: any) {
     // this.getUsers(query, this.currentFilter)
     if (this.currentFilter === 'allusers') {
       this.getAllUsers(query)
@@ -191,7 +191,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   //   return blockedUsersData
   // }
 
-  async getAllUsers(query: string) {
+  async getAllUsers(query: any) {
     this.loaderService.changeLoad.next(true)
     // const usersData: any[] = []
     const filtreq = {
@@ -199,7 +199,9 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       status: 1,
     }
 
-    this.usersService.getAllKongUsers(filtreq, this.limit, this.pageIndex, query).subscribe((data: any) => {
+    const serchKey = query.searchText ? query.searchText : ''
+
+    this.usersService.getAllKongUsers(filtreq, this.limit, this.pageIndex, serchKey).subscribe((data: any) => {
       const allusersData = data.result.response
       this.activeUsersData = allusersData.content
       this.activeUsersData = this.activeUsersData.filter((wf: any) => wf.profileDetails.profileStatus !== 'NOT-MY-USER')
@@ -215,14 +217,17 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       }
     })
   }
-  async getVUsers(query: string) {
+  async getVUsers(query: any) {
     this.loaderService.changeLoad.next(true)
     const filtreq = {
       rootOrgId: this.rootOrgId,
       'profileDetails.profileStatus': 'VERIFIED',
     }
 
-    this.usersService.getAllKongUsers(filtreq, this.limit, this.pageIndex, query).subscribe((data: any) => {
+
+    const serchKey = query.searchText ? query.searchText : ''
+
+    this.usersService.getAllKongUsers(filtreq, this.limit, this.pageIndex, serchKey).subscribe((data: any) => {
       const allusersData = data.result.response
       this.verifiedUsersData = allusersData.content
       this.verifiedUsersDataCount = data.result.response.count
@@ -237,14 +242,17 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     })
   }
 
-  async getNVUsers(query: string) {
+  async getNVUsers(query: any) {
     this.loaderService.changeLoad.next(true)
     const filtreq = {
       rootOrgId: this.rootOrgId,
       'profileDetails.profileStatus': 'NOT-VERIFIED',
     }
 
-    this.usersService.getAllKongUsers(filtreq, this.limit, this.pageIndex, query).subscribe((data: any) => {
+
+    const serchKey = query.searchText ? query.searchText : ''
+
+    this.usersService.getAllKongUsers(filtreq, this.limit, this.pageIndex, serchKey).subscribe((data: any) => {
       const allusersData = data.result.response
       this.nonverifiedUsersData = allusersData.content
       this.nonverifiedUsersDataCount = data.result.response.count
@@ -260,14 +268,15 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     })
   }
 
-  async getNMUsers(query: string) {
+  async getNMUsers(query: any) {
     this.loaderService.changeLoad.next(true)
     const filtreq = {
       rootOrgId: this.rootOrgId,
       'profileDetails.profileStatus': 'NOT-MY-USER',
     }
 
-    this.usersService.getAllKongUsers(filtreq, this.limit, this.pageIndex, query).subscribe((data: any) => {
+    const serchKey = query.searchText ? query.searchText : ''
+    this.usersService.getAllKongUsers(filtreq, this.limit, this.pageIndex, serchKey).subscribe((data: any) => {
       const allusersData = data.result.response
       this.notmyuserUsersData = allusersData.content
       this.notmyuserUsersDataCount = data.result.response.count

From 2358b0b71073c83421efbec5383d0ac5d5d7c513 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Thu, 13 Jun 2024 15:11:44 +0530
Subject: [PATCH 705/887] fixed 4706

---
 .../single-user-creation.component.html       | 26 ++++++++++++-------
 .../single-user-creation.component.ts         | 21 +++++++++------
 2 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
index 1f7c0108a..9ac6e68a3 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
@@ -18,10 +18,16 @@
       </div>
       <div class="input-container">
         <div class="label required">Email</div>
-        <input type="text" class="input-text" formControlName="email" placeholder="Type here" />
-        <mat-error class="text-xs"
-          *ngIf="userCreationForm?.get('email')?.touched && userCreationForm?.get('email')?.invalid">
+        <!-- <input type="email" class="input-text" formControlName="email" placeholder="Type here" />
+        <mat-error class="text-xs" *ngIf="userCreationForm?.controls['email'].errors?.pattern">
           Please enter a valid email address
+        </mat-error> -->
+
+        <input type="email" class="input-text" placeholder="Type here" #email formControlName="email" i18n-aria-label
+          aria-label="Primary Email readonly input" maxlength="320">
+        <mat-error [hidden]="false" class="custom-error" *ngIf="userCreationForm?.get('email')?.touched &&
+        userCreationForm?.controls['email'].errors?.pattern" i18n-aria-label aria-label="Please enter a valid email">
+          Please enter a valid email
         </mat-error>
       </div>
     </div>
@@ -40,8 +46,8 @@
         <div class="label required">Designation</div>
         <mat-form-field class="profile-form-field required-select" appearance="none">
           <div class="flex flex-row auto-complete-row">
-            <input type="text" class="input-text" aria-label="Designation" matInput formControlName="designation"
-              [matAutocomplete]="designationAuto" />
+            <input type="text" class="input-text" aria-label="Designation" placeholder="Select designation" matInput
+              formControlName="designation" [matAutocomplete]="designationAuto" />
             <mat-icon>arrow_drop_down</mat-icon>
           </div>
           <mat-autocomplete #designationAuto="matAutocomplete">
@@ -73,9 +79,9 @@
       </div>
       <div class="input-container">
         <div class="label">Date of birth</div>
-        <mat-form-field class="profile-form-field">
+        <mat-form-field class="profile-form-field" appearance="none">
           <input matInput class="input-text icon-include-input" [matDatepicker]="picker" readonly formControlName="dob"
-            [max]="today" />
+            [max]="today" placeholder="Choose date of birth" />
           <mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
           <mat-datepicker #picker></mat-datepicker>
         </mat-form-field>
@@ -85,10 +91,10 @@
     <div class="flex flex-row gap-6">
       <div class="input-container">
         <div class="label">Mother tongue</div>
-        <mat-form-field class="profile-form-field">
+        <mat-form-field class="profile-form-field" appearance="none">
           <div class="flex flex-row auto-complete-row">
-            <input type="text" class="input-text" aria-label="Domicile medium" matInput formControlName="domicileMedium"
-              [matAutocomplete]="languageAuto" />
+            <input type="text" class="input-text" aria-label="Domicile medium" placeholder="Type here" matInput
+              formControlName="domicileMedium" [matAutocomplete]="languageAuto" />
             <mat-icon>arrow_drop_down</mat-icon>
           </div>
           <mat-autocomplete #languageAuto="matAutocomplete">
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
index 7248f5547..ebc946406 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
@@ -26,7 +26,7 @@ export const MY_FORMATS = {
   },
 }
 
-// const EMAIL_PATTERN = /^[a-zA-Z0-9](\.?[a-zA-Z0-9_]+)*@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/
+const EMAIL_PATTERN = /^[a-zA-Z0-9](\.?[a-zA-Z0-9_]+)*@[a-zA-Z0-9]*.[a-zA-Z]{2,}$/
 const MOBILE_PATTERN = /^[0]?[6789]\d{9}$/
 const PIN_CODE_PATTERN = /^[1-9][0-9]{5}$/
 
@@ -49,9 +49,9 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
   rolesArr: string[] = []
   fullProfile: any
   namePatern = `^[a-zA-Z\\s\\']{1,50}$`
-  emailRegix = `^[\\w\-\\.]+@([\\w-]+\\.)+[\\w-]{2,4}$`
+  // emailRegix = `^[\\w\-\\.]+@([\\w-]+\\.)+[\\w-]{2,4}$`
   userCreationForm = this.formBuilder.group({
-    email: new FormControl('', [Validators.required, Validators.pattern(this.emailRegix)]),
+    email: new FormControl('', [Validators.required, Validators.pattern(EMAIL_PATTERN)]),
     firstName: new FormControl('', [Validators.required, Validators.pattern(this.namePatern)]),
     phone: new FormControl('', [Validators.required, Validators.pattern(MOBILE_PATTERN), Validators.minLength(10)]),
     channel: new FormControl(''),
@@ -138,7 +138,8 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
       .subscribe((_res: any) => {
         this.masterData['designation'] = _res.responseData
         this.masterData['designationBackup'] = _res.responseData
-      },         (_err: HttpErrorResponse) => {
+        // tslint:disable-next-line
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch designation details, please try again later!')
         }
@@ -151,7 +152,8 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
       .subscribe((res: any) => {
         this.masterData['language'] = res.languages
         this.masterData['languageBackup'] = res.languages
-      },         (_err: HttpErrorResponse) => {
+        // tslint:disable-next-line
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch master language details, please try again later!')
         }
@@ -163,7 +165,8 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
         this.masterData['group'] = res.result.response
-      },         (_err: HttpErrorResponse) => {
+        // tslint:disable-next-line
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch group data, please try again later!')
         }
@@ -181,7 +184,8 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
             this.masterData['mdoRoles'] = mdoArray.roles
           }
         }
-      },         (_err: HttpErrorResponse) => {
+        // tslint:disable-next-line
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open('Unable to fetch roles list, please try again later!')
         }
@@ -269,7 +273,8 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
       .subscribe((_res: any) => {
         this.matSnackBar.open('User created successfully!')
         this.handleFormClear()
-      },         (_err: HttpErrorResponse) => {
+        // tslint:disable-next-line
+      }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
           this.matSnackBar.open(_.get(_err, 'error.params.errmsg') || 'Unable to create user, please try again later!')
         }

From e10b29d725d5d67111cd8045ba913b452b3cae18 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Thu, 13 Jun 2024 15:15:47 +0530
Subject: [PATCH 706/887] Updated reject msg for transfers

---
 .../user-cards/user-card.component.html        |  3 ++-
 .../user-cards/user-card.component.ts          | 18 ++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 1b29b1de8..331660af5 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -574,7 +574,8 @@
               <span class="font-bold">Primary Details</span> <mat-icon
                 class="ws-mat-black40-text infoicon">info_outline</mat-icon>
               <p class="float-right mat-body-2" *ngIf="currentFilter === 'transfers'">
-                <mat-slide-toggle #toggleElement (change)="confirmNotMyUser(notmyuserconfirm, appData, $event)"
+                <mat-slide-toggle #toggleElement
+                  (change)="confirmTransferRequest(notmyuserconfirm, appData, $event, panel)"
                   [checked]="appData.enableToggle">Approve transfer</mat-slide-toggle>
               </p>
             </div>
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 55303dcfb..e659ddf55 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -115,10 +115,10 @@ export class UserCardComponent implements OnInit, OnChanges {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-              private dialog: MatDialog, private approvalSvc: ApprovalsService,
-              private route: ActivatedRoute, private snackBar: MatSnackBar,
-              private events: EventService,
-              private datePipe: DatePipe) {
+    private dialog: MatDialog, private approvalSvc: ApprovalsService,
+    private route: ActivatedRoute, private snackBar: MatSnackBar,
+    private events: EventService,
+    private datePipe: DatePipe) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),
@@ -923,7 +923,7 @@ export class UserCardComponent implements OnInit, OnChanges {
     })
   }
 
-  confirmNotMyUser(template: any, data: any, event: any) {
+  confirmTransferRequest(template: any, data: any, event: any, panel: any) {
     data.enableToggle = true
     const dialog = this.dialog.open(template, {
       width: '500px',
@@ -951,7 +951,13 @@ export class UserCardComponent implements OnInit, OnChanges {
             })
           }
         })
-        this.onApproveOrRejectClick(orgReq)
+        this.approvalSvc.handleWorkflow(orgReq).subscribe((res: any) => {
+          if (res) {
+            this.openSnackbar('Request rejected successfully')
+            panel.close()
+            this.updateList.emit()
+          }
+        })
         // this.markStatus('NOT-MY-USER', data.user)
         data.enableToggle = false
       } else {

From 40ef0f28d6790c8ca7b464ceed00e5e89f68ca19 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Thu, 13 Jun 2024 17:45:33 +0530
Subject: [PATCH 707/887] Fixed ApproveAll button issue

---
 .../approval-pending/approval-pending.component.ts  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
index 332bd3e40..ddd3acb44 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
@@ -18,7 +18,7 @@ import { ApprovalsService } from '../../../services/approvals.service'
 })
 
 export class ApprovalPendingComponent implements OnInit, OnDestroy {
-  data: any = []
+  // data: any = []
   profileVerificationData: any = []
   transfersData: any = []
   approvalData: any = []
@@ -151,7 +151,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
       this.profileVerificationCount = 0
 
       this.apprService.getApprovals(req).subscribe(res => {
-        this.data = []
+        // this.data = []
         const newarray: any = []
         let currentdate: Date
         const resData = res.result.data
@@ -235,7 +235,8 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   replaceWords(inputString: any, wordConditions: any) {
     return wordConditions.reduce((acc: any, [word, condition]: any) => {
       return acc.replace(new RegExp(word, 'gi'), condition)
-    },                           inputString)
+      // tslint:disable-next-line
+    }, inputString)
   }
 
   onSearch(enterValue: any) {
@@ -266,9 +267,9 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   }
   onApproveALL() {
     this.disableApproveALL = true
-    if (this.data && this.data.length > 0) {
-      const datalength = this.data.length
-      this.data.forEach((data: any, index: any) => {
+    if (this.profileVerificationData && this.profileVerificationData.length > 0) {
+      const datalength = this.profileVerificationData.length
+      this.profileVerificationData.forEach((data: any, index: any) => {
         if (data.userWorkflow.wfInfo && data.userWorkflow.wfInfo.length > 0) {
           const action = 'APPROVE'
           data.userWorkflow.wfInfo.forEach((wf: any) => {

From 830b707fc28f7409cbab8b675f792e56c47fe92b Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Thu, 13 Jun 2024 22:15:35 +0530
Subject: [PATCH 708/887] Fixed 5201

---
 .../single-user-creation.component.html                    | 7 +++++--
 .../single-user-creation/single-user-creation.component.ts | 5 +++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
index 9ac6e68a3..09db29aa1 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
@@ -176,9 +176,12 @@
     </div>
 
     <div class="flex flex-row gap-4">
-      <button class="action-button" [ngClass]="{'disable-button': userCreationForm?.invalid}"
-        [disabled]="userCreationForm?.invalid" (click)="handleUserCreation()">Create user</button>
+      <button class="action-button" [ngClass]="{'disable-button': (userCreationForm?.invalid || displayLoader)}"
+        [disabled]="userCreationForm?.invalid || displayLoader" (click)="handleUserCreation()">Create user</button>
       <button class="outline-button" (click)="handleFormClear()">Clear</button>
+      <div *ngIf="displayLoader" class="pr-4 flex items-center justify-center">
+        <mat-spinner [diameter]="30"></mat-spinner>
+      </div>
     </div>
   </form>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
index ebc946406..c47934397 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
@@ -49,6 +49,8 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
   rolesArr: string[] = []
   fullProfile: any
   namePatern = `^[a-zA-Z\\s\\']{1,50}$`
+
+  displayLoader = false
   // emailRegix = `^[\\w\-\\.]+@([\\w-]+\\.)+[\\w-]{2,4}$`
   userCreationForm = this.formBuilder.group({
     email: new FormControl('', [Validators.required, Validators.pattern(EMAIL_PATTERN)]),
@@ -252,6 +254,7 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
   }
 
   handleUserCreation(): void {
+    this.displayLoader = true
     const dataToSubmit = { ...this.userCreationForm.value }
     if (dataToSubmit.dob) {
       // tslint:disable-next-line
@@ -271,11 +274,13 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
     this.usersService.createUser(postData)
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((_res: any) => {
+        this.displayLoader = false
         this.matSnackBar.open('User created successfully!')
         this.handleFormClear()
         // tslint:disable-next-line
       }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {
+          this.displayLoader = false
           this.matSnackBar.open(_.get(_err, 'error.params.errmsg') || 'Unable to create user, please try again later!')
         }
       })

From dec43650ae79e427f7c5a6443ac53310ed8cea90 Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Fri, 14 Jun 2024 10:35:15 +0530
Subject: [PATCH 709/887] other value removed from group dropdown

---
 .../home/components/user-cards/user-card.component.ts  | 10 +++++++++-
 .../single-user-creation.component.ts                  |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index e659ddf55..5b03d6476 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -305,7 +305,7 @@ export class UserCardComponent implements OnInit, OnChanges {
   async loadGroups() {
     await this.usersSvc.getGroups().subscribe(
       (data: any) => {
-        const res = data.result.response
+        const res = data.result.response.filter((ele: any) => ele !== 'Others')
         this.groupsList = res
       },
       (_err: any) => {
@@ -801,6 +801,7 @@ export class UserCardComponent implements OnInit, OnChanges {
             req.comment = ''
           }
           this.onApproveOrRejectClick(req)
+
           if (index === datalength - 1) {
             panel.close()
             this.comment = ''
@@ -958,6 +959,11 @@ export class UserCardComponent implements OnInit, OnChanges {
             this.updateList.emit()
           }
         })
+
+
+
+
+        // setTimeout(handleRRequest, 1000)
         // this.markStatus('NOT-MY-USER', data.user)
         data.enableToggle = false
       } else {
@@ -967,6 +973,7 @@ export class UserCardComponent implements OnInit, OnChanges {
     })
   }
 
+
   confirmUpdate(template: any, updateUserDataForm: any, user: any, panel: any) {
     const dialog = this.dialog.open(template, {
       width: '500px',
@@ -987,6 +994,7 @@ export class UserCardComponent implements OnInit, OnChanges {
     dialog.afterClosed().subscribe((v: any) => {
       if (v) {
         this.onApprovalSubmit(panel, appData)
+
       } else {
         panel.close()
       }
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
index ebc946406..52c4fe0f9 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
@@ -164,7 +164,7 @@ export class SingleUserCreationComponent implements OnInit, AfterViewInit, OnDes
     this.usersService.getGroups()
       .pipe(takeUntil(this.destroySubject$))
       .subscribe((res: any) => {
-        this.masterData['group'] = res.result.response
+        this.masterData['group'] = res.result.response.filter((ele: any) => ele !== 'Others')
         // tslint:disable-next-line
       }, (_err: HttpErrorResponse) => {
         if (!_err.ok) {

From 9c2a9f62bac108e86880f13fc88443e57dfd67b5 Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Fri, 14 Jun 2024 10:40:03 +0530
Subject: [PATCH 710/887] lint fix

---
 .../components/user-cards/user-card.component.ts     | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 5b03d6476..5b7709850 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -115,10 +115,10 @@ export class UserCardComponent implements OnInit, OnChanges {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-    private dialog: MatDialog, private approvalSvc: ApprovalsService,
-    private route: ActivatedRoute, private snackBar: MatSnackBar,
-    private events: EventService,
-    private datePipe: DatePipe) {
+              private dialog: MatDialog, private approvalSvc: ApprovalsService,
+              private route: ActivatedRoute, private snackBar: MatSnackBar,
+              private events: EventService,
+              private datePipe: DatePipe) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),
@@ -960,9 +960,6 @@ export class UserCardComponent implements OnInit, OnChanges {
           }
         })
 
-
-
-
         // setTimeout(handleRRequest, 1000)
         // this.markStatus('NOT-MY-USER', data.user)
         data.enableToggle = false
@@ -973,7 +970,6 @@ export class UserCardComponent implements OnInit, OnChanges {
     })
   }
 
-
   confirmUpdate(template: any, updateUserDataForm: any, user: any, panel: any) {
     const dialog = this.dialog.open(template, {
       width: '500px',

From dea5bdbc9e2e3ce8ab23dfd30e1710b9598a4b2d Mon Sep 17 00:00:00 2001
From: sohail amjad <sohail.amjad@tarento.com>
Date: Fri, 14 Jun 2024 10:51:24 +0530
Subject: [PATCH 711/887] resolved reviewed points

---
 .../create-request-form.component.html                    | 2 +-
 .../create-request-form.component.scss                    | 2 +-
 .../components/request-list/request-list.component.ts     | 2 +-
 .../routes/create-content/create-content.component.ts     | 8 +++++---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
index 5480cc11e..150aa6804 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
@@ -21,7 +21,7 @@
             <form [formGroup]="requestForm">
                 <div class="title-name">
                     <div class="fonm-element-label label-text">Title <span class="required"></span></div>
-                    <mat-form-field appearance="outline" class="w-full" fxFlex="40">
+                    <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
                         <input class="w-full" matInput placeholder="Enter Title" formControlName="TitleName" maxlength="70">
                         <mat-hint align="end">{{ requestForm.controls['TitleName'].value.length }} / 70</mat-hint>                    
                         <mat-error *ngIf="requestForm.controls['TitleName'].hasError('required')">
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.scss b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.scss
index f86d3ea9e..90bc296cf 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.scss
@@ -101,7 +101,7 @@
     color: rgba(0, 0, 0, 0.87) !important;
   }
 
-  ::ng-deep.mat-form-field-flex {
+  ::ng-deep .field-height .mat-form-field-flex {
     width: 100% !important;
 }
   .mat-button[disabled] {
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
index 93e8dd823..a5ad2faba 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
@@ -7,7 +7,7 @@ import { ActivatedRoute, Router } from '@angular/router'
 import { MatDialog, MatSnackBar, MatTableDataSource } from '@angular/material'
 import { ConfirmationBoxComponent } from '../../../training-plan/components/confirmation-box/confirmation.box.component'
 import { AssignListPopupComponent } from './assign-list-popup/assign-list-popup.component'
-import { LoaderService } from 'src/app/services/loader.service'
+import { LoaderService } from '../../../../../../../../../src/app/services/loader.service'
 export enum statusValue {
   Assigned= 'Assigned',
   Unassigned = 'Unassigned',
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
index 307df3e5b..8c2566033 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
@@ -22,6 +22,10 @@ export class CreateContentComponent implements OnInit {
   count = 0;
   queryParams:any;
   dialogRef:any;
+   /* tslint:disable */
+  confirmationText:string = 'You have unsaved progress on your CBP plan. Clicking "Yes" will discard it and take you to request new content screen. Would you like to continue?'
+  /* tslint:enable */
+
   constructor(private tpdsSvc: TrainingPlanDataSharingService, public dialog: MatDialog,
     //  private snackbar: MatSnackBar,
     private router: Router
@@ -135,20 +139,18 @@ export class CreateContentComponent implements OnInit {
   // }
 
   showAddContentDialog() {
-    /* tslint:disable */
     this.dialogRef = this.dialog.open(ConfirmationBoxComponent, {
       disableClose: true,
       data: {
         type: 'conformation',
         icon: 'radio_on',
-        title: 'You have unsaved progress on your CBP plan. Clicking "Yes" will discard it and take you to request new content screen. Would you like to continue?',
+        title: this.confirmationText,
         subTitle: '',
         primaryAction: 'Yes',
         secondaryAction: 'No',
       },
       autoFocus: false,
     })
-   /* tslint:enable */
     this.dialogRef.afterClosed().subscribe((_res: any) => {
       if (_res === 'confirmed') {
         this.router.navigate(['/app/home/create-request-form'])

From 9ef09600e86beb2e35429c13c24c7ea9648e7dfa Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Fri, 14 Jun 2024 11:09:06 +0530
Subject: [PATCH 712/887] Fixed 4793,4792

---
 .../user-cards/user-card.component.html       |  7 ++-
 .../user-cards/user-card.component.ts         | 62 ++++++++++---------
 2 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 331660af5..97457c813 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -4,8 +4,9 @@
 </div>
 <div *ngIf="!isApprovals">
   <mat-accordion [multi]="true">
-    <mat-expansion-panel class="user-card" *ngFor="let user of usersData" #panel (opened)="closeOtherPanels(panel)">
-      <mat-expansion-panel-header (click)="getUerData(user, '', panel)">
+    <mat-expansion-panel class="user-card" *ngFor="let user of usersData; let i = index" #panel
+      (opened)="closeOtherPanels(panel)">
+      <mat-expansion-panel-header (click)="getUerData(user, panel, index)">
         <div class="float-left width88 flex" (click)="$event.stopPropagation();">
           <div class="initialcircle display-inline-block margin-right-m">
             <!-- <span>AB</span> -->
@@ -535,7 +536,7 @@
   <mat-accordion [multi]="true" *ngIf="approvalData">
     <mat-expansion-panel class="user-card" *ngFor="let appData of approvalData | orderBy: 'firstName':'asc'" #panel
       (opened)="closeOtherPanels(panel)">
-      <mat-expansion-panel-header (click)="getUerData(appData.user, appData.userWorkflow, panel);">
+      <mat-expansion-panel-header (click)="getApprovalUserData(appData.user, appData.userWorkflow, panel);">
         <div class="float-left width82 flex" (click)="$event.stopPropagation();">
           <div class="initialcircle display-inline-block margin-right-s" *ngIf="appData?.user">
             <ws-widget-avatar-photo [name]="getUseravatarName(appData?.user)" [photoUrl]="appData?.user?.photo"
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index e659ddf55..38a01122e 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -62,7 +62,7 @@ export class UserCardComponent implements OnInit, OnChanges {
   lastIndex = 20
   pageSize = 20
 
-  userStatus: any
+  // userStatus: any
   rolesList: any = []
   rolesObject: any = []
   uniqueRoles: any = []
@@ -404,32 +404,34 @@ export class UserCardComponent implements OnInit, OnChanges {
     })
   }
 
-  getUerData(user: any, data: any, panel: any) {
-    if (panel.expanded) {
+  getApprovalUserData(user: any, data: any, openPanel: MatExpansionPanel) {
+    if (openPanel.expanded) {
+      user.enableEdit = false
+      this.approveUserDataForm.reset()
+      user.needApprovalList = []
+      this.actionList = []
+      this.comment = ''
+      this.getApprovalList(data)
+    }
+  }
+
+  getUerData(user: any, openPanel: MatExpansionPanel, index: any) {
+    if (openPanel.expanded) {
       user.enableEdit = false
       let profileDataAll = user
-      this.userStatus = profileDataAll.isDeleted ? 'Inactive' : 'Active'
 
       const profileData = profileDataAll.profileDetails
       this.updateTags(profileData)
 
-      if (this.isApprovals) {
-        this.approveUserDataForm.reset()
-        user.needApprovalList = []
-        this.actionList = []
-        this.comment = ''
-        this.getApprovalList(data)
-      } else {
-        this.usersSvc.getUserById(user.userId).subscribe((res: any) => {
-          if (res) {
-            profileDataAll = res
-            profileDataAll.enableEdit = false
-            // user = profileDataAll
-            this.userRoles.clear()
-            this.mapRoles(profileDataAll)
-          }
-        })
-      }
+      this.usersSvc.getUserById(user.userId).subscribe((res: any) => {
+        if (res) {
+          user = res
+          user.enableEdit = false
+          this.userRoles.clear()
+          this.mapRoles(user)
+          this.usersData[index] = user
+        }
+      })
     }
   }
 
@@ -632,16 +634,18 @@ export class UserCardComponent implements OnInit, OnChanges {
           userId: user.userId,
           profileDetails: {
             personalDetails: {
-              dob: dobn,
-              domicileMedium: this.updateUserDataForm.controls['domicileMedium'].value,
-              gender: this.updateUserDataForm.controls['gender'].value,
-              category: this.updateUserDataForm.controls['category'].value,
+              dob: dobn ? dobn : '',
+              domicileMedium: this.updateUserDataForm.controls['domicileMedium'].value ?
+                this.updateUserDataForm.controls['domicileMedium'].value : '',
+              gender: this.updateUserDataForm.controls['gender'].value ? this.updateUserDataForm.controls['gender'].value : '',
+              category: this.updateUserDataForm.controls['category'].value ? this.updateUserDataForm.controls['category'].value : '',
               mobile: this.updateUserDataForm.controls['mobile'].value,
               primaryEmail: this.updateUserDataForm.controls['primaryEmail'].value,
             },
             professionalDetails: [
               {
-                designation: this.updateUserDataForm.controls['designation'].value,
+                designation: this.updateUserDataForm.controls['designation'].value ?
+                  this.updateUserDataForm.controls['designation'].value : '',
                 group: this.updateUserDataForm.controls['group'].value,
               },
             ],
@@ -649,8 +653,10 @@ export class UserCardComponent implements OnInit, OnChanges {
               tag: this.selectedtags,
             },
             employmentDetails: {
-              pinCode: this.updateUserDataForm.controls['pincode'].value,
-              employeeCode: this.updateUserDataForm.controls['employeeID'].value,
+              pinCode: this.updateUserDataForm.controls['pincode'].value ?
+                this.updateUserDataForm.controls['pincode'].value : '',
+              employeeCode: this.updateUserDataForm.controls['employeeID'].value ?
+                this.updateUserDataForm.controls['employeeID'].value : '',
             },
           },
         },

From b93c9330fbab624b227663a9821ff4f530bd10bc Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Fri, 14 Jun 2024 13:02:02 +0530
Subject: [PATCH 713/887] Fixed UI alignment

---
 .../user-cards/user-card.component.scss         |  6 ++++++
 .../user-cards/user-card.component.ts           | 17 ++++++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
index 392462e1c..faac511cb 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
@@ -288,6 +288,12 @@ label {
 
   .customdob {
     width: 16.5em !important;
+    .mat-form-field-flex {
+      height: 45px !important;
+    }
+    .mat-form-field-infix {
+      line-height: 0 !important;
+    }
   }
   .mat-slide-toggle.mat-checked .mat-slide-toggle-thumb {
     background-color: rgba(29, 137, 35) !important;
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 76416db8a..f37aee5e9 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -25,6 +25,8 @@ import { EventService } from '@sunbird-cb/utils'
 import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
 import { DatePipe } from '@angular/common'
 
+const EMAIL_PATTERN = /^[a-zA-Z0-9](\.?[a-zA-Z0-9_]+)*@[a-zA-Z0-9]*.[a-zA-Z]{2,}$/
+
 @Component({
   selector: 'ws-widget-user-card',
   templateUrl: './user-card.component.html',
@@ -115,17 +117,17 @@ export class UserCardComponent implements OnInit, OnChanges {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-              private dialog: MatDialog, private approvalSvc: ApprovalsService,
-              private route: ActivatedRoute, private snackBar: MatSnackBar,
-              private events: EventService,
-              private datePipe: DatePipe) {
+    private dialog: MatDialog, private approvalSvc: ApprovalsService,
+    private route: ActivatedRoute, private snackBar: MatSnackBar,
+    private events: EventService,
+    private datePipe: DatePipe) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),
       employeeID: new FormControl('', [Validators.pattern(this.empIDPattern)]),
       ehrmsID: new FormControl({ value: '', disabled: true }, []),
       dob: new FormControl('', []),
-      primaryEmail: new FormControl('', [Validators.required, Validators.email, Validators.pattern(this.emailRegix)]),
+      primaryEmail: new FormControl('', [Validators.required, Validators.email, Validators.pattern(EMAIL_PATTERN)]),
       // countryCode: new FormControl('+91', []),
       mobile: new FormControl('', [Validators.required, Validators.pattern(this.phoneNumberPattern)]),
       tags: new FormControl('', [Validators.pattern(this.namePatern)]),
@@ -418,15 +420,16 @@ export class UserCardComponent implements OnInit, OnChanges {
   getUerData(user: any, openPanel: MatExpansionPanel, index: any) {
     if (openPanel.expanded) {
       user.enableEdit = false
-      let profileDataAll = user
+      const profileDataAll = user
 
       const profileData = profileDataAll.profileDetails
       this.updateTags(profileData)
 
       this.usersSvc.getUserById(user.userId).subscribe((res: any) => {
         if (res) {
+          // tslint:disable-next-line
           user = res
-          user.enableEdit = false
+          // user.enableEdit = false
           this.userRoles.clear()
           this.mapRoles(user)
           this.usersData[index] = user

From c14d9220099a6ce73e19fef1e1c35811a94ddd23 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Fri, 14 Jun 2024 13:07:20 +0530
Subject: [PATCH 714/887] Fixed lint

---
 .../home/components/user-cards/user-card.component.ts     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index f37aee5e9..9a1bf3214 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -117,10 +117,10 @@ export class UserCardComponent implements OnInit, OnChanges {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-    private dialog: MatDialog, private approvalSvc: ApprovalsService,
-    private route: ActivatedRoute, private snackBar: MatSnackBar,
-    private events: EventService,
-    private datePipe: DatePipe) {
+              private dialog: MatDialog, private approvalSvc: ApprovalsService,
+              private route: ActivatedRoute, private snackBar: MatSnackBar,
+              private events: EventService,
+              private datePipe: DatePipe) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),

From c49888689abded54d662bd3f85cac1962484d2ee Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Fri, 14 Jun 2024 17:59:44 +0530
Subject: [PATCH 715/887] serach functionality for all user page

---
 .../components/search/search.component.html   |  2 +-
 .../user-cards/user-card.component.html       |  4 +-
 .../user-cards/user-card.component.ts         | 11 ++--
 .../users-view/users-view.component.html      | 38 +++++++++---
 .../routes/users-view/users-view.component.ts |  8 ++-
 .../routes/users/services/users.service.ts    | 59 +++++++++++++++++--
 6 files changed, 98 insertions(+), 24 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.html b/project/ws/app/src/lib/routes/home/components/search/search.component.html
index 90572666e..03a9177af 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.html
@@ -3,7 +3,7 @@
         <div class="rsearch flex w-full">
             <mat-icon
                 class="color-60 search-icon mat-icon notranslate material-icons mat-icon-no-color">search</mat-icon>
-            <input class="sinput color-60 w-full" [(ngModel)]="searchText" (keyup.enter)="searchData($event)" label=""
+            <input class="sinput color-60 w-full" [(ngModel)]="searchText" (keyup)="searchData($event)" label=""
                 placeholder="Search" type="Standard" [ngClass]="{'disable': isContentLive}">
         </div>
     </div>
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index e0b7c8f8c..ee92bfec3 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -1,7 +1,7 @@
-<div class="searchfilter" *ngIf="!isApprovals">
+<!-- <div class="searchfilter" *ngIf="!isApprovals">
   <ws-app-searchuser (handleApiData)="onSearch($event)" (handleapproveAll)="onApproveALL()"
     [showApproveALL]="showApproveALL" [currentFilter]="currentFilter"></ws-app-searchuser>
-</div>
+</div> -->
 <div *ngIf="!isApprovals">
   <mat-accordion [multi]="true">
     <mat-expansion-panel class="user-card" *ngFor="let user of usersData" #panel (opened)="closeOtherPanels(panel)">
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 90b4068e1..8992f056f 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -42,6 +42,7 @@ export class UserCardComponent implements OnInit, OnChanges {
   @Input() tabChangeIndex: any
   @Input() currentFilter: any
   @Input() isApprovals: any
+  @Input() handleApiData: any
 
   @Output() paginationData = new EventEmitter()
   @Output() searchByEnterKey = new EventEmitter()
@@ -115,10 +116,10 @@ export class UserCardComponent implements OnInit, OnChanges {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-              private dialog: MatDialog, private approvalSvc: ApprovalsService,
-              private route: ActivatedRoute, private snackBar: MatSnackBar,
-              private events: EventService,
-              private datePipe: DatePipe) {
+    private dialog: MatDialog, private approvalSvc: ApprovalsService,
+    private route: ActivatedRoute, private snackBar: MatSnackBar,
+    private events: EventService,
+    private datePipe: DatePipe) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),
@@ -179,6 +180,8 @@ export class UserCardComponent implements OnInit, OnChanges {
   }
 
   ngOnInit() {
+      console.log(this.handleApiData, "handleApiData======")
+      console.log("page loaded;")
     if (this.isApprovals && this.usersData) {
       this.getApprovalData()
     } else {
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index cde4b37d8..a7655ea81 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -78,28 +78,50 @@
       </ws-widget-org-user-table-v2> -->
 
       <ng-container *ngIf="currentFilter === 'allusers'">
+        <div class="searchfilter">
+          <ws-app-searchuser (handleApiData)="onEnterkySearch($event)" [showApproveALL]="showApproveALL"
+            [currentFilter]="currentFilter"></ws-app-searchuser>
+        </div>
         <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="activeUsersData"
           [totalRecords]="activeUsersDataCount" [tabChangeIndex]="pageIndex" [isApprovals]="false"
-          (searchByEnterKey)="onEnterkySearch($event)" (paginationData)="onPaginateChange($event)"
-          (updateList)="getAllUsers('')"></ws-widget-user-card>
+          (paginationData)="onPaginateChange($event)" (updateList)="getAllUsers('')"></ws-widget-user-card>
+
       </ng-container>
+
+
+
       <ng-container *ngIf="currentFilter === 'verified'">
+        <div class="searchfilter">
+          <ws-app-searchuser (handleApiData)="onEnterkySearch($event)" [showApproveALL]="showApproveALL"
+            [currentFilter]="currentFilter"></ws-app-searchuser>
+        </div>
+
         <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="verifiedUsersData"
           [totalRecords]="verifiedUsersDataCount" [tabChangeIndex]="pageIndex"
-          (searchByEnterKey)="onEnterkySearch($event)" (paginationData)="onPaginateChange($event)"
-          (updateList)="getVUsers('')"></ws-widget-user-card>
+          (paginationData)="onPaginateChange($event)" (updateList)="getVUsers('')"></ws-widget-user-card>
       </ng-container>
+
+
+
       <ng-container *ngIf="currentFilter === 'nonverified'">
+        <div class="searchfilter">
+          <ws-app-searchuser (handleApiData)="onEnterkySearch($event)" [showApproveALL]="showApproveALL"
+            [currentFilter]="currentFilter"></ws-app-searchuser>
+        </div>
         <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="nonverifiedUsersData"
           [totalRecords]="nonverifiedUsersDataCount" [tabChangeIndex]="pageIndex"
-          (searchByEnterKey)="onEnterkySearch($event)" (paginationData)="onPaginateChange($event)"
-          (updateList)="getNVUsers('')"></ws-widget-user-card>
+          (paginationData)="onPaginateChange($event)" (updateList)="getNVUsers('')"></ws-widget-user-card>
       </ng-container>
+
+
       <ng-container *ngIf="currentFilter === 'notmyuser'">
+        <div class="searchfilter">
+          <ws-app-searchuser (handleApiData)="onEnterkySearch($event)" [showApproveALL]="showApproveALL"
+            [currentFilter]="currentFilter"></ws-app-searchuser>
+        </div>
         <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="notmyuserUsersData"
           [totalRecords]="notmyuserUsersDataCount" [tabChangeIndex]="pageIndex"
-          (searchByEnterKey)="onEnterkySearch($event)" (paginationData)="onPaginateChange($event)"
-          (updateList)="getNMUsers('')"></ws-widget-user-card>
+          (paginationData)="onPaginateChange($event)" (updateList)="getNMUsers('')"></ws-widget-user-card>
       </ng-container>
     </mat-card-content>
   </mat-card>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index f368fd4e6..c4acd2446 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -199,9 +199,9 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       status: 1,
     }
 
-    const serchKey = query.searchText ? query.searchText : ''
-
-    this.usersService.getAllKongUsers(filtreq, this.limit, this.pageIndex, serchKey).subscribe((data: any) => {
+    // const serchKey = query.searchText ? query.searchText : ''
+    // console.log(serchKey, " serchKey==========")
+    this.usersService.getAllKongUsers(filtreq, this.limit, this.pageIndex, query).subscribe((data: any) => {
       const allusersData = data.result.response
       this.activeUsersData = allusersData.content
       this.activeUsersData = this.activeUsersData.filter((wf: any) => wf.profileDetails.profileStatus !== 'NOT-MY-USER')
@@ -326,8 +326,10 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   }
 
   onEnterkySearch(enterValue: any) {
+    console.log(enterValue, "enterValue=========")
     this.searchQuery = enterValue
     this.filterData(this.searchQuery)
+
   }
 
   onPaginateChange(event: PageEvent) {
diff --git a/project/ws/app/src/lib/routes/users/services/users.service.ts b/project/ws/app/src/lib/routes/users/services/users.service.ts
index 8dabc0ad2..a613f1797 100644
--- a/project/ws/app/src/lib/routes/users/services/users.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/users.service.ts
@@ -4,6 +4,7 @@ import { Observable, Subject } from 'rxjs'
 import { map, retry } from 'rxjs/operators'
 // tslint:disable
 import _ from 'lodash'
+
 // tslint:enable
 
 const API_END_POINTS = {
@@ -45,6 +46,7 @@ export class UsersService {
   constructor(private http: HttpClient) { }
 
   getAllUsers(filter: object): Observable<any> {
+    // console.log()
     return this.http.post<any>(`${API_END_POINTS.GET_ALL_USERS}`, filter).pipe(map(res => _.get(res, 'result.response')))
   }
 
@@ -119,20 +121,65 @@ export class UsersService {
     return this.http.post<any>(`${API_END_POINTS.NEW_USER_UN_BLOCK_API}`, org)
   }
 
-  getAllKongUsers(filters: any, pageLimit: number = 20, offsetNum: number = 0, searchText?: string): Observable<any> {
+  getAllKongUsers(filters: any, pageLimit: number = 20, offsetNum: number = 0, query?: any): Observable<any> {
     let reqBody
+    // if (query && query.sortOrder=="alphabetical") {
+    //   reqBody = {
+    //     request: {
+    //       filters,
+    //       limit: pageLimit,
+    //       offset: offsetNum,
+    //       query: query.searchText,
+    //       sort_by: {
+    //         firstName: 'asc',
+    //       },
+    //     },
+    //   }
+    // }
+    // if (query && query.sortOrder == "oldest") {
+    //   reqBody = {
+    //     request: {
+    //       filters,
+    //       limit: pageLimit,
+    //       offset: offsetNum,
+    //       query: query.searchText,
+    //       sort_by: {
+    //         "createdOn": "desc"
+    //       },
+    //     },
+    //   }
+    // }
+    // if (query && query.sortOrder == "newest") {
+    //   reqBody = {
+    //     request: {
+    //       filters,
+    //       limit: pageLimit,
+    //       offset: offsetNum,
+    //       query: query.searchText,
+    //       sort_by: {
+    //         "createdOn": "asc",
+    //       },
+    //     },
+    //   }
+    // }
     reqBody = {
       request: {
         filters,
         limit: pageLimit,
         offset: offsetNum,
-        query: searchText,
-        sort_by: {
-          firstName: 'asc',
-        },
-      },
+        query: query.searchText,
+        sort_by: { "firstName": "asc" }
+        //  ("firstName": "asc") ? (query.sortOrder == "alphabetical") :
+        // { "createdOn": "desc" ? (query.sortOrder == "oldest") : '' },
+        // { "createdOn": "asc" ? (query.sortOrder == "newest") : '' },
+        // (query.sortOrder == "alphabetical") ? ("firstName" : "asc")
+
+
+
+      }
     }
     return this.http.post<any>(`${API_END_POINTS.GET_ALL_USERS}`, reqBody)
+    // return
   }
   // getAllRoleUsers(depId: string, role: {}): Observable<any> {
   getAllRoleUsers(depId: string, role: string): Observable<any> {

From e195a9856864d65620353c65868b9131cd97a589 Mon Sep 17 00:00:00 2001
From: sohail amjad <sohail.amjad@tarento.com>
Date: Sat, 15 Jun 2024 12:27:49 +0530
Subject: [PATCH 716/887] fixed lint issue

---
 .../assign-list-popup.component.html          | 12 +++---
 .../assign-list-popup.component.scss          | 43 ++++++++++++++-----
 .../assign-list-popup.component.ts            |  4 +-
 .../create-request-form.component.html        | 29 +++++++++----
 .../create-request-form.component.scss        |  6 +++
 .../create-request-form.component.ts          |  7 +--
 .../request-list/request-list.component.html  | 25 ++++++-----
 .../request-list/request-list.component.scss  | 35 ++++++++-------
 .../request-list/request-list.component.ts    | 18 ++------
 9 files changed, 107 insertions(+), 72 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.html b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.html
index 5fb25c75c..6aedcc5a7 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.html
+++ b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.html
@@ -6,7 +6,7 @@
                 <h2 class="titleText">{{assignText}}</h2>
             </div>
             <div class="actions">
-                <button mat-button type="button" class="search-btn" (click)="onSubmitAssign()" >{{submitAssign}}</button>
+                <button mat-button type="button" class="search-btn"  (click)="onSubmitAssign()"  [disabled]="!requestForm.valid" >{{submitAssign}}</button>
 
                 <button mat-button class="cancel" (click)="cancel()">
                     <span>Cancel</span>
@@ -21,28 +21,28 @@ <h2 class="titleText">{{assignText}}</h2>
             <div class="table-class">
               <table mat-table [dataSource]="dataSource">
                 <ng-container matColumnDef="select">
-                    <th mat-header-cell *matHeaderCellDef></th>
+                    <th mat-header-cell *matHeaderCellDef class="row-heading radio-width"></th>
                   <td mat-cell class="title-class" *matCellDef="let provider">
                     <mat-radio-button [value]="provider"></mat-radio-button>
                   </td>
                 </ng-container>
 
                 <ng-container matColumnDef="providerName">
-                  <th mat-header-cell *matHeaderCellDef>Provider Name</th>
+                  <th mat-header-cell *matHeaderCellDef class="row-heading">Provider Name</th>
                   <td mat-cell class="title-class" *matCellDef="let provider">{{ provider?.orgName ? provider?.orgName  : '_' }}</td>
                 </ng-container>
 
                 <ng-container matColumnDef="details">
-                  <th mat-header-cell *matHeaderCellDef>Details</th>
+                  <th mat-header-cell *matHeaderCellDef class="row-heading">Details</th>
                   <td mat-cell class="title-class" *matCellDef="let provider">{{ provider?.description ? provider?.description: '_' }}</td>
                 </ng-container>
 
                 <ng-container matColumnDef="eta">
-                  <th mat-header-cell *matHeaderCellDef>ETA</th>
+                  <th mat-header-cell *matHeaderCellDef class="row-heading">ETA</th>
                   <td mat-cell class="title-class" *matCellDef="let provider">{{ provider?.turnAroundTime ? provider?.turnAroundTime : '_' }}</td>
                 </ng-container>
 
-                <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+                <tr mat-header-row *matHeaderRowDef="displayedColumns" class="table-row-data"></tr>
                 <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
               </table>
               <mat-paginator [pageSize]="pageSize" [length]="this.providerCount" [pageSizeOptions]="[5,10,20]"
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.scss b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.scss
index 31207e9d2..a31ae8b7e 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.scss
@@ -69,17 +69,37 @@
   //   width: 13% !important;
   // }
   
-  table tr .cdk-column-title {
-    width: 18% !important;
-  }
-  
-  table tr .cdk-column-RequestId {
-    width: 9% !important;
-  }
+  // table tr .cdk-column-title {
+  //   width: 18% !important;
+  // }
   
-  table tr .cdk-column-assignee {
-    width: 17% !important;
+
+  table .table-row-data {
+    height: 56px !important;
   }
+  table tr .row-heading {
+    font-family: 'Lato';
+    font-weight: 400;
+    font-size: 14px !important;
+    line-height: 21px;
+    color: rgba(0, 0, 0, 0.6);
+    border-bottom: none;
+    // width: 13% !important;
+    // padding: 0 13px 0 13px !important;
+}
+table tr .radio-width{
+  width: 6% !important;
+}
+
+table tr .cdk-column-providerName {
+  width: 21% !important;
+  padding: 0 4% 0 0px !important;
+}
+
+table tr .cdk-column-details {
+  width: 40%;
+  padding: 0 10% 0 0px !important
+}
   
   .action-btn-view {
     color: #1B4CA1;
@@ -92,9 +112,10 @@
   
   .title-class {
     font-family: Lato;
-    font-size: 14px;
+    font-size: 14px !important;
     font-weight: 400;
-    line-height: 16.8px;
+    line-height: 21px;
+    color: rgba(0, 0, 0, 0.6) !important;
   }
   
   .search-border {
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.ts
index fc2ee0a85..5dc91615c 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.ts
@@ -1,5 +1,5 @@
 import { Component, Inject, OnInit } from '@angular/core'
-import { FormBuilder, FormControl, FormGroup } from '@angular/forms'
+import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'
 import { ProfileV2Service } from '../../../services/home.servive'
 import { MAT_DIALOG_DATA, MatDialogRef, MatTableDataSource } from '@angular/material'
 import { ConfigResolveService } from '../../../resolvers/config-resolve.service'
@@ -29,7 +29,7 @@ export class AssignListPopupComponent implements OnInit {
               public dialogRef: MatDialogRef<AssignListPopupComponent>,
   ) {
     this.requestForm = this.fb.group({
-      assignee: new FormControl(''),
+      assignee: new FormControl('', Validators.required),
     })
   }
 
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
index 150aa6804..575c23bfa 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
@@ -22,10 +22,10 @@
                 <div class="title-name">
                     <div class="fonm-element-label label-text">Title <span class="required"></span></div>
                     <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
-                        <input class="w-full" matInput placeholder="Enter Title" formControlName="TitleName" maxlength="70">
+                        <input class="w-full placeholder-text" matInput placeholder="Enter the content name" formControlName="TitleName" maxlength="70">
                         <mat-hint align="end">{{ requestForm.controls['TitleName'].value.length }} / 70</mat-hint>                    
                         <mat-error *ngIf="requestForm.controls['TitleName'].hasError('required')">
-                        Title is Mandatory
+                          Please enter a title for the request."
                         </mat-error>
                         <mat-error
                         *ngIf="requestForm.controls['TitleName'].hasError('minlength') && !requestForm.controls['TitleName'].errors?.pattern"
@@ -44,10 +44,12 @@
                 <div class="title-name">
                     <div class="fonm-element-label label-text">Objective <span class="required"></span></div>
                     <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
-                        <input class="w-full" matInput placeholder="Enter Objective" formControlName="Objective" maxlength="500">
+                        <!-- <input class="w-full" matInput placeholder="Provide the objective of the content" formControlName="Objective" maxlength="500"> -->
+                        <textarea matInput class="w-full  placeholder-text" [matTextareaAutosize] [matAutosizeMaxRows]="10" [matAutosizeMinRows]="5"
+                        formControlName="Objective" placeholder="Provide the objective of the content" maxlength="500" i18n-placeholder></textarea>
                         <mat-hint align="end">{{ requestForm.controls['Objective'].value.length }} / 500</mat-hint>                    
                         <mat-error *ngIf="requestForm.controls['Objective'].hasError('required')">
-                        Objective is Mandatory
+                          Please enter the objective of the request.
                         </mat-error>
                         <mat-error
                         *ngIf="requestForm.controls['Objective'].hasError('minlength') && !requestForm.controls['Objective'].errors?.pattern"
@@ -66,7 +68,9 @@
                 <div class="title-name">
                     <div class="fonm-element-label label-text">Type of user</div>
                     <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
-                        <input class="w-full" matInput placeholder="Enter Type of user" formControlName="userType" maxlength="500">
+                        <!-- <input class="w-full" matInput placeholder="Example for ASO and above" formControlName="userType" maxlength="500"> -->
+                        <textarea matInput class="w-full  placeholder-text" [matTextareaAutosize] [matAutosizeMaxRows]="10" [matAutosizeMinRows]="2"
+                        formControlName="userType" placeholder="Example for ASO and above" maxlength="500" i18n-placeholder></textarea>
                         <mat-hint align="end">{{ requestForm.controls['userType'].value.length }} / 500</mat-hint>                    
                         <mat-error
                         *ngIf="requestForm.controls['userType'].hasError('minlength') && !requestForm.controls['userType'].errors?.pattern"
@@ -276,7 +280,7 @@
                 <div class="title-text">
                     <div class="fonm-element-label label-text">Refrence Link</div>
                     <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
-                        <input class="w-full" matInput placeholder="Provide reference link" formControlName="referenceLink">
+                        <input class="w-full  placeholder-text" matInput placeholder="Provide reference link" formControlName="referenceLink">
                         </mat-form-field>
 
                     
@@ -286,6 +290,9 @@
                     <div class="mt-5">
                     <mat-radio-group aria-label="Select an option"    formControlName="requestType" >
                         <mat-radio-button class="learning-section"  *ngFor="let item of requestTypeList" [value]="item" (change)="selectRequestType(item)">{{item}}</mat-radio-button>
+                        <!-- <mat-error *ngIf="requestForm.controls['requestType'].hasError('required')">
+                          Please select a request type (Single Provider or Broadcast).
+                        </mat-error> -->
                     
                       </mat-radio-group>
                     </div>
@@ -294,10 +301,13 @@
                     <div class="fonm-element-label label-text">Assignee <span class="required"></span></div>
                     <div class="">
                         <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
-                            <mat-select placeholder="Choose the Assignee" formControlName="assignee">
+                            <mat-select class=" placeholder-text" placeholder="Choose the Assignee" formControlName="assignee">
                               <mat-option *ngFor="let option of requestTypeData" [value]="option">{{option.orgName}}</mat-option>
                           
                             </mat-select>
+                            <mat-error *ngIf="requestForm.controls['assignee'].hasError('required')">
+                              Please select a provider/assignee for the request.
+                            </mat-error>
                           </mat-form-field>
                     </div>
                 </div>
@@ -305,7 +315,7 @@
                     <div class="fonm-element-label label-text">Preffered Providers <span class="required"></span></div>
                     <div class="">
                         <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
-                            <mat-select placeholder="Choose the provider" (openedChange)="openedChange($event,'providerText')" formControlName="providers"  multiple>
+                            <mat-select class=" placeholder-text" placeholder="Choose the provider" (openedChange)="openedChange($event,'providerText')" formControlName="providers"  multiple>
                           
                               <mat-select-trigger [ngClass]="{'disbaledSelect':isHideData}">
                                 <mat-chip-list>
@@ -331,6 +341,9 @@
                               <mat-option *ngFor="let option of filteredRequestType" [value]="option">{{option.orgName}}</mat-option>
                           
                             </mat-select>
+                            <mat-error *ngIf="requestForm.controls['providerText'].hasError('required')">
+                              Please select up to five preferred providers for the request.
+                            </mat-error>
                           </mat-form-field>
                     </div>
                 </div>
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.scss b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.scss
index 90bc296cf..0868ce67e 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.scss
@@ -103,6 +103,12 @@
 
   ::ng-deep .field-height .mat-form-field-flex {
     width: 100% !important;
+    .placeholder-text {
+      font-size: 14px !important;
+      font-family: 'Lato' !important;
+       line-height: 16.8px !important;
+      font-weight: 400  !important;
+    }
 }
   .mat-button[disabled] {
     opacity: 0.6;
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
index e7317b52c..89d32d997 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
@@ -69,7 +69,7 @@ export class CreateRequestFormComponent implements OnInit {
               private activatedRouter: ActivatedRoute,
               private snackBar: MatSnackBar,
               private router: Router,
-              public dialog: MatDialog,
+              public dialog: MatDialog
   ) {
     this.requestForm = this.formBuilder.group({
       TitleName: new FormControl('', [Validators.required, Validators.pattern(this.noSpecialChar), Validators.minLength(10)]),
@@ -79,7 +79,7 @@ export class CreateRequestFormComponent implements OnInit {
       compArea: new FormControl(''),
       referenceLink: new FormControl(''),
       requestType: new FormControl('', Validators.required),
-      assignee: new FormControl({}),
+      assignee: new FormControl(''),
       providers: new FormControl([[]]),
       providerText: new FormControl(''),
       queryThemeControl: new FormControl(''),
@@ -251,9 +251,10 @@ export class CreateRequestFormComponent implements OnInit {
      this.statusValue = 'Assigned'
      this.requestForm.controls['providers'].setValue('')
      this.requestForm.controls['providers'].clearValidators()
-     this.requestForm.controls['providers'].updateValueAndValidity() //
+     this.requestForm.controls['providers'].updateValueAndValidity()
      this.requestForm.controls['assignee'].setValidators([Validators.required])
      this.requestForm.controls['assignee'].updateValueAndValidity()
+
    } else if (item === 'Broadcast') {
     this.statusValue = 'Unassigned'
      this.isBroadCast = true
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
index c12f9777c..2f3a883cf 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
@@ -34,22 +34,27 @@ <h2>Content Request</h2>
             <ng-container *ngIf="dataSource?.filteredData?.length > 0">
             <table mat-table   [dataSource]="dataSource" > 
               <ng-container matColumnDef="RequestId">
-                <th mat-header-cell *matHeaderCellDef>Request ID </th>
+                <th mat-header-cell *matHeaderCellDef class="row-heading">Request ID </th>
                 <td mat-cell class="title-class" *matCellDef="let element">{{element?.demand_id}}</td>
               </ng-container>
   
               <ng-container matColumnDef="title">
-                <th mat-header-cell *matHeaderCellDef>Title </th>
+                <th mat-header-cell *matHeaderCellDef class="row-heading">Title </th>
+                <td mat-cell class="title-class" *matCellDef="let element">{{element?.title}}</td>
+              </ng-container>
+
+              <ng-container matColumnDef="requestor">
+                <th mat-header-cell *matHeaderCellDef class="row-heading">Requestor </th>
                 <td mat-cell class="title-class" *matCellDef="let element">{{element?.title}}</td>
               </ng-container>
   
               <ng-container matColumnDef="requestType">
-                <th mat-header-cell *matHeaderCellDef>Request Type </th>
+                <th mat-header-cell *matHeaderCellDef class="row-heading">Request Type </th>
                 <td mat-cell class="title-class" *matCellDef="let element">{{element?.requestType}}</td>
               </ng-container>
   
               <ng-container matColumnDef="requestStatus">
-                <th mat-header-cell *matHeaderCellDef>Request Status </th>
+                <th mat-header-cell *matHeaderCellDef class="row-heading">Request Status </th>
                 
                 <td mat-cell class="title-class" *matCellDef="let element">
                   <span [ngClass]="getStatusClass(element?.status)">{{element?.status}}</span>
@@ -57,17 +62,17 @@ <h2>Content Request</h2>
               </ng-container>
   
               <ng-container matColumnDef="assignee">
-                <th mat-header-cell *matHeaderCellDef>Assignee </th>
+                <th mat-header-cell *matHeaderCellDef class="row-heading">Assignee </th>
                 <td mat-cell class="title-class" *matCellDef="let element">{{element?.assignedProvider ? element?.assignedProvider : 'Not Assigned' }}</td>
               </ng-container>
   
               <ng-container matColumnDef="requestedOn">
-                <th mat-header-cell *matHeaderCellDef>Requested On </th>
+                <th mat-header-cell *matHeaderCellDef class="row-heading">Requested On </th>
                 <td mat-cell class="title-class" *matCellDef="let element">{{element?.createdOn | date}}</td>
               </ng-container>
 
               <ng-container matColumnDef="interests">
-                <th mat-header-cell *matHeaderCellDef>Interests</th>
+                <th mat-header-cell *matHeaderCellDef class="row-heading">Interests</th>
                 <td mat-cell class="title-class" *matCellDef="let element">
                     <a class="action-btn-view"   *ngIf="element?.interestCount!== 0" 
                     href="javascript:void(0)"  >
@@ -80,14 +85,14 @@ <h2>Content Request</h2>
               </ng-container>
   
               <ng-container matColumnDef="details">
-                <th mat-header-cell *matHeaderCellDef>Details</th>
+                <th mat-header-cell *matHeaderCellDef class="row-heading">Details</th>
                 <td mat-cell *matCellDef="let element">
                   <mat-icon (click)="navigateToDetails(element?.demand_id)" class="cursor-pointer">visibility</mat-icon>
                 </td>
               </ng-container>
   
               <ng-container matColumnDef="action">
-                <th mat-header-cell *matHeaderCellDef>Action</th>
+                <th mat-header-cell *matHeaderCellDef class="row-heading"></th>
                 <td mat-cell  *matCellDef="let element">
                 
                   <!-- <a class="action-btn-view" *ngIf="element.status === 'Unassigned'" (click)="showInterestPopup()"
@@ -122,7 +127,7 @@ <h2>Content Request</h2>
   
               </ng-container>
   
-              <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+              <tr mat-header-row *matHeaderRowDef="displayedColumns" class="table-row-data"></tr>
               <tr mat-row *matRowDef="let row;columns:displayedColumns"></tr>
   
   
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.scss b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.scss
index 531717dbc..90ece9c43 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.scss
@@ -15,26 +15,21 @@ table tr {
   height: 70px !important;
 }
 
-// ::ng-deep {
-//   table tr td .cdk-column-title .title-class {
-//     width: 13% !important;
-//   }
-// }
 
-// table tr td .cdk-column-title .cdk-column-assignee {
-//   width: 13% !important;
-// }
 
-table tr .cdk-column-title {
-  width: 18% !important;
+table .table-row-data {
+  height: 56px !important;
 }
 
-table tr .cdk-column-RequestId {
-  width: 9% !important;
-}
-
-table tr .cdk-column-assignee {
-  width: 20% !important;
+table tr .row-heading {
+    font-family: 'Lato';
+    font-weight: 400;
+    font-size: 14px !important;
+    line-height: 21px;
+    color: rgba(0, 0, 0, 0.6);
+    border-bottom: none;
+    width: 13% !important;
+    padding: 0 13px 0 13px !important;
 }
 
 .action-btn-view {
@@ -62,9 +57,13 @@ table tr .cdk-column-assignee {
 
 .title-class {
   font-family: Lato;
-  font-size: 14px;
+  font-size: 14px !important;
   font-weight: 400;
-  line-height: 16.8px;
+  line-height: 21px;
+  color: rgba(0, 0, 0, 0.6) !important;
+  width: 13% !important;
+  padding: 0 13px !important;
+  
 }
 .status-unassigned {
   background: rgba(0, 0, 0, 0.6);
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
index a5ad2faba..e9468a9c8 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
@@ -43,10 +43,6 @@ export class RequestListComponent implements OnInit {
   }
   getTableData: any[] = []
   requestListData: any
-  isUnassigned = false
-  isAssigned = false
-  inProgress = false
-  invalid = false
   assignProvider: any
   pageConfig: any
   configSvc: any
@@ -58,7 +54,8 @@ export class RequestListComponent implements OnInit {
   invalidRes: any
   detailsEvent: any
   dataSource: any
-  displayedColumns: string[] = ['RequestId', 'title', 'requestType', 'requestStatus', 'assignee', 'requestedOn', 'interests', 'action']
+  displayedColumns: string[] = ['RequestId', 'title','requestor', 'requestType',
+   'requestStatus', 'assignee', 'requestedOn', 'interests', 'action']
   statusKey = statusValue
 
   constructor(private sanitizer: DomSanitizer,
@@ -263,6 +260,7 @@ export class RequestListComponent implements OnInit {
         orderDirection: 'ASC',
     }
     this.homeService.getRequestList(request).subscribe(res => {
+      if(res){
       this.requestListData = res.data
       if (this.requestListData) {
         this.loaderService.changeLoaderState(false)
@@ -274,19 +272,11 @@ export class RequestListComponent implements OnInit {
           if (data.assignedProvider) {
             data.assignedProvider = data.assignedProvider.providerName
           }
-          if (data.status === 'Unassigned') {
-           this.isUnassigned =  true
-          } else if (data.status === 'Assigned') {
-           this.isAssigned =  true
-          } else if (data.status === 'Inprogress') {
-            this.inProgress =  true
-           } else if (data.status === 'invalid') {
-            this.invalid =  true
-           }
         })
         this.dataSource = new MatTableDataSource<any>(this.requestListData)
 
       }
+    }
 
     })
 

From 3b9b124d2c926fbe6ddc4172f886b66d74610b68 Mon Sep 17 00:00:00 2001
From: sohail amjad <sohail.amjad@tarento.com>
Date: Sat, 15 Jun 2024 20:55:09 +0530
Subject: [PATCH 717/887] Bug Fixes karma Quest

---
 .../assign-list-popup.component.html          |  2 +-
 .../assign-list-popup.component.scss          |  3 ++
 .../create-request-form.component.html        | 10 ++--
 .../create-request-form.component.scss        |  8 ++++
 .../create-request-form.component.ts          | 48 ++++++++++++-------
 .../request-list/request-list.component.html  |  2 +-
 6 files changed, 51 insertions(+), 22 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.html b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.html
index 6aedcc5a7..4e2ab2f8f 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.html
+++ b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.html
@@ -6,7 +6,7 @@
                 <h2 class="titleText">{{assignText}}</h2>
             </div>
             <div class="actions">
-                <button mat-button type="button" class="search-btn"  (click)="onSubmitAssign()"  [disabled]="!requestForm.valid" >{{submitAssign}}</button>
+                <button mat-button type="button" class="search-btn" [ngClass]="{'disableBtn': !requestForm.valid}"  (click)="onSubmitAssign()"  [disabled]="!requestForm.valid" >{{submitAssign}}</button>
 
                 <button mat-button class="cancel" (click)="cancel()">
                     <span>Cancel</span>
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.scss b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.scss
index a31ae8b7e..3cda53f18 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.scss
@@ -46,6 +46,9 @@
       border: 1px solid #1b4ca1 !important;
       border-radius: 4px;
       min-width: 81px;
+  }
+  .disableBtn {
+    background: rgba(0, 0, 0, 0.4) !important;
   }
     }
   }
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
index 575c23bfa..57949eb0f 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
@@ -190,7 +190,7 @@
                         <th class="padding-xs ws-mat-black60-text mat-body-1">Theme</th>
                         <th class="padding-xs ws-mat-black60-text mat-body-1">Sub theme</th>
                       </tr>
-                      <tr   *ngFor="let comp of requestForm.controls?.competencies_v5?.value"  [attr.disabled]="isHideData ? true : null" (click)=view(comp)>
+                      <tr   *ngFor="let comp of requestForm.controls?.competencies_v5?.value"  [attr.disabled]="isCompetencyHide ? true : null" (click)=view(comp)>
                         <td  class="padding-xs mat-body-1 cursor-pointer">{{comp.competencyArea}}</td>
                         <td class="padding-xs mat-body-1 cursor-pointer">{{comp.competencyTheme || comp.name}}</td>
                         <td class="padding-xs mat-body-1 cursor-pointer">{{comp.competencySubTheme ||
@@ -302,7 +302,9 @@
                     <div class="">
                         <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
                             <mat-select class=" placeholder-text" placeholder="Choose the Assignee" formControlName="assignee">
-                              <mat-option *ngFor="let option of requestTypeData" [value]="option">{{option.orgName}}</mat-option>
+                              <input #search autocomplete="off" placeholder="Search" class="assigneeSearch"
+                               (keyup)="searchValueData('assigneeText')"  formControlName="assigneeText" matInput>
+                              <mat-option *ngFor="let option of filteredAssigneeType" [value]="option">{{option.orgName}}</mat-option>
                           
                             </mat-select>
                             <mat-error *ngIf="requestForm.controls['assignee'].hasError('required')">
@@ -329,7 +331,7 @@
                               </mat-select-trigger>
                               <mat-optgroup>
                                 <mat-form-field floatLabel="never">
-                                  <input #search autocomplete="off" placeholder="Search" (keyup)="searchValueData($event,'providerText')"  formControlName="providerText" matInput>
+                                  <input #search autocomplete="off" placeholder="Search" (keyup)="searchValueData('providerText')"  formControlName="providerText" matInput>
                                   <button [disableRipple]="true" *ngIf="search.value" matSuffix mat-icon-button aria-label="Clear"
                                     (click)="clearSearch($event,'providerText')"><mat-icon>close</mat-icon></button>
                                 </mat-form-field>
@@ -338,7 +340,7 @@
                                 <div>No results found!</div>
                               </mat-optgroup>
                               <!-- <mat-option *ngFor="let option of requestObjData.preferredProvider" [value]="option.providerName">{{option.providerName}}</mat-option> -->
-                              <mat-option *ngFor="let option of filteredRequestType" [value]="option">{{option.orgName}}</mat-option>
+                              <mat-option *ngFor="let option of filteredRequestType"  [disabled]="isOptionDisabled(option)" [value]="option">{{option.orgName}}</mat-option>
                           
                             </mat-select>
                             <mat-error *ngIf="requestForm.controls['providerText'].hasError('required')">
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.scss b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.scss
index 0868ce67e..399f7419e 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.scss
@@ -109,6 +109,14 @@
        line-height: 16.8px !important;
       font-weight: 400  !important;
     }
+    
+}
+.assigneeSearch {
+  height: 50px !important;
+  font-size: 15px;
+  padding-left: 12px;
+  box-sizing: border-box;
+
 }
   .mat-button[disabled] {
     opacity: 0.6;
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
index 89d32d997..eb5600eb4 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
@@ -42,7 +42,8 @@ export class CreateRequestFormComponent implements OnInit {
   isBroadCast = false
   filterCompetencyThemes: any[] = []
   filteredSubTheme: any[] = []
-  filteredRequestType: any[] = []
+  filteredRequestType: any[] = [];
+  filteredAssigneeType:any[]=[];
   subthemeCheckedList: any[] = []
   resData = ''
   fullProfile: any
@@ -57,7 +58,8 @@ export class CreateRequestFormComponent implements OnInit {
   demandId: any
   actionBtnName: any
   requestObjData: any
-  isHideData = false
+  isHideData = false;
+  isCompetencyHide:boolean = false;
 
   competencyCtrl!: FormControl
   competencyArea!: FormControl
@@ -85,6 +87,7 @@ export class CreateRequestFormComponent implements OnInit {
       queryThemeControl: new FormControl(''),
       querySubThemeControl: new FormControl(''),
       competencies_v5: [],
+      assigneeText: new FormControl('')
     })
 
    }
@@ -133,6 +136,7 @@ export class CreateRequestFormComponent implements OnInit {
       providerText: '',
       queryThemeControl: '',
       querySubThemeControl: '',
+      assigneeText: ''
     })
    const value = this.requestForm.controls.competencies_v5.value || []
    this.requestObjData.competencies.map((comp: any) => {
@@ -156,9 +160,9 @@ export class CreateRequestFormComponent implements OnInit {
   this.requestForm.controls['providers'].setValue(abc)
    }
 
-   if (this.requestTypeData) {
+   if (this.filteredAssigneeType) {
     if (this.requestObjData.assignedProvider) {
-      const assignData = this.requestTypeData.find(option =>
+      const assignData = this.filteredAssigneeType.find(option =>
         this.requestObjData.assignedProvider.providerName === option.orgName
        )
        if (assignData) {
@@ -172,20 +176,17 @@ export class CreateRequestFormComponent implements OnInit {
     this.router.navigateByUrl('/app/home/request-list')
   }
 
-  searchValueData(e: any, searchValue: any) {
-    if (searchValue === 'themeText') {
-      this.requestForm.controls['themeText'].valueChanges.subscribe((newValue: any) => {
-        this.filterCompetencyThemes = this.filterValues(newValue, this.allCompetencyTheme)
-      })
-    } else if (searchValue === 'subthemeText') {
-      this.requestForm.controls['subthemeText'].valueChanges.subscribe((newValue: any) => {
-        this.filteredSubTheme = this.filterValues(newValue, this.allCompetencySubtheme)
-      })
-    } else if (searchValue === 'providerText' || e) {
+  searchValueData(searchValue: any) {
+    if (searchValue === 'providerText') {
       this.requestForm.controls['providerText'].valueChanges.subscribe((newValue: any) => {
         this.filteredRequestType = this.filterOrgValues(newValue, this.requestTypeData)
       })
     }
+    if (searchValue === 'assigneeText') {
+      this.requestForm.controls['assigneeText'].valueChanges.subscribe((newValue: any) => {
+        this.filteredAssigneeType = this.filterOrgValues(newValue, this.requestTypeData)
+      })
+    }
 
   }
 
@@ -229,14 +230,17 @@ export class CreateRequestFormComponent implements OnInit {
     this.homeService.getRequestTypeList(requestObj).subscribe(data => {
       this.requestTypeData = data
       this.filteredRequestType = [...this.requestTypeData]
+      this.filteredAssigneeType = [...this.requestTypeData]
       if (this.demandId) {
         this.getRequestDataById()
         if (this.actionBtnName === 'view') {
           this.requestForm.disable()
-          this.isHideData = true
+          this.isHideData = true;
+          this.isCompetencyHide = true;
         } else if (this.actionBtnName === 'reassign') {
             this.requestForm.disable()
-            // this.isHideData = true;
+             this.isCompetencyHide = true;
+            this.requestForm.controls['assigneeText'].enable()
             this.requestForm.controls['assignee'].enable()
         }
       }
@@ -466,6 +470,9 @@ view(item?: any) {
   })
 }
 
+
+
+
   onProviderRemoved(provider: any) {
     const compThemeControl = this.requestForm.get('providers') as FormControl | null
     if (compThemeControl) {
@@ -480,6 +487,15 @@ view(item?: any) {
     }
   }
 
+  isOptionDisabled(option: any): boolean {
+    const control = this.requestForm.get('providers');
+    if (control) {
+      const selectedProviders = control.value;
+      return selectedProviders.length >= 5 && !selectedProviders.includes(option);
+    }
+    return false;
+  }
+
   showSaveButton() {
 
   }
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
index 2f3a883cf..328bca01e 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
@@ -45,7 +45,7 @@ <h2>Content Request</h2>
 
               <ng-container matColumnDef="requestor">
                 <th mat-header-cell *matHeaderCellDef class="row-heading">Requestor </th>
-                <td mat-cell class="title-class" *matCellDef="let element">{{element?.title}}</td>
+                <td mat-cell class="title-class" *matCellDef="let element">{{'N/A'}}</td>
               </ng-container>
   
               <ng-container matColumnDef="requestType">

From aed12df68196f13ac475d1384a81ea4281345f50 Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Sun, 16 Jun 2024 23:09:49 +0530
Subject: [PATCH 718/887] console removed

---
 .../routes/home/components/user-cards/user-card.component.ts    | 2 --
 .../lib/routes/home/routes/users-view/users-view.component.ts   | 2 --
 2 files changed, 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 8992f056f..420657845 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -180,8 +180,6 @@ export class UserCardComponent implements OnInit, OnChanges {
   }
 
   ngOnInit() {
-      console.log(this.handleApiData, "handleApiData======")
-      console.log("page loaded;")
     if (this.isApprovals && this.usersData) {
       this.getApprovalData()
     } else {
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index c4acd2446..8fbe24161 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -200,7 +200,6 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     }
 
     // const serchKey = query.searchText ? query.searchText : ''
-    // console.log(serchKey, " serchKey==========")
     this.usersService.getAllKongUsers(filtreq, this.limit, this.pageIndex, query).subscribe((data: any) => {
       const allusersData = data.result.response
       this.activeUsersData = allusersData.content
@@ -326,7 +325,6 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   }
 
   onEnterkySearch(enterValue: any) {
-    console.log(enterValue, "enterValue=========")
     this.searchQuery = enterValue
     this.filterData(this.searchQuery)
 

From e06e7276aedce9988dd1da8a7967cfa144cfadf5 Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Mon, 17 Jun 2024 19:08:18 +0530
Subject: [PATCH 719/887] filter functionality fixed

---
 .../routes/users-view/users-view.component.ts | 156 ++++++++++++++++--
 .../routes/users/services/users.service.ts    | 123 ++++++++------
 2 files changed, 209 insertions(+), 70 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 8fbe24161..5f4b6f3b6 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -62,6 +62,13 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   searchQuery = ''
   rootOrgId: any
   currentUserStatus: any
+  filetrGroup = []
+  filterDesignation = []
+  filterRoles = []
+  filterTags = []
+  sortOrder: any
+  searchText = ''
+
 
   constructor(
     public dialog: MatDialog,
@@ -94,7 +101,6 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     if (this.configSvc.unMappedUser && this.configSvc.unMappedUser.roles) {
       this.isMdoAdmin = this.configSvc.unMappedUser.roles.includes('MDO_ADMIN')
     }
-    // this.filterData('')
 
     this.getNMUsers('')
     this.getAllUsers('')
@@ -148,7 +154,6 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   }
 
   filterData(query: any) {
-    // this.getUsers(query, this.currentFilter)
     if (this.currentFilter === 'allusers') {
       this.getAllUsers(query)
     } else if (this.currentFilter === 'verified') {
@@ -193,14 +198,33 @@ export class UsersViewComponent implements OnInit, OnDestroy {
 
   async getAllUsers(query: any) {
     this.loaderService.changeLoad.next(true)
-    // const usersData: any[] = []
+    let reqBody
     const filtreq = {
       rootOrgId: this.rootOrgId,
       status: 1,
     }
-
-    // const serchKey = query.searchText ? query.searchText : ''
-    this.usersService.getAllKongUsers(filtreq, this.limit, this.pageIndex, query).subscribe((data: any) => {
+    if (this.getFilterGroup(query) && this.getFilterGroup(query) !== 'undefind') {
+      Object.assign(filtreq, { "profileDetails.professionalDetails.group": this.getFilterGroup(query) })
+    }
+    if (this.getFilterDesignation(query) && this.getFilterDesignation(query) !== 'undefind') {
+      Object.assign(filtreq, { "profileDetails.professionalDetails.designation": this.getFilterDesignation(query) })
+    }
+    if (this.getFilterRoles(query) && this.getFilterRoles(query) !== 'undefind') {
+      Object.assign(filtreq, { "profileDetails.professionalDetails.role": this.getFilterRoles(query) })
+    }
+    if (this.getFilterTags(query) && this.getFilterTags(query) !== 'undefind') {
+      Object.assign(filtreq, { "profileDetails.professionalDetails.tag": this.getFilterTags(query) })
+    }
+    reqBody = {
+      request: {
+        filters: filtreq,
+        limit: this.limit,
+        offset: this.pageIndex,
+        query: this.getSearchText(query),
+        sort_by: this.getSortOrder(query)
+      },
+    }
+    this.usersService.getAllKongUsers(reqBody).subscribe((data: any) => {
       const allusersData = data.result.response
       this.activeUsersData = allusersData.content
       this.activeUsersData = this.activeUsersData.filter((wf: any) => wf.profileDetails.profileStatus !== 'NOT-MY-USER')
@@ -217,16 +241,35 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     })
   }
   async getVUsers(query: any) {
+    let reqBody
     this.loaderService.changeLoad.next(true)
     const filtreq = {
       rootOrgId: this.rootOrgId,
       'profileDetails.profileStatus': 'VERIFIED',
     }
+    if (this.getFilterGroup(query) && this.getFilterGroup(query) !== 'undefind') {
+      Object.assign(filtreq, { "profileDetails.professionalDetails.group": this.getFilterGroup(query) })
+    }
+    if (this.getFilterDesignation(query) && this.getFilterDesignation(query) !== 'undefind') {
+      Object.assign(filtreq, { "profileDetails.professionalDetails.designation": this.getFilterDesignation(query) })
+    }
+    if (this.getFilterRoles(query) && this.getFilterRoles(query) !== 'undefind') {
+      Object.assign(filtreq, { "profileDetails.professionalDetails.role": this.getFilterRoles(query) })
+    }
+    if (this.getFilterTags(query) && this.getFilterTags(query) !== 'undefind') {
+      Object.assign(filtreq, { "profileDetails.professionalDetails.tag": this.getFilterTags(query) })
+    }
 
-
-    const serchKey = query.searchText ? query.searchText : ''
-
-    this.usersService.getAllKongUsers(filtreq, this.limit, this.pageIndex, serchKey).subscribe((data: any) => {
+    reqBody = {
+      request: {
+        filters: filtreq,
+        limit: this.limit,
+        offset: this.pageIndex,
+        query: this.getSearchText(query),
+        sort_by: this.getSortOrder(query)
+      },
+    }
+    this.usersService.getAllKongUsers(reqBody).subscribe((data: any) => {
       const allusersData = data.result.response
       this.verifiedUsersData = allusersData.content
       this.verifiedUsersDataCount = data.result.response.count
@@ -242,16 +285,35 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   }
 
   async getNVUsers(query: any) {
+    let reqBody
     this.loaderService.changeLoad.next(true)
     const filtreq = {
       rootOrgId: this.rootOrgId,
       'profileDetails.profileStatus': 'NOT-VERIFIED',
     }
+    if (this.getFilterGroup(query) && this.getFilterGroup(query) !== 'undefind') {
+      Object.assign(filtreq, { "profileDetails.professionalDetails.group": this.getFilterGroup(query) })
+    }
+    if (this.getFilterDesignation(query) && this.getFilterDesignation(query) !== 'undefind') {
+      Object.assign(filtreq, { "profileDetails.professionalDetails.designation": this.getFilterDesignation(query) })
+    }
+    if (this.getFilterRoles(query) && this.getFilterRoles(query) !== 'undefind') {
+      Object.assign(filtreq, { "profileDetails.professionalDetails.role": this.getFilterRoles(query) })
+    }
+    if (this.getFilterTags(query) && this.getFilterTags(query) !== 'undefind') {
+      Object.assign(filtreq, { "profileDetails.professionalDetails.tag": this.getFilterTags(query) })
+    }
 
-
-    const serchKey = query.searchText ? query.searchText : ''
-
-    this.usersService.getAllKongUsers(filtreq, this.limit, this.pageIndex, serchKey).subscribe((data: any) => {
+    reqBody = {
+      request: {
+        filters: filtreq,
+        limit: this.limit,
+        offset: this.pageIndex,
+        query: this.getSearchText(query),
+        sort_by: this.getSortOrder(query)
+      },
+    }
+    this.usersService.getAllKongUsers(reqBody).subscribe((data: any) => {
       const allusersData = data.result.response
       this.nonverifiedUsersData = allusersData.content
       this.nonverifiedUsersDataCount = data.result.response.count
@@ -268,20 +330,82 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   }
 
   async getNMUsers(query: any) {
+    let reqBody
     this.loaderService.changeLoad.next(true)
     const filtreq = {
       rootOrgId: this.rootOrgId,
       'profileDetails.profileStatus': 'NOT-MY-USER',
     }
+    if (this.getFilterGroup(query) && this.getFilterGroup(query) !== 'undefind') {
+      Object.assign(filtreq, { "profileDetails.professionalDetails.group": this.getFilterGroup(query) })
+    }
+    if (this.getFilterDesignation(query) && this.getFilterDesignation(query) !== 'undefind') {
+      Object.assign(filtreq, { "profileDetails.professionalDetails.designation": this.getFilterDesignation(query) })
+    }
+    if (this.getFilterRoles(query) && this.getFilterRoles(query) !== 'undefind') {
+      Object.assign(filtreq, { "profileDetails.professionalDetails.role": this.getFilterRoles(query) })
+    }
+    if (this.getFilterTags(query) && this.getFilterTags(query) !== 'undefind') {
+      Object.assign(filtreq, { "profileDetails.professionalDetails.tag": this.getFilterTags(query) })
+    }
 
-    const serchKey = query.searchText ? query.searchText : ''
-    this.usersService.getAllKongUsers(filtreq, this.limit, this.pageIndex, serchKey).subscribe((data: any) => {
+    reqBody = {
+      request: {
+        filters: filtreq,
+        limit: this.limit,
+        offset: this.pageIndex,
+        query: this.getSearchText(query),
+        sort_by: this.getSortOrder(query)
+      },
+    }
+    this.usersService.getAllKongUsers(reqBody).subscribe((data: any) => {
       const allusersData = data.result.response
       this.notmyuserUsersData = allusersData.content
       this.notmyuserUsersDataCount = data.result.response.count
     })
   }
 
+  getFilterGroup(query: any) {
+    if (query && query.filters && (query.filters.group).length > 0) {
+      return query.filters.group
+    }
+  }
+  getFilterDesignation(query: any) {
+    if (query && query.filters && (query.filters.designation).length > 0) {
+      return query.filters.designation
+    }
+  }
+  getFilterRoles(query: any) {
+    if (query && query.filters && (query.filters.roles).length > 0) {
+      return query.filters.roles
+    }
+  }
+  getFilterTags(query: any) {
+    if (query && query.filters && (query.filters.tags.length > 0)) {
+      return query.filters.tags
+    }
+  }
+  getSearchText(query: any) {
+    return this.searchText = query && query.searchText ? query.searchText : ''
+  }
+  getSortOrder(query: any) {
+    let sort_by
+    if (query && query.sortOrder) {
+      sort_by = query.sortOrder
+      if (sort_by === "alphabetical") {
+        return { firstName: 'asc' }
+      }
+      else if (sort_by === "oldest") {
+        return { createdDate: "desc" }
+      }
+      else if (sort_by === "newest") {
+        return { createdDate: "asc" }
+      } else {
+        return { firstName: 'asc' }
+      }
+    }
+  }
+
   clickHandler(event: any) {
     switch (event.type) {
       case 'createUser':
diff --git a/project/ws/app/src/lib/routes/users/services/users.service.ts b/project/ws/app/src/lib/routes/users/services/users.service.ts
index a613f1797..6fae6f27a 100644
--- a/project/ws/app/src/lib/routes/users/services/users.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/users.service.ts
@@ -121,63 +121,78 @@ export class UsersService {
     return this.http.post<any>(`${API_END_POINTS.NEW_USER_UN_BLOCK_API}`, org)
   }
 
-  getAllKongUsers(filters: any, pageLimit: number = 20, offsetNum: number = 0, query?: any): Observable<any> {
-    let reqBody
-    // if (query && query.sortOrder=="alphabetical") {
-    //   reqBody = {
-    //     request: {
-    //       filters,
-    //       limit: pageLimit,
-    //       offset: offsetNum,
-    //       query: query.searchText,
-    //       sort_by: {
-    //         firstName: 'asc',
-    //       },
-    //     },
-    //   }
-    // }
-    // if (query && query.sortOrder == "oldest") {
-    //   reqBody = {
-    //     request: {
-    //       filters,
-    //       limit: pageLimit,
-    //       offset: offsetNum,
-    //       query: query.searchText,
-    //       sort_by: {
-    //         "createdOn": "desc"
-    //       },
-    //     },
-    //   }
-    // }
-    // if (query && query.sortOrder == "newest") {
-    //   reqBody = {
-    //     request: {
-    //       filters,
-    //       limit: pageLimit,
-    //       offset: offsetNum,
-    //       query: query.searchText,
-    //       sort_by: {
-    //         "createdOn": "asc",
-    //       },
-    //     },
-    //   }
-    // }
-    reqBody = {
-      request: {
-        filters,
-        limit: pageLimit,
-        offset: offsetNum,
-        query: query.searchText,
-        sort_by: { "firstName": "asc" }
-        //  ("firstName": "asc") ? (query.sortOrder == "alphabetical") :
-        // { "createdOn": "desc" ? (query.sortOrder == "oldest") : '' },
-        // { "createdOn": "asc" ? (query.sortOrder == "newest") : '' },
-        // (query.sortOrder == "alphabetical") ? ("firstName" : "asc")
+  // getAllKongUsers(filters: any, pageLimit: number = 20, offsetNum: number = 0, query?: any): Observable<any> {
+  // console.log('query--==+++', query)
+  // let reqBody
+  // if (query && query.sortOrder == "alphabetical") {
+  //   reqBody = {
+  //     request: {
+  //       filters,
+  //       limit: pageLimit,
+  //       offset: offsetNum,
+  //       query: query.searchText,
+  //       sort_by: {
+  //         firstName: 'asc',
+  //       },
+  //     },
+  //   }
+  // }
+  // if (query && query.sortOrder == "oldest") {
+  //   reqBody = {
+  //     request: {
+  //       filters,
+  //       limit: pageLimit,
+  //       offset: offsetNum,
+  //       query: query.searchText,
+  //       sort_by: {
+  //         "createdDate": "desc"
+  //       },
+  //     },
+  //   }
+  // }
+  // if (query && query.sortOrder == "newest") {
+  //   reqBody = {
+  //     request: {
+  //       filters,
+  //       limit: pageLimit,
+  //       offset: offsetNum,
+  //       query: query.searchText,
+  //       sort_by: {
+  //         "createdDate": "asc",
+  //       },
+  //     },
+  //   }
+  // }
+  // if (!query) {
+  //   reqBody = {
+  //     request: {
+  //       filters,
+  //       limit: pageLimit,
+  //       offset: offsetNum,
+  //       query: query.searchText,
+  //       sort_by: {
+  //         firstName: 'asc',
+  //       },
+  //     },
+  //   }
+  // }
+  // reqBody = {
+  //   request: {
+  //     filters,
+  //     limit: pageLimit,
+  //     offset: offsetNum,
+  //     query: query.searchText,
+  //     sort_by: { "firstName": "asc" }
+  //     //  ("firstName": "asc") ? (query.sortOrder == "alphabetical") :
+  //     // { "createdOn": "desc" ? (query.sortOrder == "oldest") : '' },
+  //     // { "createdOn": "asc" ? (query.sortOrder == "newest") : '' },
+  //     // (query.sortOrder == "alphabetical") ? ("firstName" : "asc")
 
 
 
-      }
-    }
+  //   }
+  // }
+  getAllKongUsers(reqBody: any): Observable<any> {
     return this.http.post<any>(`${API_END_POINTS.GET_ALL_USERS}`, reqBody)
     // return
   }

From 7027dad52f821667937d06b8406d987655749222 Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Mon, 17 Jun 2024 20:01:04 +0530
Subject: [PATCH 720/887] lint error fixed

---
 .../components/search/search.component.ts     |  4 +-
 .../user-cards/user-card.component.html       |  1 +
 .../user-cards/user-card.component.ts         |  8 +--
 .../routes/users-view/users-view.component.ts | 58 +++++++++----------
 .../routes/users/services/users.service.ts    |  2 -
 5 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.ts b/project/ws/app/src/lib/routes/home/components/search/search.component.ts
index e4cf2cda0..fa799eba9 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.ts
@@ -26,7 +26,7 @@ export class SearchComponent implements OnInit {
   pageSize = 20
   isContentLive = false
   filtersList: any
-  sortOrder: string = ''
+  sortOrder = ''
   constructor(
     // private route: ActivatedRoute,
     private usersSvc: UsersService,
@@ -117,7 +117,7 @@ export class SearchComponent implements OnInit {
     const filterKeys = {
       searchText: this.searchText,
       filters: this.filtersList,
-      sortOrder: this.sortOrder
+      sortOrder: this.sortOrder,
     }
     this.handleApiData.emit(filterKeys)
   }
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index ee92bfec3..24247dce0 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -21,6 +21,7 @@
                 <span *ngIf="!user?.profileDetails?.personalDetails">
                   {{user?.firstName}}
                 </span>
+
               </div>
               <div>
                 <span class="status-label margin-left-s verified"
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 420657845..3d13739fc 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -116,10 +116,10 @@ export class UserCardComponent implements OnInit, OnChanges {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-    private dialog: MatDialog, private approvalSvc: ApprovalsService,
-    private route: ActivatedRoute, private snackBar: MatSnackBar,
-    private events: EventService,
-    private datePipe: DatePipe) {
+              private dialog: MatDialog, private approvalSvc: ApprovalsService,
+              private route: ActivatedRoute, private snackBar: MatSnackBar,
+              private events: EventService,
+              private datePipe: DatePipe) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 5f4b6f3b6..5927f7450 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -69,7 +69,6 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   sortOrder: any
   searchText = ''
 
-
   constructor(
     public dialog: MatDialog,
     private route: ActivatedRoute,
@@ -204,16 +203,16 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       status: 1,
     }
     if (this.getFilterGroup(query) && this.getFilterGroup(query) !== 'undefind') {
-      Object.assign(filtreq, { "profileDetails.professionalDetails.group": this.getFilterGroup(query) })
+      Object.assign(filtreq, { 'profileDetails.professionalDetails.group': this.getFilterGroup(query) })
     }
     if (this.getFilterDesignation(query) && this.getFilterDesignation(query) !== 'undefind') {
-      Object.assign(filtreq, { "profileDetails.professionalDetails.designation": this.getFilterDesignation(query) })
+      Object.assign(filtreq, { 'profileDetails.professionalDetails.designation': this.getFilterDesignation(query) })
     }
     if (this.getFilterRoles(query) && this.getFilterRoles(query) !== 'undefind') {
-      Object.assign(filtreq, { "profileDetails.professionalDetails.role": this.getFilterRoles(query) })
+      Object.assign(filtreq, { 'profileDetails.professionalDetails.role': this.getFilterRoles(query) })
     }
     if (this.getFilterTags(query) && this.getFilterTags(query) !== 'undefind') {
-      Object.assign(filtreq, { "profileDetails.professionalDetails.tag": this.getFilterTags(query) })
+      Object.assign(filtreq, { 'profileDetails.professionalDetails.tag': this.getFilterTags(query) })
     }
     reqBody = {
       request: {
@@ -221,7 +220,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
         limit: this.limit,
         offset: this.pageIndex,
         query: this.getSearchText(query),
-        sort_by: this.getSortOrder(query)
+        sort_by: this.getSortOrder(query),
       },
     }
     this.usersService.getAllKongUsers(reqBody).subscribe((data: any) => {
@@ -248,16 +247,16 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       'profileDetails.profileStatus': 'VERIFIED',
     }
     if (this.getFilterGroup(query) && this.getFilterGroup(query) !== 'undefind') {
-      Object.assign(filtreq, { "profileDetails.professionalDetails.group": this.getFilterGroup(query) })
+      Object.assign(filtreq, { 'profileDetails.professionalDetails.group': this.getFilterGroup(query) })
     }
     if (this.getFilterDesignation(query) && this.getFilterDesignation(query) !== 'undefind') {
-      Object.assign(filtreq, { "profileDetails.professionalDetails.designation": this.getFilterDesignation(query) })
+      Object.assign(filtreq, { 'profileDetails.professionalDetails.designation': this.getFilterDesignation(query) })
     }
     if (this.getFilterRoles(query) && this.getFilterRoles(query) !== 'undefind') {
-      Object.assign(filtreq, { "profileDetails.professionalDetails.role": this.getFilterRoles(query) })
+      Object.assign(filtreq, { 'profileDetails.professionalDetails.role': this.getFilterRoles(query) })
     }
     if (this.getFilterTags(query) && this.getFilterTags(query) !== 'undefind') {
-      Object.assign(filtreq, { "profileDetails.professionalDetails.tag": this.getFilterTags(query) })
+      Object.assign(filtreq, { 'profileDetails.professionalDetails.tag': this.getFilterTags(query) })
     }
 
     reqBody = {
@@ -266,7 +265,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
         limit: this.limit,
         offset: this.pageIndex,
         query: this.getSearchText(query),
-        sort_by: this.getSortOrder(query)
+        sort_by: this.getSortOrder(query),
       },
     }
     this.usersService.getAllKongUsers(reqBody).subscribe((data: any) => {
@@ -292,16 +291,16 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       'profileDetails.profileStatus': 'NOT-VERIFIED',
     }
     if (this.getFilterGroup(query) && this.getFilterGroup(query) !== 'undefind') {
-      Object.assign(filtreq, { "profileDetails.professionalDetails.group": this.getFilterGroup(query) })
+      Object.assign(filtreq, { 'profileDetails.professionalDetails.group': this.getFilterGroup(query) })
     }
     if (this.getFilterDesignation(query) && this.getFilterDesignation(query) !== 'undefind') {
-      Object.assign(filtreq, { "profileDetails.professionalDetails.designation": this.getFilterDesignation(query) })
+      Object.assign(filtreq, { 'profileDetails.professionalDetails.designation': this.getFilterDesignation(query) })
     }
     if (this.getFilterRoles(query) && this.getFilterRoles(query) !== 'undefind') {
-      Object.assign(filtreq, { "profileDetails.professionalDetails.role": this.getFilterRoles(query) })
+      Object.assign(filtreq, { 'profileDetails.professionalDetails.role': this.getFilterRoles(query) })
     }
     if (this.getFilterTags(query) && this.getFilterTags(query) !== 'undefind') {
-      Object.assign(filtreq, { "profileDetails.professionalDetails.tag": this.getFilterTags(query) })
+      Object.assign(filtreq, { 'profileDetails.professionalDetails.tag': this.getFilterTags(query) })
     }
 
     reqBody = {
@@ -310,7 +309,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
         limit: this.limit,
         offset: this.pageIndex,
         query: this.getSearchText(query),
-        sort_by: this.getSortOrder(query)
+        sort_by: this.getSortOrder(query),
       },
     }
     this.usersService.getAllKongUsers(reqBody).subscribe((data: any) => {
@@ -337,16 +336,16 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       'profileDetails.profileStatus': 'NOT-MY-USER',
     }
     if (this.getFilterGroup(query) && this.getFilterGroup(query) !== 'undefind') {
-      Object.assign(filtreq, { "profileDetails.professionalDetails.group": this.getFilterGroup(query) })
+      Object.assign(filtreq, { 'profileDetails.professionalDetails.group': this.getFilterGroup(query) })
     }
     if (this.getFilterDesignation(query) && this.getFilterDesignation(query) !== 'undefind') {
-      Object.assign(filtreq, { "profileDetails.professionalDetails.designation": this.getFilterDesignation(query) })
+      Object.assign(filtreq, { 'profileDetails.professionalDetails.designation': this.getFilterDesignation(query) })
     }
     if (this.getFilterRoles(query) && this.getFilterRoles(query) !== 'undefind') {
-      Object.assign(filtreq, { "profileDetails.professionalDetails.role": this.getFilterRoles(query) })
+      Object.assign(filtreq, { 'profileDetails.professionalDetails.role': this.getFilterRoles(query) })
     }
     if (this.getFilterTags(query) && this.getFilterTags(query) !== 'undefind') {
-      Object.assign(filtreq, { "profileDetails.professionalDetails.tag": this.getFilterTags(query) })
+      Object.assign(filtreq, { 'profileDetails.professionalDetails.tag': this.getFilterTags(query) })
     }
 
     reqBody = {
@@ -355,7 +354,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
         limit: this.limit,
         offset: this.pageIndex,
         query: this.getSearchText(query),
-        sort_by: this.getSortOrder(query)
+        sort_by: this.getSortOrder(query),
       },
     }
     this.usersService.getAllKongUsers(reqBody).subscribe((data: any) => {
@@ -389,20 +388,19 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     return this.searchText = query && query.searchText ? query.searchText : ''
   }
   getSortOrder(query: any) {
-    let sort_by
+    let sortBy
     if (query && query.sortOrder) {
-      sort_by = query.sortOrder
-      if (sort_by === "alphabetical") {
+      sortBy = query.sortOrder
+      if (sortBy === 'alphabetical') {
         return { firstName: 'asc' }
       }
-      else if (sort_by === "oldest") {
-        return { createdDate: "desc" }
+      if (sortBy === 'oldest') {
+        return { createdDate: 'desc' }
       }
-      else if (sort_by === "newest") {
-        return { createdDate: "asc" }
-      } else {
-        return { firstName: 'asc' }
+      if (sortBy === 'newest') {
+        return { createdDate: 'asc' }
       }
+      return { firstName: 'asc' }
     }
   }
 
diff --git a/project/ws/app/src/lib/routes/users/services/users.service.ts b/project/ws/app/src/lib/routes/users/services/users.service.ts
index 6fae6f27a..2b906c503 100644
--- a/project/ws/app/src/lib/routes/users/services/users.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/users.service.ts
@@ -188,8 +188,6 @@ export class UsersService {
   //     // { "createdOn": "asc" ? (query.sortOrder == "newest") : '' },
   //     // (query.sortOrder == "alphabetical") ? ("firstName" : "asc")
 
-
-
   //   }
   // }
   getAllKongUsers(reqBody: any): Observable<any> {

From 451ec86ca25e4b4d7dd344df9fe7a18755b36fee Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Tue, 18 Jun 2024 09:57:10 +0530
Subject: [PATCH 721/887] lint fixes

---
 .../home/components/filter/filter.component.ts   | 14 ++++++--------
 .../create-request-form.component.ts             |  2 +-
 .../request-list/request-list.component.ts       | 16 ++++++++--------
 .../approval-pending.component.ts                |  2 +-
 .../create-content/create-content.component.ts   | 10 ++++------
 5 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
index 92ec24f23..f4b9146ba 100644
--- a/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
@@ -126,7 +126,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
       this.groupList.forEach((groupName: any) => {
         if (groupName.toUpperCase().includes(searchKey)) {
           const formatedGroup: any = {
-            name: groupName
+            name: groupName,
           }
           if (this.assigneeFilterObj['group'] && this.assigneeFilterObj['group'].indexOf(groupName) > -1) {
             formatedGroup['selected'] = true
@@ -146,7 +146,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
       this.designationList.forEach((designation: any) => {
         if (designation.name.toUpperCase().includes(searchKey)) {
           const formatedDesignation: any = {
-            name: designation.name
+            name: designation.name,
           }
           if (this.assigneeFilterObj['designation'] && this.assigneeFilterObj['designation'].indexOf(designation.name) > -1) {
             formatedDesignation['selected'] = true
@@ -166,7 +166,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
       this.rolesList.forEach((rolesName: any) => {
         if (rolesName.toUpperCase().includes(searchKey)) {
           const formatedRoles: any = {
-            name: rolesName
+            name: rolesName,
           }
           if (this.assigneeFilterObj['roles'] && this.assigneeFilterObj['roles'].indexOf(rolesName) > -1) {
             formatedRoles['selected'] = true
@@ -186,7 +186,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
       this.tagsList.forEach((tagsName: any) => {
         if (tagsName.toUpperCase().includes(searchKey)) {
           const formatedTags: any = {
-            name: tagsName
+            name: tagsName,
           }
           if (this.assigneeFilterObj['tags'] && this.assigneeFilterObj['tags'].indexOf(tagsName) > -1) {
             formatedTags['selected'] = true
@@ -233,8 +233,8 @@ export class FilterComponent implements OnInit, AfterContentChecked {
 
   hideFilter(filter: string) {
     const event = {
-      filter: filter,
-      filtersList: this.assigneeFilterObj
+      filter,
+      filtersList: this.assigneeFilterObj,
     }
     this.toggleFilter.emit(event)
     this.usersSvc.filterToggle.next({ from: '', status: false })
@@ -610,8 +610,6 @@ export class FilterComponent implements OnInit, AfterContentChecked {
       // })
     }
 
-
-
     // if (this.designationList) {
     //   this.designationList.map((pitem: any) => {
     //     if (pitem && pitem['selected']) {
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
index e7317b52c..b8da24381 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
@@ -489,7 +489,7 @@ view(item?: any) {
       data: {
         type: 'conformation',
         icon: 'radio_on',
-        title:  this.actionBtnName === 'reassign'? 'Are you sure you want to Re-assign?': 'Are you sure you want to Create a demand?',
+        title:  this.actionBtnName === 'reassign' ? 'Are you sure you want to Re-assign?' : 'Are you sure you want to Create a demand?',
         // subTitle: 'You wont be able to revert this',
         primaryAction: 'Confirm',
         secondaryAction: 'Cancel',
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
index a5ad2faba..59765fb19 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
@@ -13,7 +13,7 @@ export enum statusValue {
   Unassigned = 'Unassigned',
   Inprogress = 'InProgress',
   invalid = 'Invalid',
-  fullfill='Fulfill'
+  fullfill= 'Fulfill',
 }
 @Component({
   selector: 'ws-app-request-list',
@@ -91,14 +91,14 @@ export class RequestListComponent implements OnInit {
   }
 
   handleClick(element: any): void {
-    if(element.status && element.status.length > 0){
-      if (element.status !== this.statusKey.Inprogress && 
-        element.status !== this.statusKey.invalid && 
+    if (element.status && element.status.length > 0) {
+      if (element.status !== this.statusKey.Inprogress &&
+        element.status !== this.statusKey.invalid &&
         element.status !== this.statusKey.fullfill) {
-        this.onClickMenu(element, 'assignContent');
+        this.onClickMenu(element, 'assignContent')
     }
     }
-   
+
 }
 
   hasAccess() {
@@ -218,10 +218,10 @@ export class RequestListComponent implements OnInit {
    }
    this.homeService.markAsInvalid(request).subscribe(res => {
      this.invalidRes = res
-     if(res){
+     if (res) {
       this.getRequestList()
      }
-     
+
      this.snackBar.open('Marked as Invalid')
     }
   )
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
index 960f14229..06052fccf 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
@@ -236,7 +236,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   replaceWords(inputString: any, wordConditions: any) {
     return wordConditions.reduce((acc: any, [word, condition]: any) => {
       return acc.replace(new RegExp(word, 'gi'), condition)
-    }, inputString)
+    },                           inputString)
   }
 
   onSearch(enterValue: any) {
diff --git a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
index 8c2566033..4bcbc6710 100644
--- a/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
+++ b/project/ws/app/src/lib/routes/training-plan/routes/create-content/create-content.component.ts
@@ -19,16 +19,16 @@ export class CreateContentComponent implements OnInit {
   selectContentCount = 0
   pageIndex: any
   pageSize: any
-  count = 0;
-  queryParams:any;
-  dialogRef:any;
+  count = 0
+  queryParams: any
+  dialogRef: any
    /* tslint:disable */
   confirmationText:string = 'You have unsaved progress on your CBP plan. Clicking "Yes" will discard it and take you to request new content screen. Would you like to continue?'
   /* tslint:enable */
 
   constructor(private tpdsSvc: TrainingPlanDataSharingService, public dialog: MatDialog,
     //  private snackbar: MatSnackBar,
-    private router: Router
+              private router: Router
   ) { }
 
   ngOnInit() {
@@ -158,6 +158,4 @@ export class CreateContentComponent implements OnInit {
     })
   }
 
-
-  
 }

From a53f8c69b17af08670862aa486e81b8e62c12109 Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Tue, 18 Jun 2024 11:28:26 +0530
Subject: [PATCH 722/887] approval page ui fix for different screen resolution

---
 .../user-cards/user-card.component.html       | 45 ++++++++++---------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 97457c813..e35869373 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -593,16 +593,19 @@
                       <mat-icon class="nonverified-icon margin-left-s"
                         *ngIf="field.action === 'REJECT'">cancel</mat-icon>
                     </span>
-                    <mat-radio-group aria-label="Select an option" name="approveGroup" formControlName="approveGroup"
-                      class="mat-caption margin-top-s">
-                      <mat-radio-button value="approvegroup" class="margin-right-s"
-                        (click)="onClickHandleWorkflow(field,'APPROVE')">Approve</mat-radio-button>
-                      <mat-radio-button value="rejectgroup"
-                        (click)="onClickHandleWorkflow(field,'REJECT')">Reject</mat-radio-button>
-                      <mat-icon class="margin-left-m editreasonicon cursor-pointer"
-                        *ngIf="field.action === 'REJECT' && comment !== ''"
-                        (click)="updateRejection(field)">chat_bubble</mat-icon>
-                    </mat-radio-group>
+                    <div class="flex flex-1">
+                      <mat-radio-group aria-label="Select an option" name="approveGroup" formControlName="approveGroup"
+                        class="mat-caption">
+                        <mat-radio-button value="approvegroup" class="margin-right-s"
+                          (click)="onClickHandleWorkflow(field,'APPROVE')">Approve</mat-radio-button>
+                        <mat-radio-button value="rejectgroup"
+                          (click)="onClickHandleWorkflow(field,'REJECT')">Reject</mat-radio-button>
+                        <mat-icon class="margin-left-m editreasonicon cursor-pointer"
+                          *ngIf="field.action === 'REJECT' && comment !== ''"
+                          (click)="updateRejection(field)">chat_bubble</mat-icon>
+                      </mat-radio-group>
+                    </div>
+
                   </div>
                 </div>
                 <div class="md:w-1/3 margin-bottom-s" *ngIf="field.label === 'Designation'">
@@ -616,16 +619,18 @@
                       <mat-icon class="nonverified-icon margin-left-s"
                         *ngIf="field.action === 'REJECT'">cancel</mat-icon>
                     </span>
-                    <mat-radio-group aria-label="Select an option" name="approveDesignation"
-                      formControlName="approveDesignation" class="mat-caption margin-top-s">
-                      <mat-radio-button value="approvedesg" class="margin-right-s"
-                        (click)="onClickHandleWorkflow(field,'APPROVE')">Approve</mat-radio-button>
-                      <mat-radio-button value="rejectdesg"
-                        (click)="onClickHandleWorkflow(field,'REJECT')">Reject</mat-radio-button>
-                      <mat-icon class="margin-left-m editreasonicon cursor-pointer"
-                        *ngIf="field.action === 'REJECT' && comment !== ''"
-                        (click)="updateRejection(field)">chat_bubble</mat-icon>
-                    </mat-radio-group>
+                    <div class="flex flex-1">
+                      <mat-radio-group aria-label="Select an option" name="approveDesignation"
+                        formControlName="approveDesignation" class="mat-caption">
+                        <mat-radio-button value="approvedesg" class="margin-right-s"
+                          (click)="onClickHandleWorkflow(field,'APPROVE')">Approve</mat-radio-button>
+                        <mat-radio-button value="rejectdesg"
+                          (click)="onClickHandleWorkflow(field,'REJECT')">Reject</mat-radio-button>
+                        <mat-icon class="margin-left-m editreasonicon cursor-pointer"
+                          *ngIf="field.action === 'REJECT' && comment !== ''"
+                          (click)="updateRejection(field)">chat_bubble</mat-icon>
+                      </mat-radio-group>
+                    </div>
                   </div>
                 </div>
               </ng-container>

From 06ab029f7c801a050dc377b21cd09a355a02e1df Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Tue, 18 Jun 2024 12:43:46 +0530
Subject: [PATCH 723/887] Filter facets integration

---
 .../components/filter/filter.component.ts     | 62 ++++++++++---------
 .../components/search/search.component.html   |  5 +-
 .../components/search/search.component.ts     |  1 +
 .../users-view/users-view.component.html      |  5 +-
 .../routes/users-view/users-view.component.ts | 10 ++-
 5 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
index f4b9146ba..9bc1a4622 100644
--- a/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
@@ -16,6 +16,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
   @Output() toggleFilter = new EventEmitter()
   // @Output() getFilterData = new EventEmitter()
   @Input() from: any
+  @Input() filterFacetsData: any
   designationList: any = []
   providersList: any[] = []
   selectedProviders: any[] = []
@@ -51,41 +52,46 @@ export class FilterComponent implements OnInit, AfterContentChecked {
   }
 
   ngOnInit() {
+    this.designationList = this.filterFacetsData.designation
+    this.groupList = this.filterFacetsData.group
+    this.rolesList = this.filterFacetsData.rolesList
+    this.tagsList = this.filterFacetsData.tagsList
+
     if (!this.usersSvc.filterToggle) { return }
     this.usersSvc.filterToggle.subscribe((data: any) => {
       if (data && data.status) {
-        if (data.from === 'content') {
-          this.getFilterEntity()
-          // this.getProviders()
-        } else {
-          // if(this.usersSvc.trainingPlanAssigneeData &&
-          //   this.usersSvc.trainingPlanAssigneeData.category === 'Custom Users') {
-          //   this.getDesignation();
-          // }
-          if (!this.designationList.length) {
-            this.getDesignation()
-          } else {
-            this.getFilteredDesignationList()
-          }
+        // if (data.from === 'content') {
+        //   this.getFilterEntity()
+        // this.getProviders()
+        // } else {
+        // if(this.usersSvc.trainingPlanAssigneeData &&
+        //   this.usersSvc.trainingPlanAssigneeData.category === 'Custom Users') {
+        //   this.getDesignation();
+        // }
+        if (this.designationList.length) {
+          //   this.getDesignation()
+          // } else {
+          this.getFilteredDesignationList()
+        }
 
-          if (!this.groupList.length) {
-            this.loadGroups()
-          } else {
-            this.getFilteredGroupList()
-          }
+        if (this.groupList.length) {
+          //   this.loadGroups()
+          // } else {
+          this.getFilteredGroupList()
+        }
 
-          if (!this.rolesList.length) {
-            this.loadRoles()
-          } else {
-            this.getFilteredRolesList()
-          }
+        if (this.rolesList.length) {
+          //   this.loadRoles()
+          // } else {
+          this.getFilteredRolesList()
+        }
 
-          if (!this.tagsList.length) {
-            this.loadTags()
-          } else {
-            this.getFilteredTagsList()
-          }
+        if (this.tagsList.length) {
+          //   this.loadTags()
+          // } else {
+          this.getFilteredTagsList()
         }
+        // }
       }
     })
 
diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.html b/project/ws/app/src/lib/routes/home/components/search/search.component.html
index d94388230..d33e40ac3 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.html
@@ -26,7 +26,7 @@
             </ng-template>
         </mat-menu>
     </div>
-    <div class="filter-section flex">
+    <div class="filter-section flex" *ngIf="!isApprovals">
         <button mat-button type="button" (click)="openFilter()" class="apply-filter margin-right-s">
             Apply Filter <mat-icon class="margin-right-xs">filter_list</mat-icon>
         </button>
@@ -46,5 +46,6 @@
 </div>
 
 <div [hidden]="!filterVisibilityFlag">
-    <ws-app-filter [from]="from" (toggleFilter)="hideFilter($event)"></ws-app-filter>
+    <ws-app-filter [from]="from" (toggleFilter)="hideFilter($event)"
+        [filterFacetsData]="filterFacetsData"></ws-app-filter>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.ts b/project/ws/app/src/lib/routes/home/components/search/search.component.ts
index 9faef07cd..01ac0dcad 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.ts
@@ -17,6 +17,7 @@ export class SearchComponent implements OnInit {
   @Input() showBulkUpdate: any
   @Input() disableApproveALL: any
   @Input() currentFilter: any
+  @Input() filterFacetsData: any
   @Output() handleApiData = new EventEmitter()
   @Output() handleapproveAll = new EventEmitter()
   searchText = ''
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index a7655ea81..71403dfc9 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -80,16 +80,13 @@
       <ng-container *ngIf="currentFilter === 'allusers'">
         <div class="searchfilter">
           <ws-app-searchuser (handleApiData)="onEnterkySearch($event)" [showApproveALL]="showApproveALL"
-            [currentFilter]="currentFilter"></ws-app-searchuser>
+            [currentFilter]="currentFilter" [filterFacetsData]="filterFacets"></ws-app-searchuser>
         </div>
         <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="activeUsersData"
           [totalRecords]="activeUsersDataCount" [tabChangeIndex]="pageIndex" [isApprovals]="false"
           (paginationData)="onPaginateChange($event)" (updateList)="getAllUsers('')"></ws-widget-user-card>
-
       </ng-container>
 
-
-
       <ng-container *ngIf="currentFilter === 'verified'">
         <div class="searchfilter">
           <ws-app-searchuser (handleApiData)="onEnterkySearch($event)" [showApproveALL]="showApproveALL"
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 5cdd8dec8..dfe7a1fa7 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -68,6 +68,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   filterTags = []
   sortOrder: any
   searchText = ''
+  filterFacets = []
 
   constructor(
     public dialog: MatDialog,
@@ -217,6 +218,12 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     reqBody = {
       request: {
         filters: filtreq,
+        facets: [
+          'profileDetails.professionalDetails.group',
+          'profileDetails.professionalDetails.designation',
+          'profileDetails.additionalDetails.tag',
+          'profileDetails.organisations[0].roles',
+        ],
         limit: this.limit,
         offset: this.pageIndex,
         query: this.getSearchText(query),
@@ -228,6 +235,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       this.activeUsersData = allusersData.content
       // this.activeUsersData = this.activeUsersData.filter((wf: any) => wf.profileDetails.profileStatus !== 'NOT-MY-USER')
       this.activeUsersDataCount = allusersData.count
+      this.filterFacets = allusersData.facets
       // const i = this.activeUsersData.findIndex((wf: any) => wf.userId === this.currentUser)
       // if (i > -1) {
       //   this.activeUsersData.splice(i, 1)
@@ -400,8 +408,8 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       if (sortBy === 'newest') {
         return { createdDate: 'asc' }
       }
-      return { firstName: 'asc' }
     }
+    return { firstName: 'asc' }
   }
 
   clickHandler(event: any) {

From 629bf9ff23da39ed1f2dff53f72e2815e938d42e Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Tue, 18 Jun 2024 12:44:53 +0530
Subject: [PATCH 724/887] Lint error due to service function update

---
 .../routes/users-view/all-users/all-users.component.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.ts
index e365a5bde..b654e33a4 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.ts
@@ -210,8 +210,16 @@ export class AllUsersComponent implements OnInit, OnDestroy {
         'profileDetails.profileStatus': 'NOT-VERIFIED',
       }
     }
+    const reqBody = {
+      request: {
+        filters: filtreq,
+        limit: this.limit,
+        offset: this.pageIndex,
+        query: query,
+      },
+    }
 
-    this.usersService.getAllKongUsers(filtreq, this.limit, this.pageIndex, query).subscribe((data: any) => {
+    this.usersService.getAllKongUsers(reqBody).subscribe((data: any) => {
       this.usersData = data.result.response
       if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
         _.filter(this.usersData.content, { isDeleted: false }).forEach((user: any) => {

From 844324d2ae6331dda29be39ee1a0a873f932d413 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Tue, 18 Jun 2024 12:59:07 +0530
Subject: [PATCH 725/887] Updated conditions

---
 .../home/components/filter/filter.component.ts  | 17 +++++++++--------
 .../routes/users-view/users-view.component.ts   |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
index 9bc1a4622..08b315eb7 100644
--- a/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
@@ -52,10 +52,11 @@ export class FilterComponent implements OnInit, AfterContentChecked {
   }
 
   ngOnInit() {
-    this.designationList = this.filterFacetsData.designation
-    this.groupList = this.filterFacetsData.group
-    this.rolesList = this.filterFacetsData.rolesList
-    this.tagsList = this.filterFacetsData.tagsList
+    this.designationList = this.filterFacetsData.designation && this.filterFacetsData.designation.length > 0 ?
+      this.filterFacetsData.designation : []
+    this.groupList = this.filterFacetsData.group && this.filterFacetsData.group.length > 0 ? this.filterFacetsData.group : []
+    this.rolesList = this.filterFacetsData.rolesList && this.filterFacetsData.rolesList > 0 ? this.filterFacetsData.rolesList : []
+    this.tagsList = this.filterFacetsData.tagsList && this.filterFacetsData.tagsList > 0 ? this.filterFacetsData.tagsList : []
 
     if (!this.usersSvc.filterToggle) { return }
     this.usersSvc.filterToggle.subscribe((data: any) => {
@@ -68,25 +69,25 @@ export class FilterComponent implements OnInit, AfterContentChecked {
         //   this.usersSvc.trainingPlanAssigneeData.category === 'Custom Users') {
         //   this.getDesignation();
         // }
-        if (this.designationList.length) {
+        if (this.designationList && this.designationList.length > 0) {
           //   this.getDesignation()
           // } else {
           this.getFilteredDesignationList()
         }
 
-        if (this.groupList.length) {
+        if (this.groupList && this.groupList.length > 0) {
           //   this.loadGroups()
           // } else {
           this.getFilteredGroupList()
         }
 
-        if (this.rolesList.length) {
+        if (this.rolesList && this.rolesList.length > 0) {
           //   this.loadRoles()
           // } else {
           this.getFilteredRolesList()
         }
 
-        if (this.tagsList.length) {
+        if (this.tagsList && this.tagsList.length > 0) {
           //   this.loadTags()
           // } else {
           this.getFilteredTagsList()
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index dfe7a1fa7..030f7c276 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -235,7 +235,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       this.activeUsersData = allusersData.content
       // this.activeUsersData = this.activeUsersData.filter((wf: any) => wf.profileDetails.profileStatus !== 'NOT-MY-USER')
       this.activeUsersDataCount = allusersData.count
-      this.filterFacets = allusersData.facets
+      this.filterFacets = allusersData.facets ? allusersData.facets : []
       // const i = this.activeUsersData.findIndex((wf: any) => wf.userId === this.currentUser)
       // if (i > -1) {
       //   this.activeUsersData.splice(i, 1)

From ab44c809aa5cbb4bc441ddeeeb15cfdbc2c80f4d Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Tue, 18 Jun 2024 17:54:40 +0530
Subject: [PATCH 726/887] Updated bulk upload files for csv file support & api

---
 .../approvals/bulk-upload/bulk-upload.component.html      | 8 ++++----
 .../users-view/bulk-upload/bulk-upload.component.html     | 8 ++++----
 .../app/src/lib/routes/users/services/upload.service.ts   | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
index 30a4059a9..456241b89 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
@@ -15,7 +15,7 @@
               <li>Download the Sample File ZIP.</li>
               <li>Fill in user details in the Sample File.</li>
               <li>Verify via OTP.</li>
-              <li>Upload the populated sample file.</li>
+              <li>Upload the populated sample csv file.</li>
               <li>Check the upload results for confirmation.</li>
             </ol>
           </div>
@@ -30,18 +30,18 @@
             (dblclick)="$event.preventDefault()">
             <img src="/assets/icons/csv-file.svg" alt="CSV file logo" />
           </div>
-          <div *ngIf="showFileError" class="error-msg">Upload xlsx format file only</div>
+          <div *ngIf="showFileError" class="error-msg">Upload csv format file only</div>
           <div class="flex flex-col items-center">
             <div class="text-primary cursor-pointer" (click)="fileInput.click()" (dblclick)="$event.preventDefault()">
               Browse files</div>
             <input hidden type="file" #fileInput (click)="handleFileClick($event)" (change)="handleOnFileChange($event)"
-              name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();" accept=".xlsx, .xls" />
+              name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();" accept=".csv" />
             <!-- <div class="flex">or</div>
             <div class="flex">Drag file to upload</div> -->
           </div>
           <div class="flex flex-col items-center margin-bottom-m">
             <div class="flex">Max file size: 100 MB</div>
-            <div class="flex">Supported file types: xlsx</div>
+            <div class="flex">Supported file types: csv</div>
           </div>
         </div>
       </div>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
index e46bee73a..86ea1bc48 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
@@ -10,7 +10,7 @@
               <li>Download the Sample File ZIP.</li>
               <li>Fill in user details in the Sample File.</li>
               <li>Verify via OTP.</li>
-              <li>Upload the populated sample file.</li>
+              <li>Upload the populated sample csv file.</li>
               <li>Check the upload results for confirmation.</li>
             </ol>
           </div>
@@ -25,18 +25,18 @@
             (dblclick)="$event.preventDefault()">
             <img src="/assets/icons/csv-file.svg" alt="CSV file logo" />
           </div>
-          <div *ngIf="showFileError" class="error-msg">Upload xlsx format file only</div>
+          <div *ngIf="showFileError" class="error-msg">Upload csv format file only</div>
           <div class="flex flex-col items-center">
             <div class="text-primary cursor-pointer" (click)="fileInput.click()" (dblclick)="$event.preventDefault()">
               Browse files</div>
             <input hidden type="file" #fileInput (click)="handleFileClick($event)" (change)="handleOnFileChange($event)"
-              name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();" accept=".xlsx, .xls" />
+              name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();" accept=".csv" />
             <!-- <div class="flex">or</div>
             <div class="flex">Drag file to upload</div> -->
           </div>
           <div class="flex flex-col items-center margin-bottom-m">
             <div class="flex">Max file size: 100 MB</div>
-            <div class="flex">Supported file types: xlsx</div>
+            <div class="flex">Supported file types: csv</div>
           </div>
         </div>
       </div>
diff --git a/project/ws/app/src/lib/routes/users/services/upload.service.ts b/project/ws/app/src/lib/routes/users/services/upload.service.ts
index 5d563e83d..0ec11541f 100644
--- a/project/ws/app/src/lib/routes/users/services/upload.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/upload.service.ts
@@ -5,7 +5,7 @@ import { HttpClient } from '@angular/common/http'
 import * as fileSaver from 'file-saver'
 
 const API_ENDPOINTS = {
-  bulkUpload: `/apis/proxies/v8/user/v1/bulkupload`,
+  bulkUpload: `/apis/proxies/v8/user/v2/bulkupload`,
   downloadReport: `/apis/protected/v8/admin/userRegistration/bulkUploadReport`,
   getBulkUploadData: '/apis/proxies/v8/user/v1/bulkupload',
   getBulkApproval: '/apis/proxies/v8/workflow/admin/bulkupdate/getstatus',

From bc4bb8415fbc9139bc5af0c1fe5f5815c4be726c Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Tue, 18 Jun 2024 18:09:36 +0530
Subject: [PATCH 727/887] facets issue fix

---
 .../components/filter/filter.component.ts     | 13 ++++---
 .../components/search/search.component.html   |  3 +-
 .../approval-pending.component.ts             | 38 ++++++++++++++++---
 .../users-view/users-view.component.html      |  6 +--
 .../routes/users-view/users-view.component.ts | 16 +++++++-
 5 files changed, 61 insertions(+), 15 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
index 08b315eb7..ccf15bb44 100644
--- a/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
@@ -52,11 +52,14 @@ export class FilterComponent implements OnInit, AfterContentChecked {
   }
 
   ngOnInit() {
-    this.designationList = this.filterFacetsData.designation && this.filterFacetsData.designation.length > 0 ?
-      this.filterFacetsData.designation : []
-    this.groupList = this.filterFacetsData.group && this.filterFacetsData.group.length > 0 ? this.filterFacetsData.group : []
-    this.rolesList = this.filterFacetsData.rolesList && this.filterFacetsData.rolesList > 0 ? this.filterFacetsData.rolesList : []
-    this.tagsList = this.filterFacetsData.tagsList && this.filterFacetsData.tagsList > 0 ? this.filterFacetsData.tagsList : []
+    if (this.filterFacetsData) {
+      this.designationList = this.filterFacetsData.designation && this.filterFacetsData.designation.length > 0 ?
+        this.filterFacetsData.designation : []
+      this.groupList = this.filterFacetsData.group && this.filterFacetsData.group.length > 0 ? this.filterFacetsData.group : []
+      this.rolesList = this.filterFacetsData.rolesList && this.filterFacetsData.rolesList > 0 ? this.filterFacetsData.rolesList : []
+      this.tagsList = this.filterFacetsData.tagsList && this.filterFacetsData.tagsList > 0 ? this.filterFacetsData.tagsList : []
+    }
+
 
     if (!this.usersSvc.filterToggle) { return }
     this.usersSvc.filterToggle.subscribe((data: any) => {
diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.html b/project/ws/app/src/lib/routes/home/components/search/search.component.html
index d33e40ac3..c8c91b1ed 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.html
@@ -27,6 +27,7 @@
         </mat-menu>
     </div>
     <div class="filter-section flex" *ngIf="!isApprovals">
+
         <button mat-button type="button" (click)="openFilter()" class="apply-filter margin-right-s">
             Apply Filter <mat-icon class="margin-right-xs">filter_list</mat-icon>
         </button>
@@ -45,7 +46,7 @@
     </div>
 </div>
 
-<div [hidden]="!filterVisibilityFlag">
+<div [hidden]="!filterVisibilityFlag" *ngIf="!isApprovals">
     <ws-app-filter [from]="from" (toggleFilter)="hideFilter($event)"
         [filterFacetsData]="filterFacetsData"></ws-app-filter>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
index 68437e4db..b0e1849ce 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
@@ -38,6 +38,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   disableApproveALL = false
   transfersCount = 0
   profileVerificationCount = 0
+  getSortOrderValue: any
 
   constructor(
     private router: Router,
@@ -60,7 +61,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
       ? this.route.snapshot.routeConfig.path : 'profileverification'
     // this.currentFilter = this.currentFilter === 'upload' ? 'uploadApprovals' : 'pending'
     // if (this.currentFilter === 'profileverification') {
-    this.fetchApprovals()
+    this.fetchApprovals('')
     // }
     // if (this.currentFilter !== 'profileverification') {
     //   this.fetchApprovals()
@@ -96,7 +97,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
     if (key) {
       this.currentFilter = key
       // if (key === 'profileverification') {
-      this.fetchApprovals()
+      this.fetchApprovals('')
       // }
       // if (key === 'transfers') {
       //   this.fetchApprovals()
@@ -134,7 +135,11 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
 
   }
 
-  fetchApprovals() {
+  fetchApprovals(sortValue: any) {
+    let sortedVal = {}
+    if (!sortValue) {
+      sortedVal = { firstName: 'asc' }
+    }
     if (this.departName) {
       const req = {
         serviceName: 'profile',
@@ -142,6 +147,8 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
         deptName: this.departName,
         offset: this.currentOffset,
         limit: this.limit,
+        sort_by: sortValue ? sortValue : sortedVal
+
       }
       this.allTransfersData = []
       this.transfersData = []
@@ -237,6 +244,23 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   //   return this.data
   // }
 
+  getSortOrder(query: any) {
+    let sortBy
+    if (query && query.sortOrder) {
+      sortBy = query.sortOrder
+      if (sortBy === 'alphabetical') {
+        return { firstName: 'asc' }
+      }
+      if (sortBy === 'oldest') {
+        return { createdDate: 'desc' }
+      }
+      if (sortBy === 'newest') {
+        return { createdDate: 'asc' }
+      }
+    }
+    return { firstName: 'asc' }
+  }
+
   replaceWords(inputString: any, wordConditions: any) {
     return wordConditions.reduce((acc: any, [word, condition]: any) => {
       return acc.replace(new RegExp(word, 'gi'), condition)
@@ -245,6 +269,10 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   }
 
   onSearch(enterValue: any) {
+    this.getSortOrderValue = this.getSortOrder(enterValue.sortOrder)
+    if (this.getSortOrderValue) {
+      this.fetchApprovals(this.getSortOrderValue)
+    }
     // this.data.filter((user: any) => enterValue.includes(user.userInfo.first_name))
     const filterValue = enterValue.searchText.toLowerCase() ? enterValue.searchText : ''
     if (this.currentFilter === 'profileverification') {
@@ -259,7 +287,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
     this.pageIndex = event.pageIndex
     this.limit = event.pageSize
     this.currentOffset = event.pageIndex
-    this.fetchApprovals()
+    this.fetchApprovals('')
   }
 
   ngOnDestroy(): void { }
@@ -307,7 +335,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
         if (index === datalength - 1) {
           setTimeout(() => {
             this.openSnackbar('All requests are Approved')
-            this.fetchApprovals()
+            this.fetchApprovals('')
             /* tslint:disable */
           }, 200)
         }
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index 71403dfc9..e0c891b03 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -90,7 +90,7 @@
       <ng-container *ngIf="currentFilter === 'verified'">
         <div class="searchfilter">
           <ws-app-searchuser (handleApiData)="onEnterkySearch($event)" [showApproveALL]="showApproveALL"
-            [currentFilter]="currentFilter"></ws-app-searchuser>
+            [currentFilter]="currentFilter" [filterFacetsData]="filterFacets"></ws-app-searchuser>
         </div>
 
         <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="verifiedUsersData"
@@ -103,7 +103,7 @@
       <ng-container *ngIf="currentFilter === 'nonverified'">
         <div class="searchfilter">
           <ws-app-searchuser (handleApiData)="onEnterkySearch($event)" [showApproveALL]="showApproveALL"
-            [currentFilter]="currentFilter"></ws-app-searchuser>
+            [currentFilter]="currentFilter" [filterFacetsData]="filterFacets"></ws-app-searchuser>
         </div>
         <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="nonverifiedUsersData"
           [totalRecords]="nonverifiedUsersDataCount" [tabChangeIndex]="pageIndex"
@@ -114,7 +114,7 @@
       <ng-container *ngIf="currentFilter === 'notmyuser'">
         <div class="searchfilter">
           <ws-app-searchuser (handleApiData)="onEnterkySearch($event)" [showApproveALL]="showApproveALL"
-            [currentFilter]="currentFilter"></ws-app-searchuser>
+            [currentFilter]="currentFilter" [filterFacetsData]="filterFacets"></ws-app-searchuser>
         </div>
         <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="notmyuserUsersData"
           [totalRecords]="notmyuserUsersDataCount" [tabChangeIndex]="pageIndex"
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 030f7c276..c16e19612 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -222,7 +222,6 @@ export class UsersViewComponent implements OnInit, OnDestroy {
           'profileDetails.professionalDetails.group',
           'profileDetails.professionalDetails.designation',
           'profileDetails.additionalDetails.tag',
-          'profileDetails.organisations[0].roles',
         ],
         limit: this.limit,
         offset: this.pageIndex,
@@ -270,6 +269,11 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     reqBody = {
       request: {
         filters: filtreq,
+        facets: [
+          'profileDetails.professionalDetails.group',
+          'profileDetails.professionalDetails.designation',
+          'profileDetails.additionalDetails.tag',
+        ],
         limit: this.limit,
         offset: this.pageIndex,
         query: this.getSearchText(query),
@@ -314,6 +318,11 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     reqBody = {
       request: {
         filters: filtreq,
+        facets: [
+          'profileDetails.professionalDetails.group',
+          'profileDetails.professionalDetails.designation',
+          'profileDetails.additionalDetails.tag',
+        ],
         limit: this.limit,
         offset: this.pageIndex,
         query: this.getSearchText(query),
@@ -359,6 +368,11 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     reqBody = {
       request: {
         filters: filtreq,
+        facets: [
+          'profileDetails.professionalDetails.group',
+          'profileDetails.professionalDetails.designation',
+          'profileDetails.additionalDetails.tag',
+        ],
         limit: this.limit,
         offset: this.pageIndex,
         query: this.getSearchText(query),

From 9b666c039312a4a39550c316b6dfeebab355fed0 Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Tue, 18 Jun 2024 18:20:30 +0530
Subject: [PATCH 728/887] lint error fix

---
 .../components/filter/filter.component.ts     |  1 -
 .../create-request-form.component.ts          | 29 +++++++++----------
 .../request-list/request-list.component.ts    |  4 +--
 .../user-cards/user-card.component.ts         |  8 ++---
 .../approval-pending.component.ts             |  2 +-
 .../all-users/all-users.component.ts          |  4 +--
 6 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
index ccf15bb44..2998f9ce4 100644
--- a/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
@@ -60,7 +60,6 @@ export class FilterComponent implements OnInit, AfterContentChecked {
       this.tagsList = this.filterFacetsData.tagsList && this.filterFacetsData.tagsList > 0 ? this.filterFacetsData.tagsList : []
     }
 
-
     if (!this.usersSvc.filterToggle) { return }
     this.usersSvc.filterToggle.subscribe((data: any) => {
       if (data && data.status) {
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
index cf4e3c178..7a5139537 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
@@ -42,8 +42,8 @@ export class CreateRequestFormComponent implements OnInit {
   isBroadCast = false
   filterCompetencyThemes: any[] = []
   filteredSubTheme: any[] = []
-  filteredRequestType: any[] = [];
-  filteredAssigneeType:any[]=[];
+  filteredRequestType: any[] = []
+  filteredAssigneeType: any[] = []
   subthemeCheckedList: any[] = []
   resData = ''
   fullProfile: any
@@ -58,8 +58,8 @@ export class CreateRequestFormComponent implements OnInit {
   demandId: any
   actionBtnName: any
   requestObjData: any
-  isHideData = false;
-  isCompetencyHide:boolean = false;
+  isHideData = false
+  isCompetencyHide = false
 
   competencyCtrl!: FormControl
   competencyArea!: FormControl
@@ -87,7 +87,7 @@ export class CreateRequestFormComponent implements OnInit {
       queryThemeControl: new FormControl(''),
       querySubThemeControl: new FormControl(''),
       competencies_v5: [],
-      assigneeText: new FormControl('')
+      assigneeText: new FormControl(''),
     })
 
    }
@@ -136,7 +136,7 @@ export class CreateRequestFormComponent implements OnInit {
       providerText: '',
       queryThemeControl: '',
       querySubThemeControl: '',
-      assigneeText: ''
+      assigneeText: '',
     })
    const value = this.requestForm.controls.competencies_v5.value || []
    this.requestObjData.competencies.map((comp: any) => {
@@ -235,11 +235,11 @@ export class CreateRequestFormComponent implements OnInit {
         this.getRequestDataById()
         if (this.actionBtnName === 'view') {
           this.requestForm.disable()
-          this.isHideData = true;
-          this.isCompetencyHide = true;
+          this.isHideData = true
+          this.isCompetencyHide = true
         } else if (this.actionBtnName === 'reassign') {
             this.requestForm.disable()
-             this.isCompetencyHide = true;
+             this.isCompetencyHide = true
             this.requestForm.controls['assigneeText'].enable()
             this.requestForm.controls['assignee'].enable()
         }
@@ -470,9 +470,6 @@ view(item?: any) {
   })
 }
 
-
-
-
   onProviderRemoved(provider: any) {
     const compThemeControl = this.requestForm.get('providers') as FormControl | null
     if (compThemeControl) {
@@ -488,12 +485,12 @@ view(item?: any) {
   }
 
   isOptionDisabled(option: any): boolean {
-    const control = this.requestForm.get('providers');
+    const control = this.requestForm.get('providers')
     if (control) {
-      const selectedProviders = control.value;
-      return selectedProviders.length >= 5 && !selectedProviders.includes(option);
+      const selectedProviders = control.value
+      return selectedProviders.length >= 5 && !selectedProviders.includes(option)
     }
-    return false;
+    return false
   }
 
   showSaveButton() {
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
index cd5006250..c1bbee275 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
@@ -54,7 +54,7 @@ export class RequestListComponent implements OnInit {
   invalidRes: any
   detailsEvent: any
   dataSource: any
-  displayedColumns: string[] = ['RequestId', 'title','requestor', 'requestType',
+  displayedColumns: string[] = ['RequestId', 'title', 'requestor', 'requestType',
    'requestStatus', 'assignee', 'requestedOn', 'interests', 'action']
   statusKey = statusValue
 
@@ -260,7 +260,7 @@ export class RequestListComponent implements OnInit {
         orderDirection: 'ASC',
     }
     this.homeService.getRequestList(request).subscribe(res => {
-      if(res){
+      if (res) {
       this.requestListData = res.data
       if (this.requestListData) {
         this.loaderService.changeLoaderState(false)
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 3b934fda9..52b47aecf 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -118,10 +118,10 @@ export class UserCardComponent implements OnInit, OnChanges {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-    private dialog: MatDialog, private approvalSvc: ApprovalsService,
-    private route: ActivatedRoute, private snackBar: MatSnackBar,
-    private events: EventService,
-    private datePipe: DatePipe) {
+              private dialog: MatDialog, private approvalSvc: ApprovalsService,
+              private route: ActivatedRoute, private snackBar: MatSnackBar,
+              private events: EventService,
+              private datePipe: DatePipe) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
index b0e1849ce..ab6981772 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
@@ -147,7 +147,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
         deptName: this.departName,
         offset: this.currentOffset,
         limit: this.limit,
-        sort_by: sortValue ? sortValue : sortedVal
+        sort_by: sortValue ? sortValue : sortedVal,
 
       }
       this.allTransfersData = []
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.ts
index b654e33a4..f2518419a 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.ts
@@ -189,7 +189,7 @@ export class AllUsersComponent implements OnInit, OnDestroy {
     return blockedUsersData
   }
 
-  getUsers(query: string, currentFilter: any) {
+  getUsers(qText: string, currentFilter: any) {
     // console.log('currentFilter', currentFilter)
     this.loaderService.changeLoad.next(true)
     const usersData: any[] = []
@@ -215,7 +215,7 @@ export class AllUsersComponent implements OnInit, OnDestroy {
         filters: filtreq,
         limit: this.limit,
         offset: this.pageIndex,
-        query: query,
+        query: qText,
       },
     }
 

From 524b148f32a45b9a8822b8d84348bed340660aa6 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Tue, 18 Jun 2024 22:01:50 +0530
Subject: [PATCH 729/887] Added confirm popup for approve all button

---
 .../components/search/search.component.html   | 28 +++++++++++++++++--
 .../components/search/search.component.scss   | 18 ++++++++++++
 .../components/search/search.component.ts     | 13 +++++++++
 3 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.html b/project/ws/app/src/lib/routes/home/components/search/search.component.html
index c8c91b1ed..960243b4c 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.html
@@ -37,7 +37,7 @@
             [ngClass]="{'disable': isContentLive}">Create user</button>
     </div>
     <div class="flex flex-end margin-right-s" *ngIf="isApprovals && showApproveALL">
-        <button mat-button type="button" class="search-btn" (click)="approveAll()"
+        <button mat-button type="button" class="search-btn" (click)="confirmApproval(approvalconfirm)"
             [disabled]="disableApproveALL">Approve all requests</button>
     </div>
     <div class="flex flex-end" *ngIf="isApprovals && showBulkUpdate">
@@ -49,4 +49,28 @@
 <div [hidden]="!filterVisibilityFlag" *ngIf="!isApprovals">
     <ws-app-filter [from]="from" (toggleFilter)="hideFilter($event)"
         [filterFacetsData]="filterFacetsData"></ws-app-filter>
-</div>
\ No newline at end of file
+</div>
+
+<ng-template #approvalconfirm>
+    <div class="confirm-dialog text-center padding-l">
+        <mat-icon class="infoIcon orangeicon-dialog">error_outline</mat-icon>
+        <div mat-dialog-content i18n class="margin-top-xs blue-text">
+            Are you sure you want to apporve all the requests of this page?
+        </div>
+        <div class="mat-caption margin-top-xs">Do you want to proceed?</div>
+        <div mat-dialog-actions class="flex-center margin-top-s">
+            <button mat-raised-button type="submit" [mat-dialog-close]="false"
+                class="margin-right-m  btn-success btn-responsive cancelbtn">
+                <span i18n>
+                    No
+                </span>
+            </button>
+            <button mat-raised-button type="submit" [mat-dialog-close]="true"
+                class="btn-success btn-responsive successbtn">
+                <span class="text-white" i18n>
+                    Yes
+                </span>
+            </button>
+        </div>
+    </div>
+</ng-template>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.scss b/project/ws/app/src/lib/routes/home/components/search/search.component.scss
index 825554ecf..c59c2a12e 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.scss
@@ -50,4 +50,22 @@
   opacity: 0.3;
   pointer-events: none;
   cursor: none;
+}
+
+.orangeicon-dialog {
+  color: #e99e38;
+  vertical-align: middle;
+  height: 45px !important;
+  font-size: 36px;
+}
+
+.infoicon {
+  font-size: 18px !important;
+  width: 20px;
+  height: 20px;
+  vertical-align: bottom;
+  margin-left: 5px;
+}
+.blue-text {
+  color:#1B4CA1;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.ts b/project/ws/app/src/lib/routes/home/components/search/search.component.ts
index 01ac0dcad..ee77fe748 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.ts
@@ -5,6 +5,7 @@ import _ from 'lodash'
 /* tslint:enable */
 import { LoaderService } from '../../../../../../../../../src/app/services/loader.service'
 import { UsersService } from '../../../users/services/users.service'
+import { MatDialog } from '@angular/material'
 @Component({
   selector: 'ws-app-searchuser',
   templateUrl: './search.component.html',
@@ -31,6 +32,7 @@ export class SearchComponent implements OnInit {
   sortOrder = ''
   constructor(
     // private route: ActivatedRoute,
+    private dialog: MatDialog,
     private usersSvc: UsersService,
     private loadingService: LoaderService
   ) { }
@@ -138,5 +140,16 @@ export class SearchComponent implements OnInit {
     this.handleapproveAll.emit()
   }
 
+  confirmApproval(template: any) {
+    const dialog = this.dialog.open(template, {
+      width: '500px',
+    })
+    dialog.afterClosed().subscribe((v: any) => {
+      if (v) {
+        this.handleapproveAll.emit()
+      }
+    })
+  }
+
   sort() { }
 }

From 735986fa7d627e5d1b1f63674716253d3f2700d2 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Tue, 18 Jun 2024 22:39:58 +0530
Subject: [PATCH 730/887] Added confirm popup for user status changes in all
 users

---
 .../user-cards/user-card.component.html       |  8 +++---
 .../user-cards/user-card.component.ts         | 27 ++++++++++++++++---
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 29acb8c76..e6ec739a4 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -61,11 +61,13 @@
           <div class="inner-body">
             Primary Details <mat-icon class="ws-mat-black40-text custominfo">info_outline</mat-icon>
             <p class="float-right mat-body-2" *ngIf="user?.profileDetails?.profileStatus === 'VERIFIED'">
-              <mat-slide-toggle (click)="markStatus('NOT-VERIFIED', user)">Mark this user as
+              <mat-slide-toggle (change)="confirmUserRequest(updateconfirm,'NOT-VERIFIED', user, $event)">Mark this user
+                as
                 non-verified</mat-slide-toggle>
             </p>
             <p class="float-right mat-body-2" *ngIf="user?.profileDetails?.profileStatus === 'NOT-VERIFIED'">
-              <mat-slide-toggle (click)="markStatus('NOT-MY-USER', user)" [checked]="true">This is my
+              <mat-slide-toggle (change)="confirmUserRequest(updateconfirm,'NOT-MY-USER', user, $event)"
+                [checked]="true">This is my
                 user</mat-slide-toggle>
             </p>
             <div class="flex flex-row margin-top-m">
@@ -832,7 +834,7 @@
     <div class="mat-caption margin-top-xs">Note: The user will be shifted to non-verified tab</div>
     <div mat-dialog-actions class="flex-center margin-top-s">
       <button mat-raised-button type="submit" [mat-dialog-close]="false"
-        class="margin-right-m  btn-success btn-responsive cancelbtn">
+        class="margin-right-m btn-success btn-responsive cancelbtn">
         <span i18n>
           No
         </span>
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 52b47aecf..af64360f5 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -118,10 +118,10 @@ export class UserCardComponent implements OnInit, OnChanges {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-              private dialog: MatDialog, private approvalSvc: ApprovalsService,
-              private route: ActivatedRoute, private snackBar: MatSnackBar,
-              private events: EventService,
-              private datePipe: DatePipe) {
+    private dialog: MatDialog, private approvalSvc: ApprovalsService,
+    private route: ActivatedRoute, private snackBar: MatSnackBar,
+    private events: EventService,
+    private datePipe: DatePipe) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),
@@ -979,6 +979,25 @@ export class UserCardComponent implements OnInit, OnChanges {
     })
   }
 
+  confirmUserRequest(template: any, status: any, data: any, event: any) {
+    data.enableToggle = true
+    const dialog = this.dialog.open(template, {
+      width: '500px',
+    })
+    dialog.afterClosed().subscribe((v: any) => {
+      if (v) {
+        this.markStatus(status, data)
+        data.enableToggle = false
+      } else {
+        if (status === 'NOT-MY-USER') {
+          event.source.checked = true
+        } else {
+          event.source.checked = false
+        }
+      }
+    })
+  }
+
   confirmUpdate(template: any, updateUserDataForm: any, user: any, panel: any) {
     const dialog = this.dialog.open(template, {
       width: '500px',

From 045c7366af048d5842501ef17f89a539eafc4663 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Wed, 19 Jun 2024 12:02:04 +0530
Subject: [PATCH 731/887] Updated roles alignment in create user page

---
 .../single-user-creation.component.html            |  8 ++++----
 .../single-user-creation.component.scss            | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
index 09db29aa1..4a26c2ecd 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.html
@@ -162,17 +162,17 @@
     <div class="flex flex-row gap-6">
       <div class="input-container">
         <div class="label required mb-2">Role</div>
-        <div class="flex flex-col gap-4">
+        <div class="custom-roles">
           <ng-container *ngFor="let role of masterData?.mdoRoles">
-            <div class="flex flex-row gap-4" *ngIf="role !== 'MDO_LEADER'">
-              <div class="flex-1">{{ role }}</div>
+            <div class="rolehead" *ngIf="role !== 'MDO_LEADER'">
+              <div class="roletitle">{{ role }}</div>
               <mat-checkbox value="{{ role }}" #rolesCheckbox [checked]="role === 'PUBLIC'"
                 [disabled]="role === 'PUBLIC'" (change)="handleRolesCheck($event, role)"></mat-checkbox>
             </div>
           </ng-container>
         </div>
       </div>
-      <div class="input-container"></div>
+      <!-- <div class="input-container"></div> -->
     </div>
 
     <div class="flex flex-row gap-4">
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.scss b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.scss
index 7c3cc1ee5..655a0877d 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.scss
@@ -66,4 +66,18 @@
 
 ::ng-deep .required-select .mat-form-field-subscript-wrapper {
   margin-top: 20px;
+}
+
+.rolehead {
+  border: 1px solid #dedede !important;
+  border-radius: 4px !important;
+  margin: 0 12px 12px 0;
+  padding: 0.4em 0.7em;
+  display: inline-table;
+  font: 400 14px / 20px Lato !important;
+}
+
+.roletitle {
+  display: inline-block;
+  padding-right: 10px;
 }
\ No newline at end of file

From f939b59041d06639c64b8963bc229a0bafd5d6b6 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Wed, 19 Jun 2024 12:19:27 +0530
Subject: [PATCH 732/887] Updates & lint fix

---
 .../routes/home/components/search/search.component.html   | 2 +-
 .../home/components/user-cards/user-card.component.ts     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.html b/project/ws/app/src/lib/routes/home/components/search/search.component.html
index 960243b4c..96f8618c6 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.html
@@ -3,7 +3,7 @@
         <div class="rsearch flex w-full">
             <mat-icon
                 class="color-60 search-icon mat-icon notranslate material-icons mat-icon-no-color">search</mat-icon>
-            <input class="sinput color-60 w-full" [(ngModel)]="searchText" (keyup)="searchData($event)" label=""
+            <input class="sinput color-60 w-full" [(ngModel)]="searchText" (keyup.enter)="searchData($event)" label=""
                 placeholder="Search" type="Standard" [ngClass]="{'disable': isContentLive}">
         </div>
     </div>
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index af64360f5..88696dad2 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -118,10 +118,10 @@ export class UserCardComponent implements OnInit, OnChanges {
   today = new Date()
 
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-    private dialog: MatDialog, private approvalSvc: ApprovalsService,
-    private route: ActivatedRoute, private snackBar: MatSnackBar,
-    private events: EventService,
-    private datePipe: DatePipe) {
+              private dialog: MatDialog, private approvalSvc: ApprovalsService,
+              private route: ActivatedRoute, private snackBar: MatSnackBar,
+              private events: EventService,
+              private datePipe: DatePipe) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),

From def402bac60d162066aa0eb4da1758f416de0750 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Wed, 19 Jun 2024 12:25:04 +0530
Subject: [PATCH 733/887] Commenting sort for approvals

---
 .../approval-pending/approval-pending.component.ts          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
index ab6981772..06edbb1c2 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
@@ -136,9 +136,9 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   }
 
   fetchApprovals(sortValue: any) {
-    let sortedVal = {}
+    // let sortedVal = {}
     if (!sortValue) {
-      sortedVal = { firstName: 'asc' }
+      // sortedVal = { firstName: 'asc' }
     }
     if (this.departName) {
       const req = {
@@ -147,7 +147,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
         deptName: this.departName,
         offset: this.currentOffset,
         limit: this.limit,
-        sort_by: sortValue ? sortValue : sortedVal,
+        // sort_by: sortValue ? sortValue : sortedVal,
 
       }
       this.allTransfersData = []

From ac1d049bb99ff12488685f32466866e256068cce Mon Sep 17 00:00:00 2001
From: sohail amjad <sohail.amjad@tarento.com>
Date: Wed, 19 Jun 2024 16:38:56 +0530
Subject: [PATCH 734/887] tslint issues

---
 .../request-list/request-list.component.html   |  2 +-
 .../request-list/request-list.component.ts     | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
index 328bca01e..8446edcbd 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
@@ -45,7 +45,7 @@ <h2>Content Request</h2>
 
               <ng-container matColumnDef="requestor">
                 <th mat-header-cell *matHeaderCellDef class="row-heading">Requestor </th>
-                <td mat-cell class="title-class" *matCellDef="let element">{{'N/A'}}</td>
+                <td mat-cell class="title-class" *matCellDef="let element">{{element?.ownerName}}</td>
               </ng-container>
   
               <ng-container matColumnDef="requestType">
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
index cd5006250..c79c90f03 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
@@ -8,6 +8,9 @@ import { MatDialog, MatSnackBar, MatTableDataSource } from '@angular/material'
 import { ConfirmationBoxComponent } from '../../../training-plan/components/confirmation-box/confirmation.box.component'
 import { AssignListPopupComponent } from './assign-list-popup/assign-list-popup.component'
 import { LoaderService } from '../../../../../../../../../src/app/services/loader.service'
+/* tslint:disable */
+import _ from 'lodash'
+/* tslint:enable */
 export enum statusValue {
   Assigned= 'Assigned',
   Unassigned = 'Unassigned',
@@ -54,10 +57,11 @@ export class RequestListComponent implements OnInit {
   invalidRes: any
   detailsEvent: any
   dataSource: any
-  displayedColumns: string[] = ['RequestId', 'title','requestor', 'requestType',
+  displayedColumns: string[] = ['RequestId', 'title', 'requestor', 'requestType',
    'requestStatus', 'assignee', 'requestedOn', 'interests', 'action']
   statusKey = statusValue
-
+  fullProfile: any
+ rootOrgId: any
   constructor(private sanitizer: DomSanitizer,
               private homeService: ProfileV2Service,
               private datePipe: DatePipe,
@@ -76,6 +80,10 @@ export class RequestListComponent implements OnInit {
 
   ngOnInit() {
     this.configSvc = this.activeRoute.snapshot.data['configService']
+    this.fullProfile = _.get(this.activeRoute.snapshot, 'data.configService')
+    if (this.fullProfile.userProfile && this.fullProfile.userProfile.rootOrgId) {
+      this.rootOrgId = this.fullProfile.userProfile.rootOrgId
+    }
     this.getRequestList()
     this.pageConfig = this.activeRoute.snapshot.data['pageData']
     this.hasAccess()
@@ -251,7 +259,9 @@ export class RequestListComponent implements OnInit {
   getRequestList() {
     this.loaderService.changeLoaderState(true)
     const request = {
-        filterCriteriaMap: {},
+        filterCriteriaMap: {
+          rootOrgId: this.rootOrgId,
+        },
         requestedFields: [],
         facets: [],
         pageNumber: this.pageNo,
@@ -260,7 +270,7 @@ export class RequestListComponent implements OnInit {
         orderDirection: 'ASC',
     }
     this.homeService.getRequestList(request).subscribe(res => {
-      if(res){
+      if (res) {
       this.requestListData = res.data
       if (this.requestListData) {
         this.loaderService.changeLoaderState(false)

From 1dc8583eb7dcf0a5c07a65d1e788f71697325505 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Wed, 19 Jun 2024 16:57:50 +0530
Subject: [PATCH 735/887] Facets updates

---
 .../components/filter/filter.component.html   |  12 ++-
 .../components/filter/filter.component.ts     | 101 +++++++++++-------
 .../components/search/search.component.html   |   1 -
 .../components/search/search.component.ts     |   6 +-
 .../users-view/users-view.component.html      |  11 +-
 .../routes/users-view/users-view.component.ts |   1 -
 6 files changed, 74 insertions(+), 58 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/filter/filter.component.html b/project/ws/app/src/lib/routes/home/components/filter/filter.component.html
index 95c570c25..6e46e5393 100644
--- a/project/ws/app/src/lib/routes/home/components/filter/filter.component.html
+++ b/project/ws/app/src/lib/routes/home/components/filter/filter.component.html
@@ -8,7 +8,7 @@
             </div>
         </div>
         <div class="filter-content-container">
-            <div class="filter-content flex flex-1">
+            <div class="filter-content flex flex-1" *ngIf="filteredGroupList && filteredGroupList.length > 0">
                 <mat-accordion>
                     <mat-expansion-panel disableRipple [expanded]="true">
                         <mat-expansion-panel-header>
@@ -34,7 +34,8 @@
                     </mat-expansion-panel>
                 </mat-accordion>
             </div>
-            <div class="filter-content flex flex-1">
+            <div class="filter-content flex flex-1"
+                *ngIf="filteredDesignationList && filteredDesignationList.length > 0">
                 <mat-accordion>
                     <mat-expansion-panel disableRipple [expanded]="true">
                         <mat-expansion-panel-header>
@@ -52,7 +53,8 @@
                             </div>
                             <div class="flex flex-1 flex-row category-item" *ngFor="let des of filteredDesignationList">
                                 <mat-checkbox #checkboxes disableRipple class="example-margin" [checked]="des?.selected"
-                                    (change)="manageSelectedDesignation($event, des)">{{des?.name |
+                                    (change)="manageSelectedDesignation($event, des)"
+                                    *ngIf="des?.name !== ''">{{des?.name |
                                     titlecase}}</mat-checkbox>
                             </div>
                         </div>
@@ -60,7 +62,7 @@
                 </mat-accordion>
             </div>
             <!-- roles -->
-            <div class="filter-content flex flex-1">
+            <div class="filter-content flex flex-1" *ngIf="filteredRolesList && filteredRolesList.length > 0">
                 <mat-accordion>
                     <mat-expansion-panel disableRipple [expanded]="true">
                         <mat-expansion-panel-header>
@@ -87,7 +89,7 @@
                 </mat-accordion>
             </div>
             <!-- tage -->
-            <div class="filter-content flex flex-1">
+            <div class="filter-content flex flex-1" *ngIf="filteredTagsList && filteredTagsList.length > 0">
                 <mat-accordion>
                     <mat-expansion-panel disableRipple [expanded]="true">
                         <mat-expansion-panel-header>
diff --git a/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
index 2998f9ce4..db2aec19d 100644
--- a/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
@@ -52,49 +52,44 @@ export class FilterComponent implements OnInit, AfterContentChecked {
   }
 
   ngOnInit() {
-    if (this.filterFacetsData) {
-      this.designationList = this.filterFacetsData.designation && this.filterFacetsData.designation.length > 0 ?
-        this.filterFacetsData.designation : []
-      this.groupList = this.filterFacetsData.group && this.filterFacetsData.group.length > 0 ? this.filterFacetsData.group : []
-      this.rolesList = this.filterFacetsData.rolesList && this.filterFacetsData.rolesList > 0 ? this.filterFacetsData.rolesList : []
-      this.tagsList = this.filterFacetsData.tagsList && this.filterFacetsData.tagsList > 0 ? this.filterFacetsData.tagsList : []
-    }
-
+    this.setData()
     if (!this.usersSvc.filterToggle) { return }
     this.usersSvc.filterToggle.subscribe((data: any) => {
       if (data && data.status) {
-        // if (data.from === 'content') {
-        //   this.getFilterEntity()
-        // this.getProviders()
-        // } else {
-        // if(this.usersSvc.trainingPlanAssigneeData &&
-        //   this.usersSvc.trainingPlanAssigneeData.category === 'Custom Users') {
-        //   this.getDesignation();
-        // }
-        if (this.designationList && this.designationList.length > 0) {
-          //   this.getDesignation()
-          // } else {
-          this.getFilteredDesignationList()
-        }
-
-        if (this.groupList && this.groupList.length > 0) {
-          //   this.loadGroups()
-          // } else {
-          this.getFilteredGroupList()
-        }
-
-        if (this.rolesList && this.rolesList.length > 0) {
-          //   this.loadRoles()
-          // } else {
-          this.getFilteredRolesList()
-        }
-
-        if (this.tagsList && this.tagsList.length > 0) {
-          //   this.loadTags()
-          // } else {
-          this.getFilteredTagsList()
-        }
-        // }
+        this.filterFacetsData = data.data
+        this.setData()
+        //     // if (data.from === 'content') {
+        //     //   this.getFilterEntity()
+        //     // this.getProviders()
+        //     // } else {
+        //     // if(this.usersSvc.trainingPlanAssigneeData &&
+        //     //   this.usersSvc.trainingPlanAssigneeData.category === 'Custom Users') {
+        //     //   this.getDesignation();
+        //     // }
+        //     if (this.designationList && this.designationList.length > 0) {
+        //       //   this.getDesignation()
+        //       // } else {
+        //       this.getFilteredDesignationList()
+        //     }
+
+        //     if (this.groupList && this.groupList.length > 0) {
+        //       //   this.loadGroups()
+        //       // } else {
+        //       this.getFilteredGroupList()
+        //     }
+
+        //     if (this.rolesList && this.rolesList.length > 0) {
+        //       //   this.loadRoles()
+        //       // } else {
+        //       this.getFilteredRolesList()
+        //     }
+
+        //     if (this.tagsList && this.tagsList.length > 0) {
+        //       //   this.loadTags()
+        //       // } else {
+        //       this.getFilteredTagsList()
+        //     }
+        //     // }
       }
     })
 
@@ -108,6 +103,32 @@ export class FilterComponent implements OnInit, AfterContentChecked {
     this.resetFilter()
   }
 
+  setData() {
+    if (this.filterFacetsData) {
+      this.filterFacetsData.forEach((item: any) => {
+        if (item.name === 'profileDetails.professionalDetails.group') {
+          if (item.values && item.values.length > 0) {
+            this.groupList = item.values
+            this.filteredGroupList = this.groupList
+          }
+        }
+        if (item.name === 'profileDetails.professionalDetails.designation') {
+          if (item.values && item.values.length > 0) {
+            this.designationList = item.values
+            this.filteredDesignationList = this.designationList
+          }
+        }
+        if (item.name === 'profileDetails.additionalDetails.tag') {
+          if (item.values && item.values.length > 0) {
+            this.tagsList = item.values
+            this.filteredTagsList = this.tagsList
+          }
+        }
+      })
+      // this.rolesList = this.filterFacetsData.rolesList && this.filterFacetsData.rolesList > 0 ? this.filterFacetsData.rolesList : []
+    }
+  }
+
   searchGroup(searchKey: string) {
     this.groupSearchKey = searchKey.toUpperCase()
     this.getFilteredGroupList()
diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.html b/project/ws/app/src/lib/routes/home/components/search/search.component.html
index 96f8618c6..c62ead36c 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.html
@@ -27,7 +27,6 @@
         </mat-menu>
     </div>
     <div class="filter-section flex" *ngIf="!isApprovals">
-
         <button mat-button type="button" (click)="openFilter()" class="apply-filter margin-right-s">
             Apply Filter <mat-icon class="margin-right-xs">filter_list</mat-icon>
         </button>
diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.ts b/project/ws/app/src/lib/routes/home/components/search/search.component.ts
index ee77fe748..366fe9e09 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.ts
@@ -49,12 +49,11 @@ export class SearchComponent implements OnInit {
 
   openFilter() {
     this.filterVisibilityFlag = true
-    this.usersSvc.filterToggle.next({ from: this.from, status: true })
+    this.usersSvc.filterToggle.next({ from: this.from, status: true, data: this.filterFacetsData })
     // if (this.document.getElementById('top-nav-bar')) {
     //   const ele: any = this.document.getElementById('top-nav-bar')
     //   ele.style.zIndex = '1'
     // }
-
   }
 
   hideFilter(event: any) {
@@ -70,7 +69,7 @@ export class SearchComponent implements OnInit {
     }
 
     this.filterVisibilityFlag = false
-    this.usersSvc.filterToggle.next({ from: '', status: false })
+    this.usersSvc.filterToggle.next({ from: '', status: false, data: this.filterFacetsData })
     // if (this.document.getElementById('top-nav-bar')) {
     //   const ele: any = this.document.getElementById('top-nav-bar')
     //   ele.style.zIndex = '1000'
@@ -109,7 +108,6 @@ export class SearchComponent implements OnInit {
   searchData(event: any) {
     this.searchText = event.target.value
     this.emitSearchRequest()
-
   }
 
   sortData(sortOrder: string) {
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
index e0c891b03..2a77c953f 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.html
@@ -78,7 +78,7 @@
       </ws-widget-org-user-table-v2> -->
 
       <ng-container *ngIf="currentFilter === 'allusers'">
-        <div class="searchfilter">
+        <div class="searchfilter" *ngIf="activeUsersData">
           <ws-app-searchuser (handleApiData)="onEnterkySearch($event)" [showApproveALL]="showApproveALL"
             [currentFilter]="currentFilter" [filterFacetsData]="filterFacets"></ws-app-searchuser>
         </div>
@@ -88,7 +88,7 @@
       </ng-container>
 
       <ng-container *ngIf="currentFilter === 'verified'">
-        <div class="searchfilter">
+        <div class="searchfilter" *ngIf="verifiedUsersData">
           <ws-app-searchuser (handleApiData)="onEnterkySearch($event)" [showApproveALL]="showApproveALL"
             [currentFilter]="currentFilter" [filterFacetsData]="filterFacets"></ws-app-searchuser>
         </div>
@@ -98,10 +98,8 @@
           (paginationData)="onPaginateChange($event)" (updateList)="getVUsers('')"></ws-widget-user-card>
       </ng-container>
 
-
-
       <ng-container *ngIf="currentFilter === 'nonverified'">
-        <div class="searchfilter">
+        <div class="searchfilter" *ngIf="nonverifiedUsersData">
           <ws-app-searchuser (handleApiData)="onEnterkySearch($event)" [showApproveALL]="showApproveALL"
             [currentFilter]="currentFilter" [filterFacetsData]="filterFacets"></ws-app-searchuser>
         </div>
@@ -110,9 +108,8 @@
           (paginationData)="onPaginateChange($event)" (updateList)="getNVUsers('')"></ws-widget-user-card>
       </ng-container>
 
-
       <ng-container *ngIf="currentFilter === 'notmyuser'">
-        <div class="searchfilter">
+        <div class="searchfilter" *ngIf="notmyuserUsersData">
           <ws-app-searchuser (handleApiData)="onEnterkySearch($event)" [showApproveALL]="showApproveALL"
             [currentFilter]="currentFilter" [filterFacetsData]="filterFacets"></ws-app-searchuser>
         </div>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index c16e19612..488f062a4 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -471,7 +471,6 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   onEnterkySearch(enterValue: any) {
     this.searchQuery = enterValue
     this.filterData(this.searchQuery)
-
   }
 
   onPaginateChange(event: PageEvent) {

From 130b97f41423d3b52d3e0635864898696b72e718 Mon Sep 17 00:00:00 2001
From: sohail amjad <sohail.amjad@tarento.com>
Date: Wed, 19 Jun 2024 17:26:49 +0530
Subject: [PATCH 736/887] review resolved

---
 .../home/components/request-list/request-list.component.ts    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
index c79c90f03..96701b1c5 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
@@ -81,7 +81,7 @@ export class RequestListComponent implements OnInit {
   ngOnInit() {
     this.configSvc = this.activeRoute.snapshot.data['configService']
     this.fullProfile = _.get(this.activeRoute.snapshot, 'data.configService')
-    if (this.fullProfile.userProfile && this.fullProfile.userProfile.rootOrgId) {
+    if (this.fullProfile && this.fullProfile.userProfile && this.fullProfile.userProfile.rootOrgId) {
       this.rootOrgId = this.fullProfile.userProfile.rootOrgId
     }
     this.getRequestList()
@@ -260,7 +260,7 @@ export class RequestListComponent implements OnInit {
     this.loaderService.changeLoaderState(true)
     const request = {
         filterCriteriaMap: {
-          rootOrgId: this.rootOrgId,
+          rootOrgId: this.rootOrgId ? this.rootOrgId :'',
         },
         requestedFields: [],
         facets: [],

From 78b31ba0ba0a4bc472e26a6b756f07a3b0003621 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Wed, 19 Jun 2024 22:47:51 +0530
Subject: [PATCH 737/887] Updated filter search

---
 .../components/filter/filter.component.html   | 67 +++++++++-----
 .../components/filter/filter.component.scss   |  4 +-
 .../components/filter/filter.component.ts     | 87 +++++--------------
 3 files changed, 68 insertions(+), 90 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/filter/filter.component.html b/project/ws/app/src/lib/routes/home/components/filter/filter.component.html
index 6e46e5393..3ccd67c21 100644
--- a/project/ws/app/src/lib/routes/home/components/filter/filter.component.html
+++ b/project/ws/app/src/lib/routes/home/components/filter/filter.component.html
@@ -8,7 +8,7 @@
             </div>
         </div>
         <div class="filter-content-container">
-            <div class="filter-content flex flex-1" *ngIf="filteredGroupList && filteredGroupList.length > 0">
+            <div class="filter-content flex flex-1" *ngIf="groupList && groupList.length > 0">
                 <mat-accordion>
                     <mat-expansion-panel disableRipple [expanded]="true">
                         <mat-expansion-panel-header>
@@ -24,18 +24,21 @@
                                     (ngModelChange)="searchGroup($event)" label="" placeholder="Enter group"
                                     type="Standard">
                             </div>
-                            <div class="flex flex-1 flex-row category-item" *ngFor="let group of filteredGroupList">
-                                <mat-checkbox #checkboxes disableRipple class="example-margin"
-                                    [checked]="group?.selected"
-                                    (change)="manageSelectedGroup($event, group)">{{group?.name |
-                                    titlecase}}</mat-checkbox>
+                            <div *ngIf="filteredGroupList && filteredGroupList.length > 0">
+                                <div class="flex flex-1 flex-row category-item" *ngFor="let group of filteredGroupList">
+                                    <mat-checkbox #checkboxes disableRipple class="example-margin"
+                                        [checked]="group?.selected"
+                                        (change)="manageSelectedGroup($event, group)">{{group?.name |
+                                        titlecase}}</mat-checkbox>
+                                </div>
                             </div>
+                            <div *ngIf="filteredGroupList && filteredGroupList.length === 0" class="margin-top-xs">No
+                                groups found</div>
                         </div>
                     </mat-expansion-panel>
                 </mat-accordion>
             </div>
-            <div class="filter-content flex flex-1"
-                *ngIf="filteredDesignationList && filteredDesignationList.length > 0">
+            <div class="filter-content flex flex-1" *ngIf="designationList && designationList.length > 0">
                 <mat-accordion>
                     <mat-expansion-panel disableRipple [expanded]="true">
                         <mat-expansion-panel-header>
@@ -51,18 +54,24 @@
                                     (ngModelChange)="searchDesignation($event)" label="" placeholder="Enter designation"
                                     type="Standard">
                             </div>
-                            <div class="flex flex-1 flex-row category-item" *ngFor="let des of filteredDesignationList">
-                                <mat-checkbox #checkboxes disableRipple class="example-margin" [checked]="des?.selected"
-                                    (change)="manageSelectedDesignation($event, des)"
-                                    *ngIf="des?.name !== ''">{{des?.name |
-                                    titlecase}}</mat-checkbox>
+                            <div *ngIf="filteredDesignationList && filteredDesignationList.length > 0">
+                                <div class="flex flex-1 flex-row category-item"
+                                    *ngFor="let des of filteredDesignationList">
+                                    <mat-checkbox #checkboxes disableRipple class="example-margin"
+                                        [checked]="des?.selected" (change)="manageSelectedDesignation($event, des)"
+                                        *ngIf="des?.name !== ''">{{des?.name |
+                                        titlecase}}</mat-checkbox>
+                                </div>
                             </div>
+                            <div *ngIf="filteredDesignationList && filteredDesignationList.length === 0"
+                                class="margin-top-xs">No designation
+                                found</div>
                         </div>
                     </mat-expansion-panel>
                 </mat-accordion>
             </div>
             <!-- roles -->
-            <div class="filter-content flex flex-1" *ngIf="filteredRolesList && filteredRolesList.length > 0">
+            <div class="filter-content flex flex-1" *ngIf="rolesList && rolesList.length > 0">
                 <mat-accordion>
                     <mat-expansion-panel disableRipple [expanded]="true">
                         <mat-expansion-panel-header>
@@ -78,18 +87,23 @@
                                     (ngModelChange)="searchRoles($event)" label="" placeholder="Enter roles"
                                     type="Standard">
                             </div>
-                            <div class="flex flex-1 flex-row category-item" *ngFor="let role of filteredRolesList">
-                                <mat-checkbox #checkboxes disableRipple class="example-margin"
-                                    [checked]="role?.selected" (change)="manageSelectedRoles($event, role)">{{role?.name
-                                    |
-                                    titlecase}}</mat-checkbox>
+                            <div *ngIf="filteredRolesList && filteredRolesList.length > 0">
+                                <div class="flex flex-1 flex-row category-item" *ngFor="let role of filteredRolesList">
+                                    <mat-checkbox #checkboxes disableRipple class="example-margin"
+                                        [checked]="role?.selected"
+                                        (change)="manageSelectedRoles($event, role)">{{role?.name
+                                        |
+                                        titlecase}}</mat-checkbox>
+                                </div>
                             </div>
+                            <div *ngIf="filteredRolesList && filteredRolesList.length === 0" class="margin-top-xs">No
+                                roles found</div>
                         </div>
                     </mat-expansion-panel>
                 </mat-accordion>
             </div>
             <!-- tage -->
-            <div class="filter-content flex flex-1" *ngIf="filteredTagsList && filteredTagsList.length > 0">
+            <div class="filter-content flex flex-1" *ngIf="tagsList && tagsList.length > 0">
                 <mat-accordion>
                     <mat-expansion-panel disableRipple [expanded]="true">
                         <mat-expansion-panel-header>
@@ -105,11 +119,16 @@
                                     (ngModelChange)="searchTags($event)" label="" placeholder="Enter tags"
                                     type="Standard">
                             </div>
-                            <div class="flex flex-1 flex-row category-item" *ngFor="let tag of filteredTagsList">
-                                <mat-checkbox #checkboxes disableRipple class="example-margin" [checked]="tag?.selected"
-                                    (change)="manageSelectedTags($event, tag)">{{tag?.name |
-                                    titlecase}}</mat-checkbox>
+                            <div *ngIf="filteredTagsList && filteredTagsList.length > 0">
+                                <div class="flex flex-1 flex-row category-item" *ngFor="let tag of filteredTagsList">
+                                    <mat-checkbox #checkboxes disableRipple class="example-margin"
+                                        [checked]="tag?.selected" (change)="manageSelectedTags($event, tag)">{{tag?.name
+                                        |
+                                        titlecase}}</mat-checkbox>
+                                </div>
                             </div>
+                            <div *ngIf="filteredTagsList && filteredTagsList.length === 0" class="margin-top-xs">No tags
+                                found</div>
                         </div>
                     </mat-expansion-panel>
                 </mat-accordion>
diff --git a/project/ws/app/src/lib/routes/home/components/filter/filter.component.scss b/project/ws/app/src/lib/routes/home/components/filter/filter.component.scss
index 8202b5ea4..bd77ffc81 100644
--- a/project/ws/app/src/lib/routes/home/components/filter/filter.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/filter/filter.component.scss
@@ -27,8 +27,8 @@
 }
 
 .filter-content {
-    padding: 18px 0px;
-    margin: 0px 25px;
+    padding: 6px 0;
+    margin: 0 25px 12px 25px;
 }
 
 .filter-content-container {
diff --git a/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
index db2aec19d..27e176d9a 100644
--- a/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
@@ -3,7 +3,6 @@ import {
   Output, QueryList, ViewChildren, ChangeDetectionStrategy, AfterContentChecked,
 } from '@angular/core'
 import { FormControl } from '@angular/forms'
-// import { TrainingPlanDataSharingService } from '../../../training-plan/services/training-plan-data-share.service'
 import { TrainingPlanService } from '../../../training-plan/services/traininig-plan.service'
 import { UsersService } from '../../../users/services/users.service'
 @Component({
@@ -130,40 +129,37 @@ export class FilterComponent implements OnInit, AfterContentChecked {
   }
 
   searchGroup(searchKey: string) {
-    this.groupSearchKey = searchKey.toUpperCase()
+    this.groupSearchKey = searchKey
     this.getFilteredGroupList()
   }
 
   searchDesignation(searchKey: string) {
-    this.designationSearchKey = searchKey.toUpperCase()
+    this.designationSearchKey = searchKey
     this.getFilteredDesignationList()
   }
 
   searchRoles(searchKey: string) {
-    this.rolesSearchKey = searchKey.toUpperCase()
+    this.rolesSearchKey = searchKey
     this.getFilteredRolesList()
   }
 
   searchTags(searchKey: string) {
-    this.tagsSearchKey = searchKey.toUpperCase()
+    this.tagsSearchKey = searchKey
     this.getFilteredTagsList()
   }
 
   getFilteredGroupList() {
     if (this.groupList.length) {
-      const searchKey = this.groupSearchKey ? this.groupSearchKey : ''
+      const searchKey = this.groupSearchKey ? this.groupSearchKey.toUpperCase() : ''
       this.filteredGroupList = []
       this.groupList.forEach((groupName: any) => {
-        if (groupName.toUpperCase().includes(searchKey)) {
-          const formatedGroup: any = {
-            name: groupName,
-          }
+        if (groupName.name.toUpperCase().includes(searchKey)) {
           if (this.assigneeFilterObj['group'] && this.assigneeFilterObj['group'].indexOf(groupName) > -1) {
-            formatedGroup['selected'] = true
+            groupName['selected'] = true
           } else {
-            formatedGroup['selected'] = false
+            groupName['selected'] = false
           }
-          this.filteredGroupList.push(formatedGroup)
+          this.filteredGroupList.push(groupName)
         }
       })
     }
@@ -171,19 +167,16 @@ export class FilterComponent implements OnInit, AfterContentChecked {
 
   getFilteredDesignationList() {
     if (this.designationList.length) {
-      const searchKey = this.designationSearchKey ? this.designationSearchKey : ''
+      const searchKey = this.designationSearchKey ? this.designationSearchKey.toUpperCase() : ''
       this.filteredDesignationList = []
       this.designationList.forEach((designation: any) => {
         if (designation.name.toUpperCase().includes(searchKey)) {
-          const formatedDesignation: any = {
-            name: designation.name,
-          }
           if (this.assigneeFilterObj['designation'] && this.assigneeFilterObj['designation'].indexOf(designation.name) > -1) {
-            formatedDesignation['selected'] = true
+            designation['selected'] = true
           } else {
-            formatedDesignation['selected'] = false
+            designation['selected'] = false
           }
-          this.filteredDesignationList.push(formatedDesignation)
+          this.filteredDesignationList.push(designation)
         }
       })
     }
@@ -191,19 +184,16 @@ export class FilterComponent implements OnInit, AfterContentChecked {
 
   getFilteredRolesList() {
     if (this.rolesList.length) {
-      const searchKey = this.rolesSearchKey ? this.rolesSearchKey : ''
+      const searchKey = this.rolesSearchKey ? this.rolesSearchKey.toUpperCase() : ''
       this.filteredRolesList = []
       this.rolesList.forEach((rolesName: any) => {
-        if (rolesName.toUpperCase().includes(searchKey)) {
-          const formatedRoles: any = {
-            name: rolesName,
-          }
+        if (rolesName.name.toUpperCase().includes(searchKey)) {
           if (this.assigneeFilterObj['roles'] && this.assigneeFilterObj['roles'].indexOf(rolesName) > -1) {
-            formatedRoles['selected'] = true
+            rolesName['selected'] = true
           } else {
-            formatedRoles['selected'] = false
+            rolesName['selected'] = false
           }
-          this.filteredRolesList.push(formatedRoles)
+          this.filteredRolesList.push(rolesName)
         }
       })
     }
@@ -211,19 +201,16 @@ export class FilterComponent implements OnInit, AfterContentChecked {
 
   getFilteredTagsList() {
     if (this.tagsList.length) {
-      const searchKey = this.tagsSearchKey ? this.tagsSearchKey : ''
+      const searchKey = this.tagsSearchKey ? this.tagsSearchKey.toUpperCase() : ''
       this.filteredTagsList = []
       this.tagsList.forEach((tagsName: any) => {
-        if (tagsName.toUpperCase().includes(searchKey)) {
-          const formatedTags: any = {
-            name: tagsName,
-          }
+        if (tagsName.name.toUpperCase().includes(searchKey)) {
           if (this.assigneeFilterObj['tags'] && this.assigneeFilterObj['tags'].indexOf(tagsName) > -1) {
-            formatedTags['selected'] = true
+            tagsName['selected'] = true
           } else {
-            formatedTags['selected'] = false
+            tagsName['selected'] = false
           }
-          this.filteredTagsList.push(formatedTags)
+          this.filteredTagsList.push(tagsName)
         }
       })
     }
@@ -233,34 +220,6 @@ export class FilterComponent implements OnInit, AfterContentChecked {
     this.cdref.detectChanges()
   }
 
-  getFilterEntity() {
-    const filterObj = {
-      search: {
-        type: 'Competency Area',
-      },
-      filter: {
-        isDetail: true,
-      },
-    }
-    this.trainingPlanService.getFilterEntity(filterObj).subscribe((res: any) => {
-
-      this.competencyList = res
-
-    })
-  }
-  // getProviders() {
-  //   this.trainingPlanService.getProviders().subscribe((res: any) => {
-  //     this.providersList = res
-  //     this.providersList.map((pitem: any) => {
-  //       if (this.filterObj['providers'] && pitem && this.filterObj['providers'].indexOf(pitem.name) > -1) {
-  //         pitem['selected'] = true
-  //       } else {
-  //         pitem['selected'] = false
-  //       }
-  //     })
-  //   })
-  // }
-
   hideFilter(filter: string) {
     const event = {
       filter,

From 2351c234f3c72dad2570faaacac68ce203e0cae8 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Wed, 19 Jun 2024 22:54:14 +0530
Subject: [PATCH 738/887] lint fix

---
 .../home/components/request-list/request-list.component.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
index 96701b1c5..714c0508e 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
@@ -260,7 +260,7 @@ export class RequestListComponent implements OnInit {
     this.loaderService.changeLoaderState(true)
     const request = {
         filterCriteriaMap: {
-          rootOrgId: this.rootOrgId ? this.rootOrgId :'',
+          rootOrgId: this.rootOrgId ? this.rootOrgId : '',
         },
         requestedFields: [],
         facets: [],

From 58d4c41cdf8cb387d5314dadcff11959d2eba895 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Thu, 20 Jun 2024 15:14:14 +0530
Subject: [PATCH 739/887] Filter selection flow  updated

---
 .../components/filter/filter.component.ts     | 64 +++++++++----------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
index 27e176d9a..3fc603119 100644
--- a/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
@@ -51,7 +51,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
   }
 
   ngOnInit() {
-    this.setData()
+    // this.setData()
     if (!this.usersSvc.filterToggle) { return }
     this.usersSvc.filterToggle.subscribe((data: any) => {
       if (data && data.status) {
@@ -108,19 +108,22 @@ export class FilterComponent implements OnInit, AfterContentChecked {
         if (item.name === 'profileDetails.professionalDetails.group') {
           if (item.values && item.values.length > 0) {
             this.groupList = item.values
-            this.filteredGroupList = this.groupList
+            // this.filteredGroupList = this.groupList
+            this.getFilteredGroupList()
           }
         }
         if (item.name === 'profileDetails.professionalDetails.designation') {
           if (item.values && item.values.length > 0) {
             this.designationList = item.values
-            this.filteredDesignationList = this.designationList
+            // this.filteredDesignationList = this.designationList
+            this.getFilteredDesignationList()
           }
         }
         if (item.name === 'profileDetails.additionalDetails.tag') {
           if (item.values && item.values.length > 0) {
             this.tagsList = item.values
-            this.filteredTagsList = this.tagsList
+            // this.filteredTagsList = this.tagsList
+            this.getFilteredTagsList()
           }
         }
       })
@@ -154,7 +157,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
       this.filteredGroupList = []
       this.groupList.forEach((groupName: any) => {
         if (groupName.name.toUpperCase().includes(searchKey)) {
-          if (this.assigneeFilterObj['group'] && this.assigneeFilterObj['group'].indexOf(groupName) > -1) {
+          if (this.assigneeFilterObj['group'] && this.assigneeFilterObj['group'].indexOf(groupName.name) > -1) {
             groupName['selected'] = true
           } else {
             groupName['selected'] = false
@@ -188,7 +191,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
       this.filteredRolesList = []
       this.rolesList.forEach((rolesName: any) => {
         if (rolesName.name.toUpperCase().includes(searchKey)) {
-          if (this.assigneeFilterObj['roles'] && this.assigneeFilterObj['roles'].indexOf(rolesName) > -1) {
+          if (this.assigneeFilterObj['roles'] && this.assigneeFilterObj['roles'].indexOf(rolesName.name) > -1) {
             rolesName['selected'] = true
           } else {
             rolesName['selected'] = false
@@ -205,7 +208,7 @@ export class FilterComponent implements OnInit, AfterContentChecked {
       this.filteredTagsList = []
       this.tagsList.forEach((tagsName: any) => {
         if (tagsName.name.toUpperCase().includes(searchKey)) {
-          if (this.assigneeFilterObj['tags'] && this.assigneeFilterObj['tags'].indexOf(tagsName) > -1) {
+          if (this.assigneeFilterObj['tags'] && this.assigneeFilterObj['tags'].indexOf(tagsName.name) > -1) {
             tagsName['selected'] = true
           } else {
             tagsName['selected'] = false
@@ -431,31 +434,28 @@ export class FilterComponent implements OnInit, AfterContentChecked {
     }
   }
 
-  loadGroups() {
-    this.groupList = []
-    this.filteredGroupList = []
-    this.usersSvc.getGroups().subscribe(
-      (data: any) => {
-        const res = data.result.response
-        this.groupList = res
-        this.getFilteredGroupList()
-
-        // this.loadRoles() // need to remove after appis
-        // this.loadTags() // need to remove after appis
-      },
-      (_err: any) => {
-      })
-  }
-
-  loadRoles() {
-    this.rolesList = this.groupList
-    this.getFilteredRolesList()
-  }
-
-  loadTags() {
-    this.tagsList = this.groupList
-    this.getFilteredTagsList()
-  }
+  // loadGroups() {
+  //   this.groupList = []
+  //   this.filteredGroupList = []
+  //   this.usersSvc.getGroups().subscribe(
+  //     (data: any) => {
+  //       const res = data.result.response
+  //       this.groupList = res
+  //       this.getFilteredGroupList()
+  //     },
+  //     (_err: any) => {
+  //     })
+  // }
+
+  // loadRoles() {
+  //   this.rolesList = this.groupList
+  //   this.getFilteredRolesList()
+  // }
+
+  // loadTags() {
+  //   this.tagsList = this.groupList
+  //   this.getFilteredTagsList()
+  // }
 
   getDesignation() {
     this.trainingPlanService.getDesignations().subscribe((res: any) => {

From e3a195e54484d284255eecbfeccf224eedce7ad6 Mon Sep 17 00:00:00 2001
From: sohail amjad <sohail.amjad@tarento.com>
Date: Thu, 20 Jun 2024 17:39:52 +0530
Subject: [PATCH 740/887] re assign single select ui implemented

---
 .../request-list/request-list.component.ts    |  44 +-
 .../single-assign-popup.component.html        |  58 +++
 .../single-assign-popup.component.scss        | 398 ++++++++++++++++++
 .../single-assign-popup.component.spec.ts     |  25 ++
 .../single-assign-popup.component.ts          | 178 ++++++++
 .../ws/app/src/lib/routes/home/home.module.ts |   3 +
 6 files changed, 699 insertions(+), 7 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/home/components/request-list/single-assign-popup/single-assign-popup.component.html
 create mode 100644 project/ws/app/src/lib/routes/home/components/request-list/single-assign-popup/single-assign-popup.component.scss
 create mode 100644 project/ws/app/src/lib/routes/home/components/request-list/single-assign-popup/single-assign-popup.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/home/components/request-list/single-assign-popup/single-assign-popup.component.ts

diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
index 714c0508e..b303d02e4 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
@@ -10,6 +10,7 @@ import { AssignListPopupComponent } from './assign-list-popup/assign-list-popup.
 import { LoaderService } from '../../../../../../../../../src/app/services/loader.service'
 /* tslint:disable */
 import _ from 'lodash'
+import { SingleAssignPopupComponent } from './single-assign-popup/single-assign-popup.component'
 /* tslint:enable */
 export enum statusValue {
   Assigned= 'Assigned',
@@ -146,13 +147,17 @@ export class RequestListComponent implements OnInit {
     case 'reAssignContent':
       if (item.requestType === 'Broadcast') {
         this.openAssignlistPopup(item)
-      } else {
-        this.queryParams = {
-          id: item.demand_id,
-          name: 'reassign',
-        }
-          this.router.navigate(['/app/home/create-request-form'], { queryParams: this.queryParams })
+      } 
+      else {
+        this.openSingleReassignPopup(item)
       }
+      // else {
+      //   this.queryParams = {
+      //     id: item.demand_id,
+      //     name: 'reassign',
+      //   }
+      //     this.router.navigate(['/app/home/create-request-form'], { queryParams: this.queryParams })
+      // }
 
       break
     case 'copyContent':
@@ -244,7 +249,9 @@ export class RequestListComponent implements OnInit {
 
     this.dialogRef.afterClosed().subscribe((_res: any) => {
       if (_res && _res.data === 'confirmed') {
-         this.getRequestList()
+        setTimeout(()=>{
+          this.getRequestList()
+        },1000)
          this.snackBar.open('Assigned submitted Successfully')
       } else {
         // this.snackBar.open('error')
@@ -252,6 +259,29 @@ export class RequestListComponent implements OnInit {
     })
   }
 
+
+  openSingleReassignPopup(item:any){
+    this.dialogRef = this.dialog.open(SingleAssignPopupComponent, {
+      disableClose: false,
+      width: '90%',
+      height: '70vh',
+      data: item,
+      autoFocus: false,
+    })
+
+    this.dialogRef.afterClosed().subscribe((_res: any) => {
+      if (_res && _res.data === 'confirmed') {
+        setTimeout(()=>{
+          this.getRequestList()
+        },1000)
+        
+         this.snackBar.open('Re-assign submitted Successfully')
+      } else {
+        // this.snackBar.open('error')
+      }
+    })
+  }
+
   sanitizeHtml(html: string): SafeHtml {
     return this.sanitizer.bypassSecurityTrustHtml(html)
   }
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/single-assign-popup/single-assign-popup.component.html b/project/ws/app/src/lib/routes/home/components/request-list/single-assign-popup/single-assign-popup.component.html
new file mode 100644
index 000000000..004a2a818
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/components/request-list/single-assign-popup/single-assign-popup.component.html
@@ -0,0 +1,58 @@
+<div class="main-container">
+    <div class="full-table-container" *ngIf="requestTypeData?.length > 0">
+      <form [formGroup]="requestForm">
+          <div class="header-section">
+              <div class="title">
+                  <h2 class="titleText">{{'Re-Assign'}}</h2>
+              </div>
+              <div class="actions">
+                  <button mat-button type="button" class="search-btn" [ngClass]="{'disableBtn': !requestForm.valid}"  (click)="onSubmitAssign()"  [disabled]="!requestForm.valid" >{{submitAssign}}</button>
+  
+                  <button mat-button class="cancel" (click)="cancel()">
+                      <span>Cancel</span>
+                  </button>
+  
+              </div>
+             
+            </div>
+            <!-- <div class="input-group rounded search-btns">
+                <input type="search" class="form-control rounded search-int" formControlName="orgSearch" placeholder="Search" aria-label="Search" (keyup)="searchText('orgSearch')" aria-describedby="search-addon" />
+                <span class="input-group-text border-0" id="search-addon">
+                  <i class="fas fa-search"></i>
+                </span>
+              </div> -->
+
+        <mat-radio-group formControlName="assignee">
+          <div class="nav-container">
+            <div class="sidenav-content">
+              <div class="table-class">
+                <table mat-table [dataSource]="dataSource">
+                  <ng-container matColumnDef="select">
+                      <th mat-header-cell *matHeaderCellDef class="row-heading radio-width"></th>
+                    <td mat-cell class="title-class" *matCellDef="let provider">
+                      <mat-radio-button [value]="provider" ></mat-radio-button>
+                    </td>
+                  </ng-container>
+  
+                  <ng-container matColumnDef="name">
+                    <th mat-header-cell *matHeaderCellDef class="row-heading">Provider Name</th>
+                    <td mat-cell class="title-class" *matCellDef="let provider">{{ provider?.orgName }}</td>
+                  </ng-container>
+  
+  
+                  <tr mat-header-row *matHeaderRowDef="displayedColumns" class="table-row-data"></tr>
+                  <tr mat-row *matRowDef="let row; columns: displayedColumns" [ngClass]="{'row-bg':row === this.requestTypeData[0]}"></tr>
+                </table>
+                <!-- <mat-paginator [pageSize]=5 [length]="this.requestTypeData?.length" [pageSizeOptions]="[5,10,20]"
+                (page)="onChangePage($event)"></mat-paginator> -->
+                <mat-paginator [pageSizeOptions]="[5,10,20]" showFirstLastButtons
+            ></mat-paginator>
+    
+              </div>
+            </div>
+          </div>
+        </mat-radio-group>
+      </form>
+    </div>
+  </div>
+  
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/single-assign-popup/single-assign-popup.component.scss b/project/ws/app/src/lib/routes/home/components/request-list/single-assign-popup/single-assign-popup.component.scss
new file mode 100644
index 000000000..df9173b19
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/components/request-list/single-assign-popup/single-assign-popup.component.scss
@@ -0,0 +1,398 @@
+.main-container {
+    width: 100%;
+    // height: 100%;
+  }
+  @import "ws-common";
+  @import "ws-mixins";
+  
+  
+  
+  table {
+    width: 100%;
+  }
+
+  .header-section {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    padding: 0 19px;
+    margin: 14px 0 22px;
+    .title {
+      .title-text {
+        font-family: Montserrat;
+        font-size: 20px;
+        font-weight: 600;
+        line-height: 30px;
+        text-align: left;
+    
+        }
+    }
+    
+    .actions {
+     display: flex;
+     gap: 12px;
+     .search-btn {
+      background: #1b4ca1 !important;
+      color: white !important;
+      font-family: 'Lato';
+      font-weight: 700;
+      font-size: 14px;
+      border-radius: 4px;
+      min-width: 81px;
+      line-height: 21px;
+     }
+     .cancel {
+      color: #1b4ca1 !important;
+      border: 1px solid #1b4ca1 !important;
+      border-radius: 4px;
+      min-width: 81px;
+  }
+  .disableBtn {
+    background: rgba(0, 0, 0, 0.4) !important;
+  }
+    } 
+  }
+
+  .search-btns {
+    margin-left: 17px !important;
+    margin-bottom: 31px !important;
+    .search-int {
+            height: 46px !important;
+            padding: 14px !important;
+            width: 43% !important;
+            font-size: 16px !important;
+            border: 1px solid lightgray !important;
+        }
+}
+
+  
+  .userTable {
+    box-shadow: none;
+  }
+  
+  table tr {
+    height: 70px !important;
+  }
+  
+  // ::ng-deep {
+  //   table tr td .cdk-column-title .title-class {
+  //     width: 13% !important;
+  //   }
+  // }
+  
+  // table tr td .cdk-column-title .cdk-column-assignee {
+  //   width: 13% !important;
+  // }
+  
+  // table tr .cdk-column-title {
+  //   width: 18% !important;
+  // }
+  
+
+  table .table-row-data {
+    height: 56px !important;
+  }
+  table tr .row-heading {
+    font-family: 'Lato';
+    font-weight: 400;
+    font-size: 14px !important;
+    line-height: 21px;
+    color: rgba(0, 0, 0, 0.6);
+    border-bottom: none;
+    // width: 13% !important;
+    // padding: 0 13px 0 13px !important;
+}
+table tr .radio-width{
+  width: 6% !important;
+}
+
+table tr .cdk-column-providerName {
+  width: 21% !important;
+  padding: 0 4% 0 0px !important;
+}
+
+table tr .cdk-column-details {
+  width: 40%;
+  padding: 0 10% 0 0px !important
+}
+
+.row-bg {
+    background-color: rgba(0, 0, 0, 0.16) !important;
+    pointer-events: none !important;
+  }
+  
+  .action-btn-view {
+    color: #1B4CA1;
+    font-family: Lato;
+    font-size: 14px;
+    font-weight: 400;
+    line-height: 16.8px;
+    text-decoration: underline !important;
+  }
+  
+  .title-class {
+    font-family: Lato;
+    font-size: 14px !important;
+    font-weight: 400;
+    line-height: 21px;
+    color: rgba(0, 0, 0, 0.6) !important;
+  }
+  
+  .search-border {
+    border-color: #cecece;
+  }
+  
+  .color-60 {
+    color: rgba(0, 0, 0, .6) !important;
+  }
+  
+  .nav-container {
+    position: relative;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    // min-height: 180vh;
+  }
+  
+  .mt-1 {
+    margin-top: 2rem !important;
+  }
+  
+  .m-auto {
+    margin: auto;
+  }
+  
+  .searchinput {
+    padding: $size-xs;
+  }
+  
+  .text-white {
+    color: white !important;
+  }
+  
+  .small-list-logo {
+    width: 64px;
+    height: 36px;
+  }
+  
+  .new-mat-table {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+  }
+  
+  .new-row {
+    padding: 0.65em 0 0.65em 0;
+  }
+  
+  .filter {
+    .filter-option {
+      margin: $size-xs $size-m;
+      /* border-bottom: darkslateblue; */
+      border-radius: 0;
+      border-bottom-width: 2px;
+      border-top-width: 0;
+      border-left-width: 0;
+      border-right-width: 0;
+    }
+  }
+  
+  .hand {
+    cursor: pointer;
+  }
+  
+  .vertical-align {
+    vertical-align: text-bottom;
+  }
+  
+  .width-300 {
+    width: 300px;
+  }
+  
+  .font-size-m {
+    font-size: 16px;
+  }
+  
+  .border-bottom {
+    border-bottom: 1px solid lightgray;
+  }
+  
+  .mat-drawer-content {
+    overflow: hidden !important;
+  }
+  
+  .pointer {
+    cursor: pointer;
+  }
+  
+  .margin-right-xxl {
+    margin-right: 50px;
+  }
+  
+  .margin-horizontal-s {
+    margin-left: 3%;
+    margin-right: 2%;
+  }
+  
+  .flex-dynamic {
+    justify-content: flex-start;
+  
+    @include breakpoint-gt-s {
+      justify-content: center;
+    }
+  
+    @include breakpoint-gt-xs {
+      justify-content: center;
+    }
+  
+    @include breakpoint-xs {
+      justify-content: center;
+    }
+  
+    @include breakpoint-gt-m {
+      justify-content: flex-start;
+    }
+  }
+  
+  .large-icon {
+    font-size: 32px;
+    width: 32px;
+    height: 32px;
+  }
+  
+  .sidenav {
+    width: 20%;
+    min-width: 250px;
+    // padding-left: $size-m;
+    background: inherit;
+    box-shadow: none;
+    // margin-bottom: 32px;
+  }
+  
+  .sidenav-content {
+    margin: 0;
+    padding: 0 $size-m $size-l;
+    box-sizing: border-box;
+    // min-height: calc(100vh);
+  }
+  
+  .reportsDemo {
+  
+  
+    .reportsDemoVideo {
+      width: 290px;
+      height: 163px;
+      border-radius: 5px;
+      background-color: #FDEAD5;
+      font-weight: 600;
+      pointer-events: all;
+      cursor: pointer;
+  
+      .video_icon {
+        font-size: 32px;
+      }
+    }
+  }
+  .create-action {
+    display: flex;
+    justify-content: end;
+    margin-bottom: 21px;
+    .search-btn {
+        background: #1b4ca1 !important;
+        color: white !important;
+        font-family: 'Lato';
+        font-weight: 700;
+        font-size: 14px;
+        border-radius: 4px;
+        min-width: 138px;
+    }
+  }
+  
+  .grid {
+    display: grid;
+    grid-template-columns: 1fr 0.3fr;
+    grid-auto-columns: minmax(auto, 300px);
+    width: 90%;
+  }
+  
+  .close-button {
+    margin-right: 50px;
+  }
+  
+  .hidden {
+    display: none;
+  }
+  
+  .border-right {
+    border-right: 1px solid #cecece;
+  }
+  
+  :host ::ng-deep .search {
+    .mat-form-field-wrapper {
+      padding-bottom: 0px !important;
+    }
+  
+    .mat-form-field-infix {
+      border-top-width: 2px !important;
+      margin: auto;
+    }
+  }
+  
+  .border-0 {
+    border: 0;
+  }
+  
+  .min-width-4 {
+    min-width: 400px;
+  }
+  
+  ws-auth-content-card-v2 {
+    display: contents;
+  }
+  
+  // @import 'ws-vars';
+  // @import 'ws-mixins';
+  $size-xs: 8px;
+  $size-s: 12px;
+  $size-m: 16px;
+  $size-l: 24px;
+  $size-xl: 32px;
+  $size-xxl: 40px;
+  $card-standard-width: 268px;
+  
+  @mixin breakpoint-xs {
+    @media only screen and (max-width: 599px) {
+      @content;
+    }
+  }
+  
+  $title-line-count: 2;
+  
+  mat-header-row {
+    min-height: 40px;
+  }
+  
+  .mat-header-cell {
+    background-color: #F5F5F5;
+  }
+  
+  .flex-update {
+    flex-direction: row;
+  
+    @include breakpoint-xs {
+      flex-direction: row;
+    }
+  
+  
+  }
+  
+  .flex-custom-m {
+    @include breakpoint-xs {
+      flex-direction: column;
+    }
+  }
+
+  
+  
+  
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/single-assign-popup/single-assign-popup.component.spec.ts b/project/ws/app/src/lib/routes/home/components/request-list/single-assign-popup/single-assign-popup.component.spec.ts
new file mode 100644
index 000000000..5db0ceadd
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/components/request-list/single-assign-popup/single-assign-popup.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { SingleAssignPopupComponent } from './single-assign-popup.component';
+
+describe('SingleAssignPopupComponent', () => {
+  let component: SingleAssignPopupComponent;
+  let fixture: ComponentFixture<SingleAssignPopupComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ SingleAssignPopupComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SingleAssignPopupComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/single-assign-popup/single-assign-popup.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/single-assign-popup/single-assign-popup.component.ts
new file mode 100644
index 000000000..61652ac81
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/components/request-list/single-assign-popup/single-assign-popup.component.ts
@@ -0,0 +1,178 @@
+import { Component, Inject, OnInit, ViewChild } from '@angular/core';
+import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
+import { MAT_DIALOG_DATA, MatDialogRef, MatTableDataSource } from '@angular/material';
+import { MatPaginator } from '@angular/material/paginator';
+import { ProfileV2Service } from '../../../services/home.servive';
+import { ConfigResolveService } from '../../../resolvers/config-resolve.service';
+
+@Component({
+  selector: 'ws-app-single-assign-popup',
+  templateUrl: './single-assign-popup.component.html',
+  styleUrls: ['./single-assign-popup.component.scss']
+})
+export class SingleAssignPopupComponent implements OnInit {
+
+  requestForm!: FormGroup
+  displayedColumns: string[] = ['select', 'name']
+  providerList: any[] = []
+  providerCount: any
+  pageNumber = 0
+  pageSize = 5
+  fullProfile: any
+  userId: any
+  assignText = ''
+  submitAssign = '';
+  requestTypeData:any[]=[]
+  filterRequestData:any[]=[]
+  isDisable:boolean  = false;
+  // @ViewChild(MatPaginator, { static: false }) paginator!: MatPaginator;
+  dataSource = new MatTableDataSource<any>([]);
+  @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | null = null
+  @ViewChild(MatPaginator, { static: false }) set matPaginator(paginator: MatPaginator) {
+    this.paginator = paginator
+    this.setDataSourceAttributes()
+  }
+  setDataSourceAttributes() {
+    this.dataSource.paginator = this.paginator
+  }
+
+  constructor(private fb: FormBuilder,
+              private homeService: ProfileV2Service,
+              @Inject(MAT_DIALOG_DATA) public data: any,
+              private configService: ConfigResolveService,
+              public dialogRef: MatDialogRef<SingleAssignPopupComponent>,
+  ) {
+    this.requestForm = this.fb.group({
+      assignee: new FormControl('', Validators.required),
+      orgSearch: new FormControl('')
+
+    })
+  }
+
+  ngOnInit() {
+    this.assignText = 'Assign'
+    this.submitAssign = 'Assign'
+    this.getOrgListData()
+    if (this.configService['confService'].userProfile || this.configService['confService'].userProfileV2) {
+      this.fullProfile = this.configService['confService'].userProfile ?
+      this.configService['confService'].userProfile
+       : this.configService['confService'].userProfileV2
+      this.userId =  this.fullProfile.userId
+    }
+  }
+
+  setFormData() {
+    if (this.data.assignedProvider) {
+      this.assignText = 'Re-assign'
+      this.submitAssign = 'Re-Assign'
+      const assignOrgData = this.requestTypeData.find(option =>
+        this.data.assignedProvider === option.orgName
+      )
+      // if (assignOrgData) {
+      //   this.requestForm.controls['assignee'].setValue(assignOrgData)
+      // }
+      //move selected data to first
+      let position = this.requestTypeData.indexOf(assignOrgData)
+
+      //check if the element exists in the array
+      if(position > -1){
+        // Remove the element from its position
+        let selectedData= this.requestTypeData.splice(position, 1)[0]
+
+        // Add the removed element to the beginning of the array
+        this.requestTypeData.unshift(selectedData)
+      }
+    }
+   }
+
+   
+
+  getOrgListData(){
+    const requestObj = {
+      request: {
+        filters: {
+          isCbp: true,
+        },
+      },
+    }
+    this.homeService.getRequestTypeList(requestObj).subscribe(data => {
+      if(data){
+        this.requestTypeData = data;
+        this.filterRequestData = this.requestTypeData
+        this.dataSource.data = this.requestTypeData
+        
+        this.dataSource.paginator = this.paginator
+        this.setFormData()
+      
+      }   
+    })
+   }
+
+  //  searchText(event:any){
+  //   this.requestForm.controls['orgSearch'].valueChanges.subscribe((newValue: any) => {
+  //     this.filterRequestData = this.filterOrgValues(newValue, this.requestTypeData)
+  //     this.dataSource.data = this.filterRequestData
+  //     this.dataSource.paginator = this.paginator
+  //     this.setFormData()
+  //   })
+  //  }
+
+  //  filterOrgValues(searchValue: string, array: any) {
+  //   return array.filter((value: any) =>
+  //     value.orgName.toLowerCase().includes(searchValue.toLowerCase()))
+  // }
+ 
+
+  onChangePage(event: any) {
+    this.pageNumber = event.pageIndex
+    this.pageSize = event.pageSize
+    this.getOrgListData()
+    }
+
+    onSubmitAssign() {
+    const selectedProvider = this.requestForm.value.assignee
+    let assigneeProvider: any
+    if (this.requestForm.value.assignee) {
+      assigneeProvider = {
+        providerName: this.requestForm.value.assignee.orgName,
+        providerId: this.requestForm.value.assignee.id,
+      }
+    }
+    if (selectedProvider) {
+      const request = {
+      title:  this.data.title,
+      objective: this.data.objective,
+      typeOfUser: this.data.typeOfUser,
+      // learningMode: this.requestForm.value.learningMode.toLowerCase(),
+      competencies: this.data.competencies,
+      referenceLink: this.data.referenceLink,
+      requestType: this.data.requestType,
+      preferredProvider:this.data.preferredProvider,
+      assignedProvider: assigneeProvider,
+      status: this.data.status,
+      source: this.data.owner,
+      demand_id: this.data.demand_id,
+      learningMode:this.data.learningMode
+        // assignedBy: this.userId,
+      }
+      this.homeService.createDemand(request).subscribe((res:any) => {
+        if (res) {
+          this.dialogRef.close({ data: 'confirmed' })
+        }
+
+      },(error:any) => {
+       this.dialogRef.close({ error })
+
+      }
+    )
+    } else {
+    }
+  }
+
+  cancel() {
+    this.dialogRef.close()
+    // Implement your cancel logic here
+  }
+
+
+}
diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index 98cd018e6..2c07f9ee0 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -79,6 +79,7 @@ import { RequestListComponent } from './components/request-list/request-list.com
 import { CreateRequestFormComponent } from './components/request-list/create-request-form/create-request-form.component'
 import { CompetencyViewComponent } from './components/request-list/competency-view/competency-view.component'
 import { AssignListPopupComponent } from './components/request-list/assign-list-popup/assign-list-popup.component'
+import { SingleAssignPopupComponent } from './components/request-list/single-assign-popup/single-assign-popup.component'
 
 @NgModule({
   declarations: [
@@ -123,6 +124,7 @@ import { AssignListPopupComponent } from './components/request-list/assign-list-
     CreateRequestFormComponent,
     CompetencyViewComponent,
     AssignListPopupComponent,
+    SingleAssignPopupComponent
   ],
   imports: [
     CommonModule,
@@ -193,6 +195,7 @@ import { AssignListPopupComponent } from './components/request-list/assign-list-
     FileProgressComponent,
     CompetencyViewComponent,
     AssignListPopupComponent,
+    SingleAssignPopupComponent
   ],
   providers: [
     InitResolver,

From 89f2d618e170eeed15d7714354e6dcdf92ab231e Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Thu, 20 Jun 2024 18:37:20 +0530
Subject: [PATCH 741/887] Bulk upload otp support for mobile added

---
 .../bulk-upload/bulk-upload.component.ts      |  9 ++--
 .../bulk-upload/bulk-upload.component.ts      |  3 +-
 .../verify-otp/verify-otp.component.html      | 18 +++++--
 .../verify-otp/verify-otp.component.scss      |  5 ++
 .../verify-otp/verify-otp.component.ts        | 53 ++++++++++++++++---
 .../lib/routes/users/services/otp.service.ts  |  2 +-
 6 files changed, 74 insertions(+), 16 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
index de58a0793..8f780dca8 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
@@ -75,7 +75,7 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
       .subscribe((res: any) => {
         this.lastUploadList = res.result.content.sort((a: any, b: any) =>
           new Date(b.datecreatedon).getTime() - new Date(a.datecreatedon).getTime())
-      },         (error: HttpErrorResponse) => {
+      }, (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open('Unable to get Bulk status list')
         }
@@ -117,7 +117,7 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
         if (!resendFlag) {
           this.verifyOTP(contactType)
         }
-      },         (error: HttpErrorResponse) => {
+      }, (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open(_.get(error, 'error.params.errmsg') || `Unable to send OTP to your ${contactType}, please try again later!`)
         }
@@ -132,7 +132,8 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
       this.fileName = file.name
       this.fileSelected = file
       if (this.fileService.validateFile(this.fileName)) {
-        this.sendOTP()
+        // this.sendOTP()
+        this.verifyOTP(this.userProfile.email ? 'email' : 'phone')
       } else {
         this.showFileError = true
       }
@@ -169,7 +170,7 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
             this.fileName = ''
             this.fileSelected = ''
             this.getBulkStatusList()
-          },         (_err: HttpErrorResponse) => {
+          }, (_err: HttpErrorResponse) => {
             if (!_err.ok) {
               this.matSnackBar.open('Uploading CSV file failed due to some error, please try again later!')
             }
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts
index d36083116..4832abf02 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.ts
@@ -134,7 +134,8 @@ export class BulkUploadComponent implements OnInit, AfterViewInit, OnDestroy {
       this.fileName = file.name
       this.fileSelected = file
       if (this.fileService.validateFile(this.fileName)) {
-        this.sendOTP()
+        // this.sendOTP()
+        this.verifyOTP(this.userProfile.email ? 'email' : 'phone')
       } else {
         this.showFileError = true
       }
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.html
index c76792cad..f353f4c0c 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.html
@@ -1,7 +1,19 @@
 <div class="verify-otp-dialog">
-  <div class="flex flex-col gap-4">
+  <form [formGroup]="otpSelectionForm" class="mobile-wrapper" *ngIf="!otpTypeSelected">
+    <label class="mat-title-1 font-bold" aria-label="Send OTP to">Send OTP to </label>
+    <div class="margin-bottom-l margin-top-m">
+      <!-- <mat-radio-group aria-label="Select an option" formControlName='otpType' #otpType (change)="radioChange($event)"> -->
+      <mat-radio-group aria-label="Select an option" formControlName='otpType' #otpType>
+        <mat-radio-button [value]="'email'" color="accent" class="radio-btn margin-right-xl">Email</mat-radio-button>
+        <mat-radio-button [value]="'phone'" color="accent" class="radio-btn">Mobile</mat-radio-button>
+      </mat-radio-group>
+    </div>
+    <button class="action-button margin-top-l" (click)="sendOtp()" [disabled]="otpSelectionForm.invalid">Send
+      OTP</button>
+  </form>
+  <div class="flex flex-col gap-4" *ngIf="otpTypeSelected">
     <div class="text-base font-semibold text-center mb-4">
-      Enter the OTP sent to your {{ data.type === 'phone' ? 'mobile number' : 'email address' }}
+      Enter the OTP sent to your {{ otpTypeSelectedValue === 'phone' ? 'mobile number' : 'email address' }}
     </div>
     <div class="flex flex-col gap-1">
       <div class="text-sm font-bold">Enter OTP</div>
@@ -18,7 +30,7 @@
 
     <div class="flex flex-row justify-between">
       <button class="outline-button" (click)="handleCloseModal()">Cancel</button>
-      <button class="action-button" (click)="handleVerifyOTP()">Submit</button>
+      <button class="action-button" (click)="handleVerifyOTP()" [disabled]="otpEntered === ''">Submit</button>
     </div>
   </div>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.scss b/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.scss
index ab347e306..01216014e 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.scss
@@ -19,4 +19,9 @@
     cursor: pointer;
     margin-bottom: 16px;
   }
+}
+.action-button:disabled,
+.action-button[disabled] {
+  opacity: 0.6;
+  cursor: auto;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.ts
index 4aeae6fb8..eb01f41be 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit, Inject, OnDestroy, ViewChild, Output, EventEmitter } from '@angular/core'
 import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'
 import { HttpErrorResponse } from '@angular/common/http'
-import { MatSnackBar } from '@angular/material'
+import { MatRadioChange, MatSnackBar } from '@angular/material'
 
 import { Subject } from 'rxjs'
 import { takeUntil } from 'rxjs/operators'
@@ -9,6 +9,8 @@ import { takeUntil } from 'rxjs/operators'
 import * as _ from 'lodash'
 /* tslint:enable */
 import { OtpService } from '../../../../users/services/otp.service'
+import { FormControl, FormGroup, Validators } from '@angular/forms'
+import { UsersService } from '../../../../users/services/users.service'
 
 @Component({
   selector: 'ws-verify-otp',
@@ -25,13 +27,21 @@ export class VerifyOtpComponent implements OnInit, OnDestroy {
   interval: any
   showResendOTP = false
   otpEntered = ''
+  otpSelectionForm!: FormGroup
+  otpTypeSelected = false
+  otpTypeSelectedValue: any
 
   constructor(
     public dialogRef: MatDialogRef<VerifyOtpComponent>,
     @Inject(MAT_DIALOG_DATA) public data: any,
     private matSnackbar: MatSnackBar,
-    private otpService: OtpService
-  ) { }
+    private otpService: OtpService,
+    private usersService: UsersService
+  ) {
+    this.otpSelectionForm = new FormGroup({
+      otpType: new FormControl('', [Validators.required]),
+    })
+  }
 
   ngOnInit() {
     this.startTimer()
@@ -46,7 +56,7 @@ export class VerifyOtpComponent implements OnInit, OnDestroy {
         clearInterval(this.interval)
         this.showResendOTP = true
       }
-    },                          1000)
+    }, 1000)
   }
 
   handleCloseModal(): void {
@@ -61,7 +71,7 @@ export class VerifyOtpComponent implements OnInit, OnDestroy {
   }
 
   handleVerifyOTP(): void {
-    if (this.data.type === 'email') {
+    if (this.otpTypeSelectedValue === 'email') {
       this.verifyEmailOTP()
     } else {
       this.verifyMobileOTP()
@@ -74,7 +84,7 @@ export class VerifyOtpComponent implements OnInit, OnDestroy {
       .subscribe((_res: any) => {
         this.handleCloseModal()
         this.otpVerified.emit(true)
-      },         (error: HttpErrorResponse) => {
+      }, (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackbar.open('Unable to verify OTP, please try again later!')
         }
@@ -87,7 +97,7 @@ export class VerifyOtpComponent implements OnInit, OnDestroy {
       .subscribe((_res: any) => {
         this.handleCloseModal()
         this.otpVerified.emit(true)
-      },         (error: HttpErrorResponse) => {
+      }, (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackbar.open('Unable to verify OTP, please try again later!')
         }
@@ -98,4 +108,33 @@ export class VerifyOtpComponent implements OnInit, OnDestroy {
     clearInterval(this.interval)
     this.destroySubject$.unsubscribe()
   }
+
+  radioChange(_event: MatRadioChange) {
+    // this.resetOTPFields()
+  }
+
+  sendOtp() {
+    this.generateAndVerifyOTP(this.otpSelectionForm.value.otpType)
+    this.otpTypeSelected = true
+    this.otpTypeSelectedValue = this.otpSelectionForm.value.otpType
+  }
+
+  generateAndVerifyOTP(contactType: string): void {
+    const type = contactType === 'email' ? 'email' : 'phone'
+    const postValue = contactType === 'email' ? this.data.email : this.data.mobile
+    this.usersService.sendOtp(postValue, type)
+      .pipe(takeUntil(this.destroySubject$))
+      .subscribe((_res: any) => {
+        this.matSnackbar.open(`An OTP has been sent to your ${type === 'phone' ? 'Mobile number'
+          : 'Email address'}, (Valid for 15 min's)`)
+        // if (!resendFlag) {
+        //   this.verifyOTP(contactType)
+        // }
+        // tslint:disable-next-line
+      }, (error: HttpErrorResponse) => {
+        if (!error.ok) {
+          this.matSnackbar.open(_.get(error, 'error.params.errmsg') || `Unable to send OTP to your ${contactType}, please try again later!`)
+        }
+      })
+  }
 }
diff --git a/project/ws/app/src/lib/routes/users/services/otp.service.ts b/project/ws/app/src/lib/routes/users/services/otp.service.ts
index ba0c4723b..438b1717e 100644
--- a/project/ws/app/src/lib/routes/users/services/otp.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/otp.service.ts
@@ -37,7 +37,7 @@ export class OtpService {
   verifyOTP(otp: number, mob: number) {
     const reqObj = {
       request: {
-        otp,
+        otp: otp.toString(),
         type: 'phone',
         key: `${mob}`,
       },

From 282221622f3d94744fe5d91b623c1f222a0cd5bb Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Thu, 20 Jun 2024 18:47:17 +0530
Subject: [PATCH 742/887] lint fix

---
 .../routes/approvals/bulk-upload/bulk-upload.component.ts   | 6 +++---
 .../routes/users-view/verify-otp/verify-otp.component.ts    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
index 8f780dca8..05d9cabfe 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
@@ -75,7 +75,7 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
       .subscribe((res: any) => {
         this.lastUploadList = res.result.content.sort((a: any, b: any) =>
           new Date(b.datecreatedon).getTime() - new Date(a.datecreatedon).getTime())
-      }, (error: HttpErrorResponse) => {
+      },         (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open('Unable to get Bulk status list')
         }
@@ -117,7 +117,7 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
         if (!resendFlag) {
           this.verifyOTP(contactType)
         }
-      }, (error: HttpErrorResponse) => {
+      },         (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open(_.get(error, 'error.params.errmsg') || `Unable to send OTP to your ${contactType}, please try again later!`)
         }
@@ -170,7 +170,7 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
             this.fileName = ''
             this.fileSelected = ''
             this.getBulkStatusList()
-          }, (_err: HttpErrorResponse) => {
+          },         (_err: HttpErrorResponse) => {
             if (!_err.ok) {
               this.matSnackBar.open('Uploading CSV file failed due to some error, please try again later!')
             }
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.ts
index eb01f41be..8cfbff809 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/verify-otp/verify-otp.component.ts
@@ -56,7 +56,7 @@ export class VerifyOtpComponent implements OnInit, OnDestroy {
         clearInterval(this.interval)
         this.showResendOTP = true
       }
-    }, 1000)
+    },                          1000)
   }
 
   handleCloseModal(): void {
@@ -84,7 +84,7 @@ export class VerifyOtpComponent implements OnInit, OnDestroy {
       .subscribe((_res: any) => {
         this.handleCloseModal()
         this.otpVerified.emit(true)
-      }, (error: HttpErrorResponse) => {
+      },         (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackbar.open('Unable to verify OTP, please try again later!')
         }
@@ -97,7 +97,7 @@ export class VerifyOtpComponent implements OnInit, OnDestroy {
       .subscribe((_res: any) => {
         this.handleCloseModal()
         this.otpVerified.emit(true)
-      }, (error: HttpErrorResponse) => {
+      },         (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackbar.open('Unable to verify OTP, please try again later!')
         }

From 11aff0d5eab9abe900349c5d5530e15eddd975e3 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Mon, 24 Jun 2024 17:54:10 +0530
Subject: [PATCH 743/887] Added pending requests btn,commented sort for
 approvals, updated API for bulk update

---
 .../home/components/search/search.component.html |  2 +-
 .../bulk-upload/bulk-upload.component.html       |  8 ++++----
 .../bulk-upload/bulk-upload.component.ts         | 16 +++++++++++++---
 .../lib/routes/users/services/upload.service.ts  |  3 ++-
 .../lib/routes/users/services/users.service.ts   |  6 ++++++
 5 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.html b/project/ws/app/src/lib/routes/home/components/search/search.component.html
index c62ead36c..bf7ff3795 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.html
@@ -7,7 +7,7 @@
                 placeholder="Search" type="Standard" [ngClass]="{'disable': isContentLive}">
         </div>
     </div>
-    <div class="filter-section flex">
+    <div class="filter-section flex" *ngIf="!isApprovals">
         <button mat-button type="button" (click)="sort()" class="apply-filter margin-right-s"
             [matMenuTriggerFor]="cardMenu">
             <mat-icon class="margin-right-xs">sort</mat-icon> Sort
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
index 456241b89..1512804e1 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
@@ -48,7 +48,10 @@
     </div>
   </div>
 
-  <div class="text-base font-bold">File logs</div>
+  <div class="text-base font-bold">File logs
+    <button type="button" class="outline-button float-right" [ngClass]="{'disable': isContentLive}"
+      (click)="getPendingResquests()">Download pending requests</button>
+  </div>
   <div class="flex flex-col gap-6">
     <div class="file-container"
       *ngFor="let list of lastUploadList | slice : startIndex : lastIndex | orderBy:'datecreatedon':'desc'">
@@ -101,8 +104,5 @@
   <div class="flex flex-row justify-end mt-4">
     <mat-paginator [pageSize]="pageSize" [length]="lastUploadList.length" [pageSizeOptions]="sizeOptions"
       (page)="handleChangePage($event)"></mat-paginator>
-
   </div>
-
-
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
index 05d9cabfe..fec76413d 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
@@ -75,7 +75,7 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
       .subscribe((res: any) => {
         this.lastUploadList = res.result.content.sort((a: any, b: any) =>
           new Date(b.datecreatedon).getTime() - new Date(a.datecreatedon).getTime())
-      },         (error: HttpErrorResponse) => {
+      }, (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open('Unable to get Bulk status list')
         }
@@ -117,7 +117,7 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
         if (!resendFlag) {
           this.verifyOTP(contactType)
         }
-      },         (error: HttpErrorResponse) => {
+      }, (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open(_.get(error, 'error.params.errmsg') || `Unable to send OTP to your ${contactType}, please try again later!`)
         }
@@ -170,7 +170,7 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
             this.fileName = ''
             this.fileSelected = ''
             this.getBulkStatusList()
-          },         (_err: HttpErrorResponse) => {
+          }, (_err: HttpErrorResponse) => {
             if (!_err.ok) {
               this.matSnackBar.open('Uploading CSV file failed due to some error, please try again later!')
             }
@@ -191,4 +191,14 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
     this.destroySubject$.unsubscribe()
   }
 
+  getPendingResquests(): void {
+    // const filePath = `/apis/proxies/v8/workflow/admin/bulkuploadfile/download/${listObj.filename}`
+    // window.open(filePath, '_blank')
+    this.usersService.fetchPendingRequests().subscribe((res: any) => {
+      if (res) {
+        // console.log('*********************', res)
+      }
+    })
+  }
+
 }
diff --git a/project/ws/app/src/lib/routes/users/services/upload.service.ts b/project/ws/app/src/lib/routes/users/services/upload.service.ts
index 0ec11541f..e1b6749a8 100644
--- a/project/ws/app/src/lib/routes/users/services/upload.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/upload.service.ts
@@ -9,7 +9,8 @@ const API_ENDPOINTS = {
   downloadReport: `/apis/protected/v8/admin/userRegistration/bulkUploadReport`,
   getBulkUploadData: '/apis/proxies/v8/user/v1/bulkupload',
   getBulkApproval: '/apis/proxies/v8/workflow/admin/bulkupdate/getstatus',
-  bulkApprovalUpload: `/apis/proxies/v8/workflow/admin/transition/bulkupdate`,
+  // bulkApprovalUpload: `/apis/proxies/v8/workflow/admin/transition/bulkupdate`,
+  bulkApprovalUpload: '/apis/proxies/v8/workflow/admin/v2/bulkupdate/transition',
 }
 
 @Injectable()
diff --git a/project/ws/app/src/lib/routes/users/services/users.service.ts b/project/ws/app/src/lib/routes/users/services/users.service.ts
index 2b906c503..cd9dfd787 100644
--- a/project/ws/app/src/lib/routes/users/services/users.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/users.service.ts
@@ -34,6 +34,7 @@ const API_END_POINTS = {
   editProfileDetails: '/apis/proxies/v8/user/v1/extPatch',
   getPendingFields: '/apis/proxies/v8/workflow/v2/userWFApplicationFieldsSearch',
   getApprovalPendingFields: '/apis/proxies/v8/workflow/v2/userWFApplicationFieldsSearch',
+  getPendingRequests: '/apis/proxies/v8/workflow/admin/pending/request',
 }
 
 @Injectable()
@@ -324,4 +325,9 @@ export class UsersService {
       applicationStatus: 'REJECTED',
     })
   }
+
+  fetchPendingRequests() {
+    return this.http.get<any>(API_END_POINTS.getPendingRequests)
+  }
+
 }

From 49ee3a7a4f66373085f33503361beee54ef74a40 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Mon, 24 Jun 2024 18:06:58 +0530
Subject: [PATCH 744/887] Fixed lint issues

---
 .../request-list/request-list.component.ts    | 16 +++--
 .../single-assign-popup.component.spec.ts     | 28 ++++-----
 .../single-assign-popup.component.ts          | 60 +++++++++----------
 .../ws/app/src/lib/routes/home/home.module.ts |  4 +-
 .../bulk-upload/bulk-upload.component.ts      |  6 +-
 5 files changed, 54 insertions(+), 60 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
index b303d02e4..5354e8449 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
@@ -147,8 +147,7 @@ export class RequestListComponent implements OnInit {
     case 'reAssignContent':
       if (item.requestType === 'Broadcast') {
         this.openAssignlistPopup(item)
-      } 
-      else {
+      } else {
         this.openSingleReassignPopup(item)
       }
       // else {
@@ -249,9 +248,9 @@ export class RequestListComponent implements OnInit {
 
     this.dialogRef.afterClosed().subscribe((_res: any) => {
       if (_res && _res.data === 'confirmed') {
-        setTimeout(()=>{
+        setTimeout(() => {
           this.getRequestList()
-        },1000)
+        },         1000)
          this.snackBar.open('Assigned submitted Successfully')
       } else {
         // this.snackBar.open('error')
@@ -259,8 +258,7 @@ export class RequestListComponent implements OnInit {
     })
   }
 
-
-  openSingleReassignPopup(item:any){
+  openSingleReassignPopup(item: any) {
     this.dialogRef = this.dialog.open(SingleAssignPopupComponent, {
       disableClose: false,
       width: '90%',
@@ -271,10 +269,10 @@ export class RequestListComponent implements OnInit {
 
     this.dialogRef.afterClosed().subscribe((_res: any) => {
       if (_res && _res.data === 'confirmed') {
-        setTimeout(()=>{
+        setTimeout(() => {
           this.getRequestList()
-        },1000)
-        
+        },         1000)
+
          this.snackBar.open('Re-assign submitted Successfully')
       } else {
         // this.snackBar.open('error')
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/single-assign-popup/single-assign-popup.component.spec.ts b/project/ws/app/src/lib/routes/home/components/request-list/single-assign-popup/single-assign-popup.component.spec.ts
index 5db0ceadd..c43af98a6 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/single-assign-popup/single-assign-popup.component.spec.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/single-assign-popup/single-assign-popup.component.spec.ts
@@ -1,25 +1,25 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
 
-import { SingleAssignPopupComponent } from './single-assign-popup.component';
+import { SingleAssignPopupComponent } from './single-assign-popup.component'
 
 describe('SingleAssignPopupComponent', () => {
-  let component: SingleAssignPopupComponent;
-  let fixture: ComponentFixture<SingleAssignPopupComponent>;
+  let component: SingleAssignPopupComponent
+  let fixture: ComponentFixture<SingleAssignPopupComponent>
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ SingleAssignPopupComponent ]
+      declarations: [SingleAssignPopupComponent],
     })
-    .compileComponents();
-  }));
+    .compileComponents()
+  }))
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(SingleAssignPopupComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+    fixture = TestBed.createComponent(SingleAssignPopupComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
 
   it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/single-assign-popup/single-assign-popup.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/single-assign-popup/single-assign-popup.component.ts
index 61652ac81..56daadcab 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/single-assign-popup/single-assign-popup.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/single-assign-popup/single-assign-popup.component.ts
@@ -1,14 +1,14 @@
-import { Component, Inject, OnInit, ViewChild } from '@angular/core';
-import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
-import { MAT_DIALOG_DATA, MatDialogRef, MatTableDataSource } from '@angular/material';
-import { MatPaginator } from '@angular/material/paginator';
-import { ProfileV2Service } from '../../../services/home.servive';
-import { ConfigResolveService } from '../../../resolvers/config-resolve.service';
+import { Component, Inject, OnInit, ViewChild } from '@angular/core'
+import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'
+import { MAT_DIALOG_DATA, MatDialogRef, MatTableDataSource } from '@angular/material'
+import { MatPaginator } from '@angular/material/paginator'
+import { ProfileV2Service } from '../../../services/home.servive'
+import { ConfigResolveService } from '../../../resolvers/config-resolve.service'
 
 @Component({
   selector: 'ws-app-single-assign-popup',
   templateUrl: './single-assign-popup.component.html',
-  styleUrls: ['./single-assign-popup.component.scss']
+  styleUrls: ['./single-assign-popup.component.scss'],
 })
 export class SingleAssignPopupComponent implements OnInit {
 
@@ -21,12 +21,12 @@ export class SingleAssignPopupComponent implements OnInit {
   fullProfile: any
   userId: any
   assignText = ''
-  submitAssign = '';
-  requestTypeData:any[]=[]
-  filterRequestData:any[]=[]
-  isDisable:boolean  = false;
+  submitAssign = ''
+  requestTypeData: any[] = []
+  filterRequestData: any[] = []
+  isDisable  = false
   // @ViewChild(MatPaginator, { static: false }) paginator!: MatPaginator;
-  dataSource = new MatTableDataSource<any>([]);
+  dataSource = new MatTableDataSource<any>([])
   @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | null = null
   @ViewChild(MatPaginator, { static: false }) set matPaginator(paginator: MatPaginator) {
     this.paginator = paginator
@@ -44,7 +44,7 @@ export class SingleAssignPopupComponent implements OnInit {
   ) {
     this.requestForm = this.fb.group({
       assignee: new FormControl('', Validators.required),
-      orgSearch: new FormControl('')
+      orgSearch: new FormControl(''),
 
     })
   }
@@ -71,13 +71,13 @@ export class SingleAssignPopupComponent implements OnInit {
       // if (assignOrgData) {
       //   this.requestForm.controls['assignee'].setValue(assignOrgData)
       // }
-      //move selected data to first
-      let position = this.requestTypeData.indexOf(assignOrgData)
+      // move selected data to first
+      const position = this.requestTypeData.indexOf(assignOrgData)
 
-      //check if the element exists in the array
-      if(position > -1){
+      // check if the element exists in the array
+      if (position > -1) {
         // Remove the element from its position
-        let selectedData= this.requestTypeData.splice(position, 1)[0]
+        const selectedData = this.requestTypeData.splice(position, 1)[0]
 
         // Add the removed element to the beginning of the array
         this.requestTypeData.unshift(selectedData)
@@ -85,9 +85,7 @@ export class SingleAssignPopupComponent implements OnInit {
     }
    }
 
-   
-
-  getOrgListData(){
+  getOrgListData() {
     const requestObj = {
       request: {
         filters: {
@@ -96,15 +94,15 @@ export class SingleAssignPopupComponent implements OnInit {
       },
     }
     this.homeService.getRequestTypeList(requestObj).subscribe(data => {
-      if(data){
-        this.requestTypeData = data;
+      if (data) {
+        this.requestTypeData = data
         this.filterRequestData = this.requestTypeData
         this.dataSource.data = this.requestTypeData
-        
+
         this.dataSource.paginator = this.paginator
         this.setFormData()
-      
-      }   
+
+      }
     })
    }
 
@@ -121,7 +119,6 @@ export class SingleAssignPopupComponent implements OnInit {
   //   return array.filter((value: any) =>
   //     value.orgName.toLowerCase().includes(searchValue.toLowerCase()))
   // }
- 
 
   onChangePage(event: any) {
     this.pageNumber = event.pageIndex
@@ -147,20 +144,20 @@ export class SingleAssignPopupComponent implements OnInit {
       competencies: this.data.competencies,
       referenceLink: this.data.referenceLink,
       requestType: this.data.requestType,
-      preferredProvider:this.data.preferredProvider,
+      preferredProvider: this.data.preferredProvider,
       assignedProvider: assigneeProvider,
       status: this.data.status,
       source: this.data.owner,
       demand_id: this.data.demand_id,
-      learningMode:this.data.learningMode
+      learningMode: this.data.learningMode,
         // assignedBy: this.userId,
       }
-      this.homeService.createDemand(request).subscribe((res:any) => {
+      this.homeService.createDemand(request).subscribe((res: any) => {
         if (res) {
           this.dialogRef.close({ data: 'confirmed' })
         }
 
-      },(error:any) => {
+      },                                               (error: any) => {
        this.dialogRef.close({ error })
 
       }
@@ -174,5 +171,4 @@ export class SingleAssignPopupComponent implements OnInit {
     // Implement your cancel logic here
   }
 
-
 }
diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index 2c07f9ee0..7f9b0202b 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -124,7 +124,7 @@ import { SingleAssignPopupComponent } from './components/request-list/single-ass
     CreateRequestFormComponent,
     CompetencyViewComponent,
     AssignListPopupComponent,
-    SingleAssignPopupComponent
+    SingleAssignPopupComponent,
   ],
   imports: [
     CommonModule,
@@ -195,7 +195,7 @@ import { SingleAssignPopupComponent } from './components/request-list/single-ass
     FileProgressComponent,
     CompetencyViewComponent,
     AssignListPopupComponent,
-    SingleAssignPopupComponent
+    SingleAssignPopupComponent,
   ],
   providers: [
     InitResolver,
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
index fec76413d..8b0ab28dc 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
@@ -75,7 +75,7 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
       .subscribe((res: any) => {
         this.lastUploadList = res.result.content.sort((a: any, b: any) =>
           new Date(b.datecreatedon).getTime() - new Date(a.datecreatedon).getTime())
-      }, (error: HttpErrorResponse) => {
+      },         (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open('Unable to get Bulk status list')
         }
@@ -117,7 +117,7 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
         if (!resendFlag) {
           this.verifyOTP(contactType)
         }
-      }, (error: HttpErrorResponse) => {
+      },         (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open(_.get(error, 'error.params.errmsg') || `Unable to send OTP to your ${contactType}, please try again later!`)
         }
@@ -170,7 +170,7 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
             this.fileName = ''
             this.fileSelected = ''
             this.getBulkStatusList()
-          }, (_err: HttpErrorResponse) => {
+          },         (_err: HttpErrorResponse) => {
             if (!_err.ok) {
               this.matSnackBar.open('Uploading CSV file failed due to some error, please try again later!')
             }

From a478f59fe698dac2c51b1ba5c0245e84251b84b4 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Tue, 25 Jun 2024 11:20:28 +0530
Subject: [PATCH 745/887] Fixed lint issues

---
 .../routes/approvals/bulk-upload/bulk-upload.component.html   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
index 1512804e1..671ffbf64 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
@@ -49,8 +49,8 @@
   </div>
 
   <div class="text-base font-bold">File logs
-    <button type="button" class="outline-button float-right" [ngClass]="{'disable': isContentLive}"
-      (click)="getPendingResquests()">Download pending requests</button>
+    <button type="button" class="outline-button float-right" (click)="getPendingResquests()">Download pending
+      requests</button>
   </div>
   <div class="flex flex-col gap-6">
     <div class="file-container"

From 887739dbada8bca8006b6941537c9471d9965f57 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Tue, 25 Jun 2024 13:17:52 +0530
Subject: [PATCH 746/887] Updated pending requests API integration

---
 .../approvals/bulk-upload/bulk-upload.component.ts | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
index 8b0ab28dc..a6e2412b2 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
@@ -75,7 +75,8 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
       .subscribe((res: any) => {
         this.lastUploadList = res.result.content.sort((a: any, b: any) =>
           new Date(b.datecreatedon).getTime() - new Date(a.datecreatedon).getTime())
-      },         (error: HttpErrorResponse) => {
+        // tslint:disable-next-line
+      }, (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open('Unable to get Bulk status list')
         }
@@ -117,7 +118,8 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
         if (!resendFlag) {
           this.verifyOTP(contactType)
         }
-      },         (error: HttpErrorResponse) => {
+        // tslint:disable-next-line
+      }, (error: HttpErrorResponse) => {
         if (!error.ok) {
           this.matSnackBar.open(_.get(error, 'error.params.errmsg') || `Unable to send OTP to your ${contactType}, please try again later!`)
         }
@@ -170,7 +172,8 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
             this.fileName = ''
             this.fileSelected = ''
             this.getBulkStatusList()
-          },         (_err: HttpErrorResponse) => {
+            // tslint:disable-next-line
+          }, (_err: HttpErrorResponse) => {
             if (!_err.ok) {
               this.matSnackBar.open('Uploading CSV file failed due to some error, please try again later!')
             }
@@ -198,6 +201,11 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
       if (res) {
         // console.log('*********************', res)
       }
+      // tslint:disable-next-line
+    }, (error: HttpErrorResponse) => {
+      if (!error.ok) {
+        this.matSnackBar.open(error.error.text)
+      }
     })
   }
 

From fe225725651275e91491015b206a28c929ed5750 Mon Sep 17 00:00:00 2001
From: sohail amjad <sohail.amjad@tarento.com>
Date: Tue, 25 Jun 2024 16:15:38 +0530
Subject: [PATCH 747/887] mdo portal bug fixes

---
 .../assign-list-popup.component.html             |  2 +-
 .../assign-list-popup.component.scss             |  5 +++++
 .../assign-list-popup.component.ts               | 16 ++++++++++++++--
 .../create-request-form.component.html           | 11 +++++++++--
 .../create-request-form.component.scss           | 16 ++++++++++++++++
 .../create-request-form.component.ts             | 11 ++++++++---
 .../request-list/request-list.component.html     |  4 ++--
 .../request-list/request-list.component.ts       |  4 +++-
 8 files changed, 58 insertions(+), 11 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.html b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.html
index 4e2ab2f8f..bd01840b6 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.html
+++ b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.html
@@ -43,7 +43,7 @@ <h2 class="titleText">{{assignText}}</h2>
                 </ng-container>
 
                 <tr mat-header-row *matHeaderRowDef="displayedColumns" class="table-row-data"></tr>
-                <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
+                <tr mat-row *matRowDef="let row; columns: displayedColumns" [ngClass]="{'row-bg':row === this.providerList[0]}"></tr>
               </table>
               <mat-paginator [pageSize]="pageSize" [length]="this.providerCount" [pageSizeOptions]="[5,10,20]"
               (page)="onChangePage($event)"></mat-paginator>
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.scss b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.scss
index 3cda53f18..914f5d8cc 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.scss
@@ -103,6 +103,11 @@ table tr .cdk-column-details {
   width: 40%;
   padding: 0 10% 0 0px !important
 }
+
+.row-bg {
+  background-color: rgba(0, 0, 0, 0.16) !important;
+  pointer-events: none !important;
+}
   
   .action-btn-view {
     color: #1B4CA1;
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.ts
index 5dc91615c..ec2fda3c2 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.ts
@@ -52,9 +52,21 @@ export class AssignListPopupComponent implements OnInit {
       const assignOrgData = this.providerList.find(option =>
         this.data.assignedProvider === option.orgName
       )
-      if (assignOrgData) {
-        this.requestForm.controls['assignee'].setValue(assignOrgData)
+      // if (assignOrgData) {
+      //   this.requestForm.controls['assignee'].setValue(assignOrgData)
+      // }
+
+      // move selected data to first
+      const position = this.providerList.indexOf(assignOrgData)
+       // check if the element exists in the array
+       if (position > -1) {
+        // Remove the element from its position
+        const selectedData = this.providerList.splice(position, 1)[0]
+
+        // Add the removed element to the beginning of the array
+        this.providerList.unshift(selectedData)
       }
+
     }
    }
 
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
index 57949eb0f..f14aa4153 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
@@ -314,7 +314,14 @@
                     </div>
                 </div>
                 <div class="title-name" *ngIf="isBroadCast">
-                    <div class="fonm-element-label label-text">Preffered Providers <span class="required"></span></div>
+                    <div class="fonm-element-label label-text">Preffered Providers <span class="required"></span>
+                      <span class="tooltip-span">
+                        <mat-icon class="info-icon cursor-pointer" [matTooltip]="'You can select upto 5 preferred provider'" 
+                        matTooltipClass="tooltip-sec">info</mat-icon>
+
+                      </span>
+
+                    </div>
                     <div class="">
                         <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
                             <mat-select class=" placeholder-text" placeholder="Choose the provider" (openedChange)="openedChange($event,'providerText')" formControlName="providers"  multiple>
@@ -351,7 +358,7 @@
                 </div>
 
                 <div class="flex flex-start margin-top-l" *ngIf="!isHideData">
-                    <button mat-button class="submit-btn margin-right-xs" type="button" (click)="showConformationPopUp()" [disabled]="!requestForm.valid">Submit</button>
+                    <button mat-button class="submit-btn margin-right-xs" type="button" (click)="submit()" [disabled]="!requestForm.valid">Submit</button>
                     <button mat-button class="close-btn" (click)="navigateBack()" type="button" >Cancel</button>
                    
                   </div>
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.scss b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.scss
index 399f7419e..24f10ca97 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.scss
@@ -21,6 +21,15 @@
                 font-weight: 700;
                 font-size: 14px;
                 line-height: 21px;
+                .tooltip-span {
+                  position: relative;
+                  padding-left: 7px;
+                  .info-icon {
+                    position: absolute;
+                    font-size: 19px;
+                    top: -1px;
+                  }
+                }
             }
                         .learning-section {
                             padding: 16px;
@@ -166,4 +175,11 @@
         padding: 0 4px;
       }
     }
+  }
+  
+  ::ng-deep .tooltip-sec {
+    background-color: 000000 !important;
+    font-size: 12px !important;
+    font-family: 500 !important;
+    color: white !important;
   }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
index 7a5139537..32c08f251 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
@@ -582,7 +582,12 @@ this.dialogRefs.afterClosed().subscribe((_res: any) => {
           this.snackBar.open('Request submitted successfully ')
       }
       },         1000)
-    }
+    },
+    (error:any) => {
+      this.dialogRefs.close({ error })
+      this.snackBar.open('Request Failed')
+
+     }
   )
    }
 
@@ -600,11 +605,11 @@ this.dialogRefs.afterClosed().subscribe((_res: any) => {
         dialogData['icon'] = 'accept_icon'
         dialogData['title'] = 'Processing your request'
         dialogData['subTitle'] = `Wait a second , your request is processing………`
-        dialogData['primaryAction'] = 'Redirecting....'
+        dialogData['primaryAction'] = 'Successfully created....'
         break
     }
 
-    this.openDialoagBox(dialogData)
+     this.openDialoagBox(dialogData)
   }
 
   openDialoagBox(dialogData: any) {
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
index 8446edcbd..1975440c8 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
@@ -111,10 +111,10 @@ <h2>Content Request</h2>
                       <button *ngIf="element?.status === statusKey.Unassigned && element?.status!== statusKey.Inprogress &&  element?.status!== statusKey.invalid " mat-menu-item (click)="onClickMenu(element,'invalidContent')">
                         <span>Mark as invalid</span>
                       </button>
-                      <button mat-menu-item *ngIf="element?.status!== statusKey.Assigned && element?.interestCount >0 && element?.status!== statusKey.Inprogress &&  element?.status!== statusKey.invalid" (click)="onClickMenu(element,'assignContent')">
+                      <button mat-menu-item *ngIf="element?.status!== statusKey.Assigned && element?.interestCount >0 && element?.status!== statusKey.Inprogress &&  element?.status!== statusKey.invalid && element?.status!==statusKey.fullfill" (click)="onClickMenu(element,'assignContent')">
                         <span>Assign</span>
                       </button>
-                      <button *ngIf="element?.status === statusKey.Assigned && element?.status!== statusKey.Inprogress &&  element?.status!== statusKey.invalid " mat-menu-item (click)="onClickMenu(element,'reAssignContent')">
+                      <button *ngIf="element?.status === statusKey.Assigned && element?.status!== statusKey.Inprogress &&  element?.status!== statusKey.invalid && element?.status!==statusKey.fullfill " mat-menu-item (click)="onClickMenu(element,'reAssignContent')">
                         <span> Re-Assign</span>
                       </button>
                       <button mat-menu-item (click)="onClickMenu(element,'copyContent')">
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
index 5354e8449..948e2852d 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
@@ -228,7 +228,9 @@ export class RequestListComponent implements OnInit {
    this.homeService.markAsInvalid(request).subscribe(res => {
      this.invalidRes = res
      if (res) {
-      this.getRequestList()
+      setTimeout(() => {
+        this.getRequestList()
+      },         1000)
      }
 
      this.snackBar.open('Marked as Invalid')

From 802087905c2db32756553116ea4042976f6c06aa Mon Sep 17 00:00:00 2001
From: sohail amjad <sohail.amjad@tarento.com>
Date: Wed, 26 Jun 2024 23:59:24 +0530
Subject: [PATCH 748/887] search issue resolved

---
 .../create-request-form.component.html              |  5 +++--
 .../create-request-form.component.ts                | 13 +++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
index f14aa4153..389710785 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
@@ -303,7 +303,7 @@
                         <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
                             <mat-select class=" placeholder-text" placeholder="Choose the Assignee" formControlName="assignee">
                               <input #search autocomplete="off" placeholder="Search" class="assigneeSearch"
-                               (keyup)="searchValueData('assigneeText')"  formControlName="assigneeText" matInput>
+                               (keyup)="searchValueData('assigneeText')"  (keydown.space)="$event.stopPropagation()" formControlName="assigneeText" matInput>
                               <mat-option *ngFor="let option of filteredAssigneeType" [value]="option">{{option.orgName}}</mat-option>
                           
                             </mat-select>
@@ -338,7 +338,8 @@
                               </mat-select-trigger>
                               <mat-optgroup>
                                 <mat-form-field floatLabel="never">
-                                  <input #search autocomplete="off" placeholder="Search" (keyup)="searchValueData('providerText')"  formControlName="providerText" matInput>
+                                  <input #search autocomplete="off" placeholder="Search" (keyup)="searchValueData('providerText')" (keydown.space)="$event.stopPropagation()"
+                                   formControlName="providerText" matInput>
                                   <button [disableRipple]="true" *ngIf="search.value" matSuffix mat-icon-button aria-label="Clear"
                                     (click)="clearSearch($event,'providerText')"><mat-icon>close</mat-icon></button>
                                 </mat-form-field>
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
index 32c08f251..29c2a27c2 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
@@ -7,6 +7,7 @@ import { CompetencyViewComponent } from '../competency-view/competency-view.comp
 import { ConfirmationBoxComponent } from '../../../../training-plan/components/confirmation-box/confirmation.box.component'
 /* tslint:disable */
 import _ from 'lodash'
+import { debounceTime, distinctUntilChanged, startWith } from 'rxjs/operators'
 /* tslint:enable */
 
 @Component({
@@ -178,12 +179,20 @@ export class CreateRequestFormComponent implements OnInit {
 
   searchValueData(searchValue: any) {
     if (searchValue === 'providerText') {
-      this.requestForm.controls['providerText'].valueChanges.subscribe((newValue: any) => {
+      this.requestForm.controls['providerText'].valueChanges.pipe(
+        debounceTime(100),
+        distinctUntilChanged(),
+        startWith(''),
+      ).subscribe((newValue: any) => {
         this.filteredRequestType = this.filterOrgValues(newValue, this.requestTypeData)
       })
     }
     if (searchValue === 'assigneeText') {
-      this.requestForm.controls['assigneeText'].valueChanges.subscribe((newValue: any) => {
+      this.requestForm.controls['assigneeText'].valueChanges.pipe(
+        debounceTime(100),
+        distinctUntilChanged(),
+        startWith(''),
+      ).subscribe((newValue: any) => {
         this.filteredAssigneeType = this.filterOrgValues(newValue, this.requestTypeData)
       })
     }

From 65ee8fa5c77709c47897d94704e5648e393cf1c4 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Thu, 27 Jun 2024 16:25:08 +0530
Subject: [PATCH 749/887] KAR-642 & KAR-644 fixed

---
 .../create-request-form.component.ts               |  2 +-
 .../components/user-cards/user-card.component.ts   | 14 +++++++++++---
 .../single-user-creation.component.ts              |  3 ++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
index 29c2a27c2..39afd3af3 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
@@ -592,7 +592,7 @@ this.dialogRefs.afterClosed().subscribe((_res: any) => {
       }
       },         1000)
     },
-    (error:any) => {
+                                                     (error: any) => {
       this.dialogRefs.close({ error })
       this.snackBar.open('Request Failed')
 
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 88696dad2..08a648520 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -1,4 +1,6 @@
 import {
+  AfterViewChecked,
+  ChangeDetectorRef,
   Component, ElementRef, EventEmitter, Input, OnChanges, OnInit, Output,
   QueryList, TemplateRef, ViewChild, ViewChildren,
 } from '@angular/core'
@@ -25,7 +27,8 @@ import { EventService } from '@sunbird-cb/utils'
 import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
 import { DatePipe } from '@angular/common'
 
-const EMAIL_PATTERN = /^[a-zA-Z0-9](\.?[a-zA-Z0-9_]+)*@[a-zA-Z0-9]*.[a-zA-Z]{2,}$/
+// const EMAIL_PATTERN = /^[a-zA-Z0-9](\.?[a-zA-Z0-9_]+)*@[a-zA-Z0-9]*.[a-zA-Z]{2,}$/
+const EMAIL_PATTERN = /^[a-zA-Z0-9]+[a-zA-Z0-9._-]*[a-zA-Z0-9]+@[a-zA-Z0-9]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z]{2,4}$/
 
 @Component({
   selector: 'ws-widget-user-card',
@@ -36,7 +39,7 @@ const EMAIL_PATTERN = /^[a-zA-Z0-9](\.?[a-zA-Z0-9_]+)*@[a-zA-Z0-9]*.[a-zA-Z]{2,}
     { provide: MAT_DATE_FORMATS, useValue: APP_DATE_FORMATS },
   ],
 })
-export class UserCardComponent implements OnInit, OnChanges {
+export class UserCardComponent implements OnInit, OnChanges, AfterViewChecked {
   @Input() userId: any
   @Input() tableData: any
   @Input() usersData: any
@@ -121,7 +124,8 @@ export class UserCardComponent implements OnInit, OnChanges {
               private dialog: MatDialog, private approvalSvc: ApprovalsService,
               private route: ActivatedRoute, private snackBar: MatSnackBar,
               private events: EventService,
-              private datePipe: DatePipe) {
+              private datePipe: DatePipe,
+              private cdr: ChangeDetectorRef) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),
@@ -205,6 +209,10 @@ export class UserCardComponent implements OnInit, OnChanges {
     }
   }
 
+  ngAfterViewChecked() {
+    this.cdr.detectChanges()
+  }
+
   getApprovalData() {
     this.approvalData = this.usersData
     if (this.approvalData && this.approvalData.length > 0) {
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
index 77be3ca32..2189200cb 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/single-user-creation/single-user-creation.component.ts
@@ -26,7 +26,8 @@ export const MY_FORMATS = {
   },
 }
 
-const EMAIL_PATTERN = /^[a-zA-Z0-9](\.?[a-zA-Z0-9_]+)*@[a-zA-Z0-9]*.[a-zA-Z]{2,}$/
+// const EMAIL_PATTERN = /^[a-zA-Z0-9](\.?[a-zA-Z0-9_]+)*@[a-zA-Z0-9]*.[a-zA-Z]{2,}$/
+const EMAIL_PATTERN = /^[a-zA-Z0-9]+[a-zA-Z0-9._-]*[a-zA-Z0-9]+@[a-zA-Z0-9]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z]{2,4}$/
 const MOBILE_PATTERN = /^[0]?[6789]\d{9}$/
 const PIN_CODE_PATTERN = /^[1-9][0-9]{5}$/
 

From 142c1c97cfeeeff68ca119246286bbe56fa5c54c Mon Sep 17 00:00:00 2001
From: sohail amjad <sohail.amjad@tarento.com>
Date: Thu, 27 Jun 2024 20:34:44 +0530
Subject: [PATCH 750/887] assign Issue Fixed

---
 .../assign-list-popup/assign-list-popup.component.html   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.html b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.html
index bd01840b6..4551e3aa9 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.html
+++ b/project/ws/app/src/lib/routes/home/components/request-list/assign-list-popup/assign-list-popup.component.html
@@ -43,7 +43,14 @@ <h2 class="titleText">{{assignText}}</h2>
                 </ng-container>
 
                 <tr mat-header-row *matHeaderRowDef="displayedColumns" class="table-row-data"></tr>
-                <tr mat-row *matRowDef="let row; columns: displayedColumns" [ngClass]="{'row-bg':row === this.providerList[0]}"></tr>
+                <ng-container *ngIf="data?.assignedProvider">
+                  <tr mat-row *matRowDef="let row; columns: displayedColumns" [ngClass]="{'row-bg':row === this.providerList[0]}"></tr>
+
+                </ng-container>
+                <ng-container *ngIf="!data?.assignedProvider">
+                  <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
+
+                </ng-container>
               </table>
               <mat-paginator [pageSize]="pageSize" [length]="this.providerCount" [pageSizeOptions]="[5,10,20]"
               (page)="onChangePage($event)"></mat-paginator>

From e12c74c034dab47ad50f8e2a7359e2ceb605b673 Mon Sep 17 00:00:00 2001
From: sohail amjad <sohail.amjad@tarento.com>
Date: Thu, 27 Jun 2024 22:29:25 +0530
Subject: [PATCH 751/887] commented status

---
 .../create-request-form/create-request-form.component.ts      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
index 39afd3af3..51e59f56e 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
@@ -565,8 +565,8 @@ this.dialogRefs.afterClosed().subscribe((_res: any) => {
       requestType: this.requestForm.value.requestType,
       preferredProvider: providerList,
       assignedProvider: assigneeProvider,
-      status: this.statusValue,
-      source: this.userId,
+      // status: this.statusValue,
+      // source: this.userId,
 
     }
 

From ef105f2ff33484c4085ea1d2a27fa8027d62afc5 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Fri, 28 Jun 2024 17:50:17 +0530
Subject: [PATCH 752/887] =?UTF-8?q?KB-5265=20Once=20user=20select=20the=20?=
 =?UTF-8?q?provider=E2=80=99s=20name=20by=20searching=20previously=20selec?=
 =?UTF-8?q?ted=20provider=20name=20is=20disappearing.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../create-request-form.component.html        | 577 +++++++++---------
 .../create-request-form.component.scss        |  42 +-
 .../create-request-form.component.ts          | 438 ++++++-------
 3 files changed, 543 insertions(+), 514 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
index 389710785..efc865705 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
@@ -1,6 +1,6 @@
 <div class="flex flex-4 flex-column main-container">
-    <mat-card class="card-section">
-      <!-- <mat-card-header class="flex-custom-m">
+  <mat-card class="card-section">
+    <!-- <mat-card-header class="flex-custom-m">
         <div class="flex-1" role="link" tabindex="1">
           <div class="flex flex-1">
             <mat-card-title class="flex-4 mobile-margin mat-h2">
@@ -9,96 +9,100 @@
           </div>
         </div>
       </mat-card-header> -->
-      <span class="flex">
-        <mat-icon class="arrow-btn" (click)="navigateBack()">arrow_back</mat-icon>
-        <mat-card-title class="flex-4 mobile-margin mat-h2 title-request">
-          {{isHideData ? 'Go Back':'Request Content'}}
-        </mat-card-title>
-      </span>
-      
-      <mat-card-content>
-        <div class="form-element">
-            <form [formGroup]="requestForm">
-                <div class="title-name">
-                    <div class="fonm-element-label label-text">Title <span class="required"></span></div>
-                    <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
-                        <input class="w-full placeholder-text" matInput placeholder="Enter the content name" formControlName="TitleName" maxlength="70">
-                        <mat-hint align="end">{{ requestForm.controls['TitleName'].value.length }} / 70</mat-hint>                    
-                        <mat-error *ngIf="requestForm.controls['TitleName'].hasError('required')">
-                          Please enter a title for the request."
-                        </mat-error>
-                        <mat-error
-                        *ngIf="requestForm.controls['TitleName'].hasError('minlength') && !requestForm.controls['TitleName'].errors?.pattern"
-                        i18n="name Error|Explains name is required">
-                        Minimum characters left to create {{10 - requestForm.controls['TitleName'].value.length}}
-                      </mat-error>
-                      <mat-error *ngIf="requestForm.controls['TitleName'].errors?.pattern"
-                        i18n="name Error|Explains name is required">
-                        Only {{specialCharList}} characters are supported
-                      </mat-error>
-                      <mat-hint>
-                        Only {{specialCharList}} characters are supported
-                      </mat-hint>
-                    </mat-form-field>
-                </div>
-                <div class="title-name">
-                    <div class="fonm-element-label label-text">Objective <span class="required"></span></div>
-                    <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
-                        <!-- <input class="w-full" matInput placeholder="Provide the objective of the content" formControlName="Objective" maxlength="500"> -->
-                        <textarea matInput class="w-full  placeholder-text" [matTextareaAutosize] [matAutosizeMaxRows]="10" [matAutosizeMinRows]="5"
-                        formControlName="Objective" placeholder="Provide the objective of the content" maxlength="500" i18n-placeholder></textarea>
-                        <mat-hint align="end">{{ requestForm.controls['Objective'].value.length }} / 500</mat-hint>                    
-                        <mat-error *ngIf="requestForm.controls['Objective'].hasError('required')">
-                          Please enter the objective of the request.
-                        </mat-error>
-                        <mat-error
-                        *ngIf="requestForm.controls['Objective'].hasError('minlength') && !requestForm.controls['Objective'].errors?.pattern"
-                        i18n="name Error|Explains name is required">
-                        Minimum characters left to create {{10 - requestForm.controls['Objective'].value.length}}
-                      </mat-error>
-                      <mat-error *ngIf="requestForm.controls['Objective'].errors?.pattern"
-                        i18n="name Error|Explains name is required">
-                        Only {{specialCharList}} characters are supported
-                      </mat-error>
-                      <mat-hint>
-                        Only {{specialCharList}} characters are supported
-                      </mat-hint>
-                    </mat-form-field>
-                </div>
-                <div class="title-name">
-                    <div class="fonm-element-label label-text">Type of user</div>
-                    <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
-                        <!-- <input class="w-full" matInput placeholder="Example for ASO and above" formControlName="userType" maxlength="500"> -->
-                        <textarea matInput class="w-full  placeholder-text" [matTextareaAutosize] [matAutosizeMaxRows]="10" [matAutosizeMinRows]="2"
-                        formControlName="userType" placeholder="Example for ASO and above" maxlength="500" i18n-placeholder></textarea>
-                        <mat-hint align="end">{{ requestForm.controls['userType'].value.length }} / 500</mat-hint>                    
-                        <mat-error
-                        *ngIf="requestForm.controls['userType'].hasError('minlength') && !requestForm.controls['userType'].errors?.pattern"
-                        i18n="name Error|Explains name is required">
-                        Minimum characters left to create {{10 - requestForm.controls['userType'].value.length}}
-                      </mat-error>
-                      <mat-error *ngIf="requestForm.controls['userType'].errors?.pattern"
-                        i18n="name Error|Explains name is required">
-                        Only {{specialCharList}} characters are supported
-                      </mat-error>
-                      <mat-hint>
-                        Only {{specialCharList}} characters are supported
-                      </mat-hint>
-                    </mat-form-field>
-                </div>
-                <div class="title-name">
-                    <div class="fonm-element-label label-text">Learning Mode</div>
-                    <div class="mt-5">
-                    <mat-radio-group aria-label="Select an option" formControlName="learningMode" >
-                        <mat-radio-button class="learning-section"  *ngFor="let item of learningList"  [value]="item.key"  >{{item.name}}</mat-radio-button>
-                    
-                      </mat-radio-group>
-                    </div>
-                </div>
-                
-                <div class="title-name">
-                    <span class="comp-heading">Targeted Competencies</span>
-                    <!-- <div>
+    <span class="flex">
+      <mat-icon class="arrow-btn" (click)="navigateBack()">arrow_back</mat-icon>
+      <mat-card-title class="flex-4 mobile-margin mat-h2 title-request">
+        {{isHideData ? 'Go Back':'Request Content'}}
+      </mat-card-title>
+    </span>
+
+    <mat-card-content>
+      <div class="form-element">
+        <form [formGroup]="requestForm">
+          <div class="title-name">
+            <div class="fonm-element-label label-text">Title <span class="required"></span></div>
+            <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
+              <input class="w-full placeholder-text" matInput placeholder="Enter the content name"
+                formControlName="TitleName" maxlength="70">
+              <mat-hint align="end">{{ requestForm.controls['TitleName'].value.length }} / 70</mat-hint>
+              <mat-error *ngIf="requestForm.controls['TitleName'].hasError('required')">
+                Please enter a title for the request."
+              </mat-error>
+              <mat-error
+                *ngIf="requestForm.controls['TitleName'].hasError('minlength') && !requestForm.controls['TitleName'].errors?.pattern"
+                i18n="name Error|Explains name is required">
+                Minimum characters left to create {{10 - requestForm.controls['TitleName'].value.length}}
+              </mat-error>
+              <mat-error *ngIf="requestForm.controls['TitleName'].errors?.pattern"
+                i18n="name Error|Explains name is required">
+                Only {{specialCharList}} characters are supported
+              </mat-error>
+              <mat-hint>
+                Only {{specialCharList}} characters are supported
+              </mat-hint>
+            </mat-form-field>
+          </div>
+          <div class="title-name">
+            <div class="fonm-element-label label-text">Objective <span class="required"></span></div>
+            <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
+              <!-- <input class="w-full" matInput placeholder="Provide the objective of the content" formControlName="Objective" maxlength="500"> -->
+              <textarea matInput class="w-full  placeholder-text" [matTextareaAutosize] [matAutosizeMaxRows]="10"
+                [matAutosizeMinRows]="5" formControlName="Objective" placeholder="Provide the objective of the content"
+                maxlength="500" i18n-placeholder></textarea>
+              <mat-hint align="end">{{ requestForm.controls['Objective'].value.length }} / 500</mat-hint>
+              <mat-error *ngIf="requestForm.controls['Objective'].hasError('required')">
+                Please enter the objective of the request.
+              </mat-error>
+              <mat-error
+                *ngIf="requestForm.controls['Objective'].hasError('minlength') && !requestForm.controls['Objective'].errors?.pattern"
+                i18n="name Error|Explains name is required">
+                Minimum characters left to create {{10 - requestForm.controls['Objective'].value.length}}
+              </mat-error>
+              <mat-error *ngIf="requestForm.controls['Objective'].errors?.pattern"
+                i18n="name Error|Explains name is required">
+                Only {{specialCharList}} characters are supported
+              </mat-error>
+              <mat-hint>
+                Only {{specialCharList}} characters are supported
+              </mat-hint>
+            </mat-form-field>
+          </div>
+          <div class="title-name">
+            <div class="fonm-element-label label-text">Type of user</div>
+            <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
+              <!-- <input class="w-full" matInput placeholder="Example for ASO and above" formControlName="userType" maxlength="500"> -->
+              <textarea matInput class="w-full  placeholder-text" [matTextareaAutosize] [matAutosizeMaxRows]="10"
+                [matAutosizeMinRows]="2" formControlName="userType" placeholder="Example for ASO and above"
+                maxlength="500" i18n-placeholder></textarea>
+              <mat-hint align="end">{{ requestForm.controls['userType'].value.length }} / 500</mat-hint>
+              <mat-error
+                *ngIf="requestForm.controls['userType'].hasError('minlength') && !requestForm.controls['userType'].errors?.pattern"
+                i18n="name Error|Explains name is required">
+                Minimum characters left to create {{10 - requestForm.controls['userType'].value.length}}
+              </mat-error>
+              <mat-error *ngIf="requestForm.controls['userType'].errors?.pattern"
+                i18n="name Error|Explains name is required">
+                Only {{specialCharList}} characters are supported
+              </mat-error>
+              <mat-hint>
+                Only {{specialCharList}} characters are supported
+              </mat-hint>
+            </mat-form-field>
+          </div>
+          <div class="title-name">
+            <div class="fonm-element-label label-text">Learning Mode</div>
+            <div class="mt-5">
+              <mat-radio-group aria-label="Select an option" formControlName="learningMode">
+                <mat-radio-button class="learning-section" *ngFor="let item of learningList"
+                  [value]="item.key">{{item.name}}</mat-radio-button>
+
+              </mat-radio-group>
+            </div>
+          </div>
+
+          <div class="title-name">
+            <span class="comp-heading">Targeted Competencies</span>
+            <!-- <div>
                         <div class="fonm-element-label label-text">Competency Area</div>
                         <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
                             <mat-select placeholder="Select Area" formControlName="compArea" (selectionChange)="onAreaSelection($event)">
@@ -109,112 +113,109 @@
                         </mat-form-field>
                     </div> -->
 
-                    <div class="flex-1">
-                      <div class="margin-bottom-m">
-                        <p class="mat-subheading-2">Competency Area</p>
-                        <ng-container *ngIf="filteredallCompetencies">
-                          <mat-radio-group name="competencyArea" class="flex tgl-group margin-top-s flex-wrap"
-                          formControlName="compArea">
-                            <mat-radio-button matInput [name]="'radio-' + option.name"
-                              class="flex flex-row itm-center ws-mat-accent-border margin-right-s"
-                              *ngFor="let option of filteredallCompetencies" [value]="option.name"
-                              (change)="compAreaSelected(option)">
-                              <span class="mat-body-2">{{option.name}}</span>
-                            </mat-radio-button>
-                          </mat-radio-group>
-                        </ng-container>
-                      </div>
-    
-                  <div class="margin-bottom-m" *ngIf="allCompetencyTheme && allCompetencyTheme.length > 0">
-                        <p class="mat-subheading-2">Competency Theme</p>
-                        <div class="flex flex-1 flex-row margin-fix search">
-                          <mat-form-field appearance="outline" class="autocomplete-form" color="primary"
-                            [floatLabel]="'never'">
-                            <mat-icon matPrefix class="search-home flex items-center justify-center">search</mat-icon>
-                            <mat-label>Search</mat-label>
-                            <input type="search" #searchInput class="ml-2 flex-1" i18n-placeholder="search"
-                              [placeholder]="'Search'" i18-aria-label aria-label="Search" matInput
-                              formControlName="queryThemeControl" maxlength="50"
-                              (keyup)="updateQuery('theme')" />
-                          </mat-form-field>
-                          <button class="margin-top-s" mat-icon-button (click)="resetSearch('theme')">
-                            <mat-icon>refresh</mat-icon>
-                          </button>
-                        </div>
-                        <div>
-                          <span class="display-inline-block complabels mat-caption cursor-pointer"
-                            [ngClass]="{active: (seletedCompetencyTheme && option.id === seletedCompetencyTheme.id)}"
-                            (click)="compThemeSelected(option)"
-                            *ngFor="let option of filteredallCompetencyTheme">{{option.name}}</span>
-                        </div>
-                      </div>
-    
-                       <div class="margin-bottom-m" *ngIf="allCompetencySubtheme && allCompetencySubtheme.length > 0">
-                        <p class="mat-subheading-2">Competency Sub theme</p>
-                        <div class="flex flex-1 flex-row margin-fix search">
-                          <mat-form-field appearance="outline" class="autocomplete-form" color="primary"
-                            [floatLabel]="'never'">
-                            <mat-icon matPrefix class="search-home flex items-center justify-center">search</mat-icon>
-                            <mat-label>Search</mat-label>
-                            <input type="search" #searchInput class="ml-2 flex-1" i18n-placeholder="search"
-                              [placeholder]="'Search'" i18-aria-label aria-label="Search" matInput
-                              formControlName="querySubThemeControl" maxlength="50"
-                              (keyup)="updateQuery('subtheme')" />
-                          </mat-form-field>
-                          <button class="margin-top-s" mat-icon-button (click)="resetSearch('subtheme')">
-                            <mat-icon>refresh</mat-icon>
-                          </button>
-                        </div>
-                        <div>
-                          <span class="display-inline-block complabels mat-caption cursor-pointer"
-                            [ngClass]="{active: (seletedCompetencySubTheme && option.id === seletedCompetencySubTheme.id)}"
-                            (click)="compSubThemeSelected(option)"
-                            *ngFor="let option of filteredallCompetencySubtheme">{{option.name}}</span>
-                        </div>
-                      </div> 
-    
-                      <div class="margin-bottom-l">
-                        <button mat-raised-button type="button"
-                          class="ws-mat-default-text ws-mat-accent-border-active compbutton"
-                          [disabled]="!enableCompetencyAdd" (click)="addCompetency()">
-                          <span class="mat-subheading-2 padding-xs" i18n style="vertical-align: unset;">Add</span>
-                        </button>
-                      </div>
-                    </div>
-                      <div class="flex new-mobile">
-                <div class="flex-1" >
-                  <div class="flex flex-1" *ngIf="requestForm.controls?.competencies_v5?.value?.length > 0">
-                    <table class="compt-table width-1-1 text-left margin-bottom-xl" cellspacing="0">
-                      <tr>
-                        <th class="padding-xs ws-mat-black60-text mat-body-1">Area</th>
-                        <th class="padding-xs ws-mat-black60-text mat-body-1">Theme</th>
-                        <th class="padding-xs ws-mat-black60-text mat-body-1">Sub theme</th>
-                      </tr>
-                      <tr   *ngFor="let comp of requestForm.controls?.competencies_v5?.value"  [attr.disabled]="isCompetencyHide ? true : null" (click)=view(comp)>
-                        <td  class="padding-xs mat-body-1 cursor-pointer">{{comp.competencyArea}}</td>
-                        <td class="padding-xs mat-body-1 cursor-pointer">{{comp.competencyTheme || comp.name}}</td>
-                        <td class="padding-xs mat-body-1 cursor-pointer">{{comp.competencySubTheme ||
-                          comp.selectedLevelLevel}}</td>
-                      </tr>
-                    </table>
-                  </div>
+            <div class="flex-1">
+              <div class="margin-bottom-m">
+                <p class="mat-subheading-2">Competency Area</p>
+                <ng-container *ngIf="filteredallCompetencies">
+                  <mat-radio-group name="competencyArea" class="flex tgl-group margin-top-s flex-wrap"
+                    formControlName="compArea">
+                    <mat-radio-button matInput [name]="'radio-' + option.name"
+                      class="flex flex-row itm-center ws-mat-accent-border margin-right-s"
+                      *ngFor="let option of filteredallCompetencies" [value]="option.name"
+                      (change)="compAreaSelected(option)">
+                      <span class="mat-body-2">{{option.name}}</span>
+                    </mat-radio-button>
+                  </mat-radio-group>
+                </ng-container>
+              </div>
+
+              <div class="margin-bottom-m" *ngIf="allCompetencyTheme && allCompetencyTheme.length > 0">
+                <p class="mat-subheading-2">Competency Theme</p>
+                <div class="flex flex-1 flex-row margin-fix search">
+                  <mat-form-field appearance="outline" class="autocomplete-form" color="primary" [floatLabel]="'never'">
+                    <mat-icon matPrefix class="search-home flex items-center justify-center">search</mat-icon>
+                    <mat-label>Search</mat-label>
+                    <input type="search" #searchInput class="ml-2 flex-1" i18n-placeholder="search"
+                      [placeholder]="'Search'" i18-aria-label aria-label="Search" matInput
+                      formControlName="queryThemeControl" maxlength="50" (keyup)="updateQuery('theme')" />
+                  </mat-form-field>
+                  <button class="margin-top-s" mat-icon-button (click)="resetSearch('theme')">
+                    <mat-icon>refresh</mat-icon>
+                  </button>
                 </div>
-                <div class="" *ngIf="showSaveButton()"> 
-                  <button mat-raised-button type="button" style="line-height: 48px;"
+                <div>
+                  <span class="display-inline-block complabels mat-caption cursor-pointer"
+                    [ngClass]="{active: (seletedCompetencyTheme && option.id === seletedCompetencyTheme.id)}"
+                    (click)="compThemeSelected(option)"
+                    *ngFor="let option of filteredallCompetencyTheme">{{option.name}}</span>
+                </div>
+              </div>
+
+              <div class="margin-bottom-m" *ngIf="allCompetencySubtheme && allCompetencySubtheme.length > 0">
+                <p class="mat-subheading-2">Competency Sub theme</p>
+                <div class="flex flex-1 flex-row margin-fix search">
+                  <mat-form-field appearance="outline" class="autocomplete-form" color="primary" [floatLabel]="'never'">
+                    <mat-icon matPrefix class="search-home flex items-center justify-center">search</mat-icon>
+                    <mat-label>Search</mat-label>
+                    <input type="search" #searchInput class="ml-2 flex-1" i18n-placeholder="search"
+                      [placeholder]="'Search'" i18-aria-label aria-label="Search" matInput
+                      formControlName="querySubThemeControl" maxlength="50" (keyup)="updateQuery('subtheme')" />
+                  </mat-form-field>
+                  <button class="margin-top-s" mat-icon-button (click)="resetSearch('subtheme')">
+                    <mat-icon>refresh</mat-icon>
+                  </button>
+                </div>
+                <div>
+                  <span class="display-inline-block complabels mat-caption cursor-pointer"
+                    [ngClass]="{active: (seletedCompetencySubTheme && option.id === seletedCompetencySubTheme.id)}"
+                    (click)="compSubThemeSelected(option)"
+                    *ngFor="let option of filteredallCompetencySubtheme">{{option.name}}</span>
+                </div>
+              </div>
+
+              <div class="margin-bottom-l">
+                <button mat-raised-button type="button"
+                  class="ws-mat-default-text ws-mat-accent-border-active compbutton" [disabled]="!enableCompetencyAdd"
+                  (click)="addCompetency()">
+                  <span class="mat-subheading-2 padding-xs" i18n style="vertical-align: unset;">Add</span>
+                </button>
+              </div>
+            </div>
+            <div class="flex new-mobile">
+              <div class="flex-1">
+                <div class="flex flex-1" *ngIf="requestForm.controls?.competencies_v5?.value?.length > 0">
+                  <table class="compt-table width-1-1 text-left margin-bottom-xl" cellspacing="0">
+                    <tr>
+                      <th class="padding-xs ws-mat-black60-text mat-body-1">Area</th>
+                      <th class="padding-xs ws-mat-black60-text mat-body-1">Theme</th>
+                      <th class="padding-xs ws-mat-black60-text mat-body-1">Sub theme</th>
+                    </tr>
+                    <tr *ngFor="let comp of requestForm.controls?.competencies_v5?.value"
+                      [attr.disabled]="isCompetencyHide ? true : null" (click)=view(comp)>
+                      <td class="padding-xs mat-body-1 cursor-pointer">{{comp.competencyArea}}</td>
+                      <td class="padding-xs mat-body-1 cursor-pointer">{{comp.competencyTheme || comp.name}}</td>
+                      <td class="padding-xs mat-body-1 cursor-pointer">{{comp.competencySubTheme ||
+                        comp.selectedLevelLevel}}</td>
+                    </tr>
+                  </table>
+                </div>
+              </div>
+              <div class="" *ngIf="showSaveButton()">
+                <button mat-raised-button type="button" style="line-height: 48px;"
                   class="ws-mat-default-text ws-mat-accent-border-active"
                   (click)="!requestForm.invalid ? data.emit('save') : showToasterMessage('mandatoryFields')">
                   <span class="mat-subheading-2 padding-xs" i18n style="vertical-align: unset;">Save</span>
                 </button>
-                </div>
               </div>
+            </div>
 
-           <!-- //old design -->
-                <!-- <div *ngIf="allCompetencyTheme && allCompetencyTheme.length > 0">
+            <!-- //old design -->
+            <!-- <div *ngIf="allCompetencyTheme && allCompetencyTheme.length > 0">
                     <div class="fonm-element-label label-text">Competency Theme</div>
                     <mat-form-field appearance="outline" class="w-full" fxFlex="40">
                         <mat-label>Select theme</mat-label>
                         <mat-select (openedChange)="openedChange($event,'themeText')"  (selectionChange)="onThemeSelection($event)" formControlName="compTheme"  multiple>
-                      
+
                           <mat-select-trigger>
                             <mat-chip-list>
                               <mat-chip *ngFor="let item of requestForm.get('compTheme').value"
@@ -235,7 +236,7 @@
                             <div>No results found!</div>
                           </mat-optgroup>
                           <mat-option *ngFor="let option of filterCompetencyThemes"  [value]="option">{{option.name}}</mat-option>
-                      
+
                         </mat-select>
                       </mat-form-field>
                 </div>
@@ -245,7 +246,7 @@
                     <mat-form-field appearance="outline" class="w-full" fxFlex="40">
                         <mat-label>Select Sub theme</mat-label>
                         <mat-select (openedChange)="openedChange($event,'subthemeText')" (selectionChange)="onSubThemeSelection($event)" formControlName="compSubTheme"  multiple>
-                      
+
                           <mat-select-trigger>
                             <mat-chip-list>
                               <mat-chip *ngFor="let item of requestForm.get('compSubTheme').value"
@@ -266,111 +267,119 @@
                             <div>No results found!</div>
                           </mat-optgroup>
                           <mat-option *ngFor="let option of filteredSubTheme"  [value]="option">{{option.name}}</mat-option>
-                      
+
                         </mat-select>
                       </mat-form-field>
 
-                  
+
                 </div> -->
-                </div>
-                <!-- <div class="title-name">
-                   
+          </div>
+          <!-- <div class="title-name">
+
                 </div> -->
 
-                <div class="title-text">
-                    <div class="fonm-element-label label-text">Refrence Link</div>
-                    <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
-                        <input class="w-full  placeholder-text" matInput placeholder="Provide reference link" formControlName="referenceLink">
-                        </mat-form-field>
+          <div class="title-text">
+            <div class="fonm-element-label label-text">Refrence Link</div>
+            <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
+              <input class="w-full  placeholder-text" matInput placeholder="Provide reference link"
+                formControlName="referenceLink">
+            </mat-form-field>
 
-                    
-                </div>
-                <div class="title-text">
-                    <div class="fonm-element-label label-text">Request Type<span class="required"></span></div>
-                    <div class="mt-5">
-                    <mat-radio-group aria-label="Select an option"    formControlName="requestType" >
-                        <mat-radio-button class="learning-section"  *ngFor="let item of requestTypeList" [value]="item" (change)="selectRequestType(item)">{{item}}</mat-radio-button>
-                        <!-- <mat-error *ngIf="requestForm.controls['requestType'].hasError('required')">
+
+          </div>
+          <div class="title-text">
+            <div class="fonm-element-label label-text">Request Type<span class="required"></span></div>
+            <div class="mt-5">
+              <mat-radio-group aria-label="Select an option" formControlName="requestType">
+                <mat-radio-button class="learning-section" *ngFor="let item of requestTypeList" [value]="item"
+                  (change)="selectRequestType(item)">{{item}}</mat-radio-button>
+                <!-- <mat-error *ngIf="requestForm.controls['requestType'].hasError('required')">
                           Please select a request type (Single Provider or Broadcast).
                         </mat-error> -->
-                    
-                      </mat-radio-group>
-                    </div>
-                </div>
-                <div class="title-name" *ngIf="isAssignee">
-                    <div class="fonm-element-label label-text">Assignee <span class="required"></span></div>
-                    <div class="">
-                        <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
-                            <mat-select class=" placeholder-text" placeholder="Choose the Assignee" formControlName="assignee">
-                              <input #search autocomplete="off" placeholder="Search" class="assigneeSearch"
-                               (keyup)="searchValueData('assigneeText')"  (keydown.space)="$event.stopPropagation()" formControlName="assigneeText" matInput>
-                              <mat-option *ngFor="let option of filteredAssigneeType" [value]="option">{{option.orgName}}</mat-option>
-                          
-                            </mat-select>
-                            <mat-error *ngIf="requestForm.controls['assignee'].hasError('required')">
-                              Please select a provider/assignee for the request.
-                            </mat-error>
-                          </mat-form-field>
-                    </div>
-                </div>
-                <div class="title-name" *ngIf="isBroadCast">
-                    <div class="fonm-element-label label-text">Preffered Providers <span class="required"></span>
-                      <span class="tooltip-span">
-                        <mat-icon class="info-icon cursor-pointer" [matTooltip]="'You can select upto 5 preferred provider'" 
-                        matTooltipClass="tooltip-sec">info</mat-icon>
 
-                      </span>
+              </mat-radio-group>
+            </div>
+          </div>
+          <div class="title-name" *ngIf="isAssignee">
+            <div class="fonm-element-label label-text">Assignee <span class="required"></span></div>
+            <div class="">
+              <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
+                <mat-select class=" placeholder-text" placeholder="Choose the Assignee" formControlName="assignee">
+                  <input #search autocomplete="off" placeholder="Search" class="assigneeSearch"
+                    (keydown.space)="$event.stopPropagation()" formControlName="assigneeText" matInput>
+                  <mat-option *ngFor="let option of filteredAssigneeType"
+                    [value]="option">{{option.orgName}}</mat-option>
 
-                    </div>
-                    <div class="">
-                        <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
-                            <mat-select class=" placeholder-text" placeholder="Choose the provider" (openedChange)="openedChange($event,'providerText')" formControlName="providers"  multiple>
-                          
-                              <mat-select-trigger [ngClass]="{'disbaledSelect':isHideData}">
-                                <mat-chip-list>
-                                  <mat-chip *ngFor="let item of requestForm.get('providers').value"
-                                    [removable]="true" (removed)="onProviderRemoved(item)">
-                                    {{ item.orgName }}
-                                    <mat-icon matChipRemove>cancel</mat-icon>
-                                  </mat-chip>
-                                </mat-chip-list>
-                                <!-- {{requestForm.get('compTheme').value | json}} -->
-                              </mat-select-trigger>
-                              <mat-optgroup>
-                                <mat-form-field floatLabel="never">
-                                  <input #search autocomplete="off" placeholder="Search" (keyup)="searchValueData('providerText')" (keydown.space)="$event.stopPropagation()"
-                                   formControlName="providerText" matInput>
-                                  <button [disableRipple]="true" *ngIf="search.value" matSuffix mat-icon-button aria-label="Clear"
-                                    (click)="clearSearch($event,'providerText')"><mat-icon>close</mat-icon></button>
-                                </mat-form-field>
-                              </mat-optgroup>
-                              <mat-optgroup *ngIf="filteredRequestType.length === 0">
-                                <div>No results found!</div>
-                              </mat-optgroup>
-                              <!-- <mat-option *ngFor="let option of requestObjData.preferredProvider" [value]="option.providerName">{{option.providerName}}</mat-option> -->
-                              <mat-option *ngFor="let option of filteredRequestType"  [disabled]="isOptionDisabled(option)" [value]="option">{{option.orgName}}</mat-option>
-                          
-                            </mat-select>
-                            <mat-error *ngIf="requestForm.controls['providerText'].hasError('required')">
-                              Please select up to five preferred providers for the request.
-                            </mat-error>
-                          </mat-form-field>
-                    </div>
-                </div>
+                </mat-select>
+                <mat-error *ngIf="requestForm.controls['assignee'].hasError('required')">
+                  Please select a provider/assignee for the request.
+                </mat-error>
+              </mat-form-field>
+            </div>
+          </div>
+          <div class="title-name" *ngIf="isBroadCast">
+            <div class="fonm-element-label label-text">Preffered Providers <span class="required"></span>
+              <span class="tooltip-span">
+                <mat-icon class="info-icon cursor-pointer" [matTooltip]="'You can select upto 5 preferred provider'"
+                  matTooltipClass="tooltip-sec">info</mat-icon>
 
-                <div class="flex flex-start margin-top-l" *ngIf="!isHideData">
-                    <button mat-button class="submit-btn margin-right-xs" type="button" (click)="submit()" [disabled]="!requestForm.valid">Submit</button>
-                    <button mat-button class="close-btn" (click)="navigateBack()" type="button" >Cancel</button>
-                   
-                  </div>
+              </span>
 
-                  <div class="flex flex-start margin-top-l" *ngIf="isHideData">
-                    <button mat-button class="close-btn" (click)="navigateBack()" type="button" >Cancel</button>
-                   
-                  </div>
-            </form>
-        </div>
-        
-      </mat-card-content>
-    </mat-card>
-  </div>
\ No newline at end of file
+            </div>
+            <div class="">
+              <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
+                <mat-select class=" placeholder-text" placeholder="Choose the provider"
+                  (openedChange)="openedChange($event,'providerText')" formControlName="providers" multiple>
+
+                  <mat-select-trigger [ngClass]="{'disbaledSelect':isHideData}">
+                    <mat-chip-list>
+                      <mat-chip *ngFor="let item of requestForm.get('providers').value" [removable]="true"
+                        (removed)="onProviderRemoved(item)">
+                        {{ item.orgName }}
+                        <mat-icon matChipRemove>cancel</mat-icon>
+                      </mat-chip>
+                    </mat-chip-list>
+                    <!-- {{requestForm.get('compTheme').value | json}} -->
+                  </mat-select-trigger>
+                  <mat-optgroup>
+                    <mat-form-field floatLabel="never">
+                      <input #search autocomplete="off" placeholder="Search" (keydown.space)="$event.stopPropagation()"
+                        formControlName="providerText" matInput>
+                      <button [disableRipple]="true" *ngIf="search.value" matSuffix mat-icon-button aria-label="Clear"
+                        (click)="clearSearch($event,'providerText')"><mat-icon>close</mat-icon></button>
+                    </mat-form-field>
+                  </mat-optgroup>
+                  <mat-optgroup *ngIf="filteredRequestType.length === 0">
+                    <div>No results found!</div>
+                  </mat-optgroup>
+                  <!-- <mat-option *ngFor="let option of requestObjData.preferredProvider" [value]="option.providerName">{{option.providerName}}</mat-option> -->
+                  <ng-container *ngFor="let option of filteredRequestType">
+                    <mat-option [ngClass]="{'hideOptions': (option.hideOption && option.hideOption === 'hide')}"
+                      [disabled]="isOptionDisabled(option)" [value]="option">{{option.orgName}}</mat-option>
+                  </ng-container>
+
+                </mat-select>
+                <mat-error *ngIf="requestForm.controls['providerText'].hasError('required')">
+                  Please select up to five preferred providers for the request.
+                </mat-error>
+              </mat-form-field>
+            </div>
+          </div>
+
+          <div class="flex flex-start margin-top-l" *ngIf="!isHideData">
+            <button mat-button class="submit-btn margin-right-xs" type="button" (click)="submit()"
+              [disabled]="!requestForm.valid">Submit</button>
+            <button mat-button class="close-btn" (click)="navigateBack()" type="button">Cancel</button>
+
+          </div>
+
+          <div class="flex flex-start margin-top-l" *ngIf="isHideData">
+            <button mat-button class="close-btn" (click)="navigateBack()" type="button">Cancel</button>
+
+          </div>
+        </form>
+      </div>
+
+    </mat-card-content>
+  </mat-card>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.scss b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.scss
index 24f10ca97..ff77f2022 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.scss
@@ -13,7 +13,7 @@
             font-size: 20px;
             line-height: 30px;
         }
-       
+
         .title-name {
             margin-top: 20px;
             .label-text {
@@ -54,8 +54,8 @@
            cursor: not-allowed;
           }
 
-          
-           
+
+
         }
         .title-text {
             font-family: 'lato';
@@ -78,7 +78,7 @@
             border-radius: 4px;
             width: auto;
         }
-      
+
         .submit-btn {
           width: 9%;
           background: #1b4ca1 !important;
@@ -87,25 +87,25 @@
           font-weight: 700;
           font-size: 14px;
         }
-       
+
     }
-   
+
 }
 
 ::ng-deep.mat-pseudo-checkbox-checked {
     background: #0074b6 !important;
   }
-  
+
   ::ng-deep.mat-radio-inner-circle {
       background-color: #0074b6!important;
   }
-  
+
   ::ng-deep.ws-mat-accent-border {
       border: 1px solid rgba(0, 0, 0, 0.16);
       padding: 8px 12px !important;
       border-radius: 4px !important;
   }
-  
+
   ::ng-deep.mat-option.mat-selected:not(.mat-option-disabled) {
     color: rgba(0, 0, 0, 0.87) !important;
   }
@@ -118,7 +118,7 @@
        line-height: 16.8px !important;
       font-weight: 400  !important;
     }
-    
+
 }
 .assigneeSearch {
   height: 50px !important;
@@ -138,9 +138,9 @@
     .compt-table th,
     .compt-table td {
       border: 1px solid #eaeaea;
-    
+
     }
-  
+
   .complabels {
     color: #ffffff !important;
     background: #000;
@@ -148,7 +148,7 @@
     border-radius: 6px;
     margin: 4px 8px 4px 0;
   }
-  
+
   .complabels.active {
     background: #ffffff;
     color: #555555 !important;
@@ -157,29 +157,33 @@
 
   .forms-table {
     border-spacing: 0 6px;
-  
+
     tr {
       background-color: rgba(0, 116, 182, 0.2);
       border-radius: 4px 4px 4px 4px;
-  
+
       td:nth-child(1) {
         border-radius: 4px 0px 0px 4px;
       }
-  
+
       td:nth-child(2) {
         border-radius: 0 4px 4px 0px;
       }
-  
+
       .usericon {
         vertical-align: bottom;
         padding: 0 4px;
       }
     }
   }
-  
+
+  .hideOptions {
+    display: none;
+  }
+
   ::ng-deep .tooltip-sec {
     background-color: 000000 !important;
     font-size: 12px !important;
     font-family: 500 !important;
     color: white !important;
-  }
\ No newline at end of file
+  }
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
index 51e59f56e..d05b6dc3f 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
@@ -68,17 +68,17 @@ export class CreateRequestFormComponent implements OnInit {
   competencySubtheme!: FormControl
 
   constructor(private formBuilder: FormBuilder,
-              private homeService: ProfileV2Service,
-              private activatedRouter: ActivatedRoute,
-              private snackBar: MatSnackBar,
-              private router: Router,
-              public dialog: MatDialog
+    private homeService: ProfileV2Service,
+    private activatedRouter: ActivatedRoute,
+    private snackBar: MatSnackBar,
+    private router: Router,
+    public dialog: MatDialog
   ) {
     this.requestForm = this.formBuilder.group({
       TitleName: new FormControl('', [Validators.required, Validators.pattern(this.noSpecialChar), Validators.minLength(10)]),
-      Objective:  new FormControl('', [Validators.required, Validators.pattern(this.noSpecialChar)]),
-      userType:  new FormControl('', [Validators.pattern(this.noSpecialChar)]),
-      learningMode:  new FormControl(''),
+      Objective: new FormControl('', [Validators.required, Validators.pattern(this.noSpecialChar)]),
+      userType: new FormControl('', [Validators.pattern(this.noSpecialChar)]),
+      learningMode: new FormControl(''),
       compArea: new FormControl(''),
       referenceLink: new FormControl(''),
       requestType: new FormControl('', Validators.required),
@@ -91,7 +91,7 @@ export class CreateRequestFormComponent implements OnInit {
       assigneeText: new FormControl(''),
     })
 
-   }
+  }
 
   ngOnInit() {
     this.getRequestTypeList()
@@ -110,16 +110,18 @@ export class CreateRequestFormComponent implements OnInit {
       }
     })
 
+    this.valuechangeFuctions()
+
   }
 
   getRequestDataById() {
     this.homeService.getRequestDataById(this.demandId).subscribe((data: any) => {
-     if (data) {
-      this.requestObjData = data
-       this.setRequestData()
-     }
+      if (data) {
+        this.requestObjData = data
+        this.setRequestData()
+      }
     }
-  )
+    )
   }
 
   setRequestData() {
@@ -129,7 +131,7 @@ export class CreateRequestFormComponent implements OnInit {
       userType: this.requestObjData.typeOfUser ? this.requestObjData.typeOfUser : '',
       learningMode: this.requestObjData.learningMode ? this.requestObjData.learningMode : '',
       competencies_v5: [],
-      referenceLink: this.requestObjData.referenceLink ?  this.requestObjData.referenceLink : '',
+      referenceLink: this.requestObjData.referenceLink ? this.requestObjData.referenceLink : '',
       providers: [],
       assignee: {},
       requestType: this.requestObjData.requestType,
@@ -139,55 +141,56 @@ export class CreateRequestFormComponent implements OnInit {
       querySubThemeControl: '',
       assigneeText: '',
     })
-   const value = this.requestForm.controls.competencies_v5.value || []
-   this.requestObjData.competencies.map((comp: any) => {
-    const obj = {
-      competencyArea: comp.area,
-      competencyTheme: comp.sub_theme,
-      competencySubTheme: comp.theme,
-     }
-     value.push(obj)
-   })
-
-     this.requestForm.controls.competencies_v5.setValue(value)
+    const value = this.requestForm.controls.competencies_v5.value || []
+    this.requestObjData.competencies.map((comp: any) => {
+      const obj = {
+        competencyArea: comp.area,
+        competencyTheme: comp.sub_theme,
+        competencySubTheme: comp.theme,
+      }
+      value.push(obj)
+    })
+
+    this.requestForm.controls.competencies_v5.setValue(value)
 
     this.selectRequestType(this.requestObjData.requestType)
-   if (this.filteredRequestType) {
-    const abc = this.filteredRequestType.filter(option =>
-      this.requestObjData.preferredProvider.some((res: any) =>
-         res.providerName === option.orgName
-    )
-  )
-  this.requestForm.controls['providers'].setValue(abc)
-   }
-
-   if (this.filteredAssigneeType) {
-    if (this.requestObjData.assignedProvider) {
-      const assignData = this.filteredAssigneeType.find(option =>
-        this.requestObjData.assignedProvider.providerName === option.orgName
-       )
-       if (assignData) {
-         this.requestForm.controls['assignee'].setValue(assignData)
-       }
+    if (this.filteredRequestType) {
+      const abc = this.filteredRequestType.filter(option =>
+        this.requestObjData.preferredProvider.some((res: any) =>
+          res.providerId === option.id
+        )
+      )
+      this.requestForm.controls['providers'].setValue(abc)
+    }
+
+    if (this.filteredAssigneeType) {
+      if (this.requestObjData.assignedProvider) {
+        const assignData = this.filteredAssigneeType.find(option =>
+          this.requestObjData.assignedProvider.providerId === option.id
+        )
+        if (assignData) {
+          this.requestForm.controls['assignee'].setValue(assignData)
+        }
+      }
     }
-   }
   }
 
   navigateBack() {
     this.router.navigateByUrl('/app/home/request-list')
   }
 
-  searchValueData(searchValue: any) {
-    if (searchValue === 'providerText') {
+  valuechangeFuctions() {
+    if (this.requestForm.controls['providerText']) {
       this.requestForm.controls['providerText'].valueChanges.pipe(
         debounceTime(100),
         distinctUntilChanged(),
         startWith(''),
       ).subscribe((newValue: any) => {
-        this.filteredRequestType = this.filterOrgValues(newValue, this.requestTypeData)
+        this.filteredRequestType = this.getHiddenOptions(newValue, this.requestTypeData)
       })
     }
-    if (searchValue === 'assigneeText') {
+
+    if (this.requestForm.controls['assigneeText']) {
       this.requestForm.controls['assigneeText'].valueChanges.pipe(
         debounceTime(100),
         distinctUntilChanged(),
@@ -209,6 +212,19 @@ export class CreateRequestFormComponent implements OnInit {
       value.orgName.toLowerCase().includes(searchValue.toLowerCase()))
   }
 
+  getHiddenOptions(searchValue: string, array: any) {
+    const hiddenOptions: any = []
+    array.forEach((element: any) => {
+      if (element.orgName.toLowerCase().includes(searchValue.toLowerCase())) {
+        element['hideOption'] = 'show'
+      } else {
+        element['hideOption'] = 'hide'
+      }
+      hiddenOptions.push(element)
+    })
+    return hiddenOptions
+  }
+
   getFilterEntity() {
     const filterObj = {
       search: {
@@ -222,7 +238,7 @@ export class CreateRequestFormComponent implements OnInit {
       if (res) {
         this.competencyList = res
         this.allCompetencies = res
-          this.filteredallCompetencies = this.allCompetencies
+        this.filteredallCompetencies = this.allCompetencies
       }
 
     })
@@ -247,10 +263,10 @@ export class CreateRequestFormComponent implements OnInit {
           this.isHideData = true
           this.isCompetencyHide = true
         } else if (this.actionBtnName === 'reassign') {
-            this.requestForm.disable()
-             this.isCompetencyHide = true
-            this.requestForm.controls['assigneeText'].enable()
-            this.requestForm.controls['assignee'].enable()
+          this.requestForm.disable()
+          this.isCompetencyHide = true
+          this.requestForm.controls['assigneeText'].enable()
+          this.requestForm.controls['assignee'].enable()
         }
       }
 
@@ -258,26 +274,26 @@ export class CreateRequestFormComponent implements OnInit {
   }
 
   selectRequestType(item: any) {
-   if (item === 'Single') {
-     this.isAssignee = true
-     this.isBroadCast = false
-     this.statusValue = 'Assigned'
-     this.requestForm.controls['providers'].setValue('')
-     this.requestForm.controls['providers'].clearValidators()
-     this.requestForm.controls['providers'].updateValueAndValidity()
-     this.requestForm.controls['assignee'].setValidators([Validators.required])
-     this.requestForm.controls['assignee'].updateValueAndValidity()
-
-   } else if (item === 'Broadcast') {
-    this.statusValue = 'Unassigned'
-     this.isBroadCast = true
-     this.isAssignee = false
-     this.requestForm.controls['assignee'].setValue('')
-     this.requestForm.controls['assignee'].clearValidators()
-     this.requestForm.controls['assignee'].updateValueAndValidity()
-     this.requestForm.controls['providers'].setValidators([Validators.required])
-     this.requestForm.controls['providers'].updateValueAndValidity()
-   }
+    if (item === 'Single') {
+      this.isAssignee = true
+      this.isBroadCast = false
+      this.statusValue = 'Assigned'
+      this.requestForm.controls['providers'].setValue('')
+      this.requestForm.controls['providers'].clearValidators()
+      this.requestForm.controls['providers'].updateValueAndValidity()
+      this.requestForm.controls['assignee'].setValidators([Validators.required])
+      this.requestForm.controls['assignee'].updateValueAndValidity()
+
+    } else if (item === 'Broadcast') {
+      this.statusValue = 'Unassigned'
+      this.isBroadCast = true
+      this.isAssignee = false
+      this.requestForm.controls['assignee'].setValue('')
+      this.requestForm.controls['assignee'].clearValidators()
+      this.requestForm.controls['assignee'].updateValueAndValidity()
+      this.requestForm.controls['providers'].setValidators([Validators.required])
+      this.requestForm.controls['providers'].updateValueAndValidity()
+    }
 
   }
 
@@ -337,148 +353,148 @@ export class CreateRequestFormComponent implements OnInit {
     this.seletedCompetencySubTheme = ''
   }
 
- // on selection change of competency area and assign value to allCompetencyTheme
- compAreaSelected(option: any) {
-  this.resetCompSubfields()
-  this.allCompetencies.forEach((val: any) => {
-    if (option.name === val.name) {
-      this.seletedCompetencyArea = val
-      this.allCompetencyTheme = val.children
-      this.filteredallCompetencyTheme = this.allCompetencyTheme
+  // on selection change of competency area and assign value to allCompetencyTheme
+  compAreaSelected(option: any) {
+    this.resetCompSubfields()
+    this.allCompetencies.forEach((val: any) => {
+      if (option.name === val.name) {
+        this.seletedCompetencyArea = val
+        this.allCompetencyTheme = val.children
+        this.filteredallCompetencyTheme = this.allCompetencyTheme
 
-    }
-  })
-}
+      }
+    })
+  }
 
-compThemeSelected(option: any) {
-  this.enableCompetencyAdd = false
-  this.allCompetencyTheme.forEach((val: any) => {
-    if (option.name === val.name) {
-      this.seletedCompetencyTheme = val
-      this.allCompetencySubtheme = val.children
-      this.filteredallCompetencySubtheme = this.allCompetencySubtheme
-    }
-  })
-}
+  compThemeSelected(option: any) {
+    this.enableCompetencyAdd = false
+    this.allCompetencyTheme.forEach((val: any) => {
+      if (option.name === val.name) {
+        this.seletedCompetencyTheme = val
+        this.allCompetencySubtheme = val.children
+        this.filteredallCompetencySubtheme = this.allCompetencySubtheme
+      }
+    })
+  }
+
+  compSubThemeSelected(option: any) {
+    this.enableCompetencyAdd = true
+    this.allCompetencySubtheme.forEach((val: any) => {
+      if (option.name === val.name) {
+        this.seletedCompetencySubTheme = val
+      }
+    })
+  }
+
+  resetCompfields() {
+    this.enableCompetencyAdd = false
+    this.requestForm.controls['compArea'].setValue('')
+    this.allCompetencyTheme = []
+    this.allCompetencySubtheme = []
+    this.filteredallCompetencyTheme = []
+    this.filteredallCompetencySubtheme = []
+    this.requestForm.controls['queryThemeControl'].setValue('')
+    this.requestForm.controls['querySubThemeControl'].setValue('')
+  }
 
-compSubThemeSelected(option: any) {
-  this.enableCompetencyAdd = true
-  this.allCompetencySubtheme.forEach((val: any) => {
-    if (option.name === val.name) {
-      this.seletedCompetencySubTheme = val
+  canPush(arr: any[], obj: any) {
+    for (const item of arr) {
+      // if (test.id === obj.id) {
+      if (item.competencyAreaId === obj.competencyAreaId && item.competencyThemeId === obj.competencyThemeId
+        && item.competencySubThemeId === obj.competencySubThemeId) {
+        return false
+      }
     }
-  })
-}
+    return true
 
-resetCompfields() {
-  this.enableCompetencyAdd = false
-  this.requestForm.controls['compArea'].setValue('')
-  this.allCompetencyTheme = []
-  this.allCompetencySubtheme = []
-  this.filteredallCompetencyTheme = []
-  this.filteredallCompetencySubtheme = []
-  this.requestForm.controls['queryThemeControl'].setValue('')
-  this.requestForm.controls['querySubThemeControl'].setValue('')
-}
+  }
 
-canPush(arr: any[], obj: any) {
-  for (const item of arr) {
-    // if (test.id === obj.id) {
-    if (item.competencyAreaId === obj.competencyAreaId && item.competencyThemeId === obj.competencyThemeId
-      && item.competencySubThemeId === obj.competencySubThemeId) {
-      return false
+  refreshData() {
+    const searchObj = {
+      search: {
+        type: 'Competency Area',
+      },
+      filter: {
+        isDetail: true,
+      },
     }
+    this.homeService.getFilterEntity(searchObj).subscribe((response: any) => {
+      if (response) {
+        this.allCompetencies = response
+        this.filteredallCompetencies = this.allCompetencies
+      }
+    })
   }
-  return true
 
-}
+  addCompetency() {
+    if (this.seletedCompetencyArea && this.seletedCompetencyTheme && this.seletedCompetencySubTheme) {
+      const obj = {
+        competencyArea: this.seletedCompetencyArea.name,
+        competencyAreaId: this.seletedCompetencyArea.id,
+        competencyAreaDescription: this.seletedCompetencyArea.description,
+        competencyTheme: this.seletedCompetencyTheme.name,
+        competencyThemeId: this.seletedCompetencyTheme.id,
+        competecnyThemeDescription: this.seletedCompetencyTheme.description,
+        competencyThemeType: this.seletedCompetencyTheme.additionalProperties.themeType,
+        competencySubTheme: this.seletedCompetencySubTheme.name,
+        competencySubThemeId: this.seletedCompetencySubTheme.id,
+        competecnySubThemeDescription: this.seletedCompetencySubTheme.description,
+      }
 
-refreshData() {
-  const searchObj = {
-    search: {
-      type: 'Competency Area',
-    },
-    filter: {
-      isDetail: true,
-    },
-  }
-  this.homeService.getFilterEntity(searchObj).subscribe((response: any) => {
-    if (response) {
-      this.allCompetencies = response
-      this.filteredallCompetencies = this.allCompetencies
+      const value = this.requestForm.controls.competencies_v5.value || []
+      if (this.canPush(value, obj)) {
+        value.push(obj)
+        this.requestForm.controls.competencies_v5.setValue(value)
+        this.resetCompfields()
+        this.refreshData()
+      } else {
+        this.snackBar.open('This competency is already added')
+        this.resetCompfields()
+      }
     }
-  })
-}
 
-addCompetency() {
-  if (this.seletedCompetencyArea && this.seletedCompetencyTheme && this.seletedCompetencySubTheme) {
-    const obj = {
-      competencyArea: this.seletedCompetencyArea.name,
-      competencyAreaId: this.seletedCompetencyArea.id,
-      competencyAreaDescription: this.seletedCompetencyArea.description,
-      competencyTheme: this.seletedCompetencyTheme.name,
-      competencyThemeId: this.seletedCompetencyTheme.id,
-      competecnyThemeDescription: this.seletedCompetencyTheme.description,
-      competencyThemeType: this.seletedCompetencyTheme.additionalProperties.themeType,
-      competencySubTheme: this.seletedCompetencySubTheme.name,
-      competencySubThemeId: this.seletedCompetencySubTheme.id,
-      competecnySubThemeDescription: this.seletedCompetencySubTheme.description,
-    }
+  }
 
-    const value = this.requestForm.controls.competencies_v5.value || []
-    if (this.canPush(value, obj)) {
-      value.push(obj)
-      this.requestForm.controls.competencies_v5.setValue(value)
-      this.resetCompfields()
+  removeCompetency(id: any): void {
+    if (id && !id.competencyArea) {
+      const index = _.findIndex(this.requestForm.controls.competencies_v5.value, { id })
+      this.requestForm.controls.competencies_v5.value.splice(index, 1)
+      this.requestForm.controls.competencies_v5.setValue(this.requestForm.controls.competencies_v5.value)
       this.refreshData()
     } else {
-      this.snackBar.open('This competency is already added')
-      this.resetCompfields()
+      this.requestForm.controls.competencies_v5.value.forEach((item: any, index: any) => {
+        if (item.competencyAreaId === id.competencyAreaId && item.competencyThemeId === id.competencyThemeId
+          && item.competencySubThemeId === id.competencySubThemeId) {
+          this.requestForm.controls.competencies_v5.value.splice(index, 1)
+          this.requestForm.controls.competencies_v5.setValue(this.requestForm.controls.competencies_v5.value)
+          this.refreshData()
+        }
+      })
     }
+
   }
 
-}
+  view(item?: any) {
+    // const seletedItem = this.allCompetencies.filter((v: any) => v.id === (item && item.id))[0]
+    // item['children'] = (seletedItem && seletedItem.children) ? seletedItem.children : []
+    const dialogRef = this.dialog.open(CompetencyViewComponent, {
+      // minHeight: 'auto',
+      width: '30%',
+      panelClass: 'remove-pad',
+      data: item,
+      autoFocus: false,
+    })
+    dialogRef.afterClosed().subscribe((response: any) => {
 
-removeCompetency(id: any): void {
-  if (id && !id.competencyArea) {
-    const index = _.findIndex(this.requestForm.controls.competencies_v5.value, { id })
-    this.requestForm.controls.competencies_v5.value.splice(index, 1)
-    this.requestForm.controls.competencies_v5.setValue(this.requestForm.controls.competencies_v5.value)
-    this.refreshData()
-  } else {
-    this.requestForm.controls.competencies_v5.value.forEach((item: any, index: any) => {
-      if (item.competencyAreaId === id.competencyAreaId && item.competencyThemeId === id.competencyThemeId
-        && item.competencySubThemeId === id.competencySubThemeId) {
-        this.requestForm.controls.competencies_v5.value.splice(index, 1)
-        this.requestForm.controls.competencies_v5.setValue(this.requestForm.controls.competencies_v5.value)
-        this.refreshData()
+      if (response && response.action === 'ADD') {
+        // this.addCompetency(response)
+        // this.refreshData(this.currentActivePage)
+      } else if (response && response.action === 'DELETE') {
+        this.removeCompetency(response.id)
       }
     })
   }
 
-}
-
-view(item?: any) {
-  // const seletedItem = this.allCompetencies.filter((v: any) => v.id === (item && item.id))[0]
-  // item['children'] = (seletedItem && seletedItem.children) ? seletedItem.children : []
-  const dialogRef = this.dialog.open(CompetencyViewComponent, {
-    // minHeight: 'auto',
-    width: '30%',
-    panelClass: 'remove-pad',
-    data: item,
-    autoFocus: false,
-  })
-  dialogRef.afterClosed().subscribe((response: any) => {
-
-    if (response && response.action === 'ADD') {
-      // this.addCompetency(response)
-      // this.refreshData(this.currentActivePage)
-    } else if (response && response.action === 'DELETE') {
-      this.removeCompetency(response.id)
-    }
-  })
-}
-
   onProviderRemoved(provider: any) {
     const compThemeControl = this.requestForm.get('providers') as FormControl | null
     if (compThemeControl) {
@@ -512,7 +528,7 @@ view(item?: any) {
       data: {
         type: 'conformation',
         icon: 'radio_on',
-        title:  this.actionBtnName === 'reassign' ? 'Are you sure you want to Re-assign?' : 'Are you sure you want to Create a demand?',
+        title: this.actionBtnName === 'reassign' ? 'Are you sure you want to Re-assign?' : 'Are you sure you want to Create a demand?',
         // subTitle: 'You wont be able to revert this',
         primaryAction: 'Confirm',
         secondaryAction: 'Cancel',
@@ -520,15 +536,15 @@ view(item?: any) {
       autoFocus: false,
     })
 
-this.dialogRefs.afterClosed().subscribe((_res: any) => {
-  if (_res === 'confirmed') {
-    this.submit()
+    this.dialogRefs.afterClosed().subscribe((_res: any) => {
+      if (_res === 'confirmed') {
+        this.submit()
+      }
+    })
   }
-})
-}
 
   submit() {
-    if (this.demandId &&  this.actionBtnName === 'reassign') {
+    if (this.demandId && this.actionBtnName === 'reassign') {
       this.requestForm.enable()
     }
     let providerList: any[] = []
@@ -574,8 +590,8 @@ this.dialogRefs.afterClosed().subscribe((_res: any) => {
       request.learningMode = this.requestForm.value.learningMode.toLowerCase()
     }
 
-    if (this.demandId &&  this.actionBtnName === 'reassign') {
-      request.demand_id =  this.demandId
+    if (this.demandId && this.actionBtnName === 'reassign') {
+      request.demand_id = this.demandId
 
     }
     this.showDialogBox('progress')
@@ -589,18 +605,18 @@ this.dialogRefs.afterClosed().subscribe((_res: any) => {
         if (this.resData) {
           this.router.navigateByUrl('/app/home/request-list')
           this.snackBar.open('Request submitted successfully ')
-      }
-      },         1000)
+        }
+      }, 1000)
     },
-                                                     (error: any) => {
-      this.dialogRefs.close({ error })
-      this.snackBar.open('Request Failed')
+      (error: any) => {
+        this.dialogRefs.close({ error })
+        this.snackBar.open('Request Failed')
 
-     }
-  )
-   }
+      }
+    )
+  }
 
-   showDialogBox(event: any) {
+  showDialogBox(event: any) {
     const dialogData: any = {}
     switch (event) {
       case 'progress':
@@ -618,7 +634,7 @@ this.dialogRefs.afterClosed().subscribe((_res: any) => {
         break
     }
 
-     this.openDialoagBox(dialogData)
+    this.openDialoagBox(dialogData)
   }
 
   openDialoagBox(dialogData: any) {

From febc479c1cf16b2de07cd82549e8c344a0f7709b Mon Sep 17 00:00:00 2001
From: Afzal84 <mohd.afzal@tarento.com>
Date: Tue, 2 Jul 2024 13:31:33 +0530
Subject: [PATCH 753/887] Note line removed from the users page

---
 .../home/routes/users-view/all-users/all-users.component.ts     | 2 +-
 .../lib/routes/home/routes/users-view/users-view.component.ts   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.ts
index f2518419a..4ab055ddc 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.ts
@@ -113,7 +113,7 @@ export class AllUsersComponent implements OnInit, OnDestroy {
       `Verified Users: Users with all their primary fields approved.`,
       // tslint:disable-next-line: max-line-length
       `Non-Verified Users: Users whose one or more primary fields are yet to be approved. You can help by reviewing and approving their requests.`,
-      `Not My User: Remove a user from your organization with a simple click.`,
+      // `Not My User: Remove a user from your organization with a simple click.`,
     ]
   }
 
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 488f062a4..2626bbff2 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -113,7 +113,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       `Verified Users: Users with all their primary fields approved.`,
       // tslint:disable-next-line: max-line-length
       `Non-Verified Users: Users whose one or more primary fields are yet to be approved. You can help by reviewing and approving their requests.`,
-      `Not My User: Remove a user from your organization with a simple click.`,
+      // `Not My User: Remove a user from your organization with a simple click.`,
     ]
   }
 

From 2c4514465e2532f03b613ab66a2057e1c0b6a81e Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Tue, 2 Jul 2024 17:00:04 +0530
Subject: [PATCH 754/887] Fixed 5641,5620,5617,5615

---
 .../home/components/filter/filter.component.ts   | 16 ++++++++++++++--
 .../routes/users-view/users-view.component.ts    |  9 ++++++---
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts b/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
index 3fc603119..2b5be9dae 100644
--- a/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/filter/filter.component.ts
@@ -51,7 +51,6 @@ export class FilterComponent implements OnInit, AfterContentChecked {
   }
 
   ngOnInit() {
-    // this.setData()
     if (!this.usersSvc.filterToggle) { return }
     this.usersSvc.filterToggle.subscribe((data: any) => {
       if (data && data.status) {
@@ -408,7 +407,20 @@ export class FilterComponent implements OnInit, AfterContentChecked {
       this.resetFilter()
     } else {
       this.assigneeFilterObj = { group: [], designation: [], roles: [], tags: [] }
-      this.resetAssigneeFilter()
+      // this.resetAssigneeFilter()
+      if (this.groupList) {
+        this.assigneeFilterObj['group'] = []
+        this.groupSearchKey = ''
+      }
+      this.assigneeFilterObj['designation'] = []
+      this.designationSearchKey = ''
+
+      this.assigneeFilterObj['roles'] = []
+      this.rolesSearchKey = ''
+
+      this.assigneeFilterObj['tags'] = []
+      this.tagsSearchKey = ''
+
     }
 
     if (this.from === 'content') {
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 488f062a4..175fc5d5d 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -241,9 +241,9 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       //   allusersData.count = allusersData.count - 1
       // }
 
-      if (this.notmyuserUsersDataCount && allusersData.count > this.notmyuserUsersDataCount) {
-        this.activeUsersDataCount = allusersData.count - this.notmyuserUsersDataCount
-      }
+      // if (this.notmyuserUsersDataCount && allusersData.count > this.notmyuserUsersDataCount) {
+      //   this.activeUsersDataCount = allusersData.count - this.notmyuserUsersDataCount
+      // }
     })
   }
   async getVUsers(query: any) {
@@ -284,6 +284,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       const allusersData = data.result.response
       this.verifiedUsersData = allusersData.content
       this.verifiedUsersDataCount = data.result.response.count
+      this.filterFacets = allusersData.facets ? allusersData.facets : []
 
       // if (this.currentUserStatus === 'VERIFIED') {
       //   const i = this.verifiedUsersData.findIndex((wf: any) => wf.userId === this.currentUser)
@@ -333,6 +334,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       const allusersData = data.result.response
       this.nonverifiedUsersData = allusersData.content
       this.nonverifiedUsersDataCount = data.result.response.count
+      this.filterFacets = allusersData.facets ? allusersData.facets : []
 
       // if (this.currentUserStatus === 'NOT-VERIFIED') {
       //   const i = this.nonverifiedUsersData.findIndex((wf: any) => wf.userId === this.currentUser)
@@ -383,6 +385,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       const allusersData = data.result.response
       this.notmyuserUsersData = allusersData.content
       this.notmyuserUsersDataCount = data.result.response.count
+      this.filterFacets = allusersData.facets ? allusersData.facets : []
     })
   }
 

From 0e019e6151990cfb32495779d1a79207c6d1318b Mon Sep 17 00:00:00 2001
From: sohail amjad <sohail.amjad@tarento.com>
Date: Tue, 2 Jul 2024 18:25:06 +0530
Subject: [PATCH 755/887] fixed issue

---
 .../create-request-form.component.ts          | 45 +++++++++++--------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
index d05b6dc3f..96192e95f 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
@@ -155,12 +155,16 @@ export class CreateRequestFormComponent implements OnInit {
 
     this.selectRequestType(this.requestObjData.requestType)
     if (this.filteredRequestType) {
-      const abc = this.filteredRequestType.filter(option =>
+      if(this.requestObjData.preferredProvider && this.requestObjData.preferredProvider.length){
+      const prefferedData = this.filteredRequestType.filter(option =>
         this.requestObjData.preferredProvider.some((res: any) =>
           res.providerId === option.id
         )
       )
-      this.requestForm.controls['providers'].setValue(abc)
+      if(prefferedData && prefferedData.length){
+        this.requestForm.controls['providers'].setValue(prefferedData)
+      }
+    }
     }
 
     if (this.filteredAssigneeType) {
@@ -547,20 +551,7 @@ export class CreateRequestFormComponent implements OnInit {
     if (this.demandId && this.actionBtnName === 'reassign') {
       this.requestForm.enable()
     }
-    let providerList: any[] = []
-    if (this.requestForm.value.providers) {
-      providerList = this.requestForm.value.providers.map((item: any) => ({
-        providerName: item.orgName,
-        providerId: item.id,
-      }))
-    }
-    let assigneeProvider: any
-    if (this.requestForm.value.assignee) {
-      assigneeProvider = {
-        providerName: this.requestForm.value.assignee.orgName,
-        providerId: this.requestForm.value.assignee.id,
-      }
-    }
+   
 
     let competencyDataList: any[] = []
     if (this.requestForm.value.competencies_v5) {
@@ -579,13 +570,31 @@ export class CreateRequestFormComponent implements OnInit {
       competencies: competencyDataList,
       referenceLink: this.requestForm.value.referenceLink,
       requestType: this.requestForm.value.requestType,
-      preferredProvider: providerList,
-      assignedProvider: assigneeProvider,
+      // preferredProvider: providerList,
+      // assignedProvider: assigneeProvider,
       // status: this.statusValue,
       // source: this.userId,
 
     }
 
+    let providerList: any[] = []
+    if (this.requestForm.value.providers && this.isBroadCast) {
+      providerList = this.requestForm.value.providers.map((item: any) => ({
+        providerName: item.orgName,
+        providerId: item.id,
+      }))
+      request.preferredProvider = providerList
+    }
+    let assigneeProvider: any
+    if (this.requestForm.value.assignee && this.isAssignee) {
+      assigneeProvider = {
+        providerName: this.requestForm.value.assignee.orgName,
+        providerId: this.requestForm.value.assignee.id,
+      }
+      request.assignedProvider = assigneeProvider
+    }
+     
+
     if (this.requestForm.value.learningMode) {
       request.learningMode = this.requestForm.value.learningMode.toLowerCase()
     }

From 21afb354a64f63e9864f38fb9682a246d00b8904 Mon Sep 17 00:00:00 2001
From: Afzal84 <mohd.afzal@tarento.com>
Date: Wed, 3 Jul 2024 11:29:21 +0530
Subject: [PATCH 756/887] KAR-656 edit button removed from leadership and admin
 page

---
 .../home/components/admintable/admintable.component.html      | 4 ++--
 .../components/leadershiptable/leadershiptable.component.html | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.html b/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.html
index 7385a2f8a..db56665fa 100644
--- a/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.html
+++ b/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.html
@@ -60,10 +60,10 @@
                         [matMenuTriggerData]="{'data':row}" class="action-btn">
                         <mat-icon>more_horiz</mat-icon>
                     </button> -->
-                    <button type="button" mat-icon-button i18n-aria-label aria-label="action items"
+                    <!-- <button type="button" mat-icon-button i18n-aria-label aria-label="action items"
                         (click)="updateData(row)" class="action-btn">
                         <mat-icon class="ws-mat-black60-text font-22">edit</mat-icon>
-                    </button>
+                    </button> -->
                 </mat-cell>
             </ng-container>
             <mat-header-row *matHeaderRowDef="getFinalColumns()"></mat-header-row>
diff --git a/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.html b/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.html
index 8a58f2d14..42248b2d6 100644
--- a/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.html
+++ b/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.html
@@ -57,10 +57,10 @@
                 <mat-header-cell *matHeaderCellDef class="clr-darkish-blue action-header">
                 </mat-header-cell>
                 <mat-cell *matCellDef="let row" class="action-cell">
-                    <button type="button" mat-icon-button i18n-aria-label aria-label="action items"
+                    <!-- <button type="button" mat-icon-button i18n-aria-label aria-label="action items"
                         (click)="updateData(row)" class="action-btn">
                         <mat-icon class="ws-mat-black60-text font-22">edit</mat-icon>
-                    </button>
+                    </button> -->
                 </mat-cell>
             </ng-container>
             <mat-header-row *matHeaderRowDef="getFinalColumns()"></mat-header-row>

From 710fc95ef518671962f5f6bc9f1d8fbe6e99c07b Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Wed, 3 Jul 2024 11:39:18 +0530
Subject: [PATCH 757/887] Moved prending requests button from bulk page to
 verifications tab

---
 .../approval-pending.component.html           |  9 +++--
 .../approval-pending.component.scss           | 34 ++++++++++++-------
 .../approval-pending.component.ts             | 15 ++++++++
 .../bulk-upload/bulk-upload.component.html    |  5 +--
 .../bulk-upload/bulk-upload.component.ts      | 16 ---------
 5 files changed, 45 insertions(+), 34 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
index 0f7132f0f..52fcbaad5 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
@@ -28,8 +28,8 @@
       </mat-card-content>
     </mat-card>
     <mat-card-content>
-      <div class="flex flex-1 flex-column margin-fix">
-        <div class="flex flex-1 filter max-height-60">
+      <div class="flex flex-1 flex-row margin-fix">
+        <div class="flex flex-3 filter max-height-60">
           <a routerLink="/app/home/approvals/profileverification" class="filter-option"
             [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'profileverification', 'ws-mat-accent-border font-medium': currentFilter !== 'profileverification'}"
             mat-button (click)="filter('profileverification'); tabTelemetry('toapprove', 0)" role="button">Profile
@@ -40,6 +40,11 @@
             mat-button (click)="filter('transfers'); tabTelemetry('transfers', 1)" role="button">Transfers
             ({{transfersCount}})</a>
         </div>
+        <div class="flex flex-3 flex-end" *ngIf="currentFilter === 'profileverification'">
+          <a (click)="getPendingResquests()"
+            class="customlink cursor-pointer mat-body-2"><mat-icon>download_outlined</mat-icon> Download
+            Pending Requests</a>
+        </div>
       </div>
       <ng-container *ngIf="currentFilter === 'profileverification'">
         <div class="searchfilter">
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.scss b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.scss
index 4df45e821..48190764b 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.scss
@@ -291,17 +291,27 @@ a:not([href]):not([tabindex]) {
 }
 
 .reportsDemo {
-    .reportsDemoVideo {
-      width: 200px;
-      height: 140px;
-      border-radius: 5px;
-      background-color: #FDEAD5;
-      font-weight: 600;
-      pointer-events: all;
-      cursor: pointer;
-
-      .video_icon {
-        font-size: 32px;
-      }
+  .reportsDemoVideo {
+    width: 200px;
+    height: 140px;
+    border-radius: 5px;
+    background-color: #FDEAD5;
+    font-weight: 600;
+    pointer-events: all;
+    cursor: pointer;
+
+    .video_icon {
+      font-size: 32px;
     }
   }
+}
+
+.customlink {
+  color: #1b4ca1 !important;
+  font-weight: 600;
+  margin: 16px 0 0 0;
+
+  mat-icon {
+    vertical-align: middle;
+  }
+}
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
index 06edbb1c2..b63c731d6 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
@@ -10,6 +10,7 @@ import _ from 'lodash'
 import { TelemetryEvents } from '../../../../../head/_services/telemetry.event.model'
 import { ReportsVideoComponent } from '../../reports-video/reports-video.component'
 import { ApprovalsService } from '../../../services/approvals.service'
+import { UsersService } from '../../../../users/services/users.service'
 
 @Component({
   selector: 'ws-approval-pending',
@@ -48,6 +49,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
     private events: EventService,
     public dialog: MatDialog,
     private sanitizer: DomSanitizer,
+    private usersService: UsersService,
     private snackbar: MatSnackBar) {
     this.configSvc = this.route.parent && this.route.parent.snapshot.data.configService
     if (this.activeRouter.parent && this.activeRouter.parent.snapshot.data.configService.unMappedUser.channel
@@ -352,4 +354,17 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   showButton() {
     this.disableApproveALL = true
   }
+
+  getPendingResquests(): void {
+    this.usersService.fetchPendingRequests().subscribe((res: any) => {
+      if (res) {
+        // console.log('*********************', res)
+      }
+      // tslint:disable-next-line
+    }, (error: any) => {
+      if (!error.ok) {
+        this.snackbar.open(error.error.text)
+      }
+    })
+  }
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
index 671ffbf64..9812a373e 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
@@ -48,10 +48,7 @@
     </div>
   </div>
 
-  <div class="text-base font-bold">File logs
-    <button type="button" class="outline-button float-right" (click)="getPendingResquests()">Download pending
-      requests</button>
-  </div>
+  <div class="text-base font-bold">File logs</div>
   <div class="flex flex-col gap-6">
     <div class="file-container"
       *ngFor="let list of lastUploadList | slice : startIndex : lastIndex | orderBy:'datecreatedon':'desc'">
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
index a6e2412b2..26389f9b6 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.ts
@@ -193,20 +193,4 @@ export class BulkUploadApprovalComponent implements OnInit, AfterViewInit, OnDes
   ngOnDestroy(): void {
     this.destroySubject$.unsubscribe()
   }
-
-  getPendingResquests(): void {
-    // const filePath = `/apis/proxies/v8/workflow/admin/bulkuploadfile/download/${listObj.filename}`
-    // window.open(filePath, '_blank')
-    this.usersService.fetchPendingRequests().subscribe((res: any) => {
-      if (res) {
-        // console.log('*********************', res)
-      }
-      // tslint:disable-next-line
-    }, (error: HttpErrorResponse) => {
-      if (!error.ok) {
-        this.matSnackBar.open(error.error.text)
-      }
-    })
-  }
-
 }

From 4b0dd4bf34b16ad63368e952ab54894e883eb615 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Wed, 3 Jul 2024 11:43:05 +0530
Subject: [PATCH 758/887] Updated user search payload

---
 .../approval-pending.component.scss              |  2 +-
 .../routes/users-view/users-view.component.ts    | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.scss b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.scss
index 48190764b..b3ff0545d 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.scss
@@ -309,7 +309,7 @@ a:not([href]):not([tabindex]) {
 .customlink {
   color: #1b4ca1 !important;
   font-weight: 600;
-  margin: 16px 0 0 0;
+  margin: 18px 0 0 0;
 
   mat-icon {
     vertical-align: middle;
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 175fc5d5d..172ff24a8 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -223,6 +223,10 @@ export class UsersViewComponent implements OnInit, OnDestroy {
           'profileDetails.professionalDetails.designation',
           'profileDetails.additionalDetails.tag',
         ],
+        fields: [
+          'rootOrgId',
+          'profileDetails',
+        ],
         limit: this.limit,
         offset: this.pageIndex,
         query: this.getSearchText(query),
@@ -274,6 +278,10 @@ export class UsersViewComponent implements OnInit, OnDestroy {
           'profileDetails.professionalDetails.designation',
           'profileDetails.additionalDetails.tag',
         ],
+        fields: [
+          'rootOrgId',
+          'profileDetails',
+        ],
         limit: this.limit,
         offset: this.pageIndex,
         query: this.getSearchText(query),
@@ -324,6 +332,10 @@ export class UsersViewComponent implements OnInit, OnDestroy {
           'profileDetails.professionalDetails.designation',
           'profileDetails.additionalDetails.tag',
         ],
+        fields: [
+          'rootOrgId',
+          'profileDetails',
+        ],
         limit: this.limit,
         offset: this.pageIndex,
         query: this.getSearchText(query),
@@ -375,6 +387,10 @@ export class UsersViewComponent implements OnInit, OnDestroy {
           'profileDetails.professionalDetails.designation',
           'profileDetails.additionalDetails.tag',
         ],
+        fields: [
+          'rootOrgId',
+          'profileDetails',
+        ],
         limit: this.limit,
         offset: this.pageIndex,
         query: this.getSearchText(query),

From f40e9177394e4802482c0836f1d16a762f5c9d0d Mon Sep 17 00:00:00 2001
From: sohail amjad <sohail.amjad@tarento.com>
Date: Wed, 3 Jul 2024 16:18:41 +0530
Subject: [PATCH 759/887] pointer events issue resolved

---
 .../components/request-list/request-list.component.html   | 2 +-
 .../components/request-list/request-list.component.ts     | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
index 1975440c8..0556c3d8c 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
@@ -75,7 +75,7 @@ <h2>Content Request</h2>
                 <th mat-header-cell *matHeaderCellDef class="row-heading">Interests</th>
                 <td mat-cell class="title-class" *matCellDef="let element">
                     <a class="action-btn-view"   *ngIf="element?.interestCount!== 0" 
-                    href="javascript:void(0)"  >
+                    href="javascript:void(0)" [ngStyle]="getPointerEventsStyle(element)"  >
                     <span (click)="handleClick(element)">
                       {{element?.interestCount}}
                     </span></a>
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
index 948e2852d..2a5456d04 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
@@ -107,6 +107,14 @@ export class RequestListComponent implements OnInit {
 
 }
 
+getPointerEventsStyle(element:any){
+  return {
+   'pointer-events': (element.status !== this.statusKey.Inprogress && 
+     element.status !== this.statusKey.invalid && 
+     element.status !== this.statusKey.fullfill) ? 'auto' : 'none',
+  }
+ }
+
   hasAccess() {
     let flag = false
     if (this.pageConfig && this.pageConfig.data && this.pageConfig.data.actionMenu) {

From 2ab41c99aa3cd550b6822fabacb89f4530c2c262 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Wed, 3 Jul 2024 16:30:34 +0530
Subject: [PATCH 760/887] Commented sort & filter, facets in user search
 payload

---
 .../components/search/search.component.html   |  8 +-
 .../approval-pending.component.html           |  4 +-
 .../routes/users-view/users-view.component.ts | 81 ++++++++++---------
 3 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.html b/project/ws/app/src/lib/routes/home/components/search/search.component.html
index bf7ff3795..309727751 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.html
@@ -7,7 +7,7 @@
                 placeholder="Search" type="Standard" [ngClass]="{'disable': isContentLive}">
         </div>
     </div>
-    <div class="filter-section flex" *ngIf="!isApprovals">
+    <!-- <div class="filter-section flex" *ngIf="!isApprovals">
         <button mat-button type="button" (click)="sort()" class="apply-filter margin-right-s"
             [matMenuTriggerFor]="cardMenu">
             <mat-icon class="margin-right-xs">sort</mat-icon> Sort
@@ -25,12 +25,12 @@
                 </div>
             </ng-template>
         </mat-menu>
-    </div>
-    <div class="filter-section flex" *ngIf="!isApprovals">
+    </div> -->
+    <!-- <div class="filter-section flex" *ngIf="!isApprovals">
         <button mat-button type="button" (click)="openFilter()" class="apply-filter margin-right-s">
             Apply Filter <mat-icon class="margin-right-xs">filter_list</mat-icon>
         </button>
-    </div>
+    </div> -->
     <div class="flex flex-end" *ngIf="!isApprovals && currentFilter === 'allusers'">
         <button mat-button type="button" class="search-btn" [routerLink]="['/app/home/user-creation']"
             [ngClass]="{'disable': isContentLive}">Create user</button>
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
index 52fcbaad5..5b29c485e 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
@@ -40,11 +40,11 @@
             mat-button (click)="filter('transfers'); tabTelemetry('transfers', 1)" role="button">Transfers
             ({{transfersCount}})</a>
         </div>
-        <div class="flex flex-3 flex-end" *ngIf="currentFilter === 'profileverification'">
+        <!-- <div class="flex flex-3 flex-end" *ngIf="currentFilter === 'profileverification'">
           <a (click)="getPendingResquests()"
             class="customlink cursor-pointer mat-body-2"><mat-icon>download_outlined</mat-icon> Download
             Pending Requests</a>
-        </div>
+        </div> -->
       </div>
       <ng-container *ngIf="currentFilter === 'profileverification'">
         <div class="searchfilter">
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 172ff24a8..c9e932e8e 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -218,15 +218,15 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     reqBody = {
       request: {
         filters: filtreq,
-        facets: [
-          'profileDetails.professionalDetails.group',
-          'profileDetails.professionalDetails.designation',
-          'profileDetails.additionalDetails.tag',
-        ],
-        fields: [
-          'rootOrgId',
-          'profileDetails',
-        ],
+        // facets: [
+        //   'profileDetails.professionalDetails.group',
+        //   'profileDetails.professionalDetails.designation',
+        //   'profileDetails.additionalDetails.tag',
+        // ],
+        // fields: [
+        //   'rootOrgId',
+        //   'profileDetails',
+        // ],
         limit: this.limit,
         offset: this.pageIndex,
         query: this.getSearchText(query),
@@ -238,7 +238,8 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       this.activeUsersData = allusersData.content
       // this.activeUsersData = this.activeUsersData.filter((wf: any) => wf.profileDetails.profileStatus !== 'NOT-MY-USER')
       this.activeUsersDataCount = allusersData.count
-      this.filterFacets = allusersData.facets ? allusersData.facets : []
+      // this.filterFacets = allusersData.facets ? allusersData.facets : []
+
       // const i = this.activeUsersData.findIndex((wf: any) => wf.userId === this.currentUser)
       // if (i > -1) {
       //   this.activeUsersData.splice(i, 1)
@@ -273,15 +274,15 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     reqBody = {
       request: {
         filters: filtreq,
-        facets: [
-          'profileDetails.professionalDetails.group',
-          'profileDetails.professionalDetails.designation',
-          'profileDetails.additionalDetails.tag',
-        ],
-        fields: [
-          'rootOrgId',
-          'profileDetails',
-        ],
+        // facets: [
+        //   'profileDetails.professionalDetails.group',
+        //   'profileDetails.professionalDetails.designation',
+        //   'profileDetails.additionalDetails.tag',
+        // ],
+        // fields: [
+        //   'rootOrgId',
+        //   'profileDetails',
+        // ],
         limit: this.limit,
         offset: this.pageIndex,
         query: this.getSearchText(query),
@@ -292,7 +293,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       const allusersData = data.result.response
       this.verifiedUsersData = allusersData.content
       this.verifiedUsersDataCount = data.result.response.count
-      this.filterFacets = allusersData.facets ? allusersData.facets : []
+      // this.filterFacets = allusersData.facets ? allusersData.facets : []
 
       // if (this.currentUserStatus === 'VERIFIED') {
       //   const i = this.verifiedUsersData.findIndex((wf: any) => wf.userId === this.currentUser)
@@ -327,15 +328,15 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     reqBody = {
       request: {
         filters: filtreq,
-        facets: [
-          'profileDetails.professionalDetails.group',
-          'profileDetails.professionalDetails.designation',
-          'profileDetails.additionalDetails.tag',
-        ],
-        fields: [
-          'rootOrgId',
-          'profileDetails',
-        ],
+        // facets: [
+        //   'profileDetails.professionalDetails.group',
+        //   'profileDetails.professionalDetails.designation',
+        //   'profileDetails.additionalDetails.tag',
+        // ],
+        // fields: [
+        //   'rootOrgId',
+        //   'profileDetails',
+        // ],
         limit: this.limit,
         offset: this.pageIndex,
         query: this.getSearchText(query),
@@ -346,7 +347,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       const allusersData = data.result.response
       this.nonverifiedUsersData = allusersData.content
       this.nonverifiedUsersDataCount = data.result.response.count
-      this.filterFacets = allusersData.facets ? allusersData.facets : []
+      // this.filterFacets = allusersData.facets ? allusersData.facets : []
 
       // if (this.currentUserStatus === 'NOT-VERIFIED') {
       //   const i = this.nonverifiedUsersData.findIndex((wf: any) => wf.userId === this.currentUser)
@@ -382,15 +383,15 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     reqBody = {
       request: {
         filters: filtreq,
-        facets: [
-          'profileDetails.professionalDetails.group',
-          'profileDetails.professionalDetails.designation',
-          'profileDetails.additionalDetails.tag',
-        ],
-        fields: [
-          'rootOrgId',
-          'profileDetails',
-        ],
+        // facets: [
+        //   'profileDetails.professionalDetails.group',
+        //   'profileDetails.professionalDetails.designation',
+        //   'profileDetails.additionalDetails.tag',
+        // ],
+        // fields: [
+        //   'rootOrgId',
+        //   'profileDetails',
+        // ],
         limit: this.limit,
         offset: this.pageIndex,
         query: this.getSearchText(query),
@@ -401,7 +402,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       const allusersData = data.result.response
       this.notmyuserUsersData = allusersData.content
       this.notmyuserUsersDataCount = data.result.response.count
-      this.filterFacets = allusersData.facets ? allusersData.facets : []
+      // this.filterFacets = allusersData.facets ? allusersData.facets : []
     })
   }
 

From bda327bad38fb6bbecc81d06ba62694c562768fd Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Wed, 3 Jul 2024 16:50:11 +0530
Subject: [PATCH 761/887] reverted back to xslx format bulk

---
 .../approvals/bulk-upload/bulk-upload.component.html      | 8 ++++----
 .../users-view/bulk-upload/bulk-upload.component.html     | 8 ++++----
 .../app/src/lib/routes/users/services/upload.service.ts   | 7 ++++---
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
index 9812a373e..dc12d646c 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
@@ -15,7 +15,7 @@
               <li>Download the Sample File ZIP.</li>
               <li>Fill in user details in the Sample File.</li>
               <li>Verify via OTP.</li>
-              <li>Upload the populated sample csv file.</li>
+              <li>Upload the populated sample file.</li>
               <li>Check the upload results for confirmation.</li>
             </ol>
           </div>
@@ -30,18 +30,18 @@
             (dblclick)="$event.preventDefault()">
             <img src="/assets/icons/csv-file.svg" alt="CSV file logo" />
           </div>
-          <div *ngIf="showFileError" class="error-msg">Upload csv format file only</div>
+          <div *ngIf="showFileError" class="error-msg">Upload xslx format file only</div>
           <div class="flex flex-col items-center">
             <div class="text-primary cursor-pointer" (click)="fileInput.click()" (dblclick)="$event.preventDefault()">
               Browse files</div>
             <input hidden type="file" #fileInput (click)="handleFileClick($event)" (change)="handleOnFileChange($event)"
-              name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();" accept=".csv" />
+              name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();" accept=".xlsx, .xls" />
             <!-- <div class="flex">or</div>
             <div class="flex">Drag file to upload</div> -->
           </div>
           <div class="flex flex-col items-center margin-bottom-m">
             <div class="flex">Max file size: 100 MB</div>
-            <div class="flex">Supported file types: csv</div>
+            <div class="flex">Supported file types: xslx</div>
           </div>
         </div>
       </div>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
index 86ea1bc48..46fb10df4 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
@@ -10,7 +10,7 @@
               <li>Download the Sample File ZIP.</li>
               <li>Fill in user details in the Sample File.</li>
               <li>Verify via OTP.</li>
-              <li>Upload the populated sample csv file.</li>
+              <li>Upload the populated sample file.</li>
               <li>Check the upload results for confirmation.</li>
             </ol>
           </div>
@@ -25,18 +25,18 @@
             (dblclick)="$event.preventDefault()">
             <img src="/assets/icons/csv-file.svg" alt="CSV file logo" />
           </div>
-          <div *ngIf="showFileError" class="error-msg">Upload csv format file only</div>
+          <div *ngIf="showFileError" class="error-msg">Upload xslx format file only</div>
           <div class="flex flex-col items-center">
             <div class="text-primary cursor-pointer" (click)="fileInput.click()" (dblclick)="$event.preventDefault()">
               Browse files</div>
             <input hidden type="file" #fileInput (click)="handleFileClick($event)" (change)="handleOnFileChange($event)"
-              name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();" accept=".csv" />
+              name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();" accept=".xlsx, .xls" />
             <!-- <div class="flex">or</div>
             <div class="flex">Drag file to upload</div> -->
           </div>
           <div class="flex flex-col items-center margin-bottom-m">
             <div class="flex">Max file size: 100 MB</div>
-            <div class="flex">Supported file types: csv</div>
+            <div class="flex">Supported file types: xslx</div>
           </div>
         </div>
       </div>
diff --git a/project/ws/app/src/lib/routes/users/services/upload.service.ts b/project/ws/app/src/lib/routes/users/services/upload.service.ts
index e1b6749a8..e1f53a323 100644
--- a/project/ws/app/src/lib/routes/users/services/upload.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/upload.service.ts
@@ -5,12 +5,13 @@ import { HttpClient } from '@angular/common/http'
 import * as fileSaver from 'file-saver'
 
 const API_ENDPOINTS = {
-  bulkUpload: `/apis/proxies/v8/user/v2/bulkupload`,
+  bulkUpload: `/apis/proxies/v8/user/v1/bulkupload`,
+  // bulkUpload: `/apis/proxies/v8/user/v2/bulkupload`, //csv support
   downloadReport: `/apis/protected/v8/admin/userRegistration/bulkUploadReport`,
   getBulkUploadData: '/apis/proxies/v8/user/v1/bulkupload',
   getBulkApproval: '/apis/proxies/v8/workflow/admin/bulkupdate/getstatus',
-  // bulkApprovalUpload: `/apis/proxies/v8/workflow/admin/transition/bulkupdate`,
-  bulkApprovalUpload: '/apis/proxies/v8/workflow/admin/v2/bulkupdate/transition',
+  bulkApprovalUpload: `/apis/proxies/v8/workflow/admin/transition/bulkupdate`,
+  // bulkApprovalUpload: '/apis/proxies/v8/workflow/admin/v2/bulkupdate/transition', //csv support
 }
 
 @Injectable()

From 0948e334902f9fbfc2397de96f1a5cbb657edaf9 Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Thu, 4 Jul 2024 17:32:40 +0530
Subject: [PATCH 762/887] Enabled notmyuser point & accept file format updated

---
 .../routes/approvals/bulk-upload/bulk-upload.component.html     | 2 +-
 .../routes/users-view/bulk-upload/bulk-upload.component.html    | 2 +-
 .../lib/routes/home/routes/users-view/users-view.component.ts   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
index dc12d646c..0df1a0962 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
@@ -35,7 +35,7 @@
             <div class="text-primary cursor-pointer" (click)="fileInput.click()" (dblclick)="$event.preventDefault()">
               Browse files</div>
             <input hidden type="file" #fileInput (click)="handleFileClick($event)" (change)="handleOnFileChange($event)"
-              name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();" accept=".xlsx, .xls" />
+              name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();" accept=".xslx, .xls" />
             <!-- <div class="flex">or</div>
             <div class="flex">Drag file to upload</div> -->
           </div>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
index 46fb10df4..f28787f92 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
@@ -30,7 +30,7 @@
             <div class="text-primary cursor-pointer" (click)="fileInput.click()" (dblclick)="$event.preventDefault()">
               Browse files</div>
             <input hidden type="file" #fileInput (click)="handleFileClick($event)" (change)="handleOnFileChange($event)"
-              name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();" accept=".xlsx, .xls" />
+              name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();" accept=".xslx, .xls" />
             <!-- <div class="flex">or</div>
             <div class="flex">Drag file to upload</div> -->
           </div>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 11353c9c0..c9e932e8e 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -113,7 +113,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       `Verified Users: Users with all their primary fields approved.`,
       // tslint:disable-next-line: max-line-length
       `Non-Verified Users: Users whose one or more primary fields are yet to be approved. You can help by reviewing and approving their requests.`,
-      // `Not My User: Remove a user from your organization with a simple click.`,
+      `Not My User: Remove a user from your organization with a simple click.`,
     ]
   }
 

From 6e6c3cb66ea527a56883a25dadb2af0a917f051d Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Thu, 4 Jul 2024 17:50:43 +0530
Subject: [PATCH 763/887] Corrected xlsx format & validation

---
 .../routes/approvals/bulk-upload/bulk-upload.component.html | 6 +++---
 .../users-view/bulk-upload/bulk-upload.component.html       | 6 +++---
 .../ws/app/src/lib/routes/users/services/upload.service.ts  | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
index 0df1a0962..85a8b0230 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
@@ -30,18 +30,18 @@
             (dblclick)="$event.preventDefault()">
             <img src="/assets/icons/csv-file.svg" alt="CSV file logo" />
           </div>
-          <div *ngIf="showFileError" class="error-msg">Upload xslx format file only</div>
+          <div *ngIf="showFileError" class="error-msg">Upload xlsx format file only</div>
           <div class="flex flex-col items-center">
             <div class="text-primary cursor-pointer" (click)="fileInput.click()" (dblclick)="$event.preventDefault()">
               Browse files</div>
             <input hidden type="file" #fileInput (click)="handleFileClick($event)" (change)="handleOnFileChange($event)"
-              name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();" accept=".xslx, .xls" />
+              name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();" accept=".xlsx, .xls" />
             <!-- <div class="flex">or</div>
             <div class="flex">Drag file to upload</div> -->
           </div>
           <div class="flex flex-col items-center margin-bottom-m">
             <div class="flex">Max file size: 100 MB</div>
-            <div class="flex">Supported file types: xslx</div>
+            <div class="flex">Supported file types: xlsx</div>
           </div>
         </div>
       </div>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
index f28787f92..e46bee73a 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
@@ -25,18 +25,18 @@
             (dblclick)="$event.preventDefault()">
             <img src="/assets/icons/csv-file.svg" alt="CSV file logo" />
           </div>
-          <div *ngIf="showFileError" class="error-msg">Upload xslx format file only</div>
+          <div *ngIf="showFileError" class="error-msg">Upload xlsx format file only</div>
           <div class="flex flex-col items-center">
             <div class="text-primary cursor-pointer" (click)="fileInput.click()" (dblclick)="$event.preventDefault()">
               Browse files</div>
             <input hidden type="file" #fileInput (click)="handleFileClick($event)" (change)="handleOnFileChange($event)"
-              name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();" accept=".xslx, .xls" />
+              name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();" accept=".xlsx, .xls" />
             <!-- <div class="flex">or</div>
             <div class="flex">Drag file to upload</div> -->
           </div>
           <div class="flex flex-col items-center margin-bottom-m">
             <div class="flex">Max file size: 100 MB</div>
-            <div class="flex">Supported file types: xslx</div>
+            <div class="flex">Supported file types: xlsx</div>
           </div>
         </div>
       </div>
diff --git a/project/ws/app/src/lib/routes/users/services/upload.service.ts b/project/ws/app/src/lib/routes/users/services/upload.service.ts
index e1f53a323..6860bba71 100644
--- a/project/ws/app/src/lib/routes/users/services/upload.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/upload.service.ts
@@ -61,7 +61,7 @@ export class FileService {
   }
 
   validateFile(name: String) {
-    const allowedFormats = ['xlsx', 'csv']
+    const allowedFormats = ['xlsx']
     const ext = name.substring(name.lastIndexOf('.') + 1).toLowerCase()
     if (allowedFormats.indexOf(ext) > -1) {
       return true

From abd1ce9e32d6d89dcbaa1d8ec498d9b7cae3e4fd Mon Sep 17 00:00:00 2001
From: sohail amjad <sohail.amjad@tarento.com>
Date: Sat, 6 Jul 2024 18:41:39 +0530
Subject: [PATCH 764/887] status name modified and how to video text

---
 .../request-list/request-list.component.html  | 312 +++++++++---------
 .../request-list/request-list.component.ts    | 196 +++++------
 2 files changed, 261 insertions(+), 247 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
index 0556c3d8c..3f22f9b3f 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.html
@@ -1,171 +1,181 @@
 <div class="request-container">
-    <h2>Content Request</h2>
-    <mat-card class="mb-8">
-        <mat-card-content class="flex gap-10">
-            <div class="section-1">
-                <div class="flex-4 mobile-margin text-capitalize mat-h2">Note:</div>
-                <ng-container *ngFor="let note of requestList">
-                    <div class="flex gap-4 mb-4">
-                        <div>
-                            <mat-icon class="infoIcon">error_outline</mat-icon>
-                        </div>
-                        <div [innerHTML]="sanitizeHtml(note)"></div>
-                    </div>
-                </ng-container>
+  <h2>Content Request</h2>
+  <mat-card class="mb-8">
+    <mat-card-content class="flex gap-10">
+      <div class="section-1">
+        <div class="flex-4 mobile-margin text-capitalize mat-h2">Note:</div>
+        <ng-container *ngFor="let note of requestList">
+          <div class="flex gap-4 mb-4">
+            <div>
+              <mat-icon class="infoIcon">error_outline</mat-icon>
             </div>
-            <div class="reportsDemo flex justify-end section-2">
-                <div class="reportsDemoVideo flex flex-column flex-middle justify-center margin-top-m"
-                    (click)="openVideoPopup()">
-                    <mat-icon class="video_icon mb-2">play_circle</mat-icon>
-                    <div>
-                        Watch how it works
-                    </div>
-                </div>
-            </div>
-        </mat-card-content>
-    </mat-card>
-    <div class="create-action">
-        <button mat-button type="button" class="search-btn" [routerLink]="['/app/home/create-request-form']">Request Content</button>
-    </div>
+            <div [innerHTML]="sanitizeHtml(note)"></div>
+          </div>
+        </ng-container>
+      </div>
+      <!-- <div class="reportsDemo flex justify-end section-2">
+        <div class="reportsDemoVideo flex flex-column flex-middle justify-center margin-top-m"
+          (click)="openVideoPopup()">
+          <mat-icon class="video_icon mb-2">play_circle</mat-icon>
+          <div>
+            Watch how it works
+          </div>
+        </div>
+      </div> -->
+    </mat-card-content>
+  </mat-card>
+  <div class="create-action">
+    <button mat-button type="button" class="search-btn" [routerLink]="['/app/home/create-request-form']">Request
+      Content</button>
+  </div>
+
+  <div class="nav-container">
+    <div class="sidenav-content">
+      <div class="table-class">
+        <ng-container *ngIf="dataSource?.filteredData?.length > 0">
+          <table mat-table [dataSource]="dataSource">
+            <ng-container matColumnDef="RequestId">
+              <th mat-header-cell *matHeaderCellDef class="row-heading">Request ID </th>
+              <td mat-cell class="title-class" *matCellDef="let element">{{element?.demand_id}}</td>
+            </ng-container>
+
+            <ng-container matColumnDef="title">
+              <th mat-header-cell *matHeaderCellDef class="row-heading">Title </th>
+              <td mat-cell class="title-class" *matCellDef="let element">{{element?.title}}</td>
+            </ng-container>
+
+            <ng-container matColumnDef="requestor">
+              <th mat-header-cell *matHeaderCellDef class="row-heading">Requestor </th>
+              <td mat-cell class="title-class" *matCellDef="let element">{{element?.ownerName}}</td>
+            </ng-container>
+
+            <ng-container matColumnDef="requestType">
+              <th mat-header-cell *matHeaderCellDef class="row-heading">Request Type </th>
+              <td mat-cell class="title-class" *matCellDef="let element">{{element?.requestType}}</td>
+            </ng-container>
+
+            <ng-container matColumnDef="requestStatus">
+              <th mat-header-cell *matHeaderCellDef class="row-heading">Request Status </th>
 
-    <div class="nav-container">
-        <div class="sidenav-content">
-          <div class="table-class">
-            <ng-container *ngIf="dataSource?.filteredData?.length > 0">
-            <table mat-table   [dataSource]="dataSource" > 
-              <ng-container matColumnDef="RequestId">
-                <th mat-header-cell *matHeaderCellDef class="row-heading">Request ID </th>
-                <td mat-cell class="title-class" *matCellDef="let element">{{element?.demand_id}}</td>
-              </ng-container>
-  
-              <ng-container matColumnDef="title">
-                <th mat-header-cell *matHeaderCellDef class="row-heading">Title </th>
-                <td mat-cell class="title-class" *matCellDef="let element">{{element?.title}}</td>
-              </ng-container>
-
-              <ng-container matColumnDef="requestor">
-                <th mat-header-cell *matHeaderCellDef class="row-heading">Requestor </th>
-                <td mat-cell class="title-class" *matCellDef="let element">{{element?.ownerName}}</td>
-              </ng-container>
-  
-              <ng-container matColumnDef="requestType">
-                <th mat-header-cell *matHeaderCellDef class="row-heading">Request Type </th>
-                <td mat-cell class="title-class" *matCellDef="let element">{{element?.requestType}}</td>
-              </ng-container>
-  
-              <ng-container matColumnDef="requestStatus">
-                <th mat-header-cell *matHeaderCellDef class="row-heading">Request Status </th>
-                
-                <td mat-cell class="title-class" *matCellDef="let element">
-                  <span [ngClass]="getStatusClass(element?.status)">{{element?.status}}</span>
-                </td>
-              </ng-container>
-  
-              <ng-container matColumnDef="assignee">
-                <th mat-header-cell *matHeaderCellDef class="row-heading">Assignee </th>
-                <td mat-cell class="title-class" *matCellDef="let element">{{element?.assignedProvider ? element?.assignedProvider : 'Not Assigned' }}</td>
-              </ng-container>
-  
-              <ng-container matColumnDef="requestedOn">
-                <th mat-header-cell *matHeaderCellDef class="row-heading">Requested On </th>
-                <td mat-cell class="title-class" *matCellDef="let element">{{element?.createdOn | date}}</td>
-              </ng-container>
-
-              <ng-container matColumnDef="interests">
-                <th mat-header-cell *matHeaderCellDef class="row-heading">Interests</th>
-                <td mat-cell class="title-class" *matCellDef="let element">
-                    <a class="action-btn-view"   *ngIf="element?.interestCount!== 0" 
-                    href="javascript:void(0)" [ngStyle]="getPointerEventsStyle(element)"  >
-                    <span (click)="handleClick(element)">
-                      {{element?.interestCount}}
-                    </span></a>
-                    <a class="" *ngIf="element?.interestCount === 0" 
-                    href="javascript:void(0)">{{element?.requestType == 'Single' ? 'N/A' : element?.interestCount}}</a>
-                </td>
-              </ng-container>
-  
-              <ng-container matColumnDef="details">
-                <th mat-header-cell *matHeaderCellDef class="row-heading">Details</th>
-                <td mat-cell *matCellDef="let element">
-                  <mat-icon (click)="navigateToDetails(element?.demand_id)" class="cursor-pointer">visibility</mat-icon>
-                </td>
-              </ng-container>
-  
-              <ng-container matColumnDef="action">
-                <th mat-header-cell *matHeaderCellDef class="row-heading"></th>
-                <td mat-cell  *matCellDef="let element">
-                
-                  <!-- <a class="action-btn-view" *ngIf="element.status === 'Unassigned'" (click)="showInterestPopup()"
+              <td mat-cell class="title-class" *matCellDef="let element">
+                <span [ngClass]="getStatusClass(element?.status)">{{element?.status === statusKey.fullfill ? 'Fulfilled'
+                  : element?.status}}</span>
+              </td>
+            </ng-container>
+
+            <ng-container matColumnDef="assignee">
+              <th mat-header-cell *matHeaderCellDef class="row-heading">Assignee </th>
+              <td mat-cell class="title-class" *matCellDef="let element">{{element?.assignedProvider ?
+                element?.assignedProvider : 'Not Assigned' }}</td>
+            </ng-container>
+
+            <ng-container matColumnDef="requestedOn">
+              <th mat-header-cell *matHeaderCellDef class="row-heading">Requested On </th>
+              <td mat-cell class="title-class" *matCellDef="let element">{{element?.createdOn | date}}</td>
+            </ng-container>
+
+            <ng-container matColumnDef="interests">
+              <th mat-header-cell *matHeaderCellDef class="row-heading">Interests</th>
+              <td mat-cell class="title-class" *matCellDef="let element">
+                <a class="action-btn-view" *ngIf="element?.interestCount!== 0" href="javascript:void(0)"
+                  [ngStyle]="getPointerEventsStyle(element)">
+                  <span (click)="handleClick(element)">
+                    {{element?.interestCount}}
+                  </span></a>
+                <a class="" *ngIf="element?.interestCount === 0" href="javascript:void(0)">{{element?.requestType ==
+                  'Single' ? 'N/A' : element?.interestCount}}</a>
+              </td>
+            </ng-container>
+
+            <ng-container matColumnDef="details">
+              <th mat-header-cell *matHeaderCellDef class="row-heading">Details</th>
+              <td mat-cell *matCellDef="let element">
+                <mat-icon (click)="navigateToDetails(element?.demand_id)" class="cursor-pointer">visibility</mat-icon>
+              </td>
+            </ng-container>
+
+            <ng-container matColumnDef="action">
+              <th mat-header-cell *matHeaderCellDef class="row-heading"></th>
+              <td mat-cell *matCellDef="let element">
+
+                <!-- <a class="action-btn-view" *ngIf="element.status === 'Unassigned'" (click)="showInterestPopup()"
                     href="javascript:void(0)">Show
                     Interest</a> -->
 
 
-                      <span>
-                    <button mat-icon-button [matMenuTriggerFor]="menu" aria-label="Example icon-button with a menu">
-                      <mat-icon>more_vert</mat-icon>
+                <span>
+                  <button mat-icon-button [matMenuTriggerFor]="menu" aria-label="Example icon-button with a menu">
+                    <mat-icon>more_vert</mat-icon>
+                  </button>
+                  <mat-menu #menu="matMenu">
+                    <button mat-menu-item (click)="onClickMenu(element,'viewContent')">
+                      <span>View</span>
+                    </button>
+                    <button
+                      *ngIf="element?.status === statusKey.Unassigned && element?.status!== statusKey.Inprogress &&  element?.status!== statusKey.invalid "
+                      mat-menu-item (click)="onClickMenu(element,'invalidContent')">
+                      <span>Mark as invalid</span>
+                    </button>
+                    <button mat-menu-item
+                      *ngIf="element?.status!== statusKey.Assigned && element?.interestCount >0 && element?.status!== statusKey.Inprogress &&  element?.status!== statusKey.invalid && element?.status!==statusKey.fullfill"
+                      (click)="onClickMenu(element,'assignContent')">
+                      <span>Assign</span>
+                    </button>
+                    <button
+                      *ngIf="element?.status === statusKey.Assigned && element?.status!== statusKey.Inprogress &&  element?.status!== statusKey.invalid && element?.status!==statusKey.fullfill "
+                      mat-menu-item (click)="onClickMenu(element,'reAssignContent')">
+                      <span> Re-Assign</span>
                     </button>
-                    <mat-menu #menu="matMenu">
-                      <button mat-menu-item (click)="onClickMenu(element,'viewContent')">
-                        <span >View</span>
-                      </button>
-                      <button *ngIf="element?.status === statusKey.Unassigned && element?.status!== statusKey.Inprogress &&  element?.status!== statusKey.invalid " mat-menu-item (click)="onClickMenu(element,'invalidContent')">
-                        <span>Mark as invalid</span>
-                      </button>
-                      <button mat-menu-item *ngIf="element?.status!== statusKey.Assigned && element?.interestCount >0 && element?.status!== statusKey.Inprogress &&  element?.status!== statusKey.invalid && element?.status!==statusKey.fullfill" (click)="onClickMenu(element,'assignContent')">
-                        <span>Assign</span>
-                      </button>
-                      <button *ngIf="element?.status === statusKey.Assigned && element?.status!== statusKey.Inprogress &&  element?.status!== statusKey.invalid && element?.status!==statusKey.fullfill " mat-menu-item (click)="onClickMenu(element,'reAssignContent')">
-                        <span> Re-Assign</span>
-                      </button>
-                      <button mat-menu-item (click)="onClickMenu(element,'copyContent')">
-                        <span>Copy</span>
-                      </button>
-                    </mat-menu>
-                  </span>
-                </td>
-  
-  
-              </ng-container>
-  
-              <tr mat-header-row *matHeaderRowDef="displayedColumns" class="table-row-data"></tr>
-              <tr mat-row *matRowDef="let row;columns:displayedColumns"></tr>
-  
-  
-            </table>
-          </ng-container>
-
-            <div class="no-cbp-data" *ngIf="dataSource?.filteredData?.length === 0">
-              <div><img src="/mdo-assets/images/no-content-data.svg"></div>
-              <!-- <div class="mat-subheading-1 margin-remove">No CBP plan created yet</div> -->
-              <div>No Request yet made</div>
-              <!-- <div class="margin-top-m">
+                    <button mat-menu-item (click)="onClickMenu(element,'copyContent')">
+                      <span>Copy</span>
+                    </button>
+                  </mat-menu>
+                </span>
+              </td>
+
+
+            </ng-container>
+
+            <tr mat-header-row *matHeaderRowDef="displayedColumns" class="table-row-data"></tr>
+            <tr mat-row *matRowDef="let row;columns:displayedColumns"></tr>
+
+
+          </table>
+        </ng-container>
+
+        <div class="no-cbp-data" *ngIf="dataSource?.filteredData?.length === 0">
+          <div><img src="/mdo-assets/images/no-content-data.svg"></div>
+          <!-- <div class="mat-subheading-1 margin-remove">No CBP plan created yet</div> -->
+          <div>No Request yet made</div>
+          <!-- <div class="margin-top-m">
                   <button mat-button type="button" class="search-btn"
                   [routerLink]="['/app/home/create-request-form']">Request Content</button>
               </div> -->
-              <div class=" margin-top-m no-content-create">
-                <button mat-button type="button" class="search-btns" [routerLink]="['/app/home/create-request-form']">Request Content</button>
-            </div>
-
+          <div class=" margin-top-m no-content-create">
+            <button mat-button type="button" class="search-btns"
+              [routerLink]="['/app/home/create-request-form']">Request Content</button>
           </div>
-  
-            <mat-paginator *ngIf="dataSource?.filteredData?.length > 0" [pageSize]="pageSize" [length]="this.requestCount" [pageSizeOptions]="[10,20,40]"
-              (page)="onChangePage($event)"></mat-paginator>
-  
-  
-          </div>
-  
-  
-  
+
         </div>
+
+        <mat-paginator *ngIf="dataSource?.filteredData?.length > 0" [pageSize]="pageSize" [length]="this.requestCount"
+          [pageSizeOptions]="[10,20,40]" (page)="onChangePage($event)"></mat-paginator>
+
+
+      </div>
+
+
+
     </div>
-    
-    <!-- <div class="margin-top-l custom-table" *ngIf="requestListData"
-     [ngClass]="{ 'assignedClass':isAssigned }" 
-     > 
+  </div>
+
+  <!-- <div class="margin-top-l custom-table" *ngIf="requestListData"
+     [ngClass]="{ 'assignedClass':isAssigned }"
+     >
     <ws-widget-org-user-table  [tableData]="tabledata" [data]="requestListData" [actionMenuItem]="pageConfig?.data?.actionMenu"  (actionsClick)="menuSelected($event)" (eOnRowClick)="viewDetails($event)">
     </ws-widget-org-user-table>
     <mat-paginator [pageSize]="pageSize" [length]="this.requestCount" [pageSizeOptions]="[20,30,40]"
     (page)="onChangePage($event)"></mat-paginator>
 </div> -->
 
-</div>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
index 2a5456d04..a9b279ecd 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
@@ -13,11 +13,11 @@ import _ from 'lodash'
 import { SingleAssignPopupComponent } from './single-assign-popup/single-assign-popup.component'
 /* tslint:enable */
 export enum statusValue {
-  Assigned= 'Assigned',
+  Assigned = 'Assigned',
   Unassigned = 'Unassigned',
   Inprogress = 'InProgress',
   invalid = 'Invalid',
-  fullfill= 'Fulfill',
+  fullfill = 'Fulfill',
 }
 @Component({
   selector: 'ws-app-request-list',
@@ -59,24 +59,28 @@ export class RequestListComponent implements OnInit {
   detailsEvent: any
   dataSource: any
   displayedColumns: string[] = ['RequestId', 'title', 'requestor', 'requestType',
-   'requestStatus', 'assignee', 'requestedOn', 'interests', 'action']
+    'requestStatus', 'assignee', 'requestedOn', 'interests', 'action']
   statusKey = statusValue
   fullProfile: any
- rootOrgId: any
+  rootOrgId: any
   constructor(private sanitizer: DomSanitizer,
-              private homeService: ProfileV2Service,
-              private datePipe: DatePipe,
-              private activeRoute: ActivatedRoute,
-              private dialog: MatDialog,
-              private router: Router,
-              private snackBar: MatSnackBar,
-              private loaderService: LoaderService,
+    private homeService: ProfileV2Service,
+    private datePipe: DatePipe,
+    private activeRoute: ActivatedRoute,
+    private dialog: MatDialog,
+    private router: Router,
+    private snackBar: MatSnackBar,
+    private loaderService: LoaderService,
   ) { }
   requestList: any[] = [
     `You can request new content by filling out the request form. You will have the option to choose your content provider and
      if you are unsure then you can choose the option as broadcast your request.`,
-      `Please review the interest received from various providers and assign
+    `Please review the interest received from various providers and assign
       to the provider of your choice among the list.`,
+    `You can mark any unassigned request to invalid by choosing the
+      "Mark as Invalid" option. Similarly, you can "Re-Assign" any request that is
+      currently in "Assigned" status by selecting the "Re-Assign" option.`,
+    `You can copy an existing request and make necessary modifications to create a new content request`
   ]
 
   ngOnInit() {
@@ -102,18 +106,18 @@ export class RequestListComponent implements OnInit {
         element.status !== this.statusKey.invalid &&
         element.status !== this.statusKey.fullfill) {
         this.onClickMenu(element, 'assignContent')
-    }
+      }
     }
 
-}
+  }
 
-getPointerEventsStyle(element:any){
-  return {
-   'pointer-events': (element.status !== this.statusKey.Inprogress && 
-     element.status !== this.statusKey.invalid && 
-     element.status !== this.statusKey.fullfill) ? 'auto' : 'none',
+  getPointerEventsStyle(element: any) {
+    return {
+      'pointer-events': (element.status !== this.statusKey.Inprogress &&
+        element.status !== this.statusKey.invalid &&
+        element.status !== this.statusKey.fullfill) ? 'auto' : 'none',
+    }
   }
- }
 
   hasAccess() {
     let flag = false
@@ -137,51 +141,51 @@ getPointerEventsStyle(element:any){
   }
 
   onClickMenu(item: any, action: string) {
-  switch (action) {
-    case 'viewContent':
+    switch (action) {
+      case 'viewContent':
 
-      this.queryParams = {
-      id: item.demand_id,
-      name: 'view',
-    }
-      this.router.navigate(['/app/home/create-request-form'], { queryParams: this.queryParams })
-      break
-    case 'invalidContent':
-      this.showConformationModal(item, action)
-      break
-    case 'assignContent':
-       this.openAssignlistPopup(item)
-      break
-    case 'reAssignContent':
-      if (item.requestType === 'Broadcast') {
+        this.queryParams = {
+          id: item.demand_id,
+          name: 'view',
+        }
+        this.router.navigate(['/app/home/create-request-form'], { queryParams: this.queryParams })
+        break
+      case 'invalidContent':
+        this.showConformationModal(item, action)
+        break
+      case 'assignContent':
         this.openAssignlistPopup(item)
-      } else {
-        this.openSingleReassignPopup(item)
-      }
-      // else {
-      //   this.queryParams = {
-      //     id: item.demand_id,
-      //     name: 'reassign',
-      //   }
-      //     this.router.navigate(['/app/home/create-request-form'], { queryParams: this.queryParams })
-      // }
+        break
+      case 'reAssignContent':
+        if (item.requestType === 'Broadcast') {
+          this.openAssignlistPopup(item)
+        } else {
+          this.openSingleReassignPopup(item)
+        }
+        // else {
+        //   this.queryParams = {
+        //     id: item.demand_id,
+        //     name: 'reassign',
+        //   }
+        //     this.router.navigate(['/app/home/create-request-form'], { queryParams: this.queryParams })
+        // }
 
-      break
-    case 'copyContent':
+        break
+      case 'copyContent':
         this.queryParams = {
           id: item.demand_id,
           name: 'copy',
         }
-          this.router.navigate(['/app/home/create-request-form'], { queryParams: this.queryParams })
-      break
-  }
+        this.router.navigate(['/app/home/create-request-form'], { queryParams: this.queryParams })
+        break
+    }
 
   }
 
   onChangePage(event: any) {
-  this.pageNo = event.pageIndex
-  this.pageSize = event.pageSize
-  this.getRequestList()
+    this.pageNo = event.pageIndex
+    this.pageSize = event.pageSize
+    this.getRequestList()
   }
 
   getStatusClass(status: string): string {
@@ -194,8 +198,8 @@ getPointerEventsStyle(element:any){
         return 'status-invalid'
       case 'Fulfill':
         return 'status-fullfill'
-        case 'InProgress':
-          return 'status-inprogress'
+      case 'InProgress':
+        return 'status-inprogress'
       default:
         return ''
     }
@@ -229,21 +233,21 @@ getPointerEventsStyle(element:any){
   }
 
   invalidContent(row: any) {
-   const request = {
-    demand_id: row.demand_id,
-    newStatus: 'Invalid',
-   }
-   this.homeService.markAsInvalid(request).subscribe(res => {
-     this.invalidRes = res
-     if (res) {
-      setTimeout(() => {
-        this.getRequestList()
-      },         1000)
-     }
+    const request = {
+      demand_id: row.demand_id,
+      newStatus: 'Invalid',
+    }
+    this.homeService.markAsInvalid(request).subscribe(res => {
+      this.invalidRes = res
+      if (res) {
+        setTimeout(() => {
+          this.getRequestList()
+        }, 1000)
+      }
 
-     this.snackBar.open('Marked as Invalid')
+      this.snackBar.open('Marked as Invalid')
     }
-  )
+    )
 
   }
 
@@ -260,8 +264,8 @@ getPointerEventsStyle(element:any){
       if (_res && _res.data === 'confirmed') {
         setTimeout(() => {
           this.getRequestList()
-        },         1000)
-         this.snackBar.open('Assigned submitted Successfully')
+        }, 1000)
+        this.snackBar.open('Assigned submitted Successfully')
       } else {
         // this.snackBar.open('error')
       }
@@ -281,9 +285,9 @@ getPointerEventsStyle(element:any){
       if (_res && _res.data === 'confirmed') {
         setTimeout(() => {
           this.getRequestList()
-        },         1000)
+        }, 1000)
 
-         this.snackBar.open('Re-assign submitted Successfully')
+        this.snackBar.open('Re-assign submitted Successfully')
       } else {
         // this.snackBar.open('error')
       }
@@ -297,34 +301,34 @@ getPointerEventsStyle(element:any){
   getRequestList() {
     this.loaderService.changeLoaderState(true)
     const request = {
-        filterCriteriaMap: {
-          rootOrgId: this.rootOrgId ? this.rootOrgId : '',
-        },
-        requestedFields: [],
-        facets: [],
-        pageNumber: this.pageNo,
-        pageSize: this.pageSize,
-        orderBy: 'createdOn',
-        orderDirection: 'ASC',
+      filterCriteriaMap: {
+        rootOrgId: this.rootOrgId ? this.rootOrgId : '',
+      },
+      requestedFields: [],
+      facets: [],
+      pageNumber: this.pageNo,
+      pageSize: this.pageSize,
+      orderBy: 'createdOn',
+      orderDirection: 'ASC',
     }
     this.homeService.getRequestList(request).subscribe(res => {
       if (res) {
-      this.requestListData = res.data
-      if (this.requestListData) {
-        this.loaderService.changeLoaderState(false)
-      this.requestCount = res.totalCount
-        this.requestListData.map((data: any) => {
-          if (data.createdOn) {
-            data.createdOn = this.datePipe.transform(data.createdOn, 'MMM d, y')
-          }
-          if (data.assignedProvider) {
-            data.assignedProvider = data.assignedProvider.providerName
-          }
-        })
-        this.dataSource = new MatTableDataSource<any>(this.requestListData)
+        this.requestListData = res.data
+        if (this.requestListData) {
+          this.loaderService.changeLoaderState(false)
+          this.requestCount = res.totalCount
+          this.requestListData.map((data: any) => {
+            if (data.createdOn) {
+              data.createdOn = this.datePipe.transform(data.createdOn, 'MMM d, y')
+            }
+            if (data.assignedProvider) {
+              data.assignedProvider = data.assignedProvider.providerName
+            }
+          })
+          this.dataSource = new MatTableDataSource<any>(this.requestListData)
 
+        }
       }
-    }
 
     })
 

From da76c03822e72253d11ecb27d982de94f6f3effe Mon Sep 17 00:00:00 2001
From: Nandini Achutha <nandini.achutha@tarento.com>
Date: Mon, 8 Jul 2024 17:17:15 +0530
Subject: [PATCH 765/887] Enabled sort, filter, facets, pending requests, csv
 support

---
 .../components/search/search.component.html   |  8 +-
 .../approval-pending.component.html           |  4 +-
 .../bulk-upload/bulk-upload.component.html    |  8 +-
 .../bulk-upload/bulk-upload.component.html    |  8 +-
 .../routes/users-view/users-view.component.ts | 80 +++++++++----------
 .../routes/users/services/upload.service.ts   | 10 +--
 6 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.html b/project/ws/app/src/lib/routes/home/components/search/search.component.html
index 309727751..bf7ff3795 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.html
@@ -7,7 +7,7 @@
                 placeholder="Search" type="Standard" [ngClass]="{'disable': isContentLive}">
         </div>
     </div>
-    <!-- <div class="filter-section flex" *ngIf="!isApprovals">
+    <div class="filter-section flex" *ngIf="!isApprovals">
         <button mat-button type="button" (click)="sort()" class="apply-filter margin-right-s"
             [matMenuTriggerFor]="cardMenu">
             <mat-icon class="margin-right-xs">sort</mat-icon> Sort
@@ -25,12 +25,12 @@
                 </div>
             </ng-template>
         </mat-menu>
-    </div> -->
-    <!-- <div class="filter-section flex" *ngIf="!isApprovals">
+    </div>
+    <div class="filter-section flex" *ngIf="!isApprovals">
         <button mat-button type="button" (click)="openFilter()" class="apply-filter margin-right-s">
             Apply Filter <mat-icon class="margin-right-xs">filter_list</mat-icon>
         </button>
-    </div> -->
+    </div>
     <div class="flex flex-end" *ngIf="!isApprovals && currentFilter === 'allusers'">
         <button mat-button type="button" class="search-btn" [routerLink]="['/app/home/user-creation']"
             [ngClass]="{'disable': isContentLive}">Create user</button>
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
index 5b29c485e..52fcbaad5 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
@@ -40,11 +40,11 @@
             mat-button (click)="filter('transfers'); tabTelemetry('transfers', 1)" role="button">Transfers
             ({{transfersCount}})</a>
         </div>
-        <!-- <div class="flex flex-3 flex-end" *ngIf="currentFilter === 'profileverification'">
+        <div class="flex flex-3 flex-end" *ngIf="currentFilter === 'profileverification'">
           <a (click)="getPendingResquests()"
             class="customlink cursor-pointer mat-body-2"><mat-icon>download_outlined</mat-icon> Download
             Pending Requests</a>
-        </div> -->
+        </div>
       </div>
       <ng-container *ngIf="currentFilter === 'profileverification'">
         <div class="searchfilter">
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
index 85a8b0230..9812a373e 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
@@ -15,7 +15,7 @@
               <li>Download the Sample File ZIP.</li>
               <li>Fill in user details in the Sample File.</li>
               <li>Verify via OTP.</li>
-              <li>Upload the populated sample file.</li>
+              <li>Upload the populated sample csv file.</li>
               <li>Check the upload results for confirmation.</li>
             </ol>
           </div>
@@ -30,18 +30,18 @@
             (dblclick)="$event.preventDefault()">
             <img src="/assets/icons/csv-file.svg" alt="CSV file logo" />
           </div>
-          <div *ngIf="showFileError" class="error-msg">Upload xlsx format file only</div>
+          <div *ngIf="showFileError" class="error-msg">Upload csv format file only</div>
           <div class="flex flex-col items-center">
             <div class="text-primary cursor-pointer" (click)="fileInput.click()" (dblclick)="$event.preventDefault()">
               Browse files</div>
             <input hidden type="file" #fileInput (click)="handleFileClick($event)" (change)="handleOnFileChange($event)"
-              name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();" accept=".xlsx, .xls" />
+              name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();" accept=".csv" />
             <!-- <div class="flex">or</div>
             <div class="flex">Drag file to upload</div> -->
           </div>
           <div class="flex flex-col items-center margin-bottom-m">
             <div class="flex">Max file size: 100 MB</div>
-            <div class="flex">Supported file types: xlsx</div>
+            <div class="flex">Supported file types: csv</div>
           </div>
         </div>
       </div>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
index e46bee73a..86ea1bc48 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
@@ -10,7 +10,7 @@
               <li>Download the Sample File ZIP.</li>
               <li>Fill in user details in the Sample File.</li>
               <li>Verify via OTP.</li>
-              <li>Upload the populated sample file.</li>
+              <li>Upload the populated sample csv file.</li>
               <li>Check the upload results for confirmation.</li>
             </ol>
           </div>
@@ -25,18 +25,18 @@
             (dblclick)="$event.preventDefault()">
             <img src="/assets/icons/csv-file.svg" alt="CSV file logo" />
           </div>
-          <div *ngIf="showFileError" class="error-msg">Upload xlsx format file only</div>
+          <div *ngIf="showFileError" class="error-msg">Upload csv format file only</div>
           <div class="flex flex-col items-center">
             <div class="text-primary cursor-pointer" (click)="fileInput.click()" (dblclick)="$event.preventDefault()">
               Browse files</div>
             <input hidden type="file" #fileInput (click)="handleFileClick($event)" (change)="handleOnFileChange($event)"
-              name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();" accept=".xlsx, .xls" />
+              name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();" accept=".csv" />
             <!-- <div class="flex">or</div>
             <div class="flex">Drag file to upload</div> -->
           </div>
           <div class="flex flex-col items-center margin-bottom-m">
             <div class="flex">Max file size: 100 MB</div>
-            <div class="flex">Supported file types: xlsx</div>
+            <div class="flex">Supported file types: csv</div>
           </div>
         </div>
       </div>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index c9e932e8e..7b405a0df 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -218,15 +218,15 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     reqBody = {
       request: {
         filters: filtreq,
-        // facets: [
-        //   'profileDetails.professionalDetails.group',
-        //   'profileDetails.professionalDetails.designation',
-        //   'profileDetails.additionalDetails.tag',
-        // ],
-        // fields: [
-        //   'rootOrgId',
-        //   'profileDetails',
-        // ],
+        facets: [
+          'profileDetails.professionalDetails.group',
+          'profileDetails.professionalDetails.designation',
+          'profileDetails.additionalDetails.tag',
+        ],
+        fields: [
+          'rootOrgId',
+          'profileDetails',
+        ],
         limit: this.limit,
         offset: this.pageIndex,
         query: this.getSearchText(query),
@@ -238,7 +238,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       this.activeUsersData = allusersData.content
       // this.activeUsersData = this.activeUsersData.filter((wf: any) => wf.profileDetails.profileStatus !== 'NOT-MY-USER')
       this.activeUsersDataCount = allusersData.count
-      // this.filterFacets = allusersData.facets ? allusersData.facets : []
+      this.filterFacets = allusersData.facets ? allusersData.facets : []
 
       // const i = this.activeUsersData.findIndex((wf: any) => wf.userId === this.currentUser)
       // if (i > -1) {
@@ -274,15 +274,15 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     reqBody = {
       request: {
         filters: filtreq,
-        // facets: [
-        //   'profileDetails.professionalDetails.group',
-        //   'profileDetails.professionalDetails.designation',
-        //   'profileDetails.additionalDetails.tag',
-        // ],
-        // fields: [
-        //   'rootOrgId',
-        //   'profileDetails',
-        // ],
+        facets: [
+          'profileDetails.professionalDetails.group',
+          'profileDetails.professionalDetails.designation',
+          'profileDetails.additionalDetails.tag',
+        ],
+        fields: [
+          'rootOrgId',
+          'profileDetails',
+        ],
         limit: this.limit,
         offset: this.pageIndex,
         query: this.getSearchText(query),
@@ -293,7 +293,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       const allusersData = data.result.response
       this.verifiedUsersData = allusersData.content
       this.verifiedUsersDataCount = data.result.response.count
-      // this.filterFacets = allusersData.facets ? allusersData.facets : []
+      this.filterFacets = allusersData.facets ? allusersData.facets : []
 
       // if (this.currentUserStatus === 'VERIFIED') {
       //   const i = this.verifiedUsersData.findIndex((wf: any) => wf.userId === this.currentUser)
@@ -328,15 +328,15 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     reqBody = {
       request: {
         filters: filtreq,
-        // facets: [
-        //   'profileDetails.professionalDetails.group',
-        //   'profileDetails.professionalDetails.designation',
-        //   'profileDetails.additionalDetails.tag',
-        // ],
-        // fields: [
-        //   'rootOrgId',
-        //   'profileDetails',
-        // ],
+        facets: [
+          'profileDetails.professionalDetails.group',
+          'profileDetails.professionalDetails.designation',
+          'profileDetails.additionalDetails.tag',
+        ],
+        fields: [
+          'rootOrgId',
+          'profileDetails',
+        ],
         limit: this.limit,
         offset: this.pageIndex,
         query: this.getSearchText(query),
@@ -347,7 +347,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       const allusersData = data.result.response
       this.nonverifiedUsersData = allusersData.content
       this.nonverifiedUsersDataCount = data.result.response.count
-      // this.filterFacets = allusersData.facets ? allusersData.facets : []
+      this.filterFacets = allusersData.facets ? allusersData.facets : []
 
       // if (this.currentUserStatus === 'NOT-VERIFIED') {
       //   const i = this.nonverifiedUsersData.findIndex((wf: any) => wf.userId === this.currentUser)
@@ -383,15 +383,15 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     reqBody = {
       request: {
         filters: filtreq,
-        // facets: [
-        //   'profileDetails.professionalDetails.group',
-        //   'profileDetails.professionalDetails.designation',
-        //   'profileDetails.additionalDetails.tag',
-        // ],
-        // fields: [
-        //   'rootOrgId',
-        //   'profileDetails',
-        // ],
+        facets: [
+          'profileDetails.professionalDetails.group',
+          'profileDetails.professionalDetails.designation',
+          'profileDetails.additionalDetails.tag',
+        ],
+        fields: [
+          'rootOrgId',
+          'profileDetails',
+        ],
         limit: this.limit,
         offset: this.pageIndex,
         query: this.getSearchText(query),
@@ -402,7 +402,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       const allusersData = data.result.response
       this.notmyuserUsersData = allusersData.content
       this.notmyuserUsersDataCount = data.result.response.count
-      // this.filterFacets = allusersData.facets ? allusersData.facets : []
+      this.filterFacets = allusersData.facets ? allusersData.facets : []
     })
   }
 
diff --git a/project/ws/app/src/lib/routes/users/services/upload.service.ts b/project/ws/app/src/lib/routes/users/services/upload.service.ts
index 6860bba71..0273b4b43 100644
--- a/project/ws/app/src/lib/routes/users/services/upload.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/upload.service.ts
@@ -5,13 +5,13 @@ import { HttpClient } from '@angular/common/http'
 import * as fileSaver from 'file-saver'
 
 const API_ENDPOINTS = {
-  bulkUpload: `/apis/proxies/v8/user/v1/bulkupload`,
-  // bulkUpload: `/apis/proxies/v8/user/v2/bulkupload`, //csv support
+  // bulkUpload: `/apis/proxies/v8/user/v1/bulkupload`,
+  bulkUpload: `/apis/proxies/v8/user/v2/bulkupload`, //csv support
   downloadReport: `/apis/protected/v8/admin/userRegistration/bulkUploadReport`,
   getBulkUploadData: '/apis/proxies/v8/user/v1/bulkupload',
   getBulkApproval: '/apis/proxies/v8/workflow/admin/bulkupdate/getstatus',
-  bulkApprovalUpload: `/apis/proxies/v8/workflow/admin/transition/bulkupdate`,
-  // bulkApprovalUpload: '/apis/proxies/v8/workflow/admin/v2/bulkupdate/transition', //csv support
+  // bulkApprovalUpload: `/apis/proxies/v8/workflow/admin/transition/bulkupdate`,
+  bulkApprovalUpload: '/apis/proxies/v8/workflow/admin/v2/bulkupdate/transition', //csv support
 }
 
 @Injectable()
@@ -61,7 +61,7 @@ export class FileService {
   }
 
   validateFile(name: String) {
-    const allowedFormats = ['xlsx']
+    const allowedFormats = ['xlsx', 'csv']
     const ext = name.substring(name.lastIndexOf('.') + 1).toLowerCase()
     if (allowedFormats.indexOf(ext) > -1) {
       return true

From 98a9259b91371d9b15e137a13668209b799d8a24 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Mon, 8 Jul 2024 17:58:36 +0530
Subject: [PATCH 766/887] WIP adding odces designations

---
 .../ws/app/src/lib/routes/home/home.module.ts |  4 +
 .../lib/routes/home/home.rounting.module.ts   | 14 ++++
 .../designations/designations.component.html  | 17 ++++
 .../designations/designations.component.scss  |  0
 .../designations.component.spec.ts            | 25 ++++++
 .../designations/designations.component.ts    | 29 +++++++
 .../routes/home/services/odcs.service.spec.ts | 12 +++
 .../lib/routes/home/services/odcs.service.ts  | 80 +++++++++++++++++++
 8 files changed, 181 insertions(+)
 create mode 100644 project/ws/app/src/lib/routes/home/routes/designations/designations.component.html
 create mode 100644 project/ws/app/src/lib/routes/home/routes/designations/designations.component.scss
 create mode 100644 project/ws/app/src/lib/routes/home/routes/designations/designations.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/home/routes/designations/designations.component.ts
 create mode 100644 project/ws/app/src/lib/routes/home/services/odcs.service.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/home/services/odcs.service.ts

diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index 7f9b0202b..43f72e2dc 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -80,6 +80,8 @@ import { CreateRequestFormComponent } from './components/request-list/create-req
 import { CompetencyViewComponent } from './components/request-list/competency-view/competency-view.component'
 import { AssignListPopupComponent } from './components/request-list/assign-list-popup/assign-list-popup.component'
 import { SingleAssignPopupComponent } from './components/request-list/single-assign-popup/single-assign-popup.component'
+import { DesignationsComponent } from './routes/designations/designations.component'
+import { OdcsService } from './services/odcs.service'
 
 @NgModule({
   declarations: [
@@ -125,6 +127,7 @@ import { SingleAssignPopupComponent } from './components/request-list/single-ass
     CompetencyViewComponent,
     AssignListPopupComponent,
     SingleAssignPopupComponent,
+    DesignationsComponent
   ],
   imports: [
     CommonModule,
@@ -203,6 +206,7 @@ import { SingleAssignPopupComponent } from './components/request-list/single-ass
     UploadService,
     TrainingPlanDashboardService,
     UsersService,
+    OdcsService
   ],
 })
 export class HomeModule {
diff --git a/project/ws/app/src/lib/routes/home/home.rounting.module.ts b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
index 46b565f17..c5d81dee2 100644
--- a/project/ws/app/src/lib/routes/home/home.rounting.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
@@ -27,6 +27,7 @@ import { UserCreationComponent } from './routes/users-view/user-creation/user-cr
 import { BulkUploadApprovalComponent } from './routes/approvals/bulk-upload/bulk-upload.component'
 import { RequestListComponent } from './components/request-list/request-list.component'
 import { CreateRequestFormComponent } from './components/request-list/create-request-form/create-request-form.component'
+import { DesignationsComponent } from './routes/designations/designations.component'
 
 const routes: Routes = [
   {
@@ -338,6 +339,19 @@ const routes: Routes = [
           pageData: PageResolve,
         },
       },
+      {
+        path: 'org-designations',
+        component: DesignationsComponent,
+        data: {
+          pageId: 'designations-list',
+          pageType: 'feature',
+          pageKey: 'designations-list',
+        },
+        resolve: {
+          configService: ConfigResolveService,
+          pageData: PageResolve,
+        },
+      },
 
     ],
   },
diff --git a/project/ws/app/src/lib/routes/home/routes/designations/designations.component.html b/project/ws/app/src/lib/routes/home/routes/designations/designations.component.html
new file mode 100644
index 000000000..6f39b277f
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/designations/designations.component.html
@@ -0,0 +1,17 @@
+<div class="flex flex-4 flex-column">
+  <mat-card>
+    <mat-card-title class="flex-4 mobile-margin mat-h2">
+      Designations
+    </mat-card-title>
+    <mat-card-content>
+      <ng-container *ngIf="data?.length > 0">
+
+      </ng-container>
+      <ng-container *ngIf="!roleCountSpinner">
+        <div class="flex flex-1 loader-box">
+          <mat-spinner strokeWidth="3" diameter="50"></mat-spinner>
+        </div>
+      </ng-container>
+    </mat-card-content>
+  </mat-card>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/designations/designations.component.scss b/project/ws/app/src/lib/routes/home/routes/designations/designations.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/project/ws/app/src/lib/routes/home/routes/designations/designations.component.spec.ts b/project/ws/app/src/lib/routes/home/routes/designations/designations.component.spec.ts
new file mode 100644
index 000000000..bcd54e4f1
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/designations/designations.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DesignationsComponent } from './designations.component';
+
+describe('DesignationsComponent', () => {
+  let component: DesignationsComponent;
+  let fixture: ComponentFixture<DesignationsComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DesignationsComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DesignationsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/project/ws/app/src/lib/routes/home/routes/designations/designations.component.ts b/project/ws/app/src/lib/routes/home/routes/designations/designations.component.ts
new file mode 100644
index 000000000..84abe71d9
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/designations/designations.component.ts
@@ -0,0 +1,29 @@
+import { Component, OnInit } from '@angular/core'
+import { OdcsService } from '../../services/odcs.service'
+
+@Component({
+  selector: 'ws-app-designations',
+  templateUrl: './designations.component.html',
+  styleUrls: ['./designations.component.scss']
+})
+export class DesignationsComponent implements OnInit {
+
+  organisationsList: any = []
+  selectedOrganisation: string = ''
+  showLoader: boolean = true
+
+  constructor(
+    private odcsService: OdcsService
+  ) { }
+
+  ngOnInit() {
+    this.getOrganisations()
+  }
+
+  getOrganisations() {
+    this.odcsService.getFrameworkInfo().subscribe(res => {
+      console.log('designations:', res)
+    })
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/home/services/odcs.service.spec.ts b/project/ws/app/src/lib/routes/home/services/odcs.service.spec.ts
new file mode 100644
index 000000000..30a532254
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/services/odcs.service.spec.ts
@@ -0,0 +1,12 @@
+import { TestBed } from '@angular/core/testing';
+
+import { OdcsService } from './odcs.service';
+
+describe('OdcsService', () => {
+  beforeEach(() => TestBed.configureTestingModule({}));
+
+  it('should be created', () => {
+    const service: OdcsService = TestBed.get(OdcsService);
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/project/ws/app/src/lib/routes/home/services/odcs.service.ts b/project/ws/app/src/lib/routes/home/services/odcs.service.ts
new file mode 100644
index 000000000..7422e7ac0
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/services/odcs.service.ts
@@ -0,0 +1,80 @@
+import { HttpClient } from '@angular/common/http'
+import { Injectable } from '@angular/core'
+import { Observable } from 'rxjs'
+import { tap } from 'rxjs/operators'
+
+const API_END_POINTS = {
+  ORGANISATION_FW: '/apis/proxies/v8/framework/v1/read/organisation_fw',
+}
+
+@Injectable({
+  providedIn: 'root'
+})
+export class OdcsService {
+
+  list = new Map<string, any>()
+
+  constructor(
+    private http: HttpClient
+  ) { }
+
+  getFrameworkInfo(): Observable<any> {
+    return this.http.get(`${API_END_POINTS.ORGANISATION_FW}`, { withCredentials: true }).pipe(
+      tap((response: any) => {
+        this.formateData(response)
+      }),
+    )
+  }
+
+  formateData(response: any) {
+    (response.result.framework.categories).forEach((a: any) => {
+      this.list.set(a.code, {
+        code: a.code,
+        identifier: a.identifier,
+        index: a.index,
+        name: a.name,
+        selected: a.selected,
+        status: a.status,
+        description: a.description,
+        translations: a.translations,
+        category: a.category,
+        associations: a.associations,
+        // config: this.getConfig(a.code),
+        children: (a.terms || []).map((c: any) => {
+          const associations = c.associations || []
+          if (associations.length > 0) {
+            Object.assign(c, { children: associations })
+          }
+          return c
+        })
+      })
+    })
+
+    const allCategories: any = []
+    this.list.forEach((a: any) => {
+      allCategories.push({
+        code: a.code,
+        identifier: a.identifier,
+        index: a.index,
+        name: a.name,
+        status: a.status,
+        description: a.description,
+        translations: a.translations,
+      })
+    })
+    // this.categoriesHash.next(allCategories)
+
+  }
+
+  // getConfig(code: string) {
+  //   let categoryConfig: any
+  //   if (this.rootConfig && this.rootConfig[0]) {
+  //     this.rootConfig.forEach((config: any, index: number) => {
+  //       if (this.frameworkId == config.frameworkId) {
+  //         categoryConfig = config.config.find((obj: any) => obj.category == code)
+  //       }
+  //     })
+  //   }
+  //   return categoryConfig
+  // }
+}

From 34df8d3a6179e907e493ee6a8f8064f123a861c5 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Tue, 9 Jul 2024 12:39:47 +0530
Subject: [PATCH 767/887] fix for logout page banner

---
 .../public-logout.component.html              | 20 +++++------
 .../public-logout.component.scss              | 33 ++++++++++++++++---
 2 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/src/app/routes/public/public-logout/public-logout.component.html b/src/app/routes/public/public-logout/public-logout.component.html
index f7af14bea..156fb8956 100644
--- a/src/app/routes/public/public-logout/public-logout.component.html
+++ b/src/app/routes/public/public-logout/public-logout.component.html
@@ -1,30 +1,28 @@
 <div class="main_container flex flex-row"
-  style=" background: url(assets/instances/eagle/banners/home/9/Login_background.png) no-repeat center center fixed;">
+  style=" background: url(/assets/instances/eagle/banners/home/9/BG.png) center center fixed;">
   <div class="left_container flex flex-col items-center justify-center">
-    <div class="logo_box flex items-center">
+    <!-- <div class="logo_box flex items-center">
       <img src="/assets/instances/eagle/app_logos/dopt_logo.png" alt="logo" class="logo_img">
-    </div>
+    </div> -->
 
-    <div class="slideshow-container">
+    <!-- <div class="slideshow-container">
 
       <div class="mySlides">
         <img src="/assets/instances/eagle/app_logos/Hexagon.png" alt="karmayogi">
-        <!-- <img src="/assets/instances/eagle/app_logos/card3.png" alt="slide 1"> -->
 
       </div>
 
-      <!-- <div class="mySlides">
-
-        <img src="/assets/instances/eagle/app_logos/Hexagon.png" alt="slide 2">
-
-      </div> -->
-
 
 
 
 
 
 
+    </div> -->
+    <div class="left_container mt-8">
+      <div class="features-image">
+        <img src="/assets/instances/eagle/banners/home/9/Sticky Notes.png" alt="What's New @ iGOT?">
+      </div>
     </div>
     <br>
 
diff --git a/src/app/routes/public/public-logout/public-logout.component.scss b/src/app/routes/public/public-logout/public-logout.component.scss
index b2e95d700..7698d2fff 100644
--- a/src/app/routes/public/public-logout/public-logout.component.scss
+++ b/src/app/routes/public/public-logout/public-logout.component.scss
@@ -22,11 +22,23 @@
       }
     }
 
+    // .left_container {
+    //   padding: 5rem 6rem;
+    //   box-sizing: border-box;
+    //   width: 55%;
+    //   height: 100vh;
+
+    //   @include breakpoint-xs {
+    //     display: none!important;
+    //   }
+    // }
     .left_container {
-      padding: 5rem 6rem;
-      box-sizing: border-box;
-      width: 55%;
-      height: 100vh;
+      flex: 1;
+      // display: flex;
+      // align-items: center;
+      // justify-content: center;
+      position: relative;
+      max-width: 100%;
 
       @include breakpoint-xs {
         display: none!important;
@@ -124,6 +136,19 @@ width:300px;
     }
   }
 
+  .features-image {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+    .features-image img {
+      max-width: 90%;
+      // position: absolute;
+      // top: 10%;
+      // // left: 50%;
+      // transform: translate(-50%, -50%);
+    }
+
 
 
 

From 1d65b397c079158f7f23bf45297dd3a79d5becd2 Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Tue, 9 Jul 2024 13:09:05 +0530
Subject: [PATCH 768/887] update for lint fix

---
 .../create-request-form.component.ts          | 20 ++++++++---------
 .../request-list/request-list.component.ts    | 22 +++++++++----------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
index 96192e95f..1bad5f063 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
@@ -68,11 +68,11 @@ export class CreateRequestFormComponent implements OnInit {
   competencySubtheme!: FormControl
 
   constructor(private formBuilder: FormBuilder,
-    private homeService: ProfileV2Service,
-    private activatedRouter: ActivatedRoute,
-    private snackBar: MatSnackBar,
-    private router: Router,
-    public dialog: MatDialog
+              private homeService: ProfileV2Service,
+              private activatedRouter: ActivatedRoute,
+              private snackBar: MatSnackBar,
+              private router: Router,
+              public dialog: MatDialog
   ) {
     this.requestForm = this.formBuilder.group({
       TitleName: new FormControl('', [Validators.required, Validators.pattern(this.noSpecialChar), Validators.minLength(10)]),
@@ -155,13 +155,13 @@ export class CreateRequestFormComponent implements OnInit {
 
     this.selectRequestType(this.requestObjData.requestType)
     if (this.filteredRequestType) {
-      if(this.requestObjData.preferredProvider && this.requestObjData.preferredProvider.length){
+      if (this.requestObjData.preferredProvider && this.requestObjData.preferredProvider.length) {
       const prefferedData = this.filteredRequestType.filter(option =>
         this.requestObjData.preferredProvider.some((res: any) =>
           res.providerId === option.id
         )
       )
-      if(prefferedData && prefferedData.length){
+      if (prefferedData && prefferedData.length) {
         this.requestForm.controls['providers'].setValue(prefferedData)
       }
     }
@@ -551,7 +551,6 @@ export class CreateRequestFormComponent implements OnInit {
     if (this.demandId && this.actionBtnName === 'reassign') {
       this.requestForm.enable()
     }
-   
 
     let competencyDataList: any[] = []
     if (this.requestForm.value.competencies_v5) {
@@ -593,7 +592,6 @@ export class CreateRequestFormComponent implements OnInit {
       }
       request.assignedProvider = assigneeProvider
     }
-     
 
     if (this.requestForm.value.learningMode) {
       request.learningMode = this.requestForm.value.learningMode.toLowerCase()
@@ -615,9 +613,9 @@ export class CreateRequestFormComponent implements OnInit {
           this.router.navigateByUrl('/app/home/request-list')
           this.snackBar.open('Request submitted successfully ')
         }
-      }, 1000)
+      },         1000)
     },
-      (error: any) => {
+                                                     (error: any) => {
         this.dialogRefs.close({ error })
         this.snackBar.open('Request Failed')
 
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
index a9b279ecd..102e32f60 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
@@ -64,13 +64,13 @@ export class RequestListComponent implements OnInit {
   fullProfile: any
   rootOrgId: any
   constructor(private sanitizer: DomSanitizer,
-    private homeService: ProfileV2Service,
-    private datePipe: DatePipe,
-    private activeRoute: ActivatedRoute,
-    private dialog: MatDialog,
-    private router: Router,
-    private snackBar: MatSnackBar,
-    private loaderService: LoaderService,
+              private homeService: ProfileV2Service,
+              private datePipe: DatePipe,
+              private activeRoute: ActivatedRoute,
+              private dialog: MatDialog,
+              private router: Router,
+              private snackBar: MatSnackBar,
+              private loaderService: LoaderService,
   ) { }
   requestList: any[] = [
     `You can request new content by filling out the request form. You will have the option to choose your content provider and
@@ -80,7 +80,7 @@ export class RequestListComponent implements OnInit {
     `You can mark any unassigned request to invalid by choosing the
       "Mark as Invalid" option. Similarly, you can "Re-Assign" any request that is
       currently in "Assigned" status by selecting the "Re-Assign" option.`,
-    `You can copy an existing request and make necessary modifications to create a new content request`
+    `You can copy an existing request and make necessary modifications to create a new content request`,
   ]
 
   ngOnInit() {
@@ -242,7 +242,7 @@ export class RequestListComponent implements OnInit {
       if (res) {
         setTimeout(() => {
           this.getRequestList()
-        }, 1000)
+        },         1000)
       }
 
       this.snackBar.open('Marked as Invalid')
@@ -264,7 +264,7 @@ export class RequestListComponent implements OnInit {
       if (_res && _res.data === 'confirmed') {
         setTimeout(() => {
           this.getRequestList()
-        }, 1000)
+        },         1000)
         this.snackBar.open('Assigned submitted Successfully')
       } else {
         // this.snackBar.open('error')
@@ -285,7 +285,7 @@ export class RequestListComponent implements OnInit {
       if (_res && _res.data === 'confirmed') {
         setTimeout(() => {
           this.getRequestList()
-        }, 1000)
+        },         1000)
 
         this.snackBar.open('Re-assign submitted Successfully')
       } else {

From 506a71465446625e0d66667decf96ad2fc40a6d7 Mon Sep 17 00:00:00 2001
From: Afzal84 <mohd.afzal@tarento.com>
Date: Wed, 10 Jul 2024 11:28:59 +0530
Subject: [PATCH 769/887] Fixed:- KAR-656 Issue in MDO portal

---
 .../home/components/admintable/admintable.component.html      | 4 ++--
 .../components/leadershiptable/leadershiptable.component.html | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.html b/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.html
index db56665fa..fec488834 100644
--- a/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.html
+++ b/project/ws/app/src/lib/routes/home/components/admintable/admintable.component.html
@@ -13,9 +13,9 @@
                     </div>
                 </div>
                 <div class="flex-1 right-align">
-                    <button type="button" mat-button class="create-btn" (click)="adduser()">
+                    <!-- <button type="button" mat-button class="create-btn" (click)="adduser()">
                         Add user
-                    </button>
+                    </button> -->
                 </div>
             </div>
         </div>
diff --git a/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.html b/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.html
index 42248b2d6..e3eca1edd 100644
--- a/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.html
+++ b/project/ws/app/src/lib/routes/home/components/leadershiptable/leadershiptable.component.html
@@ -13,9 +13,9 @@
                     </div>
                 </div>
                 <div class="flex-1 right-align">
-                    <button type="button" mat-button class="create-btn" (click)="adduser()">
+                    <!-- <button type="button" mat-button class="create-btn" (click)="adduser()">
                         Add user
-                    </button>
+                    </button> -->
                 </div>
             </div>
         </div>

From ba946a60e802354405be9bafbca59164f92447b0 Mon Sep 17 00:00:00 2001
From: Afzal84 <mohd.afzal@tarento.com>
Date: Wed, 10 Jul 2024 11:52:53 +0530
Subject: [PATCH 770/887] Fixed:- Removed line from the note in MDO users page

---
 .../home/routes/users-view/all-users/all-users.component.ts      | 1 -
 .../lib/routes/home/routes/users-view/users-view.component.ts    | 1 -
 2 files changed, 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.ts
index 4ab055ddc..2d5a3f8a5 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/all-users/all-users.component.ts
@@ -113,7 +113,6 @@ export class AllUsersComponent implements OnInit, OnDestroy {
       `Verified Users: Users with all their primary fields approved.`,
       // tslint:disable-next-line: max-line-length
       `Non-Verified Users: Users whose one or more primary fields are yet to be approved. You can help by reviewing and approving their requests.`,
-      // `Not My User: Remove a user from your organization with a simple click.`,
     ]
   }
 
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 7b405a0df..5d14dbe16 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -113,7 +113,6 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       `Verified Users: Users with all their primary fields approved.`,
       // tslint:disable-next-line: max-line-length
       `Non-Verified Users: Users whose one or more primary fields are yet to be approved. You can help by reviewing and approving their requests.`,
-      `Not My User: Remove a user from your organization with a simple click.`,
     ]
   }
 

From 46e2927f4cd85f97666b7e097eeb5e85f2784a90 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Thu, 11 Jul 2024 15:38:35 +0530
Subject: [PATCH 771/887] wip add designations

---
 .../ws/app/src/lib/routes/home/home.module.ts |  14 ++-
 .../designations/designations.component.html  |  29 ++++-
 .../designations/designations.component.scss  |  33 +++++
 .../designations/designations.component.ts    | 119 +++++++++++++++++-
 4 files changed, 185 insertions(+), 10 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index 43f72e2dc..007e39ec8 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -11,6 +11,7 @@ import {
   MatChipsModule, MatProgressSpinnerModule, MatProgressBarModule, MatRadioModule,
   MatTabsModule, MatCheckboxModule, MatDatepickerModule, MatAutocompleteModule, MatSlideToggleModule,
 } from '@angular/material'
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'
 import { MatMenuModule } from '@angular/material/menu'
 import { MatPaginatorModule } from '@angular/material/paginator'
 import { MatCardModule } from '@angular/material/card'
@@ -82,6 +83,8 @@ import { AssignListPopupComponent } from './components/request-list/assign-list-
 import { SingleAssignPopupComponent } from './components/request-list/single-assign-popup/single-assign-popup.component'
 import { DesignationsComponent } from './routes/designations/designations.component'
 import { OdcsService } from './services/odcs.service'
+import { TaxonomyEditorModule } from '@sunbird-cb/taxonomy-editor'
+import { HttpClientModule } from '@angular/common/http'
 
 @NgModule({
   declarations: [
@@ -127,7 +130,7 @@ import { OdcsService } from './services/odcs.service'
     CompetencyViewComponent,
     AssignListPopupComponent,
     SingleAssignPopupComponent,
-    DesignationsComponent
+    DesignationsComponent,
   ],
   imports: [
     CommonModule,
@@ -183,6 +186,8 @@ import { OdcsService } from './services/odcs.service'
     FilterSearchPipeModule,
     MatAutocompleteModule,
     MatSlideToggleModule,
+    TaxonomyEditorModule,
+    HttpClientModule
   ],
   entryComponents: [
     AdduserpopupComponent,
@@ -201,12 +206,17 @@ import { OdcsService } from './services/odcs.service'
     SingleAssignPopupComponent,
   ],
   providers: [
+    {
+      provide: MatDialogRef,
+      useValue: {}
+    },
+    { provide: MAT_DIALOG_DATA, useValue: {} },
     InitResolver,
     MdoInfoService,
     UploadService,
     TrainingPlanDashboardService,
     UsersService,
-    OdcsService
+    OdcsService,
   ],
 })
 export class HomeModule {
diff --git a/project/ws/app/src/lib/routes/home/routes/designations/designations.component.html b/project/ws/app/src/lib/routes/home/routes/designations/designations.component.html
index 6f39b277f..d54337fa0 100644
--- a/project/ws/app/src/lib/routes/home/routes/designations/designations.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/designations/designations.component.html
@@ -3,11 +3,32 @@
     <mat-card-title class="flex-4 mobile-margin mat-h2">
       Designations
     </mat-card-title>
-    <mat-card-content>
-      <ng-container *ngIf="data?.length > 0">
-
+    <mat-card-content class="designationTable pt-4">
+      <div class="w-full flex justify-between items-center">
+        <div class="flex">
+          <div>
+            <div class="organisation-lable">Organisation</div>
+            <mat-form-field appearance="outline" class="organisation">
+              <mat-select [(ngModel)]="selectedOrganisation" [disabled]="!organisationsList.length < 2">
+                <ng-container *ngFor="let Organisation of organisationsList">
+                  <mat-option [value]="Organisation.identifier">{{ Organisation.name }}</mat-option>
+                </ng-container>
+              </mat-select>
+            </mat-form-field>
+          </div>
+        </div>
+        <div class="flex gap-4">
+          <button mat-raised-button class="btn-upload" (click)="upload()">Upload
+          </button>
+          <button mat-raised-button class="btn-create-designation" (click)="openDesignationCreatPopup()">Add
+            Designation</button>
+        </div>
+      </div>
+      <ng-container *ngIf="!showLoader">
+        <ws-widget-org-user-table [tableData]="tableData" [data]="designationsList" [actionMenuItem]="actionMenuItem"
+          [isSearchBar]=false (actionsClick)="menuSelected($event)"></ws-widget-org-user-table>
       </ng-container>
-      <ng-container *ngIf="!roleCountSpinner">
+      <ng-container *ngIf="showLoader">
         <div class="flex flex-1 loader-box">
           <mat-spinner strokeWidth="3" diameter="50"></mat-spinner>
         </div>
diff --git a/project/ws/app/src/lib/routes/home/routes/designations/designations.component.scss b/project/ws/app/src/lib/routes/home/routes/designations/designations.component.scss
index e69de29bb..66b51d97e 100644
--- a/project/ws/app/src/lib/routes/home/routes/designations/designations.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/designations/designations.component.scss
@@ -0,0 +1,33 @@
+:host ::ng-deep .designationTable {
+   .mat-column-CBP-Menu {
+    max-width: 100px;
+   }
+}
+
+.organisation-lable {
+  font-family: 'lato';
+  font-weight: 700;
+  font-size: 14px;
+  line-height: 21px;
+}
+
+.organisation {
+  width: 300px;
+}
+
+.btn-upload {
+  background: #1b4ca1 !important;
+  color: white !important;
+  font-family: 'Lato';
+  font-weight: 700;
+  font-size: 14px;
+  height: 40px;
+}
+
+.btn-create-designation {
+  width: auto;
+  border: 1px solid #0075B7;
+  border-radius: 4px;
+  color: #0075B7 !important;
+  height: 40px;
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/designations/designations.component.ts b/project/ws/app/src/lib/routes/home/routes/designations/designations.component.ts
index 84abe71d9..077c2757f 100644
--- a/project/ws/app/src/lib/routes/home/routes/designations/designations.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designations/designations.component.ts
@@ -1,5 +1,7 @@
 import { Component, OnInit } from '@angular/core'
 import { OdcsService } from '../../services/odcs.service'
+import * as _ from 'lodash'
+import { ITableData } from '@sunbird-cb/collection/lib/ui-org-table/interface/interfaces'
 
 @Component({
   selector: 'ws-app-designations',
@@ -8,22 +10,131 @@ import { OdcsService } from '../../services/odcs.service'
 })
 export class DesignationsComponent implements OnInit {
 
+  frameworkDetails: any = {}
   organisationsList: any = []
   selectedOrganisation: string = ''
+  designationsList: any = []
+  tableData!: ITableData
   showLoader: boolean = true
+  actionMenuItem: {
+    name: string,
+    icon: string,
+    key: string,
+    isMdoLeader: boolean
+  }[] = []
 
   constructor(
-    private odcsService: OdcsService
+    private odcsService: OdcsService,
   ) { }
 
   ngOnInit() {
-    this.getOrganisations()
+    this.initialization()
   }
 
-  getOrganisations() {
+  //#region (intial actions)
+  initialization() {
+    this.initializeDefaultValues()
+    this.getFrameworkInfo()
+  }
+
+  initializeDefaultValues() {
+    this.actionMenuItem = [
+      {
+        name: 'Edit',
+        icon: 'edit',
+        key: 'edit',
+        isMdoLeader: true //ws-widget-org-user-table library has conditions
+      },
+      {
+        name: 'View',
+        icon: 'remove_red_eye',
+        key: 'view',
+        isMdoLeader: true
+      }
+    ]
+
+    this.tableData = {
+      columns: [
+        { displayName: 'Designation', key: 'name' },
+        { displayName: 'Description', key: 'description' },
+      ],
+      needCheckBox: false,
+      needHash: false,
+      needUserMenus: false,
+      actions: [],
+      actionColumnName: 'Action',
+      cbpPlanMenu: true,
+    }
+  }
+
+  getFrameworkInfo() {
+    this.showLoader = true
     this.odcsService.getFrameworkInfo().subscribe(res => {
-      console.log('designations:', res)
+      this.showLoader = false
+      this.frameworkDetails = _.get(res, 'result.framework')
+      this.getOrganisations()
+      console.log('frame work: ', this.frameworkDetails)
     })
   }
 
+  getOrganisations() {
+    this.organisationsList = this.getTermsOfCategorie('organisation_fw_org')
+    this.selectedOrganisation = _.get(this.organisationsList, '[0].identifier', '')
+    this.getDesignations()
+  }
+
+  getDesignations() {
+    this.designationsList = this.getTermsOfCategorie('organisation_fw_designation')
+  }
+
+  // to get list from categories like designations, organisations
+  getTermsOfCategorie(catagoriIdentifier: string) {
+    const selectedCatagori = this.categoriesOfFramework.filter((catagori: any) => catagori.identifier === catagoriIdentifier)
+    return _.get(selectedCatagori, '[0].terms', [])
+  }
+
+  // to get different categories list
+  get categoriesOfFramework() {
+    return _.get(this.frameworkDetails, 'categories', [])
+  }
+
+  //#endregion
+
+  //#region (ui interactions like click)
+
+  openDesignationCreatPopup(event?: any) {
+    console.log('event', event)
+    const dialogData = {
+      mode: 'create',
+      columnInfo: {
+        code: 'designation',
+        name: 'Designation',
+        children: this.designationsList,
+      },
+      frameworkId: 'organisation_fw',
+      selectedDesignation: null
+    }
+    if (event && event.action) {
+      dialogData.mode = event.action
+      dialogData.selectedDesignation = event.row
+    }
+  }
+
+  upload() { }
+
+  menuSelected(event: any) {
+    switch (event.action) {
+      case 'edit':
+        this.openDesignationCreatPopup(event)
+        break
+      case 'view':
+        this.openDesignationCreatPopup(event)
+        break
+    }
+  }
+
+  //#endregion
+
+
+
 }

From bb0495a41c89928d6858dedcf71057a2d6892e1e Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Mon, 15 Jul 2024 13:35:32 +0530
Subject: [PATCH 772/887] wip implementing designations

---
 .../ws/app/src/lib/routes/home/home.module.ts |   8 +-
 .../lib/routes/home/home.rounting.module.ts   |  12 +-
 .../designations/designations.component.html  |  27 ++-
 .../designations/designations.component.scss  |  26 +++
 .../designations.component.spec.ts            |   0
 .../designations/designations.component.ts    | 205 ++++++++++++++++++
 .../import-designation.component.html         |  68 ++++++
 .../import-designation.component.scss         | 114 ++++++++++
 .../import-designation.component.spec.ts      |  25 +++
 .../import-designation.component.ts           | 155 +++++++++++++
 .../routes/designation/designation.module.ts  |  57 +++++
 .../conformation-popup.component.html         |   9 +
 .../conformation-popup.component.scss         |  14 ++
 .../conformation-popup.component.spec.ts      |  25 +++
 .../conformation-popup.component.ts           |  27 +++
 .../selected-designation-popup.component.html |  25 +++
 .../selected-designation-popup.component.scss |  47 ++++
 ...lected-designation-popup.component.spec.ts |  25 +++
 .../selected-designation-popup.component.ts   |  33 +++
 .../services/designations.service.spec.ts}    |   6 +-
 .../services/designations.service.ts}         |  40 +++-
 .../designations/designations.component.ts    | 140 ------------
 22 files changed, 921 insertions(+), 167 deletions(-)
 rename project/ws/app/src/lib/routes/home/routes/{ => designation/components}/designations/designations.component.html (57%)
 rename project/ws/app/src/lib/routes/home/routes/{ => designation/components}/designations/designations.component.scss (58%)
 rename project/ws/app/src/lib/routes/home/routes/{ => designation/components}/designations/designations.component.spec.ts (100%)
 create mode 100644 project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
 create mode 100644 project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.html
 create mode 100644 project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.scss
 create mode 100644 project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
 create mode 100644 project/ws/app/src/lib/routes/home/routes/designation/designation.module.ts
 create mode 100644 project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.html
 create mode 100644 project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.scss
 create mode 100644 project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.ts
 create mode 100644 project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/selected-designation-popup/selected-designation-popup.component.html
 create mode 100644 project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/selected-designation-popup/selected-designation-popup.component.scss
 create mode 100644 project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/selected-designation-popup/selected-designation-popup.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/selected-designation-popup/selected-designation-popup.component.ts
 rename project/ws/app/src/lib/routes/home/{services/odcs.service.spec.ts => routes/designation/services/designations.service.spec.ts} (51%)
 rename project/ws/app/src/lib/routes/home/{services/odcs.service.ts => routes/designation/services/designations.service.ts} (59%)
 delete mode 100644 project/ws/app/src/lib/routes/home/routes/designations/designations.component.ts

diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index 007e39ec8..9ac876283 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -81,10 +81,9 @@ import { CreateRequestFormComponent } from './components/request-list/create-req
 import { CompetencyViewComponent } from './components/request-list/competency-view/competency-view.component'
 import { AssignListPopupComponent } from './components/request-list/assign-list-popup/assign-list-popup.component'
 import { SingleAssignPopupComponent } from './components/request-list/single-assign-popup/single-assign-popup.component'
-import { DesignationsComponent } from './routes/designations/designations.component'
-import { OdcsService } from './services/odcs.service'
 import { TaxonomyEditorModule } from '@sunbird-cb/taxonomy-editor'
 import { HttpClientModule } from '@angular/common/http'
+import { DesignationModule } from './routes/designation/designation.module'
 
 @NgModule({
   declarations: [
@@ -130,7 +129,6 @@ import { HttpClientModule } from '@angular/common/http'
     CompetencyViewComponent,
     AssignListPopupComponent,
     SingleAssignPopupComponent,
-    DesignationsComponent,
   ],
   imports: [
     CommonModule,
@@ -187,7 +185,8 @@ import { HttpClientModule } from '@angular/common/http'
     MatAutocompleteModule,
     MatSlideToggleModule,
     TaxonomyEditorModule,
-    HttpClientModule
+    HttpClientModule,
+    DesignationModule
   ],
   entryComponents: [
     AdduserpopupComponent,
@@ -216,7 +215,6 @@ import { HttpClientModule } from '@angular/common/http'
     UploadService,
     TrainingPlanDashboardService,
     UsersService,
-    OdcsService,
   ],
 })
 export class HomeModule {
diff --git a/project/ws/app/src/lib/routes/home/home.rounting.module.ts b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
index c5d81dee2..3b8bf35a1 100644
--- a/project/ws/app/src/lib/routes/home/home.rounting.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
@@ -27,7 +27,6 @@ import { UserCreationComponent } from './routes/users-view/user-creation/user-cr
 import { BulkUploadApprovalComponent } from './routes/approvals/bulk-upload/bulk-upload.component'
 import { RequestListComponent } from './components/request-list/request-list.component'
 import { CreateRequestFormComponent } from './components/request-list/create-request-form/create-request-form.component'
-import { DesignationsComponent } from './routes/designations/designations.component'
 
 const routes: Routes = [
   {
@@ -341,16 +340,7 @@ const routes: Routes = [
       },
       {
         path: 'org-designations',
-        component: DesignationsComponent,
-        data: {
-          pageId: 'designations-list',
-          pageType: 'feature',
-          pageKey: 'designations-list',
-        },
-        resolve: {
-          configService: ConfigResolveService,
-          pageData: PageResolve,
-        },
+        loadChildren: () => import('./routes/designation/designation.module').then(m => m.DesignationModule),
       },
 
     ],
diff --git a/project/ws/app/src/lib/routes/home/routes/designations/designations.component.html b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html
similarity index 57%
rename from project/ws/app/src/lib/routes/home/routes/designations/designations.component.html
rename to project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html
index d54337fa0..edda63b4d 100644
--- a/project/ws/app/src/lib/routes/home/routes/designations/designations.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html
@@ -1,10 +1,10 @@
 <div class="flex flex-4 flex-column">
   <mat-card>
     <mat-card-title class="flex-4 mobile-margin mat-h2">
-      Designations
+      My Designation Master
     </mat-card-title>
     <mat-card-content class="designationTable pt-4">
-      <div class="w-full flex justify-between items-center">
+      <!-- <div class="w-full flex justify-between items-center">
         <div class="flex">
           <div>
             <div class="organisation-lable">Organisation</div>
@@ -23,10 +23,29 @@
           <button mat-raised-button class="btn-create-designation" (click)="openDesignationCreatPopup()">Add
             Designation</button>
         </div>
+      </div> -->
+      <div class="w-full flex justify-between items-center mb-6">
+        <div class="flex items-center">
+          <div class="search">
+            <div class=rsearch>
+              <mat-icon class="color-60 search-icon">search</mat-icon>
+              <input [formControl]="searchControl" class="sinput color-60" type="Standard" placeholder="Search">
+            </div>
+          </div>
+        </div>
+        <div class="flex items-center">
+          <button class="font-normal ws-mat-primary-border attendBtn mat-raised-button"
+            [routerLink]="'import-designation'" type="button">
+            Import from Igot master
+          </button>
+          <!-- <button mat-button class="btn-upload" (click)="upload()">Import from Igot master
+          </button> -->
+        </div>
       </div>
       <ng-container *ngIf="!showLoader">
-        <ws-widget-org-user-table [tableData]="tableData" [data]="designationsList" [actionMenuItem]="actionMenuItem"
-          [isSearchBar]=false (actionsClick)="menuSelected($event)"></ws-widget-org-user-table>
+        <ws-widget-org-user-table [tableData]="tableData" [data]="filteredDesignationsList"
+          [actionMenuItem]="actionMenuItem" [isSearchBar]=false
+          (actionsClick)="menuSelected($event)"></ws-widget-org-user-table>
       </ng-container>
       <ng-container *ngIf="showLoader">
         <div class="flex flex-1 loader-box">
diff --git a/project/ws/app/src/lib/routes/home/routes/designations/designations.component.scss b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.scss
similarity index 58%
rename from project/ws/app/src/lib/routes/home/routes/designations/designations.component.scss
rename to project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.scss
index 66b51d97e..b6699f901 100644
--- a/project/ws/app/src/lib/routes/home/routes/designations/designations.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.scss
@@ -30,4 +30,30 @@
   border-radius: 4px;
   color: #0075B7 !important;
   height: 40px;
+}
+
+.search {
+
+  .search-icon {
+    position: absolute;
+    top: 9px;
+    font-size: 20px;
+    left: 10px;
+  }
+
+  .rsearch {
+    display: flex;
+    position: relative;
+    flex: 1 1 auto;
+  }
+
+  .sinput {
+    width: 315px;
+    border-radius: 4px;
+    border: 1px solid #d5d0d0;
+    padding: 9px 9px 9px 35px;
+    margin-top: 0;
+    font: normal 14px Lato;
+    font-weight: 400;
+  }
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/designations/designations.component.spec.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.spec.ts
similarity index 100%
rename from project/ws/app/src/lib/routes/home/routes/designations/designations.component.spec.ts
rename to project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.spec.ts
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
new file mode 100644
index 000000000..1ffb0f4cf
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
@@ -0,0 +1,205 @@
+import { Component, OnInit } from '@angular/core'
+import * as _ from 'lodash'
+import { ITableData } from '@sunbird-cb/collection/lib/ui-org-table/interface/interfaces'
+import { DesignationsService } from '../../services/designations.service'
+import { FormControl } from '@angular/forms'
+import { delay } from 'rxjs/operators'
+import { HttpErrorResponse } from '@angular/common/http'
+import { MatDialog } from '@angular/material'
+import { ConformationPopupComponent } from '../../dialog-boxes/conformation-popup/conformation-popup.component'
+
+
+@Component({
+  selector: 'ws-app-designations',
+  templateUrl: './designations.component.html',
+  styleUrls: ['./designations.component.scss']
+})
+export class DesignationsComponent implements OnInit {
+
+  searchControl = new FormControl();
+  frameworkDetails: any = {}
+  organisationsList: any = []
+  selectedOrganisation: string = ''
+  designationsList: any = []
+  filteredDesignationsList: any = []
+  tableData!: ITableData
+  showLoader: boolean = true
+  actionMenuItem: {
+    name: string,
+    icon: string,
+    key: string,
+    isMdoLeader: boolean
+  }[] = []
+
+  constructor(
+    private designationsService: DesignationsService,
+    private dialog: MatDialog
+  ) { }
+
+  ngOnInit() {
+    this.initialization()
+  }
+
+  //#region (intial actions)
+  initialization() {
+    this.initializeDefaultValues()
+    this.getFrameworkInfo()
+    this.valudChangeSubscribers()
+  }
+
+  initializeDefaultValues() {
+    this.actionMenuItem = [
+      // {
+      //   name: 'Edit',
+      //   icon: 'edit',
+      //   key: 'edit',
+      //   isMdoLeader: true //ws-widget-org-user-table library has conditions
+      // },
+      // {
+      //   name: 'View',
+      //   icon: 'remove_red_eye',
+      //   key: 'view',
+      //   isMdoLeader: true
+      // }
+      {
+        name: 'Remove',
+        icon: 'delete',
+        key: 'remove',
+        isMdoLeader: true
+      }
+    ]
+
+    this.tableData = {
+      columns: [
+        { displayName: 'Designation', key: 'name' },
+        { displayName: 'Description', key: 'description' },
+      ],
+      needCheckBox: false,
+      needHash: false,
+      needUserMenus: false,
+      actions: [],
+      actionColumnName: 'Action',
+      cbpPlanMenu: true,
+    }
+  }
+
+  getFrameworkInfo() {
+    this.showLoader = true
+    this.designationsService.getFrameworkInfo().subscribe(res => {
+      this.showLoader = false
+      this.frameworkDetails = _.get(res, 'result.framework')
+      this.getOrganisations()
+      console.log('frame work: ', this.frameworkDetails)
+    })
+  }
+
+  valudChangeSubscribers() {
+    if (this.searchControl) {
+      this.searchControl.valueChanges.pipe(delay(500)).subscribe({
+        next: response => {
+          this.filterDesignations(response)
+        },
+        error: (error: HttpErrorResponse) => {
+          console.log(error)
+        }
+      })
+    }
+  }
+
+  getOrganisations() {
+    this.organisationsList = this.getTermsOfCategorie('organisation_fw_org')
+    this.selectedOrganisation = _.get(this.organisationsList, '[0].identifier', '')
+    this.getDesignations()
+  }
+
+  getDesignations() {
+    this.designationsList = this.getTermsOfCategorie('organisation_fw_designation')
+    this.filterDesignations()
+  }
+
+  // to get list from categories like designations, organisations
+  getTermsOfCategorie(catagoriIdentifier: string) {
+    const selectedCatagori = this.categoriesOfFramework.filter((catagori: any) => catagori.identifier === catagoriIdentifier)
+    return _.get(selectedCatagori, '[0].terms', [])
+  }
+
+  // to get different categories list
+  get categoriesOfFramework() {
+    return _.get(this.frameworkDetails, 'categories', [])
+  }
+
+  //#endregion
+
+  filterDesignations(key?: string) {
+    if (key) {
+      this.filteredDesignationsList = this.designationsList
+        .filter((designation: any) => designation.name.toLowerCase().includes(key.toLowerCase()))
+    } else {
+      this.filteredDesignationsList = this.designationsList
+    }
+  }
+
+  //#region (ui interactions like click)
+
+  // openDesignationCreatPopup(event?: any) {
+  //   console.log('event', event)
+  //   const dialogData = {
+  //     mode: 'create',
+  //     columnInfo: {
+  //       code: 'designation',
+  //       name: 'Designation',
+  //       children: this.designationsList,
+  //     },
+  //     frameworkId: 'organisation_fw',
+  //     selectedDesignation: null
+  //   }
+  //   if (event && event.action) {
+  //     dialogData.mode = event.action
+  //     dialogData.selectedDesignation = event.row
+  //   }
+  // }
+
+  // upload() { }
+
+  menuSelected(event: any) {
+    switch (event.action) {
+      // case 'edit':
+      //   this.openDesignationCreatPopup(event)
+      //   break
+      // case 'view':
+      //   this.openDesignationCreatPopup(event)
+      //   break
+      case 'remove':
+        this.openConformationPopup(event)
+        break
+    }
+  }
+
+  openConformationPopup(event: any) {
+    console.log('envent data', event)
+    const dialogData = {
+      message: `Are you sure you want to remove the ${_.get(event, 'row.name')} designation?`
+    }
+    const dialogRef = this.dialog.open(ConformationPopupComponent, {
+      data: dialogData,
+      autoFocus: false,
+      width: '500px',
+      maxWidth: '80vw',
+      disableClose: true
+    })
+    dialogRef.afterClosed().subscribe((res: any) => {
+      if (res) {
+        this.removeDesignation(event.row)
+      }
+    })
+  }
+
+  removeDesignation(designation: any) {
+    console.log(designation)
+  }
+
+  //#endregion
+
+
+
+}
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.html b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.html
new file mode 100644
index 000000000..48567e1cb
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.html
@@ -0,0 +1,68 @@
+<div class="flex flex-4 flex-column">
+  <mat-card>
+    <mat-card-title class="flex-4 mobile-margin mat-h2">
+      Import from Igot Designations
+    </mat-card-title>
+    <mat-card-content class="master-designations pt-4">
+      <div class="w-full flex justify-between items-center mb-6">
+        <div class="flex items-center">
+          <div class="search">
+            <div class=rsearch>
+              <mat-icon class="color-60 search-icon">search</mat-icon>
+              <input [formControl]="searchControl" class="sinput color-60" type="Standard" placeholder="Search">
+            </div>
+          </div>
+        </div>
+      </div>
+      <ng-container *ngIf="selctedDesignationsCount > 0">
+        <div class="flex flex-row mb-4">
+          <div class="flex flex-2 flex-middle w-full flex-wrap gap-4">
+            <div class="selected-designation-label">Selected designations - </div>
+            <ng-container *ngFor="let item of selectedDesignationsList | slice : 0 : 10">
+              <div class="chips flex flex-row" *ngIf="item?.selected">
+                <div class="chips-content">
+                  <span class="color-60">{{item?.name | titlecase}}</span>
+                </div>
+                <div class="cross-icon" (click)="removeDesignation([item])">
+                  <img class="cursor-pointer" src="assets/icons/close.svg" />
+                </div>
+              </div>
+            </ng-container>
+            <ng-container *ngIf="selctedDesignationsCount > 10">
+              <a mat-button class="select-more-link margin-left-m"
+                (click)="openPreviewPoup()">+{{selctedDesignationsCount - 10}} more</a>
+            </ng-container>
+          </div>
+          <!-- <div class="flex flex-1 flex-row right-section flex-middle">
+            <a mat-button class="select-more-link" (click)="clearAll()">Clear all</a>
+          </div> -->
+        </div>
+      </ng-container>
+      <div class="w-full flex flex-4 flex-row designations-card-container flex-wrap gap-5">
+        <ng-container
+          *ngFor="let designation of filteredIgotDesignationsList | slice : startIndex : lastIndex; let i = index">
+          <div class="flex flex-4 custom-user-card items-center justify-center"
+            [ngClass]="designation?.selected ? 'active-card':''">
+            <div class="custom-user-desc">
+              <p>{{designation?.name | titlecase}}</p>
+            </div>
+
+            <div class="check-action">
+              <mat-checkbox [checked]="designation?.selected"
+                (change)="selectDesignation($event.checked, designation.id)"></mat-checkbox>
+            </div>
+          </div>
+        </ng-container>
+      </div>
+      <div class="flex flex-row justify-center">
+        <mat-paginator [length]="filteredIgotDesignationsList.length" [pageSize]="pageSize"
+          [pageSizeOptions]="[20,30,40]" (page)="onChangePage($event)"></mat-paginator>
+      </div>
+      <div class="flex justify-end items-center">
+        <button mat-raised-button (click)="importDesignations()"
+          class="importBtn flex items-center justify-center">Import selected
+          designations</button>
+      </div>
+    </mat-card-content>
+  </mat-card>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.scss b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.scss
new file mode 100644
index 000000000..d2efdbdc9
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.scss
@@ -0,0 +1,114 @@
+
+.search {
+
+  .search-icon {
+    position: absolute;
+    top: 9px;
+    font-size: 20px;
+    left: 10px;
+  }
+
+  .rsearch {
+    display: flex;
+    position: relative;
+    flex: 1 1 auto;
+  }
+
+  .sinput {
+    width: 315px;
+    border-radius: 4px;
+    border: 1px solid #d5d0d0;
+    padding: 9px 9px 9px 35px;
+    margin-top: 0;
+    font: normal 14px Lato;
+    font-weight: 400;
+  }
+}
+
+.selected-designation-label {
+    margin: 10px 0px;
+    font-size: 14px;
+    color: rgb(0, 0, 0, 0.87);
+    font-weight: 400;
+    letter-spacing: 0.25px;
+}
+
+.chips {
+  border-radius: 63px;
+  width: 178px;
+  border: 1px solid rgba(0, 0, 0, 0.16);
+  align-items: center;
+
+  span {
+    font-size: 14px;
+    letter-spacing: 0.25px;
+  }
+
+  .cross-icon {
+    vertical-align: middle;
+    margin-left: 0;
+    margin-right: 16px;
+    margin-top: 6px;
+  }
+}
+
+.chips-content {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  vertical-align: middle;
+  padding-top: 10px;
+  padding-bottom: 10px;
+  padding-left: 16px;
+  width: 131px;
+}
+
+.select-more-link {
+  color: #1b4ca1 !important;
+  font-weight: 700;
+  letter-spacing: 0.25px;
+  font-family: 'Lato';
+}
+
+.master-designations {
+
+  .designations-card-container {
+    .active-card {
+      border: 1px solid #1B4CA1 !important;
+    }
+
+    .custom-user-card {
+      width: 292px;
+      border: 1px solid rgba(0, 0, 0, 0.16);
+      border-radius: 4px;
+      height: 70px;
+    }
+
+    .custom-user-desc {
+      display: flex;
+      flex-direction: column;
+      padding: 0 16px;
+      width: 230px;
+      white-space: nowrap;
+      p {
+          padding: 0;
+          margin: 0;
+          width: 190px;
+          overflow: hidden;
+          text-overflow: ellipsis;
+      }
+    }
+
+    .check-action {
+      margin-right: 16px;
+    }
+  }
+}
+
+.importBtn {
+  background: #1b4ca1 !important;
+  color: white !important;
+  font-family: "Lato";
+  font-weight: 700;
+  font-size: 14px;
+}
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.spec.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.spec.ts
new file mode 100644
index 000000000..5cb18f629
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ImportDesignationComponent } from './import-designation.component';
+
+describe('ImportDesignationComponent', () => {
+  let component: ImportDesignationComponent;
+  let fixture: ComponentFixture<ImportDesignationComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ImportDesignationComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ImportDesignationComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
new file mode 100644
index 000000000..77a458e62
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
@@ -0,0 +1,155 @@
+import { Component, OnInit } from '@angular/core'
+import { DesignationsService } from '../../services/designations.service'
+import { MatDialog, PageEvent } from '@angular/material'
+import { FormControl } from '@angular/forms'
+import { delay } from 'rxjs/operators'
+import { SelectedDesignationPopupComponent } from '../../dialog-boxes/selected-designation-popup/selected-designation-popup.component'
+import { forkJoin } from 'rxjs'
+import { HttpErrorResponse } from '@angular/common/http'
+import * as _ from 'lodash'
+
+@Component({
+  selector: 'ws-app-import-designation',
+  templateUrl: './import-designation.component.html',
+  styleUrls: ['./import-designation.component.scss']
+})
+export class ImportDesignationComponent implements OnInit {
+
+  searchControl = new FormControl();
+  igotDesignationsList: any = []
+  filteredIgotDesignationsList: any = []
+  selectedDesignationsList: any = []
+  orgDesignationsList: any = []
+  pageSize = 20
+  startIndex = 0
+  lastIndex = 20
+
+  constructor(
+    private designationsService: DesignationsService,
+    private dialog: MatDialog
+  ) { }
+
+  ngOnInit() {
+    this.loadDesignations()
+    this.valudChangeSubscribers()
+  }
+
+  loadDesignations() {
+    this.designationsService.getDesignations({}).subscribe(
+      (data: any) => {
+        this.igotDesignationsList = data
+        this.getFilteredDesignationList()
+      },
+      (_err: any) => {
+      })
+  }
+
+  valudChangeSubscribers() {
+    if (this.searchControl) {
+      this.searchControl.valueChanges.pipe(delay(500)).subscribe((value: string) => {
+        this.getFilteredDesignationList(value)
+      })
+    }
+  }
+
+  getFilteredDesignationList(key?: string) {
+    if (key) {
+      this.filteredIgotDesignationsList = this.igotDesignationsList
+        .filter((designation: any) =>
+          designation.name.toLowerCase().includes(key.toLowerCase()))
+    } else {
+      this.filteredIgotDesignationsList = this.igotDesignationsList
+    }
+  }
+
+  selectDesignation(checked: Boolean, id: number) {
+    const index = this.igotDesignationsList.findIndex((e: any) => e.id === id)
+    const designation = this.igotDesignationsList[index]
+    if (checked) {
+      designation['selected'] = true
+      this.selectedDesignationsList.push(designation)
+      this.igotDesignationsList.splice(index, 1)
+      this.igotDesignationsList.unshift(designation)
+      this.getFilteredDesignationList(this.searchControl.value)
+    } else {
+      this.removeDesignation([designation])
+    }
+  }
+
+
+
+  get selctedDesignationsCount() {
+    return this.selectedDesignationsList.length
+  }
+
+  removeDesignation(designationToRemoveList: any[]) {
+    designationToRemoveList.forEach((designationToRemove: any) => {
+      this.selectedDesignationsList = this.selectedDesignationsList
+        .filter((selectedDesignation: any) => selectedDesignation.id !== designationToRemove.id)
+
+      const igotListIndex = this.igotDesignationsList
+        .findIndex((designation: any) => designation.id === designationToRemove.id)
+      if (igotListIndex >= 0) {
+        const designation = this.igotDesignationsList[igotListIndex]
+        designation['selected'] = false
+        this.igotDesignationsList.splice(igotListIndex, 1)
+        this.igotDesignationsList.splice(this.selctedDesignationsCount, 0, designation)
+      }
+    })
+    this.getFilteredDesignationList(this.searchControl.value)
+
+  }
+
+  openPreviewPoup() {
+    const dialogData = JSON.parse(JSON.stringify(this.selectedDesignationsList))
+    const dialogRef = this.dialog.open(SelectedDesignationPopupComponent, {
+      disableClose: true,
+      data: dialogData,
+      autoFocus: false,
+      width: '90%',
+    })
+    dialogRef.afterClosed().subscribe((res: any[]) => {
+      if (res && res.length > 0) {
+        this.selectedDesignationsList
+        this.removeDesignation(res)
+      }
+    })
+  }
+
+  onChangePage(pe: PageEvent) {
+    this.startIndex = pe.pageIndex * pe.pageSize
+    this.lastIndex = (pe.pageIndex + 1) * pe.pageSize
+  }
+
+  importDesignations() {
+    if (this.selctedDesignationsCount) {
+      const framework = 'organisation_fw'
+      const category = 'organisation_fw'
+      const importRequest: any = []
+      this.selectedDesignationsList((selectedDesignation: any) => {
+        const formBody = {
+          "request": {
+            "term": {
+              "name": selectedDesignation.name,
+              "code": selectedDesignation.name,
+              "refId": selectedDesignation.id,
+              "refType": "Testing Schema Update For Creating Term"
+            }
+          }
+        }
+        importRequest.push(this.designationsService.importDesigantion(framework, category, formBody))
+      })
+
+      forkJoin(importRequest).subscribe({
+        next: response => {
+          console.log(response)
+        },
+        error: (error: HttpErrorResponse) => {
+          const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
+          console.log(errorMessage)
+        }
+      })
+    }
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/designation.module.ts b/project/ws/app/src/lib/routes/home/routes/designation/designation.module.ts
new file mode 100644
index 000000000..9439b1eae
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/designation/designation.module.ts
@@ -0,0 +1,57 @@
+import { NgModule } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { RouterModule, Routes } from '@angular/router'
+import { DesignationsComponent } from './components/designations/designations.component'
+import { ImportDesignationComponent } from './components/import-designation/import-designation.component'
+import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { MatButtonModule, MatCardModule, MatCheckboxModule, MatDialogModule, MatIconModule, MatInputModule, MatPaginatorModule, MatProgressSpinnerModule, MatSelectModule, MatTableModule } from '@angular/material'
+import { UIORGTableModule } from '@sunbird-cb/collection'
+import { SelectedDesignationPopupComponent } from './dialog-boxes/selected-designation-popup/selected-designation-popup.component'
+import { ConformationPopupComponent } from './dialog-boxes/conformation-popup/conformation-popup.component'
+
+const routes: Routes = [
+  {
+    path: '',
+    pathMatch: 'full',
+    component: DesignationsComponent
+  },
+  {
+    path: 'import-designation',
+    pathMatch: 'full',
+    component: ImportDesignationComponent
+  },
+]
+
+@NgModule({
+  declarations: [
+    DesignationsComponent,
+    ImportDesignationComponent,
+    SelectedDesignationPopupComponent,
+    ConformationPopupComponent
+  ],
+  imports: [
+    CommonModule,
+    RouterModule.forChild(routes),
+    FormsModule,
+    MatIconModule,
+    MatCardModule,
+    MatCheckboxModule,
+    ReactiveFormsModule,
+    MatInputModule,
+    MatButtonModule,
+    MatProgressSpinnerModule,
+    MatSelectModule,
+    MatTableModule,
+    UIORGTableModule,
+    MatPaginatorModule,
+    MatDialogModule
+  ],
+  entryComponents: [
+    SelectedDesignationPopupComponent,
+    ConformationPopupComponent
+  ],
+  exports: [
+    RouterModule,
+  ]
+})
+export class DesignationModule { }
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.html b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.html
new file mode 100644
index 000000000..e785aa697
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.html
@@ -0,0 +1,9 @@
+<div class="w-full">
+  <div class="w-full conformation-popup flex justify-center items-center">
+    <span class="msgDescription">{{dialogData?.message}}</span>
+  </div>
+  <div class="w-full flex justify-end items-center gap-4">
+    <button mat-raised-button [mat-dialog-close]="true">Close</button>
+    <button mat-raised-button (click)="closePopup(true)" class="remove">Remove</button>
+  </div>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.scss b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.scss
new file mode 100644
index 000000000..271459bc6
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.scss
@@ -0,0 +1,14 @@
+.conformation-popup {
+  height: 300px;
+  max-height: 80vh;
+
+  .msgDescription {
+    font-size: 14px;
+  }
+
+}
+
+.remove {
+  background-color: red !important;
+  color: #ffffff !important;
+}
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.spec.ts b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.spec.ts
new file mode 100644
index 000000000..8b90741b0
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ConformationPopupComponent } from './conformation-popup.component';
+
+describe('ConformationPopupComponent', () => {
+  let component: ConformationPopupComponent;
+  let fixture: ComponentFixture<ConformationPopupComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ConformationPopupComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ConformationPopupComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.ts
new file mode 100644
index 000000000..b6beae61a
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.ts
@@ -0,0 +1,27 @@
+import { Component, Inject, OnInit } from '@angular/core'
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'
+
+@Component({
+  selector: 'ws-app-conformation-popup',
+  templateUrl: './conformation-popup.component.html',
+  styleUrls: ['./conformation-popup.component.scss']
+})
+export class ConformationPopupComponent implements OnInit {
+
+  dialogData: any
+
+  constructor(
+    private dialogRef: MatDialogRef<ConformationPopupComponent>,
+    @Inject(MAT_DIALOG_DATA) private data: any
+  ) {
+    this.dialogData = this.data
+  }
+
+  ngOnInit() {
+  }
+
+  closePopup(event: any) {
+    this.dialogRef.close(event)
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/selected-designation-popup/selected-designation-popup.component.html b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/selected-designation-popup/selected-designation-popup.component.html
new file mode 100644
index 000000000..22fd9ad46
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/selected-designation-popup/selected-designation-popup.component.html
@@ -0,0 +1,25 @@
+<div class="flex items-center">
+  <span class="designationHeader mt-3 mb-6">
+    Selected Designations ( {{selectedDesignationsList.length}} )</span>
+</div>
+
+<div class="w-full flex flex-4 flex-row flex-wrap gap-5">
+  <ng-container *ngFor="let designation of selectedDesignationsList | slice : startIndex : lastIndex; let i = index">
+    <div class="flex flex-4 custom-user-card items-center justify-center">
+      <div class="card-cross-icon">
+        <button mat-mini-fab class="card-cross-btn flex flex-middle flex-center" type="button"
+          (click)="removeSelectedDesignation(i)">
+          <mat-icon class="font-size-20">close</mat-icon>
+        </button>
+      </div>
+      <div class="custom-user-desc">
+        <p>{{designation?.name | titlecase}}</p>
+      </div>
+    </div>
+  </ng-container>
+</div>
+
+<div class="flex justify-end items-center gap-4 mt-4">
+  <button mat-raised-button class="close-btn" [mat-dialog-close]="true">Close</button>
+  <button mat-raised-button class="update-btn" (click)="updateList()">Update</button>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/selected-designation-popup/selected-designation-popup.component.scss b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/selected-designation-popup/selected-designation-popup.component.scss
new file mode 100644
index 000000000..e6ac7fe65
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/selected-designation-popup/selected-designation-popup.component.scss
@@ -0,0 +1,47 @@
+
+.designationHeader {
+  font: 600 16px / 24px Montserrat;
+}
+.custom-user-card {
+  width: 292px;
+  border: 1px solid #1B4CA1;
+  border-radius: 4px;
+  height: 70px;
+  display: flex;
+  padding: 0 16px;
+  width: 230px;
+  white-space: nowrap;
+  position: relative;
+  p {
+    padding: 0;
+    margin: 0;
+    width: 220px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .card-cross-icon {
+    position: absolute;
+    right: -12px;
+    top:-12px;
+  }
+
+  .card-cross-btn  {
+    background: white !important;
+    width: 35px !important;
+    height: 35px !important;
+  }
+}
+
+.close-btn {
+  color: #1b4ca1 !important;
+  border: 1px solid #1b4ca1;
+  width: 100px;
+
+}
+
+.update-btn {
+  background: #1b4ca1 !important;
+  color: white !important;
+  width: 100px;
+}
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/selected-designation-popup/selected-designation-popup.component.spec.ts b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/selected-designation-popup/selected-designation-popup.component.spec.ts
new file mode 100644
index 000000000..b811127f3
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/selected-designation-popup/selected-designation-popup.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { SelectedDesignationPopupComponent } from './selected-designation-popup.component';
+
+describe('SelectedDesignationPopupComponent', () => {
+  let component: SelectedDesignationPopupComponent;
+  let fixture: ComponentFixture<SelectedDesignationPopupComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ SelectedDesignationPopupComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SelectedDesignationPopupComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/selected-designation-popup/selected-designation-popup.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/selected-designation-popup/selected-designation-popup.component.ts
new file mode 100644
index 000000000..de1a479b9
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/selected-designation-popup/selected-designation-popup.component.ts
@@ -0,0 +1,33 @@
+import { Component, Inject, OnInit } from '@angular/core'
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'
+
+@Component({
+  selector: 'ws-app-selected-designation-popup',
+  templateUrl: './selected-designation-popup.component.html',
+  styleUrls: ['./selected-designation-popup.component.scss']
+})
+export class SelectedDesignationPopupComponent implements OnInit {
+
+  selectedDesignationsList: any[] = []
+  removedDesignationsList: any[] = []
+
+  constructor(
+    public dialogRef: MatDialogRef<SelectedDesignationPopupComponent>,
+    @Inject(MAT_DIALOG_DATA) private dialogData: any
+  ) {
+    this.selectedDesignationsList = this.dialogData
+  }
+
+  ngOnInit() {
+  }
+
+  removeSelectedDesignation(index: number) {
+    this.removedDesignationsList.push(this.selectedDesignationsList[index])
+    this.selectedDesignationsList.splice(index, 1)
+  }
+
+  updateList() {
+    this.dialogRef.close(this.removedDesignationsList)
+  }
+
+}
diff --git a/project/ws/app/src/lib/routes/home/services/odcs.service.spec.ts b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.spec.ts
similarity index 51%
rename from project/ws/app/src/lib/routes/home/services/odcs.service.spec.ts
rename to project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.spec.ts
index 30a532254..3ec2d72da 100644
--- a/project/ws/app/src/lib/routes/home/services/odcs.service.spec.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.spec.ts
@@ -1,12 +1,12 @@
 import { TestBed } from '@angular/core/testing';
 
-import { OdcsService } from './odcs.service';
+import { DesignationsService } from './designations.service';
 
-describe('OdcsService', () => {
+describe('DesignationsService', () => {
   beforeEach(() => TestBed.configureTestingModule({}));
 
   it('should be created', () => {
-    const service: OdcsService = TestBed.get(OdcsService);
+    const service: DesignationsService = TestBed.get(DesignationsService);
     expect(service).toBeTruthy();
   });
 });
diff --git a/project/ws/app/src/lib/routes/home/services/odcs.service.ts b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
similarity index 59%
rename from project/ws/app/src/lib/routes/home/services/odcs.service.ts
rename to project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
index 7422e7ac0..94396d99b 100644
--- a/project/ws/app/src/lib/routes/home/services/odcs.service.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
@@ -1,23 +1,51 @@
 import { HttpClient } from '@angular/common/http'
 import { Injectable } from '@angular/core'
-import { Observable } from 'rxjs'
-import { tap } from 'rxjs/operators'
+import { mergeMap, tap } from 'rxjs/operators'
+import { Observable, of } from 'rxjs'
 
 const API_END_POINTS = {
   ORGANISATION_FW: '/apis/proxies/v8/framework/v1/read/organisation_fw',
+  getDesignation: '/apis/proxies/v8/user/v1/positions',
+  importDesignation: 'api/framework/v1/term/create?'
 }
 
 @Injectable({
   providedIn: 'root'
 })
-export class OdcsService {
-
+export class DesignationsService {
   list = new Map<string, any>()
 
+  orgDesignationList: any = []
+
   constructor(
     private http: HttpClient
   ) { }
 
+  getDesignations(_req: any): Observable<any> {
+    return this.http.get<any>(API_END_POINTS.getDesignation).pipe(
+      mergeMap((result: any) => {
+        if (result && result.responseData) {
+          return this.formateMasterDesignationList(result.responseData)
+        }
+        return result
+      })
+    )
+  }
+
+  formateMasterDesignationList(designationsList: any): Observable<any> {
+    const formatedDesignationsLsit: any = []
+    if (designationsList) {
+      designationsList.forEach((masterDesignation: any) => {
+        masterDesignation['isOrgDesignation'] = this.orgDesignationList
+          .find((element: any) => element.name === masterDesignation.name) ? true : false
+        masterDesignation['selected'] = masterDesignation['isOrgDesignation']
+        formatedDesignationsLsit.push(masterDesignation)
+      })
+    }
+
+    return of(formatedDesignationsLsit)
+  }
+
   getFrameworkInfo(): Observable<any> {
     return this.http.get(`${API_END_POINTS.ORGANISATION_FW}`, { withCredentials: true }).pipe(
       tap((response: any) => {
@@ -77,4 +105,8 @@ export class OdcsService {
   //   }
   //   return categoryConfig
   // }
+
+  importDesigantion(framework: string, category: string, reqBody: any): Observable<any> {
+    return this.http.post<any>(`${API_END_POINTS.importDesignation}framework=${framework}&category=${category}`, reqBody)
+  }
 }
diff --git a/project/ws/app/src/lib/routes/home/routes/designations/designations.component.ts b/project/ws/app/src/lib/routes/home/routes/designations/designations.component.ts
deleted file mode 100644
index 077c2757f..000000000
--- a/project/ws/app/src/lib/routes/home/routes/designations/designations.component.ts
+++ /dev/null
@@ -1,140 +0,0 @@
-import { Component, OnInit } from '@angular/core'
-import { OdcsService } from '../../services/odcs.service'
-import * as _ from 'lodash'
-import { ITableData } from '@sunbird-cb/collection/lib/ui-org-table/interface/interfaces'
-
-@Component({
-  selector: 'ws-app-designations',
-  templateUrl: './designations.component.html',
-  styleUrls: ['./designations.component.scss']
-})
-export class DesignationsComponent implements OnInit {
-
-  frameworkDetails: any = {}
-  organisationsList: any = []
-  selectedOrganisation: string = ''
-  designationsList: any = []
-  tableData!: ITableData
-  showLoader: boolean = true
-  actionMenuItem: {
-    name: string,
-    icon: string,
-    key: string,
-    isMdoLeader: boolean
-  }[] = []
-
-  constructor(
-    private odcsService: OdcsService,
-  ) { }
-
-  ngOnInit() {
-    this.initialization()
-  }
-
-  //#region (intial actions)
-  initialization() {
-    this.initializeDefaultValues()
-    this.getFrameworkInfo()
-  }
-
-  initializeDefaultValues() {
-    this.actionMenuItem = [
-      {
-        name: 'Edit',
-        icon: 'edit',
-        key: 'edit',
-        isMdoLeader: true //ws-widget-org-user-table library has conditions
-      },
-      {
-        name: 'View',
-        icon: 'remove_red_eye',
-        key: 'view',
-        isMdoLeader: true
-      }
-    ]
-
-    this.tableData = {
-      columns: [
-        { displayName: 'Designation', key: 'name' },
-        { displayName: 'Description', key: 'description' },
-      ],
-      needCheckBox: false,
-      needHash: false,
-      needUserMenus: false,
-      actions: [],
-      actionColumnName: 'Action',
-      cbpPlanMenu: true,
-    }
-  }
-
-  getFrameworkInfo() {
-    this.showLoader = true
-    this.odcsService.getFrameworkInfo().subscribe(res => {
-      this.showLoader = false
-      this.frameworkDetails = _.get(res, 'result.framework')
-      this.getOrganisations()
-      console.log('frame work: ', this.frameworkDetails)
-    })
-  }
-
-  getOrganisations() {
-    this.organisationsList = this.getTermsOfCategorie('organisation_fw_org')
-    this.selectedOrganisation = _.get(this.organisationsList, '[0].identifier', '')
-    this.getDesignations()
-  }
-
-  getDesignations() {
-    this.designationsList = this.getTermsOfCategorie('organisation_fw_designation')
-  }
-
-  // to get list from categories like designations, organisations
-  getTermsOfCategorie(catagoriIdentifier: string) {
-    const selectedCatagori = this.categoriesOfFramework.filter((catagori: any) => catagori.identifier === catagoriIdentifier)
-    return _.get(selectedCatagori, '[0].terms', [])
-  }
-
-  // to get different categories list
-  get categoriesOfFramework() {
-    return _.get(this.frameworkDetails, 'categories', [])
-  }
-
-  //#endregion
-
-  //#region (ui interactions like click)
-
-  openDesignationCreatPopup(event?: any) {
-    console.log('event', event)
-    const dialogData = {
-      mode: 'create',
-      columnInfo: {
-        code: 'designation',
-        name: 'Designation',
-        children: this.designationsList,
-      },
-      frameworkId: 'organisation_fw',
-      selectedDesignation: null
-    }
-    if (event && event.action) {
-      dialogData.mode = event.action
-      dialogData.selectedDesignation = event.row
-    }
-  }
-
-  upload() { }
-
-  menuSelected(event: any) {
-    switch (event.action) {
-      case 'edit':
-        this.openDesignationCreatPopup(event)
-        break
-      case 'view':
-        this.openDesignationCreatPopup(event)
-        break
-    }
-  }
-
-  //#endregion
-
-
-
-}

From 11ae3312469f669108815ca4e0f1bf6cbe0c5b52 Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Mon, 15 Jul 2024 13:48:34 +0530
Subject: [PATCH 773/887] Task #0000: initial setup of odcs integration

---
 angular.json                                  |   4 +-
 package.json                                  |   7 +-
 .../head/left-menu/left-menu.component.scss   |   2 +-
 .../ws/app/src/lib/routes/home/home.module.ts |   9 +-
 .../lib/routes/home/home.rounting.module.ts   |  16 +-
 .../designations/designations.component.ts    |  12 +-
 .../odcs-mapping/odcs-mapping.component.html  |  39 +++++
 .../odcs-mapping/odcs-mapping.component.scss  |   3 +
 .../odcs-mapping.component.spec.ts            |  25 +++
 .../odcs-mapping/odcs-mapping.component.ts    | 158 ++++++++++++++++++
 .../lib/routes/home/services/odcs.service.ts  |  84 ++++------
 src/app/app.module.ts                         |   1 +
 src/app/services/init.service.ts              |  60 +++++++
 src/environments/environment.bm.ts            |   3 +
 src/environments/environment.dev.ts           |   3 +
 src/environments/environment.np.ts            |   3 +
 src/environments/environment.preprod.ts       |   3 +
 src/environments/environment.prod.ts          |   3 +
 src/environments/environment.ts               |   6 +
 src/styles/styles.scss                        |   4 +
 20 files changed, 376 insertions(+), 69 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.html
 create mode 100644 project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.scss
 create mode 100644 project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts

diff --git a/angular.json b/angular.json
index 8c05c3685..8e2024bdd 100644
--- a/angular.json
+++ b/angular.json
@@ -17,6 +17,7 @@
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
+            "preserveSymlinks": true,
             "assets": [
               "src/favicon.png",
               "src/mdo-assets/icons/",
@@ -88,7 +89,8 @@
             "scripts": [
               "node_modules/jquery/dist/jquery.min.js",
               "node_modules/@project-sunbird/telemetry-sdk/index.js",
-              "node_modules/shepherd.js/dist/js/shepherd.min.js"
+              "node_modules/shepherd.js/dist/js/shepherd.min.js",
+              "node_modules/leader-line/leader-line.min.js"
             ]
           },
           "configurations": {
diff --git a/package.json b/package.json
index becd6f681..f7c07ec68 100644
--- a/package.json
+++ b/package.json
@@ -44,11 +44,11 @@
     "@project-sunbird/telemetry-sdk": "0.0.26",
     "@sunbird-cb/collection": "^1.0.44",
     "@sunbird-cb/design-system": "0.0.1",
+    "@sunbird-cb/micro-surveys": "2.0.13",
     "@sunbird-cb/rain-dashboards": "0.4.33",
     "@sunbird-cb/resolver": "^1.0.0",
-    "@sunbird-cb/utils": "^1.0.17",
+    "@sunbird-cb/utils": "^1.0.18",
     "@types/file-saver": "^2.0.1",
-    "@sunbird-cb/micro-surveys": "2.0.13",
     "brace": "^0.11.1",
     "chart.js": "^2.8.0",
     "d3": "^5.9.7",
@@ -60,6 +60,7 @@
     "jspdf": "^2.3.1",
     "jsplumb": "2.11.2",
     "keycloak-angular": "^6.1.0",
+    "leader-line": "1.0.7",
     "lodash": "4.17.21",
     "material-icons": "^0.7.1",
     "moment": "^2.29.1",
@@ -118,6 +119,7 @@
     "@types/zip.js": "2.0.28",
     "angular-cli-alias": "^1.0.9",
     "codelyzer": "^5.1.0",
+    "d3-funnel": "^2.1.1",
     "gzipper": "^2.8.1",
     "jasmine-core": "~3.4.0",
     "jasmine-spec-reporter": "~4.2.1",
@@ -135,7 +137,6 @@
     "tslint-config-airbnb": "^5.11.1",
     "typescript": "~3.5.3",
     "typescript-tslint-plugin": "^0.5.4",
-    "d3-funnel": "^2.1.1",
     "webpack-bundle-analyzer": "^4.4.0"
   }
 }
diff --git a/project/ws/app/src/lib/head/left-menu/left-menu.component.scss b/project/ws/app/src/lib/head/left-menu/left-menu.component.scss
index 3c3c89ef4..7e1095375 100644
--- a/project/ws/app/src/lib/head/left-menu/left-menu.component.scss
+++ b/project/ws/app/src/lib/head/left-menu/left-menu.component.scss
@@ -11,7 +11,7 @@
 }
 
 ::ng-deep .mat-drawer-container {
-  z-index: 999;
+  // z-index: 999;
 }
 
 .sidenav-wrap {
diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index 007e39ec8..cec96bdb8 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -1,4 +1,4 @@
-import { NgModule } from '@angular/core'
+import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'
 import { CommonModule } from '@angular/common'
 import { PipeDurationTransformModule, PipeFilterModule, PipeHtmlTagRemovalModule, PipeOrderByModule, PipeRelativeTimeModule } from '@sunbird-cb/utils'
 import { MatGridListModule } from '@angular/material/grid-list'
@@ -85,6 +85,8 @@ import { DesignationsComponent } from './routes/designations/designations.compon
 import { OdcsService } from './services/odcs.service'
 import { TaxonomyEditorModule } from '@sunbird-cb/taxonomy-editor'
 import { HttpClientModule } from '@angular/common/http'
+import { OdcsMappingComponent } from './routes/odcs-mapping/odcs-mapping.component'
+import { environment } from '../../../../../../../src/environments/environment'
 
 @NgModule({
   declarations: [
@@ -131,6 +133,7 @@ import { HttpClientModule } from '@angular/common/http'
     AssignListPopupComponent,
     SingleAssignPopupComponent,
     DesignationsComponent,
+    OdcsMappingComponent,
   ],
   imports: [
     CommonModule,
@@ -187,7 +190,7 @@ import { HttpClientModule } from '@angular/common/http'
     MatAutocompleteModule,
     MatSlideToggleModule,
     TaxonomyEditorModule,
-    HttpClientModule
+    HttpClientModule,
   ],
   entryComponents: [
     AdduserpopupComponent,
@@ -206,6 +209,7 @@ import { HttpClientModule } from '@angular/common/http'
     SingleAssignPopupComponent,
   ],
   providers: [
+    { provide: 'environment', useValue: environment },
     {
       provide: MatDialogRef,
       useValue: {}
@@ -218,6 +222,7 @@ import { HttpClientModule } from '@angular/common/http'
     UsersService,
     OdcsService,
   ],
+  schemas: [CUSTOM_ELEMENTS_SCHEMA],
 })
 export class HomeModule {
 
diff --git a/project/ws/app/src/lib/routes/home/home.rounting.module.ts b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
index c5d81dee2..874c198c8 100644
--- a/project/ws/app/src/lib/routes/home/home.rounting.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
@@ -28,6 +28,7 @@ import { BulkUploadApprovalComponent } from './routes/approvals/bulk-upload/bulk
 import { RequestListComponent } from './components/request-list/request-list.component'
 import { CreateRequestFormComponent } from './components/request-list/create-request-form/create-request-form.component'
 import { DesignationsComponent } from './routes/designations/designations.component'
+import { OdcsMappingComponent } from './routes/odcs-mapping/odcs-mapping.component'
 
 const routes: Routes = [
   {
@@ -352,7 +353,20 @@ const routes: Routes = [
           pageData: PageResolve,
         },
       },
-
+      {
+        path: 'odcs-mapping',
+        component: OdcsMappingComponent,
+        data: {
+          pageId: 'home/odcs-mapping',
+          module: 'odcs-mapping',
+          pageType: 'feature',
+          pageKey: 'odcs',
+        },
+        resolve: {
+          configService: ConfigResolveService,
+          pageData: PageResolve,
+        },
+      },
     ],
   },
   {
diff --git a/project/ws/app/src/lib/routes/home/routes/designations/designations.component.ts b/project/ws/app/src/lib/routes/home/routes/designations/designations.component.ts
index 077c2757f..90cdaab9c 100644
--- a/project/ws/app/src/lib/routes/home/routes/designations/designations.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designations/designations.component.ts
@@ -69,12 +69,12 @@ export class DesignationsComponent implements OnInit {
 
   getFrameworkInfo() {
     this.showLoader = true
-    this.odcsService.getFrameworkInfo().subscribe(res => {
-      this.showLoader = false
-      this.frameworkDetails = _.get(res, 'result.framework')
-      this.getOrganisations()
-      console.log('frame work: ', this.frameworkDetails)
-    })
+    // this.odcsService.getFrameworkInfo().subscribe(res => {
+    //   this.showLoader = false
+    //   this.frameworkDetails = _.get(res, 'result.framework')
+    //   this.getOrganisations()
+    //   console.log('frame work: ', this.frameworkDetails)
+    // })
   }
 
   getOrganisations() {
diff --git a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.html b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.html
new file mode 100644
index 000000000..5cfc613fe
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.html
@@ -0,0 +1,39 @@
+<ng-container *ngIf="showLoader">
+  <div class="flex flex-col flex-1 w-100 items-center pt-5 text-center">
+    <mat-spinner class="display-inline-block mb-5" [diameter]="50" [strokeWidth]="3"></mat-spinner>
+    <p>{{loaderMsg}}</p>
+  </div>
+</ng-container>
+<ng-container *ngIf="!showLoader">
+  <div class="flex flex-col gap-4">
+    <h1 class="mat-heading-1">{{odcConfig?.mainHeading}}</h1>
+    <mat-card class="mb-4" [ngStyle]="{'background-color': showTopSection ? '#fff' : 'rgba(235, 235, 235, 1)'}">
+      <div class="flex">
+        <span class="mat-body-1 font-bold-imp flex-1">{{odcConfig?.topsection?.heading}}</span>
+        <mat-icon class="cursor-pointer mat-icon mr-4" *ngIf="showTopSection"
+          (click)="showTopSection = !showTopSection">keyboard_arrow_up</mat-icon>
+        <mat-icon class="cursor-pointer mat-icon mr-4" *ngIf="!showTopSection"
+          (click)="showTopSection = !showTopSection">keyboard_arrow_down</mat-icon>
+      </div>
+      <div class="mt-5" *ngIf="showTopSection">
+        <div class="flex">
+          <div class="flex-1 flex-col gap-4">
+            <p class="flex items-center" *ngFor="let step of odcConfig?.topsection?.steps">
+              <mat-icon class="mat-icon mr-4">error_outline</mat-icon>
+              {{step.title}}
+            </p>
+          </div>
+          <div *ngIf="odcConfig?.topsection?.guideVideo?.enabled">
+            <video width="173" height="102" controls>
+              <source src="{{odcConfig?.topsection?.guideVideo?.url}}"
+                type="{{odcConfig?.topsection?.guideVideo?.type}}">
+            </video>
+          </div>
+        </div>
+      </div>
+    </mat-card>
+    <div>
+      <lib-taxonomy-view [environment]="environmentVal" [taxonomyConfig]="taxonomyConfig"></lib-taxonomy-view>
+    </div>
+  </div>
+</ng-container>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.scss b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.scss
new file mode 100644
index 000000000..dc6d9444d
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.scss
@@ -0,0 +1,3 @@
+.font-bold-imp{
+  font-weight: 700 !important;
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.spec.ts b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.spec.ts
new file mode 100644
index 000000000..2ee2b60b6
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { OdcsMappingComponent } from './odcs-mapping.component';
+
+describe('OdcsMappingComponent', () => {
+  let component: OdcsMappingComponent;
+  let fixture: ComponentFixture<OdcsMappingComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ OdcsMappingComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(OdcsMappingComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
new file mode 100644
index 000000000..66d729450
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
@@ -0,0 +1,158 @@
+import { Component, OnInit } from '@angular/core'
+import { environment } from '../../../../../../../../../src/environments/environment'
+import { ActivatedRoute } from '@angular/router'
+import { OdcsService } from '../../services/odcs.service'
+
+@Component({
+  selector: 'ws-app-odcs-mapping',
+  templateUrl: './odcs-mapping.component.html',
+  styleUrls: ['./odcs-mapping.component.scss']
+})
+export class OdcsMappingComponent implements OnInit {
+  environmentVal: any
+  taxonomyConfig: any
+  showTopSection = true
+  odcConfig: any
+  configSvc: any
+  showLoader = false
+  loaderMsg = ''
+
+  constructor(
+    private activateRoute: ActivatedRoute,
+    private odcsSvc: OdcsService
+  ) { }
+
+  ngOnInit() {
+    this.environmentVal = environment
+    this.activateRoute.data.subscribe(data => {
+      this.odcConfig = data.pageData.data
+      this.taxonomyConfig = this.odcConfig.frameworkConfig
+    })
+
+    // to check whether organisation is already having fraworkid or we have initiate the process
+    this.configSvc = this.activateRoute.snapshot.data['configService']
+    console.log('this.configSvc', this.configSvc.orgReadData)
+    if (this.configSvc.orgReadData && this.configSvc.orgReadData.frameworkid) {
+      this.environmentVal.frameworkName = this.configSvc.orgReadData.frameworkid
+    } else {
+      this.showLoader = true
+      this.loaderMsg = this.odcConfig.frameworkCreationMSg
+      // this.initFramworkCreation()
+      this.environmentVal.frameworkName = '1231231231_organisation_fw'
+    }
+  }
+
+  // async initFramworkCreation() {
+  //   try {
+  //     await this.copyFrameworkCreate()
+  //     await this.createOrgTerm()
+  //     await this.publishFramework()
+  //     await this.updateOrg()
+  //     this.environmentVal.frameworkName = `designation_${this.configSvc.orgReadData.id}_fw`
+  //     this.configSvc.updateOrgReadData(this.configSvc.orgReadData.id)
+  //   } catch (error) {
+  //     console.error('Error in executing Framwork Creation process:', error)
+  //   }
+  // }
+
+
+  // copyFrameworkCreate() {
+  //   return new Promise((resolve, reject) => {
+  //     console.log('configSvc', this.configSvc.orgReadData)
+  //     const req = {
+  //       request:
+  //       {
+  //         framework:
+  //         {
+  //           name: `designation_${this.configSvc.orgReadData.id} fw`,
+  //           description: `designation framework for ${this.configSvc.orgReadData.orgName}`,
+  //           code: `designation_${this.configSvc.orgReadData.id}_fw`,
+  //           owner: this.configSvc.orgReadData.id,
+  //           type: 'k-12'
+  //         }
+  //       }
+  //     }
+  //     console.log('req ::', req)
+
+  //     this.odcsSvc.copyFramework(req).subscribe(
+  //       (res) => {
+  //         console.log('Copy Framework result:', res)
+  //         this.loaderMsg = 'Designation framework created successfully!'
+  //         resolve(res)
+  //       },
+  //       (err) => {
+  //         console.error('Copy Framework error:', err)
+  //         reject(err)
+  //       }
+  //     )
+  //   })
+  // }
+
+  // createOrgTerm() {
+  //   this.loaderMsg = 'Creating the org'
+  //   return new Promise((resolve, reject) => {
+  //     const term: any = {
+  //       code: this.odcsSvc.getUuid(),
+  //       name: `${this.configSvc.orgReadData.orgName}`,
+  //       description: ``,
+  //       category: 'organisation',
+  //       status: 'live',
+  //       additionalProperties: {}
+  //     }
+  //     const requestBody = {
+  //       request: {
+  //         term: term
+  //       }
+  //     }
+  //     const frameworkId = `designation_${this.configSvc.orgReadData.id}_fw`
+  //     this.odcsSvc.createTerm(frameworkId, 'organisation', requestBody).subscribe(
+  //       (res: any) => {
+  //         console.log('createTerm result:', res)
+  //         resolve(res)
+  //       },
+  //       (err) => {
+  //         console.error('createTerm error:', err)
+  //         reject(err)
+  //       }
+  //     )
+  //   })
+  // }
+
+  // publishFramework() {
+  //   return new Promise((resolve, reject) => {
+  //     const framework = `designation_${this.configSvc.orgReadData.id}_fw`
+  //     this.odcsSvc.publishFramework(framework).subscribe(
+  //       (res) => {
+  //         console.log('publishFramework result:', res)
+  //         resolve(res)
+  //       },
+  //       (err) => {
+  //         console.error('publishFramework error:', err)
+  //         reject(err)
+  //       }
+  //     )
+  //   })
+  // }
+
+  // updateOrg() {
+  //   return new Promise((resolve, reject) => {
+  //     const framework = `designation_${this.configSvc.orgReadData.id}_fw`
+  //     const req = {
+  //       request: {
+  //         framworkid: framework
+  //       }
+  //     }
+  //     this.odcsSvc.updateOrg(req).subscribe(
+  //       (res) => {
+  //         console.log('publishFramework result:', res)
+  //         resolve(res)
+  //       },
+  //       (err) => {
+  //         console.error('publishFramework error:', err)
+  //         reject(err)
+  //       }
+  //     )
+  //   })
+  // }
+
+}
diff --git a/project/ws/app/src/lib/routes/home/services/odcs.service.ts b/project/ws/app/src/lib/routes/home/services/odcs.service.ts
index 7422e7ac0..4b1aa8e32 100644
--- a/project/ws/app/src/lib/routes/home/services/odcs.service.ts
+++ b/project/ws/app/src/lib/routes/home/services/odcs.service.ts
@@ -1,10 +1,20 @@
 import { HttpClient } from '@angular/common/http'
 import { Injectable } from '@angular/core'
 import { Observable } from 'rxjs'
-import { tap } from 'rxjs/operators'
+import { map } from 'rxjs/operators'
+import { v4 as uuidv4 } from 'uuid'
+// tslint:disable
+import _ from 'lodash'
+import { environment } from '../../../../../../../../src/environments/environment'
+/* tslint:enable */
 
 const API_END_POINTS = {
-  ORGANISATION_FW: '/apis/proxies/v8/framework/v1/read/organisation_fw',
+  COPY_FRAMEWORK: `/api/framework/v1/copy/${environment.ODCSMasterFramework}`,
+  CREATE_TERM: (frameworkId: string, categoryId: string) =>
+    `apis/proxies/v8/framework/v1/term/create?framework=${frameworkId}&category=${categoryId}`,
+  PUBLISH_FRAMEWORK: (frameworkName: string) =>
+    `apis/proxies/v8/framework/v1/publish/${frameworkName}`,
+  UPDATE_ORG: '/apis/proxies/v8/org/v1/update'
 }
 
 @Injectable({
@@ -18,63 +28,27 @@ export class OdcsService {
     private http: HttpClient
   ) { }
 
-  getFrameworkInfo(): Observable<any> {
-    return this.http.get(`${API_END_POINTS.ORGANISATION_FW}`, { withCredentials: true }).pipe(
-      tap((response: any) => {
-        this.formateData(response)
-      }),
-    )
+  getUuid() {
+    return uuidv4()
   }
 
-  formateData(response: any) {
-    (response.result.framework.categories).forEach((a: any) => {
-      this.list.set(a.code, {
-        code: a.code,
-        identifier: a.identifier,
-        index: a.index,
-        name: a.name,
-        selected: a.selected,
-        status: a.status,
-        description: a.description,
-        translations: a.translations,
-        category: a.category,
-        associations: a.associations,
-        // config: this.getConfig(a.code),
-        children: (a.terms || []).map((c: any) => {
-          const associations = c.associations || []
-          if (associations.length > 0) {
-            Object.assign(c, { children: associations })
-          }
-          return c
-        })
-      })
-    })
+  copyFramework(request: any): Observable<any> {
+    return this.http.post<any>(`${API_END_POINTS.COPY_FRAMEWORK}`, request).pipe(map(res => _.get(res, 'result.response')))
+  }
+
+  createTerm(frameworkId: string, categoryId: string, requestBody: any) {
+    return this.http.post(`${API_END_POINTS.CREATE_TERM(
+      frameworkId,
+      categoryId,
+    )}`, requestBody)
+  }
 
-    const allCategories: any = []
-    this.list.forEach((a: any) => {
-      allCategories.push({
-        code: a.code,
-        identifier: a.identifier,
-        index: a.index,
-        name: a.name,
-        status: a.status,
-        description: a.description,
-        translations: a.translations,
-      })
-    })
-    // this.categoriesHash.next(allCategories)
+  publishFramework(frameworkName: string) {
+    return this.http.post(`${API_END_POINTS.PUBLISH_FRAMEWORK(frameworkName)}`, {})
+  }
 
+  updateOrg(request: any) {
+    return this.http.patch(`${API_END_POINTS.UPDATE_ORG}`, request)
   }
 
-  // getConfig(code: string) {
-  //   let categoryConfig: any
-  //   if (this.rootConfig && this.rootConfig[0]) {
-  //     this.rootConfig.forEach((config: any, index: number) => {
-  //       if (this.frameworkId == config.frameworkId) {
-  //         categoryConfig = config.config.find((obj: any) => obj.category == code)
-  //       }
-  //     })
-  //   }
-  //   return categoryConfig
-  // }
 }
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 2688fd6df..201538852 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -157,6 +157,7 @@ const getBaseHref = (platformLocation: PlatformLocation): string => {
     ConfirmationBoxComponent,
   ],
   providers: [
+    { provide: 'environment', useValue: environment },
     {
       deps: [InitService, LoggerService],
       multi: true,
diff --git a/src/app/services/init.service.ts b/src/app/services/init.service.ts
index fa3c691b4..4e3abd4a8 100644
--- a/src/app/services/init.service.ts
+++ b/src/app/services/init.service.ts
@@ -26,6 +26,7 @@ import { environment } from '../../environments/environment'
 /* tslint:disable*/
 import _ from 'lodash'
 import { v4 as uuid } from 'uuid'
+import { Subscription } from 'rxjs'
 /* tslint:enable*/
 // interface IDetailsResponse {
 //   tncStatus: boolean
@@ -40,6 +41,7 @@ interface IFeaturePermissionConfigs {
 
 const endpoint = {
   profilePid: '/apis/proxies/v8/api/user/v2/read',
+  orgRead: '/apis/proxies/v8/org/v1/read',
   // profileV2: '/apis/protected/v8/user/profileRegistry/getUserRegistryById',
   // details: `/apis/protected/v8/user/details?ts=${Date.now()}`,
   orgProfile: (orgId: string) => `/apis/proxies/v8/org/v1/profile/read?orgId=${orgId}`,
@@ -50,6 +52,7 @@ const endpoint = {
 })
 export class InitService {
   private baseUrl = this.configSvc.baseUrl
+  updateOrgReadDataSubscription: Subscription | null = null
   constructor(
     private logger: LoggerService,
     private configSvc: ConfigurationsService,
@@ -178,6 +181,16 @@ export class InitService {
       this.settingsSvc.initializePrefChanges(environment.production)
     }
     this.updateNavConfig()
+
+    if (this.updateOrgReadDataSubscription) {
+      this.updateOrgReadDataSubscription.unsubscribe()
+    }
+    // to update the profile from user read api
+    this.updateOrgReadDataSubscription = this.configSvc.updateOrgReadDataObservable.subscribe(async (value: string) => {
+      if (value) {
+        await this.fetchOrgReadDataCopy(value)
+      }
+    })
     // await this.widgetContentSvc
     //   .setS3ImageCookie()
     //   .toPromise()
@@ -330,6 +343,11 @@ export class InitService {
           }
           localStorage.setItem('login', 'true')
 
+          // get orgReadData from logged in users organisation
+          if (completeProdata.organisations && completeProdata.organisations.length) {
+            this.fetchOrgReadData(completeProdata)
+          }
+
         } else {
           // this.authSvc.force_logout()
           // await this.http.get('/apis/reset').toPromise()
@@ -424,6 +442,48 @@ export class InitService {
   //   // return details
   // }
 
+  async fetchOrgReadData(completeProdata: any) {
+    const request = {
+      "request": {
+        "organisationId": completeProdata.organisations[0].organisationId
+      }
+    }
+    let orgReadData: any | null = null
+    orgReadData = await this.http
+      .post<any>(endpoint.orgRead, request)
+      .pipe(map((res: any) => {
+        // const roles = _.map(_.get(res, 'result.response.roles'), 'role')
+        // _.set(res, 'result.response.roles', roles)
+        return _.get(res, 'result.response')
+      }))
+      .toPromise()
+    if (orgReadData) {
+      this.configSvc.orgReadData = orgReadData
+    }
+  }
+
+  async fetchOrgReadDataCopy(id: string) {
+    if (id) {
+      const request = {
+        "request": {
+          "organisationId": id
+        }
+      }
+      let orgReadData: any | null = null
+      orgReadData = await this.http
+        .post<any>(endpoint.orgRead, request)
+        .pipe(map((res: any) => {
+          // const roles = _.map(_.get(res, 'result.response.roles'), 'role')
+          // _.set(res, 'result.response.roles', roles)
+          return _.get(res, 'result.response')
+        }))
+        .toPromise()
+      if (orgReadData) {
+        this.configSvc.orgReadData = orgReadData
+      }
+    }
+  }
+
   private async fetchInstanceConfig(): Promise<NsInstanceConfig.IConfig> {
     // TODO: use the rootOrg and org to fetch the instance
     const publicConfig = await this.http
diff --git a/src/environments/environment.bm.ts b/src/environments/environment.bm.ts
index ce1fc1e8f..9000b46ad 100644
--- a/src/environments/environment.bm.ts
+++ b/src/environments/environment.bm.ts
@@ -12,4 +12,7 @@ export const environment = {
   mdoPath: (window as { [key: string]: any })['env']['mdoPath'] || '',
   resendOTPTIme: (window as { [key: string]: any })['env']['resendOTPTIme'] || 120,
   teamsUrl: (window as { [key: string]: any })['env']['teamsUrl'] || '',
+  connectionType: (window as { [key: string]: any })['env']['connectionType'] || '',
+  KCMframeworkName: (window as { [key: string]: any })['env']['KCMframeworkName'] || '',
+  ODCSMasterFramework: (window as { [key: string]: any })['env']['ODCSMasterFramework'] || '',
 }
diff --git a/src/environments/environment.dev.ts b/src/environments/environment.dev.ts
index 007a7e6ee..67343fa39 100644
--- a/src/environments/environment.dev.ts
+++ b/src/environments/environment.dev.ts
@@ -12,4 +12,7 @@ export const environment = {
   mdoPath: (window as { [key: string]: any })['env']['mdoPath'] || '',
   resendOTPTIme: (window as { [key: string]: any })['env']['resendOTPTIme'] || 120,
   teamsUrl: (window as { [key: string]: any })['env']['teamsUrl'] || '',
+  connectionType: (window as { [key: string]: any })['env']['connectionType'] || '',
+  KCMframeworkName: (window as { [key: string]: any })['env']['KCMframeworkName'] || '',
+  ODCSMasterFramework: (window as { [key: string]: any })['env']['ODCSMasterFramework'] || '',
 }
diff --git a/src/environments/environment.np.ts b/src/environments/environment.np.ts
index 54c86578a..23956d58d 100644
--- a/src/environments/environment.np.ts
+++ b/src/environments/environment.np.ts
@@ -12,4 +12,7 @@ export const environment = {
   mdoPath: (window as { [key: string]: any })['env']['mdoPath'] || '',
   resendOTPTIme: (window as { [key: string]: any })['env']['resendOTPTIme'] || 120,
   teamsUrl: (window as { [key: string]: any })['env']['teamsUrl'] || '',
+  connectionType: (window as { [key: string]: any })['env']['connectionType'] || '',
+  KCMframeworkName: (window as { [key: string]: any })['env']['KCMframeworkName'] || '',
+  ODCSMasterFramework: (window as { [key: string]: any })['env']['ODCSMasterFramework'] || '',
 }
diff --git a/src/environments/environment.preprod.ts b/src/environments/environment.preprod.ts
index 007a7e6ee..67343fa39 100644
--- a/src/environments/environment.preprod.ts
+++ b/src/environments/environment.preprod.ts
@@ -12,4 +12,7 @@ export const environment = {
   mdoPath: (window as { [key: string]: any })['env']['mdoPath'] || '',
   resendOTPTIme: (window as { [key: string]: any })['env']['resendOTPTIme'] || 120,
   teamsUrl: (window as { [key: string]: any })['env']['teamsUrl'] || '',
+  connectionType: (window as { [key: string]: any })['env']['connectionType'] || '',
+  KCMframeworkName: (window as { [key: string]: any })['env']['KCMframeworkName'] || '',
+  ODCSMasterFramework: (window as { [key: string]: any })['env']['ODCSMasterFramework'] || '',
 }
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 007a7e6ee..67343fa39 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -12,4 +12,7 @@ export const environment = {
   mdoPath: (window as { [key: string]: any })['env']['mdoPath'] || '',
   resendOTPTIme: (window as { [key: string]: any })['env']['resendOTPTIme'] || 120,
   teamsUrl: (window as { [key: string]: any })['env']['teamsUrl'] || '',
+  connectionType: (window as { [key: string]: any })['env']['connectionType'] || '',
+  KCMframeworkName: (window as { [key: string]: any })['env']['KCMframeworkName'] || '',
+  ODCSMasterFramework: (window as { [key: string]: any })['env']['ODCSMasterFramework'] || '',
 }
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 43b7832dd..67c3b8de9 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -16,6 +16,9 @@ export const environment: IEnvironment = {
   mdoPath: (window as { [key: string]: any })['env']['mdoPath'] || '',
   resendOTPTIme: (window as { [key: string]: any })['env']['resendOTPTIme'] || 120,
   teamsUrl: (window as { [key: string]: any })['env']['teamsUrl'] || '',
+  connectionType: (window as { [key: string]: any })['env']['connectionType'] || '',
+  KCMframeworkName: (window as { [key: string]: any })['env']['KCMframeworkName'] || '',
+  ODCSMasterFramework: (window as { [key: string]: any })['env']['ODCSMasterFramework'] || '',
 }
 interface IEnvironment {
   name: null | string
@@ -31,6 +34,9 @@ interface IEnvironment {
   mdoPath: string,
   resendOTPTIme: number,
   teamsUrl?: string,
+  connectionType?: string,
+  KCMframeworkName?: string,
+  ODCSMasterFramework?: string
 }
 
 /*
diff --git a/src/styles/styles.scss b/src/styles/styles.scss
index f6475ba48..2ce3393e3 100644
--- a/src/styles/styles.scss
+++ b/src/styles/styles.scss
@@ -662,3 +662,7 @@ h3.shepherd-title {
   max-width: 500px;
   padding: 16px;
 }
+
+.leader-line {
+    z-index: 20;
+}

From febc03edaf6b063e7456a12f2f783db949dc2278 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Wed, 17 Jul 2024 15:54:21 +0530
Subject: [PATCH 774/887] wip designation api integrations

---
 .../ws/app/src/lib/routes/home/home.module.ts |   2 -
 .../designations/designations.component.html  |  84 ++---
 .../designations/designations.component.scss  |   8 +
 .../designations/designations.component.ts    |  72 ++++-
 .../import-designation.component.html         | 120 ++++----
 .../import-designation.component.scss         |   5 +
 .../import-designation.component.ts           | 290 +++++++++++++++---
 .../routes/designation/designation.module.ts  |  32 +-
 .../conformation-popup.component.html         |  37 ++-
 .../conformation-popup.component.scss         |  98 +++++-
 .../conformation-popup.component.ts           |   4 +-
 .../selected-designation-popup.component.html |   2 +-
 .../services/designations.service.ts          | 104 +++++--
 .../odcs-mapping/odcs-mapping.component.ts    |   4 +-
 14 files changed, 678 insertions(+), 184 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index f5fbc33ab..f38c514a8 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -81,7 +81,6 @@ import { CreateRequestFormComponent } from './components/request-list/create-req
 import { CompetencyViewComponent } from './components/request-list/competency-view/competency-view.component'
 import { AssignListPopupComponent } from './components/request-list/assign-list-popup/assign-list-popup.component'
 import { SingleAssignPopupComponent } from './components/request-list/single-assign-popup/single-assign-popup.component'
-import { TaxonomyEditorModule } from '@sunbird-cb/taxonomy-editor'
 import { HttpClientModule } from '@angular/common/http'
 import { DesignationModule } from './routes/designation/designation.module'
 import { OdcsMappingComponent } from './routes/odcs-mapping/odcs-mapping.component'
@@ -187,7 +186,6 @@ import { environment } from '../../../../../../../src/environments/environment'
     FilterSearchPipeModule,
     MatAutocompleteModule,
     MatSlideToggleModule,
-    TaxonomyEditorModule,
     HttpClientModule,
     DesignationModule
   ],
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html
index edda63b4d..88b5fdad9 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html
@@ -4,54 +4,54 @@
       My Designation Master
     </mat-card-title>
     <mat-card-content class="designationTable pt-4">
-      <!-- <div class="w-full flex justify-between items-center">
-        <div class="flex">
-          <div>
-            <div class="organisation-lable">Organisation</div>
-            <mat-form-field appearance="outline" class="organisation">
-              <mat-select [(ngModel)]="selectedOrganisation" [disabled]="!organisationsList.length < 2">
-                <ng-container *ngFor="let Organisation of organisationsList">
-                  <mat-option [value]="Organisation.identifier">{{ Organisation.name }}</mat-option>
-                </ng-container>
-              </mat-select>
-            </mat-form-field>
+      <ng-container *ngIf="!showCreateLoader; else fw_create_loader">
+        <div class="w-full flex justify-between items-center mb-6">
+          <div class="flex items-center">
+            <div class="search">
+              <div class=rsearch>
+                <mat-icon class="color-60 search-icon">search</mat-icon>
+                <input [formControl]="searchControl" class="sinput color-60" type="Standard" placeholder="Search">
+              </div>
+            </div>
+          </div>
+          <div class="flex items-center">
+            <button class="font-normal ws-mat-primary-border attendBtn mat-raised-button"
+              [routerLink]="'import-designation'" type="button">
+              Import from Igot master
+            </button>
           </div>
         </div>
-        <div class="flex gap-4">
-          <button mat-raised-button class="btn-upload" (click)="upload()">Upload
-          </button>
-          <button mat-raised-button class="btn-create-designation" (click)="openDesignationCreatPopup()">Add
-            Designation</button>
-        </div>
-      </div> -->
-      <div class="w-full flex justify-between items-center mb-6">
-        <div class="flex items-center">
-          <div class="search">
-            <div class=rsearch>
-              <mat-icon class="color-60 search-icon">search</mat-icon>
-              <input [formControl]="searchControl" class="sinput color-60" type="Standard" placeholder="Search">
+        <ng-container *ngIf="!showLoader">
+          <ng-container *ngIf="designationsList.length === 0; else designationsTable">
+            <div class="w-full flex flex-col justify-center items-center emptyDesignations">
+              <div></div>
+              <div>
+                <p>No designations have been added to your master's list yet</p>
+              </div>
+              <div class="mt-4">
+                <button mat-raised-button [routerLink]="'import-designation'">
+                  <mat-icon class="download-icon">download</mat-icon>Start Importing</button>
+              </div>
             </div>
+          </ng-container>
+          <ng-template #designationsTable>
+            <ws-widget-org-user-table [tableData]="tableData" [data]="filteredDesignationsList"
+              [actionMenuItem]="actionMenuItem" [isSearchBar]=false
+              (actionsClick)="menuSelected($event)"></ws-widget-org-user-table>
+          </ng-template>
+        </ng-container>
+        <ng-container *ngIf="showLoader">
+          <div class="flex flex-1 loader-box">
+            <mat-spinner strokeWidth="3" diameter="50"></mat-spinner>
           </div>
-        </div>
-        <div class="flex items-center">
-          <button class="font-normal ws-mat-primary-border attendBtn mat-raised-button"
-            [routerLink]="'import-designation'" type="button">
-            Import from Igot master
-          </button>
-          <!-- <button mat-button class="btn-upload" (click)="upload()">Import from Igot master
-          </button> -->
-        </div>
-      </div>
-      <ng-container *ngIf="!showLoader">
-        <ws-widget-org-user-table [tableData]="tableData" [data]="filteredDesignationsList"
-          [actionMenuItem]="actionMenuItem" [isSearchBar]=false
-          (actionsClick)="menuSelected($event)"></ws-widget-org-user-table>
+        </ng-container>
       </ng-container>
-      <ng-container *ngIf="showLoader">
-        <div class="flex flex-1 loader-box">
-          <mat-spinner strokeWidth="3" diameter="50"></mat-spinner>
+      <ng-template #fw_create_loader>
+        <div class="flex flex-col flex-1 w-100 items-center pt-5 text-center">
+          <mat-spinner class="display-inline-block mb-5" [diameter]="50" [strokeWidth]="3"></mat-spinner>
+          <p>{{loaderMsg}}</p>
         </div>
-      </ng-container>
+      </ng-template>
     </mat-card-content>
   </mat-card>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.scss b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.scss
index b6699f901..bdd6b5456 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.scss
@@ -56,4 +56,12 @@
     font: normal 14px Lato;
     font-weight: 400;
   }
+}
+
+.emptyDesignations{
+  height: calc(100vh - 300px);
+}
+
+.download-icon {
+  margin-right: 5px;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
index 1ffb0f4cf..5f6aab7de 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
@@ -7,6 +7,8 @@ import { delay } from 'rxjs/operators'
 import { HttpErrorResponse } from '@angular/common/http'
 import { MatDialog } from '@angular/material'
 import { ConformationPopupComponent } from '../../dialog-boxes/conformation-popup/conformation-popup.component'
+import { ActivatedRoute } from '@angular/router'
+import { environment } from '../../../../../../../../../../../src/environments/environment'
 
 
 @Component({
@@ -16,6 +18,12 @@ import { ConformationPopupComponent } from '../../dialog-boxes/conformation-popu
 })
 export class DesignationsComponent implements OnInit {
 
+  environmentVal: any
+  designationConfig: any
+  frameworkConfig: any
+  configSvc: any
+  loaderMsg: string = ''
+  showCreateLoader = false
   searchControl = new FormControl();
   frameworkDetails: any = {}
   organisationsList: any = []
@@ -23,17 +31,19 @@ export class DesignationsComponent implements OnInit {
   designationsList: any = []
   filteredDesignationsList: any = []
   tableData!: ITableData
-  showLoader: boolean = true
+  showLoader: boolean = false
   actionMenuItem: {
     name: string,
     icon: string,
     key: string,
     isMdoLeader: boolean
   }[] = []
+  orgId = ''
 
   constructor(
     private designationsService: DesignationsService,
-    private dialog: MatDialog
+    private dialog: MatDialog,
+    private activateRoute: ActivatedRoute,
   ) { }
 
   ngOnInit() {
@@ -45,9 +55,37 @@ export class DesignationsComponent implements OnInit {
     this.initializeDefaultValues()
     this.getFrameworkInfo()
     this.valudChangeSubscribers()
+    // this.getRoutesData()
+  }
+
+  getRoutesData() {
+    this.environmentVal = environment
+    this.activateRoute.data.subscribe(data => {
+      this.designationConfig = data.pageData.data
+      this.frameworkConfig = this.designationConfig.frameworkConfig
+    })
+
+    this.configSvc = this.activateRoute.snapshot.data['configService']
+    console.log('this.configSvc', this.configSvc.orgReadData)
+    if (this.configSvc.orgReadData && this.configSvc.orgReadData.frameworkid) {
+      this.environmentVal.frameworkName = this.configSvc.orgReadData.frameworkid
+    } else {
+      this.createFreamwork()
+    }
+  }
+
+  createFreamwork() {
+    this.showCreateLoader = true
+    this.loaderMsg = this.designationConfig.frameworkCreationMSg
+    this.environmentVal.frameworkName = '1231231231_organisation_fw'
+  }
+
+  getFrameWorkDetails() {
+    this.designationsService.getOrgReadData(this.orgId)
   }
 
   initializeDefaultValues() {
+    this.orgId = _.get(this.configSvc, 'userProfile.rootOrgId')
     this.actionMenuItem = [
       // {
       //   name: 'Edit',
@@ -72,7 +110,8 @@ export class DesignationsComponent implements OnInit {
     this.tableData = {
       columns: [
         { displayName: 'Designation', key: 'name' },
-        { displayName: 'Description', key: 'description' },
+        { displayName: 'Imported by', key: 'Importedby' },
+        { displayName: 'Imported on', key: 'Importedon' },
       ],
       needCheckBox: false,
       needHash: false,
@@ -85,9 +124,11 @@ export class DesignationsComponent implements OnInit {
 
   getFrameworkInfo() {
     this.showLoader = true
-    this.designationsService.getFrameworkInfo().subscribe(res => {
+    this.designationsService.getFrameworkInfo('organisation_fw').subscribe(res => {
       this.showLoader = false
       this.frameworkDetails = _.get(res, 'result.framework')
+      this.designationsService.setFrameWorkInfo(this.frameworkDetails)
+
       this.getOrganisations()
       console.log('frame work: ', this.frameworkDetails)
     })
@@ -114,6 +155,7 @@ export class DesignationsComponent implements OnInit {
 
   getDesignations() {
     this.designationsList = this.getTermsOfCategorie('organisation_fw_designation')
+    this.designationsService.setCurrentOrgDesignationsList(this.designationsList)
     this.filterDesignations()
   }
 
@@ -178,13 +220,33 @@ export class DesignationsComponent implements OnInit {
   openConformationPopup(event: any) {
     console.log('envent data', event)
     const dialogData = {
-      message: `Are you sure you want to remove the ${_.get(event, 'row.name')} designation?`
+      descriptions: [
+        {
+          header: '',
+          message: `Are you sure you want to remove the ${_.get(event, 'row.name')} designation?`,
+        }
+      ],
+      footerClass: 'items-center justify-end',
+      buttons: [
+        {
+          btnText: 'Remove',
+          btnClass: 'btn-full-red',
+          response: true
+        },
+        {
+          btnText: 'Cancel',
+          btnClass: '',
+          response: false
+        },
+      ],
     }
     const dialogRef = this.dialog.open(ConformationPopupComponent, {
       data: dialogData,
       autoFocus: false,
       width: '500px',
       maxWidth: '80vw',
+      maxHeight: '90vh',
+      height: '300px',
       disableClose: true
     })
     dialogRef.afterClosed().subscribe((res: any) => {
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.html b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.html
index 48567e1cb..88d324473 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.html
@@ -1,68 +1,82 @@
 <div class="flex flex-4 flex-column">
   <mat-card>
     <mat-card-title class="flex-4 mobile-margin mat-h2">
-      Import from Igot Designations
+      Import from Igot Master
     </mat-card-title>
     <mat-card-content class="master-designations pt-4">
-      <div class="w-full flex justify-between items-center mb-6">
-        <div class="flex items-center">
-          <div class="search">
-            <div class=rsearch>
-              <mat-icon class="color-60 search-icon">search</mat-icon>
-              <input [formControl]="searchControl" class="sinput color-60" type="Standard" placeholder="Search">
+      <ng-container *ngIf="!showCreateLoader; else fw_create_loader">
+        <div class="w-full flex justify-between items-center mb-6">
+          <div class="flex items-center">
+            <div class="search">
+              <div class=rsearch>
+                <mat-icon class="color-60 search-icon">search</mat-icon>
+                <input [formControl]="searchControl" class="sinput color-60" type="Standard" placeholder="Search">
+              </div>
             </div>
           </div>
         </div>
-      </div>
-      <ng-container *ngIf="selctedDesignationsCount > 0">
-        <div class="flex flex-row mb-4">
-          <div class="flex flex-2 flex-middle w-full flex-wrap gap-4">
-            <div class="selected-designation-label">Selected designations - </div>
-            <ng-container *ngFor="let item of selectedDesignationsList | slice : 0 : 10">
-              <div class="chips flex flex-row" *ngIf="item?.selected">
-                <div class="chips-content">
-                  <span class="color-60">{{item?.name | titlecase}}</span>
-                </div>
-                <div class="cross-icon" (click)="removeDesignation([item])">
-                  <img class="cursor-pointer" src="assets/icons/close.svg" />
+        <ng-container *ngIf="selctedDesignationsCount > 0">
+          <div class="flex flex-row mb-4">
+            <div class="flex flex-2 flex-middle w-full flex-wrap gap-4">
+              <div class="selected-designation-label">Selected designations - </div>
+              <ng-container *ngFor="let item of selectedDesignationsList | slice : 0 : 10">
+                <div class="chips flex flex-row" *ngIf="item?.selected">
+                  <div class="chips-content">
+                    <span class="color-60">{{item?.designation | titlecase}}</span>
+                  </div>
+                  <div class="cross-icon" (click)="removeDesignation([item])">
+                    <img class="cursor-pointer" src="assets/icons/close.svg" />
+                  </div>
                 </div>
-              </div>
-            </ng-container>
-            <ng-container *ngIf="selctedDesignationsCount > 10">
-              <a mat-button class="select-more-link margin-left-m"
-                (click)="openPreviewPoup()">+{{selctedDesignationsCount - 10}} more</a>
-            </ng-container>
-          </div>
-          <!-- <div class="flex flex-1 flex-row right-section flex-middle">
-            <a mat-button class="select-more-link" (click)="clearAll()">Clear all</a>
-          </div> -->
-        </div>
-      </ng-container>
-      <div class="w-full flex flex-4 flex-row designations-card-container flex-wrap gap-5">
-        <ng-container
-          *ngFor="let designation of filteredIgotDesignationsList | slice : startIndex : lastIndex; let i = index">
-          <div class="flex flex-4 custom-user-card items-center justify-center"
-            [ngClass]="designation?.selected ? 'active-card':''">
-            <div class="custom-user-desc">
-              <p>{{designation?.name | titlecase}}</p>
-            </div>
-
-            <div class="check-action">
-              <mat-checkbox [checked]="designation?.selected"
-                (change)="selectDesignation($event.checked, designation.id)"></mat-checkbox>
+              </ng-container>
+              <ng-container *ngIf="selctedDesignationsCount > 10">
+                <a mat-button class="select-more-link margin-left-m"
+                  (click)="openPreviewPoup()">+{{selctedDesignationsCount - 10}} more</a>
+              </ng-container>
             </div>
+            <!-- <div class="flex flex-1 flex-row right-section flex-middle">
+              <a mat-button class="select-more-link" (click)="clearAll()">Clear all</a>
+            </div> -->
           </div>
         </ng-container>
-      </div>
-      <div class="flex flex-row justify-center">
-        <mat-paginator [length]="filteredIgotDesignationsList.length" [pageSize]="pageSize"
-          [pageSizeOptions]="[20,30,40]" (page)="onChangePage($event)"></mat-paginator>
-      </div>
-      <div class="flex justify-end items-center">
-        <button mat-raised-button (click)="importDesignations()"
-          class="importBtn flex items-center justify-center">Import selected
-          designations</button>
-      </div>
+        <div class="w-full flex flex-4 flex-row designations-card-container flex-wrap gap-5">
+          <ng-container *ngFor="let designation of igotDesignationsList let i = index">
+            <div class="flex flex-4 custom-user-card items-center justify-center"
+              [ngClass]="{'active-card': designation?.selected, 'disableCard': designation?.isOrgDesignation}">
+              <div class="custom-user-desc">
+                <p>{{designation?.designation | titlecase}}</p>
+              </div>
+
+              <div class="check-action">
+                <mat-checkbox [checked]="designation?.selected" [disabled]="designation?.isOrgDesignation"
+                  (change)="selectDesignation($event.checked, designation.id)"></mat-checkbox>
+              </div>
+            </div>
+          </ng-container>
+          <ng-container *ngIf="igotDesignationsList.length === 0">
+            <div class=" w-full flex justify-center items-center">
+              <div class="my-8 mx-4">
+                <p>No designations found</p>
+              </div>
+            </div>
+          </ng-container>
+        </div>
+        <div class="flex flex-row justify-center">
+          <mat-paginator [length]="deisgnationsCount" [pageSize]="pageSize" [pageSizeOptions]="[20,30,40]"
+            (page)="onChangePage($event)"></mat-paginator>
+        </div>
+        <div class="flex justify-end items-center">
+          <button mat-raised-button (click)="importDesignations()"
+            class="importBtn flex items-center justify-center">Import selected
+            designations</button>
+        </div>
+      </ng-container>
+      <ng-template #fw_create_loader>
+        <div class="flex flex-col flex-1 w-100 items-center pt-5 text-center">
+          <mat-spinner class="display-inline-block mb-5" [diameter]="50" [strokeWidth]="3"></mat-spinner>
+          <p>{{loaderMsg}}</p>
+        </div>
+      </ng-template>
     </mat-card-content>
   </mat-card>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.scss b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.scss
index d2efdbdc9..13be2054e 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.scss
@@ -84,6 +84,11 @@
       height: 70px;
     }
 
+    .disableCard {
+      background-color: #6c757d;
+      pointer-events: none;
+    }
+
     .custom-user-desc {
       display: flex;
       flex-direction: column;
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
index 77a458e62..e1a52d59e 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
@@ -1,83 +1,154 @@
-import { Component, OnInit } from '@angular/core'
+import { Component, OnDestroy, OnInit } from '@angular/core'
 import { DesignationsService } from '../../services/designations.service'
 import { MatDialog, PageEvent } from '@angular/material'
 import { FormControl } from '@angular/forms'
 import { delay } from 'rxjs/operators'
 import { SelectedDesignationPopupComponent } from '../../dialog-boxes/selected-designation-popup/selected-designation-popup.component'
-import { forkJoin } from 'rxjs'
+import { forkJoin, of, Subscription } from 'rxjs'
+import { catchError, map } from 'rxjs/operators'
 import { HttpErrorResponse } from '@angular/common/http'
 import * as _ from 'lodash'
+import { LoaderService } from '../../../../../../../../../../../src/app/services/loader.service'
+import { ActivatedRoute, Router } from '@angular/router'
+import { environment } from '../../../../../../../../../../../src/environments/environment'
+import { ConformationPopupComponent } from '../../dialog-boxes/conformation-popup/conformation-popup.component'
 
 @Component({
   selector: 'ws-app-import-designation',
   templateUrl: './import-designation.component.html',
   styleUrls: ['./import-designation.component.scss']
 })
-export class ImportDesignationComponent implements OnInit {
+export class ImportDesignationComponent implements OnInit, OnDestroy {
 
+  environmentVal: any
+  designationConfig: any
+  frameworkConfig: any
+  configSvc: any
+  loaderMsg: string = ''
+  showCreateLoader = false
   searchControl = new FormControl();
   igotDesignationsList: any = []
-  filteredIgotDesignationsList: any = []
   selectedDesignationsList: any = []
   orgDesignationsList: any = []
   pageSize = 20
   startIndex = 0
   lastIndex = 20
+  deisgnationsCount = 0
+  private apiSubscription: Subscription | undefined
+  designationsImportSuccessResponses: any = []
+  importedDesignationNames: any = []
+  designationsImportFailed: any = []
+  frameworkInfo: any = {}
 
   constructor(
     private designationsService: DesignationsService,
-    private dialog: MatDialog
+    private dialog: MatDialog,
+    private loaderService: LoaderService,
+    private activateRoute: ActivatedRoute,
+    private route: Router
   ) { }
 
   ngOnInit() {
+
+    // this.getRoutesData()
     this.loadDesignations()
     this.valudChangeSubscribers()
+
+    this.getFrameWorkDetails()
+  }
+
+  getRoutesData() {
+    this.environmentVal = environment
+    this.activateRoute.data.subscribe(data => {
+      this.designationConfig = data.pageData.data
+      this.frameworkConfig = this.designationConfig.frameworkConfig
+    })
+
+    this.configSvc = this.activateRoute.snapshot.data['configService']
+    console.log('this.configSvc', this.configSvc.orgReadData)
+    if (this.configSvc.orgReadData && this.configSvc.orgReadData.frameworkid) {
+      this.environmentVal.frameworkName = this.configSvc.orgReadData.frameworkid
+    } else {
+      this.createFreamwork()
+    }
   }
 
-  loadDesignations() {
-    this.designationsService.getDesignations({}).subscribe(
-      (data: any) => {
-        this.igotDesignationsList = data
-        this.getFilteredDesignationList()
+  createFreamwork() {
+    this.showCreateLoader = true
+    this.loaderMsg = this.designationConfig.frameworkCreationMSg
+    this.environmentVal.frameworkName = '1231231231_organisation_fw'
+  }
+
+  getFrameWorkDetails() {
+    this.frameworkInfo = this.designationsService.frameWorkInfo
+    if (this.frameworkInfo === undefined) {
+      this.navigateToMyDesignations()
+    }
+  }
+
+  loadDesignations(searchKey: string = '') {
+    this.loaderService.changeLoaderState(true)
+    let pageNumber = this.startIndex === 0 ? 0 : this.startIndex / this.pageSize
+    const requestParams: any = {
+      "filterCriteriaMap": {
+        "status": "Active"
+      },
+      "requestedFields": [],
+      "pageNumber": pageNumber,
+      "pageSize": this.pageSize
+    }
+    this.startIndex
+    if (searchKey) {
+      requestParams['searchString'] = searchKey
+    }
+
+    if (this.apiSubscription) {
+      this.apiSubscription.unsubscribe()
+      this.apiSubscription = undefined
+    }
+
+    this.apiSubscription = this.designationsService.getIgotMasterDesignations(requestParams).subscribe(
+      (result: any) => {
+        this.igotDesignationsList = result.formatedDesignationsLsit
+        this.deisgnationsCount = result.totalCount
+        this.loaderService.changeLoaderState(false)
       },
       (_err: any) => {
+        this.loaderService.changeLoaderState(false)
       })
   }
 
+  get getFilteredSelectedList() {
+    if (this.searchControl.value) {
+      return this.selectedDesignationsList
+        .filter((designation: any) =>
+          designation.name.toLowerCase().includes(this.searchControl.value.toLowerCase()))
+    }
+    return this.selectedDesignationsList
+  }
+
   valudChangeSubscribers() {
     if (this.searchControl) {
       this.searchControl.valueChanges.pipe(delay(500)).subscribe((value: string) => {
-        this.getFilteredDesignationList(value)
+        this.loadDesignations(value)
       })
     }
   }
 
-  getFilteredDesignationList(key?: string) {
-    if (key) {
-      this.filteredIgotDesignationsList = this.igotDesignationsList
-        .filter((designation: any) =>
-          designation.name.toLowerCase().includes(key.toLowerCase()))
-    } else {
-      this.filteredIgotDesignationsList = this.igotDesignationsList
-    }
-  }
-
   selectDesignation(checked: Boolean, id: number) {
     const index = this.igotDesignationsList.findIndex((e: any) => e.id === id)
     const designation = this.igotDesignationsList[index]
     if (checked) {
       designation['selected'] = true
       this.selectedDesignationsList.push(designation)
-      this.igotDesignationsList.splice(index, 1)
-      this.igotDesignationsList.unshift(designation)
-      this.getFilteredDesignationList(this.searchControl.value)
+      this.designationsService.updateSelectedDesignationList(this.selectedDesignationsList)
+      // this.igotDesignationsList.splice(index, 1)
+      // this.igotDesignationsList.unshift(designation)
     } else {
       this.removeDesignation([designation])
     }
   }
 
-
-
   get selctedDesignationsCount() {
     return this.selectedDesignationsList.length
   }
@@ -86,17 +157,17 @@ export class ImportDesignationComponent implements OnInit {
     designationToRemoveList.forEach((designationToRemove: any) => {
       this.selectedDesignationsList = this.selectedDesignationsList
         .filter((selectedDesignation: any) => selectedDesignation.id !== designationToRemove.id)
+      this.designationsService.updateSelectedDesignationList(this.selectedDesignationsList)
 
       const igotListIndex = this.igotDesignationsList
         .findIndex((designation: any) => designation.id === designationToRemove.id)
       if (igotListIndex >= 0) {
         const designation = this.igotDesignationsList[igotListIndex]
         designation['selected'] = false
-        this.igotDesignationsList.splice(igotListIndex, 1)
-        this.igotDesignationsList.splice(this.selctedDesignationsCount, 0, designation)
+        // this.displayList.splice(igotListIndex, 1)
+        // this.displayList.splice(this.selctedDesignationsCount, 0, designation)
       }
     })
-    this.getFilteredDesignationList(this.searchControl.value)
 
   }
 
@@ -106,6 +177,7 @@ export class ImportDesignationComponent implements OnInit {
       disableClose: true,
       data: dialogData,
       autoFocus: false,
+      maxHeight: '90vh',
       width: '90%',
     })
     dialogRef.afterClosed().subscribe((res: any[]) => {
@@ -119,30 +191,68 @@ export class ImportDesignationComponent implements OnInit {
   onChangePage(pe: PageEvent) {
     this.startIndex = pe.pageIndex * pe.pageSize
     this.lastIndex = (pe.pageIndex + 1) * pe.pageSize
+    this.pageSize = pe.pageSize
+    this.loadDesignations(this.searchControl.value)
   }
 
   importDesignations() {
+    // this.designationsImportFailed = [
+    //   {
+    //     designation: {
+    //       designation: 'name 1'
+    //     }
+    //   },
+    //   {
+    //     designation: {
+    //       designation: 'name 2'
+    //     }
+    //   }
+    // ]
+
+    // this.importedDesignationNames = ['succes one', 'success two', 'succes one', 'success two', 'succes one', 'success two',
+    // 'succes one', 'success two', 'succes one', 'success two', 'succes one', 'success two', 'succes one', 'success two',]
+    // this.openConforamtionPopup()
+
     if (this.selctedDesignationsCount) {
-      const framework = 'organisation_fw'
-      const category = 'organisation_fw'
-      const importRequest: any = []
-      this.selectedDesignationsList((selectedDesignation: any) => {
-        const formBody = {
-          "request": {
-            "term": {
-              "name": selectedDesignation.name,
-              "code": selectedDesignation.name,
-              "refId": selectedDesignation.id,
-              "refType": "Testing Schema Update For Creating Term"
+      const framework = _.get(this.frameworkInfo, 'code')
+      const category = 'designation'
+      const observables = this.selectedDesignationsList.map((selectedDesignation: any) => {
+        const requestBody = {
+          request: {
+            term: {
+              code: this.designationsService.getUuid,
+              name: selectedDesignation.designation,
+              description: selectedDesignation.description,
+              category: 'designation',
+              status: 'live',
+              refId: selectedDesignation.id,
+              refType: "designation",
+              additionalProperties: {}
             }
           }
         }
-        importRequest.push(this.designationsService.importDesigantion(framework, category, formBody))
+        this.designationsImportSuccessResponses =
+          _.get(this.frameworkInfo, 'categories[0].terms[0].associations').map((c: any) => {
+            return c.identifier ? { identifier: c.identifier } : null
+          })
+        // return this.designationsService.importDesigantion(framework, category, requestBody).pipe(
+        return this.designationsService.createTerm(framework, category, requestBody).pipe(
+          map(response => {
+            this.designationsImportSuccessResponses.push({ identifier: _.get(response, 'result.node_id[0]') })
+            this.importedDesignationNames.push(selectedDesignation.designation)
+            return response
+          }),
+          catchError(error => {
+            this.designationsImportFailed.push({ designation: selectedDesignation, error: error })
+            return of(null)
+          })
+        )
       })
 
-      forkJoin(importRequest).subscribe({
+      forkJoin(observables).subscribe({
         next: response => {
           console.log(response)
+          this.updateTerms()
         },
         error: (error: HttpErrorResponse) => {
           const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
@@ -152,4 +262,100 @@ export class ImportDesignationComponent implements OnInit {
     }
   }
 
+  updateTerms() {
+    const framework = _.get(this.frameworkInfo, 'code')
+    const category = _.get(this.frameworkInfo, 'categories[0].terms[0].category')
+    const categoryTermCode = _.get(this.frameworkInfo, 'categories[0].terms[0].code')
+    const requestBody = {
+      request: {
+        term: {
+          associations: this.designationsImportSuccessResponses
+        }
+      }
+    }
+    this.designationsService.updateTerms(framework, category, categoryTermCode, requestBody).subscribe({
+      next: response => {
+        this.publishFrameWork()
+        console.log('update response', response)
+      },
+      error: (error: HttpErrorResponse) => {
+        const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
+        console.log(errorMessage)
+      }
+    })
+  }
+
+  publishFrameWork() {
+    const frameworkName = _.get(this.frameworkInfo, 'code')
+    this.designationsService.publishFramework(frameworkName).subscribe({
+      next: response => {
+        console.log('publish', response)
+        this.openConforamtionPopup()
+      },
+      error: (error: HttpErrorResponse) => {
+        const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
+        console.log(errorMessage)
+      }
+    })
+  }
+
+  openConforamtionPopup() {
+    const descriptions = []
+    if (this.designationsImportFailed.length > 0) {
+      const designationNames = this.designationsImportFailed.map((e: any) => e.designation.designation).join(', ')
+      const description = {
+        header: 'Import failed designations',
+        message: `Some thing went wrong while importing ${designationNames} designations`
+      }
+      descriptions.push(description)
+    }
+    if (this.importedDesignationNames.length > 0) {
+      const designationNames = this.importedDesignationNames.join(', ')
+      const description = {
+        header: 'Designations imported successfully',
+        message: `${designationNames} are imported successfully`
+      }
+      descriptions.push(description)
+    }
+
+    descriptions.push({
+      message: 'The changes will reflect shortly.'
+    })
+    const dialogData = {
+      descriptions: descriptions,
+      footerClass: 'items-center justify-end',
+      buttons: [
+        {
+          btnText: 'Cancel',
+          btnClass: '',
+          response: false
+        },
+      ],
+    }
+
+    const dialogRef = this.dialog.open(ConformationPopupComponent, {
+      data: dialogData,
+      autoFocus: false,
+      minWidth: '500px',
+      maxWidth: '80vw',
+      maxHeight: '90vh',
+      height: '300px',
+      disableClose: true
+    })
+    dialogRef.afterClosed().subscribe(() => {
+      // this.navigateToMyDesignations()
+    })
+  }
+
+  navigateToMyDesignations() {
+    this.route.navigateByUrl('app/home/org-designations')
+  }
+
+  ngOnDestroy(): void {
+    this.designationsService.updateSelectedDesignationList([])
+    this.loaderService.changeLoaderState(false)
+    if (this.apiSubscription) {
+      this.apiSubscription.unsubscribe()
+    }
+  }
 }
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/designation.module.ts b/project/ws/app/src/lib/routes/home/routes/designation/designation.module.ts
index 9439b1eae..e14c30c05 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/designation.module.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/designation.module.ts
@@ -8,17 +8,45 @@ import { MatButtonModule, MatCardModule, MatCheckboxModule, MatDialogModule, Mat
 import { UIORGTableModule } from '@sunbird-cb/collection'
 import { SelectedDesignationPopupComponent } from './dialog-boxes/selected-designation-popup/selected-designation-popup.component'
 import { ConformationPopupComponent } from './dialog-boxes/conformation-popup/conformation-popup.component'
+import { PageResolve } from '@sunbird-cb/utils'
+import { ConfigResolveService } from '../../resolvers/config-resolve.service'
 
 const routes: Routes = [
   {
     path: '',
     pathMatch: 'full',
-    component: DesignationsComponent
+    component: DesignationsComponent,
+    data: {
+      pageId: 'home/odcs-mapping',
+      module: 'odcs-mapping',
+      pageType: 'feature',
+      pageKey: 'odcs',
+    },
+    resolve: {
+      configService: ConfigResolveService,
+      pageData: PageResolve,
+    },
   },
   {
     path: 'import-designation',
     pathMatch: 'full',
-    component: ImportDesignationComponent
+    // data: {
+    //   pageId: 'home/org-designations/import-designation',
+    //   module: 'manage-designations',
+    //   pageType: 'feature',
+    //   pageKey: 'import-designations',
+    // },
+    data: {
+      pageId: 'home/odcs-mapping',
+      module: 'odcs-mapping',
+      pageType: 'feature',
+      pageKey: 'odcs',
+    },
+    component: ImportDesignationComponent,
+    resolve: {
+      configService: ConfigResolveService,
+      pageData: PageResolve,
+    },
   },
 ]
 
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.html b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.html
index e785aa697..96c39122b 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.html
@@ -1,4 +1,4 @@
-<div class="w-full">
+<!-- <div class="w-full">
   <div class="w-full conformation-popup flex justify-center items-center">
     <span class="msgDescription">{{dialogData?.message}}</span>
   </div>
@@ -6,4 +6,39 @@
     <button mat-raised-button [mat-dialog-close]="true">Close</button>
     <button mat-raised-button (click)="closePopup(true)" class="remove">Remove</button>
   </div>
+</div> -->
+
+<div class="dialog-container">
+  <ng-container [ngSwitch]="dialogDetails.dialogType">
+    <ng-container *ngSwitchCase="'success'">
+      <div class="circule mb2 success">
+        <mat-icon aria-hidden="false" class="success-icon">done</mat-icon>
+      </div>
+    </ng-container>
+    <ng-container *ngSwitchCase="'fail'">
+      <div class="circule mb2 fail">
+        <mat-icon aria-hidden="false" class="fail-icon">priority_high</mat-icon>
+      </div>
+    </ng-container>
+  </ng-container>
+  <ng-container *ngIf="dialogDetails.iconDetails">
+    <div class="circule mb2" [ngClass]="dialogDetails.iconDetails.iconClass">
+      <mat-icon aria-hidden="false" class="success-icon">{{dialogDetails.iconDetails.icon}}</mat-icon>
+    </div>
+  </ng-container>
+  <ng-container *ngFor="let description of dialogDetails?.descriptions">
+    <ng-container *ngIf="description.header">
+      <span class="header">{{description.header}}</span>
+    </ng-container>
+    <ng-container *ngIf="description.message">
+      <div class="description mt-1 mb-6">
+        <span>{{description.message}}</span>
+      </div>
+    </ng-container>
+  </ng-container>
+</div>
+<div class="px2 footer flex w-full gap-2" [ngClass]="dialogDetails.footerClass">
+  <ng-container *ngFor="let btn of dialogDetails?.buttons">
+    <button mat-raised-button (click)="closePopup(btn.response)" [ngClass]="btn.btnClass">{{btn.btnText}}</button>
+  </ng-container>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.scss b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.scss
index 271459bc6..173335c2c 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.scss
@@ -1,14 +1,94 @@
-.conformation-popup {
-  height: 300px;
-  max-height: 80vh;
+// .conformation-popup {
+//   height: 300px;
+//   max-height: 80vh;
 
-  .msgDescription {
-    font-size: 14px;
-  }
+//   .msgDescription {
+//     font-size: 14px;
+//   }
 
+// }
+
+// .remove {
+//   background-color: red !important;
+//   color: #ffffff !important;
+// }
+
+.dialog-container {
+    display: flex;
+    justify-content: center;
+    height: calc(100% - 60px);
+    flex-direction: column;
+
+    .circule {
+        width: 40px;
+        height: 40px;
+        border: 0px;
+        border-radius: 50%;
+        position: relative;
+    }
+
+    .success {
+        background-color: #1d8923;
+    }
+
+    .fail {
+        background-color: #d13924;
+    }
+
+    .success-icon {
+        position: absolute;
+        color: white;
+        top: 9px;
+        left: 7px;
+        font-weight: 900;
+    }
+
+    .fail-icon {
+        position: absolute;
+        color: white;
+        top: 9px;
+        left: 7.4px;
+    }
+
+    .header {
+      font-size: 20px;
+      font-weight: 600;
+    }
+
+    .description {
+        font-size: 14px;
+    }
 }
+.footer {
+    height: 60px;
+
+    .btn-full-success {
+        min-width: 80px;
+        border: none;
+        background-color: #045dad;
+        color: white;
+        border-radius: 5px;
+        font-size: 15px;
+        cursor: pointer;
+    }
+
+    .btn-full-red {
+        min-width: 80px;
+        border: none;
+        background-color: red;
+        color: white;
+        border-radius: 5px;
+        font-size: 15px;
+        cursor: pointer;
+    }
 
-.remove {
-  background-color: red !important;
-  color: #ffffff !important;
+    .btn-outline {
+        min-width: 80px;
+        background-color: white;
+        color: #045dad;
+        border: 2px solid #045dad;
+        border-radius: 5px;
+        font-size: 15px;
+        cursor: pointer;
+    }
 }
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.ts
index b6beae61a..642f56f42 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.ts
@@ -8,13 +8,13 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'
 })
 export class ConformationPopupComponent implements OnInit {
 
-  dialogData: any
+  dialogDetails: any
 
   constructor(
     private dialogRef: MatDialogRef<ConformationPopupComponent>,
     @Inject(MAT_DIALOG_DATA) private data: any
   ) {
-    this.dialogData = this.data
+    this.dialogDetails = this.data
   }
 
   ngOnInit() {
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/selected-designation-popup/selected-designation-popup.component.html b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/selected-designation-popup/selected-designation-popup.component.html
index 22fd9ad46..8c366c6df 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/selected-designation-popup/selected-designation-popup.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/selected-designation-popup/selected-designation-popup.component.html
@@ -13,7 +13,7 @@
         </button>
       </div>
       <div class="custom-user-desc">
-        <p>{{designation?.name | titlecase}}</p>
+        <p>{{designation?.designation | titlecase}}</p>
       </div>
     </div>
   </ng-container>
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
index e6e747604..eff6787e3 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
@@ -7,19 +7,24 @@ import { v4 as uuidv4 } from 'uuid'
 // tslint:disable
 import _ from 'lodash'
 import { environment } from '../../../../../../../../../../src/environments/environment'
+import { ConfigurationsService } from '@sunbird-cb/utils'
 /* tslint:enable */
 
 const API_END_POINTS = {
   COPY_FRAMEWORK: `/api/framework/v1/copy/${environment.ODCSMasterFramework}`,
   CREATE_TERM: (frameworkId: string, categoryId: string) =>
     `apis/proxies/v8/framework/v1/term/create?framework=${frameworkId}&category=${categoryId}`,
+  UPDATE_TERM: (frameworkId: string, categoryId: string, categoryTermCode: string) =>
+    `apis/proxies/v8/framework/v1/term/update/${categoryTermCode}?framework=${frameworkId}&category=${categoryId}`,
   PUBLISH_FRAMEWORK: (frameworkName: string) =>
     `apis/proxies/v8/framework/v1/publish/${frameworkName}`,
   UPDATE_ORG: '/apis/proxies/v8/org/v1/update',
 
-  ORGANISATION_FW: '/apis/proxies/v8/framework/v1/read/organisation_fw',
-  getDesignation: '/apis/proxies/v8/user/v1/positions',
-  importDesignation: 'api/framework/v1/term/create?'
+  ORGANISATION_FW: (frameworkName: string) =>
+    `/apis/proxies/v8/framework/v1/read/${frameworkName}`,
+  GET_IGOT_MASTER_DESIGNATIONS: 'apis/proxies/v8/designation/search',
+  IMPORT_DESIGNATION: 'api/framework/v1/term/create?',
+  ORG_READ: '/apis/proxies/v8/org/v1/read',
 }
 
 @Injectable({
@@ -29,44 +34,74 @@ export class DesignationsService {
   list = new Map<string, any>()
 
   orgDesignationList: any = []
+  selectedDesignationList: any = []
+  frameWorkInfo: any
+
 
   constructor(
-    private http: HttpClient
+    private http: HttpClient,
+    private configSvc: ConfigurationsService,
   ) { }
 
-  getDesignations(_req: any): Observable<any> {
-    return this.http.get<any>(API_END_POINTS.getDesignation).pipe(
-      mergeMap((result: any) => {
-        if (result && result.responseData) {
-          return this.formateMasterDesignationList(result.responseData)
+  getIgotMasterDesignations(req: any): Observable<any> {
+    return this.http.post<any>(API_END_POINTS.GET_IGOT_MASTER_DESIGNATIONS, req).pipe(
+      mergeMap((res: any) => {
+        if (res) {
+          return this.formateMasterDesignationList(_.get(res, 'result.result', {}))
         }
-        return result
+        return res
       })
     )
   }
 
-  formateMasterDesignationList(designationsList: any): Observable<any> {
-    const formatedDesignationsLsit: any = []
-    if (designationsList) {
-      designationsList.forEach((masterDesignation: any) => {
-        masterDesignation['isOrgDesignation'] = this.orgDesignationList
-          .find((element: any) => element.name === masterDesignation.name) ? true : false
-        masterDesignation['selected'] = masterDesignation['isOrgDesignation']
-        formatedDesignationsLsit.push(masterDesignation)
+  updateSelectedDesignationList(selectedList: any) {
+    this.selectedDesignationList = selectedList
+  }
+
+  formateMasterDesignationList(response: any): Observable<any> {
+    const result: any = {
+      formatedDesignationsLsit: [],
+      facets: response.facets,
+      totalCount: response.totalCount
+    }
+    if (response.data) {
+      response.data.forEach((masterDesignation: any) => {
+        masterDesignation['isOrgDesignation'] = (this.orgDesignationList
+          .findIndex((element: any) => element.name === masterDesignation.designation) > -1) ? true : false
+        if (this.selectedDesignationList.findIndex((element: any) => element.id === masterDesignation.id) > -1) {
+          masterDesignation['selected'] = true
+          // result.formatedDesignationsLsit.unshift(masterDesignation)
+          result.formatedDesignationsLsit.push(masterDesignation)
+        } else {
+          masterDesignation['selected'] = masterDesignation['isOrgDesignation']
+          result.formatedDesignationsLsit.push(masterDesignation)
+        }
+        // if (this.selectedDesignationList.findIndex((element: any) => element.id === masterDesignation.id) < 0) {
+        //   masterDesignation['selected'] = masterDesignation['isOrgDesignation']
+        //   result.formatedDesignationsLsit.push(masterDesignation)
+        // }
       })
     }
 
-    return of(formatedDesignationsLsit)
+    return of(result)
   }
 
-  getFrameworkInfo(): Observable<any> {
-    return this.http.get(`${API_END_POINTS.ORGANISATION_FW}`, { withCredentials: true }).pipe(
+  getFrameworkInfo(frameWorkName: string): Observable<any> {
+    return this.http.get(`${API_END_POINTS.ORGANISATION_FW(frameWorkName)}`, { withCredentials: true }).pipe(
       tap((response: any) => {
         this.formateData(response)
       }),
     )
   }
 
+  setFrameWorkInfo(frameWorkInfo: any) {
+    this.frameWorkInfo = frameWorkInfo
+  }
+
+  setCurrentOrgDesignationsList(orgDesignationList: any[]) {
+    this.orgDesignationList = orgDesignationList
+  }
+
   formateData(response: any) {
     (response.result.framework.categories).forEach((a: any) => {
       this.list.set(a.code, {
@@ -107,7 +142,7 @@ export class DesignationsService {
 
   }
 
-  getUuid() {
+  get getUuid() {
     return uuidv4()
   }
 
@@ -122,6 +157,29 @@ export class DesignationsService {
     )}`, requestBody)
   }
 
+  getOrgReadData(organisationId: string) {
+    const request = {
+      "request": {
+        "organisationId": organisationId
+      }
+    }
+    this.http
+      .post<any>(API_END_POINTS.ORG_READ, request)
+      .pipe(map((res: any) => {
+        this.configSvc.orgReadData = _.get(res, 'result.response')
+        return _.get(res, 'result.response')
+      }))
+      .toPromise()
+  }
+
+  updateTerms(frameworkId: string, categoryId: string, categoryTermCode: string, reguestBody: any) {
+    return this.http.patch(`${API_END_POINTS.UPDATE_TERM(
+      frameworkId,
+      categoryId,
+      categoryTermCode
+    )}`, reguestBody)
+  }
+
   publishFramework(frameworkName: string) {
     return this.http.post(`${API_END_POINTS.PUBLISH_FRAMEWORK(frameworkName)}`, {})
   }
@@ -143,6 +201,6 @@ export class DesignationsService {
   // }
 
   importDesigantion(framework: string, category: string, reqBody: any): Observable<any> {
-    return this.http.post<any>(`${API_END_POINTS.importDesignation}framework=${framework}&category=${category}`, reqBody)
+    return this.http.post<any>(`${API_END_POINTS.IMPORT_DESIGNATION}framework=${framework}&category=${category}`, reqBody)
   }
 }
diff --git a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
index 66d729450..e8c1dee9d 100644
--- a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core'
 import { environment } from '../../../../../../../../../src/environments/environment'
 import { ActivatedRoute } from '@angular/router'
-import { OdcsService } from '../../services/odcs.service'
+// import { OdcsService } from '../../services/odcs.service'
 
 @Component({
   selector: 'ws-app-odcs-mapping',
@@ -19,7 +19,7 @@ export class OdcsMappingComponent implements OnInit {
 
   constructor(
     private activateRoute: ActivatedRoute,
-    private odcsSvc: OdcsService
+    // private odcsSvc: OdcsService
   ) { }
 
   ngOnInit() {

From f5b7e06a113bd6874c53179d96d42d10e75c77bb Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Mon, 22 Jul 2024 17:58:49 +0530
Subject: [PATCH 775/887] manage designations import api integrations

---
 package.json                                  |   1 +
 .../create-request-form.component.ts          |  20 +-
 .../request-list/request-list.component.ts    |   6 +-
 .../ws/app/src/lib/routes/home/home.module.ts |   6 +-
 .../designations.component.spec.ts            |  28 +--
 .../designations/designations.component.ts    | 133 +++++++-----
 .../import-designation.component.spec.ts      |  28 +--
 .../import-designation.component.ts           | 205 ++++++++++--------
 .../routes/designation/designation.module.ts  |   8 +-
 .../conformation-popup.component.html         |   9 +-
 .../conformation-popup.component.scss         |  12 +-
 .../conformation-popup.component.spec.ts      |  28 +--
 .../conformation-popup.component.ts           |   2 +-
 .../selected-designation-popup.component.html |   2 +-
 ...lected-designation-popup.component.spec.ts |  28 +--
 .../selected-designation-popup.component.ts   |   2 +-
 .../services/designations.service.spec.ts     |  14 +-
 .../services/designations.service.ts          |  44 ++--
 .../odcs-mapping.component.spec.ts            |  28 +--
 .../odcs-mapping/odcs-mapping.component.ts    |  42 +++-
 src/app/services/init.service.ts              |  12 +-
 21 files changed, 371 insertions(+), 287 deletions(-)

diff --git a/package.json b/package.json
index f7c07ec68..b827b1abc 100644
--- a/package.json
+++ b/package.json
@@ -47,6 +47,7 @@
     "@sunbird-cb/micro-surveys": "2.0.13",
     "@sunbird-cb/rain-dashboards": "0.4.33",
     "@sunbird-cb/resolver": "^1.0.0",
+    "@sunbird-cb/taxonomy-editor": "^0.0.12",
     "@sunbird-cb/utils": "^1.0.18",
     "@types/file-saver": "^2.0.1",
     "brace": "^0.11.1",
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
index 96192e95f..1bad5f063 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
@@ -68,11 +68,11 @@ export class CreateRequestFormComponent implements OnInit {
   competencySubtheme!: FormControl
 
   constructor(private formBuilder: FormBuilder,
-    private homeService: ProfileV2Service,
-    private activatedRouter: ActivatedRoute,
-    private snackBar: MatSnackBar,
-    private router: Router,
-    public dialog: MatDialog
+              private homeService: ProfileV2Service,
+              private activatedRouter: ActivatedRoute,
+              private snackBar: MatSnackBar,
+              private router: Router,
+              public dialog: MatDialog
   ) {
     this.requestForm = this.formBuilder.group({
       TitleName: new FormControl('', [Validators.required, Validators.pattern(this.noSpecialChar), Validators.minLength(10)]),
@@ -155,13 +155,13 @@ export class CreateRequestFormComponent implements OnInit {
 
     this.selectRequestType(this.requestObjData.requestType)
     if (this.filteredRequestType) {
-      if(this.requestObjData.preferredProvider && this.requestObjData.preferredProvider.length){
+      if (this.requestObjData.preferredProvider && this.requestObjData.preferredProvider.length) {
       const prefferedData = this.filteredRequestType.filter(option =>
         this.requestObjData.preferredProvider.some((res: any) =>
           res.providerId === option.id
         )
       )
-      if(prefferedData && prefferedData.length){
+      if (prefferedData && prefferedData.length) {
         this.requestForm.controls['providers'].setValue(prefferedData)
       }
     }
@@ -551,7 +551,6 @@ export class CreateRequestFormComponent implements OnInit {
     if (this.demandId && this.actionBtnName === 'reassign') {
       this.requestForm.enable()
     }
-   
 
     let competencyDataList: any[] = []
     if (this.requestForm.value.competencies_v5) {
@@ -593,7 +592,6 @@ export class CreateRequestFormComponent implements OnInit {
       }
       request.assignedProvider = assigneeProvider
     }
-     
 
     if (this.requestForm.value.learningMode) {
       request.learningMode = this.requestForm.value.learningMode.toLowerCase()
@@ -615,9 +613,9 @@ export class CreateRequestFormComponent implements OnInit {
           this.router.navigateByUrl('/app/home/request-list')
           this.snackBar.open('Request submitted successfully ')
         }
-      }, 1000)
+      },         1000)
     },
-      (error: any) => {
+                                                     (error: any) => {
         this.dialogRefs.close({ error })
         this.snackBar.open('Request Failed')
 
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
index 2a5456d04..d47225791 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
@@ -107,10 +107,10 @@ export class RequestListComponent implements OnInit {
 
 }
 
-getPointerEventsStyle(element:any){
+getPointerEventsStyle(element: any) {
   return {
-   'pointer-events': (element.status !== this.statusKey.Inprogress && 
-     element.status !== this.statusKey.invalid && 
+   'pointer-events': (element.status !== this.statusKey.Inprogress &&
+     element.status !== this.statusKey.invalid &&
      element.status !== this.statusKey.fullfill) ? 'auto' : 'none',
   }
  }
diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index f38c514a8..5a5e59392 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -85,6 +85,7 @@ import { HttpClientModule } from '@angular/common/http'
 import { DesignationModule } from './routes/designation/designation.module'
 import { OdcsMappingComponent } from './routes/odcs-mapping/odcs-mapping.component'
 import { environment } from '../../../../../../../src/environments/environment'
+import { TaxonomyEditorModule } from '@sunbird-cb/taxonomy-editor'
 
 @NgModule({
   declarations: [
@@ -187,7 +188,8 @@ import { environment } from '../../../../../../../src/environments/environment'
     MatAutocompleteModule,
     MatSlideToggleModule,
     HttpClientModule,
-    DesignationModule
+    DesignationModule,
+    TaxonomyEditorModule,
   ],
   entryComponents: [
     AdduserpopupComponent,
@@ -209,7 +211,7 @@ import { environment } from '../../../../../../../src/environments/environment'
     { provide: 'environment', useValue: environment },
     {
       provide: MatDialogRef,
-      useValue: {}
+      useValue: {},
     },
     { provide: MAT_DIALOG_DATA, useValue: {} },
     InitResolver,
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.spec.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.spec.ts
index bcd54e4f1..bc40c0f6e 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.spec.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.spec.ts
@@ -1,25 +1,25 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
 
-import { DesignationsComponent } from './designations.component';
+import { DesignationsComponent } from './designations.component'
 
 describe('DesignationsComponent', () => {
-  let component: DesignationsComponent;
-  let fixture: ComponentFixture<DesignationsComponent>;
+  let component: DesignationsComponent
+  let fixture: ComponentFixture<DesignationsComponent>
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ DesignationsComponent ]
+      declarations: [DesignationsComponent],
     })
-    .compileComponents();
-  }));
+    .compileComponents()
+  }))
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(DesignationsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+    fixture = TestBed.createComponent(DesignationsComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
 
   it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
index 5f6aab7de..40279bef9 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
@@ -10,28 +10,27 @@ import { ConformationPopupComponent } from '../../dialog-boxes/conformation-popu
 import { ActivatedRoute } from '@angular/router'
 import { environment } from '../../../../../../../../../../../src/environments/environment'
 
-
 @Component({
   selector: 'ws-app-designations',
   templateUrl: './designations.component.html',
-  styleUrls: ['./designations.component.scss']
+  styleUrls: ['./designations.component.scss'],
 })
 export class DesignationsComponent implements OnInit {
 
-  environmentVal: any
+  environment: any
   designationConfig: any
   frameworkConfig: any
   configSvc: any
-  loaderMsg: string = ''
+  loaderMsg = ''
   showCreateLoader = false
-  searchControl = new FormControl();
+  searchControl = new FormControl()
   frameworkDetails: any = {}
   organisationsList: any = []
-  selectedOrganisation: string = ''
+  selectedOrganisation = ''
   designationsList: any = []
   filteredDesignationsList: any = []
   tableData!: ITableData
-  showLoader: boolean = false
+  showLoader = false
   actionMenuItem: {
     name: string,
     icon: string,
@@ -53,38 +52,12 @@ export class DesignationsComponent implements OnInit {
   //#region (intial actions)
   initialization() {
     this.initializeDefaultValues()
-    this.getFrameworkInfo()
     this.valudChangeSubscribers()
-    // this.getRoutesData()
-  }
-
-  getRoutesData() {
-    this.environmentVal = environment
-    this.activateRoute.data.subscribe(data => {
-      this.designationConfig = data.pageData.data
-      this.frameworkConfig = this.designationConfig.frameworkConfig
-    })
-
-    this.configSvc = this.activateRoute.snapshot.data['configService']
-    console.log('this.configSvc', this.configSvc.orgReadData)
-    if (this.configSvc.orgReadData && this.configSvc.orgReadData.frameworkid) {
-      this.environmentVal.frameworkName = this.configSvc.orgReadData.frameworkid
-    } else {
-      this.createFreamwork()
-    }
-  }
-
-  createFreamwork() {
-    this.showCreateLoader = true
-    this.loaderMsg = this.designationConfig.frameworkCreationMSg
-    this.environmentVal.frameworkName = '1231231231_organisation_fw'
-  }
-
-  getFrameWorkDetails() {
-    this.designationsService.getOrgReadData(this.orgId)
+    this.getRoutesData()
   }
 
   initializeDefaultValues() {
+    this.configSvc = this.activateRoute.snapshot.data['configService']
     this.orgId = _.get(this.configSvc, 'userProfile.rootOrgId')
     this.actionMenuItem = [
       // {
@@ -103,8 +76,8 @@ export class DesignationsComponent implements OnInit {
         name: 'Remove',
         icon: 'delete',
         key: 'remove',
-        isMdoLeader: true
-      }
+        isMdoLeader: true,
+      },
     ]
 
     this.tableData = {
@@ -122,15 +95,61 @@ export class DesignationsComponent implements OnInit {
     }
   }
 
-  getFrameworkInfo() {
+  getRoutesData() {
+    this.environment = environment
+    this.activateRoute.data.subscribe(data => {
+      this.designationConfig = data.pageData.data
+      this.frameworkConfig = this.designationConfig.frameworkConfig
+    })
+
+    // console.log('this.configSvc', this.configSvc.orgReadData)
+    if (this.configSvc.orgReadData && this.configSvc.orgReadData.frameworkid) {
+      // this.environmentVal.frameworkName = this.configSvc.orgReadData.frameworkid
+      this.getFrameworkInfo(this.configSvc.orgReadData.frameworkid)
+    } else {
+      this.createFreamwork()
+    }
+  }
+
+  createFreamwork() {
+    this.showCreateLoader = true
+    this.loaderMsg = this.designationConfig.frameworkCreationMSg
+    const departmentName = _.get(this.configSvc, 'userProfile.departmentName').replace(/\s/g, '')
+    const masterFrameWorkName = this.environment.ODCSMasterFramework
+    this.designationsService.createFrameWork(masterFrameWorkName, this.orgId, departmentName).subscribe((res: any) => {
+      if (res) {
+        this.getOrgReadData()
+      }
+      // console.log('frameworkCreated: ', res)
+    })
+  }
+
+  getOrgReadData() {
+    this.showLoader = true
+    this.showCreateLoader = false
+    this.designationsService.getOrgReadData(this.orgId).subscribe((res: any) => {
+      if (_.get(res, 'frameworkid')) {
+        this.environment.frameworkName = _.get(res, 'frameworkid')
+        this.getFrameworkInfo(res.frameworkid)
+      } else {
+        setTimeout(() => {
+          this.getOrgReadData()
+        },         10000)
+      }
+      // console.log('orgFramework Details', res)
+    })
+  }
+
+  getFrameworkInfo(frameworkid: string) {
     this.showLoader = true
-    this.designationsService.getFrameworkInfo('organisation_fw').subscribe(res => {
+    this.environment.frameworkName = frameworkid
+    this.designationsService.getFrameworkInfo(frameworkid).subscribe(res => {
       this.showLoader = false
       this.frameworkDetails = _.get(res, 'result.framework')
       this.designationsService.setFrameWorkInfo(this.frameworkDetails)
 
       this.getOrganisations()
-      console.log('frame work: ', this.frameworkDetails)
+      // console.log('frame work: ', this.frameworkDetails)
     })
   }
 
@@ -141,27 +160,29 @@ export class DesignationsComponent implements OnInit {
           this.filterDesignations(response)
         },
         error: (error: HttpErrorResponse) => {
-          console.log(error)
-        }
+          if (error) {
+            // console.log(error)
+          }
+        },
       })
     }
   }
 
   getOrganisations() {
-    this.organisationsList = this.getTermsOfCategorie('organisation_fw_org')
+    this.organisationsList = this.getTermsByCode('org')
     this.selectedOrganisation = _.get(this.organisationsList, '[0].identifier', '')
     this.getDesignations()
   }
 
   getDesignations() {
-    this.designationsList = this.getTermsOfCategorie('organisation_fw_designation')
+    this.designationsList = this.getTermsByCode('designation')
     this.designationsService.setCurrentOrgDesignationsList(this.designationsList)
     this.filterDesignations()
   }
 
   // to get list from categories like designations, organisations
-  getTermsOfCategorie(catagoriIdentifier: string) {
-    const selectedCatagori = this.categoriesOfFramework.filter((catagori: any) => catagori.identifier === catagoriIdentifier)
+  getTermsByCode(code: string) {
+    const selectedCatagori = this.categoriesOfFramework.filter((catagori: any) => catagori.code === code)
     return _.get(selectedCatagori, '[0].terms', [])
   }
 
@@ -218,25 +239,25 @@ export class DesignationsComponent implements OnInit {
   }
 
   openConformationPopup(event: any) {
-    console.log('envent data', event)
+    // console.log('envent data', event)
     const dialogData = {
       descriptions: [
         {
           header: '',
           message: `Are you sure you want to remove the ${_.get(event, 'row.name')} designation?`,
-        }
+        },
       ],
       footerClass: 'items-center justify-end',
       buttons: [
         {
           btnText: 'Remove',
           btnClass: 'btn-full-red',
-          response: true
+          response: true,
         },
         {
           btnText: 'Cancel',
           btnClass: '',
-          response: false
+          response: false,
         },
       ],
     }
@@ -247,21 +268,19 @@ export class DesignationsComponent implements OnInit {
       maxWidth: '80vw',
       maxHeight: '90vh',
       height: '300px',
-      disableClose: true
+      disableClose: true,
     })
     dialogRef.afterClosed().subscribe((res: any) => {
       if (res) {
-        this.removeDesignation(event.row)
+        // this.removeDesignation(event.row)
       }
     })
   }
 
-  removeDesignation(designation: any) {
-    console.log(designation)
-  }
+  // removeDesignation(designation: any) {
+  //   console.log(designation)
+  // }
 
   //#endregion
 
-
-
 }
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.spec.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.spec.ts
index 5cb18f629..a34875740 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.spec.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.spec.ts
@@ -1,25 +1,25 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
 
-import { ImportDesignationComponent } from './import-designation.component';
+import { ImportDesignationComponent } from './import-designation.component'
 
 describe('ImportDesignationComponent', () => {
-  let component: ImportDesignationComponent;
-  let fixture: ComponentFixture<ImportDesignationComponent>;
+  let component: ImportDesignationComponent
+  let fixture: ComponentFixture<ImportDesignationComponent>
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ ImportDesignationComponent ]
+      declarations: [ImportDesignationComponent],
     })
-    .compileComponents();
-  }));
+    .compileComponents()
+  }))
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(ImportDesignationComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+    fixture = TestBed.createComponent(ImportDesignationComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
 
   it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
index e1a52d59e..72863ce09 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
@@ -2,21 +2,20 @@ import { Component, OnDestroy, OnInit } from '@angular/core'
 import { DesignationsService } from '../../services/designations.service'
 import { MatDialog, PageEvent } from '@angular/material'
 import { FormControl } from '@angular/forms'
-import { delay } from 'rxjs/operators'
+import { delay, map } from 'rxjs/operators'
 import { SelectedDesignationPopupComponent } from '../../dialog-boxes/selected-designation-popup/selected-designation-popup.component'
-import { forkJoin, of, Subscription } from 'rxjs'
-import { catchError, map } from 'rxjs/operators'
-import { HttpErrorResponse } from '@angular/common/http'
+import { forkJoin, Subscription } from 'rxjs'
+// import { HttpErrorResponse } from '@angular/common/http'
 import * as _ from 'lodash'
 import { LoaderService } from '../../../../../../../../../../../src/app/services/loader.service'
-import { ActivatedRoute, Router } from '@angular/router'
-import { environment } from '../../../../../../../../../../../src/environments/environment'
+import { Router } from '@angular/router'
+// import { environment } from '../../../../../../../../../../../src/environments/environment'
 import { ConformationPopupComponent } from '../../dialog-boxes/conformation-popup/conformation-popup.component'
 
 @Component({
   selector: 'ws-app-import-designation',
   templateUrl: './import-designation.component.html',
-  styleUrls: ['./import-designation.component.scss']
+  styleUrls: ['./import-designation.component.scss'],
 })
 export class ImportDesignationComponent implements OnInit, OnDestroy {
 
@@ -24,9 +23,9 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
   designationConfig: any
   frameworkConfig: any
   configSvc: any
-  loaderMsg: string = ''
+  loaderMsg = ''
   showCreateLoader = false
-  searchControl = new FormControl();
+  searchControl = new FormControl()
   igotDesignationsList: any = []
   selectedDesignationsList: any = []
   orgDesignationsList: any = []
@@ -44,7 +43,7 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
     private designationsService: DesignationsService,
     private dialog: MatDialog,
     private loaderService: LoaderService,
-    private activateRoute: ActivatedRoute,
+    // private activateRoute: ActivatedRoute,
     private route: Router
   ) { }
 
@@ -57,27 +56,27 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
     this.getFrameWorkDetails()
   }
 
-  getRoutesData() {
-    this.environmentVal = environment
-    this.activateRoute.data.subscribe(data => {
-      this.designationConfig = data.pageData.data
-      this.frameworkConfig = this.designationConfig.frameworkConfig
-    })
-
-    this.configSvc = this.activateRoute.snapshot.data['configService']
-    console.log('this.configSvc', this.configSvc.orgReadData)
-    if (this.configSvc.orgReadData && this.configSvc.orgReadData.frameworkid) {
-      this.environmentVal.frameworkName = this.configSvc.orgReadData.frameworkid
-    } else {
-      this.createFreamwork()
-    }
-  }
-
-  createFreamwork() {
-    this.showCreateLoader = true
-    this.loaderMsg = this.designationConfig.frameworkCreationMSg
-    this.environmentVal.frameworkName = '1231231231_organisation_fw'
-  }
+  // getRoutesData() {
+  //   this.environmentVal = environment
+  //   this.activateRoute.data.subscribe(data => {
+  //     this.designationConfig = data.pageData.data
+  //     this.frameworkConfig = this.designationConfig.frameworkConfig
+  //   })
+
+  //   this.configSvc = this.activateRoute.snapshot.data['configService']
+  //   console.log('this.configSvc', this.configSvc.orgReadData)
+  //   if (this.configSvc.orgReadData && this.configSvc.orgReadData.frameworkid) {
+  //     this.environmentVal.frameworkName = this.configSvc.orgReadData.frameworkid
+  //   } else {
+  //     this.createFramework()
+  //   }
+  // }
+
+  // createFramework() {
+  //   this.showCreateLoader = true
+  //   this.loaderMsg = this.designationConfig.frameworkCreationMSg
+  //   this.environmentVal.frameworkName = '1231231231_organisation_fw'
+  // }
 
   getFrameWorkDetails() {
     this.frameworkInfo = this.designationsService.frameWorkInfo
@@ -88,16 +87,16 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
 
   loadDesignations(searchKey: string = '') {
     this.loaderService.changeLoaderState(true)
-    let pageNumber = this.startIndex === 0 ? 0 : this.startIndex / this.pageSize
+    const pageNumber = this.startIndex === 0 ? 0 : this.startIndex / this.pageSize
     const requestParams: any = {
-      "filterCriteriaMap": {
-        "status": "Active"
+      pageNumber,
+      filterCriteriaMap: {
+        status: 'Active',
       },
-      "requestedFields": [],
-      "pageNumber": pageNumber,
-      "pageSize": this.pageSize
+      requestedFields: [],
+      pageSize: this.pageSize,
     }
-    this.startIndex
+    // this.startIndex
     if (searchKey) {
       requestParams['searchString'] = searchKey
     }
@@ -182,7 +181,7 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
     })
     dialogRef.afterClosed().subscribe((res: any[]) => {
       if (res && res.length > 0) {
-        this.selectedDesignationsList
+        // this.selectedDesignationsList
         this.removeDesignation(res)
       }
     })
@@ -210,54 +209,48 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
     // ]
 
     // this.importedDesignationNames = ['succes one', 'success two', 'succes one', 'success two', 'succes one', 'success two',
-    // 'succes one', 'success two', 'succes one', 'success two', 'succes one', 'success two', 'succes one', 'success two',]
+    //   'succes one', 'success two', 'succes one', 'success two', 'succes one', 'success two', 'succes one', 'success two',]
     // this.openConforamtionPopup()
 
     if (this.selctedDesignationsCount) {
-      const framework = _.get(this.frameworkInfo, 'code')
-      const category = 'designation'
       const observables = this.selectedDesignationsList.map((selectedDesignation: any) => {
         const requestBody = {
-          request: {
-            term: {
-              code: this.designationsService.getUuid,
-              name: selectedDesignation.designation,
-              description: selectedDesignation.description,
-              category: 'designation',
-              status: 'live',
-              refId: selectedDesignation.id,
-              refType: "designation",
-              additionalProperties: {}
-            }
-          }
+          name: selectedDesignation.designation,
+          code: this.designationsService.getUuid,
+          description: selectedDesignation.description,
+          refId: selectedDesignation.id,
+          refType: 'designation',
+          category: 'designation',
+          status: 'Live',
+          framework: _.get(this.frameworkInfo, 'code'),
         }
         this.designationsImportSuccessResponses =
-          _.get(this.frameworkInfo, 'categories[0].terms[0].associations').map((c: any) => {
+          _.get(this.frameworkInfo, 'categories[0].terms[0].associations', []).map((c: any) => {
             return c.identifier ? { identifier: c.identifier } : null
           })
-        // return this.designationsService.importDesigantion(framework, category, requestBody).pipe(
-        return this.designationsService.createTerm(framework, category, requestBody).pipe(
+        return this.designationsService.createTerm(requestBody).pipe(
           map(response => {
             this.designationsImportSuccessResponses.push({ identifier: _.get(response, 'result.node_id[0]') })
             this.importedDesignationNames.push(selectedDesignation.designation)
             return response
           }),
-          catchError(error => {
-            this.designationsImportFailed.push({ designation: selectedDesignation, error: error })
-            return of(null)
-          })
+          // catchError(error => {
+          //   this.designationsImportFailed.push({ designation: selectedDesignation, error })
+          //   return of(null)
+          // })
         )
       })
 
       forkJoin(observables).subscribe({
         next: response => {
-          console.log(response)
-          this.updateTerms()
+          if (response) {
+            this.updateTerms()
+          }
         },
-        error: (error: HttpErrorResponse) => {
-          const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
-          console.log(errorMessage)
-        }
+        // error: (error: HttpErrorResponse) => {
+        //   const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
+        //   console.log(errorMessage)
+        // },
       })
     }
   }
@@ -269,19 +262,20 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
     const requestBody = {
       request: {
         term: {
-          associations: this.designationsImportSuccessResponses
-        }
-      }
+          associations: this.designationsImportSuccessResponses,
+        },
+      },
     }
     this.designationsService.updateTerms(framework, category, categoryTermCode, requestBody).subscribe({
       next: response => {
-        this.publishFrameWork()
-        console.log('update response', response)
+        if (response) {
+          this.publishFrameWork()
+        }
       },
-      error: (error: HttpErrorResponse) => {
-        const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
-        console.log(errorMessage)
-      }
+      // error: (error: HttpErrorResponse) => {
+      //   const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
+      //   console.log(errorMessage)
+      // },
     })
   }
 
@@ -289,13 +283,15 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
     const frameworkName = _.get(this.frameworkInfo, 'code')
     this.designationsService.publishFramework(frameworkName).subscribe({
       next: response => {
-        console.log('publish', response)
-        this.openConforamtionPopup()
+        // console.log('publish', response)
+        if (response) {
+          this.openConforamtionPopup()
+        }
       },
-      error: (error: HttpErrorResponse) => {
-        const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
-        console.log(errorMessage)
-      }
+      // error: (error: HttpErrorResponse) => {
+      //   const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
+      //   console.log(errorMessage)
+      // },
     })
   }
 
@@ -305,7 +301,20 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
       const designationNames = this.designationsImportFailed.map((e: any) => e.designation.designation).join(', ')
       const description = {
         header: 'Import failed designations',
-        message: `Some thing went wrong while importing ${designationNames} designations`
+        messages: [
+          {
+            msgClass: '',
+            msg: 'Some thing went wrong while importing ',
+          },
+          {
+            msgClass: 'textBold',
+            msg: `${designationNames}`,
+          },
+          {
+            msgClass: '',
+            msg: ' designations',
+          },
+        ],
       }
       descriptions.push(description)
     }
@@ -313,22 +322,36 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
       const designationNames = this.importedDesignationNames.join(', ')
       const description = {
         header: 'Designations imported successfully',
-        message: `${designationNames} are imported successfully`
+        messages: [
+          {
+            msgClass: 'textBold',
+            msg: `${designationNames}`,
+          },
+          {
+            msgClass: '',
+            msg: ' are imported successfully',
+          },
+        ],
       }
       descriptions.push(description)
     }
 
     descriptions.push({
-      message: 'The changes will reflect shortly.'
+      messages: [
+        {
+          msgClass: '',
+          msg: 'The changes will reflect shortly.',
+        },
+      ],
     })
     const dialogData = {
-      descriptions: descriptions,
+      descriptions,
       footerClass: 'items-center justify-end',
       buttons: [
         {
           btnText: 'Cancel',
           btnClass: '',
-          response: false
+          response: false,
         },
       ],
     }
@@ -336,14 +359,14 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
     const dialogRef = this.dialog.open(ConformationPopupComponent, {
       data: dialogData,
       autoFocus: false,
-      minWidth: '500px',
+      width: '600px',
       maxWidth: '80vw',
       maxHeight: '90vh',
-      height: '300px',
-      disableClose: true
+      minHeight: '300px',
+      disableClose: true,
     })
     dialogRef.afterClosed().subscribe(() => {
-      // this.navigateToMyDesignations()
+      this.navigateToMyDesignations()
     })
   }
 
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/designation.module.ts b/project/ws/app/src/lib/routes/home/routes/designation/designation.module.ts
index e14c30c05..247f570f7 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/designation.module.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/designation.module.ts
@@ -55,7 +55,7 @@ const routes: Routes = [
     DesignationsComponent,
     ImportDesignationComponent,
     SelectedDesignationPopupComponent,
-    ConformationPopupComponent
+    ConformationPopupComponent,
   ],
   imports: [
     CommonModule,
@@ -72,14 +72,14 @@ const routes: Routes = [
     MatTableModule,
     UIORGTableModule,
     MatPaginatorModule,
-    MatDialogModule
+    MatDialogModule,
   ],
   entryComponents: [
     SelectedDesignationPopupComponent,
-    ConformationPopupComponent
+    ConformationPopupComponent,
   ],
   exports: [
     RouterModule,
-  ]
+  ],
 })
 export class DesignationModule { }
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.html b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.html
index 96c39122b..933acfbe0 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.html
@@ -30,9 +30,14 @@
     <ng-container *ngIf="description.header">
       <span class="header">{{description.header}}</span>
     </ng-container>
-    <ng-container *ngIf="description.message">
+    <ng-container *ngIf="description.messages">
       <div class="description mt-1 mb-6">
-        <span>{{description.message}}</span>
+        <span>
+          <ng-container *ngFor="let msgDetails of description.messages">
+            <span [ngClass]="msgDetails.msgClass">{{msgDetails.msg}}</span>
+          </ng-container>
+        </span>
+        <!-- <span>{{description.message}}</span> -->
       </div>
     </ng-container>
   </ng-container>
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.scss b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.scss
index 173335c2c..d7a39df6c 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.scss
@@ -14,10 +14,10 @@
 // }
 
 .dialog-container {
-    display: flex;
-    justify-content: center;
-    height: calc(100% - 60px);
-    flex-direction: column;
+    // display: flex;
+    // justify-content: center;
+    // height: calc(100% - 60px);
+    // flex-direction: column;
 
     .circule {
         width: 40px;
@@ -92,3 +92,7 @@
         cursor: pointer;
     }
 }
+
+.textBold {
+    font-weight: 700;
+}
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.spec.ts b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.spec.ts
index 8b90741b0..f23c8e9cc 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.spec.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.spec.ts
@@ -1,25 +1,25 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
 
-import { ConformationPopupComponent } from './conformation-popup.component';
+import { ConformationPopupComponent } from './conformation-popup.component'
 
 describe('ConformationPopupComponent', () => {
-  let component: ConformationPopupComponent;
-  let fixture: ComponentFixture<ConformationPopupComponent>;
+  let component: ConformationPopupComponent
+  let fixture: ComponentFixture<ConformationPopupComponent>
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ ConformationPopupComponent ]
+      declarations: [ConformationPopupComponent],
     })
-    .compileComponents();
-  }));
+    .compileComponents()
+  }))
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(ConformationPopupComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+    fixture = TestBed.createComponent(ConformationPopupComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
 
   it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.ts
index 642f56f42..bd5b3e0ef 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.ts
@@ -4,7 +4,7 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'
 @Component({
   selector: 'ws-app-conformation-popup',
   templateUrl: './conformation-popup.component.html',
-  styleUrls: ['./conformation-popup.component.scss']
+  styleUrls: ['./conformation-popup.component.scss'],
 })
 export class ConformationPopupComponent implements OnInit {
 
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/selected-designation-popup/selected-designation-popup.component.html b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/selected-designation-popup/selected-designation-popup.component.html
index 8c366c6df..5d86b6981 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/selected-designation-popup/selected-designation-popup.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/selected-designation-popup/selected-designation-popup.component.html
@@ -4,7 +4,7 @@
 </div>
 
 <div class="w-full flex flex-4 flex-row flex-wrap gap-5">
-  <ng-container *ngFor="let designation of selectedDesignationsList | slice : startIndex : lastIndex; let i = index">
+  <ng-container *ngFor="let designation of selectedDesignationsList; let i = index">
     <div class="flex flex-4 custom-user-card items-center justify-center">
       <div class="card-cross-icon">
         <button mat-mini-fab class="card-cross-btn flex flex-middle flex-center" type="button"
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/selected-designation-popup/selected-designation-popup.component.spec.ts b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/selected-designation-popup/selected-designation-popup.component.spec.ts
index b811127f3..8c7b9dea5 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/selected-designation-popup/selected-designation-popup.component.spec.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/selected-designation-popup/selected-designation-popup.component.spec.ts
@@ -1,25 +1,25 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
 
-import { SelectedDesignationPopupComponent } from './selected-designation-popup.component';
+import { SelectedDesignationPopupComponent } from './selected-designation-popup.component'
 
 describe('SelectedDesignationPopupComponent', () => {
-  let component: SelectedDesignationPopupComponent;
-  let fixture: ComponentFixture<SelectedDesignationPopupComponent>;
+  let component: SelectedDesignationPopupComponent
+  let fixture: ComponentFixture<SelectedDesignationPopupComponent>
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ SelectedDesignationPopupComponent ]
+      declarations: [SelectedDesignationPopupComponent],
     })
-    .compileComponents();
-  }));
+    .compileComponents()
+  }))
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(SelectedDesignationPopupComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+    fixture = TestBed.createComponent(SelectedDesignationPopupComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
 
   it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/selected-designation-popup/selected-designation-popup.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/selected-designation-popup/selected-designation-popup.component.ts
index de1a479b9..856211b66 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/selected-designation-popup/selected-designation-popup.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/selected-designation-popup/selected-designation-popup.component.ts
@@ -4,7 +4,7 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'
 @Component({
   selector: 'ws-app-selected-designation-popup',
   templateUrl: './selected-designation-popup.component.html',
-  styleUrls: ['./selected-designation-popup.component.scss']
+  styleUrls: ['./selected-designation-popup.component.scss'],
 })
 export class SelectedDesignationPopupComponent implements OnInit {
 
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.spec.ts b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.spec.ts
index 3ec2d72da..da0809d05 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.spec.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.spec.ts
@@ -1,12 +1,12 @@
-import { TestBed } from '@angular/core/testing';
+import { TestBed } from '@angular/core/testing'
 
-import { DesignationsService } from './designations.service';
+import { DesignationsService } from './designations.service'
 
 describe('DesignationsService', () => {
-  beforeEach(() => TestBed.configureTestingModule({}));
+  beforeEach(() => TestBed.configureTestingModule({}))
 
   it('should be created', () => {
-    const service: DesignationsService = TestBed.get(DesignationsService);
-    expect(service).toBeTruthy();
-  });
-});
+    const service: DesignationsService = TestBed.get(DesignationsService)
+    expect(service).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
index eff6787e3..032e248bf 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
@@ -1,8 +1,7 @@
 import { HttpClient } from '@angular/common/http'
 import { Injectable } from '@angular/core'
-import { mergeMap, tap } from 'rxjs/operators'
+import { mergeMap, tap, map } from 'rxjs/operators'
 import { Observable, of } from 'rxjs'
-import { map } from 'rxjs/operators'
 import { v4 as uuidv4 } from 'uuid'
 // tslint:disable
 import _ from 'lodash'
@@ -12,8 +11,8 @@ import { ConfigurationsService } from '@sunbird-cb/utils'
 
 const API_END_POINTS = {
   COPY_FRAMEWORK: `/api/framework/v1/copy/${environment.ODCSMasterFramework}`,
-  CREATE_TERM: (frameworkId: string, categoryId: string) =>
-    `apis/proxies/v8/framework/v1/term/create?framework=${frameworkId}&category=${categoryId}`,
+  // CREATE_TERM: (frameworkId: string, categoryId: string) =>
+  //   `apis/proxies/v8/framework/v1/term/create?framework=${frameworkId}&category=${categoryId}`,
   UPDATE_TERM: (frameworkId: string, categoryId: string, categoryTermCode: string) =>
     `apis/proxies/v8/framework/v1/term/update/${categoryTermCode}?framework=${frameworkId}&category=${categoryId}`,
   PUBLISH_FRAMEWORK: (frameworkName: string) =>
@@ -25,10 +24,13 @@ const API_END_POINTS = {
   GET_IGOT_MASTER_DESIGNATIONS: 'apis/proxies/v8/designation/search',
   IMPORT_DESIGNATION: 'api/framework/v1/term/create?',
   ORG_READ: '/apis/proxies/v8/org/v1/read',
+  CREATE_TERM: `/apis/proxies/v8/designation/create/term`,
+  CREATE_FRAME_WORK: (frameworkName: string, orgId: string, termName: string) =>
+    `/apis/proxies/v8/org/framework/read?frameworkName=${frameworkName}&orgId=${orgId}&termName=${termName}`,
 }
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class DesignationsService {
   list = new Map<string, any>()
@@ -37,12 +39,15 @@ export class DesignationsService {
   selectedDesignationList: any = []
   frameWorkInfo: any
 
-
   constructor(
     private http: HttpClient,
     private configSvc: ConfigurationsService,
   ) { }
 
+  createFrameWork(frameworkName: string, orgId: string, termName: string) {
+    return this.http.get<any>(API_END_POINTS.CREATE_FRAME_WORK(frameworkName, orgId, termName))
+  }
+
   getIgotMasterDesignations(req: any): Observable<any> {
     return this.http.post<any>(API_END_POINTS.GET_IGOT_MASTER_DESIGNATIONS, req).pipe(
       mergeMap((res: any) => {
@@ -62,7 +67,7 @@ export class DesignationsService {
     const result: any = {
       formatedDesignationsLsit: [],
       facets: response.facets,
-      totalCount: response.totalCount
+      totalCount: response.totalCount,
     }
     if (response.data) {
       response.data.forEach((masterDesignation: any) => {
@@ -103,7 +108,7 @@ export class DesignationsService {
   }
 
   formateData(response: any) {
-    (response.result.framework.categories).forEach((a: any) => {
+    _.get(response, 'result.framework.categories', []).forEach((a: any) => {
       this.list.set(a.code, {
         code: a.code,
         identifier: a.identifier,
@@ -122,7 +127,7 @@ export class DesignationsService {
             Object.assign(c, { children: associations })
           }
           return c
-        })
+        }),
       })
     })
 
@@ -150,26 +155,23 @@ export class DesignationsService {
     return this.http.post<any>(`${API_END_POINTS.COPY_FRAMEWORK}`, request).pipe(map(res => _.get(res, 'result.response')))
   }
 
-  createTerm(frameworkId: string, categoryId: string, requestBody: any) {
-    return this.http.post(`${API_END_POINTS.CREATE_TERM(
-      frameworkId,
-      categoryId,
-    )}`, requestBody)
+  createTerm(requestBody: any) {
+    return this.http.post(`${API_END_POINTS.CREATE_TERM}`, requestBody)
   }
 
-  getOrgReadData(organisationId: string) {
+  getOrgReadData(organisationId: string): Observable<any> {
     const request = {
-      "request": {
-        "organisationId": organisationId
-      }
+      request: {
+        organisationId,
+      },
     }
-    this.http
+    return this.http
       .post<any>(API_END_POINTS.ORG_READ, request)
       .pipe(map((res: any) => {
         this.configSvc.orgReadData = _.get(res, 'result.response')
         return _.get(res, 'result.response')
       }))
-      .toPromise()
+    // .toPromise()
   }
 
   updateTerms(frameworkId: string, categoryId: string, categoryTermCode: string, reguestBody: any) {
@@ -177,7 +179,7 @@ export class DesignationsService {
       frameworkId,
       categoryId,
       categoryTermCode
-    )}`, reguestBody)
+    )}`,                   reguestBody)
   }
 
   publishFramework(frameworkName: string) {
diff --git a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.spec.ts b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.spec.ts
index 2ee2b60b6..38045490a 100644
--- a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.spec.ts
+++ b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.spec.ts
@@ -1,25 +1,25 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
 
-import { OdcsMappingComponent } from './odcs-mapping.component';
+import { OdcsMappingComponent } from './odcs-mapping.component'
 
 describe('OdcsMappingComponent', () => {
-  let component: OdcsMappingComponent;
-  let fixture: ComponentFixture<OdcsMappingComponent>;
+  let component: OdcsMappingComponent
+  let fixture: ComponentFixture<OdcsMappingComponent>
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ OdcsMappingComponent ]
+      declarations: [OdcsMappingComponent],
     })
-    .compileComponents();
-  }));
+    .compileComponents()
+  }))
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(OdcsMappingComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+    fixture = TestBed.createComponent(OdcsMappingComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
 
   it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
index e8c1dee9d..ab3b5c879 100644
--- a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
@@ -1,12 +1,14 @@
 import { Component, OnInit } from '@angular/core'
 import { environment } from '../../../../../../../../../src/environments/environment'
 import { ActivatedRoute } from '@angular/router'
+import * as _ from 'lodash'
+import { DesignationsService } from '../designation/services/designations.service'
 // import { OdcsService } from '../../services/odcs.service'
 
 @Component({
   selector: 'ws-app-odcs-mapping',
   templateUrl: './odcs-mapping.component.html',
-  styleUrls: ['./odcs-mapping.component.scss']
+  styleUrls: ['./odcs-mapping.component.scss'],
 })
 export class OdcsMappingComponent implements OnInit {
   environmentVal: any
@@ -16,9 +18,11 @@ export class OdcsMappingComponent implements OnInit {
   configSvc: any
   showLoader = false
   loaderMsg = ''
+  orgId = ''
 
   constructor(
     private activateRoute: ActivatedRoute,
+    private designationsService: DesignationsService,
     // private odcsSvc: OdcsService
   ) { }
 
@@ -31,17 +35,44 @@ export class OdcsMappingComponent implements OnInit {
 
     // to check whether organisation is already having fraworkid or we have initiate the process
     this.configSvc = this.activateRoute.snapshot.data['configService']
-    console.log('this.configSvc', this.configSvc.orgReadData)
+    this.orgId = _.get(this.configSvc, 'userProfile.rootOrgId')
+    // console.log('this.configSvc', this.configSvc.orgReadData)
     if (this.configSvc.orgReadData && this.configSvc.orgReadData.frameworkid) {
       this.environmentVal.frameworkName = this.configSvc.orgReadData.frameworkid
     } else {
-      this.showLoader = true
+      this.showLoader = false
       this.loaderMsg = this.odcConfig.frameworkCreationMSg
-      // this.initFramworkCreation()
-      this.environmentVal.frameworkName = '1231231231_organisation_fw'
+      this.createFreamwork()
     }
   }
 
+  createFreamwork() {
+    this.loaderMsg = this.odcConfig.frameworkCreationMSg
+    const departmentName = _.get(this.configSvc, 'userProfile.departmentName').replace(/\s/g, '')
+    const masterFrameWorkName = this.environmentVal.ODCSMasterFramework
+    this.designationsService.createFrameWork(masterFrameWorkName, this.orgId, departmentName).subscribe((res: any) => {
+      if (res) {
+        this.getOrgReadData()
+      }
+      // console.log('frameworkCreated: ', res)
+    })
+  }
+
+  getOrgReadData() {
+    this.showLoader = true
+    this.designationsService.getOrgReadData(this.orgId).subscribe((res: any) => {
+      if (_.get(res, 'frameworkid')) {
+        this.environmentVal.frameworkName = (_.get(res, 'frameworkid'))
+        this.environmentVal.frameworkType = 'MDO_DESIGNATION'
+        this.environmentVal.kcmFrameworkName = environment.KCMframeworkName
+      } else {
+        setTimeout(() => {
+          this.getOrgReadData()
+        },         10000)
+      }
+    })
+  }
+
   // async initFramworkCreation() {
   //   try {
   //     await this.copyFrameworkCreate()
@@ -55,7 +86,6 @@ export class OdcsMappingComponent implements OnInit {
   //   }
   // }
 
-
   // copyFrameworkCreate() {
   //   return new Promise((resolve, reject) => {
   //     console.log('configSvc', this.configSvc.orgReadData)
diff --git a/src/app/services/init.service.ts b/src/app/services/init.service.ts
index 4e3abd4a8..6c2aba3be 100644
--- a/src/app/services/init.service.ts
+++ b/src/app/services/init.service.ts
@@ -444,9 +444,9 @@ export class InitService {
 
   async fetchOrgReadData(completeProdata: any) {
     const request = {
-      "request": {
-        "organisationId": completeProdata.organisations[0].organisationId
-      }
+      request: {
+        organisationId: completeProdata.organisations[0].organisationId,
+      },
     }
     let orgReadData: any | null = null
     orgReadData = await this.http
@@ -465,9 +465,9 @@ export class InitService {
   async fetchOrgReadDataCopy(id: string) {
     if (id) {
       const request = {
-        "request": {
-          "organisationId": id
-        }
+        request: {
+          organisationId: id,
+        },
       }
       let orgReadData: any | null = null
       orgReadData = await this.http

From 489b0fce70cead48513c4f4a1d0acb06afd5ab31 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Tue, 23 Jul 2024 10:31:45 +0530
Subject: [PATCH 776/887] odcs designations added snackbars and api changes

---
 .../designations/designations.component.html  |  4 +-
 .../designations/designations.component.scss  |  6 +-
 .../designations/designations.component.ts    | 18 ++++--
 .../import-designation.component.ts           | 55 +++++++++++--------
 .../services/designations.service.ts          |  2 +-
 .../odcs-mapping/odcs-mapping.component.ts    |  6 +-
 6 files changed, 56 insertions(+), 35 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html
index 88b5fdad9..8581bf19c 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html
@@ -1,7 +1,7 @@
 <div class="flex flex-4 flex-column">
   <mat-card>
     <mat-card-title class="flex-4 mobile-margin mat-h2">
-      My Designation Master
+      Designation Master
     </mat-card-title>
     <mat-card-content class="designationTable pt-4">
       <ng-container *ngIf="!showCreateLoader; else fw_create_loader">
@@ -41,7 +41,7 @@
           </ng-template>
         </ng-container>
         <ng-container *ngIf="showLoader">
-          <div class="flex flex-1 loader-box">
+          <div class="flex flex-1 items-center justify-center loader-box w-full designations-loader">
             <mat-spinner strokeWidth="3" diameter="50"></mat-spinner>
           </div>
         </ng-container>
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.scss b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.scss
index bdd6b5456..b271b044a 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.scss
@@ -64,4 +64,8 @@
 
 .download-icon {
   margin-right: 5px;
-}
\ No newline at end of file
+}
+
+.designations-loader {
+  height: 100px;
+}
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
index 40279bef9..6700cad11 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
@@ -5,7 +5,7 @@ import { DesignationsService } from '../../services/designations.service'
 import { FormControl } from '@angular/forms'
 import { delay } from 'rxjs/operators'
 import { HttpErrorResponse } from '@angular/common/http'
-import { MatDialog } from '@angular/material'
+import { MatDialog, MatSnackBar } from '@angular/material'
 import { ConformationPopupComponent } from '../../dialog-boxes/conformation-popup/conformation-popup.component'
 import { ActivatedRoute } from '@angular/router'
 import { environment } from '../../../../../../../../../../../src/environments/environment'
@@ -43,6 +43,7 @@ export class DesignationsComponent implements OnInit {
     private designationsService: DesignationsService,
     private dialog: MatDialog,
     private activateRoute: ActivatedRoute,
+    private snackBar: MatSnackBar,
   ) { }
 
   ngOnInit() {
@@ -125,10 +126,10 @@ export class DesignationsComponent implements OnInit {
   }
 
   getOrgReadData() {
-    this.showLoader = true
-    this.showCreateLoader = false
     this.designationsService.getOrgReadData(this.orgId).subscribe((res: any) => {
       if (_.get(res, 'frameworkid')) {
+        this.showLoader = true
+        this.showCreateLoader = false
         this.environment.frameworkName = _.get(res, 'frameworkid')
         this.getFrameworkInfo(res.frameworkid)
       } else {
@@ -160,9 +161,8 @@ export class DesignationsComponent implements OnInit {
           this.filterDesignations(response)
         },
         error: (error: HttpErrorResponse) => {
-          if (error) {
-            // console.log(error)
-          }
+          const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
+          this.openSnackbar(errorMessage)
         },
       })
     }
@@ -281,6 +281,12 @@ export class DesignationsComponent implements OnInit {
   //   console.log(designation)
   // }
 
+  private openSnackbar(primaryMsg: any, duration: number = 5000) {
+    this.snackBar.open(primaryMsg, 'X', {
+      duration,
+    })
+  }
+
   //#endregion
 
 }
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
index 72863ce09..085ff979d 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
@@ -1,11 +1,11 @@
 import { Component, OnDestroy, OnInit } from '@angular/core'
 import { DesignationsService } from '../../services/designations.service'
-import { MatDialog, PageEvent } from '@angular/material'
+import { MatDialog, MatSnackBar, PageEvent } from '@angular/material'
 import { FormControl } from '@angular/forms'
-import { delay, map } from 'rxjs/operators'
+import { catchError, delay, map } from 'rxjs/operators'
 import { SelectedDesignationPopupComponent } from '../../dialog-boxes/selected-designation-popup/selected-designation-popup.component'
-import { forkJoin, Subscription } from 'rxjs'
-// import { HttpErrorResponse } from '@angular/common/http'
+import { forkJoin, of, Subscription } from 'rxjs'
+import { HttpErrorResponse } from '@angular/common/http'
 import * as _ from 'lodash'
 import { LoaderService } from '../../../../../../../../../../../src/app/services/loader.service'
 import { Router } from '@angular/router'
@@ -44,7 +44,8 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
     private dialog: MatDialog,
     private loaderService: LoaderService,
     // private activateRoute: ActivatedRoute,
-    private route: Router
+    private route: Router,
+    private snackBar: MatSnackBar,
   ) { }
 
   ngOnInit() {
@@ -212,6 +213,7 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
     //   'succes one', 'success two', 'succes one', 'success two', 'succes one', 'success two', 'succes one', 'success two',]
     // this.openConforamtionPopup()
 
+    this.loaderService.changeLoaderState(true)
     if (this.selctedDesignationsCount) {
       const observables = this.selectedDesignationsList.map((selectedDesignation: any) => {
         const requestBody = {
@@ -230,14 +232,14 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
           })
         return this.designationsService.createTerm(requestBody).pipe(
           map(response => {
-            this.designationsImportSuccessResponses.push({ identifier: _.get(response, 'result.node_id[0]') })
+            this.designationsImportSuccessResponses.push({ identifier: _.get(response, 'result.identifier[0]') })
             this.importedDesignationNames.push(selectedDesignation.designation)
             return response
           }),
-          // catchError(error => {
-          //   this.designationsImportFailed.push({ designation: selectedDesignation, error })
-          //   return of(null)
-          // })
+          catchError(error => {
+            this.designationsImportFailed.push({ error, designation: selectedDesignation })
+            return of(null)
+          })
         )
       })
 
@@ -247,10 +249,10 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
             this.updateTerms()
           }
         },
-        // error: (error: HttpErrorResponse) => {
-        //   const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
-        //   console.log(errorMessage)
-        // },
+        error: (error: HttpErrorResponse) => {
+          const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
+          this.openSnackbar(errorMessage)
+        },
       })
     }
   }
@@ -272,10 +274,10 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
           this.publishFrameWork()
         }
       },
-      // error: (error: HttpErrorResponse) => {
-      //   const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
-      //   console.log(errorMessage)
-      // },
+      error: (error: HttpErrorResponse) => {
+        const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
+        this.openSnackbar(errorMessage)
+      },
     })
   }
 
@@ -283,15 +285,15 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
     const frameworkName = _.get(this.frameworkInfo, 'code')
     this.designationsService.publishFramework(frameworkName).subscribe({
       next: response => {
-        // console.log('publish', response)
+        this.loaderService.changeLoaderState(false)
         if (response) {
           this.openConforamtionPopup()
         }
       },
-      // error: (error: HttpErrorResponse) => {
-      //   const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
-      //   console.log(errorMessage)
-      // },
+      error: (error: HttpErrorResponse) => {
+        const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
+        this.openSnackbar(errorMessage)
+      },
     })
   }
 
@@ -362,7 +364,6 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
       width: '600px',
       maxWidth: '80vw',
       maxHeight: '90vh',
-      minHeight: '300px',
       disableClose: true,
     })
     dialogRef.afterClosed().subscribe(() => {
@@ -374,6 +375,12 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
     this.route.navigateByUrl('app/home/org-designations')
   }
 
+  private openSnackbar(primaryMsg: any, duration: number = 5000) {
+    this.snackBar.open(primaryMsg, 'X', {
+      duration,
+    })
+  }
+
   ngOnDestroy(): void {
     this.designationsService.updateSelectedDesignationList([])
     this.loaderService.changeLoaderState(false)
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
index 032e248bf..30c0cbb68 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
@@ -72,7 +72,7 @@ export class DesignationsService {
     if (response.data) {
       response.data.forEach((masterDesignation: any) => {
         masterDesignation['isOrgDesignation'] = (this.orgDesignationList
-          .findIndex((element: any) => element.name === masterDesignation.designation) > -1) ? true : false
+          .findIndex((element: any) => element.refId === masterDesignation.id) > -1) ? true : false
         if (this.selectedDesignationList.findIndex((element: any) => element.id === masterDesignation.id) > -1) {
           masterDesignation['selected'] = true
           // result.formatedDesignationsLsit.unshift(masterDesignation)
diff --git a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
index ab3b5c879..06646c1a6 100644
--- a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
@@ -39,6 +39,10 @@ export class OdcsMappingComponent implements OnInit {
     // console.log('this.configSvc', this.configSvc.orgReadData)
     if (this.configSvc.orgReadData && this.configSvc.orgReadData.frameworkid) {
       this.environmentVal.frameworkName = this.configSvc.orgReadData.frameworkid
+      this.odcConfig.defaultOdcsConfig[0].frameworkId = this.configSvc.orgReadData.frameworkid
+      this.environmentVal.frameworkType = 'MDO_DESIGNATION'
+      this.taxonomyConfig = [...this.odcConfig.defaultOdcsConfig, ...this.odcConfig.frameworkConfig]
+      this.environmentVal.kcmFrameworkName = environment.KCMframeworkName
     } else {
       this.showLoader = false
       this.loaderMsg = this.odcConfig.frameworkCreationMSg
@@ -68,7 +72,7 @@ export class OdcsMappingComponent implements OnInit {
       } else {
         setTimeout(() => {
           this.getOrgReadData()
-        },         10000)
+        }, 10000)
       }
     })
   }

From 0f976856329dcef033bfb2603cc7c1586c69e568 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Tue, 23 Jul 2024 10:39:07 +0530
Subject: [PATCH 777/887] odcs designations header change

---
 .../components/designations/designations.component.html         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html
index 8581bf19c..47fcdf13d 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html
@@ -1,7 +1,7 @@
 <div class="flex flex-4 flex-column">
   <mat-card>
     <mat-card-title class="flex-4 mobile-margin mat-h2">
-      Designation Master
+      My Designation Master
     </mat-card-title>
     <mat-card-content class="designationTable pt-4">
       <ng-container *ngIf="!showCreateLoader; else fw_create_loader">

From b7d5b39ec486adc1a97da99e544a9e4bb2897c86 Mon Sep 17 00:00:00 2001
From: Bharath Kumar <bharathkumar@TI-MAC-087.local>
Date: Tue, 23 Jul 2024 11:02:29 +0530
Subject: [PATCH 778/887] change in the auto framework creation

---
 package.json                                                  | 2 +-
 .../routes/home/routes/odcs-mapping/odcs-mapping.component.ts | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index b827b1abc..0b006126e 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "@sunbird-cb/micro-surveys": "2.0.13",
     "@sunbird-cb/rain-dashboards": "0.4.33",
     "@sunbird-cb/resolver": "^1.0.0",
-    "@sunbird-cb/taxonomy-editor": "^0.0.12",
+    "@sunbird-cb/taxonomy-editor": "^0.0.14",
     "@sunbird-cb/utils": "^1.0.18",
     "@types/file-saver": "^2.0.1",
     "brace": "^0.11.1",
diff --git a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
index 06646c1a6..e9a93a2d7 100644
--- a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
@@ -68,11 +68,13 @@ export class OdcsMappingComponent implements OnInit {
       if (_.get(res, 'frameworkid')) {
         this.environmentVal.frameworkName = (_.get(res, 'frameworkid'))
         this.environmentVal.frameworkType = 'MDO_DESIGNATION'
+        this.odcConfig.defaultOdcsConfig[0].frameworkId = (_.get(res, 'frameworkid'))
+        this.taxonomyConfig = [...this.odcConfig.defaultOdcsConfig, ...this.odcConfig.frameworkConfig]
         this.environmentVal.kcmFrameworkName = environment.KCMframeworkName
       } else {
         setTimeout(() => {
           this.getOrgReadData()
-        }, 10000)
+        },         10000)
       }
     })
   }

From 4feab6b6ee5d1d7f3914b559026c58d48fc97507 Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Tue, 23 Jul 2024 13:49:44 +0530
Subject: [PATCH 779/887] Task #0000: Version update for taxonomy lib

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0b006126e..4e9baa81e 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "@sunbird-cb/micro-surveys": "2.0.13",
     "@sunbird-cb/rain-dashboards": "0.4.33",
     "@sunbird-cb/resolver": "^1.0.0",
-    "@sunbird-cb/taxonomy-editor": "^0.0.14",
+    "@sunbird-cb/taxonomy-editor": "^0.0.15",
     "@sunbird-cb/utils": "^1.0.18",
     "@types/file-saver": "^2.0.1",
     "brace": "^0.11.1",

From d67f3a159cf49d943804bfcad0ad081d23229c2a Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Wed, 24 Jul 2024 12:42:57 +0530
Subject: [PATCH 780/887] KB-5841 fix

---
 .../components/user-cards/user-card.component.html    | 11 +++++++++--
 .../components/user-cards/user-card.component.scss    |  5 +++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 16a7d598d..93d5078dc 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -86,10 +86,13 @@
                 </mat-form-field>
                 <mat-icon class="verified-icon margin-left-xs"
                   *ngIf="user?.profileDetails?.profileGroupStatus === 'VERIFIED'">
-                  check_circle</mat-icon>
+                  check_circle</mat-icon> <span *ngIf="user?.profileDetails?.profileGroupStatus === 'VERIFIED'"
+                  class="mat-caption status-text ws-mat-black40-text"> Verified</span>
+
                 <mat-icon class="nonverified-icon margin-left-xs"
                   *ngIf="user?.profileDetails?.profileGroupStatus === 'NOT-VERIFIED'">
-                  cancel</mat-icon>
+                  cancel</mat-icon> <span *ngIf="user?.profileDetails?.profileGroupStatus === 'NOT-VERIFIED'"
+                  class="mat-caption status-text ws-mat-black40-text"> Non-verified</span>
               </div>
               <div class="md:w-1/3">
                 <label class="margin-remove-bottom form-label">Designation</label>
@@ -110,9 +113,13 @@
                 <mat-icon class="verified-icon margin-left-xs"
                   *ngIf="user?.profileDetails?.profileDesignationStatus === 'VERIFIED'">
                   check_circle</mat-icon>
+                <span *ngIf="user?.profileDetails?.profileDesignationStatus === 'VERIFIED'"
+                  class="mat-caption status-text ws-mat-black40-text"> Verified</span>
                 <mat-icon class="nonverified-icon margin-left-xs"
                   *ngIf="user?.profileDetails?.profileDesignationStatus === 'NOT-VERIFIED'">
                   cancel</mat-icon>
+                <span *ngIf="user?.profileDetails?.profileDesignationStatus === 'NOT-VERIFIED'"
+                  class="mat-caption status-text ws-mat-black40-text"> Non-verified</span>
               </div>
             </div>
           </div>
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
index faac511cb..cd9983174 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
@@ -368,4 +368,9 @@ label {
     border-radius: 4px;
     border: 1px solid rgba(0, 0, 0, .14);
     font-family: Lato;
+}
+
+.status-text {
+  position: relative;
+  top: -2px;
 }
\ No newline at end of file

From a11fc38777639dbfd28e443ebab805fdc06d118d Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Wed, 24 Jul 2024 14:14:38 +0530
Subject: [PATCH 781/887] new ui changes in my designations

---
 .../designations/designations.component.html  | 124 ++++++----
 .../designations/designations.component.scss  |  41 +++-
 .../designations/designations.component.ts    |  10 +-
 .../import-designation.component.html         | 126 +++++-----
 .../import-designation.component.scss         |  69 ++++--
 .../import-designation.component.ts           | 219 +++++++++---------
 .../routes/designation/designation.module.ts  |   2 +-
 .../services/designations.service.ts          |   5 +-
 8 files changed, 356 insertions(+), 240 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html
index 47fcdf13d..53aec492a 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html
@@ -1,57 +1,87 @@
-<div class="flex flex-4 flex-column">
-  <mat-card>
-    <mat-card-title class="flex-4 mobile-margin mat-h2">
-      My Designation Master
-    </mat-card-title>
-    <mat-card-content class="designationTable pt-4">
-      <ng-container *ngIf="!showCreateLoader; else fw_create_loader">
-        <div class="w-full flex justify-between items-center mb-6">
-          <div class="flex items-center">
-            <div class="search">
-              <div class=rsearch>
-                <mat-icon class="color-60 search-icon">search</mat-icon>
-                <input [formControl]="searchControl" class="sinput color-60" type="Standard" placeholder="Search">
-              </div>
+<div class="flex flex-column gap-4 pt-4">
+  <div class="flex justify-between items-center">
+    <div class="mobile-margin text-capitalize mat-h2">{{designationConfig.mainHeading}}</div>
+    <div>
+      <button mat-raised-button class="importBtn" [routerLink]="'import-designation'" type="button">
+        Import from Igot master
+      </button>
+    </div>
+  </div>
+
+  <mat-card class="mb-4">
+    <mat-card-content class="flex gap-4">
+      <div class="section-1">
+        <div class="flex-4 mobile-margin text-capitalize mat-h2">{{designationConfig?.topsection?.heading}}</div>
+        <ng-container *ngFor="let step of designationConfig?.topsection?.steps">
+          <div class="flex gap-4 mb-4">
+            <div>
+              <mat-icon class="infoIcon">info_outlined</mat-icon>
+            </div>
+            <div>
+              <p>{{step.title}}</p>
             </div>
           </div>
-          <div class="flex items-center">
-            <button class="font-normal ws-mat-primary-border attendBtn mat-raised-button"
-              [routerLink]="'import-designation'" type="button">
-              Import from Igot master
-            </button>
+        </ng-container>
+      </div>
+      <ng-container *ngIf="designationConfig?.topsection?.guideVideo?.enabled">
+        <video width="173" height="102" controls>
+          <source src="{{designationConfig?.topsection?.guideVideo?.url}}"
+            type="{{designationConfig?.topsection?.guideVideo?.type}}">
+        </video>
+      </ng-container>
+      <!-- <div class="designationsDemo flex justify-end section-2">
+        <div class="designationsDemoVideo flex flex-column flex-middle justify-center" (click)="openVideoPopup()">
+          <mat-icon class="video_icon mb-2">play_circle</mat-icon>
+          <div>
+            Watch how it works
           </div>
         </div>
-        <ng-container *ngIf="!showLoader">
-          <ng-container *ngIf="designationsList.length === 0; else designationsTable">
-            <div class="w-full flex flex-col justify-center items-center emptyDesignations">
-              <div></div>
-              <div>
-                <p>No designations have been added to your master's list yet</p>
-              </div>
-              <div class="mt-4">
-                <button mat-raised-button [routerLink]="'import-designation'">
-                  <mat-icon class="download-icon">download</mat-icon>Start Importing</button>
-              </div>
+      </div> -->
+    </mat-card-content>
+  </mat-card>
+
+  <div class="w-full">
+    <ng-container *ngIf="!showCreateLoader; else fw_create_loader">
+      <div class="w-full flex justify-between items-center mb-6">
+        <div class="flex items-center">
+          <div class="search">
+            <div class=rsearch>
+              <mat-icon class="color-60 search-icon">search</mat-icon>
+              <input [formControl]="searchControl" class="sinput color-60" type="Standard" placeholder="Search">
+            </div>
+          </div>
+        </div>
+      </div>
+      <ng-container *ngIf="!showLoader">
+        <ng-container *ngIf="designationsList.length === 0; else designationsTable">
+          <div class="w-full flex flex-col justify-center items-center emptyDesignations">
+            <img src="/assets/icons/empty_data.svg" class="empty-desigantions-img">
+            <div>
+              <p class="empty-desigantions-text">No deisgnation has been imported from iGOT master.</p>
+            </div>
+            <div class="mt-4">
+              <button mat-raised-button class="importBtn" [routerLink]="'import-designation'">
+                Start Importing</button>
             </div>
-          </ng-container>
-          <ng-template #designationsTable>
-            <ws-widget-org-user-table [tableData]="tableData" [data]="filteredDesignationsList"
-              [actionMenuItem]="actionMenuItem" [isSearchBar]=false
-              (actionsClick)="menuSelected($event)"></ws-widget-org-user-table>
-          </ng-template>
-        </ng-container>
-        <ng-container *ngIf="showLoader">
-          <div class="flex flex-1 items-center justify-center loader-box w-full designations-loader">
-            <mat-spinner strokeWidth="3" diameter="50"></mat-spinner>
           </div>
         </ng-container>
+        <ng-template #designationsTable>
+          <ws-widget-org-user-table [tableData]="tableData" [data]="filteredDesignationsList"
+            [actionMenuItem]="actionMenuItem" [isSearchBar]=false
+            (actionsClick)="menuSelected($event)"></ws-widget-org-user-table>
+        </ng-template>
       </ng-container>
-      <ng-template #fw_create_loader>
-        <div class="flex flex-col flex-1 w-100 items-center pt-5 text-center">
-          <mat-spinner class="display-inline-block mb-5" [diameter]="50" [strokeWidth]="3"></mat-spinner>
-          <p>{{loaderMsg}}</p>
+      <ng-container *ngIf="showLoader">
+        <div class="flex flex-1 items-center justify-center loader-box w-full designations-loader">
+          <mat-spinner strokeWidth="3" diameter="50"></mat-spinner>
         </div>
-      </ng-template>
-    </mat-card-content>
-  </mat-card>
+      </ng-container>
+    </ng-container>
+    <ng-template #fw_create_loader>
+      <div class="flex flex-col flex-1 w-100 items-center pt-5 text-center">
+        <mat-spinner class="display-inline-block mb-5" [diameter]="50" [strokeWidth]="3"></mat-spinner>
+        <p>{{loaderMsg}}</p>
+      </div>
+    </ng-template>
+  </div>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.scss b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.scss
index b271b044a..1eaddf316 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.scss
@@ -4,6 +4,32 @@
    }
 }
 
+.importBtn {
+  background: #1b4ca1 !important;
+  color: #ffffff !important;
+  font-family: "Lato";
+  height: 40px;
+  font-size: 14px;
+  font-weight: 700;
+  width: 220px;
+}
+
+.designationsDemo {
+    .designationsDemoVideo {
+      width: 290px;
+      height: 163px;
+      border-radius: 5px;
+      background-color: #FDEAD5;
+      font-weight: 600;
+      pointer-events: all;
+      cursor: pointer;
+
+      .video_icon {
+        font-size: 32px;
+      }
+    }
+  }
+
 .organisation-lable {
   font-family: 'lato';
   font-weight: 700;
@@ -58,8 +84,19 @@
   }
 }
 
+.empty-desigantions-img {
+  height: 90px;
+  width: 170px;
+}
+
 .emptyDesignations{
-  height: calc(100vh - 300px);
+  height: calc(100vh - 600px);
+}
+
+.empty-desigantions-text {
+  font-size: 14px;
+  font-weight: 600;
+  font-family: Lato;
 }
 
 .download-icon {
@@ -67,5 +104,5 @@
 }
 
 .designations-loader {
-  height: 100px;
+  height: calc(100vh - 600px);
 }
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
index 6700cad11..32ab21287 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
@@ -19,7 +19,6 @@ export class DesignationsComponent implements OnInit {
 
   environment: any
   designationConfig: any
-  frameworkConfig: any
   configSvc: any
   loaderMsg = ''
   showCreateLoader = false
@@ -84,8 +83,8 @@ export class DesignationsComponent implements OnInit {
     this.tableData = {
       columns: [
         { displayName: 'Designation', key: 'name' },
-        { displayName: 'Imported by', key: 'Importedby' },
-        { displayName: 'Imported on', key: 'Importedon' },
+        { displayName: 'Imported by', key: 'importedByName' },
+        { displayName: 'Imported on', key: 'importedOn' },
       ],
       needCheckBox: false,
       needHash: false,
@@ -100,7 +99,6 @@ export class DesignationsComponent implements OnInit {
     this.environment = environment
     this.activateRoute.data.subscribe(data => {
       this.designationConfig = data.pageData.data
-      this.frameworkConfig = this.designationConfig.frameworkConfig
     })
 
     // console.log('this.configSvc', this.configSvc.orgReadData)
@@ -135,7 +133,7 @@ export class DesignationsComponent implements OnInit {
       } else {
         setTimeout(() => {
           this.getOrgReadData()
-        },         10000)
+        }, 10000)
       }
       // console.log('orgFramework Details', res)
     })
@@ -289,4 +287,6 @@ export class DesignationsComponent implements OnInit {
 
   //#endregion
 
+  // openVideoPopup() { }
+
 }
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.html b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.html
index 88d324473..25792d6f1 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.html
@@ -1,22 +1,34 @@
-<div class="flex flex-4 flex-column">
-  <mat-card>
-    <mat-card-title class="flex-4 mobile-margin mat-h2">
-      Import from Igot Master
-    </mat-card-title>
-    <mat-card-content class="master-designations pt-4">
-      <ng-container *ngIf="!showCreateLoader; else fw_create_loader">
-        <div class="w-full flex justify-between items-center mb-6">
-          <div class="flex items-center">
-            <div class="search">
-              <div class=rsearch>
-                <mat-icon class="color-60 search-icon">search</mat-icon>
-                <input [formControl]="searchControl" class="sinput color-60" type="Standard" placeholder="Search">
-              </div>
+<div class="flex flex-column">
+  <div class="flex w-full justify-between items-center">
+    <div class="flex gap-5 items-center">
+      <mat-icon class="backicon" (click)="navigateToMyDesignations()">arrow_back</mat-icon>
+      <div class="text-capitalize mat-h2 header-text">Import From Igot Master</div>
+    </div>
+
+    <div class="flex gap-5">
+      <button mat-raised-button (click)="navigateToMyDesignations()" class="cancel-btn">
+        Cancel</button>
+      <button [ngClass]="selectedDesignationsList.length === 0 ? 'disabl-btn' : 'importBtn'" mat-raised-button
+        (click)="importDesignations()" class="importBtn">Import
+        Selected
+        Designations</button>
+    </div>
+  </div>
+  <div class="master-designations pt-4">
+    <ng-container *ngIf="!showCreateLoader; else fw_create_loader">
+      <div class="w-full flex justify-between items-center mb-6">
+        <div class="flex items-center">
+          <div class="search">
+            <div class=rsearch>
+              <mat-icon class="color-60 search-icon">search</mat-icon>
+              <input [formControl]="searchControl" class="sinput color-60" type="Standard" placeholder="Search">
             </div>
           </div>
         </div>
-        <ng-container *ngIf="selctedDesignationsCount > 0">
-          <div class="flex flex-row mb-4">
+      </div>
+      <ng-container *ngIf="selctedDesignationsCount > 0">
+        <div class="flex flex-row mb-4 gap-4 items-center w-full">
+          <div class="flex flex-row gap-4 w-full">
             <div class="flex flex-2 flex-middle w-full flex-wrap gap-4">
               <div class="selected-designation-label">Selected designations - </div>
               <ng-container *ngFor="let item of selectedDesignationsList | slice : 0 : 10">
@@ -31,52 +43,50 @@
               </ng-container>
               <ng-container *ngIf="selctedDesignationsCount > 10">
                 <a mat-button class="select-more-link margin-left-m"
-                  (click)="openPreviewPoup()">+{{selctedDesignationsCount - 10}} more</a>
+                  (click)="openPreviewPoup()">+{{selctedDesignationsCount
+                  -
+                  10}} more</a>
               </ng-container>
             </div>
-            <!-- <div class="flex flex-1 flex-row right-section flex-middle">
-              <a mat-button class="select-more-link" (click)="clearAll()">Clear all</a>
-            </div> -->
           </div>
-        </ng-container>
-        <div class="w-full flex flex-4 flex-row designations-card-container flex-wrap gap-5">
-          <ng-container *ngFor="let designation of igotDesignationsList let i = index">
-            <div class="flex flex-4 custom-user-card items-center justify-center"
-              [ngClass]="{'active-card': designation?.selected, 'disableCard': designation?.isOrgDesignation}">
-              <div class="custom-user-desc">
-                <p>{{designation?.designation | titlecase}}</p>
-              </div>
+          <div class="flex items-center">
+            <!-- <button></button> -->
+            <a mat-button (click)="removeDesignation(selectedDesignationsList)" class="clearAll">Clear all</a>
+          </div>
+        </div>
+      </ng-container>
+      <div class="w-full flex flex-4 flex-row designations-card-container flex-wrap gap-5">
+        <ng-container *ngFor="let designation of igotDesignationsList let i = index">
+          <div class="flex flex-4 custom-user-card items-center justify-center" [ngClass]="{'active-card': (designation?.selected && !designation?.isOrgDesignation),
+              'disableCard': designation?.isOrgDesignation}">
+            <div class="custom-user-desc">
+              <p>{{designation?.designation | titlecase}}</p>
+            </div>
 
-              <div class="check-action">
-                <mat-checkbox [checked]="designation?.selected" [disabled]="designation?.isOrgDesignation"
-                  (change)="selectDesignation($event.checked, designation.id)"></mat-checkbox>
-              </div>
+            <div class="check-action">
+              <mat-checkbox [checked]="designation?.selected" [disabled]="designation?.isOrgDesignation"
+                (change)="selectDesignation($event.checked, designation.id)"></mat-checkbox>
             </div>
-          </ng-container>
-          <ng-container *ngIf="igotDesignationsList.length === 0">
-            <div class=" w-full flex justify-center items-center">
-              <div class="my-8 mx-4">
-                <p>No designations found</p>
-              </div>
+          </div>
+        </ng-container>
+        <ng-container *ngIf="igotDesignationsList.length === 0">
+          <div class=" w-full flex justify-center items-center">
+            <div class="my-8 mx-4">
+              <p>No designations found</p>
             </div>
-          </ng-container>
-        </div>
-        <div class="flex flex-row justify-center">
-          <mat-paginator [length]="deisgnationsCount" [pageSize]="pageSize" [pageSizeOptions]="[20,30,40]"
-            (page)="onChangePage($event)"></mat-paginator>
-        </div>
-        <div class="flex justify-end items-center">
-          <button mat-raised-button (click)="importDesignations()"
-            class="importBtn flex items-center justify-center">Import selected
-            designations</button>
-        </div>
-      </ng-container>
-      <ng-template #fw_create_loader>
-        <div class="flex flex-col flex-1 w-100 items-center pt-5 text-center">
-          <mat-spinner class="display-inline-block mb-5" [diameter]="50" [strokeWidth]="3"></mat-spinner>
-          <p>{{loaderMsg}}</p>
-        </div>
-      </ng-template>
-    </mat-card-content>
-  </mat-card>
+          </div>
+        </ng-container>
+      </div>
+      <div class="flex flex-row justify-center">
+        <mat-paginator [length]="deisgnationsCount" [pageSize]="pageSize" [pageSizeOptions]="[20,30,40]"
+          (page)="onChangePage($event)"></mat-paginator>
+      </div>
+    </ng-container>
+    <ng-template #fw_create_loader>
+      <div class="flex flex-col flex-1 w-100 items-center pt-5 text-center">
+        <mat-spinner class="display-inline-block mb-5" [diameter]="50" [strokeWidth]="3"></mat-spinner>
+        <p>{{loaderMsg}}</p>
+      </div>
+    </ng-template>
+  </div>
 </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.scss b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.scss
index 13be2054e..0fb3fb0e7 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.scss
@@ -1,10 +1,58 @@
+.backicon {
+  font-size: 20px;
+  width: 16px;
+  height: 20px;
+  color: #797979;
+  pointer-events: all;
+}
+
+.header-text {
+  margin-bottom: 0px !important;
+}
+
+.clearAll {
+  font-size: 14px;
+  font-weight: 600;
+  color: #1B4CA1 !important;
+}
+
+.cancel-btn {
+  border: 1px solid #1B4CA1;
+  color: #1B4CA1 !important;
+  background-color: #ffffff;
+  height: 40px;
+  width: 80px;
+  font-size: 14px;
+  font-weight: 700;
+}
+
+.importBtn {
+  background: #1b4ca1 !important;
+  color: #ffffff !important;
+  font-family: "Lato";
+  height: 40px;
+  font-size: 14px;
+  font-weight: 700;
+  width: 220px;
+}
+
+.disabl-btn {
+  background-color: #999 !important;
+  pointer-events: none;
+  font-family: "Lato";
+  height: 40px;
+  font-size: 14px;
+  font-weight: 700;
+  width: 220px;
+}
+
 
 .search {
 
   .search-icon {
     position: absolute;
-    top: 9px;
-    font-size: 20px;
+    top: 14px;
+    font-size: 22px;
     left: 10px;
   }
 
@@ -15,10 +63,12 @@
   }
 
   .sinput {
-    width: 315px;
+    width: 700px;
+    height: 30px;
+    max-width: 80vw;
     border-radius: 4px;
     border: 1px solid #d5d0d0;
-    padding: 9px 9px 9px 35px;
+    padding: 9px 9px 9px 40px;
     margin-top: 0;
     font: normal 14px Lato;
     font-weight: 400;
@@ -75,6 +125,7 @@
   .designations-card-container {
     .active-card {
       border: 1px solid #1B4CA1 !important;
+      color: #1B4CA1;
     }
 
     .custom-user-card {
@@ -85,7 +136,7 @@
     }
 
     .disableCard {
-      background-color: #6c757d;
+      background-color: #d6d6d6;
       pointer-events: none;
     }
 
@@ -109,11 +160,3 @@
     }
   }
 }
-
-.importBtn {
-  background: #1b4ca1 !important;
-  color: white !important;
-  font-family: "Lato";
-  font-weight: 700;
-  font-size: 14px;
-}
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
index 085ff979d..233c83540 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
@@ -8,9 +8,11 @@ import { forkJoin, of, Subscription } from 'rxjs'
 import { HttpErrorResponse } from '@angular/common/http'
 import * as _ from 'lodash'
 import { LoaderService } from '../../../../../../../../../../../src/app/services/loader.service'
-import { Router } from '@angular/router'
+import { ActivatedRoute, Router } from '@angular/router'
+import { ConfirmationBoxComponent } from '../../../../../training-plan/components/confirmation-box/confirmation.box.component'
+import { DatePipe } from '@angular/common'
 // import { environment } from '../../../../../../../../../../../src/environments/environment'
-import { ConformationPopupComponent } from '../../dialog-boxes/conformation-popup/conformation-popup.component'
+// import { ConformationPopupComponent } from '../../dialog-boxes/conformation-popup/conformation-popup.component'
 
 @Component({
   selector: 'ws-app-import-designation',
@@ -38,47 +40,26 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
   importedDesignationNames: any = []
   designationsImportFailed: any = []
   frameworkInfo: any = {}
+  dialogRef: any
 
   constructor(
     private designationsService: DesignationsService,
     private dialog: MatDialog,
     private loaderService: LoaderService,
-    // private activateRoute: ActivatedRoute,
     private route: Router,
     private snackBar: MatSnackBar,
+    private datePipe: DatePipe,
+    private activateRoute: ActivatedRoute
   ) { }
 
   ngOnInit() {
-
-    // this.getRoutesData()
+    this.configSvc = this.activateRoute.snapshot.data['configService']
     this.loadDesignations()
     this.valudChangeSubscribers()
 
     this.getFrameWorkDetails()
   }
 
-  // getRoutesData() {
-  //   this.environmentVal = environment
-  //   this.activateRoute.data.subscribe(data => {
-  //     this.designationConfig = data.pageData.data
-  //     this.frameworkConfig = this.designationConfig.frameworkConfig
-  //   })
-
-  //   this.configSvc = this.activateRoute.snapshot.data['configService']
-  //   console.log('this.configSvc', this.configSvc.orgReadData)
-  //   if (this.configSvc.orgReadData && this.configSvc.orgReadData.frameworkid) {
-  //     this.environmentVal.frameworkName = this.configSvc.orgReadData.frameworkid
-  //   } else {
-  //     this.createFramework()
-  //   }
-  // }
-
-  // createFramework() {
-  //   this.showCreateLoader = true
-  //   this.loaderMsg = this.designationConfig.frameworkCreationMSg
-  //   this.environmentVal.frameworkName = '1231231231_organisation_fw'
-  // }
-
   getFrameWorkDetails() {
     this.frameworkInfo = this.designationsService.frameWorkInfo
     if (this.frameworkInfo === undefined) {
@@ -196,25 +177,9 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
   }
 
   importDesignations() {
-    // this.designationsImportFailed = [
-    //   {
-    //     designation: {
-    //       designation: 'name 1'
-    //     }
-    //   },
-    //   {
-    //     designation: {
-    //       designation: 'name 2'
-    //     }
-    //   }
-    // ]
-
-    // this.importedDesignationNames = ['succes one', 'success two', 'succes one', 'success two', 'succes one', 'success two',
-    //   'succes one', 'success two', 'succes one', 'success two', 'succes one', 'success two', 'succes one', 'success two',]
-    // this.openConforamtionPopup()
-
-    this.loaderService.changeLoaderState(true)
     if (this.selctedDesignationsCount) {
+      this.openProcessingBox()
+      const currentDate = this.datePipe.transform(new Date(), 'dd MMM, yyyy')
       const observables = this.selectedDesignationsList.map((selectedDesignation: any) => {
         const requestBody = {
           name: selectedDesignation.designation,
@@ -225,6 +190,11 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
           category: 'designation',
           status: 'Live',
           framework: _.get(this.frameworkInfo, 'code'),
+          additionalProperties: {
+            importedByName: _.get(this.configSvc, 'userProfileV2.firstName'),
+            importedById: _.get(this.configSvc, 'userProfileV2.userId'),
+            importedOn: currentDate,
+          }
         }
         this.designationsImportSuccessResponses =
           _.get(this.frameworkInfo, 'categories[0].terms[0].associations', []).map((c: any) => {
@@ -250,6 +220,7 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
           }
         },
         error: (error: HttpErrorResponse) => {
+          this.dialogRef.close()
           const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
           this.openSnackbar(errorMessage)
         },
@@ -276,6 +247,7 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
       },
       error: (error: HttpErrorResponse) => {
         const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
+        this.dialogRef.close()
         this.openSnackbar(errorMessage)
       },
     })
@@ -285,92 +257,113 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
     const frameworkName = _.get(this.frameworkInfo, 'code')
     this.designationsService.publishFramework(frameworkName).subscribe({
       next: response => {
-        this.loaderService.changeLoaderState(false)
         if (response) {
-          this.openConforamtionPopup()
+          this.dialogRef.close()
         }
       },
       error: (error: HttpErrorResponse) => {
         const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
+        this.dialogRef, close()
         this.openSnackbar(errorMessage)
       },
     })
   }
 
-  openConforamtionPopup() {
-    const descriptions = []
-    if (this.designationsImportFailed.length > 0) {
-      const designationNames = this.designationsImportFailed.map((e: any) => e.designation.designation).join(', ')
-      const description = {
-        header: 'Import failed designations',
-        messages: [
-          {
-            msgClass: '',
-            msg: 'Some thing went wrong while importing ',
-          },
-          {
-            msgClass: 'textBold',
-            msg: `${designationNames}`,
-          },
-          {
-            msgClass: '',
-            msg: ' designations',
-          },
-        ],
-      }
-      descriptions.push(description)
-    }
-    if (this.importedDesignationNames.length > 0) {
-      const designationNames = this.importedDesignationNames.join(', ')
-      const description = {
-        header: 'Designations imported successfully',
-        messages: [
-          {
-            msgClass: 'textBold',
-            msg: `${designationNames}`,
-          },
-          {
-            msgClass: '',
-            msg: ' are imported successfully',
-          },
-        ],
-      }
-      descriptions.push(description)
-    }
-
-    descriptions.push({
-      messages: [
-        {
-          msgClass: '',
-          msg: 'The changes will reflect shortly.',
-        },
-      ],
-    })
+  openProcessingBox() {
     const dialogData = {
-      descriptions,
-      footerClass: 'items-center justify-end',
-      buttons: [
-        {
-          btnText: 'Cancel',
-          btnClass: '',
-          response: false,
-        },
-      ],
+      type: 'progress',
+      icon: 'vega',
+      title: 'Importing Your Designations',
+      subTitle: 'Wait a second , your importing in processing….',
     }
-
-    const dialogRef = this.dialog.open(ConformationPopupComponent, {
+    this.dialogRef = this.dialog.open(ConfirmationBoxComponent, {
+      disableClose: true,
       data: dialogData,
       autoFocus: false,
-      width: '600px',
-      maxWidth: '80vw',
-      maxHeight: '90vh',
-      disableClose: true,
     })
-    dialogRef.afterClosed().subscribe(() => {
-      this.navigateToMyDesignations()
+
+    this.dialogRef.afterClosed().subscribe(() => {
+      this.openConforamtionPopup()
     })
   }
 
+  openConforamtionPopup() {
+    // const descriptions = []
+    // if (this.designationsImportFailed.length > 0) {
+    //   const designationNames = this.designationsImportFailed.map((e: any) => e.designation.designation).join(', ')
+    //   const description = {
+    //     header: 'Import failed designations',
+    //     messages: [
+    //       {
+    //         msgClass: '',
+    //         msg: 'Some thing went wrong while importing ',
+    //       },
+    //       {
+    //         msgClass: 'textBold',
+    //         msg: `${designationNames}`,
+    //       },
+    //       {
+    //         msgClass: '',
+    //         msg: ' designations',
+    //       },
+    //     ],
+    //   }
+    //   descriptions.push(description)
+    // }
+    // if (this.importedDesignationNames.length > 0) {
+    //   const designationNames = this.importedDesignationNames.join(', ')
+    //   const description = {
+    //     header: 'Designations imported successfully',
+    //     messages: [
+    //       {
+    //         msgClass: 'textBold',
+    //         msg: `${designationNames}`,
+    //       },
+    //       {
+    //         msgClass: '',
+    //         msg: ' are imported successfully',
+    //       },
+    //     ],
+    //   }
+    //   descriptions.push(description)
+    // }
+
+    // descriptions.push({
+    //   messages: [
+    //     {
+    //       msgClass: '',
+    //       msg: 'The changes will reflect shortly.',
+    //     },
+    //   ],
+    // })
+    // const dialogData = {
+    //   descriptions,
+    //   footerClass: 'items-center justify-end',
+    //   buttons: [
+    //     {
+    //       btnText: 'Cancel',
+    //       btnClass: '',
+    //       response: false,
+    //     },
+    //   ],
+    // }
+
+    // const dialogRef = this.dialog.open(ConformationPopupComponent, {
+    //   data: dialogData,
+    //   autoFocus: false,
+    //   width: '600px',
+    //   maxWidth: '80vw',
+    //   maxHeight: '90vh',
+    //   disableClose: true,
+    // })
+    // dialogRef.afterClosed().subscribe(() => {
+    //   this.navigateToMyDesignations()
+    // })
+    const successMessage = 'Imported Successfully '
+    this.openSnackbar(successMessage, 10000)
+    this.navigateToMyDesignations()
+  }
+
   navigateToMyDesignations() {
     this.route.navigateByUrl('app/home/org-designations')
   }
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/designation.module.ts b/project/ws/app/src/lib/routes/home/routes/designation/designation.module.ts
index 247f570f7..e31743d6e 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/designation.module.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/designation.module.ts
@@ -20,7 +20,7 @@ const routes: Routes = [
       pageId: 'home/odcs-mapping',
       module: 'odcs-mapping',
       pageType: 'feature',
-      pageKey: 'odcs',
+      pageKey: 'my_designations',
     },
     resolve: {
       configService: ConfigResolveService,
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
index 30c0cbb68..fcdc221af 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
@@ -126,6 +126,9 @@ export class DesignationsService {
           if (associations.length > 0) {
             Object.assign(c, { children: associations })
           }
+          c['importedByName'] = _.get(c, 'additionalProperties.importedByName'),
+            c['importedOn'] = _.get(c, 'additionalProperties.importedOn'),
+            c['importedById'] = _.get(c, 'additionalProperties.importedById')
           return c
         }),
       })
@@ -179,7 +182,7 @@ export class DesignationsService {
       frameworkId,
       categoryId,
       categoryTermCode
-    )}`,                   reguestBody)
+    )}`, reguestBody)
   }
 
   publishFramework(frameworkName: string) {

From 682b95f6f933e92e9f679b68940d4c279e8f7227 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Wed, 24 Jul 2024 14:20:08 +0530
Subject: [PATCH 782/887] fixing lint issues

---
 .../components/designations/designations.component.ts         | 2 +-
 .../import-designation/import-designation.component.ts        | 4 ++--
 .../home/routes/designation/services/designations.service.ts  | 2 +-
 .../routes/home/routes/odcs-mapping/odcs-mapping.component.ts | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
index 32ab21287..9dfe81bad 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
@@ -133,7 +133,7 @@ export class DesignationsComponent implements OnInit {
       } else {
         setTimeout(() => {
           this.getOrgReadData()
-        }, 10000)
+        },         10000)
       }
       // console.log('orgFramework Details', res)
     })
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
index 233c83540..260a07554 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
@@ -194,7 +194,7 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
             importedByName: _.get(this.configSvc, 'userProfileV2.firstName'),
             importedById: _.get(this.configSvc, 'userProfileV2.userId'),
             importedOn: currentDate,
-          }
+          },
         }
         this.designationsImportSuccessResponses =
           _.get(this.frameworkInfo, 'categories[0].terms[0].associations', []).map((c: any) => {
@@ -263,7 +263,7 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
       },
       error: (error: HttpErrorResponse) => {
         const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
-        this.dialogRef, close()
+        this.dialogRef.close()
         this.openSnackbar(errorMessage)
       },
     })
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
index fcdc221af..6f72ccf9b 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
@@ -182,7 +182,7 @@ export class DesignationsService {
       frameworkId,
       categoryId,
       categoryTermCode
-    )}`, reguestBody)
+    )}`,                   reguestBody)
   }
 
   publishFramework(frameworkName: string) {
diff --git a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
index 06646c1a6..38131742f 100644
--- a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
@@ -72,7 +72,7 @@ export class OdcsMappingComponent implements OnInit {
       } else {
         setTimeout(() => {
           this.getOrgReadData()
-        }, 10000)
+        },         10000)
       }
     })
   }

From 03e6507d16a3fa7a6c78254402026df646a9ca86 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Wed, 24 Jul 2024 16:46:10 +0530
Subject: [PATCH 783/887] issue fixed

---
 .../home/components/user-cards/user-card.component.html       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 93d5078dc..c6b9f1bf5 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -92,7 +92,7 @@
                 <mat-icon class="nonverified-icon margin-left-xs"
                   *ngIf="user?.profileDetails?.profileGroupStatus === 'NOT-VERIFIED'">
                   cancel</mat-icon> <span *ngIf="user?.profileDetails?.profileGroupStatus === 'NOT-VERIFIED'"
-                  class="mat-caption status-text ws-mat-black40-text"> Non-verified</span>
+                  class="mat-caption status-text ws-mat-black40-text"> Not-verified</span>
               </div>
               <div class="md:w-1/3">
                 <label class="margin-remove-bottom form-label">Designation</label>
@@ -119,7 +119,7 @@
                   *ngIf="user?.profileDetails?.profileDesignationStatus === 'NOT-VERIFIED'">
                   cancel</mat-icon>
                 <span *ngIf="user?.profileDetails?.profileDesignationStatus === 'NOT-VERIFIED'"
-                  class="mat-caption status-text ws-mat-black40-text"> Non-verified</span>
+                  class="mat-caption status-text ws-mat-black40-text"> Not-verified</span>
               </div>
             </div>
           </div>

From 4d4eedb926f592e6f2027b1dd4f106dad9cccf9f Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Wed, 24 Jul 2024 20:41:59 +0530
Subject: [PATCH 784/887] taxonomy version update and remove popup issue fix

---
 package.json                                             | 2 +-
 .../components/designations/designations.component.ts    | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 4e9baa81e..b88c04a68 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "@sunbird-cb/micro-surveys": "2.0.13",
     "@sunbird-cb/rain-dashboards": "0.4.33",
     "@sunbird-cb/resolver": "^1.0.0",
-    "@sunbird-cb/taxonomy-editor": "^0.0.15",
+    "@sunbird-cb/taxonomy-editor": "^0.0.18",
     "@sunbird-cb/utils": "^1.0.18",
     "@types/file-saver": "^2.0.1",
     "brace": "^0.11.1",
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
index 9dfe81bad..e42582ef9 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
@@ -133,7 +133,7 @@ export class DesignationsComponent implements OnInit {
       } else {
         setTimeout(() => {
           this.getOrgReadData()
-        },         10000)
+        }, 10000)
       }
       // console.log('orgFramework Details', res)
     })
@@ -242,7 +242,12 @@ export class DesignationsComponent implements OnInit {
       descriptions: [
         {
           header: '',
-          message: `Are you sure you want to remove the ${_.get(event, 'row.name')} designation?`,
+          messages: [
+            {
+              msgClass: '',
+              msg: `Are you sure you want to remove the ${_.get(event, 'row.name')} designation?`,
+            },
+          ],
         },
       ],
       footerClass: 'items-center justify-end',

From 1ceb59d04df46cb3df6f0aaf08cc7cb712cae283 Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Thu, 25 Jul 2024 18:48:43 +0530
Subject: [PATCH 785/887] Task #0000: Lines breaking issue fix on window resize

---
 .../home/routes/odcs-mapping/odcs-mapping.component.html | 6 +++---
 .../home/routes/odcs-mapping/odcs-mapping.component.ts   | 9 +++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.html b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.html
index 5cfc613fe..473c66018 100644
--- a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.html
@@ -11,9 +11,9 @@ <h1 class="mat-heading-1">{{odcConfig?.mainHeading}}</h1>
       <div class="flex">
         <span class="mat-body-1 font-bold-imp flex-1">{{odcConfig?.topsection?.heading}}</span>
         <mat-icon class="cursor-pointer mat-icon mr-4" *ngIf="showTopSection"
-          (click)="showTopSection = !showTopSection">keyboard_arrow_up</mat-icon>
+          (click)="showTopSection = !showTopSection; callResizeEvent($event)">keyboard_arrow_up</mat-icon>
         <mat-icon class="cursor-pointer mat-icon mr-4" *ngIf="!showTopSection"
-          (click)="showTopSection = !showTopSection">keyboard_arrow_down</mat-icon>
+          (click)="showTopSection = !showTopSection; callResizeEvent($event)">keyboard_arrow_down</mat-icon>
       </div>
       <div class="mt-5" *ngIf="showTopSection">
         <div class="flex">
@@ -32,7 +32,7 @@ <h1 class="mat-heading-1">{{odcConfig?.mainHeading}}</h1>
         </div>
       </div>
     </mat-card>
-    <div>
+    <div *ngIf="environmentVal && environmentVal.frameworkName">
       <lib-taxonomy-view [environment]="environmentVal" [taxonomyConfig]="taxonomyConfig"></lib-taxonomy-view>
     </div>
   </div>
diff --git a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
index e9a93a2d7..5753888b3 100644
--- a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
@@ -19,7 +19,6 @@ export class OdcsMappingComponent implements OnInit {
   showLoader = false
   loaderMsg = ''
   orgId = ''
-
   constructor(
     private activateRoute: ActivatedRoute,
     private designationsService: DesignationsService,
@@ -50,6 +49,12 @@ export class OdcsMappingComponent implements OnInit {
     }
   }
 
+  callResizeEvent(_event: any) {
+    setTimeout(() => {
+      window.dispatchEvent(new Event('resize'))
+    }, 100)
+  }
+
   createFreamwork() {
     this.loaderMsg = this.odcConfig.frameworkCreationMSg
     const departmentName = _.get(this.configSvc, 'userProfile.departmentName').replace(/\s/g, '')
@@ -74,7 +79,7 @@ export class OdcsMappingComponent implements OnInit {
       } else {
         setTimeout(() => {
           this.getOrgReadData()
-        },         10000)
+        }, 10000)
       }
     })
   }

From fafa84374f743f534b8eb47e5133d4ae6da39918 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Thu, 25 Jul 2024 20:01:46 +0530
Subject: [PATCH 786/887] fixing qa issues in designation master

---
 .../designations/designations.component.html      |  8 ++++----
 .../designations/designations.component.ts        |  1 +
 .../import-designation.component.scss             |  5 +++--
 .../import-designation.component.ts               |  1 -
 .../designation/services/designations.service.ts  | 15 +++++++++++++--
 5 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html
index 53aec492a..e8090a2db 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html
@@ -3,7 +3,7 @@
     <div class="mobile-margin text-capitalize mat-h2">{{designationConfig.mainHeading}}</div>
     <div>
       <button mat-raised-button class="importBtn" [routerLink]="'import-designation'" type="button">
-        Import from Igot master
+        Import from iGOT master
       </button>
     </div>
   </div>
@@ -13,9 +13,9 @@
       <div class="section-1">
         <div class="flex-4 mobile-margin text-capitalize mat-h2">{{designationConfig?.topsection?.heading}}</div>
         <ng-container *ngFor="let step of designationConfig?.topsection?.steps">
-          <div class="flex gap-4 mb-4">
+          <div class="flex gap-4">
             <div>
-              <mat-icon class="infoIcon">info_outlined</mat-icon>
+              <mat-icon class="infoIcon">error_outline</mat-icon>
             </div>
             <div>
               <p>{{step.title}}</p>
@@ -57,7 +57,7 @@
           <div class="w-full flex flex-col justify-center items-center emptyDesignations">
             <img src="/assets/icons/empty_data.svg" class="empty-desigantions-img">
             <div>
-              <p class="empty-desigantions-text">No deisgnation has been imported from iGOT master.</p>
+              <p class="empty-desigantions-text">No designation has been imported from iGOT master.</p>
             </div>
             <div class="mt-4">
               <button mat-raised-button class="importBtn" [routerLink]="'import-designation'">
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
index e42582ef9..2433e0f86 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
@@ -58,6 +58,7 @@ export class DesignationsComponent implements OnInit {
 
   initializeDefaultValues() {
     this.configSvc = this.activateRoute.snapshot.data['configService']
+    this.designationsService.setUserProfile(_.get(this.configSvc, 'userProfileV2'))
     this.orgId = _.get(this.configSvc, 'userProfile.rootOrgId')
     this.actionMenuItem = [
       // {
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.scss b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.scss
index 0fb3fb0e7..974ff0ce2 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.scss
@@ -4,6 +4,7 @@
   height: 20px;
   color: #797979;
   pointer-events: all;
+  cursor: pointer;
 }
 
 .header-text {
@@ -129,10 +130,10 @@
     }
 
     .custom-user-card {
-      width: 292px;
+      width: 360px;
       border: 1px solid rgba(0, 0, 0, 0.16);
       border-radius: 4px;
-      height: 70px;
+      height: 82px;
     }
 
     .disableCard {
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
index 260a07554..a8c6ddf7b 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
@@ -78,7 +78,6 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
       requestedFields: [],
       pageSize: this.pageSize,
     }
-    // this.startIndex
     if (searchKey) {
       requestParams['searchString'] = searchKey
     }
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
index 6f72ccf9b..fe3a6a0d9 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
@@ -38,12 +38,21 @@ export class DesignationsService {
   orgDesignationList: any = []
   selectedDesignationList: any = []
   frameWorkInfo: any
+  userProfile: any
 
   constructor(
     private http: HttpClient,
     private configSvc: ConfigurationsService,
   ) { }
 
+  setUserProfile(profileDetails: any) {
+    this.userProfile = profileDetails
+  }
+
+  get userProfileDetails() {
+    return this.userProfile
+  }
+
   createFrameWork(frameworkName: string, orgId: string, termName: string) {
     return this.http.get<any>(API_END_POINTS.CREATE_FRAME_WORK(frameworkName, orgId, termName))
   }
@@ -126,7 +135,9 @@ export class DesignationsService {
           if (associations.length > 0) {
             Object.assign(c, { children: associations })
           }
-          c['importedByName'] = _.get(c, 'additionalProperties.importedByName'),
+          const importedBy = _.get(c, 'additionalProperties.importedById', null) === _.get(this.userProfile, 'userId', '')
+            ? 'You' : _.get(c, 'additionalProperties.importedById', null)
+          c['importedByName'] = importedBy,
             c['importedOn'] = _.get(c, 'additionalProperties.importedOn'),
             c['importedById'] = _.get(c, 'additionalProperties.importedById')
           return c
@@ -182,7 +193,7 @@ export class DesignationsService {
       frameworkId,
       categoryId,
       categoryTermCode
-    )}`,                   reguestBody)
+    )}`, reguestBody)
   }
 
   publishFramework(frameworkName: string) {

From ee337f56a2e1487a3e11b31318f4a5d2edaf1efb Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Thu, 25 Jul 2024 20:03:12 +0530
Subject: [PATCH 787/887] updateing taxonomy-editor library version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b88c04a68..94d0d0662 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "@sunbird-cb/micro-surveys": "2.0.13",
     "@sunbird-cb/rain-dashboards": "0.4.33",
     "@sunbird-cb/resolver": "^1.0.0",
-    "@sunbird-cb/taxonomy-editor": "^0.0.18",
+    "@sunbird-cb/taxonomy-editor": "^0.0.19",
     "@sunbird-cb/utils": "^1.0.18",
     "@types/file-saver": "^2.0.1",
     "brace": "^0.11.1",

From bf0c3831bcfbecd3f24fa3f31d28f0139ae16f93 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Thu, 25 Jul 2024 20:09:53 +0530
Subject: [PATCH 788/887] lit fixes

---
 .../request-list/request-list.component.ts    | 20 +++++++++----------
 .../designations/designations.component.ts    |  2 +-
 .../services/designations.service.ts          |  2 +-
 .../odcs-mapping/odcs-mapping.component.ts    |  4 ++--
 .../routes/users/services/upload.service.ts   |  4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
index 2ca0878f0..102e32f60 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/request-list.component.ts
@@ -64,13 +64,13 @@ export class RequestListComponent implements OnInit {
   fullProfile: any
   rootOrgId: any
   constructor(private sanitizer: DomSanitizer,
-    private homeService: ProfileV2Service,
-    private datePipe: DatePipe,
-    private activeRoute: ActivatedRoute,
-    private dialog: MatDialog,
-    private router: Router,
-    private snackBar: MatSnackBar,
-    private loaderService: LoaderService,
+              private homeService: ProfileV2Service,
+              private datePipe: DatePipe,
+              private activeRoute: ActivatedRoute,
+              private dialog: MatDialog,
+              private router: Router,
+              private snackBar: MatSnackBar,
+              private loaderService: LoaderService,
   ) { }
   requestList: any[] = [
     `You can request new content by filling out the request form. You will have the option to choose your content provider and
@@ -242,7 +242,7 @@ export class RequestListComponent implements OnInit {
       if (res) {
         setTimeout(() => {
           this.getRequestList()
-        }, 1000)
+        },         1000)
       }
 
       this.snackBar.open('Marked as Invalid')
@@ -264,7 +264,7 @@ export class RequestListComponent implements OnInit {
       if (_res && _res.data === 'confirmed') {
         setTimeout(() => {
           this.getRequestList()
-        }, 1000)
+        },         1000)
         this.snackBar.open('Assigned submitted Successfully')
       } else {
         // this.snackBar.open('error')
@@ -285,7 +285,7 @@ export class RequestListComponent implements OnInit {
       if (_res && _res.data === 'confirmed') {
         setTimeout(() => {
           this.getRequestList()
-        }, 1000)
+        },         1000)
 
         this.snackBar.open('Re-assign submitted Successfully')
       } else {
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
index 2433e0f86..56253bbe8 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
@@ -134,7 +134,7 @@ export class DesignationsComponent implements OnInit {
       } else {
         setTimeout(() => {
           this.getOrgReadData()
-        }, 10000)
+        },         10000)
       }
       // console.log('orgFramework Details', res)
     })
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
index fe3a6a0d9..88e685e50 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
@@ -193,7 +193,7 @@ export class DesignationsService {
       frameworkId,
       categoryId,
       categoryTermCode
-    )}`, reguestBody)
+    )}`,                   reguestBody)
   }
 
   publishFramework(frameworkName: string) {
diff --git a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
index 5753888b3..7111de710 100644
--- a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
@@ -52,7 +52,7 @@ export class OdcsMappingComponent implements OnInit {
   callResizeEvent(_event: any) {
     setTimeout(() => {
       window.dispatchEvent(new Event('resize'))
-    }, 100)
+    },         100)
   }
 
   createFreamwork() {
@@ -79,7 +79,7 @@ export class OdcsMappingComponent implements OnInit {
       } else {
         setTimeout(() => {
           this.getOrgReadData()
-        }, 10000)
+        },         10000)
       }
     })
   }
diff --git a/project/ws/app/src/lib/routes/users/services/upload.service.ts b/project/ws/app/src/lib/routes/users/services/upload.service.ts
index 0273b4b43..9d4fd34f6 100644
--- a/project/ws/app/src/lib/routes/users/services/upload.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/upload.service.ts
@@ -6,12 +6,12 @@ import * as fileSaver from 'file-saver'
 
 const API_ENDPOINTS = {
   // bulkUpload: `/apis/proxies/v8/user/v1/bulkupload`,
-  bulkUpload: `/apis/proxies/v8/user/v2/bulkupload`, //csv support
+  bulkUpload: `/apis/proxies/v8/user/v2/bulkupload`, // csv support
   downloadReport: `/apis/protected/v8/admin/userRegistration/bulkUploadReport`,
   getBulkUploadData: '/apis/proxies/v8/user/v1/bulkupload',
   getBulkApproval: '/apis/proxies/v8/workflow/admin/bulkupdate/getstatus',
   // bulkApprovalUpload: `/apis/proxies/v8/workflow/admin/transition/bulkupdate`,
-  bulkApprovalUpload: '/apis/proxies/v8/workflow/admin/v2/bulkupdate/transition', //csv support
+  bulkApprovalUpload: '/apis/proxies/v8/workflow/admin/v2/bulkupdate/transition', // csv support
 }
 
 @Injectable()

From 2a62c6c60553301b8eb199701602c7a9b1d81624 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Fri, 26 Jul 2024 16:23:10 +0530
Subject: [PATCH 789/887] fixing qa issues and conforamtion popup ui changes

---
 .../designations/designations.component.ts    | 32 +++++-----
 .../import-designation.component.html         |  2 +-
 .../conformation-popup.component.html         | 17 ++++--
 .../conformation-popup.component.scss         | 58 +++++++------------
 .../services/designations.service.ts          |  8 ++-
 5 files changed, 59 insertions(+), 58 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
index 56253bbe8..ecb479f39 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
@@ -240,50 +240,52 @@ export class DesignationsComponent implements OnInit {
   openConformationPopup(event: any) {
     // console.log('envent data', event)
     const dialogData = {
+      dialogType: 'warning',
       descriptions: [
         {
-          header: '',
+          header: 'Are you sure you want to remove this designation from My designation master?',
+          headerClass: 'flex items-center justify-center text-blue',
           messages: [
             {
               msgClass: '',
-              msg: `Are you sure you want to remove the ${_.get(event, 'row.name')} designation?`,
+              msg: `Please note that doing so will result in the loss of role mapping.`,
             },
           ],
         },
       ],
-      footerClass: 'items-center justify-end',
+      footerClass: 'items-center justify-center',
       buttons: [
         {
-          btnText: 'Remove',
-          btnClass: 'btn-full-red',
-          response: true,
+          btnText: 'No',
+          btnClass: 'btn-outline',
+          response: false,
         },
         {
-          btnText: 'Cancel',
-          btnClass: '',
-          response: false,
+          btnText: 'Yes',
+          btnClass: 'btn-full-success',
+          response: true,
         },
       ],
     }
     const dialogRef = this.dialog.open(ConformationPopupComponent, {
       data: dialogData,
       autoFocus: false,
-      width: '500px',
+      width: '615px',
       maxWidth: '80vw',
       maxHeight: '90vh',
-      height: '300px',
       disableClose: true,
     })
     dialogRef.afterClosed().subscribe((res: any) => {
       if (res) {
-        // this.removeDesignation(event.row)
+        this.removeDesignation(event.row)
       }
     })
   }
 
-  // removeDesignation(designation: any) {
-  //   console.log(designation)
-  // }
+  removeDesignation(designation: any) {
+    if (designation) { }
+    // console.log(designation)
+  }
 
   private openSnackbar(primaryMsg: any, duration: number = 5000) {
     this.snackBar.open(primaryMsg, 'X', {
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.html b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.html
index 25792d6f1..5de58d025 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.html
@@ -2,7 +2,7 @@
   <div class="flex w-full justify-between items-center">
     <div class="flex gap-5 items-center">
       <mat-icon class="backicon" (click)="navigateToMyDesignations()">arrow_back</mat-icon>
-      <div class="text-capitalize mat-h2 header-text">Import From Igot Master</div>
+      <div class="mat-h2 header-text">Import from iGOT master</div>
     </div>
 
     <div class="flex gap-5">
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.html b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.html
index 933acfbe0..c322864f6 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.html
@@ -10,15 +10,20 @@
 
 <div class="dialog-container">
   <ng-container [ngSwitch]="dialogDetails.dialogType">
-    <ng-container *ngSwitchCase="'success'">
-      <div class="circule mb2 success">
+    <!-- <ng-container *ngSwitchCase="'success'">
+      <div class="flex justify-center items-center mb-4">
         <mat-icon aria-hidden="false" class="success-icon">done</mat-icon>
       </div>
     </ng-container>
     <ng-container *ngSwitchCase="'fail'">
-      <div class="circule mb2 fail">
+      <div class="flex justify-center items-center mb-4">
         <mat-icon aria-hidden="false" class="fail-icon">priority_high</mat-icon>
       </div>
+    </ng-container> -->
+    <ng-container *ngSwitchCase="'warning'">
+      <div class="flex justify-center items-center mb-4">
+        <mat-icon aria-hidden="false" class="warning-icon">info_outlined</mat-icon>
+      </div>
     </ng-container>
   </ng-container>
   <ng-container *ngIf="dialogDetails.iconDetails">
@@ -28,10 +33,12 @@
   </ng-container>
   <ng-container *ngFor="let description of dialogDetails?.descriptions">
     <ng-container *ngIf="description.header">
-      <span class="header">{{description.header}}</span>
+      <div [ngClass]="description.headerClass">
+        <span>{{description.header}}</span>
+      </div>
     </ng-container>
     <ng-container *ngIf="description.messages">
-      <div class="description mt-1 mb-6">
+      <div class="description mt-1 mb-6 flex w-full justify-center">
         <span>
           <ng-container *ngFor="let msgDetails of description.messages">
             <span [ngClass]="msgDetails.msgClass">{{msgDetails.msg}}</span>
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.scss b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.scss
index d7a39df6c..77085f5af 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/designation/dialog-boxes/conformation-popup/conformation-popup.component.scss
@@ -14,50 +14,31 @@
 // }
 
 .dialog-container {
-    // display: flex;
-    // justify-content: center;
-    // height: calc(100% - 60px);
-    // flex-direction: column;
 
-    .circule {
-        width: 40px;
-        height: 40px;
-        border: 0px;
-        border-radius: 50%;
-        position: relative;
+    .warning-icon {
+        color: #F3962F;
+        font-size: 45px;
+        height: 45px;
+        width: 45px;
     }
 
-    .success {
-        background-color: #1d8923;
-    }
-
-    .fail {
-        background-color: #d13924;
-    }
-
-    .success-icon {
-        position: absolute;
-        color: white;
-        top: 9px;
-        left: 7px;
-        font-weight: 900;
-    }
-
-    .fail-icon {
-        position: absolute;
-        color: white;
-        top: 9px;
-        left: 7.4px;
-    }
+    // .success-icon {
+    //     color: green;
+    //     font-size: 40px;
+    //     height: 40px;
+    // }
 
-    .header {
-      font-size: 20px;
-      font-weight: 600;
-    }
+    // .fail-icon {
+    //     color: red;
+    //     font-size: 40px;
+    //     height: 40px;
+    // }
 
     .description {
         font-size: 14px;
     }
+
+
 }
 .footer {
     height: 60px;
@@ -96,3 +77,8 @@
 .textBold {
     font-weight: 700;
 }
+
+.text-blue {
+    font-size: 16px !important;
+    color: #1B4CA1 !important;
+}
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
index 88e685e50..56ce41bf9 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
@@ -27,6 +27,8 @@ const API_END_POINTS = {
   CREATE_TERM: `/apis/proxies/v8/designation/create/term`,
   CREATE_FRAME_WORK: (frameworkName: string, orgId: string, termName: string) =>
     `/apis/proxies/v8/org/framework/read?frameworkName=${frameworkName}&orgId=${orgId}&termName=${termName}`,
+  DELETE_DESIGNATION: (frameworkName: string, category: string) =>
+    `/apis/proxies/v8/framework/v1/term/retire?framework=${frameworkName}&category=${category}`,
 }
 
 @Injectable({
@@ -136,7 +138,7 @@ export class DesignationsService {
             Object.assign(c, { children: associations })
           }
           const importedBy = _.get(c, 'additionalProperties.importedById', null) === _.get(this.userProfile, 'userId', '')
-            ? 'You' : _.get(c, 'additionalProperties.importedById', null)
+            ? 'You' : _.get(c, 'additionalProperties.importedByName', null)
           c['importedByName'] = importedBy,
             c['importedOn'] = _.get(c, 'additionalProperties.importedOn'),
             c['importedById'] = _.get(c, 'additionalProperties.importedById')
@@ -219,4 +221,8 @@ export class DesignationsService {
   importDesigantion(framework: string, category: string, reqBody: any): Observable<any> {
     return this.http.post<any>(`${API_END_POINTS.IMPORT_DESIGNATION}framework=${framework}&category=${category}`, reqBody)
   }
+
+  deleteDesignation(frameworkName: string, category: string, formBody: any) {
+    return this.http.delete<any>(`${API_END_POINTS.DELETE_DESIGNATION(frameworkName, category)}`, formBody)
+  }
 }

From e65dc6bfa0d90480cccceeb49431f39bcef23a2c Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Fri, 26 Jul 2024 18:21:49 +0530
Subject: [PATCH 790/887] retaire api intergration for designations

---
 .../designations/designations.component.ts    | 77 +++++++++++++++----
 .../services/designations.service.ts          |  4 +-
 2 files changed, 62 insertions(+), 19 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
index ecb479f39..035433104 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
@@ -52,7 +52,7 @@ export class DesignationsComponent implements OnInit {
   //#region (intial actions)
   initialization() {
     this.initializeDefaultValues()
-    this.valudChangeSubscribers()
+    this.valueChangeSubscribers()
     this.getRoutesData()
   }
 
@@ -134,7 +134,7 @@ export class DesignationsComponent implements OnInit {
       } else {
         setTimeout(() => {
           this.getOrgReadData()
-        },         10000)
+        }, 10000)
       }
       // console.log('orgFramework Details', res)
     })
@@ -143,26 +143,30 @@ export class DesignationsComponent implements OnInit {
   getFrameworkInfo(frameworkid: string) {
     this.showLoader = true
     this.environment.frameworkName = frameworkid
-    this.designationsService.getFrameworkInfo(frameworkid).subscribe(res => {
-      this.showLoader = false
-      this.frameworkDetails = _.get(res, 'result.framework')
-      this.designationsService.setFrameWorkInfo(this.frameworkDetails)
+    this.designationsService.getFrameworkInfo(frameworkid).subscribe(
+      {
+        next: (res) => {
+          this.showLoader = false
+          this.frameworkDetails = _.get(res, 'result.framework')
+          this.designationsService.setFrameWorkInfo(this.frameworkDetails)
 
-      this.getOrganisations()
-      // console.log('frame work: ', this.frameworkDetails)
-    })
+          this.getOrganisations()
+        },
+        error: (error: HttpErrorResponse) => {
+          this.showLoader = false
+          const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
+          this.openSnackbar(errorMessage)
+        }
+
+      })
   }
 
-  valudChangeSubscribers() {
+  valueChangeSubscribers() {
     if (this.searchControl) {
       this.searchControl.valueChanges.pipe(delay(500)).subscribe({
         next: response => {
           this.filterDesignations(response)
-        },
-        error: (error: HttpErrorResponse) => {
-          const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
-          this.openSnackbar(errorMessage)
-        },
+        }
       })
     }
   }
@@ -283,8 +287,47 @@ export class DesignationsComponent implements OnInit {
   }
 
   removeDesignation(designation: any) {
-    if (designation) { }
-    // console.log(designation)
+    if (designation) {
+      const requestBody = {
+        "request": {
+          "contentIds": [
+            _.get(designation, 'code')
+          ]
+        }
+      }
+      this.showLoader = true
+      this.designationsService.deleteDesignation
+        (this.frameworkDetails.code, 'designation', requestBody).subscribe({
+          next: (res) => {
+            if (res) {
+              this.publishFrameWork()
+            } else {
+              this.showLoader = false
+            }
+          },
+          error: (error: HttpErrorResponse) => {
+            this.showLoader = false
+            const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
+            this.openSnackbar(errorMessage)
+          }
+        })
+    }
+  }
+
+  publishFrameWork() {
+    const frameworkName = _.get(this.frameworkDetails, 'code')
+    this.designationsService.publishFramework(frameworkName).subscribe({
+      next: response => {
+        if (response) {
+          this.getFrameworkInfo(this.frameworkDetails.code)
+        }
+      },
+      error: (error: HttpErrorResponse) => {
+        this.showLoader = false
+        const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
+        this.openSnackbar(errorMessage)
+      },
+    })
   }
 
   private openSnackbar(primaryMsg: any, duration: number = 5000) {
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
index 56ce41bf9..383a173ac 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
@@ -195,7 +195,7 @@ export class DesignationsService {
       frameworkId,
       categoryId,
       categoryTermCode
-    )}`,                   reguestBody)
+    )}`, reguestBody)
   }
 
   publishFramework(frameworkName: string) {
@@ -223,6 +223,6 @@ export class DesignationsService {
   }
 
   deleteDesignation(frameworkName: string, category: string, formBody: any) {
-    return this.http.delete<any>(`${API_END_POINTS.DELETE_DESIGNATION(frameworkName, category)}`, formBody)
+    return this.http.post<any>(`${API_END_POINTS.DELETE_DESIGNATION(frameworkName, category)}`, formBody)
   }
 }

From ce51260697ae9d22e77c95c00ea9f4f4e43ed496 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Fri, 26 Jul 2024 18:33:48 +0530
Subject: [PATCH 791/887] lint fixes

---
 .../designations/designations.component.ts    | 43 +++++++++----------
 .../services/designations.service.ts          |  2 +-
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
index 035433104..fd20f386f 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
@@ -134,7 +134,7 @@ export class DesignationsComponent implements OnInit {
       } else {
         setTimeout(() => {
           this.getOrgReadData()
-        }, 10000)
+        },         10000)
       }
       // console.log('orgFramework Details', res)
     })
@@ -145,7 +145,7 @@ export class DesignationsComponent implements OnInit {
     this.environment.frameworkName = frameworkid
     this.designationsService.getFrameworkInfo(frameworkid).subscribe(
       {
-        next: (res) => {
+        next: res => {
           this.showLoader = false
           this.frameworkDetails = _.get(res, 'result.framework')
           this.designationsService.setFrameWorkInfo(this.frameworkDetails)
@@ -156,7 +156,7 @@ export class DesignationsComponent implements OnInit {
           this.showLoader = false
           const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
           this.openSnackbar(errorMessage)
-        }
+        },
 
       })
   }
@@ -166,7 +166,7 @@ export class DesignationsComponent implements OnInit {
       this.searchControl.valueChanges.pipe(delay(500)).subscribe({
         next: response => {
           this.filterDesignations(response)
-        }
+        },
       })
     }
   }
@@ -289,28 +289,27 @@ export class DesignationsComponent implements OnInit {
   removeDesignation(designation: any) {
     if (designation) {
       const requestBody = {
-        "request": {
-          "contentIds": [
-            _.get(designation, 'code')
-          ]
-        }
+        request: {
+          contentIds: [
+            _.get(designation, 'code'),
+          ],
+        },
       }
       this.showLoader = true
-      this.designationsService.deleteDesignation
-        (this.frameworkDetails.code, 'designation', requestBody).subscribe({
-          next: (res) => {
-            if (res) {
-              this.publishFrameWork()
-            } else {
-              this.showLoader = false
-            }
-          },
-          error: (error: HttpErrorResponse) => {
+      this.designationsService.deleteDesignation(this.frameworkDetails.code, 'designation', requestBody).subscribe({
+        next: res => {
+          if (res) {
+            this.publishFrameWork()
+          } else {
             this.showLoader = false
-            const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
-            this.openSnackbar(errorMessage)
           }
-        })
+        },
+        error: (error: HttpErrorResponse) => {
+          this.showLoader = false
+          const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
+          this.openSnackbar(errorMessage)
+        },
+      })
     }
   }
 
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
index 383a173ac..93e851a14 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
@@ -195,7 +195,7 @@ export class DesignationsService {
       frameworkId,
       categoryId,
       categoryTermCode
-    )}`, reguestBody)
+    )}`,                   reguestBody)
   }
 
   publishFramework(frameworkName: string) {

From cf92131e233dad13280154199851d96f701d4a01 Mon Sep 17 00:00:00 2001
From: Bharath Kumar <bharathkumar@TI-MAC-087.local>
Date: Fri, 26 Jul 2024 19:55:39 +0530
Subject: [PATCH 792/887] change in version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 94d0d0662..65d5719df 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "@sunbird-cb/micro-surveys": "2.0.13",
     "@sunbird-cb/rain-dashboards": "0.4.33",
     "@sunbird-cb/resolver": "^1.0.0",
-    "@sunbird-cb/taxonomy-editor": "^0.0.19",
+    "@sunbird-cb/taxonomy-editor": "^0.0.20",
     "@sunbird-cb/utils": "^1.0.18",
     "@types/file-saver": "^2.0.1",
     "brace": "^0.11.1",

From 093a64a0ad863b0b5150f9eb1b2d649a13d8da36 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Mon, 29 Jul 2024 18:58:45 +0530
Subject: [PATCH 793/887] added delay in navigation for data update of publish
 api

---
 .../import-designation/import-designation.component.ts        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
index a8c6ddf7b..32f055b1c 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
@@ -257,7 +257,9 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
     this.designationsService.publishFramework(frameworkName).subscribe({
       next: response => {
         if (response) {
-          this.dialogRef.close()
+          setTimeout(() => {
+            this.dialogRef.close()
+          }, 2000)
         }
       },
       error: (error: HttpErrorResponse) => {

From 266a5c486b901d59c805da35c3efeaab8a163bf8 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Tue, 30 Jul 2024 10:03:26 +0530
Subject: [PATCH 794/887] fixing build issues

---
 project/ws/app/src/lib/routes/home/home.module.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index 5a5e59392..da1b06342 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -11,7 +11,7 @@ import {
   MatChipsModule, MatProgressSpinnerModule, MatProgressBarModule, MatRadioModule,
   MatTabsModule, MatCheckboxModule, MatDatepickerModule, MatAutocompleteModule, MatSlideToggleModule,
 } from '@angular/material'
-import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'
+import { MAT_DIALOG_DATA } from '@angular/material/dialog'
 import { MatMenuModule } from '@angular/material/menu'
 import { MatPaginatorModule } from '@angular/material/paginator'
 import { MatCardModule } from '@angular/material/card'
@@ -209,10 +209,6 @@ import { TaxonomyEditorModule } from '@sunbird-cb/taxonomy-editor'
   ],
   providers: [
     { provide: 'environment', useValue: environment },
-    {
-      provide: MatDialogRef,
-      useValue: {},
-    },
     { provide: MAT_DIALOG_DATA, useValue: {} },
     InitResolver,
     MdoInfoService,

From 92c58eeade18fcc3b9ebe627b79e77a985d4fa8f Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Tue, 30 Jul 2024 10:31:41 +0530
Subject: [PATCH 795/887] update for user profile update issue

---
 .../routes/users-view/users-view.component.ts | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 5d14dbe16..854412edb 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -222,10 +222,10 @@ export class UsersViewComponent implements OnInit, OnDestroy {
           'profileDetails.professionalDetails.designation',
           'profileDetails.additionalDetails.tag',
         ],
-        fields: [
-          'rootOrgId',
-          'profileDetails',
-        ],
+        // fields: [
+        //   'rootOrgId',
+        //   'profileDetails',
+        // ],
         limit: this.limit,
         offset: this.pageIndex,
         query: this.getSearchText(query),
@@ -278,10 +278,10 @@ export class UsersViewComponent implements OnInit, OnDestroy {
           'profileDetails.professionalDetails.designation',
           'profileDetails.additionalDetails.tag',
         ],
-        fields: [
-          'rootOrgId',
-          'profileDetails',
-        ],
+        // fields: [
+        //   'rootOrgId',
+        //   'profileDetails',
+        // ],
         limit: this.limit,
         offset: this.pageIndex,
         query: this.getSearchText(query),
@@ -332,10 +332,10 @@ export class UsersViewComponent implements OnInit, OnDestroy {
           'profileDetails.professionalDetails.designation',
           'profileDetails.additionalDetails.tag',
         ],
-        fields: [
-          'rootOrgId',
-          'profileDetails',
-        ],
+        // fields: [
+        //   'rootOrgId',
+        //   'profileDetails',
+        // ],
         limit: this.limit,
         offset: this.pageIndex,
         query: this.getSearchText(query),
@@ -387,10 +387,10 @@ export class UsersViewComponent implements OnInit, OnDestroy {
           'profileDetails.professionalDetails.designation',
           'profileDetails.additionalDetails.tag',
         ],
-        fields: [
-          'rootOrgId',
-          'profileDetails',
-        ],
+        // fields: [
+        //   'rootOrgId',
+        //   'profileDetails',
+        // ],
         limit: this.limit,
         offset: this.pageIndex,
         query: this.getSearchText(query),

From d1346b3941858fc36682cd8180f52099973d5e6f Mon Sep 17 00:00:00 2001
From: vishnubansal <vishnu.bansal@tarento.com>
Date: Tue, 30 Jul 2024 10:43:17 +0530
Subject: [PATCH 796/887] update for lint issue fix

---
 .../import-designation/import-designation.component.ts          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
index 32f055b1c..ee1050015 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
@@ -259,7 +259,7 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
         if (response) {
           setTimeout(() => {
             this.dialogRef.close()
-          }, 2000)
+          },         2000)
         }
       },
       error: (error: HttpErrorResponse) => {

From 74a4dd021a5fdddc3f07ee327b4820f1d3d9a9d0 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Tue, 30 Jul 2024 11:23:48 +0530
Subject: [PATCH 797/887] taxonomy-editor version update

---
 package.json                                                    | 2 +-
 .../import-designation/import-designation.component.ts          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 65d5719df..722e83a64 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "@sunbird-cb/micro-surveys": "2.0.13",
     "@sunbird-cb/rain-dashboards": "0.4.33",
     "@sunbird-cb/resolver": "^1.0.0",
-    "@sunbird-cb/taxonomy-editor": "^0.0.20",
+    "@sunbird-cb/taxonomy-editor": "^0.0.21",
     "@sunbird-cb/utils": "^1.0.18",
     "@types/file-saver": "^2.0.1",
     "brace": "^0.11.1",
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
index 32f055b1c..ee1050015 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
@@ -259,7 +259,7 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
         if (response) {
           setTimeout(() => {
             this.dialogRef.close()
-          }, 2000)
+          },         2000)
         }
       },
       error: (error: HttpErrorResponse) => {

From 5e67938819a515c0a0217a6d07fc439aa102f52e Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Tue, 30 Jul 2024 11:39:03 +0530
Subject: [PATCH 798/887] collection library version update

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 722e83a64..21c30be33 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@angular/router": "~8.2.1",
     "@angular/service-worker": "~8.2.1",
     "@project-sunbird/telemetry-sdk": "0.0.26",
-    "@sunbird-cb/collection": "^1.0.44",
+    "@sunbird-cb/collection": "^1.0.45",
     "@sunbird-cb/design-system": "0.0.1",
     "@sunbird-cb/micro-surveys": "2.0.13",
     "@sunbird-cb/rain-dashboards": "0.4.33",

From 4e072b919da9150fcd7104ab4f7a6b945a4eacaa Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Wed, 31 Jul 2024 11:51:25 +0530
Subject: [PATCH 799/887] KB-5841 label added

---
 .../components/user-cards/user-card.component.html   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index c6b9f1bf5..e4b0620f2 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -92,7 +92,7 @@
                 <mat-icon class="nonverified-icon margin-left-xs"
                   *ngIf="user?.profileDetails?.profileGroupStatus === 'NOT-VERIFIED'">
                   cancel</mat-icon> <span *ngIf="user?.profileDetails?.profileGroupStatus === 'NOT-VERIFIED'"
-                  class="mat-caption status-text ws-mat-black40-text"> Not-verified</span>
+                  class="mat-caption status-text ws-mat-black40-text"> Non-verified</span>
               </div>
               <div class="md:w-1/3">
                 <label class="margin-remove-bottom form-label">Designation</label>
@@ -119,7 +119,7 @@
                   *ngIf="user?.profileDetails?.profileDesignationStatus === 'NOT-VERIFIED'">
                   cancel</mat-icon>
                 <span *ngIf="user?.profileDetails?.profileDesignationStatus === 'NOT-VERIFIED'"
-                  class="mat-caption status-text ws-mat-black40-text"> Not-verified</span>
+                  class="mat-caption status-text ws-mat-black40-text"> Non-verified</span>
               </div>
             </div>
           </div>
@@ -409,9 +409,13 @@
                 <mat-icon class="verified-icon margin-left-xs"
                   *ngIf="user?.profileDetails?.profileGroupStatus === 'VERIFIED'">
                   check_circle</mat-icon>
+                <span *ngIf="user?.profileDetails?.profileGroupStatus === 'VERIFIED'"
+                  class="mat-caption status-text ws-mat-black40-text"> Verified</span>
                 <mat-icon class="nonverified-icon margin-left-xs"
                   *ngIf="user?.profileDetails?.profileGroupStatus === 'NOT-VERIFIED'">
                   cancel</mat-icon>
+                <span *ngIf="user?.profileDetails?.profileGroupStatus === 'NOT-VERIFIED'"
+                  class="mat-caption status-text ws-mat-black40-text"> Non-verified</span>
               </p>
             </div>
             <div class="md:w-1/3">
@@ -422,9 +426,13 @@
                 <mat-icon class="verified-icon margin-left-xs"
                   *ngIf="user?.profileDetails?.profileDesignationStatus === 'VERIFIED'">
                   check_circle</mat-icon>
+                <span *ngIf="user?.profileDetails?.profileDesignationStatus === 'VERIFIED'"
+                  class="mat-caption status-text ws-mat-black40-text"> Verified</span>
                 <mat-icon class="nonverified-icon margin-left-xs"
                   *ngIf="user?.profileDetails?.profileDesignationStatus === 'NOT-VERIFIED'">
                   cancel</mat-icon>
+                <span *ngIf="user?.profileDetails?.profileDesignationStatus === 'NOT-VERIFIED'"
+                  class="mat-caption status-text ws-mat-black40-text"> Non-verified</span>
               </p>
             </div>
           </div>

From 2de09ddf70a6f7c50f379c9096bef5ed887918be Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Wed, 31 Jul 2024 16:00:22 +0530
Subject: [PATCH 800/887] KB-6168 MDO name is displaying without any spaces in
 ODCS mapping page

---
 .../components/designations/designations.component.ts       | 4 ++--
 .../home/routes/odcs-mapping/odcs-mapping.component.ts      | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
index fd20f386f..77dc4cf01 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
@@ -114,7 +114,7 @@ export class DesignationsComponent implements OnInit {
   createFreamwork() {
     this.showCreateLoader = true
     this.loaderMsg = this.designationConfig.frameworkCreationMSg
-    const departmentName = _.get(this.configSvc, 'userProfile.departmentName').replace(/\s/g, '')
+    const departmentName = _.get(this.configSvc, 'userProfile.departmentName')
     const masterFrameWorkName = this.environment.ODCSMasterFramework
     this.designationsService.createFrameWork(masterFrameWorkName, this.orgId, departmentName).subscribe((res: any) => {
       if (res) {
@@ -134,7 +134,7 @@ export class DesignationsComponent implements OnInit {
       } else {
         setTimeout(() => {
           this.getOrgReadData()
-        },         10000)
+        }, 10000)
       }
       // console.log('orgFramework Details', res)
     })
diff --git a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
index 7111de710..2a688e904 100644
--- a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
@@ -52,12 +52,12 @@ export class OdcsMappingComponent implements OnInit {
   callResizeEvent(_event: any) {
     setTimeout(() => {
       window.dispatchEvent(new Event('resize'))
-    },         100)
+    }, 100)
   }
 
   createFreamwork() {
     this.loaderMsg = this.odcConfig.frameworkCreationMSg
-    const departmentName = _.get(this.configSvc, 'userProfile.departmentName').replace(/\s/g, '')
+    const departmentName = _.get(this.configSvc, 'userProfile.departmentName')
     const masterFrameWorkName = this.environmentVal.ODCSMasterFramework
     this.designationsService.createFrameWork(masterFrameWorkName, this.orgId, departmentName).subscribe((res: any) => {
       if (res) {
@@ -79,7 +79,7 @@ export class OdcsMappingComponent implements OnInit {
       } else {
         setTimeout(() => {
           this.getOrgReadData()
-        },         10000)
+        }, 10000)
       }
     })
   }

From 81272c4341db8d565a81c1967a6f6f5bb6821f61 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Wed, 31 Jul 2024 16:01:27 +0530
Subject: [PATCH 801/887] added popup to show designations which are failed to
 import

---
 .../import-designation.component.ts           | 210 +++++++++---------
 1 file changed, 110 insertions(+), 100 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
index ee1050015..4568b2970 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
@@ -11,6 +11,7 @@ import { LoaderService } from '../../../../../../../../../../../src/app/services
 import { ActivatedRoute, Router } from '@angular/router'
 import { ConfirmationBoxComponent } from '../../../../../training-plan/components/confirmation-box/confirmation.box.component'
 import { DatePipe } from '@angular/common'
+import { ConformationPopupComponent } from '../../dialog-boxes/conformation-popup/conformation-popup.component'
 // import { environment } from '../../../../../../../../../../../src/environments/environment'
 // import { ConformationPopupComponent } from '../../dialog-boxes/conformation-popup/conformation-popup.component'
 
@@ -179,6 +180,8 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
     if (this.selctedDesignationsCount) {
       this.openProcessingBox()
       const currentDate = this.datePipe.transform(new Date(), 'dd MMM, yyyy')
+      const orgCategorie = _.get(this.frameworkInfo, 'categories', [])
+        .find((category: any) => category.code === 'org')
       const observables = this.selectedDesignationsList.map((selectedDesignation: any) => {
         const requestBody = {
           name: selectedDesignation.designation,
@@ -193,6 +196,8 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
             importedByName: _.get(this.configSvc, 'userProfileV2.firstName'),
             importedById: _.get(this.configSvc, 'userProfileV2.userId'),
             importedOn: currentDate,
+            previousCategoryCode: _.get(orgCategorie, 'terms[0].category'),
+            previousTermCode: _.get(orgCategorie, 'terms[0].code')
           },
         }
         this.designationsImportSuccessResponses =
@@ -201,7 +206,7 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
           })
         return this.designationsService.createTerm(requestBody).pipe(
           map(response => {
-            this.designationsImportSuccessResponses.push({ identifier: _.get(response, 'result.identifier[0]') })
+            this.designationsImportSuccessResponses.push({ identifier: _.get(response, 'result.node_id[0]') })
             this.importedDesignationNames.push(selectedDesignation.designation)
             return response
           }),
@@ -215,7 +220,7 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
       forkJoin(observables).subscribe({
         next: response => {
           if (response) {
-            this.updateTerms()
+            this.updateTerms(orgCategorie)
           }
         },
         error: (error: HttpErrorResponse) => {
@@ -227,29 +232,36 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
     }
   }
 
-  updateTerms() {
-    const framework = _.get(this.frameworkInfo, 'code')
-    const category = _.get(this.frameworkInfo, 'categories[0].terms[0].category')
-    const categoryTermCode = _.get(this.frameworkInfo, 'categories[0].terms[0].code')
-    const requestBody = {
-      request: {
-        term: {
-          associations: this.designationsImportSuccessResponses,
+  updateTerms(orgCategorie: any) {
+    if (this.selectedDesignationsList.length === this.designationsImportFailed.length) {
+      this.dialogRef.close(false)
+      const errorMessage = 'Import failed'
+      this.openSnackbar(errorMessage)
+      this.designationsImportFailed = []
+    } else {
+      const framework = _.get(this.frameworkInfo, 'code')
+      const category = _.get(orgCategorie, 'terms[0].category')
+      const categoryTermCode = _.get(orgCategorie, 'terms[0].code')
+      const requestBody = {
+        request: {
+          term: {
+            associations: this.designationsImportSuccessResponses,
+          },
         },
-      },
+      }
+      this.designationsService.updateTerms(framework, category, categoryTermCode, requestBody).subscribe({
+        next: response => {
+          if (response) {
+            this.publishFrameWork()
+          }
+        },
+        error: (error: HttpErrorResponse) => {
+          const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
+          this.dialogRef.close()
+          this.openSnackbar(errorMessage)
+        },
+      })
     }
-    this.designationsService.updateTerms(framework, category, categoryTermCode, requestBody).subscribe({
-      next: response => {
-        if (response) {
-          this.publishFrameWork()
-        }
-      },
-      error: (error: HttpErrorResponse) => {
-        const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
-        this.dialogRef.close()
-        this.openSnackbar(errorMessage)
-      },
-    })
   }
 
   publishFrameWork() {
@@ -259,7 +271,7 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
         if (response) {
           setTimeout(() => {
             this.dialogRef.close()
-          },         2000)
+          }, 2000)
         }
       },
       error: (error: HttpErrorResponse) => {
@@ -274,8 +286,8 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
     const dialogData = {
       type: 'progress',
       icon: 'vega',
-      title: 'Importing Your Designations',
-      subTitle: 'Wait a second , your importing in processing….',
+      title: 'Importing your designation.',
+      subTitle: 'Please wait a moment, your import is in progress.',
     }
     this.dialogRef = this.dialog.open(ConfirmationBoxComponent, {
       disableClose: true,
@@ -283,86 +295,84 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
       autoFocus: false,
     })
 
-    this.dialogRef.afterClosed().subscribe(() => {
-      this.openConforamtionPopup()
+    this.dialogRef.afterClosed().subscribe((res = true) => {
+      if (res) {
+        this.openConforamtionPopup()
+      }
     })
   }
 
   openConforamtionPopup() {
-    // const descriptions = []
-    // if (this.designationsImportFailed.length > 0) {
-    //   const designationNames = this.designationsImportFailed.map((e: any) => e.designation.designation).join(', ')
-    //   const description = {
-    //     header: 'Import failed designations',
-    //     messages: [
-    //       {
-    //         msgClass: '',
-    //         msg: 'Some thing went wrong while importing ',
-    //       },
-    //       {
-    //         msgClass: 'textBold',
-    //         msg: `${designationNames}`,
-    //       },
-    //       {
-    //         msgClass: '',
-    //         msg: ' designations',
-    //       },
-    //     ],
-    //   }
-    //   descriptions.push(description)
-    // }
-    // if (this.importedDesignationNames.length > 0) {
-    //   const designationNames = this.importedDesignationNames.join(', ')
-    //   const description = {
-    //     header: 'Designations imported successfully',
-    //     messages: [
-    //       {
-    //         msgClass: 'textBold',
-    //         msg: `${designationNames}`,
-    //       },
-    //       {
-    //         msgClass: '',
-    //         msg: ' are imported successfully',
-    //       },
-    //     ],
-    //   }
-    //   descriptions.push(description)
-    // }
+    if (this.designationsImportFailed.length > 0) {
+      const descriptions = []
+      const designationNames = this.designationsImportFailed.map((e: any) => e.designation.designation).join(', ')
+      const description = {
+        header: 'The following designations could not be imported at the moment. Please retry after some time.',
+        headerClass: 'flex items-center justify-center text-blue',
+        messages: [
+          {
+            msgClass: '',
+            msg: `${designationNames}`,
+          },
+        ],
+      }
+      descriptions.push(description)
+      // if (this.importedDesignationNames.length > 0) {
+      //   const designationNames = this.importedDesignationNames.join(', ')
+      //   const description = {
+      //     header: 'Designations imported successfully',
+      //     messages: [
+      //       {
+      //         msgClass: 'textBold',
+      //         msg: `${designationNames}`,
+      //       },
+      //       {
+      //         msgClass: '',
+      //         msg: ' are imported successfully',
+      //       },
+      //     ],
+      //   }
+      //   descriptions.push(description)
+      // }
 
-    // descriptions.push({
-    //   messages: [
-    //     {
-    //       msgClass: '',
-    //       msg: 'The changes will reflect shortly.',
-    //     },
-    //   ],
-    // })
-    // const dialogData = {
-    //   descriptions,
-    //   footerClass: 'items-center justify-end',
-    //   buttons: [
-    //     {
-    //       btnText: 'Cancel',
-    //       btnClass: '',
-    //       response: false,
-    //     },
-    //   ],
-    // }
+      // descriptions.push({
 
-    // const dialogRef = this.dialog.open(ConformationPopupComponent, {
-    //   data: dialogData,
-    //   autoFocus: false,
-    //   width: '600px',
-    //   maxWidth: '80vw',
-    //   maxHeight: '90vh',
-    //   disableClose: true,
-    // })
-    // dialogRef.afterClosed().subscribe(() => {
-    //   this.navigateToMyDesignations()
-    // })
-    const successMessage = 'Imported Successfully '
-    this.openSnackbar(successMessage, 10000)
-    this.navigateToMyDesignations()
+      //   messages: [
+      //     {
+      //       msgClass: '',
+      //       msg: 'The changes will reflect shortly.',
+      //     },
+      //   ],
+      // })
+      const dialogData = {
+        dialogType: 'warning',
+        descriptions,
+        footerClass: 'items-center justify-center',
+        buttons: [
+          {
+            btnText: 'ok',
+            btnClass: 'btn-full-success',
+            response: true,
+          },
+        ],
+      }
+
+      const dialogRef = this.dialog.open(ConformationPopupComponent, {
+        data: dialogData,
+        autoFocus: false,
+        width: '800px',
+        maxWidth: '80vw',
+        maxHeight: '90vh',
+        disableClose: true,
+      })
+      dialogRef.afterClosed().subscribe(() => {
+        this.navigateToMyDesignations()
+      })
+    } else {
+      const successMessage = 'Imported Successfully '
+      this.openSnackbar(successMessage, 10000)
+      this.navigateToMyDesignations()
+    }
   }
 
   navigateToMyDesignations() {

From 30a4390008b4873515f7fd01eab9705d77d18372 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Wed, 31 Jul 2024 16:14:22 +0530
Subject: [PATCH 802/887] lint issues fixes

---
 .../components/designations/designations.component.ts     | 2 +-
 .../import-designation/import-designation.component.ts    | 8 ++++----
 .../home/routes/odcs-mapping/odcs-mapping.component.ts    | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
index 77dc4cf01..831c3b676 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
@@ -134,7 +134,7 @@ export class DesignationsComponent implements OnInit {
       } else {
         setTimeout(() => {
           this.getOrgReadData()
-        }, 10000)
+        },         10000)
       }
       // console.log('orgFramework Details', res)
     })
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
index 4568b2970..7747881cd 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
@@ -197,7 +197,7 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
             importedById: _.get(this.configSvc, 'userProfileV2.userId'),
             importedOn: currentDate,
             previousCategoryCode: _.get(orgCategorie, 'terms[0].category'),
-            previousTermCode: _.get(orgCategorie, 'terms[0].code')
+            previousTermCode: _.get(orgCategorie, 'terms[0].code'),
           },
         }
         this.designationsImportSuccessResponses =
@@ -271,7 +271,7 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
         if (response) {
           setTimeout(() => {
             this.dialogRef.close()
-          }, 2000)
+          },         2000)
         }
       },
       error: (error: HttpErrorResponse) => {
@@ -295,7 +295,7 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
       autoFocus: false,
     })
 
-    this.dialogRef.afterClosed().subscribe((res = true) => {
+    this.dialogRef.afterClosed().subscribe((res: boolean = true) => {
       if (res) {
         this.openConforamtionPopup()
       }
@@ -345,8 +345,8 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
       //   ],
       // })
       const dialogData = {
-        dialogType: 'warning',
         descriptions,
+        dialogType: 'warning',
         footerClass: 'items-center justify-center',
         buttons: [
           {
diff --git a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
index 2a688e904..8324cef59 100644
--- a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
@@ -52,7 +52,7 @@ export class OdcsMappingComponent implements OnInit {
   callResizeEvent(_event: any) {
     setTimeout(() => {
       window.dispatchEvent(new Event('resize'))
-    }, 100)
+    },         100)
   }
 
   createFreamwork() {
@@ -79,7 +79,7 @@ export class OdcsMappingComponent implements OnInit {
       } else {
         setTimeout(() => {
           this.getOrgReadData()
-        }, 10000)
+        },         10000)
       }
     })
   }

From 83bc68a31c7bb1b964cb7b05ee4edf95171b75e7 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Wed, 31 Jul 2024 16:56:22 +0530
Subject: [PATCH 803/887] Added inner html for help text in odcs

---
 .../routes/home/routes/odcs-mapping/odcs-mapping.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.html b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.html
index 473c66018..e395540f6 100644
--- a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.html
@@ -20,7 +20,7 @@ <h1 class="mat-heading-1">{{odcConfig?.mainHeading}}</h1>
           <div class="flex-1 flex-col gap-4">
             <p class="flex items-center" *ngFor="let step of odcConfig?.topsection?.steps">
               <mat-icon class="mat-icon mr-4">error_outline</mat-icon>
-              {{step.title}}
+              <span [innerHTML]="step.title"></span>
             </p>
           </div>
           <div *ngIf="odcConfig?.topsection?.guideVideo?.enabled">

From 4c8b86aed940573535974c447a6f8188468a5840 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Wed, 31 Jul 2024 17:47:44 +0530
Subject: [PATCH 804/887] taxonomy editor version update

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 21c30be33..5ad498eac 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "@sunbird-cb/micro-surveys": "2.0.13",
     "@sunbird-cb/rain-dashboards": "0.4.33",
     "@sunbird-cb/resolver": "^1.0.0",
-    "@sunbird-cb/taxonomy-editor": "^0.0.21",
+    "@sunbird-cb/taxonomy-editor": "^0.0.22",
     "@sunbird-cb/utils": "^1.0.18",
     "@types/file-saver": "^2.0.1",
     "brace": "^0.11.1",

From 80af493b434f0dd28a6cd8965685ff7dcd27eeec Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Thu, 1 Aug 2024 10:27:14 +0530
Subject: [PATCH 805/887] KAR-717 fixed

---
 .../user-cards/user-card.component.html       | 122 +++++++++---------
 1 file changed, 61 insertions(+), 61 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index e4b0620f2..0cbc8915c 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -37,8 +37,7 @@
               </div>
             </div>
             <div class="mat-body-2 ws-mat-black40-text">{{user?.profileDetails &&
-              user?.profileDetails?.professionalDetails
-              &&
+              user?.profileDetails?.professionalDetails &&
               user?.profileDetails?.professionalDetails[0]?.designation ?
               user?.profileDetails?.professionalDetails[0]?.designation : '-'}}</div>
             <div class="mat-caption ws-mat-black40-text">
@@ -403,9 +402,9 @@
           <div class="flex flex-row margin-top-m">
             <div class="md:w-1/3">
               <label class="view-text-label">Group</label>
-              <p>{{user.profileDetails && user.profileDetails.professionalDetails &&
-                user.profileDetails.professionalDetails[0].group ?
-                user.profileDetails.professionalDetails[0].group : '-'}}
+              <p>{{user?.profileDetails && user?.profileDetails?.professionalDetails &&
+                user?.profileDetails?.professionalDetails[0]?.group ?
+                user?.profileDetails?.professionalDetails[0]?.group : '-'}}
                 <mat-icon class="verified-icon margin-left-xs"
                   *ngIf="user?.profileDetails?.profileGroupStatus === 'VERIFIED'">
                   check_circle</mat-icon>
@@ -420,9 +419,9 @@
             </div>
             <div class="md:w-1/3">
               <label class="view-text-label">Designation</label>
-              <p>{{user.profileDetails && user.profileDetails.professionalDetails &&
-                user.profileDetails.professionalDetails[0].designation ?
-                user.profileDetails.professionalDetails[0].designation : '-'}}
+              <p>{{user?.profileDetails && user?.profileDetails?.professionalDetails &&
+                user?.profileDetails?.professionalDetails[0]?.designation ?
+                user?.profileDetails?.professionalDetails[0]?.designation : '-'}}
                 <mat-icon class="verified-icon margin-left-xs"
                   *ngIf="user?.profileDetails?.profileDesignationStatus === 'VERIFIED'">
                   check_circle</mat-icon>
@@ -447,50 +446,51 @@
           <div class="flex flex-row margin-top-m">
             <div class="md:w-1/4">
               <label class="view-text-label">Employee ID</label>
-              <p class="word-wrap margin-right-l">{{user.profileDetails && user.profileDetails.employmentDetails &&
-                user.profileDetails.employmentDetails.employeeCode ?
-                user.profileDetails.employmentDetails.employeeCode : '-'}}</p>
+              <p class="word-wrap margin-right-l">{{user?.profileDetails && user?.profileDetails?.employmentDetails &&
+                user?.profileDetails?.employmentDetails?.employeeCode ?
+                user?.profileDetails?.employmentDetails?.employeeCode : '-'}}</p>
             </div>
 
             <div class="md:w-1/4">
               <label class="view-text-label">Email</label>
-              <p class="word-wrap">{{user.profileDetails && user.profileDetails.personalDetails ?
-                user.profileDetails.personalDetails.primaryEmail : '-'}}</p>
+              <p class="word-wrap">{{user?.profileDetails && user?.profileDetails?.personalDetails ?
+                user?.profileDetails?.personalDetails?.primaryEmail : '-'}}</p>
             </div>
 
             <div class="md:w-1/4">
               <label class="view-text-label">Mobile Number</label>
-              <p>+91 {{user.profileDetails && user.profileDetails.personalDetails ?
-                user.profileDetails.personalDetails.mobile : '-'}}</p>
+              <p>+91 {{user?.profileDetails && user?.profileDetails?.personalDetails ?
+                user?.profileDetails?.personalDetails?.mobile : '-'}}</p>
             </div>
 
             <div class="md:w-1/4">
               <label class="view-text-label">Gender</label>
-              <p>{{user.profileDetails && user.profileDetails.personalDetails &&
-                user.profileDetails.personalDetails.gender ?
-                user.profileDetails.personalDetails.gender : '-'}}</p>
+              <p>{{user?.profileDetails && user?.profileDetails?.personalDetails &&
+                user?.profileDetails?.personalDetails?.gender ?
+                user?.profileDetails?.personalDetails?.gender : '-'}}</p>
             </div>
           </div>
           <div class="flex flex-row margin-top-m">
             <div class="md:w-1/4">
               <label class="view-text-label">Date Of Birth</label>
-              <p>{{user.profileDetails && user.profileDetails.personalDetails && user.profileDetails.personalDetails.dob
-                ? user.profileDetails.personalDetails.dob
+              <p>{{user?.profileDetails && user?.profileDetails?.personalDetails &&
+                user?.profileDetails?.personalDetails?.dob
+                ? user?.profileDetails?.personalDetails?.dob
                 : '-'}}</p>
             </div>
 
             <div class="md:w-1/4">
               <label class="view-text-label">Mother Tongue</label>
-              <p>{{user.profileDetails && user.profileDetails.personalDetails &&
-                user.profileDetails.personalDetails.domicileMedium ?
-                user.profileDetails.personalDetails.domicileMedium : '-'}}</p>
+              <p>{{user?.profileDetails && user?.profileDetails?.personalDetails &&
+                user?.profileDetails?.personalDetails?.domicileMedium ?
+                user?.profileDetails?.personalDetails?.domicileMedium : '-'}}</p>
             </div>
 
             <div class="md:w-1/4">
               <label class="view-text-label">Category</label>
-              <p>{{user.profileDetails && user.profileDetails.personalDetails &&
-                user.profileDetails.personalDetails.category ?
-                user.profileDetails.personalDetails.category : '-'}}</p>
+              <p>{{user?.profileDetails && user?.profileDetails?.personalDetails &&
+                user?.profileDetails?.personalDetails?.category ?
+                user?.profileDetails?.personalDetails?.category : '-'}}</p>
             </div>
 
             <!-- <div class="md:w-1/4">
@@ -503,23 +503,23 @@
           <div class="flex flex-row margin-top-m">
             <div class="md:w-1/4">
               <label class="view-text-label">Office Pin Code</label>
-              <p>{{user.profileDetails && user.profileDetails.employmentDetails &&
-                user.profileDetails.employmentDetails.pinCode ?
-                user.profileDetails.employmentDetails.pinCode : '-'}}</p>
+              <p>{{user?.profileDetails && user?.profileDetails?.employmentDetails &&
+                user?.profileDetails?.employmentDetails?.pinCode ?
+                user?.profileDetails?.employmentDetails?.pinCode : '-'}}</p>
             </div>
 
             <div class="md:w-1/4">
               <label class="view-text-label">eHRMS ID</label>
-              <p>{{user.profileDetails && user.profileDetails.additionalProperties &&
-                user.profileDetails.additionalProperties.externalSystemId ?
-                user.profileDetails.additionalProperties.externalSystemId : '-'}}</p>
+              <p>{{user?.profileDetails && user?.profileDetails?.additionalProperties &&
+                user?.profileDetails?.additionalProperties?.externalSystemId ?
+                user?.profileDetails?.additionalProperties?.externalSystemId : '-'}}</p>
             </div>
 
             <div class="md:w-1/2">
               <label class="view-text-label">Tags</label>
-              <div *ngIf="user.profileDetails && user.profileDetails.additionalProperties &&
-              user.profileDetails.additionalProperties.tag &&
-              user.profileDetails.additionalProperties.tag.length > 0">
+              <div *ngIf="user?.profileDetails && user?.profileDetails?.additionalProperties &&
+              user?.profileDetails?.additionalProperties?.tag &&
+              user?.profileDetails?.additionalProperties?.tag.length > 0">
                 <ul class="tagslist">
                   <li *ngFor="let t of user.profileDetails.additionalProperties.tag">{{t}}</li>
                 </ul>
@@ -530,13 +530,13 @@
           <div class="flex flex-row margin-top-m">
             <div class="md:w-1/1">
               <label class="view-text-label">Roles</label>
-              <div *ngIf="user.organisations && user.organisations[0].roles.length > 0">
+              <div *ngIf="user?.organisations && user?.organisations[0]?.roles?.length > 0">
                 <ul class="roleslist">
                   <li *ngFor="let t of user.organisations[0].roles">{{t}}
                   </li>
                 </ul>
               </div>
-              <p *ngIf="user.organisations && user.organisations[0].roles.length === 0">-</p>
+              <p *ngIf="user?.organisations && user?.organisations[0]?.roles?.length === 0">-</p>
             </div>
           </div>
         </div>
@@ -570,9 +570,9 @@
               {{appData.userWorkflow.userInfo.first_name}}
             </div>
             <div class="mat-body-2 ws-mat-black40-text">{{appData.user &&
-              appData.user.profileDetails.professionalDetails &&
-              appData.user.profileDetails.professionalDetails[0].designation ?
-              appData.user.profileDetails.professionalDetails[0].designation : '-'}}</div>
+              appData.user?.profileDetails?.professionalDetails &&
+              appData.user?.profileDetails?.professionalDetails[0]?.designation ?
+              appData.user?.profileDetails?.professionalDetails[0]?.designation : '-'}}</div>
             <div class="mat-caption ws-mat-black40-text">Requested on: {{appData.requestedon | date: 'dd/MM/yyyy'}}
             </div>
           </div>
@@ -675,52 +675,52 @@
             <div class="flex flex-row margin-top-m">
               <div class="md:w-1/4">
                 <label class="view-text-label">Employee ID</label>
-                <p class="word-wrap margin-right-l">{{appData.user.profileDetails &&
-                  appData.user.profileDetails.employmentDetails &&
-                  appData.user.profileDetails.employmentDetails.employeeCode ?
+                <p class="word-wrap margin-right-l">{{appData?.user?.profileDetails &&
+                  appData.user?.profileDetails?.employmentDetails &&
+                  appData.user?.profileDetails?.employmentDetails?.employeeCode ?
                   appData.user.profileDetails.employmentDetails.employeeCode : '-'}}</p>
               </div>
 
               <div class="md:w-1/4">
                 <label class="view-text-label">Email</label>
-                <p>{{appData.user.profileDetails && appData.user.profileDetails.personalDetails ?
+                <p>{{appData?.user?.profileDetails && appData?.user?.profileDetails?.personalDetails ?
                   appData.user.profileDetails.personalDetails.primaryEmail : '-'}}</p>
               </div>
 
               <div class="md:w-1/4">
                 <label class="view-text-label">Mobile Number</label>
-                <p>+91 {{appData.user.profileDetails && appData.user.profileDetails.personalDetails ?
+                <p>+91 {{appData?.user?.profileDetails && appData?.user?.profileDetails?.personalDetails ?
                   appData.user.profileDetails.personalDetails.mobile : '-'}}</p>
               </div>
 
               <div class="md:w-1/4">
                 <label class="view-text-label">Gender</label>
-                <p>{{appData.user.profileDetails && appData.user.profileDetails.personalDetails &&
-                  appData.user.profileDetails.personalDetails.gender ?
-                  appData.user.profileDetails.personalDetails.gender : '-'}}</p>
+                <p>{{appData?.user?.profileDetails && appData?.user?.profileDetails?.personalDetails &&
+                  appData?.user?.profileDetails?.personalDetails?.gender ?
+                  appData?.user?.profileDetails?.personalDetails?.gender : '-'}}</p>
               </div>
             </div>
             <div class="flex flex-row margin-top-m">
               <div class="md:w-1/4">
                 <label class="view-text-label">Date Of Birth</label>
-                <p>{{appData.user.profileDetails && appData.user.profileDetails.personalDetails &&
-                  appData.user.profileDetails.personalDetails.dob
-                  ? appData.user.profileDetails.personalDetails.dob
+                <p>{{appData?.user?.profileDetails && appData?.user?.profileDetails?.personalDetails &&
+                  appData?.user?.profileDetails?.personalDetails?.dob
+                  ? appData?.user?.profileDetails?.personalDetails?.dob
                   : '-'}}</p>
               </div>
 
               <div class="md:w-1/4">
                 <label class="view-text-label">Mother Tongue</label>
-                <p>{{appData.user.profileDetails && appData.user.profileDetails.personalDetails &&
-                  appData.user.profileDetails.personalDetails.domicileMedium ?
-                  appData.user.profileDetails.personalDetails.domicileMedium : '-'}}</p>
+                <p>{{appData?.user?.profileDetails && appData?.user?.profileDetails?.personalDetails &&
+                  appData?.user?.profileDetails?.personalDetails?.domicileMedium ?
+                  appData?.user?.profileDetails?.personalDetails?.domicileMedium : '-'}}</p>
               </div>
 
               <div class="md:w-1/4">
                 <label class="view-text-label">Category</label>
-                <p>{{appData.user.profileDetails && appData.user.profileDetails.personalDetails &&
-                  appData.user.profileDetails.personalDetails.category ?
-                  appData.user.profileDetails.personalDetails.category : '-'}}</p>
+                <p>{{appData?.user?.profileDetails && appData?.user?.profileDetails?.personalDetails &&
+                  appData?.user?.profileDetails?.personalDetails?.category ?
+                  appData?.user?.profileDetails?.personalDetails?.category : '-'}}</p>
               </div>
 
               <!-- <div class="md:w-1/4">
@@ -733,15 +733,15 @@
             <div class="flex flex-row margin-top-m">
               <div class="md:w-1/4">
                 <label class="view-text-label">Office Pin Code</label>
-                <p>{{appData.user.profileDetails && appData.user.profileDetails.employmentDetails &&
-                  appData.user.profileDetails.employmentDetails.pinCode ?
+                <p>{{appData?.user?.profileDetails && appData?.user?.profileDetails?.employmentDetails &&
+                  appData?.user?.profileDetails?.employmentDetails?.pinCode ?
                   appData.user.profileDetails.employmentDetails.pinCode : '-'}}</p>
               </div>
 
               <div class="md:w-1/4">
                 <label class="view-text-label">eHRMS ID</label>
-                <p>{{appData.user.profileDetails && appData.user.profileDetails.additionalProperties &&
-                  appData.user.profileDetails.additionalProperties.externalSystemId ?
+                <p>{{appData?.user?.profileDetails && appData?.user?.profileDetails?.additionalProperties &&
+                  appData?.user?.profileDetails?.additionalProperties?.externalSystemId ?
                   appData.user.profileDetails.additionalProperties.externalSystemId : '-'}}</p>
               </div>
 

From 72f1f821123c3d4c1e945eead2c60c74ea705d2f Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Thu, 1 Aug 2024 10:59:33 +0530
Subject: [PATCH 806/887] fixed conditions

---
 .../user-cards/user-card.component.html       | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 0cbc8915c..74432f72a 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -567,13 +567,13 @@
           </div>
           <div class="username display-inline-block">
             <div class="mat-subheading-2 margin-remove word-wrap">
-              {{appData.userWorkflow.userInfo.first_name}}
+              {{appData?.userWorkflow?.userInfo?.first_name}}
             </div>
-            <div class="mat-body-2 ws-mat-black40-text">{{appData.user &&
-              appData.user?.profileDetails?.professionalDetails &&
-              appData.user?.profileDetails?.professionalDetails[0]?.designation ?
-              appData.user?.profileDetails?.professionalDetails[0]?.designation : '-'}}</div>
-            <div class="mat-caption ws-mat-black40-text">Requested on: {{appData.requestedon | date: 'dd/MM/yyyy'}}
+            <div class="mat-body-2 ws-mat-black40-text">{{appData?.user &&
+              appData?.user?.profileDetails?.professionalDetails &&
+              appData?.user?.profileDetails?.professionalDetails[0]?.designation ?
+              appData?.user?.profileDetails?.professionalDetails[0]?.designation : '-'}}</div>
+            <div class="mat-caption ws-mat-black40-text">Requested on: {{appData?.requestedon | date: 'dd/MM/yyyy'}}
             </div>
           </div>
         </div>
@@ -676,21 +676,21 @@
               <div class="md:w-1/4">
                 <label class="view-text-label">Employee ID</label>
                 <p class="word-wrap margin-right-l">{{appData?.user?.profileDetails &&
-                  appData.user?.profileDetails?.employmentDetails &&
-                  appData.user?.profileDetails?.employmentDetails?.employeeCode ?
-                  appData.user.profileDetails.employmentDetails.employeeCode : '-'}}</p>
+                  appData?.user?.profileDetails?.employmentDetails &&
+                  appData?.user?.profileDetails?.employmentDetails?.employeeCode ?
+                  appData?.user?.profileDetails?.employmentDetails?.employeeCode : '-'}}</p>
               </div>
 
               <div class="md:w-1/4">
                 <label class="view-text-label">Email</label>
                 <p>{{appData?.user?.profileDetails && appData?.user?.profileDetails?.personalDetails ?
-                  appData.user.profileDetails.personalDetails.primaryEmail : '-'}}</p>
+                  appData?.user?.profileDetails?.personalDetails?.primaryEmail : '-'}}</p>
               </div>
 
               <div class="md:w-1/4">
                 <label class="view-text-label">Mobile Number</label>
                 <p>+91 {{appData?.user?.profileDetails && appData?.user?.profileDetails?.personalDetails ?
-                  appData.user.profileDetails.personalDetails.mobile : '-'}}</p>
+                  appData?.user?.profileDetails?.personalDetails?.mobile : '-'}}</p>
               </div>
 
               <div class="md:w-1/4">
@@ -735,14 +735,14 @@
                 <label class="view-text-label">Office Pin Code</label>
                 <p>{{appData?.user?.profileDetails && appData?.user?.profileDetails?.employmentDetails &&
                   appData?.user?.profileDetails?.employmentDetails?.pinCode ?
-                  appData.user.profileDetails.employmentDetails.pinCode : '-'}}</p>
+                  appData?.user?.profileDetails?.employmentDetails?.pinCode : '-'}}</p>
               </div>
 
               <div class="md:w-1/4">
                 <label class="view-text-label">eHRMS ID</label>
                 <p>{{appData?.user?.profileDetails && appData?.user?.profileDetails?.additionalProperties &&
                   appData?.user?.profileDetails?.additionalProperties?.externalSystemId ?
-                  appData.user.profileDetails.additionalProperties.externalSystemId : '-'}}</p>
+                  appData?.user?.profileDetails?.additionalProperties?.externalSystemId : '-'}}</p>
               </div>
 
               <div class="md:w-1/2">

From 744573ed696da85af854f00237d31121dd57a468 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Thu, 1 Aug 2024 11:59:31 +0530
Subject: [PATCH 807/887] updated conditions

---
 .../user-cards/user-card.component.html       | 80 +++++++++----------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 74432f72a..95d509a51 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -36,9 +36,9 @@
                   <mat-icon>error</mat-icon></span>
               </div>
             </div>
-            <div class="mat-body-2 ws-mat-black40-text">{{user?.profileDetails &&
+            <div class="mat-body-2 ws-mat-black40-text">{{(user?.profileDetails &&
               user?.profileDetails?.professionalDetails &&
-              user?.profileDetails?.professionalDetails[0]?.designation ?
+              user?.profileDetails?.professionalDetails[0]?.designation) ?
               user?.profileDetails?.professionalDetails[0]?.designation : '-'}}</div>
             <div class="mat-caption ws-mat-black40-text">
               Marked on: {{user?.profileDetails?.profileStatusUpdatedOn || ' NA'}}</div>
@@ -402,8 +402,8 @@
           <div class="flex flex-row margin-top-m">
             <div class="md:w-1/3">
               <label class="view-text-label">Group</label>
-              <p>{{user?.profileDetails && user?.profileDetails?.professionalDetails &&
-                user?.profileDetails?.professionalDetails[0]?.group ?
+              <p>{{(user?.profileDetails && user?.profileDetails?.professionalDetails &&
+                user?.profileDetails?.professionalDetails[0]?.group) ?
                 user?.profileDetails?.professionalDetails[0]?.group : '-'}}
                 <mat-icon class="verified-icon margin-left-xs"
                   *ngIf="user?.profileDetails?.profileGroupStatus === 'VERIFIED'">
@@ -419,8 +419,8 @@
             </div>
             <div class="md:w-1/3">
               <label class="view-text-label">Designation</label>
-              <p>{{user?.profileDetails && user?.profileDetails?.professionalDetails &&
-                user?.profileDetails?.professionalDetails[0]?.designation ?
+              <p>{{(user?.profileDetails && user?.profileDetails?.professionalDetails &&
+                user?.profileDetails?.professionalDetails[0]?.designation) ?
                 user?.profileDetails?.professionalDetails[0]?.designation : '-'}}
                 <mat-icon class="verified-icon margin-left-xs"
                   *ngIf="user?.profileDetails?.profileDesignationStatus === 'VERIFIED'">
@@ -446,50 +446,50 @@
           <div class="flex flex-row margin-top-m">
             <div class="md:w-1/4">
               <label class="view-text-label">Employee ID</label>
-              <p class="word-wrap margin-right-l">{{user?.profileDetails && user?.profileDetails?.employmentDetails &&
-                user?.profileDetails?.employmentDetails?.employeeCode ?
+              <p class="word-wrap margin-right-l">{{(user?.profileDetails && user?.profileDetails?.employmentDetails &&
+                user?.profileDetails?.employmentDetails?.employeeCode) ?
                 user?.profileDetails?.employmentDetails?.employeeCode : '-'}}</p>
             </div>
 
             <div class="md:w-1/4">
               <label class="view-text-label">Email</label>
-              <p class="word-wrap">{{user?.profileDetails && user?.profileDetails?.personalDetails ?
+              <p class="word-wrap">{{(user?.profileDetails && user?.profileDetails?.personalDetails) ?
                 user?.profileDetails?.personalDetails?.primaryEmail : '-'}}</p>
             </div>
 
             <div class="md:w-1/4">
               <label class="view-text-label">Mobile Number</label>
-              <p>+91 {{user?.profileDetails && user?.profileDetails?.personalDetails ?
+              <p>+91 {{(user?.profileDetails && user?.profileDetails?.personalDetails) ?
                 user?.profileDetails?.personalDetails?.mobile : '-'}}</p>
             </div>
 
             <div class="md:w-1/4">
               <label class="view-text-label">Gender</label>
-              <p>{{user?.profileDetails && user?.profileDetails?.personalDetails &&
-                user?.profileDetails?.personalDetails?.gender ?
+              <p>{{(user?.profileDetails && user?.profileDetails?.personalDetails &&
+                user?.profileDetails?.personalDetails?.gender) ?
                 user?.profileDetails?.personalDetails?.gender : '-'}}</p>
             </div>
           </div>
           <div class="flex flex-row margin-top-m">
             <div class="md:w-1/4">
               <label class="view-text-label">Date Of Birth</label>
-              <p>{{user?.profileDetails && user?.profileDetails?.personalDetails &&
-                user?.profileDetails?.personalDetails?.dob
+              <p>{{(user?.profileDetails && user?.profileDetails?.personalDetails &&
+                user?.profileDetails?.personalDetails?.dob)
                 ? user?.profileDetails?.personalDetails?.dob
                 : '-'}}</p>
             </div>
 
             <div class="md:w-1/4">
               <label class="view-text-label">Mother Tongue</label>
-              <p>{{user?.profileDetails && user?.profileDetails?.personalDetails &&
-                user?.profileDetails?.personalDetails?.domicileMedium ?
+              <p>{{(user?.profileDetails && user?.profileDetails?.personalDetails &&
+                user?.profileDetails?.personalDetails?.domicileMedium) ?
                 user?.profileDetails?.personalDetails?.domicileMedium : '-'}}</p>
             </div>
 
             <div class="md:w-1/4">
               <label class="view-text-label">Category</label>
-              <p>{{user?.profileDetails && user?.profileDetails?.personalDetails &&
-                user?.profileDetails?.personalDetails?.category ?
+              <p>{{(user?.profileDetails && user?.profileDetails?.personalDetails &&
+                user?.profileDetails?.personalDetails?.category) ?
                 user?.profileDetails?.personalDetails?.category : '-'}}</p>
             </div>
 
@@ -503,15 +503,15 @@
           <div class="flex flex-row margin-top-m">
             <div class="md:w-1/4">
               <label class="view-text-label">Office Pin Code</label>
-              <p>{{user?.profileDetails && user?.profileDetails?.employmentDetails &&
-                user?.profileDetails?.employmentDetails?.pinCode ?
+              <p>{{(user?.profileDetails && user?.profileDetails?.employmentDetails &&
+                user?.profileDetails?.employmentDetails?.pinCode) ?
                 user?.profileDetails?.employmentDetails?.pinCode : '-'}}</p>
             </div>
 
             <div class="md:w-1/4">
               <label class="view-text-label">eHRMS ID</label>
-              <p>{{user?.profileDetails && user?.profileDetails?.additionalProperties &&
-                user?.profileDetails?.additionalProperties?.externalSystemId ?
+              <p>{{(user?.profileDetails && user?.profileDetails?.additionalProperties &&
+                user?.profileDetails?.additionalProperties?.externalSystemId) ?
                 user?.profileDetails?.additionalProperties?.externalSystemId : '-'}}</p>
             </div>
 
@@ -569,9 +569,9 @@
             <div class="mat-subheading-2 margin-remove word-wrap">
               {{appData?.userWorkflow?.userInfo?.first_name}}
             </div>
-            <div class="mat-body-2 ws-mat-black40-text">{{appData?.user &&
+            <div class="mat-body-2 ws-mat-black40-text">{{(appData?.user &&
               appData?.user?.profileDetails?.professionalDetails &&
-              appData?.user?.profileDetails?.professionalDetails[0]?.designation ?
+              appData?.user?.profileDetails?.professionalDetails[0]?.designation) ?
               appData?.user?.profileDetails?.professionalDetails[0]?.designation : '-'}}</div>
             <div class="mat-caption ws-mat-black40-text">Requested on: {{appData?.requestedon | date: 'dd/MM/yyyy'}}
             </div>
@@ -675,51 +675,51 @@
             <div class="flex flex-row margin-top-m">
               <div class="md:w-1/4">
                 <label class="view-text-label">Employee ID</label>
-                <p class="word-wrap margin-right-l">{{appData?.user?.profileDetails &&
+                <p class="word-wrap margin-right-l">{{(appData?.user?.profileDetails &&
                   appData?.user?.profileDetails?.employmentDetails &&
-                  appData?.user?.profileDetails?.employmentDetails?.employeeCode ?
+                  appData?.user?.profileDetails?.employmentDetails?.employeeCode) ?
                   appData?.user?.profileDetails?.employmentDetails?.employeeCode : '-'}}</p>
               </div>
 
               <div class="md:w-1/4">
                 <label class="view-text-label">Email</label>
-                <p>{{appData?.user?.profileDetails && appData?.user?.profileDetails?.personalDetails ?
+                <p>{{(appData?.user?.profileDetails && appData?.user?.profileDetails?.personalDetails) ?
                   appData?.user?.profileDetails?.personalDetails?.primaryEmail : '-'}}</p>
               </div>
 
               <div class="md:w-1/4">
                 <label class="view-text-label">Mobile Number</label>
-                <p>+91 {{appData?.user?.profileDetails && appData?.user?.profileDetails?.personalDetails ?
+                <p>+91 {{(appData?.user?.profileDetails && appData?.user?.profileDetails?.personalDetails) ?
                   appData?.user?.profileDetails?.personalDetails?.mobile : '-'}}</p>
               </div>
 
               <div class="md:w-1/4">
                 <label class="view-text-label">Gender</label>
-                <p>{{appData?.user?.profileDetails && appData?.user?.profileDetails?.personalDetails &&
-                  appData?.user?.profileDetails?.personalDetails?.gender ?
+                <p>{{(appData?.user?.profileDetails && appData?.user?.profileDetails?.personalDetails &&
+                  appData?.user?.profileDetails?.personalDetails?.gender) ?
                   appData?.user?.profileDetails?.personalDetails?.gender : '-'}}</p>
               </div>
             </div>
             <div class="flex flex-row margin-top-m">
               <div class="md:w-1/4">
                 <label class="view-text-label">Date Of Birth</label>
-                <p>{{appData?.user?.profileDetails && appData?.user?.profileDetails?.personalDetails &&
-                  appData?.user?.profileDetails?.personalDetails?.dob
+                <p>{{(appData?.user?.profileDetails && appData?.user?.profileDetails?.personalDetails &&
+                  appData?.user?.profileDetails?.personalDetails?.dob)
                   ? appData?.user?.profileDetails?.personalDetails?.dob
                   : '-'}}</p>
               </div>
 
               <div class="md:w-1/4">
                 <label class="view-text-label">Mother Tongue</label>
-                <p>{{appData?.user?.profileDetails && appData?.user?.profileDetails?.personalDetails &&
-                  appData?.user?.profileDetails?.personalDetails?.domicileMedium ?
+                <p>{{(appData?.user?.profileDetails && appData?.user?.profileDetails?.personalDetails &&
+                  appData?.user?.profileDetails?.personalDetails?.domicileMedium) ?
                   appData?.user?.profileDetails?.personalDetails?.domicileMedium : '-'}}</p>
               </div>
 
               <div class="md:w-1/4">
                 <label class="view-text-label">Category</label>
-                <p>{{appData?.user?.profileDetails && appData?.user?.profileDetails?.personalDetails &&
-                  appData?.user?.profileDetails?.personalDetails?.category ?
+                <p>{{(appData?.user?.profileDetails && appData?.user?.profileDetails?.personalDetails &&
+                  appData?.user?.profileDetails?.personalDetails?.category) ?
                   appData?.user?.profileDetails?.personalDetails?.category : '-'}}</p>
               </div>
 
@@ -733,15 +733,15 @@
             <div class="flex flex-row margin-top-m">
               <div class="md:w-1/4">
                 <label class="view-text-label">Office Pin Code</label>
-                <p>{{appData?.user?.profileDetails && appData?.user?.profileDetails?.employmentDetails &&
-                  appData?.user?.profileDetails?.employmentDetails?.pinCode ?
+                <p>{{(appData?.user?.profileDetails && appData?.user?.profileDetails?.employmentDetails &&
+                  appData?.user?.profileDetails?.employmentDetails?.pinCode) ?
                   appData?.user?.profileDetails?.employmentDetails?.pinCode : '-'}}</p>
               </div>
 
               <div class="md:w-1/4">
                 <label class="view-text-label">eHRMS ID</label>
-                <p>{{appData?.user?.profileDetails && appData?.user?.profileDetails?.additionalProperties &&
-                  appData?.user?.profileDetails?.additionalProperties?.externalSystemId ?
+                <p>{{(appData?.user?.profileDetails && appData?.user?.profileDetails?.additionalProperties &&
+                  appData?.user?.profileDetails?.additionalProperties?.externalSystemId) ?
                   appData?.user?.profileDetails?.additionalProperties?.externalSystemId : '-'}}</p>
               </div>
 

From 40496bcd688e958f3dcb552acbf0f8565a7cddfe Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Thu, 1 Aug 2024 13:47:10 +0530
Subject: [PATCH 808/887] Task #0000: taxonomy version update

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5ad498eac..a7c00b550 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "@sunbird-cb/micro-surveys": "2.0.13",
     "@sunbird-cb/rain-dashboards": "0.4.33",
     "@sunbird-cb/resolver": "^1.0.0",
-    "@sunbird-cb/taxonomy-editor": "^0.0.22",
+    "@sunbird-cb/taxonomy-editor": "^0.0.23",
     "@sunbird-cb/utils": "^1.0.18",
     "@types/file-saver": "^2.0.1",
     "brace": "^0.11.1",

From 73597e2b651b140dc84cd5f35e6dd4a515c1c85f Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Thu, 1 Aug 2024 14:18:29 +0530
Subject: [PATCH 809/887] Task #0000: taxonomy version update

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a7c00b550..2e2d657a9 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "@sunbird-cb/micro-surveys": "2.0.13",
     "@sunbird-cb/rain-dashboards": "0.4.33",
     "@sunbird-cb/resolver": "^1.0.0",
-    "@sunbird-cb/taxonomy-editor": "^0.0.23",
+    "@sunbird-cb/taxonomy-editor": "^0.0.24",
     "@sunbird-cb/utils": "^1.0.18",
     "@types/file-saver": "^2.0.1",
     "brace": "^0.11.1",

From dcd2e5f77a86e02e3ad2f1f1ae4b416100ee0507 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Thu, 1 Aug 2024 17:27:39 +0530
Subject: [PATCH 810/887] updating taxonomy version and added timeStamp in
 designation create

---
 package.json                                                   | 2 +-
 .../import-designation/import-designation.component.ts         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 2e2d657a9..fa5320024 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "@sunbird-cb/micro-surveys": "2.0.13",
     "@sunbird-cb/rain-dashboards": "0.4.33",
     "@sunbird-cb/resolver": "^1.0.0",
-    "@sunbird-cb/taxonomy-editor": "^0.0.24",
+    "@sunbird-cb/taxonomy-editor": "^0.0.25",
     "@sunbird-cb/utils": "^1.0.18",
     "@types/file-saver": "^2.0.1",
     "brace": "^0.11.1",
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
index 7747881cd..61c0a08c9 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
@@ -198,6 +198,7 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
             importedOn: currentDate,
             previousCategoryCode: _.get(orgCategorie, 'terms[0].category'),
             previousTermCode: _.get(orgCategorie, 'terms[0].code'),
+            timeStamp: new Date().getTime()
           },
         }
         this.designationsImportSuccessResponses =
@@ -271,7 +272,7 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
         if (response) {
           setTimeout(() => {
             this.dialogRef.close()
-          },         2000)
+          }, 2000)
         }
       },
       error: (error: HttpErrorResponse) => {

From 07e6c3267bfebd8dedb46f59c6ae972f4d7e8ead Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Thu, 1 Aug 2024 17:39:38 +0530
Subject: [PATCH 811/887] beautification change for side sub menu text

---
 .../ws/app/src/lib/head/left-menu/left-menu.component.html    | 2 +-
 .../ws/app/src/lib/head/left-menu/left-menu.component.scss    | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/head/left-menu/left-menu.component.html b/project/ws/app/src/lib/head/left-menu/left-menu.component.html
index c90708d38..f93eadda2 100644
--- a/project/ws/app/src/lib/head/left-menu/left-menu.component.html
+++ b/project/ws/app/src/lib/head/left-menu/left-menu.component.html
@@ -45,7 +45,7 @@
     <mat-nav-list class="nav-list-menu flex-1">
       <a mat-list-item disableRipple class="flex outline-1 main-menuitem" [attr.data-index]="mi"
         [routerLink]="[menu.routerLink]" [queryParamsHandling]="preserve" routerLinkActive="ws-active-route-men">
-        <span class="padding-left-xs">{{menu?.menuCategory}}</span>
+        <span class="padding-left-xs sub-menu-text">{{menu?.menuCategory}}</span>
       </a>
     </mat-nav-list>
   </ng-container>
diff --git a/project/ws/app/src/lib/head/left-menu/left-menu.component.scss b/project/ws/app/src/lib/head/left-menu/left-menu.component.scss
index 7e1095375..a04995b10 100644
--- a/project/ws/app/src/lib/head/left-menu/left-menu.component.scss
+++ b/project/ws/app/src/lib/head/left-menu/left-menu.component.scss
@@ -134,5 +134,9 @@
   }
 }
 
+.sub-menu-text {
+  font: 400 16px/24px Lato !important;
+}
+
 // <div style="width: 100%; height: 100%; padding: 16px; background: rgba(0, 0, 0, 0.04); justify-content: center; align-items: center; gap: 8px; display: inline-flex"><div style="flex: 1 1 0; color: black; font-size: 14px; font-family: Lato; font-weight: 700; word-wrap: break-word">Curate</div><div style="width: 24px; height: 24px; justify-content: center; align-items: center; display: flex"><div style="width: 24px; height: 24px; position: relative"><div style="width: 24px; height: 24px; left: 0px; top: 0px; position: absolute; opacity: 0; background: #D8D8D8"></div><div style="width: 10px; height: 5px; left: 7px; top: 15px; position: absolute; background: rgba(0, 0, 0, 0.60)"></div></div></div>
 // </div>
\ No newline at end of file

From 1f3d10117ab89fbce6dee67b3c849d0517e3482e Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Thu, 1 Aug 2024 18:32:15 +0530
Subject: [PATCH 812/887] designations help text ui changes

---
 .../designations/designations.component.html  | 38 ++++++++++++++-----
 .../designations/designations.component.scss  |  4 ++
 .../designations/designations.component.ts    |  3 +-
 .../import-designation.component.ts           |  4 +-
 4 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html
index e8090a2db..bbec509af 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html
@@ -8,7 +8,33 @@
     </div>
   </div>
 
-  <mat-card class="mb-4">
+  <mat-card class="mb-4" [ngStyle]="{'background-color': showTopSection ? '#fff' : 'rgba(235, 235, 235, 1)'}">
+    <div class="flex">
+      <span class="mat-body-1 font-bold-imp flex-1">{{designationConfig?.topsection?.heading}}</span>
+      <mat-icon class="cursor-pointer mat-icon mr-4" *ngIf="showTopSection"
+        (click)="showTopSection = !showTopSection; callResizeEvent($event)">keyboard_arrow_up</mat-icon>
+      <mat-icon class="cursor-pointer mat-icon mr-4" *ngIf="!showTopSection"
+        (click)="showTopSection = !showTopSection; callResizeEvent($event)">keyboard_arrow_down</mat-icon>
+    </div>
+    <div class="mt-5" *ngIf="showTopSection">
+      <div class="flex">
+        <div class="flex-1 flex-col gap-4">
+          <p class="flex items-center" *ngFor="let step of designationConfig?.topsection?.steps">
+            <mat-icon class="mat-icon mr-4">error_outline</mat-icon>
+            <span [innerHTML]="step.title"></span>
+          </p>
+        </div>
+        <div *ngIf="designationConfig?.topsection?.guideVideo?.enabled">
+          <video width="173" height="102" controls>
+            <source src="{{designationConfig?.topsection?.guideVideo?.url}}"
+              type="{{designationConfig?.topsection?.guideVideo?.type}}">
+          </video>
+        </div>
+      </div>
+    </div>
+  </mat-card>
+
+  <!-- <mat-card class="mb-4">
     <mat-card-content class="flex gap-4">
       <div class="section-1">
         <div class="flex-4 mobile-margin text-capitalize mat-h2">{{designationConfig?.topsection?.heading}}</div>
@@ -29,16 +55,8 @@
             type="{{designationConfig?.topsection?.guideVideo?.type}}">
         </video>
       </ng-container>
-      <!-- <div class="designationsDemo flex justify-end section-2">
-        <div class="designationsDemoVideo flex flex-column flex-middle justify-center" (click)="openVideoPopup()">
-          <mat-icon class="video_icon mb-2">play_circle</mat-icon>
-          <div>
-            Watch how it works
-          </div>
-        </div>
-      </div> -->
     </mat-card-content>
-  </mat-card>
+  </mat-card> -->
 
   <div class="w-full">
     <ng-container *ngIf="!showCreateLoader; else fw_create_loader">
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.scss b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.scss
index 1eaddf316..288a8b853 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.scss
@@ -14,6 +14,10 @@
   width: 220px;
 }
 
+.font-bold-imp{
+  font-weight: 700 !important;
+}
+
 .designationsDemo {
     .designationsDemoVideo {
       width: 290px;
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
index 831c3b676..9b30b8bea 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
@@ -37,6 +37,7 @@ export class DesignationsComponent implements OnInit {
     isMdoLeader: boolean
   }[] = []
   orgId = ''
+  showTopSection = false
 
   constructor(
     private designationsService: DesignationsService,
@@ -134,7 +135,7 @@ export class DesignationsComponent implements OnInit {
       } else {
         setTimeout(() => {
           this.getOrgReadData()
-        },         10000)
+        }, 10000)
       }
       // console.log('orgFramework Details', res)
     })
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
index 61c0a08c9..93b78515b 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
@@ -198,7 +198,7 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
             importedOn: currentDate,
             previousCategoryCode: _.get(orgCategorie, 'terms[0].category'),
             previousTermCode: _.get(orgCategorie, 'terms[0].code'),
-            timeStamp: new Date().getTime()
+            timeStamp: new Date().getTime(),
           },
         }
         this.designationsImportSuccessResponses =
@@ -272,7 +272,7 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
         if (response) {
           setTimeout(() => {
             this.dialogRef.close()
-          }, 2000)
+          },         2000)
         }
       },
       error: (error: HttpErrorResponse) => {

From 4cf8946555ab089e538f2c7c2d21fc8f45c6706c Mon Sep 17 00:00:00 2001
From: Bharath Kumar <bharathkumar@TI-MAC-087.local>
Date: Thu, 1 Aug 2024 19:19:34 +0530
Subject: [PATCH 813/887] changes in the accordian value change

---
 .../import-designation/import-designation.component.ts      | 4 ++--
 .../home/routes/odcs-mapping/odcs-mapping.component.ts      | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
index 93b78515b..65ebb33f7 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
@@ -198,7 +198,7 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
             importedOn: currentDate,
             previousCategoryCode: _.get(orgCategorie, 'terms[0].category'),
             previousTermCode: _.get(orgCategorie, 'terms[0].code'),
-            timeStamp: new Date().getTime(),
+            timeStamp: new Date().getTime() + 1,
           },
         }
         this.designationsImportSuccessResponses =
@@ -272,7 +272,7 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
         if (response) {
           setTimeout(() => {
             this.dialogRef.close()
-          },         2000)
+          }, 2000)
         }
       },
       error: (error: HttpErrorResponse) => {
diff --git a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
index 8324cef59..157b66c5a 100644
--- a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
@@ -13,7 +13,7 @@ import { DesignationsService } from '../designation/services/designations.servic
 export class OdcsMappingComponent implements OnInit {
   environmentVal: any
   taxonomyConfig: any
-  showTopSection = true
+  showTopSection = false
   odcConfig: any
   configSvc: any
   showLoader = false
@@ -52,7 +52,7 @@ export class OdcsMappingComponent implements OnInit {
   callResizeEvent(_event: any) {
     setTimeout(() => {
       window.dispatchEvent(new Event('resize'))
-    },         100)
+    }, 100)
   }
 
   createFreamwork() {
@@ -79,7 +79,7 @@ export class OdcsMappingComponent implements OnInit {
       } else {
         setTimeout(() => {
           this.getOrgReadData()
-        },         10000)
+        }, 10000)
       }
     })
   }

From e10c64f477e7f0c6794e20377c857ba0dae5c4ec Mon Sep 17 00:00:00 2001
From: Bharath Kumar <bharathkumar@TI-MAC-087.local>
Date: Thu, 1 Aug 2024 19:21:57 +0530
Subject: [PATCH 814/887] changes in the accordian value change

---
 .../components/designations/designations.component.ts         | 2 +-
 .../import-designation/import-designation.component.ts        | 2 +-
 .../routes/home/routes/odcs-mapping/odcs-mapping.component.ts | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
index 9b30b8bea..9e51ec673 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
@@ -135,7 +135,7 @@ export class DesignationsComponent implements OnInit {
       } else {
         setTimeout(() => {
           this.getOrgReadData()
-        }, 10000)
+        },         10000)
       }
       // console.log('orgFramework Details', res)
     })
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
index 65ebb33f7..651d905c0 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
@@ -272,7 +272,7 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
         if (response) {
           setTimeout(() => {
             this.dialogRef.close()
-          }, 2000)
+          },         2000)
         }
       },
       error: (error: HttpErrorResponse) => {
diff --git a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
index 157b66c5a..4019b3084 100644
--- a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
@@ -52,7 +52,7 @@ export class OdcsMappingComponent implements OnInit {
   callResizeEvent(_event: any) {
     setTimeout(() => {
       window.dispatchEvent(new Event('resize'))
-    }, 100)
+    },         100)
   }
 
   createFreamwork() {
@@ -79,7 +79,7 @@ export class OdcsMappingComponent implements OnInit {
       } else {
         setTimeout(() => {
           this.getOrgReadData()
-        }, 10000)
+        },         10000)
       }
     })
   }

From 643c1393abf288dcca7024a29b1b6601be2a91ee Mon Sep 17 00:00:00 2001
From: Bharath Kumar <bharathkumar@TI-MAC-087.local>
Date: Fri, 2 Aug 2024 10:22:55 +0530
Subject: [PATCH 815/887] taxanomy editor version change

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fa5320024..b6f5765cc 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "@sunbird-cb/micro-surveys": "2.0.13",
     "@sunbird-cb/rain-dashboards": "0.4.33",
     "@sunbird-cb/resolver": "^1.0.0",
-    "@sunbird-cb/taxonomy-editor": "^0.0.25",
+    "@sunbird-cb/taxonomy-editor": "^0.0.26",
     "@sunbird-cb/utils": "^1.0.18",
     "@types/file-saver": "^2.0.1",
     "brace": "^0.11.1",

From 8bf28ebbb702cb85f45502971ed0a58bbd1961ea Mon Sep 17 00:00:00 2001
From: Afzal84 <mohd.afzal@tarento.com>
Date: Fri, 2 Aug 2024 16:06:15 +0530
Subject: [PATCH 816/887] Fixed:- ATI redirection removed from MDO

---
 src/app/guards/general.guard.ts | 37 +++++++++++++++++----------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/app/guards/general.guard.ts b/src/app/guards/general.guard.ts
index f8ee3dd2f..eed6b823a 100644
--- a/src/app/guards/general.guard.ts
+++ b/src/app/guards/general.guard.ts
@@ -109,24 +109,25 @@ export class GeneralGuard implements CanActivate {
       // }
       // return this.router.parseUrl(`/app/tnc`)
     }
-    const orgProfile = _.get(this.configSvc.unMappedUser, 'orgProfile')
-    if (this.configSvc.userProfileV2
-      && _.get(this.configSvc.unMappedUser, 'rootOrg')
-      // && _.get(this.configSvc.unMappedUser, 'rootOrg.orgType') === null /// <Make it orgType>
-      && _.get(this.configSvc.unMappedUser, 'rootOrg.isInstitute')
-      && (orgProfile
-        && (JSON.stringify(_.get(orgProfile, 'profileDetails.consultancy') || {}) === '{}'
-          || JSON.stringify(_.get(orgProfile, 'profileDetails.faculty') || {}) === '{}'
-          || JSON.stringify(_.get(orgProfile, 'profileDetails.infrastructure') || {}) === '{}'
-          || JSON.stringify(_.get(orgProfile, 'profileDetails.instituteProfile') || {}) === '{}'
-          || JSON.stringify(_.get(orgProfile, 'profileDetails.research') || {}) === '{}'
-          || JSON.stringify(_.get(orgProfile, 'profileDetails.rolesAndFunctions') || {}) === '{}'
-          || JSON.stringify(_.get(orgProfile, 'profileDetails.trainingPrograms') || {}) === '{}')
-      )
-      || (_.get(this.configSvc.unMappedUser, 'rootOrg.isInstitute') && !orgProfile)
-    ) { // need to check the State Profile just after Login
-      return this.router.parseUrl(`/app/setup`)
-    }
+    // const orgProfile = _.get(this.configSvc.unMappedUser, 'orgProfile')
+    // if (this.configSvc.userProfileV2
+    //   && _.get(this.configSvc.unMappedUser, 'rootOrg')
+    //   // && _.get(this.configSvc.unMappedUser, 'rootOrg.orgType') === null /// <Make it orgType>
+    //   && _.get(this.configSvc.unMappedUser, 'rootOrg.isInstitute')
+    //   && (orgProfile
+    //     && (JSON.stringify(_.get(orgProfile, 'profileDetails.consultancy') || {}) === '{}'
+    //       || JSON.stringify(_.get(orgProfile, 'profileDetails.faculty') || {}) === '{}'
+    //       || JSON.stringify(_.get(orgProfile, 'profileDetails.infrastructure') || {}) === '{}'
+    //       || JSON.stringify(_.get(orgProfile, 'profileDetails.instituteProfile') || {}) === '{}'
+    //       || JSON.stringify(_.get(orgProfile, 'profileDetails.research') || {}) === '{}'
+    //       || JSON.stringify(_.get(orgProfile, 'profileDetails.rolesAndFunctions') || {}) === '{}'
+    //       || JSON.stringify(_.get(orgProfile, 'profileDetails.trainingPrograms') || {}) === '{}')
+    //   )
+    //   || (_.get(this.configSvc.unMappedUser, 'rootOrg.isInstitute') && !orgProfile)
+    // ) { // need to check the State Profile just after Login
+    //   return this.router.parseUrl(`/app/setup`)
+    // }
+
     if (_.get(this.configSvc, 'unMappedUser.isDeleted')) {
       this.router.navigateByUrl('/error-access-forbidden')
       this.authSvc.logout()

From ce7e1936886f0035b15f6befdc59ef8640b83e83 Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Fri, 2 Aug 2024 17:55:49 +0530
Subject: [PATCH 817/887] Task #0000: deleted message added for designation
 remove

---
 package.json                                             | 2 +-
 .../components/designations/designations.component.ts    | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index b6f5765cc..694e90058 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "@sunbird-cb/micro-surveys": "2.0.13",
     "@sunbird-cb/rain-dashboards": "0.4.33",
     "@sunbird-cb/resolver": "^1.0.0",
-    "@sunbird-cb/taxonomy-editor": "^0.0.26",
+    "@sunbird-cb/taxonomy-editor": "^0.0.27",
     "@sunbird-cb/utils": "^1.0.18",
     "@types/file-saver": "^2.0.1",
     "brace": "^0.11.1",
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
index 9e51ec673..9a3e14b18 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
@@ -135,7 +135,7 @@ export class DesignationsComponent implements OnInit {
       } else {
         setTimeout(() => {
           this.getOrgReadData()
-        },         10000)
+        }, 10000)
       }
       // console.log('orgFramework Details', res)
     })
@@ -300,7 +300,7 @@ export class DesignationsComponent implements OnInit {
       this.designationsService.deleteDesignation(this.frameworkDetails.code, 'designation', requestBody).subscribe({
         next: res => {
           if (res) {
-            this.publishFrameWork()
+            this.publishFrameWork('delete')
           } else {
             this.showLoader = false
           }
@@ -314,12 +314,15 @@ export class DesignationsComponent implements OnInit {
     }
   }
 
-  publishFrameWork() {
+  publishFrameWork(action?: string) {
     const frameworkName = _.get(this.frameworkDetails, 'code')
     this.designationsService.publishFramework(frameworkName).subscribe({
       next: response => {
         if (response) {
           this.getFrameworkInfo(this.frameworkDetails.code)
+          if (action && action === 'delete') {
+            this.openSnackbar('Deleted Successfully')
+          }
         }
       },
       error: (error: HttpErrorResponse) => {

From 1df859340e18a89c7e6c9ed0e2887eb8461e649e Mon Sep 17 00:00:00 2001
From: Bharath Kumar <bharathkumar@TI-MAC-087.local>
Date: Sun, 4 Aug 2024 19:19:02 +0530
Subject: [PATCH 818/887] taxanomy editor version change

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 694e90058..f36b05993 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "@sunbird-cb/micro-surveys": "2.0.13",
     "@sunbird-cb/rain-dashboards": "0.4.33",
     "@sunbird-cb/resolver": "^1.0.0",
-    "@sunbird-cb/taxonomy-editor": "^0.0.27",
+    "@sunbird-cb/taxonomy-editor": "^0.0.28",
     "@sunbird-cb/utils": "^1.0.18",
     "@types/file-saver": "^2.0.1",
     "brace": "^0.11.1",

From 1c5e201151d0dfe227a114496264e01dfa5859f8 Mon Sep 17 00:00:00 2001
From: Bharath Kumar <bharathkumar@TI-MAC-087.local>
Date: Sun, 4 Aug 2024 19:23:23 +0530
Subject: [PATCH 819/887] taxanomy editor version change

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f36b05993..ab63155da 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "@sunbird-cb/micro-surveys": "2.0.13",
     "@sunbird-cb/rain-dashboards": "0.4.33",
     "@sunbird-cb/resolver": "^1.0.0",
-    "@sunbird-cb/taxonomy-editor": "^0.0.28",
+    "@sunbird-cb/taxonomy-editor": "^0.0.29",
     "@sunbird-cb/utils": "^1.0.18",
     "@types/file-saver": "^2.0.1",
     "brace": "^0.11.1",

From d5ca85a6d5329c93acf7ea9311bee333257d69b5 Mon Sep 17 00:00:00 2001
From: Bharath Kumar <bharathkumar@TI-MAC-087.local>
Date: Sun, 4 Aug 2024 19:57:47 +0530
Subject: [PATCH 820/887] taxanomy editor version change

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ab63155da..8b9c52c91 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "@sunbird-cb/micro-surveys": "2.0.13",
     "@sunbird-cb/rain-dashboards": "0.4.33",
     "@sunbird-cb/resolver": "^1.0.0",
-    "@sunbird-cb/taxonomy-editor": "^0.0.29",
+    "@sunbird-cb/taxonomy-editor": "^0.0.30",
     "@sunbird-cb/utils": "^1.0.18",
     "@types/file-saver": "^2.0.1",
     "brace": "^0.11.1",

From 1851130707a5a69576087e43532143d652b05502 Mon Sep 17 00:00:00 2001
From: Bharath Kumar <bharathkumar@TI-MAC-087.local>
Date: Mon, 5 Aug 2024 18:10:33 +0530
Subject: [PATCH 821/887] changes in the delay and sorting

---
 .../components/designations/designations.component.ts    | 9 ++++++++-
 .../import-designation/import-designation.component.ts   | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
index 9a3e14b18..435b956af 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
@@ -202,7 +202,14 @@ export class DesignationsComponent implements OnInit {
       this.filteredDesignationsList = this.designationsList
         .filter((designation: any) => designation.name.toLowerCase().includes(key.toLowerCase()))
     } else {
-      this.filteredDesignationsList = this.designationsList
+      let filteredData: any = this.designationsList.sort((a: any, b: any) => {
+        const timestampA = a.additionalProperties && a.additionalProperties.timeStamp ? new Date(Number(a.additionalProperties.timeStamp)).getTime() : 0
+        const timestampB = b.additionalProperties && b.additionalProperties.timeStamp ? new Date(Number(b.additionalProperties.timeStamp)).getTime() : 0
+
+        return timestampB - timestampA
+
+      })
+      this.filteredDesignationsList = filteredData
     }
   }
 
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
index 651d905c0..41dbd7097 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
@@ -272,7 +272,7 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
         if (response) {
           setTimeout(() => {
             this.dialogRef.close()
-          },         2000)
+          }, 10000)
         }
       },
       error: (error: HttpErrorResponse) => {

From 6a176332ff07d9e9bd4e4c77b2fd1d275b9f990c Mon Sep 17 00:00:00 2001
From: Bharath Kumar <bharathkumar@TI-MAC-087.local>
Date: Mon, 5 Aug 2024 18:24:09 +0530
Subject: [PATCH 822/887] changes in the delay and sorting

---
 .../components/designations/designations.component.ts  | 10 ++++++----
 .../import-designation/import-designation.component.ts |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
index 435b956af..303f18aab 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
@@ -135,7 +135,7 @@ export class DesignationsComponent implements OnInit {
       } else {
         setTimeout(() => {
           this.getOrgReadData()
-        }, 10000)
+        },         10000)
       }
       // console.log('orgFramework Details', res)
     })
@@ -202,9 +202,11 @@ export class DesignationsComponent implements OnInit {
       this.filteredDesignationsList = this.designationsList
         .filter((designation: any) => designation.name.toLowerCase().includes(key.toLowerCase()))
     } else {
-      let filteredData: any = this.designationsList.sort((a: any, b: any) => {
-        const timestampA = a.additionalProperties && a.additionalProperties.timeStamp ? new Date(Number(a.additionalProperties.timeStamp)).getTime() : 0
-        const timestampB = b.additionalProperties && b.additionalProperties.timeStamp ? new Date(Number(b.additionalProperties.timeStamp)).getTime() : 0
+      const filteredData: any = this.designationsList.sort((a: any, b: any) => {
+        const timestampA = a.additionalProperties && a.additionalProperties.timeStamp ?
+          new Date(Number(a.additionalProperties.timeStamp)).getTime() : 0
+        const timestampB = b.additionalProperties && b.additionalProperties.timeStamp ?
+          new Date(Number(b.additionalProperties.timeStamp)).getTime() : 0
 
         return timestampB - timestampA
 
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
index 41dbd7097..76b2b39bb 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
@@ -272,7 +272,7 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
         if (response) {
           setTimeout(() => {
             this.dialogRef.close()
-          }, 10000)
+          },         10000)
         }
       },
       error: (error: HttpErrorResponse) => {

From 3b6ea5bd09848336bea039bf3661255913435474 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Tue, 6 Aug 2024 19:17:12 +0530
Subject: [PATCH 823/887] fixing designations list issue

---
 .../components/designations/designations.component.ts         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
index 303f18aab..b5143b5ab 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
@@ -135,7 +135,7 @@ export class DesignationsComponent implements OnInit {
       } else {
         setTimeout(() => {
           this.getOrgReadData()
-        },         10000)
+        }, 10000)
       }
       // console.log('orgFramework Details', res)
     })
@@ -179,7 +179,7 @@ export class DesignationsComponent implements OnInit {
   }
 
   getDesignations() {
-    this.designationsList = this.getTermsByCode('designation')
+    this.designationsList = _.get(this.organisationsList, '[0].children')
     this.designationsService.setCurrentOrgDesignationsList(this.designationsList)
     this.filterDesignations()
   }

From 2218521b70746688b0dd285962b348e98fb6afcc Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Wed, 7 Aug 2024 11:11:23 +0530
Subject: [PATCH 824/887] fixing designations list issue

---
 .../designations/designations.component.ts    | 12 ++++----
 .../services/designations.service.ts          | 29 +++++++++++--------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
index b5143b5ab..23b893498 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
@@ -135,7 +135,7 @@ export class DesignationsComponent implements OnInit {
       } else {
         setTimeout(() => {
           this.getOrgReadData()
-        }, 10000)
+        },         10000)
       }
       // console.log('orgFramework Details', res)
     })
@@ -328,10 +328,12 @@ export class DesignationsComponent implements OnInit {
     this.designationsService.publishFramework(frameworkName).subscribe({
       next: response => {
         if (response) {
-          this.getFrameworkInfo(this.frameworkDetails.code)
-          if (action && action === 'delete') {
-            this.openSnackbar('Deleted Successfully')
-          }
+          setTimeout(() => {
+            this.getFrameworkInfo(this.frameworkDetails.code)
+            if (action && action === 'delete') {
+              this.openSnackbar('Deleted Successfully')
+            }
+          },         10000)
         }
       },
       error: (error: HttpErrorResponse) => {
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
index 93e851a14..570adad9a 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
@@ -132,18 +132,7 @@ export class DesignationsService {
         category: a.category,
         associations: a.associations,
         // config: this.getConfig(a.code),
-        children: (a.terms || []).map((c: any) => {
-          const associations = c.associations || []
-          if (associations.length > 0) {
-            Object.assign(c, { children: associations })
-          }
-          const importedBy = _.get(c, 'additionalProperties.importedById', null) === _.get(this.userProfile, 'userId', '')
-            ? 'You' : _.get(c, 'additionalProperties.importedByName', null)
-          c['importedByName'] = importedBy,
-            c['importedOn'] = _.get(c, 'additionalProperties.importedOn'),
-            c['importedById'] = _.get(c, 'additionalProperties.importedById')
-          return c
-        }),
+        children: this.formateChildren(a.terms || []),
       })
     })
 
@@ -163,6 +152,22 @@ export class DesignationsService {
 
   }
 
+  formateChildren(terms: any[]): any[] {
+    return terms.map((c: any) => {
+      const associations = c.associations || []
+      if (associations.length > 0) {
+        Object.assign(c, { children: associations })
+        this.formateChildren(c.associations)
+      }
+      const importedBy = _.get(c, 'additionalProperties.importedById', null) === _.get(this.userProfile, 'userId', '')
+        ? 'You' : _.get(c, 'additionalProperties.importedByName', null)
+      c['importedByName'] = importedBy,
+        c['importedOn'] = _.get(c, 'additionalProperties.importedOn'),
+        c['importedById'] = _.get(c, 'additionalProperties.importedById')
+      return c
+    })
+  }
+
   get getUuid() {
     return uuidv4()
   }

From 2cc85f3415511d602f8774fa89e9a8f5ec72904f Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Thu, 8 Aug 2024 11:55:21 +0530
Subject: [PATCH 825/887] fixing navigation and api fail and message changes

---
 .../designations/designations.component.ts    | 42 ++-------
 .../import-designation.component.ts           | 93 +++++++++----------
 .../routes/designation/designation.module.ts  |  8 +-
 .../confirmation-box.component.html           |  8 +-
 4 files changed, 58 insertions(+), 93 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
index 23b893498..0c640d1d9 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
@@ -4,7 +4,6 @@ import { ITableData } from '@sunbird-cb/collection/lib/ui-org-table/interface/in
 import { DesignationsService } from '../../services/designations.service'
 import { FormControl } from '@angular/forms'
 import { delay } from 'rxjs/operators'
-import { HttpErrorResponse } from '@angular/common/http'
 import { MatDialog, MatSnackBar } from '@angular/material'
 import { ConformationPopupComponent } from '../../dialog-boxes/conformation-popup/conformation-popup.component'
 import { ActivatedRoute } from '@angular/router'
@@ -103,9 +102,7 @@ export class DesignationsComponent implements OnInit {
       this.designationConfig = data.pageData.data
     })
 
-    // console.log('this.configSvc', this.configSvc.orgReadData)
     if (this.configSvc.orgReadData && this.configSvc.orgReadData.frameworkid) {
-      // this.environmentVal.frameworkName = this.configSvc.orgReadData.frameworkid
       this.getFrameworkInfo(this.configSvc.orgReadData.frameworkid)
     } else {
       this.createFreamwork()
@@ -135,7 +132,7 @@ export class DesignationsComponent implements OnInit {
       } else {
         setTimeout(() => {
           this.getOrgReadData()
-        },         10000)
+        }, _.get(this.designationConfig, 'refreshDelayTime', 10000))
       }
       // console.log('orgFramework Details', res)
     })
@@ -153,9 +150,9 @@ export class DesignationsComponent implements OnInit {
 
           this.getOrganisations()
         },
-        error: (error: HttpErrorResponse) => {
+        error: () => {
           this.showLoader = false
-          const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
+          const errorMessage = _.get(this.designationConfig, 'internalErrorMsg')
           this.openSnackbar(errorMessage)
         },
 
@@ -217,26 +214,6 @@ export class DesignationsComponent implements OnInit {
 
   //#region (ui interactions like click)
 
-  // openDesignationCreatPopup(event?: any) {
-  //   console.log('event', event)
-  //   const dialogData = {
-  //     mode: 'create',
-  //     columnInfo: {
-  //       code: 'designation',
-  //       name: 'Designation',
-  //       children: this.designationsList,
-  //     },
-  //     frameworkId: 'organisation_fw',
-  //     selectedDesignation: null
-  //   }
-  //   if (event && event.action) {
-  //     dialogData.mode = event.action
-  //     dialogData.selectedDesignation = event.row
-  //   }
-  // }
-
-  // upload() { }
-
   menuSelected(event: any) {
     switch (event.action) {
       // case 'edit':
@@ -252,7 +229,6 @@ export class DesignationsComponent implements OnInit {
   }
 
   openConformationPopup(event: any) {
-    // console.log('envent data', event)
     const dialogData = {
       dialogType: 'warning',
       descriptions: [
@@ -314,9 +290,9 @@ export class DesignationsComponent implements OnInit {
             this.showLoader = false
           }
         },
-        error: (error: HttpErrorResponse) => {
+        error: () => {
           this.showLoader = false
-          const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
+          const errorMessage = _.get(this.designationConfig, 'internalErrorMsg')
           this.openSnackbar(errorMessage)
         },
       })
@@ -331,14 +307,14 @@ export class DesignationsComponent implements OnInit {
           setTimeout(() => {
             this.getFrameworkInfo(this.frameworkDetails.code)
             if (action && action === 'delete') {
-              this.openSnackbar('Deleted Successfully')
+              this.openSnackbar(_.get(this.designationConfig, 'termRemoveMsg'))
             }
-          },         10000)
+          }, _.get(this.designationConfig, 'refreshDelayTime', 10000))
         }
       },
-      error: (error: HttpErrorResponse) => {
+      error: () => {
         this.showLoader = false
-        const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
+        const errorMessage = _.get(this.designationConfig, 'internalErrorMsg')
         this.openSnackbar(errorMessage)
       },
     })
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
index 76b2b39bb..2597eeccb 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
@@ -5,7 +5,6 @@ import { FormControl } from '@angular/forms'
 import { catchError, delay, map } from 'rxjs/operators'
 import { SelectedDesignationPopupComponent } from '../../dialog-boxes/selected-designation-popup/selected-designation-popup.component'
 import { forkJoin, of, Subscription } from 'rxjs'
-import { HttpErrorResponse } from '@angular/common/http'
 import * as _ from 'lodash'
 import { LoaderService } from '../../../../../../../../../../../src/app/services/loader.service'
 import { ActivatedRoute, Router } from '@angular/router'
@@ -42,6 +41,7 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
   designationsImportFailed: any = []
   frameworkInfo: any = {}
   dialogRef: any
+  progressDialogData: any
 
   constructor(
     private designationsService: DesignationsService,
@@ -51,14 +51,15 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
     private snackBar: MatSnackBar,
     private datePipe: DatePipe,
     private activateRoute: ActivatedRoute
-  ) { }
+  ) {
+    this.getFrameWorkDetails()
+  }
 
   ngOnInit() {
     this.configSvc = this.activateRoute.snapshot.data['configService']
     this.loadDesignations()
-    this.valudChangeSubscribers()
-
-    this.getFrameWorkDetails()
+    this.valueChangeSubscription()
+    this.getRoutesData()
   }
 
   getFrameWorkDetails() {
@@ -108,7 +109,7 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
     return this.selectedDesignationsList
   }
 
-  valudChangeSubscribers() {
+  valueChangeSubscription() {
     if (this.searchControl) {
       this.searchControl.valueChanges.pipe(delay(500)).subscribe((value: string) => {
         this.loadDesignations(value)
@@ -116,6 +117,12 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
     }
   }
 
+  getRoutesData() {
+    this.activateRoute.data.subscribe(data => {
+      this.designationConfig = data.pageData.data
+    })
+  }
+
   selectDesignation(checked: Boolean, id: number) {
     const index = this.igotDesignationsList.findIndex((e: any) => e.id === id)
     const designation = this.igotDesignationsList[index]
@@ -224,22 +231,25 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
             this.updateTerms(orgCategorie)
           }
         },
-        error: (error: HttpErrorResponse) => {
+        error: () => {
           this.dialogRef.close()
-          const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
+          const errorMessage = _.get(this.designationConfig, 'internalErrorMsg')
           this.openSnackbar(errorMessage)
         },
       })
     }
   }
 
-  updateTerms(orgCategorie: any) {
+  updateTerms(orgCategorie: any, retry = false) {
     if (this.selectedDesignationsList.length === this.designationsImportFailed.length) {
       this.dialogRef.close(false)
-      const errorMessage = 'Import failed'
+      const errorMessage = _.get(this.designationConfig, 'internalErrorMsg')
       this.openSnackbar(errorMessage)
       this.designationsImportFailed = []
     } else {
+      if (retry === false) {
+        this.progressDialogData['subTitle'] = _.get(this.designationConfig, 'associationUpdateMsg')
+      }
       const framework = _.get(this.frameworkInfo, 'code')
       const category = _.get(orgCategorie, 'terms[0].category')
       const categoryTermCode = _.get(orgCategorie, 'terms[0].code')
@@ -256,10 +266,16 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
             this.publishFrameWork()
           }
         },
-        error: (error: HttpErrorResponse) => {
-          const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
-          this.dialogRef.close()
-          this.openSnackbar(errorMessage)
+        error: () => {
+          if (retry) {
+            const errorMessage = _.get(this.designationConfig, 'internalErrorMsg')
+            this.dialogRef.close()
+            this.openSnackbar(errorMessage)
+          } else {
+            this.progressDialogData['subTitle'] = _.get(this.designationConfig, 'associationRetryMsg')
+            const traiagain = true
+            this.updateTerms(orgCategorie, traiagain)
+          }
         },
       })
     }
@@ -267,16 +283,17 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
 
   publishFrameWork() {
     const frameworkName = _.get(this.frameworkInfo, 'code')
+    this.progressDialogData['subTitle'] = _.get(this.designationConfig, 'publishingMsg')
     this.designationsService.publishFramework(frameworkName).subscribe({
       next: response => {
         if (response) {
           setTimeout(() => {
-            this.dialogRef.close()
-          },         10000)
+            this.dialogRef.close(true)
+          }, _.get(this.designationConfig, 'refreshDelayTime', 10000))
         }
       },
-      error: (error: HttpErrorResponse) => {
-        const errorMessage = _.get(error, 'error.message', 'Some thing went wrong')
+      error: () => {
+        const errorMessage = _.get(this.designationConfig, 'internalErrorMsg')
         this.dialogRef.close()
         this.openSnackbar(errorMessage)
       },
@@ -284,19 +301,20 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
   }
 
   openProcessingBox() {
-    const dialogData = {
+    this.progressDialogData = {
       type: 'progress',
       icon: 'vega',
-      title: 'Importing your designation.',
-      subTitle: 'Please wait a moment, your import is in progress.',
+      title: _.get(this.designationConfig, 'importingDesignation'),
+      subTitle: _.get(this.designationConfig, 'termCreationMsg'),
+      showLoader: true
     }
     this.dialogRef = this.dialog.open(ConfirmationBoxComponent, {
       disableClose: true,
-      data: dialogData,
+      data: this.progressDialogData,
       autoFocus: false,
     })
 
-    this.dialogRef.afterClosed().subscribe((res: boolean = true) => {
+    this.dialogRef.afterClosed().subscribe((res: boolean = false) => {
       if (res) {
         this.openConforamtionPopup()
       }
@@ -318,33 +336,6 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
         ],
       }
       descriptions.push(description)
-      // if (this.importedDesignationNames.length > 0) {
-      //   const designationNames = this.importedDesignationNames.join(', ')
-      //   const description = {
-      //     header: 'Designations imported successfully',
-      //     messages: [
-      //       {
-      //         msgClass: 'textBold',
-      //         msg: `${designationNames}`,
-      //       },
-      //       {
-      //         msgClass: '',
-      //         msg: ' are imported successfully',
-      //       },
-      //     ],
-      //   }
-      //   descriptions.push(description)
-      // }
-
-      // descriptions.push({
-
-      //   messages: [
-      //     {
-      //       msgClass: '',
-      //       msg: 'The changes will reflect shortly.',
-      //     },
-      //   ],
-      // })
       const dialogData = {
         descriptions,
         dialogType: 'warning',
@@ -370,7 +361,7 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
         this.navigateToMyDesignations()
       })
     } else {
-      const successMessage = 'Imported Successfully '
+      const successMessage = _.get(this.designationConfig, 'successMsg')
       this.openSnackbar(successMessage, 10000)
       this.navigateToMyDesignations()
     }
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/designation.module.ts b/project/ws/app/src/lib/routes/home/routes/designation/designation.module.ts
index e31743d6e..ed579eab4 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/designation.module.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/designation.module.ts
@@ -30,17 +30,11 @@ const routes: Routes = [
   {
     path: 'import-designation',
     pathMatch: 'full',
-    // data: {
-    //   pageId: 'home/org-designations/import-designation',
-    //   module: 'manage-designations',
-    //   pageType: 'feature',
-    //   pageKey: 'import-designations',
-    // },
     data: {
       pageId: 'home/odcs-mapping',
       module: 'odcs-mapping',
       pageType: 'feature',
-      pageKey: 'odcs',
+      pageKey: 'my_designations',
     },
     component: ImportDesignationComponent,
     resolve: {
diff --git a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.html b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.html
index ff4c7ca95..7e58bfbd2 100644
--- a/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.html
+++ b/project/ws/app/src/lib/routes/training-plan/components/confirmation-box/confirmation-box.component.html
@@ -36,8 +36,12 @@
         {{data?.subTitle}}
     </div>
     <div class="flex flex-1 flex-row progress-icon">
-        <img src="assets/icons/{{data?.icon}}.svg" />
-
+        <ng-container *ngIf="data?.showLoader; else progressIcon">
+            <mat-spinner [diameter]="30"></mat-spinner>
+        </ng-container>
+        <ng-template #progressIcon>
+            <img src="assets/icons/{{data?.icon}}.svg" />
+        </ng-template>
     </div>
 </div>
 

From 4531f0e2c1ca3b9a9089c071f8f0c03069a278a4 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Thu, 8 Aug 2024 12:17:13 +0530
Subject: [PATCH 826/887] lint issue fixes

---
 .../components/designations/designations.component.ts       | 4 ++--
 .../import-designation/import-designation.component.ts      | 6 +++---
 src/app/app.module.ts                                       | 2 ++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
index 0c640d1d9..c2d96b1e3 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
@@ -132,7 +132,7 @@ export class DesignationsComponent implements OnInit {
       } else {
         setTimeout(() => {
           this.getOrgReadData()
-        }, _.get(this.designationConfig, 'refreshDelayTime', 10000))
+        },         _.get(this.designationConfig, 'refreshDelayTime', 10000))
       }
       // console.log('orgFramework Details', res)
     })
@@ -309,7 +309,7 @@ export class DesignationsComponent implements OnInit {
             if (action && action === 'delete') {
               this.openSnackbar(_.get(this.designationConfig, 'termRemoveMsg'))
             }
-          }, _.get(this.designationConfig, 'refreshDelayTime', 10000))
+          },         _.get(this.designationConfig, 'refreshDelayTime', 10000))
         }
       },
       error: () => {
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
index 2597eeccb..13e301be6 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
@@ -247,7 +247,7 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
       this.openSnackbar(errorMessage)
       this.designationsImportFailed = []
     } else {
-      if (retry === false) {
+      if (!retry) {
         this.progressDialogData['subTitle'] = _.get(this.designationConfig, 'associationUpdateMsg')
       }
       const framework = _.get(this.frameworkInfo, 'code')
@@ -289,7 +289,7 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
         if (response) {
           setTimeout(() => {
             this.dialogRef.close(true)
-          }, _.get(this.designationConfig, 'refreshDelayTime', 10000))
+          },         _.get(this.designationConfig, 'refreshDelayTime', 10000))
         }
       },
       error: () => {
@@ -306,7 +306,7 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
       icon: 'vega',
       title: _.get(this.designationConfig, 'importingDesignation'),
       subTitle: _.get(this.designationConfig, 'termCreationMsg'),
-      showLoader: true
+      showLoader: true,
     }
     this.dialogRef = this.dialog.open(ConfirmationBoxComponent, {
       disableClose: true,
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 201538852..1e6e66986 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -25,6 +25,7 @@ import {
   MatCheckboxModule,
   MatNativeDateModule,
   MatSortModule,
+  MatProgressSpinnerModule,
 } from '@angular/material'
 import { BrowserModule, HAMMER_GESTURE_CONFIG } from '@angular/platform-browser'
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
@@ -145,6 +146,7 @@ const getBaseHref = (platformLocation: PlatformLocation): string => {
     PipeSafeSanitizerModule,
     TourModule,
     PublicLogoutModule,
+    MatProgressSpinnerModule,
     ServiceWorkerModule.register('ngsw-worker.js', { enabled: environment.production }),
   ],
   exports: [

From dd328624668adf09c4c378e765a010e28efb8689 Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Thu, 8 Aug 2024 13:24:01 +0530
Subject: [PATCH 827/887] Task #0000: Updated taxonomy lib version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8b9c52c91..55e15b2d6 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "@sunbird-cb/micro-surveys": "2.0.13",
     "@sunbird-cb/rain-dashboards": "0.4.33",
     "@sunbird-cb/resolver": "^1.0.0",
-    "@sunbird-cb/taxonomy-editor": "^0.0.30",
+    "@sunbird-cb/taxonomy-editor": "^0.0.31",
     "@sunbird-cb/utils": "^1.0.18",
     "@types/file-saver": "^2.0.1",
     "brace": "^0.11.1",

From 5e6e55d7c486f57f7ac0bea4291fead2eba35433 Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Thu, 8 Aug 2024 21:29:27 +0530
Subject: [PATCH 828/887] Task #0000: sort fix, default KCM config fix

---
 .../components/designations/designations.component.html    | 4 ++--
 .../routes/designation/services/designations.service.ts    | 4 +++-
 .../home/routes/odcs-mapping/odcs-mapping.component.ts     | 7 ++++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html
index bbec509af..f076e7bcc 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html
@@ -12,9 +12,9 @@
     <div class="flex">
       <span class="mat-body-1 font-bold-imp flex-1">{{designationConfig?.topsection?.heading}}</span>
       <mat-icon class="cursor-pointer mat-icon mr-4" *ngIf="showTopSection"
-        (click)="showTopSection = !showTopSection; callResizeEvent($event)">keyboard_arrow_up</mat-icon>
+        (click)="showTopSection = !showTopSection">keyboard_arrow_up</mat-icon>
       <mat-icon class="cursor-pointer mat-icon mr-4" *ngIf="!showTopSection"
-        (click)="showTopSection = !showTopSection; callResizeEvent($event)">keyboard_arrow_down</mat-icon>
+        (click)="showTopSection = !showTopSection">keyboard_arrow_down</mat-icon>
     </div>
     <div class="mt-5" *ngIf="showTopSection">
       <div class="flex">
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
index 570adad9a..088e874d8 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
@@ -158,6 +158,8 @@ export class DesignationsService {
       if (associations.length > 0) {
         Object.assign(c, { children: associations })
         this.formateChildren(c.associations)
+      } else {
+        Object.assign(c, { children: [] })
       }
       const importedBy = _.get(c, 'additionalProperties.importedById', null) === _.get(this.userProfile, 'userId', '')
         ? 'You' : _.get(c, 'additionalProperties.importedByName', null)
@@ -200,7 +202,7 @@ export class DesignationsService {
       frameworkId,
       categoryId,
       categoryTermCode
-    )}`,                   reguestBody)
+    )}`, reguestBody)
   }
 
   publishFramework(frameworkName: string) {
diff --git a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
index 4019b3084..c469c972d 100644
--- a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
@@ -40,8 +40,9 @@ export class OdcsMappingComponent implements OnInit {
       this.environmentVal.frameworkName = this.configSvc.orgReadData.frameworkid
       this.odcConfig.defaultOdcsConfig[0].frameworkId = this.configSvc.orgReadData.frameworkid
       this.environmentVal.frameworkType = 'MDO_DESIGNATION'
-      this.taxonomyConfig = [...this.odcConfig.defaultOdcsConfig, ...this.odcConfig.frameworkConfig]
       this.environmentVal.kcmFrameworkName = environment.KCMframeworkName
+      this.odcConfig.defaultKCMConfig[0].frameworkId = environment.KCMframeworkName
+      this.taxonomyConfig = [...this.odcConfig.defaultOdcsConfig, ...this.odcConfig.defaultKCMConfig, ...this.odcConfig.frameworkConfig]
     } else {
       this.showLoader = false
       this.loaderMsg = this.odcConfig.frameworkCreationMSg
@@ -52,7 +53,7 @@ export class OdcsMappingComponent implements OnInit {
   callResizeEvent(_event: any) {
     setTimeout(() => {
       window.dispatchEvent(new Event('resize'))
-    },         100)
+    }, 100)
   }
 
   createFreamwork() {
@@ -79,7 +80,7 @@ export class OdcsMappingComponent implements OnInit {
       } else {
         setTimeout(() => {
           this.getOrgReadData()
-        },         10000)
+        }, 10000)
       }
     })
   }

From bb76f66c464b711ae8d022d571eba063a5407934 Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Thu, 8 Aug 2024 21:30:25 +0530
Subject: [PATCH 829/887] Task #0000: Time delay by terms count divide by 2
 logic for refresh

---
 .../designations/designations.component.ts         | 14 +++++++++++---
 .../import-designation.component.ts                |  8 +++++++-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
index c2d96b1e3..27cfac440 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
@@ -132,7 +132,7 @@ export class DesignationsComponent implements OnInit {
       } else {
         setTimeout(() => {
           this.getOrgReadData()
-        },         _.get(this.designationConfig, 'refreshDelayTime', 10000))
+        }, _.get(this.designationConfig, 'refreshDelayTime', 10000))
       }
       // console.log('orgFramework Details', res)
     })
@@ -199,7 +199,7 @@ export class DesignationsComponent implements OnInit {
       this.filteredDesignationsList = this.designationsList
         .filter((designation: any) => designation.name.toLowerCase().includes(key.toLowerCase()))
     } else {
-      const filteredData: any = this.designationsList.sort((a: any, b: any) => {
+      const filteredData: any = (this.designationsList && this.designationsList) && this.designationsList.sort((a: any, b: any) => {
         const timestampA = a.additionalProperties && a.additionalProperties.timeStamp ?
           new Date(Number(a.additionalProperties.timeStamp)).getTime() : 0
         const timestampB = b.additionalProperties && b.additionalProperties.timeStamp ?
@@ -304,12 +304,20 @@ export class DesignationsComponent implements OnInit {
     this.designationsService.publishFramework(frameworkName).subscribe({
       next: response => {
         if (response) {
+          // setTimeout(() => {
+          //   this.getFrameworkInfo(this.frameworkDetails.code)
+          //   if (action && action === 'delete') {
+          //     this.openSnackbar(_.get(this.designationConfig, 'termRemoveMsg'))
+          //   }
+          // }, _.get(this.designationConfig, 'refreshDelayTime', 10000))
+          const refreshTime = ((this.designationsList.length / 2) * 1000) >= 10000 ?
+            (this.designationsList.length / 2) * 1000 : 10000
           setTimeout(() => {
             this.getFrameworkInfo(this.frameworkDetails.code)
             if (action && action === 'delete') {
               this.openSnackbar(_.get(this.designationConfig, 'termRemoveMsg'))
             }
-          },         _.get(this.designationConfig, 'refreshDelayTime', 10000))
+          }, refreshTime)
         }
       },
       error: () => {
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
index 13e301be6..e3b8fbf58 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
@@ -287,9 +287,15 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
     this.designationsService.publishFramework(frameworkName).subscribe({
       next: response => {
         if (response) {
+          // setTimeout(() => {
+          //   this.dialogRef.close(true)
+          // },         _.get(this.designationConfig, 'refreshDelayTime', 10000))
+          const refreshTime = ((this.designationsImportSuccessResponses.length / 2) * 1000) >= 10000 ?
+            (this.designationsImportSuccessResponses.length / 2) * 1000 : 10000
           setTimeout(() => {
             this.dialogRef.close(true)
-          },         _.get(this.designationConfig, 'refreshDelayTime', 10000))
+          }, refreshTime)
+
         }
       },
       error: () => {

From 84c557afce215550ef5ce42a51976653264ab184 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Fri, 9 Aug 2024 10:33:58 +0530
Subject: [PATCH 830/887] Added preview vide in odcs

---
 .../designations/designations.component.html  | 18 +++++++++------
 .../designations/designations.component.scss  | 16 ++++++++++++++
 .../designations/designations.component.ts    | 22 +++++++++++++++----
 .../odcs-mapping/odcs-mapping.component.html  | 16 +++++++++-----
 .../odcs-mapping/odcs-mapping.component.scss  | 18 ++++++++++++++-
 .../odcs-mapping/odcs-mapping.component.ts    | 17 ++++++++++++++
 6 files changed, 89 insertions(+), 18 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html
index f076e7bcc..73648fafc 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.html
@@ -17,18 +17,22 @@
         (click)="showTopSection = !showTopSection">keyboard_arrow_down</mat-icon>
     </div>
     <div class="mt-5" *ngIf="showTopSection">
-      <div class="flex">
+      <div class="flex gap-20">
         <div class="flex-1 flex-col gap-4">
           <p class="flex items-center" *ngFor="let step of designationConfig?.topsection?.steps">
             <mat-icon class="mat-icon mr-4">error_outline</mat-icon>
             <span [innerHTML]="step.title"></span>
           </p>
         </div>
-        <div *ngIf="designationConfig?.topsection?.guideVideo?.enabled">
-          <video width="173" height="102" controls>
-            <source src="{{designationConfig?.topsection?.guideVideo?.url}}"
-              type="{{designationConfig?.topsection?.guideVideo?.type}}">
-          </video>
+        <div class="">
+          <div class="videoDemo flex justify-end section-2">
+            <div class="videoDemoVideo flex flex-column flex-middle justify-center" (click)="openVideoPopup()">
+              <mat-icon class="video_icon mb-2">play_arrow</mat-icon>
+              <div>
+                Watch how it works
+              </div>
+            </div>
+          </div>
         </div>
       </div>
     </div>
@@ -71,7 +75,7 @@
         </div>
       </div>
       <ng-container *ngIf="!showLoader">
-        <ng-container *ngIf="designationsList.length === 0; else designationsTable">
+        <ng-container *ngIf="designationsList?.length === 0; else designationsTable">
           <div class="w-full flex flex-col justify-center items-center emptyDesignations">
             <img src="/assets/icons/empty_data.svg" class="empty-desigantions-img">
             <div>
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.scss b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.scss
index 288a8b853..95e9a5755 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.scss
@@ -4,6 +4,22 @@
    }
 }
 
+.videoDemo {
+  .videoDemoVideo {
+    width: 173px;
+    height: 102px;
+    border-radius: 5px;
+    background-color: #FDEAD5;
+    font-weight: 600;
+    pointer-events: all;
+    cursor: pointer;
+
+    .video_icon {
+      font-size: 32px;
+    }
+  }
+}
+
 .importBtn {
   background: #1b4ca1 !important;
   color: #ffffff !important;
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
index 27cfac440..bee71f740 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
@@ -8,6 +8,7 @@ import { MatDialog, MatSnackBar } from '@angular/material'
 import { ConformationPopupComponent } from '../../dialog-boxes/conformation-popup/conformation-popup.component'
 import { ActivatedRoute } from '@angular/router'
 import { environment } from '../../../../../../../../../../../src/environments/environment'
+import { ReportsVideoComponent } from '../../../reports-video/reports-video.component'
 
 @Component({
   selector: 'ws-app-designations',
@@ -176,7 +177,7 @@ export class DesignationsComponent implements OnInit {
   }
 
   getDesignations() {
-    this.designationsList = _.get(this.organisationsList, '[0].children')
+    this.designationsList = _.get(this.organisationsList, '[0].children', [])
     this.designationsService.setCurrentOrgDesignationsList(this.designationsList)
     this.filterDesignations()
   }
@@ -196,10 +197,10 @@ export class DesignationsComponent implements OnInit {
 
   filterDesignations(key?: string) {
     if (key) {
-      this.filteredDesignationsList = this.designationsList
+      this.filteredDesignationsList = (this.designationsList || [])
         .filter((designation: any) => designation.name.toLowerCase().includes(key.toLowerCase()))
     } else {
-      const filteredData: any = (this.designationsList && this.designationsList) && this.designationsList.sort((a: any, b: any) => {
+      const filteredData: any = (this.designationsList || []).sort((a: any, b: any) => {
         const timestampA = a.additionalProperties && a.additionalProperties.timeStamp ?
           new Date(Number(a.additionalProperties.timeStamp)).getTime() : 0
         const timestampB = b.additionalProperties && b.additionalProperties.timeStamp ?
@@ -208,12 +209,25 @@ export class DesignationsComponent implements OnInit {
         return timestampB - timestampA
 
       })
-      this.filteredDesignationsList = filteredData
+      this.filteredDesignationsList = filteredData ? filteredData : []
     }
   }
 
   //#region (ui interactions like click)
 
+  openVideoPopup() {
+    const url = `${environment.karmYogiPath}${_.get(this.designationConfig, 'topsection.guideVideo.url')}`
+    this.dialog.open(ReportsVideoComponent, {
+      data: {
+        videoLink: url,
+      },
+      disableClose: true,
+      width: '50%',
+      height: '60%',
+      panelClass: 'overflow-visable',
+    })
+  }
+
   menuSelected(event: any) {
     switch (event.action) {
       // case 'edit':
diff --git a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.html b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.html
index e395540f6..f9f04cd5a 100644
--- a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.html
@@ -16,18 +16,22 @@ <h1 class="mat-heading-1">{{odcConfig?.mainHeading}}</h1>
           (click)="showTopSection = !showTopSection; callResizeEvent($event)">keyboard_arrow_down</mat-icon>
       </div>
       <div class="mt-5" *ngIf="showTopSection">
-        <div class="flex">
+        <div class="flex gap-20">
           <div class="flex-1 flex-col gap-4">
             <p class="flex items-center" *ngFor="let step of odcConfig?.topsection?.steps">
               <mat-icon class="mat-icon mr-4">error_outline</mat-icon>
               <span [innerHTML]="step.title"></span>
             </p>
           </div>
-          <div *ngIf="odcConfig?.topsection?.guideVideo?.enabled">
-            <video width="173" height="102" controls>
-              <source src="{{odcConfig?.topsection?.guideVideo?.url}}"
-                type="{{odcConfig?.topsection?.guideVideo?.type}}">
-            </video>
+          <div class="">
+            <div class="videoDemo flex justify-end section-2">
+              <div class="videoDemoVideo flex flex-column flex-middle justify-center" (click)="openVideoPopup()">
+                <mat-icon class="video_icon mb-2">play_arrow</mat-icon>
+                <div>
+                  Watch how it works
+                </div>
+              </div>
+            </div>
           </div>
         </div>
       </div>
diff --git a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.scss b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.scss
index dc6d9444d..2937e3fa0 100644
--- a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.scss
@@ -1,3 +1,19 @@
 .font-bold-imp{
   font-weight: 700 !important;
-}
\ No newline at end of file
+}
+
+.videoDemo {
+  .videoDemoVideo {
+    width: 173px;
+    height: 102px;
+    border-radius: 5px;
+    background-color: #FDEAD5;
+    font-weight: 600;
+    pointer-events: all;
+    cursor: pointer;
+
+    .video_icon {
+      font-size: 32px;
+    }
+  }
+}
diff --git a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
index c469c972d..fa8b7e781 100644
--- a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
@@ -3,6 +3,8 @@ import { environment } from '../../../../../../../../../src/environments/environ
 import { ActivatedRoute } from '@angular/router'
 import * as _ from 'lodash'
 import { DesignationsService } from '../designation/services/designations.service'
+import { MatDialog } from '@angular/material'
+import { ReportsVideoComponent } from '../reports-video/reports-video.component'
 // import { OdcsService } from '../../services/odcs.service'
 
 @Component({
@@ -22,6 +24,7 @@ export class OdcsMappingComponent implements OnInit {
   constructor(
     private activateRoute: ActivatedRoute,
     private designationsService: DesignationsService,
+    private dialog: MatDialog
     // private odcsSvc: OdcsService
   ) { }
 
@@ -197,4 +200,18 @@ export class OdcsMappingComponent implements OnInit {
   //   })
   // }
 
+
+  openVideoPopup() {
+    const url = `${environment.karmYogiPath}${_.get(this.odcConfig, 'topsection.guideVideo.url')}`
+    this.dialog.open(ReportsVideoComponent, {
+      data: {
+        videoLink: url,
+      },
+      disableClose: true,
+      width: '50%',
+      height: '60%',
+      panelClass: 'overflow-visable',
+    })
+  }
+
 }

From 3b83101340ba609352974bdfaab867e204b3a2c1 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Fri, 9 Aug 2024 10:38:43 +0530
Subject: [PATCH 831/887] lint fixes

---
 .../components/designations/designations.component.ts        | 4 ++--
 .../import-designation/import-designation.component.ts       | 2 +-
 .../home/routes/designation/services/designations.service.ts | 2 +-
 .../home/routes/odcs-mapping/odcs-mapping.component.ts       | 5 ++---
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
index bee71f740..e197fffbe 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
@@ -133,7 +133,7 @@ export class DesignationsComponent implements OnInit {
       } else {
         setTimeout(() => {
           this.getOrgReadData()
-        }, _.get(this.designationConfig, 'refreshDelayTime', 10000))
+        },         _.get(this.designationConfig, 'refreshDelayTime', 10000))
       }
       // console.log('orgFramework Details', res)
     })
@@ -331,7 +331,7 @@ export class DesignationsComponent implements OnInit {
             if (action && action === 'delete') {
               this.openSnackbar(_.get(this.designationConfig, 'termRemoveMsg'))
             }
-          }, refreshTime)
+          },         refreshTime)
         }
       },
       error: () => {
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
index e3b8fbf58..fc88c7da0 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/import-designation/import-designation.component.ts
@@ -294,7 +294,7 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
             (this.designationsImportSuccessResponses.length / 2) * 1000 : 10000
           setTimeout(() => {
             this.dialogRef.close(true)
-          }, refreshTime)
+          },         refreshTime)
 
         }
       },
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
index 088e874d8..6d15716fc 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
@@ -202,7 +202,7 @@ export class DesignationsService {
       frameworkId,
       categoryId,
       categoryTermCode
-    )}`, reguestBody)
+    )}`,                   reguestBody)
   }
 
   publishFramework(frameworkName: string) {
diff --git a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
index fa8b7e781..99316102a 100644
--- a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
@@ -56,7 +56,7 @@ export class OdcsMappingComponent implements OnInit {
   callResizeEvent(_event: any) {
     setTimeout(() => {
       window.dispatchEvent(new Event('resize'))
-    }, 100)
+    },         100)
   }
 
   createFreamwork() {
@@ -83,7 +83,7 @@ export class OdcsMappingComponent implements OnInit {
       } else {
         setTimeout(() => {
           this.getOrgReadData()
-        }, 10000)
+        },         10000)
       }
     })
   }
@@ -200,7 +200,6 @@ export class OdcsMappingComponent implements OnInit {
   //   })
   // }
 
-
   openVideoPopup() {
     const url = `${environment.karmYogiPath}${_.get(this.odcConfig, 'topsection.guideVideo.url')}`
     this.dialog.open(ReportsVideoComponent, {

From 1b1c08a0a995066f117a463838fe1bd8e17bb4df Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Fri, 9 Aug 2024 10:50:08 +0530
Subject: [PATCH 832/887] fixing frame work create api changes

---
 package.json                                  |  2 +-
 .../designations/designations.component.ts    | 29 +++++-----
 .../odcs-mapping/odcs-mapping.component.ts    | 53 ++++++++++++-------
 3 files changed, 52 insertions(+), 32 deletions(-)

diff --git a/package.json b/package.json
index 55e15b2d6..e2fff27ef 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "@sunbird-cb/micro-surveys": "2.0.13",
     "@sunbird-cb/rain-dashboards": "0.4.33",
     "@sunbird-cb/resolver": "^1.0.0",
-    "@sunbird-cb/taxonomy-editor": "^0.0.31",
+    "@sunbird-cb/taxonomy-editor": "^0.0.32",
     "@sunbird-cb/utils": "^1.0.18",
     "@types/file-saver": "^2.0.1",
     "brace": "^0.11.1",
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
index e197fffbe..9b8d23e8f 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
@@ -116,8 +116,11 @@ export class DesignationsComponent implements OnInit {
     const departmentName = _.get(this.configSvc, 'userProfile.departmentName')
     const masterFrameWorkName = this.environment.ODCSMasterFramework
     this.designationsService.createFrameWork(masterFrameWorkName, this.orgId, departmentName).subscribe((res: any) => {
-      if (res) {
+      if (_.get(res, 'result.framework')) {
+        this.environment.frameworkName = _.get(res, 'result.framework')
         this.getOrgReadData()
+        // this.publishFrameWork('', true)
+        // this.getFrameworkInfo(res.frameworkid)
       }
       // console.log('frameworkCreated: ', res)
     })
@@ -125,16 +128,16 @@ export class DesignationsComponent implements OnInit {
 
   getOrgReadData() {
     this.designationsService.getOrgReadData(this.orgId).subscribe((res: any) => {
-      if (_.get(res, 'frameworkid')) {
-        this.showLoader = true
-        this.showCreateLoader = false
-        this.environment.frameworkName = _.get(res, 'frameworkid')
-        this.getFrameworkInfo(res.frameworkid)
-      } else {
-        setTimeout(() => {
-          this.getOrgReadData()
-        },         _.get(this.designationConfig, 'refreshDelayTime', 10000))
-      }
+      // if (_.get(res, 'frameworkid')) {
+      this.showLoader = true
+      this.showCreateLoader = false
+      this.environment.frameworkName = _.get(res, 'frameworkid')
+      this.getFrameworkInfo(res.frameworkid)
+      // } else {
+      //   setTimeout(() => {
+      //     this.getOrgReadData()
+      //   }, _.get(this.designationConfig, 'refreshDelayTime', 10000))
+      // }
       // console.log('orgFramework Details', res)
     })
   }
@@ -314,7 +317,7 @@ export class DesignationsComponent implements OnInit {
   }
 
   publishFrameWork(action?: string) {
-    const frameworkName = _.get(this.frameworkDetails, 'code')
+    const frameworkName = _.get(this.frameworkDetails, 'code', _.get(this.environment, 'frameworkName'))
     this.designationsService.publishFramework(frameworkName).subscribe({
       next: response => {
         if (response) {
@@ -331,7 +334,7 @@ export class DesignationsComponent implements OnInit {
             if (action && action === 'delete') {
               this.openSnackbar(_.get(this.designationConfig, 'termRemoveMsg'))
             }
-          },         refreshTime)
+          }, refreshTime)
         }
       },
       error: () => {
diff --git a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
index 99316102a..5608a3c18 100644
--- a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
@@ -3,7 +3,7 @@ import { environment } from '../../../../../../../../../src/environments/environ
 import { ActivatedRoute } from '@angular/router'
 import * as _ from 'lodash'
 import { DesignationsService } from '../designation/services/designations.service'
-import { MatDialog } from '@angular/material'
+import { MatDialog, MatSnackBar } from '@angular/material'
 import { ReportsVideoComponent } from '../reports-video/reports-video.component'
 // import { OdcsService } from '../../services/odcs.service'
 
@@ -24,6 +24,7 @@ export class OdcsMappingComponent implements OnInit {
   constructor(
     private activateRoute: ActivatedRoute,
     private designationsService: DesignationsService,
+    private snackBar: MatSnackBar,
     private dialog: MatDialog
     // private odcsSvc: OdcsService
   ) { }
@@ -47,7 +48,7 @@ export class OdcsMappingComponent implements OnInit {
       this.odcConfig.defaultKCMConfig[0].frameworkId = environment.KCMframeworkName
       this.taxonomyConfig = [...this.odcConfig.defaultOdcsConfig, ...this.odcConfig.defaultKCMConfig, ...this.odcConfig.frameworkConfig]
     } else {
-      this.showLoader = false
+      this.showLoader = true
       this.loaderMsg = this.odcConfig.frameworkCreationMSg
       this.createFreamwork()
     }
@@ -56,17 +57,25 @@ export class OdcsMappingComponent implements OnInit {
   callResizeEvent(_event: any) {
     setTimeout(() => {
       window.dispatchEvent(new Event('resize'))
-    },         100)
+    }, 100)
   }
 
   createFreamwork() {
     this.loaderMsg = this.odcConfig.frameworkCreationMSg
     const departmentName = _.get(this.configSvc, 'userProfile.departmentName')
     const masterFrameWorkName = this.environmentVal.ODCSMasterFramework
-    this.designationsService.createFrameWork(masterFrameWorkName, this.orgId, departmentName).subscribe((res: any) => {
-      if (res) {
-        this.getOrgReadData()
-      }
+    this.designationsService.createFrameWork(masterFrameWorkName, this.orgId, departmentName).subscribe({
+      next: res => {
+        if (_.get(res, 'result.framework')) {
+          this.getOrgReadData()
+        }
+      },
+      error: () => {
+        this.showLoader = false
+        const errorMessage = _.get(this.odcConfig, 'internalErrorMsg')
+        this.openSnackbar(errorMessage)
+      },
+
       // console.log('frameworkCreated: ', res)
     })
   }
@@ -74,17 +83,19 @@ export class OdcsMappingComponent implements OnInit {
   getOrgReadData() {
     this.showLoader = true
     this.designationsService.getOrgReadData(this.orgId).subscribe((res: any) => {
-      if (_.get(res, 'frameworkid')) {
-        this.environmentVal.frameworkName = (_.get(res, 'frameworkid'))
-        this.environmentVal.frameworkType = 'MDO_DESIGNATION'
-        this.odcConfig.defaultOdcsConfig[0].frameworkId = (_.get(res, 'frameworkid'))
-        this.taxonomyConfig = [...this.odcConfig.defaultOdcsConfig, ...this.odcConfig.frameworkConfig]
-        this.environmentVal.kcmFrameworkName = environment.KCMframeworkName
-      } else {
-        setTimeout(() => {
-          this.getOrgReadData()
-        },         10000)
-      }
+      // if (_.get(res, 'frameworkid')) {
+      this.environmentVal.frameworkName = (_.get(res, 'frameworkid'))
+      this.odcConfig.defaultOdcsConfig[0].frameworkId = (_.get(res, 'frameworkid'))
+      this.environmentVal.frameworkType = 'MDO_DESIGNATION'
+      this.environmentVal.kcmFrameworkName = environment.KCMframeworkName
+      this.odcConfig.defaultKCMConfig[0].frameworkId = environment.KCMframeworkName
+      this.taxonomyConfig = [...this.odcConfig.defaultOdcsConfig, ...this.odcConfig.frameworkConfig]
+      this.showLoader = false
+      // } else {
+      //   setTimeout(() => {
+      //     this.getOrgReadData()
+      //   }, 10000)
+      // }
     })
   }
 
@@ -213,4 +224,10 @@ export class OdcsMappingComponent implements OnInit {
     })
   }
 
+  private openSnackbar(primaryMsg: any, duration: number = 5000) {
+    this.snackBar.open(primaryMsg, 'X', {
+      duration,
+    })
+  }
+
 }

From df5eec5472e020697f5ae47b2a1fbb2e369d9216 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Fri, 9 Aug 2024 11:03:19 +0530
Subject: [PATCH 833/887] lit issues fixes

---
 .../components/designations/designations.component.ts           | 2 +-
 .../routes/home/routes/odcs-mapping/odcs-mapping.component.ts   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
index 9b8d23e8f..c86352020 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
@@ -334,7 +334,7 @@ export class DesignationsComponent implements OnInit {
             if (action && action === 'delete') {
               this.openSnackbar(_.get(this.designationConfig, 'termRemoveMsg'))
             }
-          }, refreshTime)
+          },         refreshTime)
         }
       },
       error: () => {
diff --git a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
index 5608a3c18..954224036 100644
--- a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
@@ -57,7 +57,7 @@ export class OdcsMappingComponent implements OnInit {
   callResizeEvent(_event: any) {
     setTimeout(() => {
       window.dispatchEvent(new Event('resize'))
-    }, 100)
+    },         100)
   }
 
   createFreamwork() {

From cd3fe7d4d2c50526ae0c40de8de7ad3a86e78b21 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Fri, 9 Aug 2024 12:57:32 +0530
Subject: [PATCH 834/887] fixing create frame work api changes

---
 .../components/designations/designations.component.ts      | 6 ++++--
 .../routes/designation/services/designations.service.ts    | 7 ++++---
 .../home/routes/odcs-mapping/odcs-mapping.component.ts     | 6 ++++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
index c86352020..7d3563b22 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
@@ -118,7 +118,9 @@ export class DesignationsComponent implements OnInit {
     this.designationsService.createFrameWork(masterFrameWorkName, this.orgId, departmentName).subscribe((res: any) => {
       if (_.get(res, 'result.framework')) {
         this.environment.frameworkName = _.get(res, 'result.framework')
-        this.getOrgReadData()
+        setTimeout(() => {
+          this.getOrgReadData()
+        }, 5000)
         // this.publishFrameWork('', true)
         // this.getFrameworkInfo(res.frameworkid)
       }
@@ -334,7 +336,7 @@ export class DesignationsComponent implements OnInit {
             if (action && action === 'delete') {
               this.openSnackbar(_.get(this.designationConfig, 'termRemoveMsg'))
             }
-          },         refreshTime)
+          }, refreshTime)
         }
       },
       error: () => {
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
index 6d15716fc..f58639636 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
@@ -25,8 +25,9 @@ const API_END_POINTS = {
   IMPORT_DESIGNATION: 'api/framework/v1/term/create?',
   ORG_READ: '/apis/proxies/v8/org/v1/read',
   CREATE_TERM: `/apis/proxies/v8/designation/create/term`,
-  CREATE_FRAME_WORK: (frameworkName: string, orgId: string, termName: string) =>
-    `/apis/proxies/v8/org/framework/read?frameworkName=${frameworkName}&orgId=${orgId}&termName=${termName}`,
+  CREATE_FRAME_WORK: (frameworkName: string, orgId: string, termName: string) => {
+    return `/apis/proxies/v8/org/framework/read?frameworkName=${frameworkName}&orgId=${orgId}&termName=${encodeURIComponent(termName)}`
+  },
   DELETE_DESIGNATION: (frameworkName: string, category: string) =>
     `/apis/proxies/v8/framework/v1/term/retire?framework=${frameworkName}&category=${category}`,
 }
@@ -202,7 +203,7 @@ export class DesignationsService {
       frameworkId,
       categoryId,
       categoryTermCode
-    )}`,                   reguestBody)
+    )}`, reguestBody)
   }
 
   publishFramework(frameworkName: string) {
diff --git a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
index 954224036..10947eefa 100644
--- a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
@@ -57,7 +57,7 @@ export class OdcsMappingComponent implements OnInit {
   callResizeEvent(_event: any) {
     setTimeout(() => {
       window.dispatchEvent(new Event('resize'))
-    },         100)
+    }, 100)
   }
 
   createFreamwork() {
@@ -67,7 +67,9 @@ export class OdcsMappingComponent implements OnInit {
     this.designationsService.createFrameWork(masterFrameWorkName, this.orgId, departmentName).subscribe({
       next: res => {
         if (_.get(res, 'result.framework')) {
-          this.getOrgReadData()
+          setTimeout(() => {
+            this.getOrgReadData()
+          }, 5000)
         }
       },
       error: () => {

From 9980bd2cbc1ced10be7bed9f9b4fe02c544ab837 Mon Sep 17 00:00:00 2001
From: mansurskTarento <mansur.shaik@tarento.com>
Date: Fri, 9 Aug 2024 13:01:05 +0530
Subject: [PATCH 835/887] lint fixes

---
 .../components/designations/designations.component.ts         | 4 ++--
 .../home/routes/designation/services/designations.service.ts  | 2 +-
 .../routes/home/routes/odcs-mapping/odcs-mapping.component.ts | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
index 7d3563b22..68d09ac0d 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/components/designations/designations.component.ts
@@ -120,7 +120,7 @@ export class DesignationsComponent implements OnInit {
         this.environment.frameworkName = _.get(res, 'result.framework')
         setTimeout(() => {
           this.getOrgReadData()
-        }, 5000)
+        },         5000)
         // this.publishFrameWork('', true)
         // this.getFrameworkInfo(res.frameworkid)
       }
@@ -336,7 +336,7 @@ export class DesignationsComponent implements OnInit {
             if (action && action === 'delete') {
               this.openSnackbar(_.get(this.designationConfig, 'termRemoveMsg'))
             }
-          }, refreshTime)
+          },         refreshTime)
         }
       },
       error: () => {
diff --git a/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
index f58639636..f95078621 100644
--- a/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
+++ b/project/ws/app/src/lib/routes/home/routes/designation/services/designations.service.ts
@@ -203,7 +203,7 @@ export class DesignationsService {
       frameworkId,
       categoryId,
       categoryTermCode
-    )}`, reguestBody)
+    )}`,                   reguestBody)
   }
 
   publishFramework(frameworkName: string) {
diff --git a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
index 10947eefa..d88f59c58 100644
--- a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.ts
@@ -57,7 +57,7 @@ export class OdcsMappingComponent implements OnInit {
   callResizeEvent(_event: any) {
     setTimeout(() => {
       window.dispatchEvent(new Event('resize'))
-    }, 100)
+    },         100)
   }
 
   createFreamwork() {
@@ -69,7 +69,7 @@ export class OdcsMappingComponent implements OnInit {
         if (_.get(res, 'result.framework')) {
           setTimeout(() => {
             this.getOrgReadData()
-          }, 5000)
+          },         5000)
         }
       },
       error: () => {

From a563ae17deda5914bddbde71dd4ad78b80cb4f84 Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Fri, 9 Aug 2024 17:55:30 +0530
Subject: [PATCH 836/887] facets removed from search payload and sort&filter
 html removed from search component

---
 .../components/search/search.component.html   |  8 ++--
 .../routes/users-view/users-view.component.ts | 40 +++++++++----------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.html b/project/ws/app/src/lib/routes/home/components/search/search.component.html
index bf7ff3795..309727751 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.html
@@ -7,7 +7,7 @@
                 placeholder="Search" type="Standard" [ngClass]="{'disable': isContentLive}">
         </div>
     </div>
-    <div class="filter-section flex" *ngIf="!isApprovals">
+    <!-- <div class="filter-section flex" *ngIf="!isApprovals">
         <button mat-button type="button" (click)="sort()" class="apply-filter margin-right-s"
             [matMenuTriggerFor]="cardMenu">
             <mat-icon class="margin-right-xs">sort</mat-icon> Sort
@@ -25,12 +25,12 @@
                 </div>
             </ng-template>
         </mat-menu>
-    </div>
-    <div class="filter-section flex" *ngIf="!isApprovals">
+    </div> -->
+    <!-- <div class="filter-section flex" *ngIf="!isApprovals">
         <button mat-button type="button" (click)="openFilter()" class="apply-filter margin-right-s">
             Apply Filter <mat-icon class="margin-right-xs">filter_list</mat-icon>
         </button>
-    </div>
+    </div> -->
     <div class="flex flex-end" *ngIf="!isApprovals && currentFilter === 'allusers'">
         <button mat-button type="button" class="search-btn" [routerLink]="['/app/home/user-creation']"
             [ngClass]="{'disable': isContentLive}">Create user</button>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 854412edb..245dca131 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -217,11 +217,11 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     reqBody = {
       request: {
         filters: filtreq,
-        facets: [
-          'profileDetails.professionalDetails.group',
-          'profileDetails.professionalDetails.designation',
-          'profileDetails.additionalDetails.tag',
-        ],
+        // facets: [
+        //   'profileDetails.professionalDetails.group',
+        //   'profileDetails.professionalDetails.designation',
+        //   'profileDetails.additionalDetails.tag',
+        // ],
         // fields: [
         //   'rootOrgId',
         //   'profileDetails',
@@ -273,11 +273,11 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     reqBody = {
       request: {
         filters: filtreq,
-        facets: [
-          'profileDetails.professionalDetails.group',
-          'profileDetails.professionalDetails.designation',
-          'profileDetails.additionalDetails.tag',
-        ],
+        // facets: [
+        //   'profileDetails.professionalDetails.group',
+        //   'profileDetails.professionalDetails.designation',
+        //   'profileDetails.additionalDetails.tag',
+        // ],
         // fields: [
         //   'rootOrgId',
         //   'profileDetails',
@@ -327,11 +327,11 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     reqBody = {
       request: {
         filters: filtreq,
-        facets: [
-          'profileDetails.professionalDetails.group',
-          'profileDetails.professionalDetails.designation',
-          'profileDetails.additionalDetails.tag',
-        ],
+        // facets: [
+        //   'profileDetails.professionalDetails.group',
+        //   'profileDetails.professionalDetails.designation',
+        //   'profileDetails.additionalDetails.tag',
+        // ],
         // fields: [
         //   'rootOrgId',
         //   'profileDetails',
@@ -382,11 +382,11 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     reqBody = {
       request: {
         filters: filtreq,
-        facets: [
-          'profileDetails.professionalDetails.group',
-          'profileDetails.professionalDetails.designation',
-          'profileDetails.additionalDetails.tag',
-        ],
+        // facets: [
+        //   'profileDetails.professionalDetails.group',
+        //   'profileDetails.professionalDetails.designation',
+        //   'profileDetails.additionalDetails.tag',
+        // ],
         // fields: [
         //   'rootOrgId',
         //   'profileDetails',

From f93bf30cad7716fcaf045b2760bcf3aebf191b72 Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Fri, 9 Aug 2024 22:13:16 +0530
Subject: [PATCH 837/887] Task #000: Taxonomy lib update

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e2fff27ef..af534ea80 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "@sunbird-cb/micro-surveys": "2.0.13",
     "@sunbird-cb/rain-dashboards": "0.4.33",
     "@sunbird-cb/resolver": "^1.0.0",
-    "@sunbird-cb/taxonomy-editor": "^0.0.32",
+    "@sunbird-cb/taxonomy-editor": "^0.0.33",
     "@sunbird-cb/utils": "^1.0.18",
     "@types/file-saver": "^2.0.1",
     "brace": "^0.11.1",

From 3113728061a3fb264cba6165ae15e3235a13f375 Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Fri, 9 Aug 2024 22:17:10 +0530
Subject: [PATCH 838/887] Task #000: Taxonomy lib update

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index af534ea80..806fcb8aa 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "@sunbird-cb/micro-surveys": "2.0.13",
     "@sunbird-cb/rain-dashboards": "0.4.33",
     "@sunbird-cb/resolver": "^1.0.0",
-    "@sunbird-cb/taxonomy-editor": "^0.0.33",
+    "@sunbird-cb/taxonomy-editor": "0.0.33",
     "@sunbird-cb/utils": "^1.0.18",
     "@types/file-saver": "^2.0.1",
     "brace": "^0.11.1",

From 737c8cd5fc2a6c70f011392d0298826522cacb37 Mon Sep 17 00:00:00 2001
From: vishnubansaltarento <vishnu.bansal@tarento.com>
Date: Sat, 10 Aug 2024 12:10:31 +0530
Subject: [PATCH 839/887] update for disable pending requiest download

---
 .../approval-pending/approval-pending.component.html          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
index 52fcbaad5..5b29c485e 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
@@ -40,11 +40,11 @@
             mat-button (click)="filter('transfers'); tabTelemetry('transfers', 1)" role="button">Transfers
             ({{transfersCount}})</a>
         </div>
-        <div class="flex flex-3 flex-end" *ngIf="currentFilter === 'profileverification'">
+        <!-- <div class="flex flex-3 flex-end" *ngIf="currentFilter === 'profileverification'">
           <a (click)="getPendingResquests()"
             class="customlink cursor-pointer mat-body-2"><mat-icon>download_outlined</mat-icon> Download
             Pending Requests</a>
-        </div>
+        </div> -->
       </div>
       <ng-container *ngIf="currentFilter === 'profileverification'">
         <div class="searchfilter">

From 080d37a78cc9519ac2a53b18f78d3a626e58c7b1 Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Sat, 10 Aug 2024 18:47:17 +0530
Subject: [PATCH 840/887] Task #0000 Taxonomy lib verison update

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 806fcb8aa..6682eec64 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "@sunbird-cb/micro-surveys": "2.0.13",
     "@sunbird-cb/rain-dashboards": "0.4.33",
     "@sunbird-cb/resolver": "^1.0.0",
-    "@sunbird-cb/taxonomy-editor": "0.0.33",
+    "@sunbird-cb/taxonomy-editor": "0.0.34",
     "@sunbird-cb/utils": "^1.0.18",
     "@types/file-saver": "^2.0.1",
     "brace": "^0.11.1",

From c196544cab2f4e3094ead684b5d1c88ad1c61d10 Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Mon, 12 Aug 2024 12:57:05 +0530
Subject: [PATCH 841/887] Task #0000: Updated taxonomy lib for view/edit issue

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6682eec64..c4951f502 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "@sunbird-cb/micro-surveys": "2.0.13",
     "@sunbird-cb/rain-dashboards": "0.4.33",
     "@sunbird-cb/resolver": "^1.0.0",
-    "@sunbird-cb/taxonomy-editor": "0.0.34",
+    "@sunbird-cb/taxonomy-editor": "0.0.35",
     "@sunbird-cb/utils": "^1.0.18",
     "@types/file-saver": "^2.0.1",
     "brace": "^0.11.1",

From 1926d1ed45f05c173b3cea2a61b343997cf38022 Mon Sep 17 00:00:00 2001
From: vishnubansaltarento <vishnu.bansal@tarento.com>
Date: Mon, 12 Aug 2024 17:44:30 +0530
Subject: [PATCH 842/887] update for removal of email address

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8b9c52c91..505cd2285 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@angular/router": "~8.2.1",
     "@angular/service-worker": "~8.2.1",
     "@project-sunbird/telemetry-sdk": "0.0.26",
-    "@sunbird-cb/collection": "^1.0.45",
+    "@sunbird-cb/collection": "^1.0.46",
     "@sunbird-cb/design-system": "0.0.1",
     "@sunbird-cb/micro-surveys": "2.0.13",
     "@sunbird-cb/rain-dashboards": "0.4.33",

From c305a30935057673c54fd55f41f29862a2551f50 Mon Sep 17 00:00:00 2001
From: vishnubansaltarento <vishnu.bansal@tarento.com>
Date: Tue, 13 Aug 2024 20:34:46 +0530
Subject: [PATCH 843/887] update for textual changes for xlsx

---
 .../routes/approvals/bulk-upload/bulk-upload.component.html | 6 +++---
 .../users-view/bulk-upload/bulk-upload.component.html       | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
index 9812a373e..6f88a5ba0 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
@@ -30,18 +30,18 @@
             (dblclick)="$event.preventDefault()">
             <img src="/assets/icons/csv-file.svg" alt="CSV file logo" />
           </div>
-          <div *ngIf="showFileError" class="error-msg">Upload csv format file only</div>
+          <div *ngIf="showFileError" class="error-msg">Upload xlsx format file only</div>
           <div class="flex flex-col items-center">
             <div class="text-primary cursor-pointer" (click)="fileInput.click()" (dblclick)="$event.preventDefault()">
               Browse files</div>
             <input hidden type="file" #fileInput (click)="handleFileClick($event)" (change)="handleOnFileChange($event)"
-              name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();" accept=".csv" />
+              name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();" accept=".xlsx" />
             <!-- <div class="flex">or</div>
             <div class="flex">Drag file to upload</div> -->
           </div>
           <div class="flex flex-col items-center margin-bottom-m">
             <div class="flex">Max file size: 100 MB</div>
-            <div class="flex">Supported file types: csv</div>
+            <div class="flex">Supported file types: xlsx</div>
           </div>
         </div>
       </div>
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
index 86ea1bc48..bfadb3952 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/bulk-upload/bulk-upload.component.html
@@ -25,18 +25,18 @@
             (dblclick)="$event.preventDefault()">
             <img src="/assets/icons/csv-file.svg" alt="CSV file logo" />
           </div>
-          <div *ngIf="showFileError" class="error-msg">Upload csv format file only</div>
+          <div *ngIf="showFileError" class="error-msg">Upload xlsx format file only</div>
           <div class="flex flex-col items-center">
             <div class="text-primary cursor-pointer" (click)="fileInput.click()" (dblclick)="$event.preventDefault()">
               Browse files</div>
             <input hidden type="file" #fileInput (click)="handleFileClick($event)" (change)="handleOnFileChange($event)"
-              name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();" accept=".csv" />
+              name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();" accept=".xlsx, .xls" />
             <!-- <div class="flex">or</div>
             <div class="flex">Drag file to upload</div> -->
           </div>
           <div class="flex flex-col items-center margin-bottom-m">
             <div class="flex">Max file size: 100 MB</div>
-            <div class="flex">Supported file types: csv</div>
+            <div class="flex">Supported file types: xlsx</div>
           </div>
         </div>
       </div>

From 6158fb9d72b201cbd5df9e028511fe4fe47daf65 Mon Sep 17 00:00:00 2001
From: vishnubansaltarento <vishnu.bansal@tarento.com>
Date: Tue, 13 Aug 2024 20:36:09 +0530
Subject: [PATCH 844/887] update for textual changes for xlsx

---
 .../routes/approvals/bulk-upload/bulk-upload.component.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
index 6f88a5ba0..d1f9d480b 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
@@ -35,7 +35,7 @@
             <div class="text-primary cursor-pointer" (click)="fileInput.click()" (dblclick)="$event.preventDefault()">
               Browse files</div>
             <input hidden type="file" #fileInput (click)="handleFileClick($event)" (change)="handleOnFileChange($event)"
-              name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();" accept=".xlsx" />
+              name="file" placeholder="Choose file" (dblclick)="$event.preventDefault();" accept=".xlsx, .xls" />
             <!-- <div class="flex">or</div>
             <div class="flex">Drag file to upload</div> -->
           </div>

From 80b53ef01e5de0bc7b6ef5397345958164d061f5 Mon Sep 17 00:00:00 2001
From: Venkat Kandagaddala <venky.kandagaddala@gmail.com>
Date: Wed, 14 Aug 2024 11:58:09 +0530
Subject: [PATCH 845/887] Updated the video urls in reports section

---
 .../home/routes/reports-section/reports-section.component.ts  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
index 9a47326d3..93f6f1f92 100644
--- a/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/reports-section/reports-section.component.ts
@@ -333,9 +333,9 @@ export class ReportsSectionComponent implements OnInit {
   openVideoPopup() {
     let url = ''
     if (this.configSvc && this.userDetails.roles.includes('MDO_LEADER')) {
-      url = `${environment.karmYogiPath}/content-store/MDO-leader-reports.MP4`
+      url = `${environment.karmYogiPath}/assets/public/content/guide-videos/MDO-leader-reports.MP4`
     } else {
-      url = `${environment.karmYogiPath}/content-store/MDO-admin-reports.mp4`
+      url = `${environment.karmYogiPath}/assets/public/content/guide-videos/MDO-admin-reports.mp4`
     }
     this.dialog.open(ReportsVideoComponent, {
       data: {

From 91f9dd6ae178efe5cda5194786a0e5a0c3118271 Mon Sep 17 00:00:00 2001
From: Venkat Kandagaddala <venky.kandagaddala@gmail.com>
Date: Wed, 14 Aug 2024 15:11:05 +0530
Subject: [PATCH 846/887] added the limit to org list API

---
 .../create-request-form.component.ts          | 29 +++++-----
 .../single-assign-popup.component.ts          | 57 ++++++++++---------
 2 files changed, 44 insertions(+), 42 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
index 1bad5f063..2d6528bb9 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
@@ -68,11 +68,11 @@ export class CreateRequestFormComponent implements OnInit {
   competencySubtheme!: FormControl
 
   constructor(private formBuilder: FormBuilder,
-              private homeService: ProfileV2Service,
-              private activatedRouter: ActivatedRoute,
-              private snackBar: MatSnackBar,
-              private router: Router,
-              public dialog: MatDialog
+    private homeService: ProfileV2Service,
+    private activatedRouter: ActivatedRoute,
+    private snackBar: MatSnackBar,
+    private router: Router,
+    public dialog: MatDialog
   ) {
     this.requestForm = this.formBuilder.group({
       TitleName: new FormControl('', [Validators.required, Validators.pattern(this.noSpecialChar), Validators.minLength(10)]),
@@ -156,16 +156,16 @@ export class CreateRequestFormComponent implements OnInit {
     this.selectRequestType(this.requestObjData.requestType)
     if (this.filteredRequestType) {
       if (this.requestObjData.preferredProvider && this.requestObjData.preferredProvider.length) {
-      const prefferedData = this.filteredRequestType.filter(option =>
-        this.requestObjData.preferredProvider.some((res: any) =>
-          res.providerId === option.id
+        const prefferedData = this.filteredRequestType.filter(option =>
+          this.requestObjData.preferredProvider.some((res: any) =>
+            res.providerId === option.id
+          )
         )
-      )
-      if (prefferedData && prefferedData.length) {
-        this.requestForm.controls['providers'].setValue(prefferedData)
+        if (prefferedData && prefferedData.length) {
+          this.requestForm.controls['providers'].setValue(prefferedData)
+        }
       }
     }
-    }
 
     if (this.filteredAssigneeType) {
       if (this.requestObjData.assignedProvider) {
@@ -254,6 +254,7 @@ export class CreateRequestFormComponent implements OnInit {
         filters: {
           isCbp: true,
         },
+        limit: 1000,
       },
     }
     this.homeService.getRequestTypeList(requestObj).subscribe(data => {
@@ -613,9 +614,9 @@ export class CreateRequestFormComponent implements OnInit {
           this.router.navigateByUrl('/app/home/request-list')
           this.snackBar.open('Request submitted successfully ')
         }
-      },         1000)
+      }, 1000)
     },
-                                                     (error: any) => {
+      (error: any) => {
         this.dialogRefs.close({ error })
         this.snackBar.open('Request Failed')
 
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/single-assign-popup/single-assign-popup.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/single-assign-popup/single-assign-popup.component.ts
index 56daadcab..4161ae09a 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/single-assign-popup/single-assign-popup.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/single-assign-popup/single-assign-popup.component.ts
@@ -24,7 +24,7 @@ export class SingleAssignPopupComponent implements OnInit {
   submitAssign = ''
   requestTypeData: any[] = []
   filterRequestData: any[] = []
-  isDisable  = false
+  isDisable = false
   // @ViewChild(MatPaginator, { static: false }) paginator!: MatPaginator;
   dataSource = new MatTableDataSource<any>([])
   @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | null = null
@@ -37,10 +37,10 @@ export class SingleAssignPopupComponent implements OnInit {
   }
 
   constructor(private fb: FormBuilder,
-              private homeService: ProfileV2Service,
-              @Inject(MAT_DIALOG_DATA) public data: any,
-              private configService: ConfigResolveService,
-              public dialogRef: MatDialogRef<SingleAssignPopupComponent>,
+    private homeService: ProfileV2Service,
+    @Inject(MAT_DIALOG_DATA) public data: any,
+    private configService: ConfigResolveService,
+    public dialogRef: MatDialogRef<SingleAssignPopupComponent>,
   ) {
     this.requestForm = this.fb.group({
       assignee: new FormControl('', Validators.required),
@@ -55,9 +55,9 @@ export class SingleAssignPopupComponent implements OnInit {
     this.getOrgListData()
     if (this.configService['confService'].userProfile || this.configService['confService'].userProfileV2) {
       this.fullProfile = this.configService['confService'].userProfile ?
-      this.configService['confService'].userProfile
-       : this.configService['confService'].userProfileV2
-      this.userId =  this.fullProfile.userId
+        this.configService['confService'].userProfile
+        : this.configService['confService'].userProfileV2
+      this.userId = this.fullProfile.userId
     }
   }
 
@@ -83,7 +83,7 @@ export class SingleAssignPopupComponent implements OnInit {
         this.requestTypeData.unshift(selectedData)
       }
     }
-   }
+  }
 
   getOrgListData() {
     const requestObj = {
@@ -91,6 +91,7 @@ export class SingleAssignPopupComponent implements OnInit {
         filters: {
           isCbp: true,
         },
+        limit: 1000,
       },
     }
     this.homeService.getRequestTypeList(requestObj).subscribe(data => {
@@ -104,7 +105,7 @@ export class SingleAssignPopupComponent implements OnInit {
 
       }
     })
-   }
+  }
 
   //  searchText(event:any){
   //   this.requestForm.controls['orgSearch'].valueChanges.subscribe((newValue: any) => {
@@ -124,9 +125,9 @@ export class SingleAssignPopupComponent implements OnInit {
     this.pageNumber = event.pageIndex
     this.pageSize = event.pageSize
     this.getOrgListData()
-    }
+  }
 
-    onSubmitAssign() {
+  onSubmitAssign() {
     const selectedProvider = this.requestForm.value.assignee
     let assigneeProvider: any
     if (this.requestForm.value.assignee) {
@@ -137,19 +138,19 @@ export class SingleAssignPopupComponent implements OnInit {
     }
     if (selectedProvider) {
       const request = {
-      title:  this.data.title,
-      objective: this.data.objective,
-      typeOfUser: this.data.typeOfUser,
-      // learningMode: this.requestForm.value.learningMode.toLowerCase(),
-      competencies: this.data.competencies,
-      referenceLink: this.data.referenceLink,
-      requestType: this.data.requestType,
-      preferredProvider: this.data.preferredProvider,
-      assignedProvider: assigneeProvider,
-      status: this.data.status,
-      source: this.data.owner,
-      demand_id: this.data.demand_id,
-      learningMode: this.data.learningMode,
+        title: this.data.title,
+        objective: this.data.objective,
+        typeOfUser: this.data.typeOfUser,
+        // learningMode: this.requestForm.value.learningMode.toLowerCase(),
+        competencies: this.data.competencies,
+        referenceLink: this.data.referenceLink,
+        requestType: this.data.requestType,
+        preferredProvider: this.data.preferredProvider,
+        assignedProvider: assigneeProvider,
+        status: this.data.status,
+        source: this.data.owner,
+        demand_id: this.data.demand_id,
+        learningMode: this.data.learningMode,
         // assignedBy: this.userId,
       }
       this.homeService.createDemand(request).subscribe((res: any) => {
@@ -157,11 +158,11 @@ export class SingleAssignPopupComponent implements OnInit {
           this.dialogRef.close({ data: 'confirmed' })
         }
 
-      },                                               (error: any) => {
-       this.dialogRef.close({ error })
+      }, (error: any) => {
+        this.dialogRef.close({ error })
 
       }
-    )
+      )
     } else {
     }
   }

From 5c662be39d3806aaa85f56c1b5f3839349383664 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Wed, 21 Aug 2024 11:11:25 +0530
Subject: [PATCH 847/887] KAR-734 fixed

---
 .../create-request-form.component.ts               | 14 +++++++-------
 .../single-assign-popup.component.ts               | 10 +++++-----
 .../components/user-cards/user-card.component.html |  8 ++++++--
 .../components/user-cards/user-card.component.ts   |  2 ++
 4 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
index 2d6528bb9..4cf499ed7 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
@@ -68,11 +68,11 @@ export class CreateRequestFormComponent implements OnInit {
   competencySubtheme!: FormControl
 
   constructor(private formBuilder: FormBuilder,
-    private homeService: ProfileV2Service,
-    private activatedRouter: ActivatedRoute,
-    private snackBar: MatSnackBar,
-    private router: Router,
-    public dialog: MatDialog
+              private homeService: ProfileV2Service,
+              private activatedRouter: ActivatedRoute,
+              private snackBar: MatSnackBar,
+              private router: Router,
+              public dialog: MatDialog
   ) {
     this.requestForm = this.formBuilder.group({
       TitleName: new FormControl('', [Validators.required, Validators.pattern(this.noSpecialChar), Validators.minLength(10)]),
@@ -614,9 +614,9 @@ export class CreateRequestFormComponent implements OnInit {
           this.router.navigateByUrl('/app/home/request-list')
           this.snackBar.open('Request submitted successfully ')
         }
-      }, 1000)
+      },         1000)
     },
-      (error: any) => {
+                                                     (error: any) => {
         this.dialogRefs.close({ error })
         this.snackBar.open('Request Failed')
 
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/single-assign-popup/single-assign-popup.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/single-assign-popup/single-assign-popup.component.ts
index 4161ae09a..ee465cafa 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/single-assign-popup/single-assign-popup.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/single-assign-popup/single-assign-popup.component.ts
@@ -37,10 +37,10 @@ export class SingleAssignPopupComponent implements OnInit {
   }
 
   constructor(private fb: FormBuilder,
-    private homeService: ProfileV2Service,
-    @Inject(MAT_DIALOG_DATA) public data: any,
-    private configService: ConfigResolveService,
-    public dialogRef: MatDialogRef<SingleAssignPopupComponent>,
+              private homeService: ProfileV2Service,
+              @Inject(MAT_DIALOG_DATA) public data: any,
+              private configService: ConfigResolveService,
+              public dialogRef: MatDialogRef<SingleAssignPopupComponent>,
   ) {
     this.requestForm = this.fb.group({
       assignee: new FormControl('', Validators.required),
@@ -158,7 +158,7 @@ export class SingleAssignPopupComponent implements OnInit {
           this.dialogRef.close({ data: 'confirmed' })
         }
 
-      }, (error: any) => {
+      },                                               (error: any) => {
         this.dialogRef.close({ error })
 
       }
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 95d509a51..038fe12dd 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -16,13 +16,17 @@
           <div class="username display-inline-block">
             <div class="mat-subheading-2 margin-remove flex">
               <div class="word-wrap userName">
-                <span *ngIf="user?.profileDetails && user?.profileDetails?.personalDetails">
+                <span
+                  *ngIf="user?.profileDetails && user?.profileDetails?.personalDetails && user?.profileDetails?.personalDetails?.firstname">
                   {{user?.profileDetails?.personalDetails?.firstname}}
                 </span>
+                <span
+                  *ngIf="user?.profileDetails && user?.profileDetails?.personalDetails && user?.profileDetails?.personalDetails?.firstName">
+                  {{user?.profileDetails?.personalDetails?.firstName}}
+                </span>
                 <span *ngIf="!user?.profileDetails?.personalDetails">
                   {{user?.firstName}}
                 </span>
-
               </div>
               <div>
                 <span class="status-label margin-left-s verified"
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 08a648520..b9abda7c8 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -564,6 +564,8 @@ export class UserCardComponent implements OnInit, OnChanges, AfterViewChecked {
     if (user && user.profileDetails && user.profileDetails.personalDetails) {
       if (user.profileDetails.personalDetails.firstname) {
         name = `${user.profileDetails.personalDetails.firstname}`
+      } else if (user.profileDetails.personalDetails.firstName) {
+        name = `${user.profileDetails.personalDetails.firstName}`
       }
     } else {
       name = `${user.firstName}`

From 95a4bd811a28ac069ac0cc0df144e567c28e3cb4 Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Wed, 21 Aug 2024 17:45:47 +0530
Subject: [PATCH 848/887] user search functionality fixed

---
 .../routes/users-view/users-view.component.ts | 181 +++++++++++++++---
 1 file changed, 154 insertions(+), 27 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 245dca131..cda0626cf 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -53,6 +53,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
   notmyuserUsersDataCount?: number | 0
   content: NsContent.IContent = {} as NsContent.IContent
   isMdoAdmin = false
+  userList: any = []
 
   reportsNoteList: string[] = []
 
@@ -233,21 +234,48 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       },
     }
     this.usersService.getAllKongUsers(reqBody).subscribe((data: any) => {
-      const allusersData = data.result.response
-      this.activeUsersData = allusersData.content
-      // this.activeUsersData = this.activeUsersData.filter((wf: any) => wf.profileDetails.profileStatus !== 'NOT-MY-USER')
-      this.activeUsersDataCount = allusersData.count
-      this.filterFacets = allusersData.facets ? allusersData.facets : []
-
-      // const i = this.activeUsersData.findIndex((wf: any) => wf.userId === this.currentUser)
-      // if (i > -1) {
-      //   this.activeUsersData.splice(i, 1)
-      //   allusersData.count = allusersData.count - 1
-      // }
-
-      // if (this.notmyuserUsersDataCount && allusersData.count > this.notmyuserUsersDataCount) {
-      //   this.activeUsersDataCount = allusersData.count - this.notmyuserUsersDataCount
-      // }
+      const allusersData = data && data.result.response
+      let userContent = allusersData.content
+      const searchText = this.getSearchText(query).toLowerCase()
+      if (searchText.length > 0) {
+        debugger
+        let userData: any = []
+        if (data.result.response.count > 0) {
+          if (userContent && userContent.length > 0) {
+            // userContent.forEach((element: any) => {
+            for (let element of userContent) {
+              let userMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+                element.profileDetails.personalDetails.primaryEmail.toLowerCase()
+              let userName = element && element.firstName && element.firstName.toLowerCase()
+              let userPhone = element && element.profileDetails && element.profileDetails.personalDetails &&
+                element.profileDetails.personalDetails.mobile
+              const emailMatch = userMail && userMail.includes(searchText)
+              const firstNameMatch = userName && userName.includes(searchText)
+              const phoneMatch = userPhone && userPhone.toString().startsWith(searchText) || userPhone &&
+                userPhone.toString().includes(searchText)
+
+              if (emailMatch || firstNameMatch || phoneMatch) {
+                userData.push(element)
+                this.activeUsersData = userData
+                this.activeUsersDataCount = userData.length
+              }
+              else {
+                // this.activeUsersData = []
+                // this.activeUsersDataCount = 0
+                this.activeUsersData = userData
+                this.activeUsersDataCount = userData.length
+              }
+            }
+          }
+        } else {
+          this.activeUsersData = allusersData.content
+          this.activeUsersDataCount = allusersData.count
+        }
+
+      } else {
+        this.activeUsersData = allusersData.content
+        this.activeUsersDataCount = allusersData.count
+      }
     })
   }
   async getVUsers(query: any) {
@@ -289,10 +317,43 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       },
     }
     this.usersService.getAllKongUsers(reqBody).subscribe((data: any) => {
-      const allusersData = data.result.response
-      this.verifiedUsersData = allusersData.content
-      this.verifiedUsersDataCount = data.result.response.count
-      this.filterFacets = allusersData.facets ? allusersData.facets : []
+      const allusersData = data && data.result.response
+      let userContent = allusersData.content
+      const searchText = this.getSearchText(query).toLowerCase()
+      if (searchText.length > 0) {
+        let userData: any = []
+        if (data.result.response.count > 0) {
+          for (let element of userContent) {
+            let userMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.primaryEmail.toLowerCase()
+            let userName = element && element.firstName && element.firstName.toLowerCase()
+            let userPhone = element && element.profileDetails && element.profileDetails.personalDetails && element.profileDetails.personalDetails.mobile
+            const emailMatch = userMail && userMail.includes(searchText)
+            const firstNameMatch = userName && userName.includes(searchText)
+            const phoneMatch = userPhone && userPhone.toString().startsWith(searchText) || userPhone && userPhone.toString().includes(searchText)
+
+            if (emailMatch || firstNameMatch || phoneMatch) {
+              userData.push(element)
+              this.verifiedUsersData = userData
+              this.verifiedUsersDataCount = userData.length
+            }
+            else {
+              this.verifiedUsersData = userData
+              this.verifiedUsersDataCount = userData.length
+            }
+          }
+        } else {
+          this.verifiedUsersData = allusersData.content
+          this.verifiedUsersDataCount = data.result.response.count
+        }
+
+      } else {
+        this.verifiedUsersData = allusersData.content
+        this.verifiedUsersDataCount = data.result.response.count
+      }
+      // this.verifiedUsersData = allusersData.content
+      // this.verifiedUsersDataCount = data.result.response.count
+      // this.filterFacets = allusersData.facets ? allusersData.facets : []
 
       // if (this.currentUserStatus === 'VERIFIED') {
       //   const i = this.verifiedUsersData.findIndex((wf: any) => wf.userId === this.currentUser)
@@ -343,10 +404,10 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       },
     }
     this.usersService.getAllKongUsers(reqBody).subscribe((data: any) => {
-      const allusersData = data.result.response
-      this.nonverifiedUsersData = allusersData.content
-      this.nonverifiedUsersDataCount = data.result.response.count
-      this.filterFacets = allusersData.facets ? allusersData.facets : []
+      const allusersData = data && data.result.response
+      // this.nonverifiedUsersData = allusersData.content
+      // this.nonverifiedUsersDataCount = data.result.response.count
+      // this.filterFacets = allusersData.facets ? allusersData.facets : []
 
       // if (this.currentUserStatus === 'NOT-VERIFIED') {
       //   const i = this.nonverifiedUsersData.findIndex((wf: any) => wf.userId === this.currentUser)
@@ -356,6 +417,39 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       //       this.nonverifiedUsersDataCount - 1 : this.nonverifiedUsersDataCount
       //   }
       // }
+      let userContent = allusersData.content
+      const searchText = this.getSearchText(query).toLowerCase()
+      if (searchText.length > 0) {
+        let userData: any = []
+        if (data.result.response.count > 0) {
+          for (let element of userContent) {
+            let userMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.primaryEmail.toLowerCase()
+            let userName = element && element.firstName && element.firstName.toLowerCase()
+            let userPhone = element && element.profileDetails && element.profileDetails.personalDetails && element.profileDetails.personalDetails.mobile
+            const emailMatch = userMail && userMail.includes(searchText)
+            const firstNameMatch = userName && userName.includes(searchText)
+            const phoneMatch = userPhone && userPhone.toString().startsWith(searchText) || userPhone && userPhone.toString().includes(searchText)
+
+            if (emailMatch || firstNameMatch || phoneMatch) {
+              userData.push(element)
+              this.nonverifiedUsersData = userData
+              this.nonverifiedUsersDataCount = userData.length
+            }
+            else {
+              this.nonverifiedUsersData = userData
+              this.nonverifiedUsersDataCount = userData.length
+            }
+          }
+        } else {
+          this.nonverifiedUsersData = allusersData.content
+          this.nonverifiedUsersDataCount = data.result.response.count
+        }
+
+      } else {
+        this.nonverifiedUsersData = allusersData.content
+        this.nonverifiedUsersDataCount = data.result.response.count
+      }
     })
   }
 
@@ -398,10 +492,43 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       },
     }
     this.usersService.getAllKongUsers(reqBody).subscribe((data: any) => {
-      const allusersData = data.result.response
-      this.notmyuserUsersData = allusersData.content
-      this.notmyuserUsersDataCount = data.result.response.count
-      this.filterFacets = allusersData.facets ? allusersData.facets : []
+      const allusersData = data && data.result.response
+      // this.notmyuserUsersData = allusersData.content
+      // this.notmyuserUsersDataCount = data.result.response.count
+      // this.filterFacets = allusersData.facets ? allusersData.facets : []
+      let userContent = allusersData.content
+      const searchText = this.getSearchText(query).toLowerCase()
+      if (searchText.length > 0) {
+        let userData: any = []
+        if (data.result.response.count > 0) {
+          for (let element of userContent) {
+            let userMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.primaryEmail.toLowerCase()
+            let userName = element && element.firstName && element.firstName.toLowerCase()
+            let userPhone = element && element.profileDetails && element.profileDetails.personalDetails && element.profileDetails.personalDetails.mobile
+            const emailMatch = userMail && userMail.includes(searchText)
+            const firstNameMatch = userName && userName.includes(searchText)
+            const phoneMatch = userPhone && userPhone.toString().startsWith(searchText) || userPhone && userPhone.toString().includes(searchText)
+
+            if (emailMatch || firstNameMatch || phoneMatch) {
+              userData.push(element)
+              this.notmyuserUsersData = userData
+              this.notmyuserUsersDataCount = userData.length
+            }
+            else {
+              this.notmyuserUsersData = userData
+              this.notmyuserUsersDataCount = userData.length
+            }
+          }
+        } else {
+          this.notmyuserUsersData = allusersData.content
+          this.notmyuserUsersDataCount = data.result.response.count
+        }
+
+      } else {
+        this.notmyuserUsersData = allusersData.content
+        this.notmyuserUsersDataCount = data.result.response.count
+      }
     })
   }
 

From 1248a669940e604c35344df62a6b0f107549b62e Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Wed, 21 Aug 2024 17:50:55 +0530
Subject: [PATCH 849/887] lint error fixed

---
 .../routes/users-view/users-view.component.ts | 72 ++++++++++---------
 1 file changed, 37 insertions(+), 35 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index cda0626cf..3f0de2754 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -235,19 +235,19 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     }
     this.usersService.getAllKongUsers(reqBody).subscribe((data: any) => {
       const allusersData = data && data.result.response
-      let userContent = allusersData.content
+      const userContent = allusersData.content
       const searchText = this.getSearchText(query).toLowerCase()
       if (searchText.length > 0) {
         debugger
-        let userData: any = []
+        const userData: any = []
         if (data.result.response.count > 0) {
           if (userContent && userContent.length > 0) {
             // userContent.forEach((element: any) => {
-            for (let element of userContent) {
-              let userMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+            for (const element of userContent) {
+              const userMail = element && element.profileDetails && element.profileDetails.personalDetails &&
                 element.profileDetails.personalDetails.primaryEmail.toLowerCase()
-              let userName = element && element.firstName && element.firstName.toLowerCase()
-              let userPhone = element && element.profileDetails && element.profileDetails.personalDetails &&
+              const userName = element && element.firstName && element.firstName.toLowerCase()
+              const userPhone = element && element.profileDetails && element.profileDetails.personalDetails &&
                 element.profileDetails.personalDetails.mobile
               const emailMatch = userMail && userMail.includes(searchText)
               const firstNameMatch = userName && userName.includes(searchText)
@@ -258,8 +258,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
                 userData.push(element)
                 this.activeUsersData = userData
                 this.activeUsersDataCount = userData.length
-              }
-              else {
+              } else {
                 // this.activeUsersData = []
                 // this.activeUsersDataCount = 0
                 this.activeUsersData = userData
@@ -318,26 +317,27 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     }
     this.usersService.getAllKongUsers(reqBody).subscribe((data: any) => {
       const allusersData = data && data.result.response
-      let userContent = allusersData.content
+      const userContent = allusersData.content
       const searchText = this.getSearchText(query).toLowerCase()
       if (searchText.length > 0) {
-        let userData: any = []
+        const userData: any = []
         if (data.result.response.count > 0) {
-          for (let element of userContent) {
-            let userMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+          for (const element of userContent) {
+            const userMail = element && element.profileDetails && element.profileDetails.personalDetails &&
               element.profileDetails.personalDetails.primaryEmail.toLowerCase()
-            let userName = element && element.firstName && element.firstName.toLowerCase()
-            let userPhone = element && element.profileDetails && element.profileDetails.personalDetails && element.profileDetails.personalDetails.mobile
+            const userName = element && element.firstName && element.firstName.toLowerCase()
+            const userPhone = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.mobile
             const emailMatch = userMail && userMail.includes(searchText)
             const firstNameMatch = userName && userName.includes(searchText)
-            const phoneMatch = userPhone && userPhone.toString().startsWith(searchText) || userPhone && userPhone.toString().includes(searchText)
+            const phoneMatch = userPhone && userPhone.toString().startsWith(searchText) || userPhone &&
+              userPhone.toString().includes(searchText)
 
             if (emailMatch || firstNameMatch || phoneMatch) {
               userData.push(element)
               this.verifiedUsersData = userData
               this.verifiedUsersDataCount = userData.length
-            }
-            else {
+            } else {
               this.verifiedUsersData = userData
               this.verifiedUsersDataCount = userData.length
             }
@@ -417,26 +417,27 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       //       this.nonverifiedUsersDataCount - 1 : this.nonverifiedUsersDataCount
       //   }
       // }
-      let userContent = allusersData.content
+      const userContent = allusersData.content
       const searchText = this.getSearchText(query).toLowerCase()
       if (searchText.length > 0) {
-        let userData: any = []
+        const userData: any = []
         if (data.result.response.count > 0) {
-          for (let element of userContent) {
-            let userMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+          for (const element of userContent) {
+            const userMail = element && element.profileDetails && element.profileDetails.personalDetails &&
               element.profileDetails.personalDetails.primaryEmail.toLowerCase()
-            let userName = element && element.firstName && element.firstName.toLowerCase()
-            let userPhone = element && element.profileDetails && element.profileDetails.personalDetails && element.profileDetails.personalDetails.mobile
+            const userName = element && element.firstName && element.firstName.toLowerCase()
+            const userPhone = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.mobile
             const emailMatch = userMail && userMail.includes(searchText)
             const firstNameMatch = userName && userName.includes(searchText)
-            const phoneMatch = userPhone && userPhone.toString().startsWith(searchText) || userPhone && userPhone.toString().includes(searchText)
+            const phoneMatch = userPhone && userPhone.toString().startsWith(searchText) || userPhone &&
+              userPhone.toString().includes(searchText)
 
             if (emailMatch || firstNameMatch || phoneMatch) {
               userData.push(element)
               this.nonverifiedUsersData = userData
               this.nonverifiedUsersDataCount = userData.length
-            }
-            else {
+            } else {
               this.nonverifiedUsersData = userData
               this.nonverifiedUsersDataCount = userData.length
             }
@@ -496,26 +497,27 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       // this.notmyuserUsersData = allusersData.content
       // this.notmyuserUsersDataCount = data.result.response.count
       // this.filterFacets = allusersData.facets ? allusersData.facets : []
-      let userContent = allusersData.content
+      const userContent = allusersData.content
       const searchText = this.getSearchText(query).toLowerCase()
       if (searchText.length > 0) {
-        let userData: any = []
+        const userData: any = []
         if (data.result.response.count > 0) {
-          for (let element of userContent) {
-            let userMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+          for (const element of userContent) {
+            const userMail = element && element.profileDetails && element.profileDetails.personalDetails &&
               element.profileDetails.personalDetails.primaryEmail.toLowerCase()
-            let userName = element && element.firstName && element.firstName.toLowerCase()
-            let userPhone = element && element.profileDetails && element.profileDetails.personalDetails && element.profileDetails.personalDetails.mobile
+            const userName = element && element.firstName && element.firstName.toLowerCase()
+            const userPhone = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.mobile
             const emailMatch = userMail && userMail.includes(searchText)
             const firstNameMatch = userName && userName.includes(searchText)
-            const phoneMatch = userPhone && userPhone.toString().startsWith(searchText) || userPhone && userPhone.toString().includes(searchText)
+            const phoneMatch = userPhone && userPhone.toString().startsWith(searchText) || userPhone &&
+              userPhone.toString().includes(searchText)
 
             if (emailMatch || firstNameMatch || phoneMatch) {
               userData.push(element)
               this.notmyuserUsersData = userData
               this.notmyuserUsersDataCount = userData.length
-            }
-            else {
+            } else {
               this.notmyuserUsersData = userData
               this.notmyuserUsersDataCount = userData.length
             }

From c9c2698d96b3acc99a184adebc615cc9d577885f Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Wed, 21 Aug 2024 17:52:43 +0530
Subject: [PATCH 850/887] lint error fixed

---
 .../lib/routes/home/routes/users-view/users-view.component.ts    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 3f0de2754..8d88bb66e 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -238,7 +238,6 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       const userContent = allusersData.content
       const searchText = this.getSearchText(query).toLowerCase()
       if (searchText.length > 0) {
-        debugger
         const userData: any = []
         if (data.result.response.count > 0) {
           if (userContent && userContent.length > 0) {

From e90e942a34116a924934ed5beae277ddbc4d2823 Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Wed, 21 Aug 2024 18:21:18 +0530
Subject: [PATCH 851/887] code extra check added

---
 .../routes/users-view/users-view.component.ts | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 8d88bb66e..2e786df9f 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -234,16 +234,17 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       },
     }
     this.usersService.getAllKongUsers(reqBody).subscribe((data: any) => {
-      const allusersData = data && data.result.response
+      const allusersData = data && data.result && data.result.response
       const userContent = allusersData.content
       const searchText = this.getSearchText(query).toLowerCase()
       if (searchText.length > 0) {
         const userData: any = []
-        if (data.result.response.count > 0) {
+        if (data && data.result && data.result.response && data.result.response.count > 0) {
           if (userContent && userContent.length > 0) {
             // userContent.forEach((element: any) => {
             for (const element of userContent) {
               const userMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+                element.profileDetails.personalDetails.primaryEmail &&
                 element.profileDetails.personalDetails.primaryEmail.toLowerCase()
               const userName = element && element.firstName && element.firstName.toLowerCase()
               const userPhone = element && element.profileDetails && element.profileDetails.personalDetails &&
@@ -315,14 +316,15 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       },
     }
     this.usersService.getAllKongUsers(reqBody).subscribe((data: any) => {
-      const allusersData = data && data.result.response
+      const allusersData = data && data.result && data.result.response
       const userContent = allusersData.content
       const searchText = this.getSearchText(query).toLowerCase()
       if (searchText.length > 0) {
         const userData: any = []
-        if (data.result.response.count > 0) {
+        if (data && data.result && data.result.response && data.result.response.count > 0) {
           for (const element of userContent) {
             const userMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.primaryEmail &&
               element.profileDetails.personalDetails.primaryEmail.toLowerCase()
             const userName = element && element.firstName && element.firstName.toLowerCase()
             const userPhone = element && element.profileDetails && element.profileDetails.personalDetails &&
@@ -403,7 +405,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       },
     }
     this.usersService.getAllKongUsers(reqBody).subscribe((data: any) => {
-      const allusersData = data && data.result.response
+      const allusersData = data && data.result && data.result.response
       // this.nonverifiedUsersData = allusersData.content
       // this.nonverifiedUsersDataCount = data.result.response.count
       // this.filterFacets = allusersData.facets ? allusersData.facets : []
@@ -420,9 +422,10 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       const searchText = this.getSearchText(query).toLowerCase()
       if (searchText.length > 0) {
         const userData: any = []
-        if (data.result.response.count > 0) {
+        if (data && data.result && data.result.response && data.result.response.count > 0) {
           for (const element of userContent) {
             const userMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.primaryEmail &&
               element.profileDetails.personalDetails.primaryEmail.toLowerCase()
             const userName = element && element.firstName && element.firstName.toLowerCase()
             const userPhone = element && element.profileDetails && element.profileDetails.personalDetails &&
@@ -492,7 +495,7 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       },
     }
     this.usersService.getAllKongUsers(reqBody).subscribe((data: any) => {
-      const allusersData = data && data.result.response
+      const allusersData = data && data.result && data.result.response
       // this.notmyuserUsersData = allusersData.content
       // this.notmyuserUsersDataCount = data.result.response.count
       // this.filterFacets = allusersData.facets ? allusersData.facets : []
@@ -500,9 +503,10 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       const searchText = this.getSearchText(query).toLowerCase()
       if (searchText.length > 0) {
         const userData: any = []
-        if (data.result.response.count > 0) {
+        if (data && data.result && data.result.response && data.result.response.count > 0) {
           for (const element of userContent) {
             const userMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.primaryEmail &&
               element.profileDetails.personalDetails.primaryEmail.toLowerCase()
             const userName = element && element.firstName && element.firstName.toLowerCase()
             const userPhone = element && element.profileDetails && element.profileDetails.personalDetails &&

From 5c28e28d5bafd469199907940c9f0b0963dcb5b8 Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Wed, 21 Aug 2024 18:57:20 +0530
Subject: [PATCH 852/887] search conditon aditional check added

---
 .../routes/users-view/users-view.component.ts | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 2e786df9f..f76debc60 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -237,9 +237,10 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       const allusersData = data && data.result && data.result.response
       const userContent = allusersData.content
       const searchText = this.getSearchText(query).toLowerCase()
-      if (searchText.length > 0) {
+      if (searchText && searchText.length && searchText.length > 0) {
         const userData: any = []
-        if (data && data.result && data.result.response && data.result.response.count > 0) {
+        if (data && data.result && data.result.response && data.result.response.count &&
+          data.result.response.count > 0) {
           if (userContent && userContent.length > 0) {
             // userContent.forEach((element: any) => {
             for (const element of userContent) {
@@ -319,9 +320,10 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       const allusersData = data && data.result && data.result.response
       const userContent = allusersData.content
       const searchText = this.getSearchText(query).toLowerCase()
-      if (searchText.length > 0) {
+      if (searchText && searchText.length && searchText.length > 0) {
         const userData: any = []
-        if (data && data.result && data.result.response && data.result.response.count > 0) {
+        if (data && data.result && data.result.response && data.result.response.count &&
+          data.result.response.count > 0) {
           for (const element of userContent) {
             const userMail = element && element.profileDetails && element.profileDetails.personalDetails &&
               element.profileDetails.personalDetails.primaryEmail &&
@@ -420,9 +422,10 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       // }
       const userContent = allusersData.content
       const searchText = this.getSearchText(query).toLowerCase()
-      if (searchText.length > 0) {
+      if (searchText && searchText.length && searchText.length > 0) {
         const userData: any = []
-        if (data && data.result && data.result.response && data.result.response.count > 0) {
+        if (data && data.result && data.result.response && data.result.response.count &&
+          data.result.response.count > 0) {
           for (const element of userContent) {
             const userMail = element && element.profileDetails && element.profileDetails.personalDetails &&
               element.profileDetails.personalDetails.primaryEmail &&
@@ -501,9 +504,10 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       // this.filterFacets = allusersData.facets ? allusersData.facets : []
       const userContent = allusersData.content
       const searchText = this.getSearchText(query).toLowerCase()
-      if (searchText.length > 0) {
+      if (searchText && searchText.length && searchText.length > 0) {
         const userData: any = []
-        if (data && data.result && data.result.response && data.result.response.count > 0) {
+        if (data && data.result && data.result.response && data.result.response.count &&
+          data.result.response.count > 0) {
           for (const element of userContent) {
             const userMail = element && element.profileDetails && element.profileDetails.personalDetails &&
               element.profileDetails.personalDetails.primaryEmail &&

From b57f5bada9af92ec30267ee79f6d4284c0d45ff0 Mon Sep 17 00:00:00 2001
From: vishnubansaltarento <vishnu.bansal@tarento.com>
Date: Thu, 22 Aug 2024 15:55:30 +0530
Subject: [PATCH 853/887] mentorship changes

---
 .../components/search/search.component.html   |   4 +-
 .../components/search/search.component.ts     |   1 +
 .../user-cards/user-card.component.html       |  40 +-
 .../user-cards/user-card.component.scss       |  21 +
 .../user-cards/user-card.component.ts         | 103 ++++-
 .../ws/app/src/lib/routes/home/home.module.ts |   2 +
 .../lib/routes/home/home.rounting.module.ts   |  33 +-
 .../mentor-manage.component.html              | 128 ++++++
 .../mentor-manage.component.scss              | 333 ++++++++++++++
 .../mentor-manage.component.spec.ts           |  25 ++
 .../mentor-manage/mentor-manage.component.ts  | 412 ++++++++++++++++++
 .../routes/users/services/users.service.ts    |   7 +
 12 files changed, 1095 insertions(+), 14 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.html
 create mode 100644 project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.scss
 create mode 100644 project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.spec.ts
 create mode 100644 project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.ts

diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.html b/project/ws/app/src/lib/routes/home/components/search/search.component.html
index 309727751..fde3cea61 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.html
@@ -7,7 +7,7 @@
                 placeholder="Search" type="Standard" [ngClass]="{'disable': isContentLive}">
         </div>
     </div>
-    <!-- <div class="filter-section flex" *ngIf="!isApprovals">
+    <!-- <div class="filter-section flex" *ngIf="!isApprovals && !forMentor">
         <button mat-button type="button" (click)="sort()" class="apply-filter margin-right-s"
             [matMenuTriggerFor]="cardMenu">
             <mat-icon class="margin-right-xs">sort</mat-icon> Sort
@@ -26,7 +26,7 @@
             </ng-template>
         </mat-menu>
     </div> -->
-    <!-- <div class="filter-section flex" *ngIf="!isApprovals">
+    <!-- <div class="filter-section flex" *ngIf="!isApprovals && !forMentor">
         <button mat-button type="button" (click)="openFilter()" class="apply-filter margin-right-s">
             Apply Filter <mat-icon class="margin-right-xs">filter_list</mat-icon>
         </button>
diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.ts b/project/ws/app/src/lib/routes/home/components/search/search.component.ts
index 366fe9e09..4f6605151 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.ts
@@ -19,6 +19,7 @@ export class SearchComponent implements OnInit {
   @Input() disableApproveALL: any
   @Input() currentFilter: any
   @Input() filterFacetsData: any
+  @Input() forMentor: any = false
   @Output() handleApiData = new EventEmitter()
   @Output() handleapproveAll = new EventEmitter()
   searchText = ''
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 95d509a51..dc2109acb 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -5,7 +5,7 @@
 <div *ngIf="!isApprovals">
   <mat-accordion [multi]="true">
     <mat-expansion-panel class="user-card" *ngFor="let user of usersData; let i = index" #panel
-      (opened)="closeOtherPanels(panel)">
+      (opened)="closeOtherPanels(panel)" [hideToggle]="forMentor ? true : false" [disabled]="forMentor ? true : false">
       <mat-expansion-panel-header (click)="getUerData(user, panel, index)">
         <div class="float-left width88 flex" (click)="$event.stopPropagation();">
           <div class="initialcircle display-inline-block margin-right-m">
@@ -14,7 +14,7 @@
             </ws-widget-avatar-photo>
           </div>
           <div class="username display-inline-block">
-            <div class="mat-subheading-2 margin-remove flex">
+            <div class="mat-subheading-2 margin-remove flex black-color">
               <div class="word-wrap userName">
                 <span *ngIf="user?.profileDetails && user?.profileDetails?.personalDetails">
                   {{user?.profileDetails?.personalDetails?.firstname}}
@@ -35,6 +35,10 @@
                   *ngIf="user?.profileDetails?.profileStatus === 'NOT-MY-USER'">Not my user
                   <mat-icon>error</mat-icon></span>
               </div>
+              <div *ngIf="getUserRoles(user)">
+                <span class="mentor-status-label margin-left-s mentor">Mentor
+                </span>
+              </div>
             </div>
             <div class="mat-body-2 ws-mat-black40-text">{{(user?.profileDetails &&
               user?.profileDetails?.professionalDetails &&
@@ -45,7 +49,7 @@
             <!-- <div class="mat-caption ws-mat-black40-text" *ngIf="!user?.profileDetails?.profileStatusUpdatedOn">-</div> -->
           </div>
         </div>
-        <div class="float-right flex items-center" *ngIf="isMdoAdmin || isMdoLeader">
+        <div class="float-right flex items-center" *ngIf="(isMdoAdmin || isMdoLeader) && !forMentor">
           <div class="button mat-body" (click)="onEditUser(user, panel);$event.stopPropagation();"
             *ngIf="currentFilter !== 'notmyuser' && !user?.enableEdit">
             <mat-icon>edit</mat-icon> Edit
@@ -53,6 +57,14 @@
           <div class="button mat-body" (click)="confirmReassign(confirm, user);$event.stopPropagation();"
             *ngIf="currentFilter === 'notmyuser'">Reassign</div>
         </div>
+        <div class="float-right flex flex-col items-center" *ngIf="(isMdoAdmin || isMdoLeader) && forMentor">
+          <div class="black-color">Mentor</div>
+          <div>
+            <div class="black-color">No&nbsp;<mat-slide-toggle [checked]="getUserRoles(user)"
+                (change)="toggleMentor(mentorconfirm, $event, user)">&nbsp;Yes</mat-slide-toggle>
+            </div>
+          </div>
+        </div>
       </mat-expansion-panel-header>
 
       <div class="panel-body profile-box" *ngIf="user?.enableEdit">
@@ -932,4 +944,24 @@
       </button>
     </div>
   </div>
-</ng-template>
\ No newline at end of file
+</ng-template>
+<ng-template #mentorconfirm>
+  <div class="confirm-dialog text-center padding-l">
+    <mat-icon class="infoIcon orangeicon-dialog">error_outline</mat-icon>
+    <div mat-dialog-content i18n class="margin-top-xs blue-text">
+      {{memberAlertMessage}}
+    </div>
+    <div mat-dialog-actions class="flex-center margin-top-s">
+      <button mat-raised-button type="submit" [mat-dialog-close]="false"
+        class="margin-right-m btn-success btn-responsive cancelbtn">
+        <span i18n>
+          No
+        </span>
+      </button>
+      <button mat-raised-button type="submit" [mat-dialog-close]="true" class="btn-success btn-responsive successbtn">
+        <span class="text-white" i18n>
+          Yes
+        </span>
+      </button>
+    </div>
+  </div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
index cd9983174..8d18d355d 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.scss
@@ -373,4 +373,25 @@ label {
 .status-text {
   position: relative;
   top: -2px;
+}
+
+.black-color {
+  color: #212529;
+}
+
+.gray-color {
+  color: color(0,0,0,0.6);
+}
+
+.mentor-status-label {
+  color: #fff;
+  font-weight: 400 ;
+  font-size:14px ;
+  font-family:Lato;
+  padding: 3px 8px 3px 8px;
+  border-radius: 4px;
+}
+
+.mentor-status-label.mentor {
+  background-color: #1B4CA1;
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 08a648520..d7494c1b7 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -48,7 +48,8 @@ export class UserCardComponent implements OnInit, OnChanges, AfterViewChecked {
   @Input() currentFilter: any
   @Input() isApprovals: any
   @Input() handleApiData: any
-
+  @Input() activeTab: any
+  @Input() forMentor = false
   @Output() paginationData = new EventEmitter()
   @Output() searchByEnterKey = new EventEmitter()
   @Output() disableButton = new EventEmitter()
@@ -119,13 +120,15 @@ export class UserCardComponent implements OnInit, OnChanges, AfterViewChecked {
   approvalData: any
   showeditText = false
   today = new Date()
-
+  memberAlertMessage = ''
+  currentUserRole = ''
+  checked = false
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-              private dialog: MatDialog, private approvalSvc: ApprovalsService,
-              private route: ActivatedRoute, private snackBar: MatSnackBar,
-              private events: EventService,
-              private datePipe: DatePipe,
-              private cdr: ChangeDetectorRef) {
+    private dialog: MatDialog, private approvalSvc: ApprovalsService,
+    private route: ActivatedRoute, private snackBar: MatSnackBar,
+    private events: EventService,
+    private datePipe: DatePipe,
+    private cdr: ChangeDetectorRef) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),
@@ -1038,4 +1041,90 @@ export class UserCardComponent implements OnInit, OnChanges, AfterViewChecked {
       f.action = ''
     })
   }
+
+  toggleMentor(template: any, event: any, user: any) {
+    if (event.checked) {
+      if (this.activeTab === 'mentor') {
+        this.memberAlertMessage = 'Assign this user as a mentor?'
+      } else {
+        this.memberAlertMessage = 'Assign this user as a mentor? The user will be moved to the Assigned Mentors Tab'
+      }
+
+    } else {
+      if (this.activeTab === 'verified') {
+        this.memberAlertMessage = 'Remove this user from mentor role?'
+      } else {
+        this.memberAlertMessage = 'Remove this user from mentor role? The user will move to the Verified tab.'
+      }
+
+    }
+    const dialog = this.dialog.open(template, {
+      width: '600px',
+    })
+    dialog.afterClosed().subscribe((v: any) => {
+      if (v) {
+        this.saveMentorProfile(user, event)
+      } else {
+        event.source.checked = true
+      }
+    })
+  }
+
+  saveMentorProfile(user: any, event: any) {
+    const usrRoles = user.roles ? user.roles : []
+    if (usrRoles.length > 0) {
+      user.roles.map((role: any) => {
+        if (role.role) {
+          this.userRoles.add(role.role)
+        }
+      })
+    }
+    if (event.checked) {
+      this.userRoles.add('MENTOR')
+    } else {
+      this.userRoles.delete('MENTOR')
+    }
+    const dreq = {
+      request: {
+        organisationId: user.rootOrgId,
+        userId: user.userId,
+        roles: Array.from(this.userRoles),
+      },
+    }
+    this.usersSvc.addUserToDepartment(dreq).subscribe(res => {
+      if (res) {
+        if (this.activeTab === 'mentor') {
+          this.usersSvc.mentorList$.next('mentor')
+        } else {
+          this.usersSvc.mentorList$.next('verified')
+        }
+        if (event.checked) {
+          this.snackBar.open('User Assigned as Mentor Successfully')
+        } else {
+          this.snackBar.open('User Removed from Mentor Role Successfully')
+        }
+
+      } else {
+        if (event.checked) {
+          this.snackBar.open('Error While Assign User as a Mentor')
+        } else {
+          this.snackBar.open('Error While Removing User as a Mentor')
+        }
+      }
+    })
+  }
+
+  getUserRoles(user: any) {
+    // console.log('user--', user)
+    const userRoles: any = []
+
+    user.roles.map((role: any) => {
+      userRoles.push(role.role)
+    })
+
+    if (userRoles.indexOf('MENTOR') > -1) {
+      return true
+    }
+    return false
+  }
 }
diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index da1b06342..92bd15f43 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -86,6 +86,7 @@ import { DesignationModule } from './routes/designation/designation.module'
 import { OdcsMappingComponent } from './routes/odcs-mapping/odcs-mapping.component'
 import { environment } from '../../../../../../../src/environments/environment'
 import { TaxonomyEditorModule } from '@sunbird-cb/taxonomy-editor'
+import { MentorManageComponent } from './routes/mentor-manage/mentor-manage.component'
 
 @NgModule({
   declarations: [
@@ -132,6 +133,7 @@ import { TaxonomyEditorModule } from '@sunbird-cb/taxonomy-editor'
     AssignListPopupComponent,
     SingleAssignPopupComponent,
     OdcsMappingComponent,
+    MentorManageComponent
   ],
   imports: [
     CommonModule,
diff --git a/project/ws/app/src/lib/routes/home/home.rounting.module.ts b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
index 2b9bc796f..7e6a2608f 100644
--- a/project/ws/app/src/lib/routes/home/home.rounting.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
@@ -28,7 +28,7 @@ import { BulkUploadApprovalComponent } from './routes/approvals/bulk-upload/bulk
 import { RequestListComponent } from './components/request-list/request-list.component'
 import { CreateRequestFormComponent } from './components/request-list/create-request-form/create-request-form.component'
 import { OdcsMappingComponent } from './routes/odcs-mapping/odcs-mapping.component'
-
+import { MentorManageComponent } from './routes/mentor-manage/mentor-manage.component'
 const routes: Routes = [
   {
     path: '',
@@ -143,6 +143,36 @@ const routes: Routes = [
           pageKey: 'users-view',
         },
       },
+      {
+        path: 'mentor-manage',
+        component: MentorManageComponent,
+        resolve: {
+          usersList: UsersListResolve,
+          pageData: PageResolve,
+          configService: ConfigResolveService,
+        },
+        data: {
+          pageId: 'users',
+          module: 'User',
+          pageType: 'feature',
+          pageKey: 'users-view',
+        },
+      },
+      {
+        path: 'mentor-manage/:tab',
+        component: MentorManageComponent,
+        resolve: {
+          usersList: UsersListResolve,
+          pageData: PageResolve,
+          configService: ConfigResolveService,
+        },
+        data: {
+          pageId: 'users',
+          module: 'User',
+          pageType: 'feature',
+          pageKey: 'users-view',
+        },
+      },
       // {
       //   path: 'bulk-upload',
       //   component: BulkUploadComponent,
@@ -405,6 +435,7 @@ const routes: Routes = [
       },
     ],
   },
+
 ]
 
 @NgModule({
diff --git a/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.html b/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.html
new file mode 100644
index 000000000..a207ae286
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.html
@@ -0,0 +1,128 @@
+<div class="flex flex-4 flex-column main-flex-box">
+  <mat-card class="no-border">
+    <!-- <mat-card-header class="flex-custom-m">
+      <div class="flex-1" role="link" tabindex="0">
+        <div class="flex flex-1">
+          <mat-card-title class="flex-4 mobile-margin text-capitalize">
+            <span class="h-600-s-20-m color-87">Users</span>
+          </mat-card-title>
+        </div>
+      </div>
+    </mat-card-header> -->
+    <mat-card-title class="flex-4 mobile-margin text-capitalize margin-bottom-l">
+      <span class="h-600-s-20-m color-87">Users</span>
+    </mat-card-title>
+    <mat-card class="mb-8">
+      <mat-card-content class="flex gap-10">
+        <div class="section-1">
+          <div class="flex-4 mobile-margin text-capitalize mat-h2">Note:</div>
+          <ng-container *ngFor="let note of reportsNoteList">
+            <div class="flex gap-4 mb-4">
+              <div>
+                <mat-icon class="infoIcon">error_outline</mat-icon>
+              </div>
+              <div [innerHTML]="sanitizeHtml(note)"></div>
+            </div>
+          </ng-container>
+        </div>
+        <div class="reportsDemo flex justify-end section-2">
+          <div class="reportsDemoVideo flex flex-column flex-middle justify-center margin-top-m"
+            (click)="openVideoPopup()">
+            <mat-icon class="video_icon mb-2">play_circle</mat-icon>
+            <div>
+              Watch how it works
+            </div>
+          </div>
+        </div>
+      </mat-card-content>
+    </mat-card>
+    <mat-card-content>
+      <div class="flex flex-1 flex-column margin-fix">
+        <div class="flex flex-1 filter max-height-60">
+          <!-- <a routerLink="/app/home/users/active" routerLinkActive="router-link-active" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'active',
+              'ws-mat-accent-border font-medium':currentFilter !== 'active'}" mat-button
+            (click)="filter('active'); tabTelemetry('active', 0)" role="button">Registered</a>
+          <a routerLink="/app/home/users/inactive" routerLinkActive="router-link-active" class="filter-option"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'inactive',
+                          'ws-mat-accent-border font-medium':currentFilter !== 'inactive'}" mat-button
+            (click)="filter('inactive'); tabTelemetry('inactive', 1)" role="button">Inactive</a>
+          <a routerLink="/app/home/users/upload" routerLinkActive="router-link-active" class="filter-option" [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'upload',
+                                      'ws-mat-accent-border font-medium':currentFilter !== 'upload'}" mat-button
+            (click)="filter('upload'); tabTelemetry('upload', 2)" role="button">File uploads</a> -->
+
+          <!-- <a routerLink="/app/home/mentor-manage/allusers" routerLinkActive="router-link-active" class="filter-option"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'allusers','ws-mat-accent-border font-medium':currentFilter !== 'allusers'}"
+            mat-button (click)="filter('allusers'); tabTelemetry('allusers', 0)" role="button">All users
+            ({{activeUsersDataCount}})</a> -->
+
+          <a routerLink="/app/home/mentor-manage/verified" routerLinkActive="router-link-active" class="filter-option"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'verified','ws-mat-accent-border font-medium':currentFilter !== 'verified'}"
+            mat-button (click)="filter('verified'); tabTelemetry('verified', 0)" role="button">All Verified <span
+              *ngIf="verifiedUsersDataCount === 1">User</span> <span *ngIf="verifiedUsersDataCount > 1">Users</span>
+            ({{verifiedUsersDataCount}})</a>
+          <a routerLink="/app/home/mentor-manage/mentor" routerLinkActive="router-link-active" class="filter-option"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'mentor','ws-mat-accent-border font-medium':currentFilter !== 'verified'}"
+            mat-button (click)="filter('mentor'); tabTelemetry('mentor', 0)" role="button">Assigned <span
+              *ngIf="mentorUsersDataCount === 1">Mentor</span> <span *ngIf="mentorUsersDataCount > 1">Mentors</span>
+            ({{mentorUsersDataCount}})</a>
+          <!-- <a routerLink="/app/home/mentor-manage/non-mentor" routerLinkActive="router-link-active" class="filter-option"
+            [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'non-mentor','ws-mat-accent-border font-medium':currentFilter !== 'verified'}"
+            mat-button (click)="filter('verified'); tabTelemetry('non-mentor', 0)" role="button">Non-Mentor
+            ({{verifiedUsersDataCount}})</a> -->
+
+
+        </div>
+      </div>
+      <!-- <ws-widget-org-user-table-v2 [userId]="currentUser" [tableData]="tabledata" [data]="dataForTable"
+        [isUpload]=false [isCreate]=true (eOnButtonClick)="clickHandler($event)" (actionsClick)="menuActions($event)"
+        (searchByEnterKey)="onEnterkySearch($event)" (pageChangeClick)="onPaginateChange($event)"
+        [showEditOnCondition]=true [totalRecords]="userDataTotalCount" [tabChangeIndex]="pageIndex">
+      </ws-widget-org-user-table-v2> -->
+      <!--
+      <ng-container *ngIf="currentFilter === 'allusers'">
+        <div class="searchfilter" *ngIf="activeUsersData">
+          <ws-app-searchuser (handleApiData)="onEnterkySearch($event)" [showApproveALL]="showApproveALL"
+            [currentFilter]="currentFilter" [filterFacetsData]="filterFacets"></ws-app-searchuser>
+        </div>
+        <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="activeUsersData"
+          [totalRecords]="activeUsersDataCount" [tabChangeIndex]="pageIndex" [isApprovals]="false"
+          (paginationData)="onPaginateChange($event)" (updateList)="getAllUsers('')"></ws-widget-user-card>
+      </ng-container> -->
+
+      <ng-container *ngIf="currentFilter === 'verified'">
+        <div class="searchfilter" *ngIf="verifiedUsersData">
+          <ws-app-searchuser (handleApiData)="onEnterkySearch($event)" [showApproveALL]="showApproveALL"
+            [currentFilter]="currentFilter" [filterFacetsData]="filterFacets" [forMentor]="true"></ws-app-searchuser>
+        </div>
+
+        <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="verifiedUsersData"
+          [totalRecords]="verifiedUsersDataCount" [tabChangeIndex]="pageIndex" [forMentor]="true"
+          (paginationData)="onPaginateChange($event)" (updateList)="getAllVerifiedUsers('')"
+          [activeTab]="currentFilter"></ws-widget-user-card>
+      </ng-container>
+      <ng-container *ngIf="currentFilter === 'mentor'">
+        <div class="searchfilter" *ngIf="mentorUsersData">
+          <ws-app-searchuser (handleApiData)="onEnterkySearch($event)" [showApproveALL]="showApproveALL"
+            [currentFilter]="currentFilter" [filterFacetsData]="filterFacets" [forMentor]="true"></ws-app-searchuser>
+        </div>
+
+        <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="mentorUsersData"
+          [totalRecords]="mentorUsersDataCount" [tabChangeIndex]="pageIndex" [forMentor]="true"
+          (paginationData)="onPaginateChange($event)" (updateList)="getMentorUsers('')"
+          [activeTab]="currentFilter"></ws-widget-user-card>
+      </ng-container>
+      <!-- <ng-container *ngIf="currentFilter === 'non-mentor'">
+        <div class="searchfilter" *ngIf="verifiedUsersData">
+          <ws-app-searchuser (handleApiData)="onEnterkySearch($event)" [showApproveALL]="showApproveALL"
+            [currentFilter]="currentFilter" [filterFacetsData]="filterFacets"></ws-app-searchuser>
+        </div>
+
+        <ws-widget-user-card [userId]="currentUser" [currentFilter]="currentFilter" [usersData]="verifiedUsersData"
+          [totalRecords]="verifiedUsersDataCount" [tabChangeIndex]="pageIndex" [forMentor]="true"
+          (paginationData)="onPaginateChange($event)" (updateList)="getVUsers('')"></ws-widget-user-card>
+      </ng-container> -->
+
+
+    </mat-card-content>
+  </mat-card>
+</div>
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.scss b/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.scss
new file mode 100644
index 000000000..f78c12356
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.scss
@@ -0,0 +1,333 @@
+@import 'ws-common';
+@import 'ws-vars';
+@import 'ws-mixins';
+
+.buton {
+  display: flex;
+  border: 1px solid;
+  flex: 1;
+  background: red;
+  align-content: center;
+  text-align: center;
+}
+
+.flex-4 {
+  flex: 4;
+}
+
+.mob {
+  @include breakpoint-xs {
+    bottom: 0 !important;
+    position: unset !important;
+  }
+}
+
+.font-medium {
+  font-weight: 500 !important;
+}
+
+.bottom-fix {
+  bottom: 1.5rem;
+  position: absolute;
+}
+
+.view-more {
+  display: flex;
+  align-items: center;
+  text-align: center;
+  border: 1px solid;
+
+  .icon {
+    $icon-size: 24px;
+    font-size: $icon-size;
+    width: $icon-size;
+    height: $icon-size;
+    border: 1px solid;
+    border-radius: 50%;
+    padding: 8px;
+    margin-bottom: 8px;
+    margin-right: $size-s;
+  }
+}
+
+.view-all {
+  display: flex;
+  margin: 0 auto;
+  // border: 1px solid;
+  // font-weight: 500;
+  box-shadow: 0px 10px 30p;
+  /*#99999933*/
+  border-radius: 8px;
+}
+
+
+
+.text-box {
+  display: flex;
+  border: 1px solid;
+  flex: 3;
+  align-content: center;
+  text-align: center;
+}
+
+.margin-fix {
+  @include breakpoint-xs {
+    margin: 0 $size-l 0 $size-l;
+  }
+
+  @include breakpoint-s {
+    margin: 0 $size-l 0 $size-l;
+  }
+}
+::ng-deep.overlay {
+  display: none !important;
+}
+.overflow {
+  // @include breakpoint-xs {
+  //   width: 10em;
+  //   // outline: 1px solid #000;
+  //   margin: 0 0 2em 0;
+  //   text-overflow: ellipsis !important;
+  //   /**
+  //  * Required properties to achieve text-overflow
+  //  */
+  //   white-space: nowrap;
+  //   overflow: hidden;
+  // }
+  overflow: hidden;
+}
+
+.custom {
+
+  // height: 48px;
+  // max-height: 48px;
+  @include breakpoint-xs {
+    flex-direction: column;
+  }
+
+  @include breakpoint-s {
+    flex-direction: column;
+  }
+}
+
+.discuss-border {
+  border-radius: 4px;
+  /*.75rem;*/
+  border: 1px solid #DEDFE0;
+  flex: 1;
+  // max-width: 500px;
+  /* border-color: #cecece;*/
+}
+
+.discuss .mat-form-field-wrapper {
+  padding-bottom: 0px;
+
+  .mat-form-field-infix {
+    border-top-width: 5px !important;
+    padding: 0px;
+    padding-bottom: 5px;
+  }
+
+}
+
+
+.flex-3 {
+  flex: 3;
+}
+
+.filter {
+  .filter-option {
+    margin: $size-xs $size-m;
+    /* border-bottom: darkslateblue; */
+    border-radius: 0;
+    border-bottom-width: 2px;
+    border-top-width: 0;
+    border-left-width: 0;
+    border-right-width: 0;
+  }
+}
+
+.max-height-60 {
+  max-height: 60px;
+}
+
+.height-48 {
+  max-height: 48px;
+}
+
+.pagination {
+  justify-content: center;
+  flex-wrap: wrap;
+  margin-top: 0;
+  margin-bottom: 1rem;
+}
+
+.pagination {
+  display: -ms-flexbox;
+  display: flex;
+  padding-left: 0;
+  list-style: none;
+  border-radius: .25rem;
+}
+
+.page-item.active .page-link {
+  z-index: 1;
+  color: #fff;
+  background-color: #0074B6;
+  border-color: #0074B6;
+}
+
+a:not([href]):not([tabindex]) {
+  color: inherit;
+  text-decoration: none;
+}
+
+.page-link {
+  position: relative;
+  display: block;
+  padding: .5rem .75rem;
+  margin-left: -1px;
+  line-height: 1.25;
+  color: #0074B6;
+  background-color: #fff;
+  border: 1px solid #dee2e6;
+
+  &.separator {
+    font-size: 20px;
+  }
+}
+
+.page-item.disabled .page-link {
+  color: #6c757d;
+  pointer-events: none;
+  cursor: auto;
+  background-color: #fff;
+  border-color: #dee2e6;
+}
+
+.container-balanced {
+  @extend %page-center;
+}
+
+@media screen and (max-width: 1024px) {
+  .main-flex-box {
+  overflow: auto;
+}
+}
+
+.flex-3 {
+  flex: 3;
+}
+
+.flex-update {
+  flex-direction: row;
+
+  @include breakpoint-xs {
+    flex-direction: row;
+  }
+
+  @include breakpoint-s {
+    flex-direction: row;
+  }
+}
+
+.flex-custom {
+  display: flex;
+
+  // @include breakpoint-xs {
+  flex-direction: column;
+  // }
+}
+
+.flex-custom-m {
+  @include breakpoint-xs {
+    flex-direction: column;
+  }
+}
+
+.example-header-image {
+  width: auto;
+  height: auto;
+}
+
+.margin-0 {
+  margin: 0;
+}
+
+.pad-4 {
+  padding: 0 0 0 $size-s;
+}
+
+.mobile-margin {
+  @include breakpoint-xs {
+    margin-top: $size-s;
+  }
+}
+
+.filter {
+  .filter-option {
+    margin: $size-s $size-s;
+    /* border-bottom: darkslateblue; */
+    border-radius: 0;
+    border-bottom-width: 2px;
+    border-top-width: 0;
+    border-left-width: 0;
+    border-right-width: 0;
+  }
+
+  .filter-option:first-child {
+    margin-left: 0;
+  }
+}
+
+.recent-tabs {
+  box-shadow: none !important;
+  border-radius: unset;
+  background: inherit !important;
+}
+
+.no-shadow {
+  box-shadow: none !important;
+}
+
+.mat-card-title{
+  // margin-left: -31px !important;
+  font-size: 20px !important;
+}
+
+::ng-deep.mat-header-cell .mat-icon {
+  padding-left: 0.3em !important;
+}
+
+.move-button{
+  cursor: pointer;
+  height: auto;
+  border-radius: 4px;
+  border: none;
+  width: 60px;
+  // background: #0075b7!important;
+  // color: #fff!important;
+  //font-weight: 700;
+  font-family: Lato;
+  font-size: 14px;
+}
+
+.reportsDemo {
+    .reportsDemoVideo {
+      width: 200px;
+      height: 140px;
+      border-radius: 5px;
+      background-color: #FDEAD5;
+      font-weight: 600;
+      pointer-events: all;
+      cursor: pointer;
+
+      .video_icon {
+        font-size: 32px;
+      }
+    }
+  }
+.no-border {
+  border: 0;
+  box-shadow: none !important;
+}
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.spec.ts b/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.spec.ts
new file mode 100644
index 000000000..7949aaad3
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing'
+
+import { MentorManageComponent } from './mentor-manage.component'
+
+describe('MentorManageComponent', () => {
+  let component: MentorManageComponent
+  let fixture: ComponentFixture<MentorManageComponent>
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [MentorManageComponent],
+    })
+    .compileComponents()
+  }))
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(MentorManageComponent)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
+
+  it('should create', () => {
+    expect(component).toBeTruthy()
+  })
+})
diff --git a/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.ts b/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.ts
new file mode 100644
index 000000000..2ad0e5db8
--- /dev/null
+++ b/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.ts
@@ -0,0 +1,412 @@
+import { Component, ChangeDetectorRef, OnDestroy, OnInit } from '@angular/core'
+import { MatDialog } from '@angular/material/dialog'
+import { ActivatedRoute, Router } from '@angular/router'
+/* tslint:disable */
+import _ from 'lodash'
+/* tslint:enable */
+// import { environment } from 'src/environments/environment'
+import { PageEvent } from '@angular/material'
+import { EventService } from '@sunbird-cb/utils'
+import { NsContent } from '@sunbird-cb/collection'
+import { DomSanitizer, SafeHtml } from '@angular/platform-browser'
+import { NSProfileDataV2 } from '../../models/profile-v2.model'
+import { UsersService } from '../../../users/services/users.service'
+import { LoaderService } from '../../../../../../../../../src/app/services/loader.service'
+import { TelemetryEvents } from '../../../../head/_services/telemetry.event.model'
+import { ReportsVideoComponent } from '../reports-video/reports-video.component'
+
+@Component({
+  selector: 'ws-app-mentor-manage',
+  templateUrl: './mentor-manage.component.html',
+  styleUrls: ['./mentor-manage.component.scss'],
+  /* tslint:disable */
+  host: { class: 'flex flex-col' },
+  /* tslint:enable */
+})
+export class MentorManageComponent implements OnInit, OnDestroy {
+  /* tslint:disable */
+  Math: any
+  /* tslint:enable */
+  currentFilter = 'verified'
+  // filterPath = '/app/home/users'
+  discussionList!: any
+  discussProfileData!: any
+  portalProfile!: NSProfileDataV2.IProfile
+  userDetails: any
+  location!: string | null
+  tabs: any
+  isLoading = false
+  // tabsData: NSProfileDataV2.IProfileTab[]
+  currentUser!: any
+  connectionRequests!: any[]
+  data: any = []
+  usersData!: any
+  configSvc: any
+  mentorUsersData!: any[]
+  verifiedUsersData!: any[]
+  nonverifiedUsersData!: any[]
+  notmyuserUsersData!: any[]
+
+  mentorUsersDataCount?: any | 0
+  verifiedUsersDataCount?: any | 0
+  content: NsContent.IContent = {} as NsContent.IContent
+  isMdoAdmin = false
+
+  reportsNoteList: string[] = []
+
+  currentOffset = 0
+  limit = 20
+  pageIndex = 0
+  searchQuery = ''
+  rootOrgId: any
+  currentUserStatus: any
+  filetrGroup = []
+  filterDesignation = []
+  filterRoles = []
+  filterTags = []
+  sortOrder: any
+  searchText = ''
+  filterFacets = []
+
+  constructor(
+    public dialog: MatDialog,
+    private route: ActivatedRoute,
+    private router: Router,
+    private events: EventService,
+    private loaderService: LoaderService,
+    private sanitizer: DomSanitizer,
+    // private configSvc: ConfigurationsService,
+    private usersService: UsersService,
+    private cdr: ChangeDetectorRef
+  ) {
+    this.Math = Math
+    this.configSvc = this.route.parent && this.route.parent.snapshot.data.configService
+    this.currentUser = this.configSvc.userProfile && this.configSvc.userProfile.userId
+    this.currentUserStatus = this.configSvc.unMappedUser.profileDetails.profileStatus
+
+    // this.usersData = _.get(this.route, 'snapshot.data.usersList.data') || {}
+    // this.filterData()
+  }
+
+  ngOnDestroy() {
+    // if (this.tabs) {
+    //   this.tabs.unsubscribe()
+    // }
+  }
+
+  ngAfterViewChecked() {
+    this.cdr.detectChanges()
+  }
+  ngOnInit() {
+    this.currentFilter = this.route.snapshot.params['tab'] || 'verified'
+    this.rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
+    this.searchQuery = ''
+    if (this.configSvc.unMappedUser && this.configSvc.unMappedUser.roles) {
+      this.isMdoAdmin = this.configSvc.unMappedUser.roles.includes('MDO_ADMIN')
+    }
+
+    // this.getNMUsers('')
+    this.usersService.mentorList$.subscribe(() => {
+      setTimeout(() => {
+        this.getAllVerifiedUsers('')
+        this.getMentorUsers('')
+      }, 1000)
+
+    })
+    this.getAllVerifiedUsers('')
+    this.getMentorUsers('')
+
+    // this.getNVUsers('')
+
+    this.reportsNoteList = [
+      `Easily create users individually or in bulk.`,
+      `Edit any user profile within your organization.`,
+      `Verified Users: Users with all their primary fields approved.`,
+      // tslint:disable-next-line: max-line-length
+      `Non-Verified Users: Users whose one or more primary fields are yet to be approved. You can help by reviewing and approving their requests.`,
+      `Not My User: Remove a user from your organization with a simple click.`,
+    ]
+  }
+
+  sanitizeHtml(html: string): SafeHtml {
+    return this.sanitizer.bypassSecurityTrustHtml(html)
+  }
+
+  openVideoPopup() {
+    this.dialog.open(ReportsVideoComponent, {
+      data: {
+        videoLink: 'https://www.youtube.com/embed/tgbNymZ7vqY?autoplay=1&mute=1',
+      },
+      disableClose: true,
+      width: '50%',
+      height: '60%',
+      panelClass: 'overflow-visable',
+    })
+  }
+
+  filter(filter: string) {
+    this.currentFilter = filter
+    this.pageIndex = 0
+    this.currentOffset = 0
+    this.limit = 20
+    this.searchQuery = ''
+    this.filterData(this.searchQuery)
+  }
+
+  public tabTelemetry(label: string, index: number) {
+    const data: TelemetryEvents.ITelemetryTabData = {
+      label,
+      index,
+    }
+    this.events.handleTabTelemetry(
+      TelemetryEvents.EnumInteractSubTypes.USER_TAB,
+      data,
+    )
+  }
+
+  filterData(query: any) {
+    if (this.currentFilter === 'verified') {
+      this.getAllVerifiedUsers(query)
+    } else if (this.currentFilter === 'mentor') {
+      this.getMentorUsers(query)
+    }
+  }
+
+  showEditUser(roles: any): boolean {
+    if (this.isMdoAdmin) {
+      if (roles && roles.length > 0) {
+        return true
+        //   return (roles.includes('PUBLIC') && roles.length === 1)
+      }
+      // return false
+    }
+    return true
+  }
+
+  // blockedUsers() {
+  //   const blockedUsersData: any[] = []
+  //   if (this.usersData && this.usersData.content && this.usersData.content.length > 0) {
+  //     _.filter(this.usersData.content, { isDeleted: false }).forEach((user: any) => {
+  //       blockedUsersData.push({
+  //         fullname: user ? `${user.firstName}` : null,
+  //         // fullname: user ? `${user.firstName} ${user.lastName}` : null,
+  //         email: user.personalDetails && user.personalDetails.primaryEmail ?
+  //           this.profileUtilSvc.emailTransform(user.personalDetails.primaryEmail) : this.profileUtilSvc.emailTransform(user.email),
+  //         role: user.roles,
+  //         userId: user.id,
+  //         active: !user.isDeleted,
+  //         blocked: user.blocked,
+  //         roles: _.join(_.map(user.roleInfo, i => `<li>${i}</li>`), ''),
+  //       })
+  //     })
+  //   }
+  //   return blockedUsersData
+  // }
+
+  async getAllVerifiedUsers(query: any) {
+    this.loaderService.changeLoad.next(true)
+    let reqBody
+    const filtreq = {
+      rootOrgId: this.rootOrgId,
+      status: 1,
+      'profileDetails.profileStatus': 'VERIFIED',
+    }
+    if (this.getFilterGroup(query) && this.getFilterGroup(query) !== 'undefind') {
+      Object.assign(filtreq, { 'profileDetails.professionalDetails.group': this.getFilterGroup(query) })
+    }
+    if (this.getFilterDesignation(query) && this.getFilterDesignation(query) !== 'undefind') {
+      Object.assign(filtreq, { 'profileDetails.professionalDetails.designation': this.getFilterDesignation(query) })
+    }
+    if (this.getFilterRoles(query) && this.getFilterRoles(query) !== 'undefind') {
+      Object.assign(filtreq, { 'profileDetails.professionalDetails.role': this.getFilterRoles(query) })
+    }
+    if (this.getFilterTags(query) && this.getFilterTags(query) !== 'undefind') {
+      Object.assign(filtreq, { 'profileDetails.professionalDetails.tag': this.getFilterTags(query) })
+    }
+    reqBody = {
+      request: {
+        filters: filtreq,
+        // facets: [
+        //   'profileDetails.professionalDetails.group',
+        //   'profileDetails.professionalDetails.designation',
+        //   'profileDetails.additionalDetails.tag',
+        // ],
+        fields: [
+          'rootOrgId',
+          'profileDetails',
+          'userId',
+          'roles',
+        ],
+        limit: this.limit,
+        offset: this.pageIndex,
+        query: this.getSearchText(query),
+        sort_by: this.getSortOrder(query),
+      },
+    }
+    this.usersService.getAllUsersV3(reqBody).subscribe((data: any) => {
+      const allusersData = data
+      this.verifiedUsersData = allusersData.content
+      this.verifiedUsersDataCount = allusersData.count
+      this.filterFacets = allusersData.facets ? allusersData.facets : []
+
+      // const i = this.activeUsersData.findIndex((wf: any) => wf.userId === this.currentUser)
+      // if (i > -1) {
+      //   this.activeUsersData.splice(i, 1)
+      //   allusersData.count = allusersData.count - 1
+      // }
+
+      // if (this.notmyuserUsersDataCount && allusersData.count > this.notmyuserUsersDataCount) {
+      //   this.activeUsersDataCount = allusersData.count - this.notmyuserUsersDataCount
+      // }
+    })
+  }
+  async getMentorUsers(query: any) {
+    let reqBody
+    this.loaderService.changeLoad.next(true)
+    const filtreq = {
+      rootOrgId: this.rootOrgId,
+      'roles.role': 'MENTOR',
+      'profileDetails.profileStatus': 'VERIFIED',
+    }
+    if (this.getFilterGroup(query) && this.getFilterGroup(query) !== 'undefind') {
+      Object.assign(filtreq, { 'profileDetails.professionalDetails.group': this.getFilterGroup(query) })
+    }
+    if (this.getFilterDesignation(query) && this.getFilterDesignation(query) !== 'undefind') {
+      Object.assign(filtreq, { 'profileDetails.professionalDetails.designation': this.getFilterDesignation(query) })
+    }
+    if (this.getFilterRoles(query) && this.getFilterRoles(query) !== 'undefind') {
+      Object.assign(filtreq, { 'profileDetails.professionalDetails.role': this.getFilterRoles(query) })
+    }
+    if (this.getFilterTags(query) && this.getFilterTags(query) !== 'undefind') {
+      Object.assign(filtreq, { 'profileDetails.professionalDetails.tag': this.getFilterTags(query) })
+    }
+
+    reqBody = {
+      request: {
+        filters: filtreq,
+        // facets: [
+        //   'profileDetails.professionalDetails.group',
+        //   'profileDetails.professionalDetails.designation',
+        //   'profileDetails.additionalDetails.tag',
+        // ],
+        fields: [
+          'rootOrgId',
+          'profileDetails',
+          'userId',
+          'roles',
+        ],
+        limit: this.limit,
+        offset: this.pageIndex,
+        query: this.getSearchText(query),
+        sort_by: this.getSortOrder(query),
+      },
+    }
+    this.usersService.getAllUsersV3(reqBody).subscribe((data: any) => {
+      const allusersData = data
+      this.mentorUsersData = allusersData.content
+      this.mentorUsersDataCount = allusersData.count
+      this.filterFacets = allusersData.facets ? allusersData.facets : []
+
+      // if (this.currentUserStatus === 'VERIFIED') {
+      //   const i = this.verifiedUsersData.findIndex((wf: any) => wf.userId === this.currentUser)
+      //   if (i > -1) {
+      //     this.verifiedUsersData.splice(i, 1)
+      //     this.verifiedUsersDataCount = this.verifiedUsersDataCount ? this.verifiedUsersDataCount - 1 : this.verifiedUsersDataCount
+      //   }
+      // }
+    })
+  }
+
+  getFilterGroup(query: any) {
+    if (query && query.filters && (query.filters.group).length > 0) {
+      return query.filters.group
+    }
+  }
+  getFilterDesignation(query: any) {
+    if (query && query.filters && (query.filters.designation).length > 0) {
+      return query.filters.designation
+    }
+  }
+  getFilterRoles(query: any) {
+    if (query && query.filters && (query.filters.roles).length > 0) {
+      return query.filters.roles
+    }
+  }
+  getFilterTags(query: any) {
+    if (query && query.filters && (query.filters.tags.length > 0)) {
+      return query.filters.tags
+    }
+  }
+  getSearchText(query: any) {
+    return this.searchText = query && query.searchText ? query.searchText : ''
+  }
+  getSortOrder(query: any) {
+    let sortBy
+    if (query && query.sortOrder) {
+      sortBy = query.sortOrder
+      if (sortBy === 'alphabetical') {
+        return { firstName: 'asc' }
+      }
+      if (sortBy === 'oldest') {
+        return { createdDate: 'desc' }
+      }
+      if (sortBy === 'newest') {
+        return { createdDate: 'asc' }
+      }
+    }
+    return { firstName: 'asc' }
+  }
+
+  clickHandler(event: any) {
+    switch (event.type) {
+      case 'createUser':
+        this.onCreateClick()
+        break
+      case 'upload':
+        this.onUploadClick()
+        break
+    }
+  }
+
+  onCreateClick() {
+    this.router.navigate([`/app/users/create-user`])
+    this.events.raiseInteractTelemetry(
+      {
+        type: TelemetryEvents.EnumInteractTypes.CLICK,
+        subType: TelemetryEvents.EnumInteractSubTypes.CREATE_BTN,
+        id: 'create-user-btn',
+      },
+      {}
+    )
+  }
+
+  onUploadClick() {
+    this.filter('upload')
+  }
+
+  onRoleClick(user: any) {
+    this.router.navigate([`/app/users/${user.userId}/details`])
+    this.events.raiseInteractTelemetry(
+      {
+        type: TelemetryEvents.EnumInteractTypes.CLICK,
+        subType: TelemetryEvents.EnumInteractSubTypes.CARD_CONTENT,
+        id: TelemetryEvents.EnumIdtype.USER_ROW,
+      },
+      {
+        id: user.userId,
+        type: TelemetryEvents.EnumIdtype.USER,
+      }
+    )
+  }
+
+  onEnterkySearch(enterValue: any) {
+    this.searchQuery = enterValue
+    this.filterData(this.searchQuery)
+  }
+
+  onPaginateChange(event: PageEvent) {
+    this.pageIndex = event.pageIndex
+    this.limit = event.pageSize
+    this.filterData(this.searchQuery)
+  }
+}
diff --git a/project/ws/app/src/lib/routes/users/services/users.service.ts b/project/ws/app/src/lib/routes/users/services/users.service.ts
index cd9dfd787..5b59e91d5 100644
--- a/project/ws/app/src/lib/routes/users/services/users.service.ts
+++ b/project/ws/app/src/lib/routes/users/services/users.service.ts
@@ -35,6 +35,7 @@ const API_END_POINTS = {
   getPendingFields: '/apis/proxies/v8/workflow/v2/userWFApplicationFieldsSearch',
   getApprovalPendingFields: '/apis/proxies/v8/workflow/v2/userWFApplicationFieldsSearch',
   getPendingRequests: '/apis/proxies/v8/workflow/admin/pending/request',
+  GET_ALL_USERS_V3: '/apis/proxies/v8/user/v3/search',
 }
 
 @Injectable()
@@ -44,6 +45,7 @@ export class UsersService {
   clearFilter = new Subject()
   getFilterDataObject = new Subject()
 
+  mentorList$ = new Subject()
   constructor(private http: HttpClient) { }
 
   getAllUsers(filter: object): Observable<any> {
@@ -51,6 +53,11 @@ export class UsersService {
     return this.http.post<any>(`${API_END_POINTS.GET_ALL_USERS}`, filter).pipe(map(res => _.get(res, 'result.response')))
   }
 
+  getAllUsersV3(filter: object): Observable<any> {
+    // console.log()
+    return this.http.post<any>(`${API_END_POINTS.GET_ALL_USERS_V3}`, filter).pipe(map(res => _.get(res, 'result.response')))
+  }
+
   getMyDepartment(): Observable<any> {
     return this.http.get<any>(`${API_END_POINTS.GET_MY_DEPARTMENT}`)
   }

From 6139358b47a7e705082e3cb8ee58b0f5b7e1499d Mon Sep 17 00:00:00 2001
From: vishnubansaltarento <vishnu.bansal@tarento.com>
Date: Thu, 22 Aug 2024 16:02:08 +0530
Subject: [PATCH 854/887] mentorship changes

---
 .../home/components/user-cards/user-card.component.ts  | 10 +++++-----
 project/ws/app/src/lib/routes/home/home.module.ts      |  2 +-
 .../routes/mentor-manage/mentor-manage.component.ts    |  9 +++------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index d7494c1b7..fcb9665d8 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -124,11 +124,11 @@ export class UserCardComponent implements OnInit, OnChanges, AfterViewChecked {
   currentUserRole = ''
   checked = false
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-    private dialog: MatDialog, private approvalSvc: ApprovalsService,
-    private route: ActivatedRoute, private snackBar: MatSnackBar,
-    private events: EventService,
-    private datePipe: DatePipe,
-    private cdr: ChangeDetectorRef) {
+              private dialog: MatDialog, private approvalSvc: ApprovalsService,
+              private route: ActivatedRoute, private snackBar: MatSnackBar,
+              private events: EventService,
+              private datePipe: DatePipe,
+              private cdr: ChangeDetectorRef) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),
diff --git a/project/ws/app/src/lib/routes/home/home.module.ts b/project/ws/app/src/lib/routes/home/home.module.ts
index 92bd15f43..d49f2c935 100644
--- a/project/ws/app/src/lib/routes/home/home.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.module.ts
@@ -133,7 +133,7 @@ import { MentorManageComponent } from './routes/mentor-manage/mentor-manage.comp
     AssignListPopupComponent,
     SingleAssignPopupComponent,
     OdcsMappingComponent,
-    MentorManageComponent
+    MentorManageComponent,
   ],
   imports: [
     CommonModule,
diff --git a/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.ts b/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.ts
index 2ad0e5db8..ad87da3c6 100644
--- a/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.ts
@@ -1,4 +1,4 @@
-import { Component, ChangeDetectorRef, OnDestroy, OnInit } from '@angular/core'
+import { Component, OnDestroy, OnInit } from '@angular/core'
 import { MatDialog } from '@angular/material/dialog'
 import { ActivatedRoute, Router } from '@angular/router'
 /* tslint:disable */
@@ -76,8 +76,7 @@ export class MentorManageComponent implements OnInit, OnDestroy {
     private loaderService: LoaderService,
     private sanitizer: DomSanitizer,
     // private configSvc: ConfigurationsService,
-    private usersService: UsersService,
-    private cdr: ChangeDetectorRef
+    private usersService: UsersService
   ) {
     this.Math = Math
     this.configSvc = this.route.parent && this.route.parent.snapshot.data.configService
@@ -94,9 +93,7 @@ export class MentorManageComponent implements OnInit, OnDestroy {
     // }
   }
 
-  ngAfterViewChecked() {
-    this.cdr.detectChanges()
-  }
+
   ngOnInit() {
     this.currentFilter = this.route.snapshot.params['tab'] || 'verified'
     this.rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')

From 72fae565054013246ecada8e5293566c68438b4f Mon Sep 17 00:00:00 2001
From: vishnubansaltarento <vishnu.bansal@tarento.com>
Date: Thu, 22 Aug 2024 17:18:00 +0530
Subject: [PATCH 855/887] update for cadre details

---
 .../user-cards/user-card.component.html       | 96 +++++++++++++++++++
 1 file changed, 96 insertions(+)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index dc2109acb..32fe10925 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -318,6 +318,58 @@
                 </mat-form-field>
               </div>
             </div>
+            <!-- Cader Related Code-->
+            <div class="flex flex-row margin-top-m">
+              <div class="md:w-1/3">
+                <label class="margin-remove-bottom form-label">Are you a Cadre Employee?</label>
+                <mat-form-field appearance="outline">
+                  <input type="text" matInput [disabled]="true"
+                    [value]="user?.profileDetails?.cadreDetails ? 'Yes': 'No'">
+                </mat-form-field>
+              </div>
+
+              <div class="md:w-1/3" *ngIf="user?.profileDetails?.cadreDetails">
+                <label class="margin-remove-bottom form-label">Type of Civil Service</label>
+                <mat-form-field appearance="outline">
+                  <input type="text" matInput [disabled]="true"
+                    [value]="user?.profileDetails?.cadreDetails?.civilServiceType ? user?.profileDetails?.cadreDetails?.civilServiceType: ''">
+                </mat-form-field>
+              </div>
+
+              <div class="md:w-1/3" *ngIf="user?.profileDetails?.cadreDetails">
+                <label class="margin-remove-bottom form-label">Service</label>
+                <mat-form-field appearance="outline">
+                  <input type="text" matInput [disabled]="true"
+                    [value]="user?.profileDetails?.cadreDetails?.civilServiceName ? user?.profileDetails?.cadreDetails?.civilServiceName: ''">
+                </mat-form-field>
+              </div>
+            </div>
+            <div class="flex flex-row margin-top-m">
+              <div class="md:w-1/3" *ngIf="user?.profileDetails?.cadreDetails">
+                <label class="margin-remove-bottom form-label">Cadre</label>
+                <mat-form-field appearance="outline">
+                  <input type="text" matInput [disabled]="true"
+                    [value]="user?.profileDetails?.cadreDetails?.cadreName ? user?.profileDetails?.cadreDetails?.cadreName: ''">
+                </mat-form-field>
+              </div>
+
+              <div class="md:w-1/3" *ngIf="user?.profileDetails?.cadreDetails">
+                <label class="margin-remove-bottom form-label">Batch</label>
+                <mat-form-field appearance="outline">
+                  <input type="text" matInput [disabled]="true"
+                    [value]="user?.profileDetails?.cadreDetails?.cadreBatch ? user?.profileDetails?.cadreDetails?.cadreBatch: ''">
+                </mat-form-field>
+              </div>
+
+              <div class="md:w-1/3" *ngIf="user?.profileDetails?.cadreDetails">
+                <label class="margin-remove-bottom form-label">Cadre Controlling Authority</label>
+                <mat-form-field appearance="outline">
+                  <input type="text" matInput [disabled]="true"
+                    [value]="user?.profileDetails?.cadreDetails?.cadreControllingAuthorityName ? user?.profileDetails?.cadreDetails?.cadreControllingAuthorityName: ''">
+                </mat-form-field>
+              </div>
+            </div>
+            <!-- End of Cadre Related Code-->
 
             <div class="flex flex-row margin-top-m">
               <div class="md:w-1/2">
@@ -539,6 +591,50 @@
               <p *ngIf="user.profileDetails && !user.profileDetails.additionalProperties">-</p>
             </div>
           </div>
+          <!-- Cader Related Code-->
+          <div class="flex flex-row margin-top-m">
+            <div class="md:w-1/4">
+              <label class="view-text-label">Are you a Cadre Employee?</label>
+              <p>{{user?.profileDetails?.cadreDetails ? 'Yes': 'No'}}</p>
+            </div>
+
+            <div class="md:w-1/4" *ngIf="user?.profileDetails?.cadreDetails">
+              <label class="view-text-label">Type of Civil Service</label>
+              <p>{{user?.profileDetails?.cadreDetails?.civilServiceType ?
+                user?.profileDetails?.cadreDetails?.civilServiceType: '-'}}</p>
+
+            </div>
+
+            <div class="md:w-1/4" *ngIf="user?.profileDetails?.cadreDetails">
+              <label class="view-text-label">Service</label>
+              <p>{{user?.profileDetails?.cadreDetails?.civilServiceName ?
+                user?.profileDetails?.cadreDetails?.civilServiceName: '-'}}</p>
+
+            </div>
+            <div class="md:w-1/4" *ngIf="user?.profileDetails?.cadreDetails">
+              <label class="view-text-label">Cadre</label>
+              <p>{{user?.profileDetails?.cadreDetails?.cadreName ? user?.profileDetails?.cadreDetails?.cadreName: '-'}}
+              </p>
+
+            </div>
+          </div>
+          <div class="flex flex-row margin-top-m">
+            <div class="md:w-1/4" *ngIf="user?.profileDetails?.cadreDetails">
+              <label class="view-text-label">Batch</label>
+              <p>{{user?.profileDetails?.cadreDetails?.cadreBatch ? user?.profileDetails?.cadreDetails?.cadreBatch:
+                '-'}}
+              </p>
+
+            </div>
+
+            <div class="md:w-1/2" *ngIf="user?.profileDetails?.cadreDetails">
+              <label class="view-text-label">Cadre Controlling Authority</label>
+              <p>{{user?.profileDetails?.cadreDetails?.cadreControllingAuthorityName ?
+                user?.profileDetails?.cadreDetails?.cadreControllingAuthorityName: '-'}}</p>
+
+            </div>
+          </div>
+          <!-- End of Cadre Related Code-->
           <div class="flex flex-row margin-top-m">
             <div class="md:w-1/1">
               <label class="view-text-label">Roles</label>

From 82bf2bf2fbf42e90d1c19c5026e45c52b83b89a4 Mon Sep 17 00:00:00 2001
From: vishnubansaltarento <vishnu.bansal@tarento.com>
Date: Tue, 27 Aug 2024 20:09:55 +0530
Subject: [PATCH 856/887] update for vapt changes

---
 package.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 074024765..8554deaae 100644
--- a/package.json
+++ b/package.json
@@ -6,11 +6,11 @@
     "start": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng serve --proxy-config proxy/localhost.proxy.json -o",
     "dev": "npm run start:mdo-dev",
     "prebuild": "npm run lint:fix",
-    "build-dev": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --prod --configuration=dev --outputPath=dist/www/en --baseHref=/ --i18nLocale=en",
-    "build-benchmark": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --prod --configuration=benchmark --outputPath=dist/www/en --baseHref=/ --i18nLocale=en",
-    "build-preprod": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --prod --configuration=preprod --outputPath=dist/www/en --baseHref=/ --i18nLocale=en",
-    "build-np": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --prod --configuration=np --outputPath=dist/www/en --baseHref=/ --i18nLocale=en",
-    "build": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --prod --outputPath=dist/www/en --baseHref=/ --i18nLocale=en",
+    "build-dev": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --prod --configuration=dev --outputPath=dist/www/en --baseHref=/ --i18nLocale=en --subresource-integrity",
+    "build-benchmark": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --prod --configuration=benchmark --outputPath=dist/www/en --baseHref=/ --i18nLocale=en --subresource-integrity",
+    "build-preprod": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --prod --configuration=preprod --outputPath=dist/www/en --baseHref=/ --i18nLocale=en --subresource-integrity",
+    "build-np": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --prod --configuration=np --outputPath=dist/www/en --baseHref=/ --i18nLocale=en --subresource-integrity",
+    "build": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng build --prod --outputPath=dist/www/en --baseHref=/ --i18nLocale=en --subresource-integrity",
     "postbuild": "npm run compress:gzip && npm run compress:brotli",
     "compress:brotli": "gzipper --brotli --gzip-level=9 --verbose ./dist/www",
     "compress:gzip": "gzipper --verbose --gzip-level=9 ./dist/www",

From f186a79d41342fb89c296508584a8a7b5470bacb Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Wed, 28 Aug 2024 17:37:14 +0530
Subject: [PATCH 857/887] search placeholder updated

---
 .../src/lib/routes/home/components/search/search.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.html b/project/ws/app/src/lib/routes/home/components/search/search.component.html
index 309727751..ddea8d175 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.html
@@ -4,7 +4,7 @@
             <mat-icon
                 class="color-60 search-icon mat-icon notranslate material-icons mat-icon-no-color">search</mat-icon>
             <input class="sinput color-60 w-full" [(ngModel)]="searchText" (keyup.enter)="searchData($event)" label=""
-                placeholder="Search" type="Standard" [ngClass]="{'disable': isContentLive}">
+                placeholder="Search by name or email" type="Standard" [ngClass]="{'disable': isContentLive}">
         </div>
     </div>
     <!-- <div class="filter-section flex" *ngIf="!isApprovals">

From a442af33b87660d8329a87708425dafa573ee49c Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Wed, 28 Aug 2024 23:57:12 +0530
Subject: [PATCH 858/887] user mobile name and email deach improved

---
 .../routes/users-view/users-view.component.ts | 180 +++++++++++++++---
 1 file changed, 155 insertions(+), 25 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index f76debc60..f527f4f80 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -244,16 +244,43 @@ export class UsersViewComponent implements OnInit, OnDestroy {
           if (userContent && userContent.length > 0) {
             // userContent.forEach((element: any) => {
             for (const element of userContent) {
-              const userMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+              const userPrimaryEmail = (element && element.profileDetails && element.profileDetails.personalDetails &&
                 element.profileDetails.personalDetails.primaryEmail &&
-                element.profileDetails.personalDetails.primaryEmail.toLowerCase()
+                element.profileDetails.personalDetails.primaryEmail.toLowerCase())
+
+              const userMail = element && element.email && element.email.toLowerCase()
+
+              const userOfficialMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+                element.profileDetails.personalDetails.officialEmail &&
+                element.profileDetails.personalDetails.officialEmail.toLowerCase()
+
+              const userPersonalMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+                element.profileDetails.personalDetails.personalEmail &&
+                element.profileDetails.personalDetails.personalEmail.toLowerCase()
+
               const userName = element && element.firstName && element.firstName.toLowerCase()
-              const userPhone = element && element.profileDetails && element.profileDetails.personalDetails &&
+              const userFirstName = element && element.profileDetails && element.profileDetails.personalDetails &&
+                element.profileDetails.personalDetails.firstname &&
+                element.profileDetails.personalDetails.firstname.toLowerCase()
+
+              const userMob = element && element.profileDetails && element.profileDetails.personalDetails &&
                 element.profileDetails.personalDetails.mobile
-              const emailMatch = userMail && userMail.includes(searchText)
-              const firstNameMatch = userName && userName.includes(searchText)
-              const phoneMatch = userPhone && userPhone.toString().startsWith(searchText) || userPhone &&
-                userPhone.toString().includes(searchText)
+
+              const userTelePhone = element && element.profileDetails && element.profileDetails.personalDetails &&
+                element.profileDetails.personalDetails.telephone
+
+              const userPhone = element && element.phone
+
+              const emailMatch = (userMail && userMail.includes(searchText.toLowerCase())) ||
+                (userPrimaryEmail && userPrimaryEmail.includes(searchText.toLowerCase())) ||
+                (userOfficialMail && userOfficialMail.includes(searchText.toLowerCase())) ||
+                (userPersonalMail && userPersonalMail.includes(searchText.toLowerCase()))
+
+              const firstNameMatch = (userName && userName.includes(searchText.toLowerCase())) ||
+                (userFirstName && userFirstName.includes(searchText.toLowerCase()))
+
+              const phoneMatch = (userTelePhone && userTelePhone.includes(searchText)) ||
+                (userMob && userMob.toString().includes(searchText)) || (userPhone && userPhone.includes(searchText))
 
               if (emailMatch || firstNameMatch || phoneMatch) {
                 userData.push(element)
@@ -325,16 +352,50 @@ export class UsersViewComponent implements OnInit, OnDestroy {
         if (data && data.result && data.result.response && data.result.response.count &&
           data.result.response.count > 0) {
           for (const element of userContent) {
-            const userMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+            // const userMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+            //   element.profileDetails.personalDetails.primaryEmail &&
+            //   element.profileDetails.personalDetails.primaryEmail.toLowerCase()
+            // const userName = element && element.firstName && element.firstName.toLowerCase()
+            // const userPhone = element && element.profileDetails && element.profileDetails.personalDetails &&
+            //   element.profileDetails.personalDetails.mobile
+
+            const userPrimaryEmail = element && element.profileDetails && element.profileDetails.personalDetails &&
               element.profileDetails.personalDetails.primaryEmail &&
               element.profileDetails.personalDetails.primaryEmail.toLowerCase()
+
+            const userMail = element && element.email && element.email.toLowerCase()
+
+            const userOfficialMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.officialEmail &&
+              element.profileDetails.personalDetails.officialEmail.toLowerCase()
+
+            const userPersonalMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.personalEmail &&
+              element.profileDetails.personalDetails.personalEmail.toLowerCase()
+
             const userName = element && element.firstName && element.firstName.toLowerCase()
-            const userPhone = element && element.profileDetails && element.profileDetails.personalDetails &&
+            const userFirstName = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.firstname &&
+              element.profileDetails.personalDetails.firstname.toLowerCase()
+
+            const userMob = element && element.profileDetails && element.profileDetails.personalDetails &&
               element.profileDetails.personalDetails.mobile
-            const emailMatch = userMail && userMail.includes(searchText)
-            const firstNameMatch = userName && userName.includes(searchText)
-            const phoneMatch = userPhone && userPhone.toString().startsWith(searchText) || userPhone &&
-              userPhone.toString().includes(searchText)
+
+            const userTelePhone = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.telephone
+
+            const userPhone = element && element.phone
+
+            const emailMatch = (userMail && userMail.includes(searchText.toLowerCase())) ||
+              (userPrimaryEmail && userPrimaryEmail.includes(searchText.toLowerCase())) ||
+              (userOfficialMail && userOfficialMail.includes(searchText.toLowerCase())) ||
+              (userPersonalMail && userPersonalMail.includes(searchText.toLowerCase()))
+
+            const firstNameMatch = (userName && userName.includes(searchText.toLowerCase())) ||
+              (userFirstName && userFirstName.includes(searchText.toLowerCase()))
+
+            const phoneMatch = (userTelePhone && userTelePhone.includes(searchText)) ||
+              (userMob && userMob.toString().includes(searchText)) || (userPhone && userPhone.includes(searchText))
 
             if (emailMatch || firstNameMatch || phoneMatch) {
               userData.push(element)
@@ -427,16 +488,50 @@ export class UsersViewComponent implements OnInit, OnDestroy {
         if (data && data.result && data.result.response && data.result.response.count &&
           data.result.response.count > 0) {
           for (const element of userContent) {
-            const userMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+            // const userMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+            //   element.profileDetails.personalDetails.primaryEmail &&
+            //   element.profileDetails.personalDetails.primaryEmail.toLowerCase()
+            // const userName = element && element.firstName && element.firstName.toLowerCase()
+            // const userPhone = element && element.profileDetails && element.profileDetails.personalDetails &&
+            //   element.profileDetails.personalDetails.mobile
+
+            const userPrimaryEmail = element && element.profileDetails && element.profileDetails.personalDetails &&
               element.profileDetails.personalDetails.primaryEmail &&
               element.profileDetails.personalDetails.primaryEmail.toLowerCase()
+
+            const userMail = element && element.email && element.email.toLowerCase()
+
+            const userOfficialMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.officialEmail &&
+              element.profileDetails.personalDetails.officialEmail.toLowerCase()
+
+            const userPersonalMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.personalEmail &&
+              element.profileDetails.personalDetails.personalEmail.toLowerCase()
+
             const userName = element && element.firstName && element.firstName.toLowerCase()
-            const userPhone = element && element.profileDetails && element.profileDetails.personalDetails &&
+            const userFirstName = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.firstname &&
+              element.profileDetails.personalDetails.firstname.toLowerCase()
+
+            const userMob = element && element.profileDetails && element.profileDetails.personalDetails &&
               element.profileDetails.personalDetails.mobile
-            const emailMatch = userMail && userMail.includes(searchText)
-            const firstNameMatch = userName && userName.includes(searchText)
-            const phoneMatch = userPhone && userPhone.toString().startsWith(searchText) || userPhone &&
-              userPhone.toString().includes(searchText)
+
+            const userTelePhone = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.telephone
+
+            const userPhone = element && element.phone
+
+            const emailMatch = (userMail && userMail.includes(searchText.toLowerCase())) ||
+              (userPrimaryEmail && userPrimaryEmail.includes(searchText.toLowerCase())) ||
+              (userOfficialMail && userOfficialMail.includes(searchText.toLowerCase())) ||
+              (userPersonalMail && userPersonalMail.includes(searchText.toLowerCase()))
+
+            const firstNameMatch = (userName && userName.includes(searchText.toLowerCase())) ||
+              (userFirstName && userFirstName.includes(searchText.toLowerCase()))
+
+            const phoneMatch = (userTelePhone && userTelePhone.includes(searchText)) ||
+              (userMob && userMob.toString().includes(searchText)) || (userPhone && userPhone.includes(searchText))
 
             if (emailMatch || firstNameMatch || phoneMatch) {
               userData.push(element)
@@ -509,16 +604,51 @@ export class UsersViewComponent implements OnInit, OnDestroy {
         if (data && data.result && data.result.response && data.result.response.count &&
           data.result.response.count > 0) {
           for (const element of userContent) {
-            const userMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+            // const userMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+            //   element.profileDetails.personalDetails.primaryEmail &&
+            //   element.profileDetails.personalDetails.primaryEmail.toLowerCase()
+            // const userName = element && element.firstName && element.firstName.toLowerCase()
+            // const userPhone = element && element.profileDetails && element.profileDetails.personalDetails &&
+            //   element.profileDetails.personalDetails.mobile
+
+            const userPrimaryEmail = element && element.profileDetails && element.profileDetails.personalDetails &&
               element.profileDetails.personalDetails.primaryEmail &&
               element.profileDetails.personalDetails.primaryEmail.toLowerCase()
+
+            const userMail = element && element.email && element.email.toLowerCase()
+
+            const userOfficialMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.officialEmail &&
+              element.profileDetails.personalDetails.officialEmail.toLowerCase()
+
+            const userPersonalMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.personalEmail &&
+              element.profileDetails.personalDetails.personalEmail.toLowerCase()
+
             const userName = element && element.firstName && element.firstName.toLowerCase()
-            const userPhone = element && element.profileDetails && element.profileDetails.personalDetails &&
+
+            const userFirstName = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.firstname &&
+              element.profileDetails.personalDetails.firstname.toLowerCase()
+
+            const userMob = element && element.profileDetails && element.profileDetails.personalDetails &&
               element.profileDetails.personalDetails.mobile
-            const emailMatch = userMail && userMail.includes(searchText)
-            const firstNameMatch = userName && userName.includes(searchText)
-            const phoneMatch = userPhone && userPhone.toString().startsWith(searchText) || userPhone &&
-              userPhone.toString().includes(searchText)
+
+            const userTelePhone = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.telephone
+
+            const userPhone = element && element.phone
+
+            const emailMatch = (userMail && userMail.includes(searchText.toLowerCase())) ||
+              (userPrimaryEmail && userPrimaryEmail.includes(searchText.toLowerCase())) ||
+              (userOfficialMail && userOfficialMail.includes(searchText.toLowerCase())) ||
+              (userPersonalMail && userPersonalMail.includes(searchText.toLowerCase()))
+
+            const firstNameMatch = (userName && userName.includes(searchText.toLowerCase())) ||
+              (userFirstName && userFirstName.includes(searchText.toLowerCase()))
+
+            const phoneMatch = (userTelePhone && userTelePhone.includes(searchText)) ||
+              (userMob && userMob.toString().includes(searchText)) || (userPhone && userPhone.includes(searchText))
 
             if (emailMatch || firstNameMatch || phoneMatch) {
               userData.push(element)

From f9c44395b51b4c4af2c5ef895c2aafd1843f2802 Mon Sep 17 00:00:00 2001
From: vishnubansaltarento <vishnu.bansal@tarento.com>
Date: Thu, 29 Aug 2024 13:05:09 +0530
Subject: [PATCH 859/887] update for mentorship

---
 .../routes/home/components/user-cards/user-card.component.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 9bf24d096..31e1839af 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -912,7 +912,7 @@
   </div>
 </div>
 
-<div class="flex flex-row justify-center">
+<div class="flex flex-row justify-center" *ngIf="totalRecords">
   <mat-paginator [pageSize]="pageSize" [length]="totalRecords" [pageSizeOptions]="[20,30,40]"
     (page)="onChangePage($event)"></mat-paginator>
 </div>

From e63b92d7979aeafbf905c624eb58704257f839f5 Mon Sep 17 00:00:00 2001
From: Venkat Kandagaddala <venky.kandagaddala@gmail.com>
Date: Thu, 29 Aug 2024 22:01:53 +0530
Subject: [PATCH 860/887] Prevent input fields with HTML and JS

---
 .../reject-reason-dialog.component.html       |  8 ++++++-
 .../reject-reason-dialog.component.ts         |  3 ++-
 .../budgetschemepopup.component.html          | 14 +++++++++++
 .../budgetschemepopup.component.ts            |  5 ++--
 .../create-request-form.component.html        |  4 ++++
 .../create-request-form.component.ts          |  3 ++-
 .../staffdetailspopup.component.html          | 14 +++++++++++
 .../staffdetailspopup.component.ts            |  5 ++--
 .../user-cards/user-card.component.html       | 17 +++++++++-----
 .../user-cards/user-card.component.ts         | 13 +++++++++++
 .../home/routes/budget/budget.component.html  | 23 +++++++++++++++++++
 .../home/routes/budget/budget.component.ts    |  7 +++---
 .../home/routes/staff/staff.component.html    | 16 +++++++++++++
 .../home/routes/staff/staff.component.ts      |  7 +++---
 .../prevent-html-and-js.validator.ts          | 12 ++++++++++
 15 files changed, 132 insertions(+), 19 deletions(-)
 create mode 100644 project/ws/app/src/lib/routes/validators/prevent-html-and-js.validator.ts

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.html
index 4fab32d76..39c530902 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.html
@@ -8,9 +8,15 @@ <h2 mat-dialog-title class="required">{{data.title}}</h2>
         <mat-hint i18n class="no-padding">
           Limited to 500 characters.
         </mat-hint>
-        <mat-error i18n="Reason Error | Explains reason is required" class="no-padding">
+        <mat-error i18n="Reason Error | Explains reason is required" class="no-padding"
+          *ngIf="reasonForm?.controls['reason']?.touched && reasonForm?.controls['reason'].errors?.required">
           Reason is required
         </mat-error>
+        <mat-error [hidden]="false" i18n="Budget year Error|Explains name is required" i18n-aria-label
+          aria-label="Budget year Error|Explains name is required"
+          *ngIf="reasonForm?.controls['reason']?.touched && !reasonForm?.controls['reason'].errors?.required && reasonForm?.controls['reason'].errors?.noHtml">
+          HTML or Js is not allowed
+        </mat-error>
       </mat-form-field>
     </div>
     <div mat-dialog-actions class="flex-row-reverse margin-top-m">
diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.ts b/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.ts
index d4927c71e..479e56c84 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.ts
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.ts
@@ -1,6 +1,7 @@
 import { Component, Inject, OnInit } from '@angular/core'
 import { FormControl, FormGroup, Validators } from '@angular/forms'
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'
+import { preventHtmlAndJs } from '../../../validators/prevent-html-and-js.validator'
 
 @Component({
   selector: 'ws-app-reject-reason-dialog',
@@ -13,7 +14,7 @@ export class RejectReasonDialogComponent implements OnInit {
   constructor(public dialogRef: MatDialogRef<RejectReasonDialogComponent>,
               @Inject(MAT_DIALOG_DATA) public data: any) {
     this.reasonForm = new FormGroup({
-      reason: new FormControl('', [Validators.required, Validators.maxLength(500)]),
+      reason: new FormControl('', [Validators.required, Validators.maxLength(500), preventHtmlAndJs()]),
     })
   }
 
diff --git a/project/ws/app/src/lib/routes/home/components/budgetschemepopup/budgetschemepopup.component.html b/project/ws/app/src/lib/routes/home/components/budgetschemepopup/budgetschemepopup.component.html
index 41c6ec84e..4ab3e7944 100644
--- a/project/ws/app/src/lib/routes/home/components/budgetschemepopup/budgetschemepopup.component.html
+++ b/project/ws/app/src/lib/routes/home/components/budgetschemepopup/budgetschemepopup.component.html
@@ -52,6 +52,13 @@
                                     *ngIf="schemeform?.controls['schemename']?.touched && schemeform?.controls['schemename'].errors?.required">
                                     Field is mandatory
                                 </mat-error>
+                                <mat-error [hidden]="false" i18n="Budget allocated Error|Explains name is required"
+                                    i18n-aria-label aria-label="Budget allocated Error|Explains name is required "
+                                    *ngIf="schemeform?.controls['schemename']?.touched &&
+                                                                    !schemeform?.controls['schemename'].errors?.required &&
+                                                                    schemeform?.controls['schemename'].errors?.noHtml">
+                                    HTML or Js is not allowed
+                                </mat-error>
                             </mat-form-field>
                         </div>
                         <div class="width-44 display-inline-block formgroup margin-right-xl margin-bottom-s">
@@ -90,6 +97,13 @@
                                     *ngIf="schemeform?.controls['budgetutilized']?.touched && schemeform?.controls['budgetutilized'].errors?.required">
                                     Field is mandatory
                                 </mat-error>
+                                <mat-error [hidden]="false" i18n="Budget allocated Error|Explains name is required"
+                                    i18n-aria-label aria-label="Budget allocated Error|Explains name is required "
+                                    *ngIf="schemeform?.controls['budgetutilized']?.touched &&
+                                            !schemeform?.controls['budgetutilized'].errors?.required &&
+                                            schemeform?.controls['budgetutilized'].errors?.noHtml">
+                                    HTML or Js is not allowed
+                                </mat-error>
                             </mat-form-field>
                         </div>
                     </div>
diff --git a/project/ws/app/src/lib/routes/home/components/budgetschemepopup/budgetschemepopup.component.ts b/project/ws/app/src/lib/routes/home/components/budgetschemepopup/budgetschemepopup.component.ts
index 252e6ef31..b207ded60 100644
--- a/project/ws/app/src/lib/routes/home/components/budgetschemepopup/budgetschemepopup.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/budgetschemepopup/budgetschemepopup.component.ts
@@ -1,6 +1,7 @@
 import { Component, OnInit, Inject } from '@angular/core'
 import { FormControl, FormGroup, Validators } from '@angular/forms'
 import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'
+import { preventHtmlAndJs } from '../../../validators/prevent-html-and-js.validator'
 
 @Component({
   selector: 'ws-app-budgetschemepopup',
@@ -17,9 +18,9 @@ export class BudgetschemepopupComponent implements OnInit {
   constructor(private dialogRef: MatDialogRef<BudgetschemepopupComponent>, @Inject(MAT_DIALOG_DATA) data: any) {
     this.schemeform = new FormGroup({
       budgetyear: new FormControl({ value: '', disabled: true }),
-      schemename: new FormControl('', [Validators.required]),
+      schemename: new FormControl('', [Validators.required, preventHtmlAndJs()]),
       budgetallocated: new FormControl({ value: '', disabled: true }, [Validators.required]),
-      budgetutilized: new FormControl('', [Validators.required]),
+      budgetutilized: new FormControl('', [Validators.required, preventHtmlAndJs()]),
     })
 
     this.yearsList = data.yearlist
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
index efc865705..e54873a62 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
@@ -283,6 +283,10 @@
             <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
               <input class="w-full  placeholder-text" matInput placeholder="Provide reference link"
                 formControlName="referenceLink">
+              <mat-error *ngIf="requestForm.controls['referenceLink'].errors?.noHtml"
+                i18n="name Error|Explains name is required">
+                HTML or Js is not allowed
+              </mat-error>
             </mat-form-field>
 
 
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
index 4cf499ed7..38e647769 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.ts
@@ -8,6 +8,7 @@ import { ConfirmationBoxComponent } from '../../../../training-plan/components/c
 /* tslint:disable */
 import _ from 'lodash'
 import { debounceTime, distinctUntilChanged, startWith } from 'rxjs/operators'
+import { preventHtmlAndJs } from '../../../../validators/prevent-html-and-js.validator'
 /* tslint:enable */
 
 @Component({
@@ -80,7 +81,7 @@ export class CreateRequestFormComponent implements OnInit {
       userType: new FormControl('', [Validators.pattern(this.noSpecialChar)]),
       learningMode: new FormControl(''),
       compArea: new FormControl(''),
-      referenceLink: new FormControl(''),
+      referenceLink: new FormControl('', [preventHtmlAndJs()]),
       requestType: new FormControl('', Validators.required),
       assignee: new FormControl(''),
       providers: new FormControl([[]]),
diff --git a/project/ws/app/src/lib/routes/home/components/staffdetailspopup/staffdetailspopup.component.html b/project/ws/app/src/lib/routes/home/components/staffdetailspopup/staffdetailspopup.component.html
index 0c5d63035..8b11b72b7 100644
--- a/project/ws/app/src/lib/routes/home/components/staffdetailspopup/staffdetailspopup.component.html
+++ b/project/ws/app/src/lib/routes/home/components/staffdetailspopup/staffdetailspopup.component.html
@@ -54,6 +54,13 @@
                                     *ngIf="staffform?.controls['posfilled']?.touched && staffform?.controls['posfilled'].errors?.required">
                                     Field is mandatory
                                 </mat-error>
+                                <mat-error [hidden]="false"
+                                    i18n="Total positions filled Error|Explains name is required" i18n-aria-label
+                                    aria-label="Total positions filled Error|Explains name is required " *ngIf="staffform?.controls['posfilled']?.touched &&
+                                        !staffform?.controls['posfilled'].errors?.required &&
+                                        staffform?.controls['posfilled'].errors?.noHtml">
+                                    HTML or Js is not allowed
+                                </mat-error>
                             </mat-form-field>
                         </div>
                         <div class="display-inline-block formgroup margin-right-xl margin-bottom-s">
@@ -74,6 +81,13 @@
                                     *ngIf="staffform?.controls['posvacant']?.touched && staffform?.controls['posvacant'].errors?.required">
                                     Field is mandatory
                                 </mat-error>
+                                <mat-error [hidden]="false"
+                                    i18n="Total positions filled Error|Explains name is required" i18n-aria-label
+                                    aria-label="Total positions filled Error|Explains name is required " *ngIf="staffform?.controls['posvacant']?.touched &&
+                                        !staffform?.controls['posvacant'].errors?.required &&
+                                        staffform?.controls['posvacant'].errors?.noHtml">
+                                    HTML or Js is not allowed
+                                </mat-error>
                             </mat-form-field>
                         </div>
                     </div>
diff --git a/project/ws/app/src/lib/routes/home/components/staffdetailspopup/staffdetailspopup.component.ts b/project/ws/app/src/lib/routes/home/components/staffdetailspopup/staffdetailspopup.component.ts
index 95270f85a..e5a412c09 100644
--- a/project/ws/app/src/lib/routes/home/components/staffdetailspopup/staffdetailspopup.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/staffdetailspopup/staffdetailspopup.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit, Inject } from '@angular/core'
 import { FormControl, FormGroup, Validators } from '@angular/forms'
 import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'
 import { MdoInfoService } from '../../services/mdoinfo.service'
+import { preventHtmlAndJs } from '../../../validators/prevent-html-and-js.validator'
 
 @Component({
   selector: 'ws-app-staffdetailspopup',
@@ -20,8 +21,8 @@ export class StaffdetailspopupComponent implements OnInit {
     private mdoinfoSrvc: MdoInfoService) {
     this.staffform = new FormGroup({
       designation: new FormControl('', [Validators.required]),
-      posfilled: new FormControl('', [Validators.required]),
-      posvacant: new FormControl('', [Validators.required]),
+      posfilled: new FormControl('', [Validators.required, preventHtmlAndJs()]),
+      posvacant: new FormControl('', [Validators.required, preventHtmlAndJs()]),
     })
 
     if (data.data) {
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 038fe12dd..561ff7117 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -623,7 +623,7 @@
                         <mat-radio-button value="rejectgroup"
                           (click)="onClickHandleWorkflow(field,'REJECT')">Reject</mat-radio-button>
                         <mat-icon class="margin-left-m editreasonicon cursor-pointer"
-                          *ngIf="field.action === 'REJECT' && comment !== ''"
+                          *ngIf="field.action === 'REJECT' && comment !== '' && !htmlDetected"
                           (click)="updateRejection(field)">chat_bubble</mat-icon>
                       </mat-radio-group>
                     </div>
@@ -649,7 +649,7 @@
                         <mat-radio-button value="rejectdesg"
                           (click)="onClickHandleWorkflow(field,'REJECT')">Reject</mat-radio-button>
                         <mat-icon class="margin-left-m editreasonicon cursor-pointer"
-                          *ngIf="field.action === 'REJECT' && comment !== ''"
+                          *ngIf="field.action === 'REJECT' && comment !== '' && !htmlDetected"
                           (click)="updateRejection(field)">chat_bubble</mat-icon>
                       </mat-radio-group>
                     </div>
@@ -816,12 +816,16 @@
       <mat-form-field class="w-full mt-5" appearance="outline">
         <textarea matInput class="reason-text-area" [(ngModel)]="comment" name="reason"
           placeholder="Type the description in fewer than 100 characters" i18n-placeholder resizable="none"
-          maxlength="100"></textarea>
+          maxlength="100" (input)="validateText($event.target.value)"></textarea>
+        <mat-error [hidden]="false" i18n="Budget year Error|Explains name is required" i18n-aria-label
+          aria-label="Budget year Error|Explains name is required" *ngIf="htmlDetected">
+          Field is mandatory
+        </mat-error>
       </mat-form-field>
     </mat-dialog-content>
     <mat-dialog-actions class="flex flex-wrap justify-end">
       <button mat-raised-button class="btn-success btn-responsive successbtn" [mat-dialog-close]="true"
-        [disabled]="!comment">
+        [disabled]="!comment || htmlDetected">
         <span class="text-white">Submit</span></button>
       <button mat-raised-button class="btn-success btn-responsive cancelbtn" matDialogClose>Cancel</button>
     </mat-dialog-actions>
@@ -838,11 +842,12 @@
       <mat-form-field class="w-full mt-5" appearance="outline" *ngIf="showeditText">
         <textarea matInput class="reason-text-area" [(ngModel)]="comment" name="reason"
           placeholder="Type the description in fewer than 100 characters" i18n-placeholder resizable="none"
-          maxlength="100"></textarea>
+          maxlength="100" (input)="validateText($event.target.value)"></textarea>
       </mat-form-field>
     </mat-dialog-content>
     <mat-dialog-actions class="flex flex-wrap justify-end" *ngIf="showeditText">
-      <button mat-raised-button class="btn-success btn-responsive successbtn" [mat-dialog-close]="true">
+      <button mat-raised-button class="btn-success btn-responsive successbtn" [disabled]="!comment || htmlDetected"
+        [mat-dialog-close]="true">
         <span class="text-white">Update</span></button>
       <button mat-raised-button class="btn-success btn-responsive cancelbtn" matDialogClose>Cancel</button>
     </mat-dialog-actions>
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index b9abda7c8..184f7e657 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -105,6 +105,9 @@ export class UserCardComponent implements OnInit, OnChanges, AfterViewChecked {
   yearPattern = '(^[0-9]{4}$)'
   empIDPattern = `^[A-Za-z0-9]+$`
 
+  noHtmlCharacter = new RegExp(/<[^>]*>|(function[^\s]+)|(javascript:[^\s]+)/i)
+  htmlDetected = false
+
   userGroup: any
 
   otpSend = false
@@ -886,6 +889,16 @@ export class UserCardComponent implements OnInit, OnChanges, AfterViewChecked {
 
   }
 
+  validateText(text: any) {
+    const regexMatch = text.match(this.noHtmlCharacter)
+    if (regexMatch) {
+      this.htmlDetected = true
+      this.snackBar.open('HTML or Js is not allowed')
+    } else {
+      this.htmlDetected = false
+    }
+  }
+
   updateRejection(field: any) {
     this.comment = field.comment
     const dialogRef = this.dialog.open(this.updaterejectDialog, {
diff --git a/project/ws/app/src/lib/routes/home/routes/budget/budget.component.html b/project/ws/app/src/lib/routes/home/routes/budget/budget.component.html
index b3ccc3a09..6a54beb60 100644
--- a/project/ws/app/src/lib/routes/home/routes/budget/budget.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/budget/budget.component.html
@@ -67,6 +67,13 @@
                                                                 *ngIf="budgetdata?.controls['salarybudget']?.touched && budgetdata?.controls['salarybudget'].errors?.required">
                                                                 Field is mandatory
                                                             </mat-error>
+                                                            <mat-error [hidden]="false"
+                                                                i18n="Salary budget allocated Error|Explains name is required"
+                                                                i18n-aria-label
+                                                                aria-label="Salary budget allocated Error|Explains name is required "
+                                                                *ngIf="budgetdata?.controls['salarybudget']?.touched && !budgetdata?.controls['salarybudget'].errors?.required && budgetdata?.controls['salarybudget'].errors?.noHtml">
+                                                                HTML or Js is not allowed
+                                                            </mat-error>
                                                         </mat-form-field>
                                                     </div>
                                                     <div class="margin-bottom-m">
@@ -92,6 +99,13 @@
                                                                 *ngIf="budgetdata?.controls['trainingbudget']?.touched && budgetdata?.controls['trainingbudget'].errors?.required">
                                                                 Field is mandatory
                                                             </mat-error>
+                                                            <mat-error [hidden]="false"
+                                                                i18n="Salary budget allocated Error|Explains name is required"
+                                                                i18n-aria-label
+                                                                aria-label="Salary budget allocated Error|Explains name is required "
+                                                                *ngIf="budgetdata?.controls['trainingbudget']?.touched && !budgetdata?.controls['trainingbudget'].errors?.required && budgetdata?.controls['trainingbudget'].errors?.noHtml">
+                                                                HTML or Js is not allowed
+                                                            </mat-error>
                                                         </mat-form-field>
                                                     </div>
                                                     <div class="margin-bottom-m">
@@ -124,6 +138,15 @@
                                                                 *ngIf="utilizedChangeError">
                                                                 Projected utilization should be less than allocated
                                                             </mat-error>
+                                                            <mat-error [hidden]="false"
+                                                                i18n="Salary budget allocated Error|Explains name is required"
+                                                                i18n-aria-label
+                                                                aria-label="Salary budget allocated Error|Explains name is required "
+                                                                *ngIf="budgetdata?.controls['budgetutilized']?.touched &&
+                                                                !budgetdata?.controls['budgetutilized'].errors?.required &&
+                                                                !utilizedChangeError && budgetdata?.controls['budgetutilized'].errors?.noHtml">
+                                                                HTML or Js is not allowed
+                                                            </mat-error>
                                                         </mat-form-field>
                                                     </div>
                                                 </div>
diff --git a/project/ws/app/src/lib/routes/home/routes/budget/budget.component.ts b/project/ws/app/src/lib/routes/home/routes/budget/budget.component.ts
index 2da6b3266..e4683e197 100644
--- a/project/ws/app/src/lib/routes/home/routes/budget/budget.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/budget/budget.component.ts
@@ -11,6 +11,7 @@ import { BudgetproofspopupComponent } from '../../components/budgetproofspopup/b
 import { MdoInfoService } from '../../services/mdoinfo.service'
 import { ConfigurationsService } from '@sunbird-cb/utils'
 import { ActivatedRoute } from '@angular/router'
+import { preventHtmlAndJs } from '../../../validators/prevent-html-and-js.validator'
 
 @Component({
   selector: 'ws-app-budget',
@@ -92,9 +93,9 @@ export class BudgetComponent implements OnInit, OnChanges {
     private mdoinfoSrvc: MdoInfoService, private activeRoute: ActivatedRoute) {
     this.budgetdata = new FormGroup({
       budgetyear: new FormControl('', [Validators.required]),
-      salarybudget: new FormControl('', [Validators.required]),
-      trainingbudget: new FormControl('', [Validators.required]),
-      budgetutilized: new FormControl('', [Validators.required]),
+      salarybudget: new FormControl('', [Validators.required, preventHtmlAndJs()]),
+      trainingbudget: new FormControl('', [Validators.required, preventHtmlAndJs()]),
+      budgetutilized: new FormControl('', [Validators.required, preventHtmlAndJs()]),
     })
     // this.dataSource1 = new MatTableDataSource<any>()
     this.dataSource = new MatTableDataSource<any>()
diff --git a/project/ws/app/src/lib/routes/home/routes/staff/staff.component.html b/project/ws/app/src/lib/routes/home/routes/staff/staff.component.html
index 718e5a102..048f71de0 100644
--- a/project/ws/app/src/lib/routes/home/routes/staff/staff.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/staff/staff.component.html
@@ -49,6 +49,14 @@
                                             *ngIf="staffdata?.controls['posfilled']?.touched && staffdata?.controls['posfilled'].errors?.required">
                                             Field is mandatory
                                         </mat-error>
+                                        <mat-error [hidden]="false"
+                                            i18n="Total positions filled Error|Explains name is required"
+                                            i18n-aria-label
+                                            aria-label="Total positions filled Error|Explains name is required " *ngIf="staffdata?.controls['posfilled']?.touched &&
+                                                !staffdata?.controls['posfilled'].errors?.required &&
+                                                staffdata?.controls['posfilled'].errors?.noHtml">
+                                            HTML or Js is not allowed
+                                        </mat-error>
                                     </mat-form-field>
                                 </div>
                                 <div class="display-inline-block margin-right-xl">
@@ -70,6 +78,14 @@
                                             *ngIf="staffdata?.controls['posvacant']?.touched && staffdata?.controls['posvacant'].errors?.required">
                                             Field is mandatory
                                         </mat-error>
+                                        <mat-error [hidden]="false"
+                                            i18n="Total positions filled Error|Explains name is required"
+                                            i18n-aria-label
+                                            aria-label="Total positions filled Error|Explains name is required " *ngIf="staffdata?.controls['posvacant']?.touched &&
+                                                !staffdata?.controls['posvacant'].errors?.required &&
+                                                staffdata?.controls['posvacant'].errors?.noHtml">
+                                            HTML or Js is not allowed
+                                        </mat-error>
                                     </mat-form-field>
                                 </div>
                             </div>
diff --git a/project/ws/app/src/lib/routes/home/routes/staff/staff.component.ts b/project/ws/app/src/lib/routes/home/routes/staff/staff.component.ts
index 730e6651f..46ac6e6c8 100644
--- a/project/ws/app/src/lib/routes/home/routes/staff/staff.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/staff/staff.component.ts
@@ -10,6 +10,7 @@ import { StaffdetailspopupComponent } from '../../components/staffdetailspopup/s
 import { ActivatedRoute } from '@angular/router'
 import { MdoInfoService } from '../../services/mdoinfo.service'
 import { ConfigurationsService } from '@sunbird-cb/utils'
+import { preventHtmlAndJs } from '../../../validators/prevent-html-and-js.validator'
 
 @Component({
   selector: 'ws-app-staff',
@@ -40,7 +41,7 @@ export class StaffComponent implements OnInit, OnChanges {
   displayedColumns: IColums[] | undefined
   selection = new SelectionModel<any>(true, [])
   @ViewChild(MatPaginator, { static: true }) paginator!: MatPaginator
-  data!: { srnumber: number; position: string; positionfilled: number; positionvacant: number; }[]
+  data!: { srnumber: number; position: string; positionfilled: number; positionvacant: number }[]
   deptID: any
   overallpos: any
   isDisabled = true
@@ -55,8 +56,8 @@ export class StaffComponent implements OnInit, OnChanges {
     private configSvc: ConfigurationsService, private mdoinfoSrvc: MdoInfoService) {
     this.staffdata = new FormGroup({
       totalpositions: new FormControl({ value: '', disabled: true }),
-      posfilled: new FormControl('', [Validators.required]),
-      posvacant: new FormControl('', [Validators.required]),
+      posfilled: new FormControl('', [Validators.required, preventHtmlAndJs()]),
+      posvacant: new FormControl('', [Validators.required, preventHtmlAndJs()]),
     })
     this.dataSource = new MatTableDataSource<any>()
     this.dataSource.paginator = this.paginator
diff --git a/project/ws/app/src/lib/routes/validators/prevent-html-and-js.validator.ts b/project/ws/app/src/lib/routes/validators/prevent-html-and-js.validator.ts
new file mode 100644
index 000000000..dc64d371e
--- /dev/null
+++ b/project/ws/app/src/lib/routes/validators/prevent-html-and-js.validator.ts
@@ -0,0 +1,12 @@
+import { AbstractControl, ValidationErrors, ValidatorFn } from '@angular/forms'
+
+// A custom validator to prevent HTML and Javascript
+export function preventHtmlAndJs(): ValidatorFn {
+  return (control: AbstractControl): ValidationErrors | null => {
+    const value = control.value
+    if (value && value.match(/<[^>]*>|(function[^\s]+)|(javascript:[^\s]+)/i)) {
+      return { noHtml: true }
+    }
+    return null
+  }
+}

From 166ea197b99706a3523eaaf3a05f146bbc229f3f Mon Sep 17 00:00:00 2001
From: vishnubansaltarento <vishnu.bansal@tarento.com>
Date: Fri, 30 Aug 2024 05:59:19 +0530
Subject: [PATCH 861/887] update for notes

---
 .../home/routes/mentor-manage/mentor-manage.component.ts  | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.ts b/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.ts
index ad87da3c6..179f3881e 100644
--- a/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.ts
@@ -116,12 +116,10 @@ export class MentorManageComponent implements OnInit, OnDestroy {
     // this.getNVUsers('')
 
     this.reportsNoteList = [
-      `Easily create users individually or in bulk.`,
-      `Edit any user profile within your organization.`,
-      `Verified Users: Users with all their primary fields approved.`,
       // tslint:disable-next-line: max-line-length
-      `Non-Verified Users: Users whose one or more primary fields are yet to be approved. You can help by reviewing and approving their requests.`,
-      `Not My User: Remove a user from your organization with a simple click.`,
+      `There are two tabs—<strong>All Verified Users</strong> (lists all verified users) and <strong>Assigned Mentors</strong> (lists users who have been assigned as mentors).`,
+      `Assign a mentor from the <strong>All Verified Users</strong> tab, and they will automatically appear in the <strong>Assigned Mentors</strong> tab.`,
+      `Mentors can be assigned or managed from either tab, with changes reflected across both.`
     ]
   }
 

From 896085ae66316b4313d3281c3550bb60a6cc89b9 Mon Sep 17 00:00:00 2001
From: vishnubansaltarento <vishnu.bansal@tarento.com>
Date: Fri, 30 Aug 2024 06:20:40 +0530
Subject: [PATCH 862/887] update notes

---
 .../routes/home/routes/mentor-manage/mentor-manage.component.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.ts b/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.ts
index 179f3881e..db86e1260 100644
--- a/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.ts
@@ -118,7 +118,9 @@ export class MentorManageComponent implements OnInit, OnDestroy {
     this.reportsNoteList = [
       // tslint:disable-next-line: max-line-length
       `There are two tabs—<strong>All Verified Users</strong> (lists all verified users) and <strong>Assigned Mentors</strong> (lists users who have been assigned as mentors).`,
+      // tslint:disable-next-line: max-line-length
       `Assign a mentor from the <strong>All Verified Users</strong> tab, and they will automatically appear in the <strong>Assigned Mentors</strong> tab.`,
+      // tslint:disable-next-line: max-line-length
       `Mentors can be assigned or managed from either tab, with changes reflected across both.`
     ]
   }

From 5a1e1b4e1382722efe25e9cfc4824568ae8c1a6c Mon Sep 17 00:00:00 2001
From: vishnubansaltarento <vishnu.bansal@tarento.com>
Date: Fri, 30 Aug 2024 06:23:32 +0530
Subject: [PATCH 863/887] update notes

---
 .../routes/home/routes/mentor-manage/mentor-manage.component.ts  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.ts b/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.ts
index db86e1260..349b0d1fb 100644
--- a/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.ts
@@ -122,6 +122,7 @@ export class MentorManageComponent implements OnInit, OnDestroy {
       `Assign a mentor from the <strong>All Verified Users</strong> tab, and they will automatically appear in the <strong>Assigned Mentors</strong> tab.`,
       // tslint:disable-next-line: max-line-length
       `Mentors can be assigned or managed from either tab, with changes reflected across both.`
+
     ]
   }
 

From bcdeb426c1478530e5463a7989e576285bd6799a Mon Sep 17 00:00:00 2001
From: vishnubansaltarento <vishnu.bansal@tarento.com>
Date: Fri, 30 Aug 2024 06:24:28 +0530
Subject: [PATCH 864/887] update notes

---
 .../routes/home/routes/mentor-manage/mentor-manage.component.ts  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.ts b/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.ts
index 349b0d1fb..db86e1260 100644
--- a/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.ts
@@ -122,7 +122,6 @@ export class MentorManageComponent implements OnInit, OnDestroy {
       `Assign a mentor from the <strong>All Verified Users</strong> tab, and they will automatically appear in the <strong>Assigned Mentors</strong> tab.`,
       // tslint:disable-next-line: max-line-length
       `Mentors can be assigned or managed from either tab, with changes reflected across both.`
-
     ]
   }
 

From d042a0c46aaa6fdd88753207303446aa44215321 Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Fri, 30 Aug 2024 12:10:30 +0530
Subject: [PATCH 865/887] user search new fix remver kar-722

---
 .../routes/users-view/users-view.component.ts | 311 +-----------------
 1 file changed, 13 insertions(+), 298 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index f527f4f80..952d1aed1 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -234,75 +234,10 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       },
     }
     this.usersService.getAllKongUsers(reqBody).subscribe((data: any) => {
-      const allusersData = data && data.result && data.result.response
-      const userContent = allusersData.content
-      const searchText = this.getSearchText(query).toLowerCase()
-      if (searchText && searchText.length && searchText.length > 0) {
-        const userData: any = []
-        if (data && data.result && data.result.response && data.result.response.count &&
-          data.result.response.count > 0) {
-          if (userContent && userContent.length > 0) {
-            // userContent.forEach((element: any) => {
-            for (const element of userContent) {
-              const userPrimaryEmail = (element && element.profileDetails && element.profileDetails.personalDetails &&
-                element.profileDetails.personalDetails.primaryEmail &&
-                element.profileDetails.personalDetails.primaryEmail.toLowerCase())
-
-              const userMail = element && element.email && element.email.toLowerCase()
-
-              const userOfficialMail = element && element.profileDetails && element.profileDetails.personalDetails &&
-                element.profileDetails.personalDetails.officialEmail &&
-                element.profileDetails.personalDetails.officialEmail.toLowerCase()
-
-              const userPersonalMail = element && element.profileDetails && element.profileDetails.personalDetails &&
-                element.profileDetails.personalDetails.personalEmail &&
-                element.profileDetails.personalDetails.personalEmail.toLowerCase()
-
-              const userName = element && element.firstName && element.firstName.toLowerCase()
-              const userFirstName = element && element.profileDetails && element.profileDetails.personalDetails &&
-                element.profileDetails.personalDetails.firstname &&
-                element.profileDetails.personalDetails.firstname.toLowerCase()
-
-              const userMob = element && element.profileDetails && element.profileDetails.personalDetails &&
-                element.profileDetails.personalDetails.mobile
-
-              const userTelePhone = element && element.profileDetails && element.profileDetails.personalDetails &&
-                element.profileDetails.personalDetails.telephone
-
-              const userPhone = element && element.phone
-
-              const emailMatch = (userMail && userMail.includes(searchText.toLowerCase())) ||
-                (userPrimaryEmail && userPrimaryEmail.includes(searchText.toLowerCase())) ||
-                (userOfficialMail && userOfficialMail.includes(searchText.toLowerCase())) ||
-                (userPersonalMail && userPersonalMail.includes(searchText.toLowerCase()))
-
-              const firstNameMatch = (userName && userName.includes(searchText.toLowerCase())) ||
-                (userFirstName && userFirstName.includes(searchText.toLowerCase()))
-
-              const phoneMatch = (userTelePhone && userTelePhone.includes(searchText)) ||
-                (userMob && userMob.toString().includes(searchText)) || (userPhone && userPhone.includes(searchText))
-
-              if (emailMatch || firstNameMatch || phoneMatch) {
-                userData.push(element)
-                this.activeUsersData = userData
-                this.activeUsersDataCount = userData.length
-              } else {
-                // this.activeUsersData = []
-                // this.activeUsersDataCount = 0
-                this.activeUsersData = userData
-                this.activeUsersDataCount = userData.length
-              }
-            }
-          }
-        } else {
-          this.activeUsersData = allusersData.content
-          this.activeUsersDataCount = allusersData.count
-        }
-
-      } else {
-        this.activeUsersData = allusersData.content
-        this.activeUsersDataCount = allusersData.count
-      }
+      const allusersData = data.result.response
+      this.activeUsersData = allusersData.content
+      // this.activeUsersData = this.activeUsersData.filter((wf: any) => wf.profileDetails.profileStatus !== 'NOT-MY-USER')
+      this.activeUsersDataCount = allusersData.count
     })
   }
   async getVUsers(query: any) {
@@ -344,77 +279,9 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       },
     }
     this.usersService.getAllKongUsers(reqBody).subscribe((data: any) => {
-      const allusersData = data && data.result && data.result.response
-      const userContent = allusersData.content
-      const searchText = this.getSearchText(query).toLowerCase()
-      if (searchText && searchText.length && searchText.length > 0) {
-        const userData: any = []
-        if (data && data.result && data.result.response && data.result.response.count &&
-          data.result.response.count > 0) {
-          for (const element of userContent) {
-            // const userMail = element && element.profileDetails && element.profileDetails.personalDetails &&
-            //   element.profileDetails.personalDetails.primaryEmail &&
-            //   element.profileDetails.personalDetails.primaryEmail.toLowerCase()
-            // const userName = element && element.firstName && element.firstName.toLowerCase()
-            // const userPhone = element && element.profileDetails && element.profileDetails.personalDetails &&
-            //   element.profileDetails.personalDetails.mobile
-
-            const userPrimaryEmail = element && element.profileDetails && element.profileDetails.personalDetails &&
-              element.profileDetails.personalDetails.primaryEmail &&
-              element.profileDetails.personalDetails.primaryEmail.toLowerCase()
-
-            const userMail = element && element.email && element.email.toLowerCase()
-
-            const userOfficialMail = element && element.profileDetails && element.profileDetails.personalDetails &&
-              element.profileDetails.personalDetails.officialEmail &&
-              element.profileDetails.personalDetails.officialEmail.toLowerCase()
-
-            const userPersonalMail = element && element.profileDetails && element.profileDetails.personalDetails &&
-              element.profileDetails.personalDetails.personalEmail &&
-              element.profileDetails.personalDetails.personalEmail.toLowerCase()
-
-            const userName = element && element.firstName && element.firstName.toLowerCase()
-            const userFirstName = element && element.profileDetails && element.profileDetails.personalDetails &&
-              element.profileDetails.personalDetails.firstname &&
-              element.profileDetails.personalDetails.firstname.toLowerCase()
-
-            const userMob = element && element.profileDetails && element.profileDetails.personalDetails &&
-              element.profileDetails.personalDetails.mobile
-
-            const userTelePhone = element && element.profileDetails && element.profileDetails.personalDetails &&
-              element.profileDetails.personalDetails.telephone
-
-            const userPhone = element && element.phone
-
-            const emailMatch = (userMail && userMail.includes(searchText.toLowerCase())) ||
-              (userPrimaryEmail && userPrimaryEmail.includes(searchText.toLowerCase())) ||
-              (userOfficialMail && userOfficialMail.includes(searchText.toLowerCase())) ||
-              (userPersonalMail && userPersonalMail.includes(searchText.toLowerCase()))
-
-            const firstNameMatch = (userName && userName.includes(searchText.toLowerCase())) ||
-              (userFirstName && userFirstName.includes(searchText.toLowerCase()))
-
-            const phoneMatch = (userTelePhone && userTelePhone.includes(searchText)) ||
-              (userMob && userMob.toString().includes(searchText)) || (userPhone && userPhone.includes(searchText))
-
-            if (emailMatch || firstNameMatch || phoneMatch) {
-              userData.push(element)
-              this.verifiedUsersData = userData
-              this.verifiedUsersDataCount = userData.length
-            } else {
-              this.verifiedUsersData = userData
-              this.verifiedUsersDataCount = userData.length
-            }
-          }
-        } else {
-          this.verifiedUsersData = allusersData.content
-          this.verifiedUsersDataCount = data.result.response.count
-        }
-
-      } else {
-        this.verifiedUsersData = allusersData.content
-        this.verifiedUsersDataCount = data.result.response.count
-      }
+      const allusersData = data.result.response
+      this.verifiedUsersData = allusersData.content
+      this.verifiedUsersDataCount = data.result.response.count
       // this.verifiedUsersData = allusersData.content
       // this.verifiedUsersDataCount = data.result.response.count
       // this.filterFacets = allusersData.facets ? allusersData.facets : []
@@ -468,89 +335,9 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       },
     }
     this.usersService.getAllKongUsers(reqBody).subscribe((data: any) => {
-      const allusersData = data && data.result && data.result.response
-      // this.nonverifiedUsersData = allusersData.content
-      // this.nonverifiedUsersDataCount = data.result.response.count
-      // this.filterFacets = allusersData.facets ? allusersData.facets : []
-
-      // if (this.currentUserStatus === 'NOT-VERIFIED') {
-      //   const i = this.nonverifiedUsersData.findIndex((wf: any) => wf.userId === this.currentUser)
-      //   if (i > -1) {
-      //     this.nonverifiedUsersData.splice(i, 1)
-      //     this.nonverifiedUsersDataCount = this.nonverifiedUsersDataCount ?
-      //       this.nonverifiedUsersDataCount - 1 : this.nonverifiedUsersDataCount
-      //   }
-      // }
-      const userContent = allusersData.content
-      const searchText = this.getSearchText(query).toLowerCase()
-      if (searchText && searchText.length && searchText.length > 0) {
-        const userData: any = []
-        if (data && data.result && data.result.response && data.result.response.count &&
-          data.result.response.count > 0) {
-          for (const element of userContent) {
-            // const userMail = element && element.profileDetails && element.profileDetails.personalDetails &&
-            //   element.profileDetails.personalDetails.primaryEmail &&
-            //   element.profileDetails.personalDetails.primaryEmail.toLowerCase()
-            // const userName = element && element.firstName && element.firstName.toLowerCase()
-            // const userPhone = element && element.profileDetails && element.profileDetails.personalDetails &&
-            //   element.profileDetails.personalDetails.mobile
-
-            const userPrimaryEmail = element && element.profileDetails && element.profileDetails.personalDetails &&
-              element.profileDetails.personalDetails.primaryEmail &&
-              element.profileDetails.personalDetails.primaryEmail.toLowerCase()
-
-            const userMail = element && element.email && element.email.toLowerCase()
-
-            const userOfficialMail = element && element.profileDetails && element.profileDetails.personalDetails &&
-              element.profileDetails.personalDetails.officialEmail &&
-              element.profileDetails.personalDetails.officialEmail.toLowerCase()
-
-            const userPersonalMail = element && element.profileDetails && element.profileDetails.personalDetails &&
-              element.profileDetails.personalDetails.personalEmail &&
-              element.profileDetails.personalDetails.personalEmail.toLowerCase()
-
-            const userName = element && element.firstName && element.firstName.toLowerCase()
-            const userFirstName = element && element.profileDetails && element.profileDetails.personalDetails &&
-              element.profileDetails.personalDetails.firstname &&
-              element.profileDetails.personalDetails.firstname.toLowerCase()
-
-            const userMob = element && element.profileDetails && element.profileDetails.personalDetails &&
-              element.profileDetails.personalDetails.mobile
-
-            const userTelePhone = element && element.profileDetails && element.profileDetails.personalDetails &&
-              element.profileDetails.personalDetails.telephone
-
-            const userPhone = element && element.phone
-
-            const emailMatch = (userMail && userMail.includes(searchText.toLowerCase())) ||
-              (userPrimaryEmail && userPrimaryEmail.includes(searchText.toLowerCase())) ||
-              (userOfficialMail && userOfficialMail.includes(searchText.toLowerCase())) ||
-              (userPersonalMail && userPersonalMail.includes(searchText.toLowerCase()))
-
-            const firstNameMatch = (userName && userName.includes(searchText.toLowerCase())) ||
-              (userFirstName && userFirstName.includes(searchText.toLowerCase()))
-
-            const phoneMatch = (userTelePhone && userTelePhone.includes(searchText)) ||
-              (userMob && userMob.toString().includes(searchText)) || (userPhone && userPhone.includes(searchText))
-
-            if (emailMatch || firstNameMatch || phoneMatch) {
-              userData.push(element)
-              this.nonverifiedUsersData = userData
-              this.nonverifiedUsersDataCount = userData.length
-            } else {
-              this.nonverifiedUsersData = userData
-              this.nonverifiedUsersDataCount = userData.length
-            }
-          }
-        } else {
-          this.nonverifiedUsersData = allusersData.content
-          this.nonverifiedUsersDataCount = data.result.response.count
-        }
-
-      } else {
-        this.nonverifiedUsersData = allusersData.content
-        this.nonverifiedUsersDataCount = data.result.response.count
-      }
+      const allusersData = data.result.response
+      this.nonverifiedUsersData = allusersData.content
+      this.nonverifiedUsersDataCount = data.result.response.count
     })
   }
 
@@ -593,81 +380,9 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       },
     }
     this.usersService.getAllKongUsers(reqBody).subscribe((data: any) => {
-      const allusersData = data && data.result && data.result.response
-      // this.notmyuserUsersData = allusersData.content
-      // this.notmyuserUsersDataCount = data.result.response.count
-      // this.filterFacets = allusersData.facets ? allusersData.facets : []
-      const userContent = allusersData.content
-      const searchText = this.getSearchText(query).toLowerCase()
-      if (searchText && searchText.length && searchText.length > 0) {
-        const userData: any = []
-        if (data && data.result && data.result.response && data.result.response.count &&
-          data.result.response.count > 0) {
-          for (const element of userContent) {
-            // const userMail = element && element.profileDetails && element.profileDetails.personalDetails &&
-            //   element.profileDetails.personalDetails.primaryEmail &&
-            //   element.profileDetails.personalDetails.primaryEmail.toLowerCase()
-            // const userName = element && element.firstName && element.firstName.toLowerCase()
-            // const userPhone = element && element.profileDetails && element.profileDetails.personalDetails &&
-            //   element.profileDetails.personalDetails.mobile
-
-            const userPrimaryEmail = element && element.profileDetails && element.profileDetails.personalDetails &&
-              element.profileDetails.personalDetails.primaryEmail &&
-              element.profileDetails.personalDetails.primaryEmail.toLowerCase()
-
-            const userMail = element && element.email && element.email.toLowerCase()
-
-            const userOfficialMail = element && element.profileDetails && element.profileDetails.personalDetails &&
-              element.profileDetails.personalDetails.officialEmail &&
-              element.profileDetails.personalDetails.officialEmail.toLowerCase()
-
-            const userPersonalMail = element && element.profileDetails && element.profileDetails.personalDetails &&
-              element.profileDetails.personalDetails.personalEmail &&
-              element.profileDetails.personalDetails.personalEmail.toLowerCase()
-
-            const userName = element && element.firstName && element.firstName.toLowerCase()
-
-            const userFirstName = element && element.profileDetails && element.profileDetails.personalDetails &&
-              element.profileDetails.personalDetails.firstname &&
-              element.profileDetails.personalDetails.firstname.toLowerCase()
-
-            const userMob = element && element.profileDetails && element.profileDetails.personalDetails &&
-              element.profileDetails.personalDetails.mobile
-
-            const userTelePhone = element && element.profileDetails && element.profileDetails.personalDetails &&
-              element.profileDetails.personalDetails.telephone
-
-            const userPhone = element && element.phone
-
-            const emailMatch = (userMail && userMail.includes(searchText.toLowerCase())) ||
-              (userPrimaryEmail && userPrimaryEmail.includes(searchText.toLowerCase())) ||
-              (userOfficialMail && userOfficialMail.includes(searchText.toLowerCase())) ||
-              (userPersonalMail && userPersonalMail.includes(searchText.toLowerCase()))
-
-            const firstNameMatch = (userName && userName.includes(searchText.toLowerCase())) ||
-              (userFirstName && userFirstName.includes(searchText.toLowerCase()))
-
-            const phoneMatch = (userTelePhone && userTelePhone.includes(searchText)) ||
-              (userMob && userMob.toString().includes(searchText)) || (userPhone && userPhone.includes(searchText))
-
-            if (emailMatch || firstNameMatch || phoneMatch) {
-              userData.push(element)
-              this.notmyuserUsersData = userData
-              this.notmyuserUsersDataCount = userData.length
-            } else {
-              this.notmyuserUsersData = userData
-              this.notmyuserUsersDataCount = userData.length
-            }
-          }
-        } else {
-          this.notmyuserUsersData = allusersData.content
-          this.notmyuserUsersDataCount = data.result.response.count
-        }
-
-      } else {
-        this.notmyuserUsersData = allusersData.content
-        this.notmyuserUsersDataCount = data.result.response.count
-      }
+      const allusersData = data.result.response
+      this.notmyuserUsersData = allusersData.content
+      this.notmyuserUsersDataCount = data.result.response.count
     })
   }
 

From 79bb33cb3264551554cfd5ca3ac5ec31f3583a9f Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Fri, 30 Aug 2024 12:49:49 +0530
Subject: [PATCH 866/887] user pending request condition error fix

---
 .../home/components/user-cards/user-card.component.html     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 038fe12dd..8a13e8ed1 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -764,13 +764,15 @@
             <div class="flex flex-row margin-top-m">
               <div class="md:w-1/1">
                 <label class="view-text-label">Roles</label>
-                <div *ngIf="appData?.user?.organisations && appData?.user?.organisations[0]?.roles.length > 0">
+                <div *ngIf="appData?.user?.organisations && appData?.user?.organisations[0]?.roles && appData?.user?.organisations[0]?.roles.length
+                 &&  appData?.user?.organisations[0]?.roles.length > 0">
                   <ul class="roleslist">
                     <li *ngFor="let t of appData?.user?.organisations[0]?.roles">{{t}}
                     </li>
                   </ul>
                 </div>
-                <p *ngIf="appData?.user?.organisations && appData?.user?.organisations[0].roles.length === 0">-</p>
+                <p *ngIf="appData?.user?.organisations && appData?.user?.organisations[0].roles &&
+                    appData?.user?.organisations[0].roles.length && appData?.user?.organisations[0].roles.length === 0">-</p>
               </div>
             </div>
           </div>

From 08bcdccc6128fd7b2391fa21000af48e88c8f994 Mon Sep 17 00:00:00 2001
From: Venkat Kandagaddala <venky.kandagaddala@gmail.com>
Date: Fri, 30 Aug 2024 13:28:19 +0530
Subject: [PATCH 867/887] Prevent the html and js in input fields

---
 .../reject-reason-dialog.component.html                     | 2 +-
 .../budgetschemepopup/budgetschemepopup.component.html      | 4 ++--
 .../create-request-form/create-request-form.component.html  | 2 +-
 .../staffdetailspopup/staffdetailspopup.component.html      | 4 ++--
 .../src/lib/routes/home/routes/budget/budget.component.html | 6 +++---
 .../src/lib/routes/home/routes/staff/staff.component.html   | 4 ++--
 .../lib/routes/validators/prevent-html-and-js.validator.ts  | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.html b/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.html
index 39c530902..4095480ea 100644
--- a/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.html
+++ b/project/ws/app/src/lib/routes/blended-program-approvals/components/reject-reason-dialog/reject-reason-dialog.component.html
@@ -14,7 +14,7 @@ <h2 mat-dialog-title class="required">{{data.title}}</h2>
         </mat-error>
         <mat-error [hidden]="false" i18n="Budget year Error|Explains name is required" i18n-aria-label
           aria-label="Budget year Error|Explains name is required"
-          *ngIf="reasonForm?.controls['reason']?.touched && !reasonForm?.controls['reason'].errors?.required && reasonForm?.controls['reason'].errors?.noHtml">
+          *ngIf="reasonForm?.controls['reason']?.touched && !reasonForm?.controls['reason'].errors?.required && reasonForm?.controls['reason'].errors?.hasHtml">
           HTML or Js is not allowed
         </mat-error>
       </mat-form-field>
diff --git a/project/ws/app/src/lib/routes/home/components/budgetschemepopup/budgetschemepopup.component.html b/project/ws/app/src/lib/routes/home/components/budgetschemepopup/budgetschemepopup.component.html
index 4ab3e7944..d8dcf3187 100644
--- a/project/ws/app/src/lib/routes/home/components/budgetschemepopup/budgetschemepopup.component.html
+++ b/project/ws/app/src/lib/routes/home/components/budgetschemepopup/budgetschemepopup.component.html
@@ -56,7 +56,7 @@
                                     i18n-aria-label aria-label="Budget allocated Error|Explains name is required "
                                     *ngIf="schemeform?.controls['schemename']?.touched &&
                                                                     !schemeform?.controls['schemename'].errors?.required &&
-                                                                    schemeform?.controls['schemename'].errors?.noHtml">
+                                                                    schemeform?.controls['schemename'].errors?.hasHtml">
                                     HTML or Js is not allowed
                                 </mat-error>
                             </mat-form-field>
@@ -101,7 +101,7 @@
                                     i18n-aria-label aria-label="Budget allocated Error|Explains name is required "
                                     *ngIf="schemeform?.controls['budgetutilized']?.touched &&
                                             !schemeform?.controls['budgetutilized'].errors?.required &&
-                                            schemeform?.controls['budgetutilized'].errors?.noHtml">
+                                            schemeform?.controls['budgetutilized'].errors?.hasHtml">
                                     HTML or Js is not allowed
                                 </mat-error>
                             </mat-form-field>
diff --git a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
index e54873a62..24f6054fb 100644
--- a/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
+++ b/project/ws/app/src/lib/routes/home/components/request-list/create-request-form/create-request-form.component.html
@@ -283,7 +283,7 @@
             <mat-form-field appearance="outline" class="w-full field-height" fxFlex="40">
               <input class="w-full  placeholder-text" matInput placeholder="Provide reference link"
                 formControlName="referenceLink">
-              <mat-error *ngIf="requestForm.controls['referenceLink'].errors?.noHtml"
+              <mat-error *ngIf="requestForm.controls['referenceLink'].errors?.hasHtml"
                 i18n="name Error|Explains name is required">
                 HTML or Js is not allowed
               </mat-error>
diff --git a/project/ws/app/src/lib/routes/home/components/staffdetailspopup/staffdetailspopup.component.html b/project/ws/app/src/lib/routes/home/components/staffdetailspopup/staffdetailspopup.component.html
index 8b11b72b7..3fc8d6a57 100644
--- a/project/ws/app/src/lib/routes/home/components/staffdetailspopup/staffdetailspopup.component.html
+++ b/project/ws/app/src/lib/routes/home/components/staffdetailspopup/staffdetailspopup.component.html
@@ -58,7 +58,7 @@
                                     i18n="Total positions filled Error|Explains name is required" i18n-aria-label
                                     aria-label="Total positions filled Error|Explains name is required " *ngIf="staffform?.controls['posfilled']?.touched &&
                                         !staffform?.controls['posfilled'].errors?.required &&
-                                        staffform?.controls['posfilled'].errors?.noHtml">
+                                        staffform?.controls['posfilled'].errors?.hasHtml">
                                     HTML or Js is not allowed
                                 </mat-error>
                             </mat-form-field>
@@ -85,7 +85,7 @@
                                     i18n="Total positions filled Error|Explains name is required" i18n-aria-label
                                     aria-label="Total positions filled Error|Explains name is required " *ngIf="staffform?.controls['posvacant']?.touched &&
                                         !staffform?.controls['posvacant'].errors?.required &&
-                                        staffform?.controls['posvacant'].errors?.noHtml">
+                                        staffform?.controls['posvacant'].errors?.hasHtml">
                                     HTML or Js is not allowed
                                 </mat-error>
                             </mat-form-field>
diff --git a/project/ws/app/src/lib/routes/home/routes/budget/budget.component.html b/project/ws/app/src/lib/routes/home/routes/budget/budget.component.html
index 6a54beb60..e111b2ec1 100644
--- a/project/ws/app/src/lib/routes/home/routes/budget/budget.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/budget/budget.component.html
@@ -71,7 +71,7 @@
                                                                 i18n="Salary budget allocated Error|Explains name is required"
                                                                 i18n-aria-label
                                                                 aria-label="Salary budget allocated Error|Explains name is required "
-                                                                *ngIf="budgetdata?.controls['salarybudget']?.touched && !budgetdata?.controls['salarybudget'].errors?.required && budgetdata?.controls['salarybudget'].errors?.noHtml">
+                                                                *ngIf="budgetdata?.controls['salarybudget']?.touched && !budgetdata?.controls['salarybudget'].errors?.required && budgetdata?.controls['salarybudget'].errors?.hasHtml">
                                                                 HTML or Js is not allowed
                                                             </mat-error>
                                                         </mat-form-field>
@@ -103,7 +103,7 @@
                                                                 i18n="Salary budget allocated Error|Explains name is required"
                                                                 i18n-aria-label
                                                                 aria-label="Salary budget allocated Error|Explains name is required "
-                                                                *ngIf="budgetdata?.controls['trainingbudget']?.touched && !budgetdata?.controls['trainingbudget'].errors?.required && budgetdata?.controls['trainingbudget'].errors?.noHtml">
+                                                                *ngIf="budgetdata?.controls['trainingbudget']?.touched && !budgetdata?.controls['trainingbudget'].errors?.required && budgetdata?.controls['trainingbudget'].errors?.hasHtml">
                                                                 HTML or Js is not allowed
                                                             </mat-error>
                                                         </mat-form-field>
@@ -144,7 +144,7 @@
                                                                 aria-label="Salary budget allocated Error|Explains name is required "
                                                                 *ngIf="budgetdata?.controls['budgetutilized']?.touched &&
                                                                 !budgetdata?.controls['budgetutilized'].errors?.required &&
-                                                                !utilizedChangeError && budgetdata?.controls['budgetutilized'].errors?.noHtml">
+                                                                !utilizedChangeError && budgetdata?.controls['budgetutilized'].errors?.hasHtml">
                                                                 HTML or Js is not allowed
                                                             </mat-error>
                                                         </mat-form-field>
diff --git a/project/ws/app/src/lib/routes/home/routes/staff/staff.component.html b/project/ws/app/src/lib/routes/home/routes/staff/staff.component.html
index 048f71de0..084a7ce49 100644
--- a/project/ws/app/src/lib/routes/home/routes/staff/staff.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/staff/staff.component.html
@@ -54,7 +54,7 @@
                                             i18n-aria-label
                                             aria-label="Total positions filled Error|Explains name is required " *ngIf="staffdata?.controls['posfilled']?.touched &&
                                                 !staffdata?.controls['posfilled'].errors?.required &&
-                                                staffdata?.controls['posfilled'].errors?.noHtml">
+                                                staffdata?.controls['posfilled'].errors?.hasHtml">
                                             HTML or Js is not allowed
                                         </mat-error>
                                     </mat-form-field>
@@ -83,7 +83,7 @@
                                             i18n-aria-label
                                             aria-label="Total positions filled Error|Explains name is required " *ngIf="staffdata?.controls['posvacant']?.touched &&
                                                 !staffdata?.controls['posvacant'].errors?.required &&
-                                                staffdata?.controls['posvacant'].errors?.noHtml">
+                                                staffdata?.controls['posvacant'].errors?.hasHtml">
                                             HTML or Js is not allowed
                                         </mat-error>
                                     </mat-form-field>
diff --git a/project/ws/app/src/lib/routes/validators/prevent-html-and-js.validator.ts b/project/ws/app/src/lib/routes/validators/prevent-html-and-js.validator.ts
index dc64d371e..dc3d965d9 100644
--- a/project/ws/app/src/lib/routes/validators/prevent-html-and-js.validator.ts
+++ b/project/ws/app/src/lib/routes/validators/prevent-html-and-js.validator.ts
@@ -5,7 +5,7 @@ export function preventHtmlAndJs(): ValidatorFn {
   return (control: AbstractControl): ValidationErrors | null => {
     const value = control.value
     if (value && value.match(/<[^>]*>|(function[^\s]+)|(javascript:[^\s]+)/i)) {
-      return { noHtml: true }
+      return { hasHtml: true }
     }
     return null
   }

From 4b03e10bb4b400ade225d7f1f9a0fa9f0db64db0 Mon Sep 17 00:00:00 2001
From: Venkat Kandagaddala <venky.kandagaddala@gmail.com>
Date: Fri, 30 Aug 2024 14:40:51 +0530
Subject: [PATCH 868/887] Env json implementation for environment variables

---
 src/index.html | 37 +++++++++++++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/index.html b/src/index.html
index 7e61a0a7e..57081d922 100644
--- a/src/index.html
+++ b/src/index.html
@@ -21,7 +21,40 @@
   <meta id="id-app-theme-color" name="theme-color" content="#000" />
   <link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Open+Sans" />
   <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-  <script src="/assets/env.js"></script>
+  <!-- <script src="/assets/env.js"></script> -->
+  <script rel="preload">
+    (async function getData() {
+      const url = "/assets/env.json"
+      try {
+        const response = await fetch(url)
+        if (!response.ok) {
+          throw new Error(`Response status: ${response.status}`)
+        }
+        const envJson = await response.json()
+        window["env"] = window["env"] || {}
+        // Environment variables
+        window["env"]["sitePath"] = envJson.sitePath
+        window["env"]["name"] = envJson.name
+        window["env"]["debug"] = envJson.debug
+        window["env"]["karmYogiPath"] = envJson.karmYogiPath
+        window["env"]["cbpPath"] = envJson.cbpPath
+        window["env"]["contentHost"] = envJson.contentHost
+        window["env"]["mdoPath"] = envJson.mdoPath
+        window["env"]["azureBucket"] = envJson.azureBucket
+        window["env"]["contentBucket"] = envJson.contentBucket
+        window["env"]["teamsUrl"] = envJson.teamsUrl
+        window["env"]["portalRoles"] = envJson.portalRoles
+        window["env"]["resendOTPTIme"] = envJson.resendOTPTIme
+        window["env"]["domainName"] = envJson.domainName
+        window["env"]["userBucket"] = envJson.userBucket
+        window["env"]["KCMframeworkName"] = envJson.KCMframeworkName
+        window["env"]["connectionType"] = envJson.connectionType
+        window["env"]["ODCSMasterFramework"] = envJson.ODCSMasterFramework
+      } catch (error) {
+        console.error("Error in fetching env json")
+      }
+    })(this);
+  </script>
 </head>
 
 <body class="mat-app-background mat-body mat-typography custom-scroll">
@@ -90,4 +123,4 @@
 
 </script>
 
-</html>
+</html>
\ No newline at end of file

From 382f6ec805c3308a0122151f6054c85078627940 Mon Sep 17 00:00:00 2001
From: vishnubansaltarento <vishnu.bansal@tarento.com>
Date: Sun, 1 Sep 2024 13:26:08 +0530
Subject: [PATCH 869/887] update for mentorship issue

---
 .../user-cards/user-card.component.ts         | 28 ++++++++++++++-----
 .../mentor-manage.component.html              |  8 ++++--
 .../mentor-manage.component.scss              | 13 +++++++++
 3 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 55c14921b..22dd663aa 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -124,11 +124,11 @@ export class UserCardComponent implements OnInit, OnChanges, AfterViewChecked {
   currentUserRole = ''
   checked = false
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-              private dialog: MatDialog, private approvalSvc: ApprovalsService,
-              private route: ActivatedRoute, private snackBar: MatSnackBar,
-              private events: EventService,
-              private datePipe: DatePipe,
-              private cdr: ChangeDetectorRef) {
+    private dialog: MatDialog, private approvalSvc: ApprovalsService,
+    private route: ActivatedRoute, private snackBar: MatSnackBar,
+    private events: EventService,
+    private datePipe: DatePipe,
+    private cdr: ChangeDetectorRef) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),
@@ -1056,7 +1056,7 @@ export class UserCardComponent implements OnInit, OnChanges, AfterViewChecked {
       if (this.activeTab === 'verified') {
         this.memberAlertMessage = 'Remove this user from mentor role?'
       } else {
-        this.memberAlertMessage = 'Remove this user from mentor role? The user will move to the Verified tab.'
+        this.memberAlertMessage = 'Remove this user from the mentor role? You can reverse this in the All Verified Users tab.'
       }
 
     }
@@ -1067,7 +1067,21 @@ export class UserCardComponent implements OnInit, OnChanges, AfterViewChecked {
       if (v) {
         this.saveMentorProfile(user, event)
       } else {
-        event.source.checked = true
+        if (this.activeTab === 'verified') {
+          if (event.checked) {
+            event.source.checked = false
+          } else {
+            event.source.checked = true
+          }
+        }
+        if (this.activeTab === 'mentor') {
+          if (event.checked) {
+            event.source.checked = false
+          } else {
+            event.source.checked = true
+          }
+        }
+
       }
     })
   }
diff --git a/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.html b/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.html
index a207ae286..6ad0e4967 100644
--- a/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.html
@@ -10,7 +10,7 @@
       </div>
     </mat-card-header> -->
     <mat-card-title class="flex-4 mobile-margin text-capitalize margin-bottom-l">
-      <span class="h-600-s-20-m color-87">Users</span>
+      <span class="h-600-s-20-m color-87">Mentor management</span>
     </mat-card-title>
     <mat-card class="mb-8">
       <mat-card-content class="flex gap-10">
@@ -58,12 +58,14 @@
           <a routerLink="/app/home/mentor-manage/verified" routerLinkActive="router-link-active" class="filter-option"
             [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'verified','ws-mat-accent-border font-medium':currentFilter !== 'verified'}"
             mat-button (click)="filter('verified'); tabTelemetry('verified', 0)" role="button">All Verified <span
-              *ngIf="verifiedUsersDataCount === 1">User</span> <span *ngIf="verifiedUsersDataCount > 1">Users</span>
+              *ngIf="verifiedUsersDataCount === 1 || verifiedUsersDataCount === 0">User</span> <span
+              *ngIf="verifiedUsersDataCount > 1">Users</span>
             ({{verifiedUsersDataCount}})</a>
           <a routerLink="/app/home/mentor-manage/mentor" routerLinkActive="router-link-active" class="filter-option"
             [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'mentor','ws-mat-accent-border font-medium':currentFilter !== 'verified'}"
             mat-button (click)="filter('mentor'); tabTelemetry('mentor', 0)" role="button">Assigned <span
-              *ngIf="mentorUsersDataCount === 1">Mentor</span> <span *ngIf="mentorUsersDataCount > 1">Mentors</span>
+              *ngIf="mentorUsersDataCount === 1 || mentorUsersDataCount === 0">Mentor</span> <span
+              *ngIf="mentorUsersDataCount > 1">Mentors</span>
             ({{mentorUsersDataCount}})</a>
           <!-- <a routerLink="/app/home/mentor-manage/non-mentor" routerLinkActive="router-link-active" class="filter-option"
             [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'non-mentor','ws-mat-accent-border font-medium':currentFilter !== 'verified'}"
diff --git a/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.scss b/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.scss
index f78c12356..ca35b2771 100644
--- a/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.scss
@@ -330,4 +330,17 @@ a:not([href]):not([tabindex]) {
 .no-border {
   border: 0;
   box-shadow: none !important;
+}
+
+::ng-deep .filter {
+  .mat-button .mat-button-wrapper>*, .mat-fab .mat-button-wrapper>*, .mat-flat-button .mat-button-wrapper>*, .mat-icon-button .mat-button-wrapper>*, .mat-mini-fab .mat-button-wrapper>*, .mat-raised-button .mat-button-wrapper>*, .mat-stroked-button .mat-button-wrapper>* {
+    vertical-align: baseline !important;
+  }
+  .mat-button, .mat-raised-button, .mat-icon-button, .mat-stroked-button, .mat-flat-button, .mat-fab, .mat-mini-fab {
+    font-weight: normal;
+  }
+
+  .ws-mat-accent-border-active {
+    font-weight: 700 !important;
+  }
 }
\ No newline at end of file

From d4b6446f10ea680d3d11b79af06ae5bf91f7576e Mon Sep 17 00:00:00 2001
From: vishnubansaltarento <vishnu.bansal@tarento.com>
Date: Sun, 1 Sep 2024 13:33:48 +0530
Subject: [PATCH 870/887] update for mentorship issues

---
 .../home/components/user-cards/user-card.component.ts  | 10 +++++-----
 .../routes/mentor-manage/mentor-manage.component.ts    |  5 ++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 22dd663aa..41e3b4a0f 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -124,11 +124,11 @@ export class UserCardComponent implements OnInit, OnChanges, AfterViewChecked {
   currentUserRole = ''
   checked = false
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-    private dialog: MatDialog, private approvalSvc: ApprovalsService,
-    private route: ActivatedRoute, private snackBar: MatSnackBar,
-    private events: EventService,
-    private datePipe: DatePipe,
-    private cdr: ChangeDetectorRef) {
+              private dialog: MatDialog, private approvalSvc: ApprovalsService,
+              private route: ActivatedRoute, private snackBar: MatSnackBar,
+              private events: EventService,
+              private datePipe: DatePipe,
+              private cdr: ChangeDetectorRef) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),
diff --git a/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.ts b/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.ts
index db86e1260..c152b61f9 100644
--- a/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/mentor-manage/mentor-manage.component.ts
@@ -93,7 +93,6 @@ export class MentorManageComponent implements OnInit, OnDestroy {
     // }
   }
 
-
   ngOnInit() {
     this.currentFilter = this.route.snapshot.params['tab'] || 'verified'
     this.rootOrgId = _.get(this.route.snapshot.parent, 'data.configService.unMappedUser.rootOrg.rootOrgId')
@@ -107,7 +106,7 @@ export class MentorManageComponent implements OnInit, OnDestroy {
       setTimeout(() => {
         this.getAllVerifiedUsers('')
         this.getMentorUsers('')
-      }, 1000)
+      },         1000)
 
     })
     this.getAllVerifiedUsers('')
@@ -121,7 +120,7 @@ export class MentorManageComponent implements OnInit, OnDestroy {
       // tslint:disable-next-line: max-line-length
       `Assign a mentor from the <strong>All Verified Users</strong> tab, and they will automatically appear in the <strong>Assigned Mentors</strong> tab.`,
       // tslint:disable-next-line: max-line-length
-      `Mentors can be assigned or managed from either tab, with changes reflected across both.`
+      `Mentors can be assigned or managed from either tab, with changes reflected across both.`,
     ]
   }
 

From a20059ec87503e02439a6e61f6d557a23cdaa401 Mon Sep 17 00:00:00 2001
From: vishnubansaltarento <vishnu.bansal@tarento.com>
Date: Wed, 4 Sep 2024 10:56:47 +0530
Subject: [PATCH 871/887] update for 6663 6665

---
 .../user-cards/user-card.component.html       | 36 +++++++++++--------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 31e1839af..e3b576db5 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -323,16 +323,17 @@
               </div>
             </div>
             <!-- Cader Related Code-->
+
             <div class="flex flex-row margin-top-m">
-              <div class="md:w-1/3">
+              <div class="md:w-1/3" *ngIf="user?.profileDetails?.hasOwnProperty('cadreDetails')">
                 <label class="margin-remove-bottom form-label">Are you a Cadre Employee?</label>
                 <mat-form-field appearance="outline">
                   <input type="text" matInput [disabled]="true"
-                    [value]="user?.profileDetails?.cadreDetails ? 'Yes': 'No'">
+                    [value]="user?.profileDetails?.cadreDetails?.civilServiceType ? 'Yes': 'No'">
                 </mat-form-field>
               </div>
 
-              <div class="md:w-1/3" *ngIf="user?.profileDetails?.cadreDetails">
+              <div class="md:w-1/3" *ngIf="user?.profileDetails?.cadreDetails?.civilServiceType">
                 <label class="margin-remove-bottom form-label">Type of Civil Service</label>
                 <mat-form-field appearance="outline">
                   <input type="text" matInput [disabled]="true"
@@ -340,7 +341,7 @@
                 </mat-form-field>
               </div>
 
-              <div class="md:w-1/3" *ngIf="user?.profileDetails?.cadreDetails">
+              <div class="md:w-1/3" *ngIf="user?.profileDetails?.cadreDetails?.civilServiceType">
                 <label class="margin-remove-bottom form-label">Service</label>
                 <mat-form-field appearance="outline">
                   <input type="text" matInput [disabled]="true"
@@ -349,7 +350,10 @@
               </div>
             </div>
             <div class="flex flex-row margin-top-m">
-              <div class="md:w-1/3" *ngIf="user?.profileDetails?.cadreDetails">
+              <div class="md:w-1/3" *ngIf="user?.profileDetails?.cadreDetails?.civilServiceType &&
+              (user?.profileDetails?.cadreDetails?.civilServiceName.trim() === 'Indian Administrative Office (IAS)' ||
+            user?.profileDetails?.cadreDetails?.civilServiceName.trim() === 'Indian Police Service (IPS)' ||
+            user?.profileDetails?.cadreDetails?.civilServiceName.trim() === 'Indian Forest Service (IFoS)')">
                 <label class="margin-remove-bottom form-label">Cadre</label>
                 <mat-form-field appearance="outline">
                   <input type="text" matInput [disabled]="true"
@@ -357,7 +361,7 @@
                 </mat-form-field>
               </div>
 
-              <div class="md:w-1/3" *ngIf="user?.profileDetails?.cadreDetails">
+              <div class="md:w-1/3" *ngIf="user?.profileDetails?.cadreDetails?.civilServiceType">
                 <label class="margin-remove-bottom form-label">Batch</label>
                 <mat-form-field appearance="outline">
                   <input type="text" matInput [disabled]="true"
@@ -365,7 +369,7 @@
                 </mat-form-field>
               </div>
 
-              <div class="md:w-1/3" *ngIf="user?.profileDetails?.cadreDetails">
+              <div class="md:w-1/3" *ngIf="user?.profileDetails?.cadreDetails?.civilServiceType">
                 <label class="margin-remove-bottom form-label">Cadre Controlling Authority</label>
                 <mat-form-field appearance="outline">
                   <input type="text" matInput [disabled]="true"
@@ -597,25 +601,29 @@
           </div>
           <!-- Cader Related Code-->
           <div class="flex flex-row margin-top-m">
-            <div class="md:w-1/4">
+            <div class="md:w-1/4" *ngIf="user?.profileDetails?.hasOwnProperty('cadreDetails')">
               <label class="view-text-label">Are you a Cadre Employee?</label>
-              <p>{{user?.profileDetails?.cadreDetails ? 'Yes': 'No'}}</p>
+              <p>{{user?.profileDetails?.cadreDetails?.civilServiceType ? 'Yes': 'No'}}</p>
             </div>
 
-            <div class="md:w-1/4" *ngIf="user?.profileDetails?.cadreDetails">
+            <div class="md:w-1/4" *ngIf="user?.profileDetails?.cadreDetails?.civilServiceType">
               <label class="view-text-label">Type of Civil Service</label>
               <p>{{user?.profileDetails?.cadreDetails?.civilServiceType ?
                 user?.profileDetails?.cadreDetails?.civilServiceType: '-'}}</p>
 
             </div>
 
-            <div class="md:w-1/4" *ngIf="user?.profileDetails?.cadreDetails">
+            <div class="md:w-1/4" *ngIf="user?.profileDetails?.cadreDetails?.civilServiceType">
               <label class="view-text-label">Service</label>
               <p>{{user?.profileDetails?.cadreDetails?.civilServiceName ?
                 user?.profileDetails?.cadreDetails?.civilServiceName: '-'}}</p>
 
             </div>
-            <div class="md:w-1/4" *ngIf="user?.profileDetails?.cadreDetails">
+            <div class="md:w-1/4" *ngIf="user?.profileDetails?.cadreDetails?.civilServiceType &&
+            (user?.profileDetails?.cadreDetails?.civilServiceName.trim() === 'Indian Administrative Office (IAS)' ||
+            user?.profileDetails?.cadreDetails?.civilServiceName.trim() === 'Indian Police Service (IPS)' ||
+            user?.profileDetails?.cadreDetails?.civilServiceName.trim() === 'Indian Forest Service (IFoS)')
+            ">
               <label class="view-text-label">Cadre</label>
               <p>{{user?.profileDetails?.cadreDetails?.cadreName ? user?.profileDetails?.cadreDetails?.cadreName: '-'}}
               </p>
@@ -623,7 +631,7 @@
             </div>
           </div>
           <div class="flex flex-row margin-top-m">
-            <div class="md:w-1/4" *ngIf="user?.profileDetails?.cadreDetails">
+            <div class="md:w-1/4" *ngIf="user?.profileDetails?.cadreDetails?.civilServiceType">
               <label class="view-text-label">Batch</label>
               <p>{{user?.profileDetails?.cadreDetails?.cadreBatch ? user?.profileDetails?.cadreDetails?.cadreBatch:
                 '-'}}
@@ -631,7 +639,7 @@
 
             </div>
 
-            <div class="md:w-1/2" *ngIf="user?.profileDetails?.cadreDetails">
+            <div class="md:w-1/2" *ngIf="user?.profileDetails?.cadreDetails?.civilServiceType">
               <label class="view-text-label">Cadre Controlling Authority</label>
               <p>{{user?.profileDetails?.cadreDetails?.cadreControllingAuthorityName ?
                 user?.profileDetails?.cadreDetails?.cadreControllingAuthorityName: '-'}}</p>

From 7f54a237847a7e56a2dd9f9f479f5b7677258118 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Wed, 4 Sep 2024 16:37:50 +0530
Subject: [PATCH 872/887] approval pagination fix

---
 .../approval-pending/approval-pending.component.html      | 8 ++++----
 .../approval-pending/approval-pending.component.ts        | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
index 5b29c485e..919a68077 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
@@ -54,7 +54,7 @@
         </div>
         <ng-container *ngIf="profileVerificationCount > 0">
           <ws-widget-user-card [currentFilter]="currentFilter" [usersData]="profileVerificationData"
-            [isApprovals]="true" [totalRecords]="profileVerificationCount" [tabChangeIndex]="pageIndex"
+            [isApprovals]="true" [totalRecords]="totalprofileVerificationRecords" [tabChangeIndex]="pageIndex"
             (searchByEnterKey)="onEnterkySearch($event)" (disableButton)="showButton()"
             (paginationData)="onPaginateChange($event)" (updateList)="fetchApprovals()"></ws-widget-user-card>
         </ng-container>
@@ -69,9 +69,9 @@
         </div>
         <ng-container *ngIf="transfersData && transfersData.length > 0">
           <ws-widget-user-card [currentFilter]="currentFilter" [usersData]="transfersData" [isApprovals]="true"
-            [totalRecords]="transfersCount" [tabChangeIndex]="pageIndex" (searchByEnterKey)="onEnterkySearch($event)"
-            (disableButton)="showButton()" (paginationData)="onPaginateChange($event)"
-            (updateList)="fetchApprovals()"></ws-widget-user-card>
+            [totalRecords]="totaltransfersRecords" [tabChangeIndex]="pageIndex"
+            (searchByEnterKey)="onEnterkySearch($event)" (disableButton)="showButton()"
+            (paginationData)="onPaginateChange($event)" (updateList)="fetchApprovals()"></ws-widget-user-card>
         </ng-container>
         <ng-container *ngIf="!transfersData || transfersData.length === 0">
           <p class="margin-top-xl margin-bottom-xl">No approvals</p>
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
index b63c731d6..1f29b7c18 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
@@ -40,6 +40,8 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   transfersCount = 0
   profileVerificationCount = 0
   getSortOrderValue: any
+  totaltransfersRecords = 0
+  totalprofileVerificationRecords = 0
 
   constructor(
     private router: Router,
@@ -161,6 +163,8 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
 
       this.apprService.getApprovals(req).subscribe(res => {
         // this.data = []
+        this.totalprofileVerificationRecords = res.result.count
+        this.totaltransfersRecords = res.result.count
         const newarray: any = []
         let currentdate: Date
         const resData = res.result.data

From c75d4e28d715892a42d0b4cf2f6b7eee6c655b01 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Wed, 4 Sep 2024 17:50:57 +0530
Subject: [PATCH 873/887] condition checked

---
 .../approval-pending.component.ts             | 128 +++++++++---------
 1 file changed, 64 insertions(+), 64 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
index 1f29b7c18..2633681a5 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
@@ -163,76 +163,76 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
 
       this.apprService.getApprovals(req).subscribe(res => {
         // this.data = []
-        this.totalprofileVerificationRecords = res.result.count
-        this.totaltransfersRecords = res.result.count
-        const newarray: any = []
-        let currentdate: Date
-        const resData = res.result.data
-        resData.forEach((approval: any) => {
-          // let keys = ''
-          approval.wfInfo.forEach((wf: any) => {
-            currentdate = new Date(wf.createdOn)
-            if (typeof wf.updateFieldValues === 'string') {
-              const fields = JSON.parse(wf.updateFieldValues)
-              if (fields.length > 0) {
-                fields.forEach((field: any) => {
-                  // if (Object.keys(field.fromValue).length > 0) {
-                  //   keys += `${_.first(Object.keys(field.fromValue))}, `
-                  // } else {
-                  //   keys += `${_.first(Object.keys(field.toValue))}, `
-                  // }
-                  const labelKey = Object.keys(field.toValue)[0]
-                  if (labelKey === 'designation' || labelKey === 'group') {
-                    if (newarray.find((u: any) => u.userInfo.wid === approval.userInfo.wid) === undefined) {
-                      newarray.push(approval)
+        if (res && res.result) {
+          this.totalprofileVerificationRecords = res.result.count
+          this.totaltransfersRecords = res.result.count
+          const newarray: any = []
+          let currentdate: Date
+          const resData = res.result.data
+          resData.forEach((approval: any) => {
+            // let keys = ''
+            approval.wfInfo.forEach((wf: any) => {
+              currentdate = new Date(wf.createdOn)
+              if (typeof wf.updateFieldValues === 'string') {
+                const fields = JSON.parse(wf.updateFieldValues)
+                if (fields.length > 0) {
+                  fields.forEach((field: any) => {
+                    // if (Object.keys(field.fromValue).length > 0) {
+                    //   keys += `${_.first(Object.keys(field.fromValue))}, `
+                    // } else {
+                    //   keys += `${_.first(Object.keys(field.toValue))}, `
+                    // }
+                    const labelKey = Object.keys(field.toValue)[0]
+                    if (labelKey === 'designation' || labelKey === 'group') {
+                      if (newarray.find((u: any) => u.userInfo.wid === approval.userInfo.wid) === undefined) {
+                        newarray.push(approval)
+                      }
                     }
-                  }
-                })
+                  })
+                }
               }
-            }
+            })
           })
-        })
-
-        newarray.forEach((appr: any) => {
-          const requestData = {
-            fullname: appr.userInfo ? `${appr.userInfo.first_name}` : '--',
-            requestedon: currentdate,
-            // fields: this.replaceWords(keys, conditions),
-            userWorkflow: appr,
-            tag: (appr.userInfo && appr.userInfo.tag) ? `${appr.userInfo.tag}` : '',
-          }
-          /* tslint:disable */
-          if (appr!.wfInfo[0] && appr!.wfInfo[0].orgTansferRequest) {
-            this.transfersData.push(requestData)
-          } else {
-            this.profileVerificationData.push(requestData)
-          }
-        })
-        /* tslint:enable */
-        this.transfersData.sort((a: any, b: any) => {
-          const textA = a.fullname.toUpperCase()
-          const textB = b.fullname.toUpperCase()
-          return (textA < textB) ? -1 : (textA > textB) ? 1 : 0
-        })
-        this.profileVerificationData.sort((a: any, b: any) => {
-          const textA = a.fullname.toUpperCase()
-          const textB = b.fullname.toUpperCase()
-          return (textA < textB) ? -1 : (textA > textB) ? 1 : 0
-        })
-        this.transfersCount = this.transfersData.length
-        this.profileVerificationCount = this.profileVerificationData.length
 
-        this.allTransfersData = this.transfersData
-        this.allprofileVerificationData = this.profileVerificationData
-
-        if (this.profileVerificationData && this.profileVerificationData.length > 0) {
-          this.showApproveALL = true
-          this.disableApproveALL = false
-          // this.transfersCount = this.transfersData.length
+          newarray.forEach((appr: any) => {
+            const requestData = {
+              fullname: appr.userInfo ? `${appr.userInfo.first_name}` : '--',
+              requestedon: currentdate,
+              // fields: this.replaceWords(keys, conditions),
+              userWorkflow: appr,
+              tag: (appr.userInfo && appr.userInfo.tag) ? `${appr.userInfo.tag}` : '',
+            }
+            /* tslint:disable */
+            if (appr!.wfInfo[0] && appr!.wfInfo[0].orgTansferRequest) {
+              this.transfersData.push(requestData)
+            } else {
+              this.profileVerificationData.push(requestData)
+            }
+          })
+          /* tslint:enable */
+          this.transfersData.sort((a: any, b: any) => {
+            const textA = a.fullname.toUpperCase()
+            const textB = b.fullname.toUpperCase()
+            return (textA < textB) ? -1 : (textA > textB) ? 1 : 0
+          })
+          this.profileVerificationData.sort((a: any, b: any) => {
+            const textA = a.fullname.toUpperCase()
+            const textB = b.fullname.toUpperCase()
+            return (textA < textB) ? -1 : (textA > textB) ? 1 : 0
+          })
+          this.transfersCount = this.transfersData.length
           this.profileVerificationCount = this.profileVerificationData.length
-
-          // this.allTransfersData = this.transfersData
+          this.allTransfersData = this.transfersData
           this.allprofileVerificationData = this.profileVerificationData
+
+          if (this.profileVerificationData && this.profileVerificationData.length > 0) {
+            this.showApproveALL = true
+            this.disableApproveALL = false
+            // this.transfersCount = this.transfersData.length
+            this.profileVerificationCount = this.profileVerificationData.length
+            // this.allTransfersData = this.transfersData
+            this.allprofileVerificationData = this.profileVerificationData
+          }
         }
       })
     } else {

From 86552707873b9d5745ecd77a79f6967211862142 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Wed, 4 Sep 2024 18:26:29 +0530
Subject: [PATCH 874/887] resolved PR comments

---
 .../approval-pending.component.ts             | 46 ++++++++++---------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
index 2633681a5..29ddae8f2 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
@@ -171,39 +171,43 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
           const resData = res.result.data
           resData.forEach((approval: any) => {
             // let keys = ''
-            approval.wfInfo.forEach((wf: any) => {
-              currentdate = new Date(wf.createdOn)
-              if (typeof wf.updateFieldValues === 'string') {
-                const fields = JSON.parse(wf.updateFieldValues)
-                if (fields.length > 0) {
-                  fields.forEach((field: any) => {
-                    // if (Object.keys(field.fromValue).length > 0) {
-                    //   keys += `${_.first(Object.keys(field.fromValue))}, `
-                    // } else {
-                    //   keys += `${_.first(Object.keys(field.toValue))}, `
-                    // }
-                    const labelKey = Object.keys(field.toValue)[0]
-                    if (labelKey === 'designation' || labelKey === 'group') {
-                      if (newarray.find((u: any) => u.userInfo.wid === approval.userInfo.wid) === undefined) {
-                        newarray.push(approval)
-                      }
+            if (approval && approval.wfInfo && approval.wfInfo.length) {
+              approval.wfInfo.forEach((wf: any) => {
+                currentdate = new Date(wf.createdOn)
+                if (wf && wf.updateFieldValues) {
+                  if (typeof wf.updateFieldValues === 'string') {
+                    const fields = JSON.parse(wf.updateFieldValues)
+                    if (fields && fields.length > 0) {
+                      fields.forEach((field: any) => {
+                        // if (Object.keys(field.fromValue).length > 0) {
+                        //   keys += `${_.first(Object.keys(field.fromValue))}, `
+                        // } else {
+                        //   keys += `${_.first(Object.keys(field.toValue))}, `
+                        // }
+                        const labelKey = field && field.toValue && Object.keys(field.toValue).length ? Object.keys(field.toValue)[0] : ''
+                        if (labelKey === 'designation' || labelKey === 'group') {
+                          if (newarray.find((u: any) => u.userInfo.wid === approval.userInfo.wid) === undefined) {
+                            newarray.push(approval)
+                          }
+                        }
+                      })
                     }
-                  })
+                  }
                 }
-              }
-            })
+              })
+            }
           })
 
           newarray.forEach((appr: any) => {
             const requestData = {
-              fullname: appr.userInfo ? `${appr.userInfo.first_name}` : '--',
+              fullname: (appr.userInfo && appr.userInfo.first_name) ? `${appr.userInfo.first_name}` : '--',
               requestedon: currentdate,
               // fields: this.replaceWords(keys, conditions),
               userWorkflow: appr,
               tag: (appr.userInfo && appr.userInfo.tag) ? `${appr.userInfo.tag}` : '',
             }
             /* tslint:disable */
-            if (appr!.wfInfo[0] && appr!.wfInfo[0].orgTansferRequest) {
+            if (appr!.wfInfo && appr!.wfInfo.length && appr!.wfInfo[0].orgTansferRequest) {
               this.transfersData.push(requestData)
             } else {
               this.profileVerificationData.push(requestData)

From 1af5b89f7b7cc9b4ef644077dc8e0fc3b7d466c6 Mon Sep 17 00:00:00 2001
From: vishnubansaltarento <vishnu.bansal@tarento.com>
Date: Thu, 5 Sep 2024 13:57:42 +0530
Subject: [PATCH 875/887] update for issue 6663

---
 .../components/user-cards/user-card.component.html     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index e3b576db5..85a84d803 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -325,11 +325,11 @@
             <!-- Cader Related Code-->
 
             <div class="flex flex-row margin-top-m">
-              <div class="md:w-1/3" *ngIf="user?.profileDetails?.hasOwnProperty('cadreDetails')">
+              <div class="md:w-1/3">
                 <label class="margin-remove-bottom form-label">Are you a Cadre Employee?</label>
                 <mat-form-field appearance="outline">
                   <input type="text" matInput [disabled]="true"
-                    [value]="user?.profileDetails?.cadreDetails?.civilServiceType ? 'Yes': 'No'">
+                    [value]="user?.profileDetails?.hasOwnProperty('cadreDetails') ? (user?.profileDetails?.cadreDetails?.civilServiceType ? 'Yes': 'No') : ''">
                 </mat-form-field>
               </div>
 
@@ -601,9 +601,11 @@
           </div>
           <!-- Cader Related Code-->
           <div class="flex flex-row margin-top-m">
-            <div class="md:w-1/4" *ngIf="user?.profileDetails?.hasOwnProperty('cadreDetails')">
+            <div class="md:w-1/4">
               <label class="view-text-label">Are you a Cadre Employee?</label>
-              <p>{{user?.profileDetails?.cadreDetails?.civilServiceType ? 'Yes': 'No'}}</p>
+              <p *ngIf="user?.profileDetails?.hasOwnProperty('cadreDetails')">
+                {{user?.profileDetails?.cadreDetails?.civilServiceType ? 'Yes': 'No'}}</p>
+              <p *ngIf="!(user?.profileDetails?.hasOwnProperty('cadreDetails'))">-</p>
             </div>
 
             <div class="md:w-1/4" *ngIf="user?.profileDetails?.cadreDetails?.civilServiceType">

From ae79e6d78a235591a767b7bda2ca2f45e894773c Mon Sep 17 00:00:00 2001
From: sujithsojan <sujithsojan@gmail.com>
Date: Thu, 5 Sep 2024 19:20:38 +0530
Subject: [PATCH 876/887] Enabled filter for  users

---
 .../routes/home/components/search/search.component.html   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.html b/project/ws/app/src/lib/routes/home/components/search/search.component.html
index 309727751..bf7ff3795 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.html
@@ -7,7 +7,7 @@
                 placeholder="Search" type="Standard" [ngClass]="{'disable': isContentLive}">
         </div>
     </div>
-    <!-- <div class="filter-section flex" *ngIf="!isApprovals">
+    <div class="filter-section flex" *ngIf="!isApprovals">
         <button mat-button type="button" (click)="sort()" class="apply-filter margin-right-s"
             [matMenuTriggerFor]="cardMenu">
             <mat-icon class="margin-right-xs">sort</mat-icon> Sort
@@ -25,12 +25,12 @@
                 </div>
             </ng-template>
         </mat-menu>
-    </div> -->
-    <!-- <div class="filter-section flex" *ngIf="!isApprovals">
+    </div>
+    <div class="filter-section flex" *ngIf="!isApprovals">
         <button mat-button type="button" (click)="openFilter()" class="apply-filter margin-right-s">
             Apply Filter <mat-icon class="margin-right-xs">filter_list</mat-icon>
         </button>
-    </div> -->
+    </div>
     <div class="flex flex-end" *ngIf="!isApprovals && currentFilter === 'allusers'">
         <button mat-button type="button" class="search-btn" [routerLink]="['/app/home/user-creation']"
             [ngClass]="{'disable': isContentLive}">Create user</button>

From 3c3a8209716bd549358aa782897134fda1825118 Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Fri, 13 Sep 2024 10:56:29 +0530
Subject: [PATCH 877/887] Task #0000: Build fix for invalid HTML

---
 .../src/lib/routes/home/components/search/search.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.html b/project/ws/app/src/lib/routes/home/components/search/search.component.html
index 0462498f0..0fe57eb99 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.html
@@ -7,7 +7,7 @@
                 placeholder="Search by name or email" type="Standard" [ngClass]="{'disable': isContentLive}">
         </div>
     </div>
-    <!-- <div class="filter-section flex" *ngIf="!isApprovals && !forMentor">
+    <div class="filter-section flex" *ngIf="!isApprovals && !forMentor">
         <button mat-button type="button" (click)="sort()" class="apply-filter margin-right-s"
             [matMenuTriggerFor]="cardMenu">
             <mat-icon class="margin-right-xs">sort</mat-icon> Sort

From 3109524db6c5f15ae54febc9c15620d713b6f369 Mon Sep 17 00:00:00 2001
From: Christyfernandes <christyabcd.05@gmail.com>
Date: Fri, 13 Sep 2024 12:28:15 +0530
Subject: [PATCH 878/887] Task #0000: ODCS search and column scroll changes

---
 package.json                                  |  2 +-
 .../home/routes/home/home.component.html      |  5 +-
 .../home/routes/home/home.component.scss      | 12 ++++
 .../routes/home/routes/home/home.component.ts |  9 +++
 .../odcs-mapping/odcs-mapping.component.html  | 56 ++++++++++---------
 src/styles/styles.scss                        | 10 ++++
 6 files changed, 64 insertions(+), 30 deletions(-)

diff --git a/package.json b/package.json
index 8554deaae..dd3ec29c3 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "@sunbird-cb/micro-surveys": "2.0.13",
     "@sunbird-cb/rain-dashboards": "0.4.33",
     "@sunbird-cb/resolver": "^1.0.0",
-    "@sunbird-cb/taxonomy-editor": "0.0.35",
+    "@sunbird-cb/taxonomy-editor": "0.0.36",
     "@sunbird-cb/utils": "^1.0.18",
     "@types/file-saver": "^2.0.1",
     "brace": "^0.11.1",
diff --git a/project/ws/app/src/lib/routes/home/routes/home/home.component.html b/project/ws/app/src/lib/routes/home/routes/home/home.component.html
index ccf8ade57..635d66680 100644
--- a/project/ws/app/src/lib/routes/home/routes/home/home.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/home/home.component.html
@@ -5,7 +5,8 @@
   <ng-container [wsResolverWidget]="banner"></ng-container>
 </div> -->
 
-<mat-sidenav-container autosize name="discuss-menu" class="nav-container" name="exp">
+<mat-sidenav-container autosize name="discuss-menu" class="nav-container" name="exp"
+  [ngClass]="{'custom-odcs':containerCustomCls}">
   <mat-sidenav [mode]="mode$ | async" [(opened)]="sideNavBarOpened" class="left-nav border-0">
     <div class="container2" *ngIf="widgetData">
       <!-- <ng-container [wsResolverWidget]="widgetData"></ng-container> -->
@@ -19,7 +20,7 @@
         <mat-icon>menu</mat-icon>
       </button>
     </div>
-    <div class="container-balanced">
+    <div class="container-balanced" [ngClass]="{'custom-odcs':containerCustomCls}">
       <router-outlet></router-outlet>
     </div>
   </mat-sidenav-content>
diff --git a/project/ws/app/src/lib/routes/home/routes/home/home.component.scss b/project/ws/app/src/lib/routes/home/routes/home/home.component.scss
index cfdad9d57..daf37105e 100644
--- a/project/ws/app/src/lib/routes/home/routes/home/home.component.scss
+++ b/project/ws/app/src/lib/routes/home/routes/home/home.component.scss
@@ -97,4 +97,16 @@
   // height: calc(100vh - 115px);
   // padding-bottom: 50px;
 
+}
+
+.custom-odcs {
+  &.container-balanced {
+    padding-top: 0;
+  }
+  &.mat-sidenav-container {
+    z-index: unset;
+    .mat-sidenav-content{
+      z-index: 22;
+    }
+  }
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/home/home.component.ts b/project/ws/app/src/lib/routes/home/routes/home/home.component.ts
index 07e305b68..4d8614f1c 100644
--- a/project/ws/app/src/lib/routes/home/routes/home/home.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/home/home.component.ts
@@ -42,6 +42,7 @@ export class HomeComponent implements OnInit, AfterViewInit, OnDestroy {
   department: any = {}
   departmentName = ''
   subscription: Subscription
+  containerCustomCls: boolean = false
 
   @HostListener('window:scroll', ['$event'])
   handleScroll() {
@@ -74,6 +75,14 @@ export class HomeComponent implements OnInit, AfterViewInit, OnDestroy {
 
     this.router.events.subscribe((event: Event) => {
       if (event instanceof NavigationEnd) {
+        let urlData = _.get(this.activeRoute, 'snapshot._routerState.url')
+        this.containerCustomCls = urlData && urlData.includes('odcs-mapping') ? true : false
+
+        if (this.containerCustomCls) {
+          document.getElementsByTagName('body')[0].classList.add('custom-height-odcs')
+        } else {
+          document.getElementsByTagName('body')[0].classList.remove('custom-height-odcs')
+        }
         this.bindUrl(event.urlAfterRedirects.replace('/app/home/', ''))
         // this.widgetData = this.activeRoute.snapshot.data &&
         //   this.activeRoute.snapshot.data.pageData.data.menus || []
diff --git a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.html b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.html
index f9f04cd5a..57bfc7f84 100644
--- a/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/odcs-mapping/odcs-mapping.component.html
@@ -5,38 +5,40 @@
   </div>
 </ng-container>
 <ng-container *ngIf="!showLoader">
-  <div class="flex flex-col gap-4">
-    <h1 class="mat-heading-1">{{odcConfig?.mainHeading}}</h1>
-    <mat-card class="mb-4" [ngStyle]="{'background-color': showTopSection ? '#fff' : 'rgba(235, 235, 235, 1)'}">
-      <div class="flex">
-        <span class="mat-body-1 font-bold-imp flex-1">{{odcConfig?.topsection?.heading}}</span>
-        <mat-icon class="cursor-pointer mat-icon mr-4" *ngIf="showTopSection"
-          (click)="showTopSection = !showTopSection; callResizeEvent($event)">keyboard_arrow_up</mat-icon>
-        <mat-icon class="cursor-pointer mat-icon mr-4" *ngIf="!showTopSection"
-          (click)="showTopSection = !showTopSection; callResizeEvent($event)">keyboard_arrow_down</mat-icon>
-      </div>
-      <div class="mt-5" *ngIf="showTopSection">
-        <div class="flex gap-20">
-          <div class="flex-1 flex-col gap-4">
-            <p class="flex items-center" *ngFor="let step of odcConfig?.topsection?.steps">
-              <mat-icon class="mat-icon mr-4">error_outline</mat-icon>
-              <span [innerHTML]="step.title"></span>
-            </p>
-          </div>
-          <div class="">
-            <div class="videoDemo flex justify-end section-2">
-              <div class="videoDemoVideo flex flex-column flex-middle justify-center" (click)="openVideoPopup()">
-                <mat-icon class="video_icon mb-2">play_arrow</mat-icon>
-                <div>
-                  Watch how it works
+  <div class="flex flex-col">
+    <div class=" odcs-title py-6 bg-white">
+      <h1 class="mat-heading-1">{{odcConfig?.mainHeading}}</h1>
+      <mat-card class="mb-4" [ngStyle]="{'background-color': showTopSection ? '#fff' : 'rgba(235, 235, 235, 1)'}">
+        <div class="flex">
+          <span class="mat-body-1 font-bold-imp flex-1">{{odcConfig?.topsection?.heading}}</span>
+          <mat-icon class="cursor-pointer mat-icon mr-4" *ngIf="showTopSection"
+            (click)="showTopSection = !showTopSection; callResizeEvent($event)">keyboard_arrow_up</mat-icon>
+          <mat-icon class="cursor-pointer mat-icon mr-4" *ngIf="!showTopSection"
+            (click)="showTopSection = !showTopSection; callResizeEvent($event)">keyboard_arrow_down</mat-icon>
+        </div>
+        <div class="mt-5" *ngIf="showTopSection">
+          <div class="flex gap-20">
+            <div class="flex-1 flex-col gap-4">
+              <p class="flex items-center" *ngFor="let step of odcConfig?.topsection?.steps">
+                <mat-icon class="mat-icon mr-4">error_outline</mat-icon>
+                <span [innerHTML]="step.title"></span>
+              </p>
+            </div>
+            <div class="">
+              <div class="videoDemo flex justify-end section-2">
+                <div class="videoDemoVideo flex flex-column flex-middle justify-center" (click)="openVideoPopup()">
+                  <mat-icon class="video_icon mb-2">play_arrow</mat-icon>
+                  <div>
+                    Watch how it works
+                  </div>
                 </div>
               </div>
             </div>
           </div>
         </div>
-      </div>
-    </mat-card>
-    <div *ngIf="environmentVal && environmentVal.frameworkName">
+      </mat-card>
+    </div>
+    <div *ngIf="environmentVal && environmentVal.frameworkName" style="height: calc(100vh - 10vh);">
       <lib-taxonomy-view [environment]="environmentVal" [taxonomyConfig]="taxonomyConfig"></lib-taxonomy-view>
     </div>
   </div>
diff --git a/src/styles/styles.scss b/src/styles/styles.scss
index 2ce3393e3..6c6dbc4cd 100644
--- a/src/styles/styles.scss
+++ b/src/styles/styles.scss
@@ -666,3 +666,13 @@ h3.shepherd-title {
 .leader-line {
     z-index: 20;
 }
+
+.custom-height-odcs {
+    overflow: hidden;
+    contain: content;
+
+    .app-footer {
+    z-index: 25;
+    position: relative;
+  }
+}
\ No newline at end of file

From 36b81b1fa45a3d28184fb96cf0395f22192eb87c Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Tue, 17 Sep 2024 11:13:23 +0530
Subject: [PATCH 879/887] KAR-781 fixes

---
 .../components/search/search.component.html   |  27 +-
 .../user-cards/user-card.component.html       |   8 +-
 .../user-cards/user-card.component.ts         |  50 ++-
 .../lib/routes/home/home.rounting.module.ts   |   3 +-
 .../approval-pending.component.html           |  18 +-
 .../approval-pending.component.ts             | 309 ++++++++++++------
 .../bulk-upload/bulk-upload.component.html    |   2 +-
 .../routes/home/services/approvals.service.ts |   5 +
 8 files changed, 275 insertions(+), 147 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.html b/project/ws/app/src/lib/routes/home/components/search/search.component.html
index 0f06566e6..3aac3c2fc 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.html
@@ -1,4 +1,4 @@
-<div class="flex flex-1 flex-row margin-top-m margin-bottom-m">
+<div class="flex flex-1 flex-row margin-top-m margin-bottom-m justify-between">
     <div class="search flex margin-right-m" [ngClass]="{'disable': isContentLive}">
         <div class="rsearch flex w-full">
             <mat-icon
@@ -31,17 +31,20 @@
             Apply Filter <mat-icon class="margin-right-xs">filter_list</mat-icon>
         </button>
     </div> -->
-    <div class="flex flex-end" *ngIf="!isApprovals && currentFilter === 'allusers'">
-        <button mat-button type="button" class="search-btn" [routerLink]="['/app/home/user-creation']"
-            [ngClass]="{'disable': isContentLive}">Create user</button>
-    </div>
-    <div class="flex flex-end margin-right-s" *ngIf="isApprovals && showApproveALL">
-        <button mat-button type="button" class="search-btn" (click)="confirmApproval(approvalconfirm)"
-            [disabled]="disableApproveALL">Approve all requests</button>
-    </div>
-    <div class="flex flex-end" *ngIf="isApprovals && showBulkUpdate">
-        <button mat-button type="button" class="search-btn" [routerLink]="['/app/home/approvals/bulkupdate']"
-            [ngClass]="{'disable': isContentLive}">Bulk profile update</button>
+    <div class="flex flex-row">
+        <div class="flex flex-end" *ngIf="!isApprovals && currentFilter === 'allusers'">
+            <button mat-button type="button" class="search-btn" [routerLink]="['/app/home/user-creation']"
+                [ngClass]="{'disable': isContentLive}">Create user</button>
+        </div>
+        <div class="flex flex-end margin-right-s" *ngIf="isApprovals && showApproveALL">
+            <button mat-button type="button" class="search-btn" (click)="confirmApproval(approvalconfirm)"
+                [disabled]="disableApproveALL">Approve all requests</button>
+        </div>
+        <div class="flex flex-end" *ngIf="isApprovals && showBulkUpdate">
+            <button mat-button type="button" class="search-btn" [routerLink]="['/app/home/approvals/bulkupdate']"
+                [ngClass]="{'disable': isContentLive}">Bulk profile update</button>
+        </div>
+
     </div>
 </div>
 
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index dddbd00e6..bb38e0609 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -889,8 +889,10 @@
                     </li>
                   </ul>
                 </div>
-                <p *ngIf="appData?.user?.organisations && appData?.user?.organisations[0].roles &&
-                    appData?.user?.organisations[0].roles.length && appData?.user?.organisations[0].roles.length === 0">-</p>
+                <p
+                  *ngIf="appData?.user?.organisations && appData?.user?.organisations[0].roles &&
+                    appData?.user?.organisations[0].roles.length && appData?.user?.organisations[0].roles.length === 0">
+                  -</p>
               </div>
             </div>
           </div>
@@ -926,7 +928,7 @@
 
 <div class="flex flex-row justify-center" *ngIf="totalRecords">
   <mat-paginator [pageSize]="pageSize" [length]="totalRecords" [pageSizeOptions]="[20,30,40]"
-    (page)="onChangePage($event)"></mat-paginator>
+    (page)="onChangePage($event)" showFirstLastButtons="true"></mat-paginator>
 </div>
 
 <ng-template #rejectDialog>
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 6d40c4719..64fea4ce8 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -1,5 +1,6 @@
 import {
   AfterViewChecked,
+  AfterViewInit,
   ChangeDetectorRef,
   Component, ElementRef, EventEmitter, Input, OnChanges, OnInit, Output,
   QueryList, TemplateRef, ViewChild, ViewChildren,
@@ -39,7 +40,7 @@ const EMAIL_PATTERN = /^[a-zA-Z0-9]+[a-zA-Z0-9._-]*[a-zA-Z0-9]+@[a-zA-Z0-9]+(\.[
     { provide: MAT_DATE_FORMATS, useValue: APP_DATE_FORMATS },
   ],
 })
-export class UserCardComponent implements OnInit, OnChanges, AfterViewChecked {
+export class UserCardComponent implements OnInit, OnChanges, AfterViewChecked, AfterViewInit {
   @Input() userId: any
   @Input() tableData: any
   @Input() usersData: any
@@ -61,7 +62,7 @@ export class UserCardComponent implements OnInit, OnChanges, AfterViewChecked {
   @ViewChild('updaterejectDialog', { static: false })
   updaterejectDialog!: TemplateRef<any>
 
-  @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator | any
+  @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | any
 
   @ViewChild('toggleElement', { static: true }) ref!: ElementRef
 
@@ -69,7 +70,9 @@ export class UserCardComponent implements OnInit, OnChanges, AfterViewChecked {
   lastIndex = 20
   pageSize = 20
 
-  // userStatus: any
+  cacheProfilePageIndex = 0
+  cacheTransferPageIndex = 0
+
   rolesList: any = []
   rolesObject: any = []
   uniqueRoles: any = []
@@ -127,11 +130,11 @@ export class UserCardComponent implements OnInit, OnChanges, AfterViewChecked {
   currentUserRole = ''
   checked = false
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-              private dialog: MatDialog, private approvalSvc: ApprovalsService,
-              private route: ActivatedRoute, private snackBar: MatSnackBar,
-              private events: EventService,
-              private datePipe: DatePipe,
-              private cdr: ChangeDetectorRef) {
+    private dialog: MatDialog, private approvalSvc: ApprovalsService,
+    private route: ActivatedRoute, private snackBar: MatSnackBar,
+    private events: EventService,
+    private datePipe: DatePipe,
+    private cdr: ChangeDetectorRef) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),
@@ -192,6 +195,11 @@ export class UserCardComponent implements OnInit, OnChanges, AfterViewChecked {
   }
 
   ngOnInit() {
+    const cacheValProfile = localStorage.getItem('profileverificationOffset')
+    const cacheValTransfer = localStorage.getItem('transferOffset')
+    this.cacheProfilePageIndex = cacheValProfile !== null ? parseInt(cacheValProfile, 10) : 0
+    this.cacheTransferPageIndex = cacheValTransfer !== null ? parseInt(cacheValTransfer, 10) : 0
+
     if (this.isApprovals && this.usersData) {
       this.getApprovalData()
     } else {
@@ -199,7 +207,20 @@ export class UserCardComponent implements OnInit, OnChanges, AfterViewChecked {
     }
   }
 
+  ngAfterViewInit() {
+    if (this.paginator) {
+      if (this.currentFilter === 'profileverification') {
+        this.paginator.pageIndex = this.cacheProfilePageIndex
+      } else if (this.currentFilter === 'transfers') {
+        this.paginator.pageIndex = this.cacheTransferPageIndex
+      }
+      this.paginator.pageSize = this.pageSize
+      this.cdr.detectChanges()
+    }
+  }
+
   ngOnChanges() {
+
     if (this.usersData) {
       this.usersData = _.orderBy(this.usersData, item => {
         if (item.profileDetails && item.profileDetails.personalDetails) {
@@ -637,11 +658,16 @@ export class UserCardComponent implements OnInit, OnChanges, AfterViewChecked {
   }
 
   onChangePage(pe: PageEvent) {
-    this.startIndex = (pe.pageIndex) * pe.pageSize
-    this.lastIndex = pe.pageSize
-    this.paginationData.emit({ pageIndex: this.startIndex, pageSize: pe.pageSize })
+    if (this.isApprovals) {
+      this.startIndex = pe.pageIndex
+      this.lastIndex = pe.pageSize
+      this.paginationData.emit({ pageIndex: this.startIndex, pageSize: pe.pageSize })
+    } else {
+      this.startIndex = (pe.pageIndex) * pe.pageSize
+      this.lastIndex = pe.pageSize
+      this.paginationData.emit({ pageIndex: this.startIndex, pageSize: pe.pageSize })
+    }
   }
-
   onSearch(event: any) {
     this.searchByEnterKey.emit(event)
   }
diff --git a/project/ws/app/src/lib/routes/home/home.rounting.module.ts b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
index 7e6a2608f..fdc44db93 100644
--- a/project/ws/app/src/lib/routes/home/home.rounting.module.ts
+++ b/project/ws/app/src/lib/routes/home/home.rounting.module.ts
@@ -242,7 +242,8 @@ const routes: Routes = [
           //   redirectTo: 'profileverification',
           // },
           {
-            path: 'profileverification',
+            // path: 'profileverification',
+            path: 'approval',
             component: ApprovalPendingComponent,
             data: {
               pageId: 'approvals-profileverification',
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
index 919a68077..4baa67f87 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
@@ -30,15 +30,15 @@
     <mat-card-content>
       <div class="flex flex-1 flex-row margin-fix">
         <div class="flex flex-3 filter max-height-60">
-          <a routerLink="/app/home/approvals/profileverification" class="filter-option"
+          <a class="filter-option"
             [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'profileverification', 'ws-mat-accent-border font-medium': currentFilter !== 'profileverification'}"
             mat-button (click)="filter('profileverification'); tabTelemetry('toapprove', 0)" role="button">Profile
-            Verifications ({{profileVerificationCount}})</a>
+            Verifications ({{totalprofileVerificationRecords}})</a>
 
-          <a routerLink="/app/home/approvals/transfers" class="filter-option"
+          <a class="filter-option"
             [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'transfers', 'ws-mat-accent-border font-medium': currentFilter !== 'transfers'}"
             mat-button (click)="filter('transfers'); tabTelemetry('transfers', 1)" role="button">Transfers
-            ({{transfersCount}})</a>
+            ({{totaltransfersRecords}})</a>
         </div>
         <!-- <div class="flex flex-3 flex-end" *ngIf="currentFilter === 'profileverification'">
           <a (click)="getPendingResquests()"
@@ -52,13 +52,13 @@
             [showApproveALL]="showApproveALL" [showBulkUpdate]="true"
             [disableApproveALL]="disableApproveALL"></ws-app-searchuser>
         </div>
-        <ng-container *ngIf="profileVerificationCount > 0">
+        <ng-container *ngIf="totalprofileVerificationRecords > 0">
           <ws-widget-user-card [currentFilter]="currentFilter" [usersData]="profileVerificationData"
             [isApprovals]="true" [totalRecords]="totalprofileVerificationRecords" [tabChangeIndex]="pageIndex"
             (searchByEnterKey)="onEnterkySearch($event)" (disableButton)="showButton()"
             (paginationData)="onPaginateChange($event)" (updateList)="fetchApprovals()"></ws-widget-user-card>
         </ng-container>
-        <ng-container *ngIf="!profileVerificationData || profileVerificationData.length === 0">
+        <ng-container *ngIf="totalprofileVerificationRecords === 0">
           <p class="margin-top-xl margin-bottom-xl">No approvals</p>
         </ng-container>
       </ng-container>
@@ -67,14 +67,14 @@
           <ws-app-searchuser (handleApiData)="onSearch($event)" [isApprovals]="true" (handleapproveAll)="onApproveALL()"
             [showApproveALL]="false" [showBulkUpdate]="false"></ws-app-searchuser>
         </div>
-        <ng-container *ngIf="transfersData && transfersData.length > 0">
+        <ng-container *ngIf="totaltransfersRecords > 0">
           <ws-widget-user-card [currentFilter]="currentFilter" [usersData]="transfersData" [isApprovals]="true"
             [totalRecords]="totaltransfersRecords" [tabChangeIndex]="pageIndex"
             (searchByEnterKey)="onEnterkySearch($event)" (disableButton)="showButton()"
             (paginationData)="onPaginateChange($event)" (updateList)="fetchApprovals()"></ws-widget-user-card>
         </ng-container>
-        <ng-container *ngIf="!transfersData || transfersData.length === 0">
-          <p class="margin-top-xl margin-bottom-xl">No approvals</p>
+        <ng-container *ngIf="totaltransfersRecords === 0">
+          <p class="margin-top-xl margin-bottom-xl">No transfers</p>
         </ng-container>
       </ng-container>
     </mat-card-content>
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
index 29ddae8f2..89c6253f0 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
@@ -10,7 +10,7 @@ import _ from 'lodash'
 import { TelemetryEvents } from '../../../../../head/_services/telemetry.event.model'
 import { ReportsVideoComponent } from '../../reports-video/reports-video.component'
 import { ApprovalsService } from '../../../services/approvals.service'
-import { UsersService } from '../../../../users/services/users.service'
+import { LoaderService } from '../../../../../../../../../../src/app/services/loader.service'
 
 @Component({
   selector: 'ws-approval-pending',
@@ -19,29 +19,24 @@ import { UsersService } from '../../../../users/services/users.service'
 })
 
 export class ApprovalPendingComponent implements OnInit, OnDestroy {
-  // data: any = []
+  profileVerificationDataCache: any[] = []
   profileVerificationData: any = []
   transfersData: any = []
   approvalData: any = []
-  allTransfersData: any = []
-  allprofileVerificationData: any = []
   currentFilter = 'profileverification'
-  discussionList!: any
-  discussProfileData!: any
   departName = ''
-  // approvalTotalCount = 0
   limit = 20
-  pageIndex = 0
+  pageIndex: any = 0
   currentOffset = 0
   configSvc: any
   reportsNoteList: string[] = []
   showApproveALL = false
   disableApproveALL = false
-  transfersCount = 0
-  profileVerificationCount = 0
   getSortOrderValue: any
-  totaltransfersRecords = 0
-  totalprofileVerificationRecords = 0
+  totaltransfersRecords: any = 0
+  totalprofileVerificationRecords: any = 0
+  tabChange = 0
+  cacheOffset: any = 0
 
   constructor(
     private router: Router,
@@ -51,8 +46,8 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
     private events: EventService,
     public dialog: MatDialog,
     private sanitizer: DomSanitizer,
-    private usersService: UsersService,
-    private snackbar: MatSnackBar) {
+    private snackbar: MatSnackBar,
+    private loaderService: LoaderService) {
     this.configSvc = this.route.parent && this.route.parent.snapshot.data.configService
     if (this.activeRouter.parent && this.activeRouter.parent.snapshot.data.configService.unMappedUser.channel
     ) {
@@ -63,13 +58,14 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   ngOnInit() {
     this.currentFilter = this.route.snapshot.routeConfig && this.route.snapshot.routeConfig.path
       ? this.route.snapshot.routeConfig.path : 'profileverification'
-    // this.currentFilter = this.currentFilter === 'upload' ? 'uploadApprovals' : 'pending'
-    // if (this.currentFilter === 'profileverification') {
-    this.fetchApprovals('')
-    // }
-    // if (this.currentFilter !== 'profileverification') {
-    //   this.fetchApprovals()
-    // }
+
+    if (!this.tabChange) {
+      this.currentFilter = 'profileverification'
+      this.fetchApprovals('')
+      this.fetchTransfers(1)
+    }
+
+    this.retrieveCachedApprovals()
 
     this.reportsNoteList = [
       // tslint:disable-next-line: max-line-length
@@ -98,14 +94,33 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   }
 
   filter(key: string | 'timestamp' | 'best' | 'saved') {
+    this.tabChange = 1
     if (key) {
       this.currentFilter = key
-      // if (key === 'profileverification') {
+      this.pageIndex = 0
+      this.currentOffset = 0
+      this.limit = 20
+
+      if (this.currentFilter === 'profileverification') {
+        const storedValue = localStorage.getItem('profileverificationOffset')
+        this.pageIndex = storedValue !== null ? parseInt(storedValue, 10) : 0
+        this.retrieveCachedApprovals()
+
+      } else if (this.currentFilter === 'transfers') {
+        if (localStorage.getItem('transfersDataCache') !== null && localStorage.getItem('transfersCacheTimestamp') !== null) {
+          this.retrieveCachedTransfers()
+        } else {
+          this.fetchTransfers(this.limit)
+        }
+      }
+    }
+  }
+
+  filterData() {
+    if (this.currentFilter === 'profileverification') {
       this.fetchApprovals('')
-      // }
-      // if (key === 'transfers') {
-      //   this.fetchApprovals()
-      // }
+    } else if (this.currentFilter === 'transfers') {
+      this.fetchTransfers(this.limit)
     }
   }
 
@@ -139,8 +154,21 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
 
   }
 
+  private updateApproveAllStatus() {
+    if (this.profileVerificationData && this.profileVerificationData.length > 0) {
+      this.showApproveALL = true
+      this.disableApproveALL = false
+    }
+  }
+
   fetchApprovals(sortValue: any) {
-    // let sortedVal = {}
+    this.loaderService.changeLoad.next(true)
+    const cacheKey = `${this.currentFilter}DataCache`
+    const cacheTimestampKey = `${this.currentFilter}CacheTimestamp`
+    const cacheTotalRecordKey = `${this.currentFilter}TotalRecords`
+
+    const now = new Date().getTime()
+
     if (!sortValue) {
       // sortedVal = { firstName: 'asc' }
     }
@@ -148,57 +176,94 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
       const req = {
         serviceName: 'profile',
         applicationStatus: 'SEND_FOR_APPROVAL',
+        requestType: ['GROUP_CHANGE', 'DESIGNATION_CHANGE'],
         deptName: this.departName,
-        offset: this.currentOffset,
+        offset: this.pageIndex,
         limit: this.limit,
         // sort_by: sortValue ? sortValue : sortedVal,
-
       }
-      this.allTransfersData = []
-      this.transfersData = []
-      this.allprofileVerificationData = []
-      this.profileVerificationData = []
-      this.transfersCount = 0
-      this.profileVerificationCount = 0
-
-      this.apprService.getApprovals(req).subscribe(res => {
-        // this.data = []
+
+      localStorage.setItem('profileverificationOffset', req.offset)
+      this.apprService.getApprovalsList(req).subscribe(res => {
         if (res && res.result) {
+          this.loaderService.changeLoaderState(false)
+          this.profileVerificationData = []
+          let createdOnDate: Date
+
           this.totalprofileVerificationRecords = res.result.count
-          this.totaltransfersRecords = res.result.count
-          const newarray: any = []
-          let currentdate: Date
           const resData = res.result.data
-          resData.forEach((approval: any) => {
-            // let keys = ''
-            if (approval && approval.wfInfo && approval.wfInfo.length) {
-              approval.wfInfo.forEach((wf: any) => {
-                currentdate = new Date(wf.createdOn)
-                if (wf && wf.updateFieldValues) {
-                  if (typeof wf.updateFieldValues === 'string') {
-                    const fields = JSON.parse(wf.updateFieldValues)
-                    if (fields && fields.length > 0) {
-                      fields.forEach((field: any) => {
-                        // if (Object.keys(field.fromValue).length > 0) {
-                        //   keys += `${_.first(Object.keys(field.fromValue))}, `
-                        // } else {
-                        //   keys += `${_.first(Object.keys(field.toValue))}, `
-                        // }
-                        const labelKey = field && field.toValue && Object.keys(field.toValue).length ? Object.keys(field.toValue)[0] : ''
-                        if (labelKey === 'designation' || labelKey === 'group') {
-                          if (newarray.find((u: any) => u.userInfo.wid === approval.userInfo.wid) === undefined) {
-                            newarray.push(approval)
-                          }
-                        }
-                      })
-                    }
-                  }
+          resData.forEach((appr: any) => {
+            if (appr && appr.wfInfo && appr.wfInfo.length) {
+              appr.wfInfo.forEach((wf: any) => {
+                if (wf.createdOn) {
+                  createdOnDate = new Date(wf.createdOn)
                 }
               })
             }
+            const requestData = {
+              fullname: (appr.userInfo && appr.userInfo.first_name) ? `${appr.userInfo.first_name}` : '--',
+              requestedon: createdOnDate,
+              // fields: this.replaceWords(keys, conditions),
+              userWorkflow: appr,
+              tag: (appr.userInfo && appr.userInfo.tag) ? `${appr.userInfo.tag}` : '',
+            }
+            this.profileVerificationData.push(requestData)
           })
+          this.profileVerificationData.sort((a: any, b: any) => {
+            const textA = a.fullname.toUpperCase()
+            const textB = b.fullname.toUpperCase()
+            return (textA < textB) ? -1 : (textA > textB) ? 1 : 0
+          })
+
+          // Cache the data and timestamp in localStorage
+          localStorage.setItem(cacheKey, JSON.stringify(this.profileVerificationData))
+          localStorage.setItem(cacheTimestampKey, now.toString())
+          localStorage.setItem(cacheTotalRecordKey, JSON.stringify(this.totalprofileVerificationRecords))
+
+          if (this.profileVerificationData && this.profileVerificationData.length > 0) {
+            this.showApproveALL = true
+            this.disableApproveALL = false
+          }
+        }
+      })
+    } else {
+      this.snackbar.open('Please connect to your SPV admin, to update MDO name.')
+    }
+  }
+
+  fetchTransfers(limit1: number) {
+    this.loaderService.changeLoad.next(true)
+    const cacheKey = `${this.currentFilter}DataCache`
+    const cacheTimestampKey = `${this.currentFilter}CacheTimestamp`
+    const cacheTotalRecordKey = `transfersTotalRecords`
+    const now = new Date().getTime()
+
+    if (this.departName) {
+      const req = {
+        serviceName: 'profile',
+        applicationStatus: 'SEND_FOR_APPROVAL',
+        requestType: ['ORG_TRANSFER'],
+        deptName: this.departName,
+        offset: this.pageIndex,
+        limit: limit1 ? limit1 : this.limit,
+      }
 
-          newarray.forEach((appr: any) => {
+      localStorage.setItem('transferOffset', req.offset)
+      this.apprService.getApprovalsList(req).subscribe(res => {
+        if (res && res.result) {
+          this.loaderService.changeLoaderState(false)
+          this.totaltransfersRecords = res.result.count
+          this.transfersData = []
+          let currentdate: Date
+          const resData = res.result.data
+          resData.forEach((appr: any) => {
+            if (appr && appr.wfInfo && appr.wfInfo.length) {
+              appr.wfInfo.forEach((wf: any) => {
+                if (wf.createdOn) {
+                  currentdate = new Date(wf.createdOn)
+                }
+              })
+            }
             const requestData = {
               fullname: (appr.userInfo && appr.userInfo.first_name) ? `${appr.userInfo.first_name}` : '--',
               requestedon: currentdate,
@@ -209,34 +274,20 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
             /* tslint:disable */
             if (appr!.wfInfo && appr!.wfInfo.length && appr!.wfInfo[0].orgTansferRequest) {
               this.transfersData.push(requestData)
-            } else {
-              this.profileVerificationData.push(requestData)
             }
           })
-          /* tslint:enable */
           this.transfersData.sort((a: any, b: any) => {
             const textA = a.fullname.toUpperCase()
             const textB = b.fullname.toUpperCase()
             return (textA < textB) ? -1 : (textA > textB) ? 1 : 0
           })
-          this.profileVerificationData.sort((a: any, b: any) => {
-            const textA = a.fullname.toUpperCase()
-            const textB = b.fullname.toUpperCase()
-            return (textA < textB) ? -1 : (textA > textB) ? 1 : 0
-          })
-          this.transfersCount = this.transfersData.length
-          this.profileVerificationCount = this.profileVerificationData.length
-          this.allTransfersData = this.transfersData
-          this.allprofileVerificationData = this.profileVerificationData
 
-          if (this.profileVerificationData && this.profileVerificationData.length > 0) {
-            this.showApproveALL = true
-            this.disableApproveALL = false
-            // this.transfersCount = this.transfersData.length
-            this.profileVerificationCount = this.profileVerificationData.length
-            // this.allTransfersData = this.transfersData
-            this.allprofileVerificationData = this.profileVerificationData
+          // Cache the data and timestamp in localStorage
+          if (this.currentFilter === 'transfers' && this.tabChange === 1) {
+            localStorage.setItem(cacheKey, JSON.stringify(this.transfersData))
+            localStorage.setItem(cacheTimestampKey, now.toString())
           }
+          localStorage.setItem(cacheTotalRecordKey, JSON.stringify(this.totaltransfersRecords))
         }
       })
     } else {
@@ -244,16 +295,6 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
     }
   }
 
-  // get getTableData() {
-  //   if (this.data.length > 0) {
-  //     this.data.forEach((element: any) => {
-  //       // element.requestedon = this.datePipe.transform(element.requestedon, 'dd MMM y')
-  //       element.requestedon = element.requestedon
-  //     })
-  //   }
-  //   return this.data
-  // }
-
   getSortOrder(query: any) {
     let sortBy
     if (query && query.sortOrder) {
@@ -286,21 +327,32 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
     // this.data.filter((user: any) => enterValue.includes(user.userInfo.first_name))
     const filterValue = enterValue.searchText.toLowerCase() ? enterValue.searchText : ''
     if (this.currentFilter === 'profileverification') {
-      this.profileVerificationData = this.allprofileVerificationData.filter((user: any) =>
+      this.profileVerificationData = this.profileVerificationData.filter((user: any) =>
         user.fullname.toLowerCase().includes(filterValue))
     } else {
-      this.transfersData = this.allTransfersData.filter((user: any) => user.fullname.toLowerCase().includes(filterValue))
+      this.transfersData = this.transfersData.filter((user: any) => user.fullname.toLowerCase().includes(filterValue))
     }
   }
 
   onPaginateChange(event: PageEvent) {
     this.pageIndex = event.pageIndex
     this.limit = event.pageSize
-    this.currentOffset = event.pageIndex
-    this.fetchApprovals('')
+    // Clear the cache only for the current tab
+    const cacheKey = `${this.currentFilter}DataCache`
+    const cacheTimestampKey = `${this.currentFilter}CacheTimestamp`
+    const transfersCacheKey = `${this.currentFilter}DataCache`
+    const transfersCacheTimestampKey = `${this.currentFilter}CacheTimestamp`
+
+    localStorage.removeItem(cacheKey)
+    localStorage.removeItem(cacheTimestampKey)
+    localStorage.removeItem(transfersCacheKey)
+    localStorage.removeItem(transfersCacheTimestampKey)
+    this.filterData()
   }
 
-  ngOnDestroy(): void { }
+  ngOnDestroy(): void {
+
+  }
 
   onApproveAllReqs(req: any) {
     this.apprService.handleWorkflow(req).subscribe((res: any) => {
@@ -363,16 +415,55 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
     this.disableApproveALL = true
   }
 
-  getPendingResquests(): void {
-    this.usersService.fetchPendingRequests().subscribe((res: any) => {
-      if (res) {
-        // console.log('*********************', res)
+  retrieveCachedApprovals() {
+    const cacheKey = `${this.currentFilter}DataCache`
+    const cacheTimestampKey = `${this.currentFilter}CacheTimestamp`
+    const cacheTotalRecordKey = `${this.currentFilter}TotalRecords`
+    const cacheDuration = 5 * 60 * 1000
+
+    const now = new Date().getTime()
+    const cachedData = localStorage.getItem(cacheKey)
+    const cachedTimestamp = localStorage.getItem(cacheTimestampKey)
+    this.totaltransfersRecords = localStorage.getItem('transfersTotalRecords')
+
+    if (cachedData && cachedTimestamp) {
+      const cacheAge = now - Number(cachedTimestamp)
+
+      if (cacheAge < cacheDuration) {
+        // Use cached data
+        this.profileVerificationData = JSON.parse(cachedData)
+        this.totalprofileVerificationRecords = localStorage.getItem(cacheTotalRecordKey)
+        this.updateApproveAllStatus()
+        return
+      } else {
+        // Fetch fresh data if cache is not available or expired
+        this.fetchTransfers(this.limit)
       }
-      // tslint:disable-next-line
-    }, (error: any) => {
-      if (!error.ok) {
-        this.snackbar.open(error.error.text)
+    }
+  }
+
+  retrieveCachedTransfers() {
+    const cacheKey = `${this.currentFilter}DataCache`
+    const cacheTimestampKey = `${this.currentFilter}CacheTimestamp`
+    const cacheDuration = 5 * 60 * 1000 // 5 minutes in milliseconds
+    this.totaltransfersRecords = localStorage.getItem('transfersTotalRecords')
+
+    const now = new Date().getTime()
+    const cachedData = localStorage.getItem(cacheKey)
+    const cachedTimestamp = localStorage.getItem(cacheTimestampKey)
+
+    if (cachedData && cachedTimestamp) {
+      const cacheAge = now - Number(cachedTimestamp)
+
+      if (cacheAge < cacheDuration) {
+        // Use cached data
+        this.transfersData = JSON.parse(cachedData)
+        return
+      } else {
+        // Fetch fresh data if cache is not available or expired
+        this.fetchTransfers(this.limit)
       }
-    })
+    }
+
   }
 }
\ No newline at end of file
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
index d1f9d480b..3b9a6672c 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/bulk-upload/bulk-upload.component.html
@@ -1,6 +1,6 @@
 <div class="flex flex-col gap-6">
   <div class="flex flex-row gap-4 items-center">
-    <mat-icon class="cursor-pointer" [routerLink]="['/app/home/approvals/profileverification']">arrow_back</mat-icon>
+    <mat-icon class="cursor-pointer" [routerLink]="['/app/home/approvals/approval']">arrow_back</mat-icon>
     <div class="flex font-bold">Bulk profile update</div>
   </div>
 
diff --git a/project/ws/app/src/lib/routes/home/services/approvals.service.ts b/project/ws/app/src/lib/routes/home/services/approvals.service.ts
index 318779ad2..f0836b4e9 100644
--- a/project/ws/app/src/lib/routes/home/services/approvals.service.ts
+++ b/project/ws/app/src/lib/routes/home/services/approvals.service.ts
@@ -6,6 +6,7 @@ import { ConfigurationsService } from '@sunbird-cb/utils'
 const API_END_POINTS = {
   APPROVALS: '/apis/protected/v8/workflowhandler/applicationsSearch',
   WORKFLOW_HANDLER: 'apis/protected/v8/workflowhandler/transition',
+  PROFILEAPPROVALSLIST: '/apis/protected/v8/workflowhandler/profileApprovalSearch',
 }
 
 @Injectable({
@@ -17,6 +18,10 @@ export class ApprovalsService {
     return this.http.post<any>(API_END_POINTS.APPROVALS, request)
   }
 
+  getApprovalsList(request: any): Observable<any> {
+    return this.http.post<any>(API_END_POINTS.PROFILEAPPROVALSLIST, request)
+  }
+
   getProfileConfig(): Promise<any> {
     const baseUrl = this.configSrv.sitePath
     const config = this.http.get<any>(`${baseUrl}/feature/approvals.json`).toPromise()

From 038ae8033b56ece0406dc8249afd3dbc9d4175e0 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Tue, 17 Sep 2024 11:15:47 +0530
Subject: [PATCH 880/887] lint fixed

---
 .../home/components/user-cards/user-card.component.ts  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 64fea4ce8..0aaee6a18 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -130,11 +130,11 @@ export class UserCardComponent implements OnInit, OnChanges, AfterViewChecked, A
   currentUserRole = ''
   checked = false
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-    private dialog: MatDialog, private approvalSvc: ApprovalsService,
-    private route: ActivatedRoute, private snackBar: MatSnackBar,
-    private events: EventService,
-    private datePipe: DatePipe,
-    private cdr: ChangeDetectorRef) {
+              private dialog: MatDialog, private approvalSvc: ApprovalsService,
+              private route: ActivatedRoute, private snackBar: MatSnackBar,
+              private events: EventService,
+              private datePipe: DatePipe,
+              private cdr: ChangeDetectorRef) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),

From 74a79989fcb88891c90b93841dfb15323cd3a6f3 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Tue, 17 Sep 2024 11:51:37 +0530
Subject: [PATCH 881/887] fixed var camelCase issue

---
 .../approval-pending.component.html            | 16 ++++++++--------
 .../approval-pending.component.ts              | 18 +++++++++---------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
index 4baa67f87..a0c496aba 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.html
@@ -33,12 +33,12 @@
           <a class="filter-option"
             [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'profileverification', 'ws-mat-accent-border font-medium': currentFilter !== 'profileverification'}"
             mat-button (click)="filter('profileverification'); tabTelemetry('toapprove', 0)" role="button">Profile
-            Verifications ({{totalprofileVerificationRecords}})</a>
+            Verifications ({{totalProfileVerificationRecords}})</a>
 
           <a class="filter-option"
             [ngClass]="{'ws-mat-accent-border-active' : currentFilter === 'transfers', 'ws-mat-accent-border font-medium': currentFilter !== 'transfers'}"
             mat-button (click)="filter('transfers'); tabTelemetry('transfers', 1)" role="button">Transfers
-            ({{totaltransfersRecords}})</a>
+            ({{totalTransfersRecords}})</a>
         </div>
         <!-- <div class="flex flex-3 flex-end" *ngIf="currentFilter === 'profileverification'">
           <a (click)="getPendingResquests()"
@@ -52,13 +52,13 @@
             [showApproveALL]="showApproveALL" [showBulkUpdate]="true"
             [disableApproveALL]="disableApproveALL"></ws-app-searchuser>
         </div>
-        <ng-container *ngIf="totalprofileVerificationRecords > 0">
+        <ng-container *ngIf="totalProfileVerificationRecords > 0">
           <ws-widget-user-card [currentFilter]="currentFilter" [usersData]="profileVerificationData"
-            [isApprovals]="true" [totalRecords]="totalprofileVerificationRecords" [tabChangeIndex]="pageIndex"
+            [isApprovals]="true" [totalRecords]="totalProfileVerificationRecords" [tabChangeIndex]="pageIndex"
             (searchByEnterKey)="onEnterkySearch($event)" (disableButton)="showButton()"
             (paginationData)="onPaginateChange($event)" (updateList)="fetchApprovals()"></ws-widget-user-card>
         </ng-container>
-        <ng-container *ngIf="totalprofileVerificationRecords === 0">
+        <ng-container *ngIf="totalProfileVerificationRecords === 0">
           <p class="margin-top-xl margin-bottom-xl">No approvals</p>
         </ng-container>
       </ng-container>
@@ -67,13 +67,13 @@
           <ws-app-searchuser (handleApiData)="onSearch($event)" [isApprovals]="true" (handleapproveAll)="onApproveALL()"
             [showApproveALL]="false" [showBulkUpdate]="false"></ws-app-searchuser>
         </div>
-        <ng-container *ngIf="totaltransfersRecords > 0">
+        <ng-container *ngIf="totalTransfersRecords > 0">
           <ws-widget-user-card [currentFilter]="currentFilter" [usersData]="transfersData" [isApprovals]="true"
-            [totalRecords]="totaltransfersRecords" [tabChangeIndex]="pageIndex"
+            [totalRecords]="totalTransfersRecords" [tabChangeIndex]="pageIndex"
             (searchByEnterKey)="onEnterkySearch($event)" (disableButton)="showButton()"
             (paginationData)="onPaginateChange($event)" (updateList)="fetchApprovals()"></ws-widget-user-card>
         </ng-container>
-        <ng-container *ngIf="totaltransfersRecords === 0">
+        <ng-container *ngIf="totalTransfersRecords === 0">
           <p class="margin-top-xl margin-bottom-xl">No transfers</p>
         </ng-container>
       </ng-container>
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
index 89c6253f0..7fa48a510 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
@@ -33,8 +33,8 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   showApproveALL = false
   disableApproveALL = false
   getSortOrderValue: any
-  totaltransfersRecords: any = 0
-  totalprofileVerificationRecords: any = 0
+  totalTransfersRecords: any = 0
+  totalProfileVerificationRecords: any = 0
   tabChange = 0
   cacheOffset: any = 0
 
@@ -190,7 +190,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
           this.profileVerificationData = []
           let createdOnDate: Date
 
-          this.totalprofileVerificationRecords = res.result.count
+          this.totalProfileVerificationRecords = res.result.count
           const resData = res.result.data
           resData.forEach((appr: any) => {
             if (appr && appr.wfInfo && appr.wfInfo.length) {
@@ -218,7 +218,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
           // Cache the data and timestamp in localStorage
           localStorage.setItem(cacheKey, JSON.stringify(this.profileVerificationData))
           localStorage.setItem(cacheTimestampKey, now.toString())
-          localStorage.setItem(cacheTotalRecordKey, JSON.stringify(this.totalprofileVerificationRecords))
+          localStorage.setItem(cacheTotalRecordKey, JSON.stringify(this.totalProfileVerificationRecords))
 
           if (this.profileVerificationData && this.profileVerificationData.length > 0) {
             this.showApproveALL = true
@@ -252,7 +252,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
       this.apprService.getApprovalsList(req).subscribe(res => {
         if (res && res.result) {
           this.loaderService.changeLoaderState(false)
-          this.totaltransfersRecords = res.result.count
+          this.totalTransfersRecords = res.result.count
           this.transfersData = []
           let currentdate: Date
           const resData = res.result.data
@@ -287,7 +287,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
             localStorage.setItem(cacheKey, JSON.stringify(this.transfersData))
             localStorage.setItem(cacheTimestampKey, now.toString())
           }
-          localStorage.setItem(cacheTotalRecordKey, JSON.stringify(this.totaltransfersRecords))
+          localStorage.setItem(cacheTotalRecordKey, JSON.stringify(this.totalTransfersRecords))
         }
       })
     } else {
@@ -424,7 +424,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
     const now = new Date().getTime()
     const cachedData = localStorage.getItem(cacheKey)
     const cachedTimestamp = localStorage.getItem(cacheTimestampKey)
-    this.totaltransfersRecords = localStorage.getItem('transfersTotalRecords')
+    this.totalTransfersRecords = localStorage.getItem('transfersTotalRecords')
 
     if (cachedData && cachedTimestamp) {
       const cacheAge = now - Number(cachedTimestamp)
@@ -432,7 +432,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
       if (cacheAge < cacheDuration) {
         // Use cached data
         this.profileVerificationData = JSON.parse(cachedData)
-        this.totalprofileVerificationRecords = localStorage.getItem(cacheTotalRecordKey)
+        this.totalProfileVerificationRecords = localStorage.getItem(cacheTotalRecordKey)
         this.updateApproveAllStatus()
         return
       } else {
@@ -446,7 +446,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
     const cacheKey = `${this.currentFilter}DataCache`
     const cacheTimestampKey = `${this.currentFilter}CacheTimestamp`
     const cacheDuration = 5 * 60 * 1000 // 5 minutes in milliseconds
-    this.totaltransfersRecords = localStorage.getItem('transfersTotalRecords')
+    this.totalTransfersRecords = localStorage.getItem('transfersTotalRecords')
 
     const now = new Date().getTime()
     const cachedData = localStorage.getItem(cacheKey)

From 20ea0896dcfc868f3e390a6316f4110245ffaabc Mon Sep 17 00:00:00 2001
From: nitinraj-tarento <nitin.raj@tarento.com>
Date: Tue, 17 Sep 2024 15:16:05 +0530
Subject: [PATCH 882/887] user search funcationality added

---
 .../routes/users-view/users-view.component.ts | 309 +++++++++++++++++-
 1 file changed, 296 insertions(+), 13 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 952d1aed1..0a9514fd2 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -234,10 +234,79 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       },
     }
     this.usersService.getAllKongUsers(reqBody).subscribe((data: any) => {
-      const allusersData = data.result.response
-      this.activeUsersData = allusersData.content
-      // this.activeUsersData = this.activeUsersData.filter((wf: any) => wf.profileDetails.profileStatus !== 'NOT-MY-USER')
-      this.activeUsersDataCount = allusersData.count
+      // const allusersData = data.result.response
+      // this.activeUsersData = allusersData.content
+      // // this.activeUsersData = this.activeUsersData.filter((wf: any) => wf.profileDetails.profileStatus !== 'NOT-MY-USER')
+      // this.activeUsersDataCount = allusersData.count
+      const allusersData = data && data.result && data.result.response
+      const userContent = allusersData.content
+      const searchText = this.getSearchText(query).toLowerCase()
+      if (searchText && searchText.length && searchText.length > 0) {
+        const userData: any = []
+        if (data && data.result && data.result.response && data.result.response.count &&
+          data.result.response.count > 0) {
+          if (userContent && userContent.length > 0) {
+            // userContent.forEach((element: any) => {
+            for (const element of userContent) {
+              const userPrimaryEmail = (element && element.profileDetails && element.profileDetails.personalDetails &&
+                element.profileDetails.personalDetails.primaryEmail &&
+                element.profileDetails.personalDetails.primaryEmail.toLowerCase())
+
+              const userMail = element && element.email && element.email.toLowerCase()
+
+              const userOfficialMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+                element.profileDetails.personalDetails.officialEmail &&
+                element.profileDetails.personalDetails.officialEmail.toLowerCase()
+
+              const userPersonalMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+                element.profileDetails.personalDetails.personalEmail &&
+                element.profileDetails.personalDetails.personalEmail.toLowerCase()
+
+              const userName = element && element.firstName && element.firstName.toLowerCase()
+              const userFirstName = element && element.profileDetails && element.profileDetails.personalDetails &&
+                element.profileDetails.personalDetails.firstname &&
+                element.profileDetails.personalDetails.firstname.toLowerCase()
+
+              const userMob = element && element.profileDetails && element.profileDetails.personalDetails &&
+                element.profileDetails.personalDetails.mobile
+
+              const userTelePhone = element && element.profileDetails && element.profileDetails.personalDetails &&
+                element.profileDetails.personalDetails.telephone
+
+              const userPhone = element && element.phone
+
+              const emailMatch = (userMail && userMail.includes(searchText.toLowerCase())) ||
+                (userPrimaryEmail && userPrimaryEmail.includes(searchText.toLowerCase())) ||
+                (userOfficialMail && userOfficialMail.includes(searchText.toLowerCase())) ||
+                (userPersonalMail && userPersonalMail.includes(searchText.toLowerCase()))
+
+              const firstNameMatch = (userName && userName.includes(searchText.toLowerCase())) ||
+                (userFirstName && userFirstName.includes(searchText.toLowerCase()))
+
+              const phoneMatch = (userTelePhone && userTelePhone.includes(searchText)) ||
+                (userMob && userMob.toString().includes(searchText)) || (userPhone && userPhone.includes(searchText))
+
+              if (emailMatch || firstNameMatch || phoneMatch) {
+                userData.push(element)
+                this.activeUsersData = userData
+                this.activeUsersDataCount = userData.length
+              } else {
+                // this.activeUsersData = []
+                // this.activeUsersDataCount = 0
+                this.activeUsersData = userData
+                this.activeUsersDataCount = userData.length
+              }
+            }
+          }
+        } else {
+          this.activeUsersData = allusersData.content
+          this.activeUsersDataCount = allusersData.count
+        }
+
+      } else {
+        this.activeUsersData = allusersData.content
+        this.activeUsersDataCount = allusersData.count
+      }
     })
   }
   async getVUsers(query: any) {
@@ -279,9 +348,9 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       },
     }
     this.usersService.getAllKongUsers(reqBody).subscribe((data: any) => {
-      const allusersData = data.result.response
-      this.verifiedUsersData = allusersData.content
-      this.verifiedUsersDataCount = data.result.response.count
+      // const allusersData = data.result.response
+      // this.verifiedUsersData = allusersData.content
+      // this.verifiedUsersDataCount = data.result.response.count
       // this.verifiedUsersData = allusersData.content
       // this.verifiedUsersDataCount = data.result.response.count
       // this.filterFacets = allusersData.facets ? allusersData.facets : []
@@ -293,6 +362,77 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       //     this.verifiedUsersDataCount = this.verifiedUsersDataCount ? this.verifiedUsersDataCount - 1 : this.verifiedUsersDataCount
       //   }
       // }
+      const allusersData = data && data.result && data.result.response
+      const userContent = allusersData.content
+      const searchText = this.getSearchText(query).toLowerCase()
+      if (searchText && searchText.length && searchText.length > 0) {
+        const userData: any = []
+        if (data && data.result && data.result.response && data.result.response.count &&
+          data.result.response.count > 0) {
+          for (const element of userContent) {
+            // const userMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+            //   element.profileDetails.personalDetails.primaryEmail &&
+            //   element.profileDetails.personalDetails.primaryEmail.toLowerCase()
+            // const userName = element && element.firstName && element.firstName.toLowerCase()
+            // const userPhone = element && element.profileDetails && element.profileDetails.personalDetails &&
+            //   element.profileDetails.personalDetails.mobile
+
+            const userPrimaryEmail = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.primaryEmail &&
+              element.profileDetails.personalDetails.primaryEmail.toLowerCase()
+
+            const userMail = element && element.email && element.email.toLowerCase()
+
+            const userOfficialMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.officialEmail &&
+              element.profileDetails.personalDetails.officialEmail.toLowerCase()
+
+            const userPersonalMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.personalEmail &&
+              element.profileDetails.personalDetails.personalEmail.toLowerCase()
+
+            const userName = element && element.firstName && element.firstName.toLowerCase()
+            const userFirstName = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.firstname &&
+              element.profileDetails.personalDetails.firstname.toLowerCase()
+
+            const userMob = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.mobile
+
+            const userTelePhone = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.telephone
+
+            const userPhone = element && element.phone
+
+            const emailMatch = (userMail && userMail.includes(searchText.toLowerCase())) ||
+              (userPrimaryEmail && userPrimaryEmail.includes(searchText.toLowerCase())) ||
+              (userOfficialMail && userOfficialMail.includes(searchText.toLowerCase())) ||
+              (userPersonalMail && userPersonalMail.includes(searchText.toLowerCase()))
+
+            const firstNameMatch = (userName && userName.includes(searchText.toLowerCase())) ||
+              (userFirstName && userFirstName.includes(searchText.toLowerCase()))
+
+            const phoneMatch = (userTelePhone && userTelePhone.includes(searchText)) ||
+              (userMob && userMob.toString().includes(searchText)) || (userPhone && userPhone.includes(searchText))
+
+            if (emailMatch || firstNameMatch || phoneMatch) {
+              userData.push(element)
+              this.verifiedUsersData = userData
+              this.verifiedUsersDataCount = userData.length
+            } else {
+              this.verifiedUsersData = userData
+              this.verifiedUsersDataCount = userData.length
+            }
+          }
+        } else {
+          this.verifiedUsersData = allusersData.content
+          this.verifiedUsersDataCount = data.result.response.count
+        }
+
+      } else {
+        this.verifiedUsersData = allusersData.content
+        this.verifiedUsersDataCount = data.result.response.count
+      }
     })
   }
 
@@ -335,9 +475,80 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       },
     }
     this.usersService.getAllKongUsers(reqBody).subscribe((data: any) => {
-      const allusersData = data.result.response
-      this.nonverifiedUsersData = allusersData.content
-      this.nonverifiedUsersDataCount = data.result.response.count
+      // const allusersData = data.result.response
+      // this.nonverifiedUsersData = allusersData.content
+      // this.nonverifiedUsersDataCount = data.result.response.count
+      const allusersData = data && data.result && data.result.response
+      const userContent = allusersData.content
+      const searchText = this.getSearchText(query).toLowerCase()
+      if (searchText && searchText.length && searchText.length > 0) {
+        const userData: any = []
+        if (data && data.result && data.result.response && data.result.response.count &&
+          data.result.response.count > 0) {
+          for (const element of userContent) {
+            // const userMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+            //   element.profileDetails.personalDetails.primaryEmail &&
+            //   element.profileDetails.personalDetails.primaryEmail.toLowerCase()
+            // const userName = element && element.firstName && element.firstName.toLowerCase()
+            // const userPhone = element && element.profileDetails && element.profileDetails.personalDetails &&
+            //   element.profileDetails.personalDetails.mobile
+
+            const userPrimaryEmail = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.primaryEmail &&
+              element.profileDetails.personalDetails.primaryEmail.toLowerCase()
+
+            const userMail = element && element.email && element.email.toLowerCase()
+
+            const userOfficialMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.officialEmail &&
+              element.profileDetails.personalDetails.officialEmail.toLowerCase()
+
+            const userPersonalMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.personalEmail &&
+              element.profileDetails.personalDetails.personalEmail.toLowerCase()
+
+            const userName = element && element.firstName && element.firstName.toLowerCase()
+            const userFirstName = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.firstname &&
+              element.profileDetails.personalDetails.firstname.toLowerCase()
+
+            const userMob = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.mobile
+
+            const userTelePhone = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.telephone
+
+            const userPhone = element && element.phone
+
+            const emailMatch = (userMail && userMail.includes(searchText.toLowerCase())) ||
+              (userPrimaryEmail && userPrimaryEmail.includes(searchText.toLowerCase())) ||
+              (userOfficialMail && userOfficialMail.includes(searchText.toLowerCase())) ||
+              (userPersonalMail && userPersonalMail.includes(searchText.toLowerCase()))
+
+            const firstNameMatch = (userName && userName.includes(searchText.toLowerCase())) ||
+              (userFirstName && userFirstName.includes(searchText.toLowerCase()))
+
+            const phoneMatch = (userTelePhone && userTelePhone.includes(searchText)) ||
+              (userMob && userMob.toString().includes(searchText)) || (userPhone && userPhone.includes(searchText))
+
+            if (emailMatch || firstNameMatch || phoneMatch) {
+              userData.push(element)
+              this.nonverifiedUsersData = userData
+              this.nonverifiedUsersDataCount = userData.length
+            } else {
+              this.nonverifiedUsersData = userData
+              this.nonverifiedUsersDataCount = userData.length
+            }
+          }
+        } else {
+          this.nonverifiedUsersData = allusersData.content
+          this.nonverifiedUsersDataCount = data.result.response.count
+        }
+
+      } else {
+        this.nonverifiedUsersData = allusersData.content
+        this.nonverifiedUsersDataCount = data.result.response.count
+      }
     })
   }
 
@@ -380,9 +591,81 @@ export class UsersViewComponent implements OnInit, OnDestroy {
       },
     }
     this.usersService.getAllKongUsers(reqBody).subscribe((data: any) => {
-      const allusersData = data.result.response
-      this.notmyuserUsersData = allusersData.content
-      this.notmyuserUsersDataCount = data.result.response.count
+      // const allusersData = data.result.response
+      // this.notmyuserUsersData = allusersData.content
+      // this.notmyuserUsersDataCount = data.result.response.count
+      const allusersData = data && data.result && data.result.response
+      const userContent = allusersData.content
+      const searchText = this.getSearchText(query).toLowerCase()
+      if (searchText && searchText.length && searchText.length > 0) {
+        const userData: any = []
+        if (data && data.result && data.result.response && data.result.response.count &&
+          data.result.response.count > 0) {
+          for (const element of userContent) {
+            // const userMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+            //   element.profileDetails.personalDetails.primaryEmail &&
+            //   element.profileDetails.personalDetails.primaryEmail.toLowerCase()
+            // const userName = element && element.firstName && element.firstName.toLowerCase()
+            // const userPhone = element && element.profileDetails && element.profileDetails.personalDetails &&
+            //   element.profileDetails.personalDetails.mobile
+
+            const userPrimaryEmail = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.primaryEmail &&
+              element.profileDetails.personalDetails.primaryEmail.toLowerCase()
+
+            const userMail = element && element.email && element.email.toLowerCase()
+
+            const userOfficialMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.officialEmail &&
+              element.profileDetails.personalDetails.officialEmail.toLowerCase()
+
+            const userPersonalMail = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.personalEmail &&
+              element.profileDetails.personalDetails.personalEmail.toLowerCase()
+
+            const userName = element && element.firstName && element.firstName.toLowerCase()
+
+            const userFirstName = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.firstname &&
+              element.profileDetails.personalDetails.firstname.toLowerCase()
+
+            const userMob = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.mobile
+
+            const userTelePhone = element && element.profileDetails && element.profileDetails.personalDetails &&
+              element.profileDetails.personalDetails.telephone
+
+            const userPhone = element && element.phone
+
+            const emailMatch = (userMail && userMail.includes(searchText.toLowerCase())) ||
+              (userPrimaryEmail && userPrimaryEmail.includes(searchText.toLowerCase())) ||
+              (userOfficialMail && userOfficialMail.includes(searchText.toLowerCase())) ||
+              (userPersonalMail && userPersonalMail.includes(searchText.toLowerCase()))
+
+            const firstNameMatch = (userName && userName.includes(searchText.toLowerCase())) ||
+              (userFirstName && userFirstName.includes(searchText.toLowerCase()))
+
+            const phoneMatch = (userTelePhone && userTelePhone.includes(searchText)) ||
+              (userMob && userMob.toString().includes(searchText)) || (userPhone && userPhone.includes(searchText))
+
+            if (emailMatch || firstNameMatch || phoneMatch) {
+              userData.push(element)
+              this.notmyuserUsersData = userData
+              this.notmyuserUsersDataCount = userData.length
+            } else {
+              this.notmyuserUsersData = userData
+              this.notmyuserUsersDataCount = userData.length
+            }
+          }
+        } else {
+          this.notmyuserUsersData = allusersData.content
+          this.notmyuserUsersDataCount = data.result.response.count
+        }
+
+      } else {
+        this.notmyuserUsersData = allusersData.content
+        this.notmyuserUsersDataCount = data.result.response.count
+      }
     })
   }
 

From 82191e9938c9afd2a94e4fe27e57a8b4b888fcc1 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Wed, 18 Sep 2024 14:23:51 +0530
Subject: [PATCH 883/887] paze size issue fixed

---
 .../components/user-cards/user-card.component.ts     | 12 +++++++-----
 .../approval-pending/approval-pending.component.ts   |  7 ++++++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 0aaee6a18..401eb3a02 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -130,11 +130,11 @@ export class UserCardComponent implements OnInit, OnChanges, AfterViewChecked, A
   currentUserRole = ''
   checked = false
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-              private dialog: MatDialog, private approvalSvc: ApprovalsService,
-              private route: ActivatedRoute, private snackBar: MatSnackBar,
-              private events: EventService,
-              private datePipe: DatePipe,
-              private cdr: ChangeDetectorRef) {
+    private dialog: MatDialog, private approvalSvc: ApprovalsService,
+    private route: ActivatedRoute, private snackBar: MatSnackBar,
+    private events: EventService,
+    private datePipe: DatePipe,
+    private cdr: ChangeDetectorRef) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),
@@ -199,6 +199,8 @@ export class UserCardComponent implements OnInit, OnChanges, AfterViewChecked, A
     const cacheValTransfer = localStorage.getItem('transferOffset')
     this.cacheProfilePageIndex = cacheValProfile !== null ? parseInt(cacheValProfile, 10) : 0
     this.cacheTransferPageIndex = cacheValTransfer !== null ? parseInt(cacheValTransfer, 10) : 0
+    const storedPageSize = localStorage.getItem(`${this.currentFilter}PageSize`)
+    this.pageSize = storedPageSize !== null ? parseInt(storedPageSize, 10) : 20
 
     if (this.isApprovals && this.usersData) {
       this.getApprovalData()
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
index 7fa48a510..22bc923cd 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
@@ -25,7 +25,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
   approvalData: any = []
   currentFilter = 'profileverification'
   departName = ''
-  limit = 20
+  limit: any = 20
   pageIndex: any = 0
   currentOffset = 0
   configSvc: any
@@ -184,6 +184,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
       }
 
       localStorage.setItem('profileverificationOffset', req.offset)
+      localStorage.setItem(`profileverificationPageSize`, req.limit.toString())
       this.apprService.getApprovalsList(req).subscribe(res => {
         if (res && res.result) {
           this.loaderService.changeLoaderState(false)
@@ -249,6 +250,7 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
       }
 
       localStorage.setItem('transferOffset', req.offset)
+      localStorage.setItem('transferPageSize', req.limit)
       this.apprService.getApprovalsList(req).subscribe(res => {
         if (res && res.result) {
           this.loaderService.changeLoaderState(false)
@@ -347,6 +349,9 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
     localStorage.removeItem(cacheTimestampKey)
     localStorage.removeItem(transfersCacheKey)
     localStorage.removeItem(transfersCacheTimestampKey)
+    // Store current pagination state
+    localStorage.setItem(`${this.currentFilter}Offset`, this.pageIndex.toString())
+    localStorage.setItem(`${this.currentFilter}PageSize`, this.limit.toString())
     this.filterData()
   }
 

From 21fc06f7f42ebe839460ecd9b5fe63512e010535 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Wed, 18 Sep 2024 14:28:33 +0530
Subject: [PATCH 884/887] pazesize issue fixed

---
 .../home/components/user-cards/user-card.component.ts  | 10 +++++-----
 .../approval-pending/approval-pending.component.ts     |  2 --
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 401eb3a02..d64f8ff78 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -130,11 +130,11 @@ export class UserCardComponent implements OnInit, OnChanges, AfterViewChecked, A
   currentUserRole = ''
   checked = false
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-    private dialog: MatDialog, private approvalSvc: ApprovalsService,
-    private route: ActivatedRoute, private snackBar: MatSnackBar,
-    private events: EventService,
-    private datePipe: DatePipe,
-    private cdr: ChangeDetectorRef) {
+              private dialog: MatDialog, private approvalSvc: ApprovalsService,
+              private route: ActivatedRoute, private snackBar: MatSnackBar,
+              private events: EventService,
+              private datePipe: DatePipe,
+              private cdr: ChangeDetectorRef) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),
diff --git a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
index 22bc923cd..c115835e3 100644
--- a/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/approvals/approval-pending/approval-pending.component.ts
@@ -184,7 +184,6 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
       }
 
       localStorage.setItem('profileverificationOffset', req.offset)
-      localStorage.setItem(`profileverificationPageSize`, req.limit.toString())
       this.apprService.getApprovalsList(req).subscribe(res => {
         if (res && res.result) {
           this.loaderService.changeLoaderState(false)
@@ -250,7 +249,6 @@ export class ApprovalPendingComponent implements OnInit, OnDestroy {
       }
 
       localStorage.setItem('transferOffset', req.offset)
-      localStorage.setItem('transferPageSize', req.limit)
       this.apprService.getApprovalsList(req).subscribe(res => {
         if (res && res.result) {
           this.loaderService.changeLoaderState(false)

From 5cb0201976b86004890c23e55f28419528da3b26 Mon Sep 17 00:00:00 2001
From: garima468 <garima.chaudhary@tarento.com>
Date: Wed, 18 Sep 2024 14:32:07 +0530
Subject: [PATCH 885/887] lint fixed

---
 .../components/user-cards/user-card.component.ts     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index d64f8ff78..4db14a444 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -130,11 +130,11 @@ export class UserCardComponent implements OnInit, OnChanges, AfterViewChecked, A
   currentUserRole = ''
   checked = false
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-              private dialog: MatDialog, private approvalSvc: ApprovalsService,
-              private route: ActivatedRoute, private snackBar: MatSnackBar,
-              private events: EventService,
-              private datePipe: DatePipe,
-              private cdr: ChangeDetectorRef) {
+    private dialog: MatDialog, private approvalSvc: ApprovalsService,
+    private route: ActivatedRoute, private snackBar: MatSnackBar,
+    private events: EventService,
+    private datePipe: DatePipe,
+    private cdr: ChangeDetectorRef) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),
@@ -197,9 +197,9 @@ export class UserCardComponent implements OnInit, OnChanges, AfterViewChecked, A
   ngOnInit() {
     const cacheValProfile = localStorage.getItem('profileverificationOffset')
     const cacheValTransfer = localStorage.getItem('transferOffset')
+    const storedPageSize = localStorage.getItem(`${this.currentFilter}PageSize`)
     this.cacheProfilePageIndex = cacheValProfile !== null ? parseInt(cacheValProfile, 10) : 0
     this.cacheTransferPageIndex = cacheValTransfer !== null ? parseInt(cacheValTransfer, 10) : 0
-    const storedPageSize = localStorage.getItem(`${this.currentFilter}PageSize`)
     this.pageSize = storedPageSize !== null ? parseInt(storedPageSize, 10) : 20
 
     if (this.isApprovals && this.usersData) {

From 91291b069fbd3a3927ef19cba2017eaefaff13d8 Mon Sep 17 00:00:00 2001
From: vishnubansaltarento <vishnu.bansal@tarento.com>
Date: Thu, 19 Sep 2024 21:10:51 +0530
Subject: [PATCH 886/887] update for not my user changes

---
 .../user-cards/user-card.component.html       |  7 +-
 .../user-cards/user-card.component.ts         | 76 ++++++++++++++-----
 .../routes/users-view/users-view.component.ts |  2 +
 3 files changed, 65 insertions(+), 20 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
index 31e1839af..3a213bb46 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.html
@@ -54,10 +54,12 @@
           </div>
         </div>
         <div class="float-right flex items-center" *ngIf="(isMdoAdmin || isMdoLeader) && !forMentor">
+          <!-- <ng-container *ngIf="checkForMDOAdmin(user)"> -->
           <div class="button mat-body" (click)="onEditUser(user, panel);$event.stopPropagation();"
             *ngIf="currentFilter !== 'notmyuser' && !user?.enableEdit">
             <mat-icon>edit</mat-icon> Edit
           </div>
+          <!-- </ng-container> -->
           <div class="button mat-body" (click)="confirmReassign(confirm, user);$event.stopPropagation();"
             *ngIf="currentFilter === 'notmyuser'">Reassign</div>
         </div>
@@ -984,7 +986,10 @@
   <div class="confirm-dialog text-center padding-l">
     <mat-icon class="infoIcon orangeicon-dialog">error_outline</mat-icon>
     <div mat-dialog-content i18n class="margin-top-xs blue-text">
-      Are you sure you want to update?
+      <span *ngIf="currentUserStatus === 'NOT-MY-USER'">You are about to remove this user from your
+        organization. The user will lose all learning access and be moved out of
+        your organization in 48 hours unless you reverse the action from the "Not My Users" tab.</span>
+      <span *ngIf="currentUserStatus !== 'NOT-MY-USER'">Are you sure you want to update?</span>
     </div>
     <div mat-dialog-actions class="flex-center margin-top-s">
       <button mat-raised-button type="submit" [mat-dialog-close]="false"
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index 41e3b4a0f..f5e81971c 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -123,12 +123,13 @@ export class UserCardComponent implements OnInit, OnChanges, AfterViewChecked {
   memberAlertMessage = ''
   currentUserRole = ''
   checked = false
+  currentUserStatus = ''
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-              private dialog: MatDialog, private approvalSvc: ApprovalsService,
-              private route: ActivatedRoute, private snackBar: MatSnackBar,
-              private events: EventService,
-              private datePipe: DatePipe,
-              private cdr: ChangeDetectorRef) {
+    private dialog: MatDialog, private approvalSvc: ApprovalsService,
+    private route: ActivatedRoute, private snackBar: MatSnackBar,
+    private events: EventService,
+    private datePipe: DatePipe,
+    private cdr: ChangeDetectorRef) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),
@@ -403,10 +404,21 @@ export class UserCardComponent implements OnInit, OnChanges, AfterViewChecked {
     this.usersSvc.getUserById(user.userId).subscribe((res: any) => {
       if (res) {
         userval = res
+        console.log('userval', userval)
         this.usersData.forEach((u: any) => {
           if (u.userId === user.userId) {
-            u.enableEdit = true
-            userval.enableEdit = true
+            if (this.isMdoLeader) {
+              u.enableEdit = true
+              userval.enableEdit = true
+            } else if (this.isMdoAdmin && userval.roles.includes('MDO_ADMIN')) {
+              u.enableEdit = false
+              userval.enableEdit = false
+              this.snackBar.open('Only MDO Leader Can Update Profile')
+            } else {
+              u.enableEdit = true
+              userval.enableEdit = true
+            }
+
           } else {
             u.enableEdit = false
           }
@@ -994,21 +1006,38 @@ export class UserCardComponent implements OnInit, OnChanges, AfterViewChecked {
 
   confirmUserRequest(template: any, status: any, data: any, event: any) {
     data.enableToggle = true
-    const dialog = this.dialog.open(template, {
-      width: '500px',
-    })
-    dialog.afterClosed().subscribe((v: any) => {
-      if (v) {
-        this.markStatus(status, data)
-        data.enableToggle = false
+    this.currentUserStatus = status
+    let showPopup = true
+    if (status === 'NOT-MY-USER') {
+      if (this.isMdoLeader) {
+        showPopup = true
+      } else if (this.isMdoAdmin && data.roles.includes('MDO_ADMIN')) {
+        showPopup = false
+        this.snackBar.open('Only MDO Leader Can Update Profile')
       } else {
-        if (status === 'NOT-MY-USER') {
-          event.source.checked = true
+        showPopup = true
+      }
+    }
+
+    if (showPopup) {
+      const dialog = this.dialog.open(template, {
+        width: '500px',
+      })
+      dialog.afterClosed().subscribe((v: any) => {
+        if (v) {
+          this.markStatus(status, data)
+          data.enableToggle = false
         } else {
-          event.source.checked = false
+          if (status === 'NOT-MY-USER') {
+            event.source.checked = true
+          } else {
+            event.source.checked = false
+          }
         }
-      }
-    })
+      })
+    }
+
+
   }
 
   confirmUpdate(template: any, updateUserDataForm: any, user: any, panel: any) {
@@ -1143,4 +1172,13 @@ export class UserCardComponent implements OnInit, OnChanges, AfterViewChecked {
     }
     return false
   }
+
+  // checkForMDOAdmin(user: any) {
+  //   if (this.isMdoLeader) {
+  //     return true
+  //   } else {
+  //     console.log('user.roles', user)
+  //   }
+
+  // }
 }
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index f527f4f80..988cea8e3 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -201,8 +201,10 @@ export class UsersViewComponent implements OnInit, OnDestroy {
     let reqBody
     const filtreq = {
       rootOrgId: this.rootOrgId,
+      'profileDetails.profileStatus': ['VERIFIED', 'NOT-VERIFIED'],
       status: 1,
     }
+
     if (this.getFilterGroup(query) && this.getFilterGroup(query) !== 'undefind') {
       Object.assign(filtreq, { 'profileDetails.professionalDetails.group': this.getFilterGroup(query) })
     }

From dc62bd536b089ded72e1310410b8f218a98338e8 Mon Sep 17 00:00:00 2001
From: vishnubansaltarento <vishnu.bansal@tarento.com>
Date: Fri, 20 Sep 2024 07:03:33 +0530
Subject: [PATCH 887/887] update for not my user changes

---
 .../home/components/search/search.component.html  |  2 +-
 .../components/user-cards/user-card.component.ts  | 15 ++++++++-------
 .../lib/routes/home/routes/home/home.component.ts |  4 ++--
 .../routes/users-view/users-view.component.ts     |  4 ++--
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/project/ws/app/src/lib/routes/home/components/search/search.component.html b/project/ws/app/src/lib/routes/home/components/search/search.component.html
index 1c702a9d8..13b591ec0 100644
--- a/project/ws/app/src/lib/routes/home/components/search/search.component.html
+++ b/project/ws/app/src/lib/routes/home/components/search/search.component.html
@@ -1,4 +1,4 @@
-<div class="flex flex-1 flex-row margin-top-m margin-bottom-m justify-between">
+<div class="flex flex-1 flex-row margin-top-m margin-bottom-m justify-start">
     <div class="search flex margin-right-m" [ngClass]="{'disable': isContentLive}">
         <div class="rsearch flex w-full">
             <mat-icon
diff --git a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
index b3c4b22a3..eeb15c09e 100644
--- a/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
+++ b/project/ws/app/src/lib/routes/home/components/user-cards/user-card.component.ts
@@ -132,11 +132,11 @@ export class UserCardComponent implements OnInit, OnChanges, AfterViewChecked, A
   checked = false
   currentUserStatus = ''
   constructor(private usersSvc: UsersService, private roleservice: RolesService,
-    private dialog: MatDialog, private approvalSvc: ApprovalsService,
-    private route: ActivatedRoute, private snackBar: MatSnackBar,
-    private events: EventService,
-    private datePipe: DatePipe,
-    private cdr: ChangeDetectorRef) {
+              private dialog: MatDialog, private approvalSvc: ApprovalsService,
+              private route: ActivatedRoute, private snackBar: MatSnackBar,
+              private events: EventService,
+              private datePipe: DatePipe,
+              private cdr: ChangeDetectorRef) {
     this.updateUserDataForm = new FormGroup({
       designation: new FormControl('', []),
       group: new FormControl('', [Validators.required]),
@@ -431,7 +431,7 @@ export class UserCardComponent implements OnInit, OnChanges, AfterViewChecked, A
     this.usersSvc.getUserById(user.userId).subscribe((res: any) => {
       if (res) {
         userval = res
-        console.log('userval', userval)
+        // console.log('userval', userval)
         this.usersData.forEach((u: any) => {
           if (u.userId === user.userId) {
             if (this.isMdoLeader) {
@@ -1052,6 +1052,7 @@ export class UserCardComponent implements OnInit, OnChanges, AfterViewChecked, A
     let showPopup = true
     if (status === 'NOT-MY-USER') {
       let checkPendingApprovals = false
+      // tslint:disable
       for (let i = 0; i < this.pendingApprovals.length; i++) {
         if (this.pendingApprovals[i] && this.pendingApprovals[i]['userInfo']
           && this.pendingApprovals[i]['userInfo']['wid'] === data.userId
@@ -1061,6 +1062,7 @@ export class UserCardComponent implements OnInit, OnChanges, AfterViewChecked, A
           checkPendingApprovals = true
         }
       }
+      // tslint:enable
       if (checkPendingApprovals) {
         this.snackBar.open('Please update the approval request of this user from the approvals tab to perform this action')
         event.source.checked = true
@@ -1094,7 +1096,6 @@ export class UserCardComponent implements OnInit, OnChanges, AfterViewChecked, A
       })
     }
 
-
   }
 
   confirmUpdate(template: any, updateUserDataForm: any, user: any, panel: any) {
diff --git a/project/ws/app/src/lib/routes/home/routes/home/home.component.ts b/project/ws/app/src/lib/routes/home/routes/home/home.component.ts
index 4d8614f1c..cc6692c18 100644
--- a/project/ws/app/src/lib/routes/home/routes/home/home.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/home/home.component.ts
@@ -42,7 +42,7 @@ export class HomeComponent implements OnInit, AfterViewInit, OnDestroy {
   department: any = {}
   departmentName = ''
   subscription: Subscription
-  containerCustomCls: boolean = false
+  containerCustomCls = false
 
   @HostListener('window:scroll', ['$event'])
   handleScroll() {
@@ -75,7 +75,7 @@ export class HomeComponent implements OnInit, AfterViewInit, OnDestroy {
 
     this.router.events.subscribe((event: Event) => {
       if (event instanceof NavigationEnd) {
-        let urlData = _.get(this.activeRoute, 'snapshot._routerState.url')
+        const urlData = _.get(this.activeRoute, 'snapshot._routerState.url')
         this.containerCustomCls = urlData && urlData.includes('odcs-mapping') ? true : false
 
         if (this.containerCustomCls) {
diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
index 87fd0de29..7c59b9591 100644
--- a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
+++ b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -774,11 +774,11 @@ export class UsersViewComponent implements OnInit, OnDestroy {
         serviceName: 'profile',
         applicationStatus: 'SEND_FOR_APPROVAL',
         requestType: ['GROUP_CHANGE', 'DESIGNATION_CHANGE'],
-        deptName: this.departName
+        deptName: this.departName,
       }
       this.apprService.getApprovalsList(req).subscribe((res: any) => {
         if (res && res.result) {
-          console.log('res--', res)
+          // console.log('res--', res)
           if (res && res.result && res.result.data && res.result.data.length) {
             this.pendingApprovals = res.result.data
           }